mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-14 11:06:45 +00:00
Code Issues Releases Wiki Activity

Handle NiBSPArrayController as alias for NiParticleSystemController

Browse source 
The differences (if any) are unknown.

NiBSPArrayController is used by the Atronach_Fire.nif model. Its particles are now visible, but they don't look right yet. Need to handle NiAutoNormalParticlesData?
This commit is contained in:
scrawl 2014-05-22 22:15:20 +02:00
parent cba50c7338
commit e51300989c
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
components/nifogre/ogrenifloader.cpp
View file

@ -863,7 +863,8 @@ class NIFObjectLoader
Nif::ControllerPtr ctrl = partnode->controller; Nif::ControllerPtr ctrl = partnode->controller;
while(!ctrl.empty()) while(!ctrl.empty())
{ {
if(ctrl->recType == Nif::RC_NiParticleSystemController && ctrl->flags & Nif::NiNode::ControllerFlag_Active) if((ctrl->recType == Nif::RC_NiParticleSystemController || ctrl->recType == Nif::RC_NiBSPArrayController)
&& ctrl->flags & Nif::NiNode::ControllerFlag_Active)
{ {
const Nif::NiParticleSystemController *partctrl = static_cast<const Nif::NiParticleSystemController*>(ctrl.getPtr()); const Nif::NiParticleSystemController *partctrl = static_cast<const Nif::NiParticleSystemController*>(ctrl.getPtr());

1
components/nifogre/skeleton.cpp
View file

@ -42,6 +42,7 @@ void NIFSkeletonLoader::buildBones(Ogre::Skeleton *skel, const Nif::Node *node,
while(!ctrl.empty()) while(!ctrl.empty())
{ {
if(!(ctrl->recType == Nif::RC_NiParticleSystemController || if(!(ctrl->recType == Nif::RC_NiParticleSystemController ||
ctrl->recType == Nif::RC_NiBSPArrayController ||
ctrl->recType == Nif::RC_NiVisController || ctrl->recType == Nif::RC_NiVisController ||
ctrl->recType == Nif::RC_NiUVController || ctrl->recType == Nif::RC_NiUVController ||
ctrl->recType == Nif::RC_NiKeyframeController || ctrl->recType == Nif::RC_NiKeyframeController ||