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

Remove no longer needed apply(Geode&) in SetFilterSettingsVisitor and NodeToShapeVisitor

Browse source 
In OSG 3.4 (which is now a requirement), Drawables are normal Nodes attached in the scene graph. Geode is still provided for backwards compatibility, but does not need to be specially handled here because it now functions just like a normal Group node.
This commit is contained in:
scrawl 2016-03-14 00:32:32 +01:00
parent e8caafa190
commit 24ae9f4ac1
2 changed files with 2 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
components/resource/bulletshapemanager.cpp
View file

@ -1,8 +1,9 @@
#include "bulletshapemanager.hpp"
#include <osg/NodeVisitor>
#include <osg/Geode>
#include <osg/TriangleFunctor>
#include <osg/Transform>
#include <osg/Drawable>
#include <BulletCollision/CollisionShapes/btTriangleMesh.h>
@ -62,12 +63,6 @@ public:
}
virtual void apply(osg::Geode& geode)
{
for (unsigned int i=0; i<geode.getNumDrawables(); ++i)
apply(*geode.getDrawable(i));
}
virtual void apply(osg::Drawable &drawable)
{
if (!mTriangleMesh)

17
components/resource/scenemanager.cpp
View file

@ -2,7 +2,6 @@
#include <iostream>
#include <osg/Node>
#include <osg/Geode>
#include <osg/UserDataContainer>
#include <osgParticle/ParticleSystem>
@ -51,7 +50,6 @@ namespace
&& partsys->getUserDataContainer()->getDescriptions()[0] == "worldspace");
}
// in OSG 3.3 and up Drawables can be directly in the scene graph without a Geode decorating them.
void apply(osg::Drawable& drw)
{
if (osgParticle::ParticleSystem* partsys = dynamic_cast<osgParticle::ParticleSystem*>(&drw))
@ -145,21 +143,6 @@ namespace Resource
traverse(node);
}
virtual void apply(osg::Geode& geode)
{
osg::StateSet* stateset = geode.getStateSet();
if (stateset)
applyStateSet(stateset);
for (unsigned int i=0; i<geode.getNumDrawables(); ++i)
{
osg::Drawable* drw = geode.getDrawable(i);
stateset = drw->getStateSet();
if (stateset)
applyStateSet(stateset);
}
}
void applyStateSet(osg::StateSet* stateset)
{
const osg::StateSet::TextureAttributeList& texAttributes = stateset->getTextureAttributeList();