teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Make the ParticleSystemController freeze the particle system instead of the emitter (Bug #3390)

Browse source
This commit is contained in:
scrawl 2016-05-14 22:36:53 +02:00
parent e30bb31a79
commit 0c08f705c5
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
components/nifosg/controller.cpp
View file

@ -441,9 +441,9 @@ void ParticleSystemController::operator() (osg::Node* node, osg::NodeVisitor* nv
{
if (hasInput())
{
osgParticle::ParticleProcessor* emitter = static_cast<osgParticle::ParticleProcessor*>(node);
osgParticle::ParticleSystem* partsys = static_cast<osgParticle::ParticleSystem*>(node);
float time = getInputValue(nv);
emitter->setEnabled(time >= mEmitStart && time < mEmitStop);
partsys->setFrozen(!(time >= mEmitStart && time < mEmitStop));
}
traverse(node, nv);
}

2
components/nifosg/nifloader.cpp
View file

@ -994,7 +994,7 @@ namespace NifOsg
osg::ref_ptr<ParticleSystemController> callback(new ParticleSystemController(partctrl));
setupParticleController(partctrl, callback, particleflags);
emitter->setUpdateCallback(callback);
partsys->setUpdateCallback(callback);
}
// affectors must be attached *after* the emitter in the scene graph for correct update order