Merge branch 'timoore/aptsign' into next

[simgear.git] / simgear / scene / model / BoundingVolumeBuildVisitor.hxx

diff --git a/simgear/scene/model/BoundingVolumeBuildVisitor.hxx b/simgear/scene/model/BoundingVolumeBuildVisitor.hxx
index 0489f82793f6810d3f5de1903d644fd220b79338..9155bcece2920c62405ee3af31fd675afacd1d55 100644 (file)
--- a/simgear/scene/model/BoundingVolumeBuildVisitor.hxx
+++ b/simgear/scene/model/BoundingVolumeBuildVisitor.hxx
@@ -27,8 +27,6 @@
 #include <osg/Transform>
 #include <osg/TriangleFunctor>
 
-#include <simgear/scene/material/Effect.hxx>
-#include <simgear/scene/material/EffectGeode.hxx>
 #include <simgear/scene/material/mat.hxx>
 #include <simgear/scene/material/matlib.hxx>
 #include <simgear/scene/util/SGNodeMasks.hxx>
@@ -386,10 +384,10 @@ public:
     {
     }
 
-    const SGMaterial* pushMaterial(Effect* effect)
+    const SGMaterial* pushMaterial(osg::Geode* geode)
     {
         const SGMaterial* oldMaterial = _primitiveFunctor.getCurrentMaterial();
-        const SGMaterial* material = SGMaterialLib::findMaterial(effect);
+        const SGMaterial* material = SGMaterialLib::findMaterial(geode);
         if (material)
             _primitiveFunctor.setCurrentMaterial(material);
         return oldMaterial;
@@ -405,11 +403,7 @@ public:
         if (hasBoundingVolumeTree(geode))
             return;
 
-        const SGMaterial* oldMaterial = 0;
-
-        EffectGeode *eg = dynamic_cast<EffectGeode*>(&geode);
-        if (eg)
-            oldMaterial = pushMaterial(eg->getEffect());
+        const SGMaterial* oldMaterial = pushMaterial(&geode);
 
         bool flushHere = getNodePath().size() <= 1 || _dumpIntoLeafs;
         if (flushHere) {
@@ -417,6 +411,9 @@ public:
             PFunctor previousPrimitives;
             _primitiveFunctor.swap(previousPrimitives);
 
+            const SGMaterial* mat = previousPrimitives.getCurrentMaterial();
+            _primitiveFunctor.setCurrentMaterial(mat);
+
             // walk the children
             for(unsigned i = 0; i < geode.getNumDrawables(); ++i)
                 fillWith(geode.getDrawable(i));
@@ -430,8 +427,8 @@ public:
             for(unsigned i = 0; i < geode.getNumDrawables(); ++i)
                 fillWith(geode.getDrawable(i));
         }
-        if (eg)
-            _primitiveFunctor.setCurrentMaterial(oldMaterial);
+
+        _primitiveFunctor.setCurrentMaterial(oldMaterial);
     }
 
     virtual void apply(osg::Group& group)
@@ -461,6 +458,9 @@ public:
         PFunctor previousPrimitives;
         _primitiveFunctor.swap(previousPrimitives);
 
+        const SGMaterial* mat = previousPrimitives.getCurrentMaterial();
+        _primitiveFunctor.setCurrentMaterial(mat);
+
         // walk the children
         traverse(node);