mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-25 03:40:40 +00:00
Code Issues Projects Releases Wiki Activity

Remove no longer needed applyEffect(osgFX::Effect&) in SetFilterSettingsVisitor

Browse Source 
No longer needed because terrain texture filtering is now updated manually in TerrainGrid::updateTextureFiltering.
This commit is contained in:
scrawl 2016-03-14 00:29:38 +01:00
parent 50acdf3e47
commit e8caafa190
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
components/resource/scenemanager.cpp
View File

@ -6,7 +6,6 @@
#include <osg/UserDataContainer> #include <osg/UserDataContainer>
#include <osgParticle/ParticleSystem> #include <osgParticle/ParticleSystem>
#include <osgFX/Effect>
#include <osgUtil/IncrementalCompileOperation> #include <osgUtil/IncrementalCompileOperation>
@ -139,9 +138,6 @@ namespace Resource
virtual void apply(osg::Node& node) virtual void apply(osg::Node& node)
{ {
if (osgFX::Effect* effect = dynamic_cast<osgFX::Effect*>(&node))
applyEffect(*effect);
osg::StateSet* stateset = node.getStateSet(); osg::StateSet* stateset = node.getStateSet();
if (stateset) if (stateset)
applyStateSet(stateset); applyStateSet(stateset);
@ -149,19 +145,6 @@ namespace Resource
traverse(node); traverse(node);
} }
void applyEffect(osgFX::Effect& effect)
{
for (int i =0; i<effect.getNumTechniques(); ++i)
{
osgFX::Technique* tech = effect.getTechnique(i);
for (int pass=0; pass<tech->getNumPasses(); ++pass)
{
if (tech->getPassStateSet(pass))
applyStateSet(tech->getPassStateSet(pass));
}
}
}
virtual void apply(osg::Geode& geode) virtual void apply(osg::Geode& geode)
{ {
osg::StateSet* stateset = geode.getStateSet(); osg::StateSet* stateset = geode.getStateSet();