From 24ae9f4ac1cdcd74e702ec8f09ccc45a8542b484 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 14 Mar 2016 00:32:32 +0100
Subject: [PATCH] Remove no longer needed apply(Geode&) in
 SetFilterSettingsVisitor and NodeToShapeVisitor

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.
---
 components/resource/bulletshapemanager.cpp |  9 ++-------
 components/resource/scenemanager.cpp       | 17 -----------------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/components/resource/bulletshapemanager.cpp b/components/resource/bulletshapemanager.cpp
index 111808e6ed..0a5ed783ef 100644
--- a/components/resource/bulletshapemanager.cpp
+++ b/components/resource/bulletshapemanager.cpp
@@ -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)
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index fef3f49dc0..7bbf08f3a4 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -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();