diff --git a/components/resource/bulletshapemanager.cpp b/components/resource/bulletshapemanager.cpp index 111808e6e..0a5ed783e 100644 --- a/components/resource/bulletshapemanager.cpp +++ b/components/resource/bulletshapemanager.cpp @@ -1,8 +1,9 @@ #include "bulletshapemanager.hpp" #include -#include #include +#include +#include #include @@ -62,12 +63,6 @@ public: } - virtual void apply(osg::Geode& geode) - { - for (unsigned int i=0; i #include -#include #include #include @@ -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(&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; igetStateSet(); - if (stateset) - applyStateSet(stateset); - } - } - void applyStateSet(osg::StateSet* stateset) { const osg::StateSet::TextureAttributeList& texAttributes = stateset->getTextureAttributeList();