mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-21 09:53:50 +00:00
Code Issues Releases Wiki Activity

Revert "Enable culling for particle emitters & programs"

Browse source 
This reverts commit 8b206e0aed.
This commit is contained in:
scrawl 2015-05-29 20:31:26 +02:00
parent b75d993da4
commit 261ed1f4e5
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
components/nifosg/nifloader.cpp
View file

@ -682,7 +682,6 @@ namespace NifOsg
attachTo->addChild(program); attachTo->addChild(program);
program->setParticleSystem(partsys); program->setParticleSystem(partsys);
program->setReferenceFrame(rf); program->setReferenceFrame(rf);
program->setCullingActive(true);
for (; !affectors.empty(); affectors = affectors->extra) for (; !affectors.empty(); affectors = affectors->extra)
{ {
if (affectors->recType == Nif::RC_NiParticleGrowFade) if (affectors->recType == Nif::RC_NiParticleGrowFade)
@ -829,7 +828,6 @@ namespace NifOsg
osg::ref_ptr<Emitter> emitter = handleParticleEmitter(partctrl); osg::ref_ptr<Emitter> emitter = handleParticleEmitter(partctrl);
emitter->setParticleSystem(partsys); emitter->setParticleSystem(partsys);
emitter->setReferenceFrame(osgParticle::ParticleProcessor::RELATIVE_RF); emitter->setReferenceFrame(osgParticle::ParticleProcessor::RELATIVE_RF);
emitter->setCullingActive(true);
// Note: we assume that the Emitter node is placed *before* the Particle node in the scene graph. // Note: we assume that the Emitter node is placed *before* the Particle node in the scene graph.
// This seems to be true for all NIF files in the game that I've checked, suggesting that NIFs work similar to OSG with regards to update order. // This seems to be true for all NIF files in the game that I've checked, suggesting that NIFs work similar to OSG with regards to update order.
@ -870,7 +868,6 @@ namespace NifOsg
// particle system updater (after the emitters and affectors in the scene graph) // particle system updater (after the emitters and affectors in the scene graph)
// I think for correct culling needs to be *before* the ParticleSystem, though osg examples do it the other way // I think for correct culling needs to be *before* the ParticleSystem, though osg examples do it the other way
osg::ref_ptr<osgParticle::ParticleSystemUpdater> updater = new osgParticle::ParticleSystemUpdater; osg::ref_ptr<osgParticle::ParticleSystemUpdater> updater = new osgParticle::ParticleSystemUpdater;
updater->setCullingActive(true);
updater->addParticleSystem(partsys); updater->addParticleSystem(partsys);
parentNode->addChild(updater); parentNode->addChild(updater);