Work around apparent OSG 3.2.0 normal binding bug.

[simgear.git] / simgear / scene / model / SGMaterialAnimation.cxx

diff --git a/simgear/scene/model/SGMaterialAnimation.cxx b/simgear/scene/model/SGMaterialAnimation.cxx
index 61181aeb22c2ba70464dbd11808316a16c91d6e4..cc5c660c6ae93355779e3f8600e1e6c2791b3f0c 100644 (file)
--- a/simgear/scene/model/SGMaterialAnimation.cxx
+++ b/simgear/scene/model/SGMaterialAnimation.cxx
@@ -27,6 +27,8 @@
 #include <simgear/scene/material/Pass.hxx>
 #include <simgear/scene/material/Technique.hxx>
 #include <simgear/scene/model/model.hxx>
+#include <simgear/scene/model/ConditionNode.hxx>
+#include <simgear/scene/util/OsgMath.hxx>
 
 using namespace std;
 using namespace simgear;
@@ -340,9 +342,7 @@ public:
 class UpdateCallback : public osg::NodeCallback {
 public:
   UpdateCallback(const osgDB::FilePathList& texturePathList,
-                 const SGCondition* condition,
                  const SGPropertyNode* configNode, SGPropertyNode* modelRoot) :
-    _condition(condition),
     _materialProps(configNode, modelRoot),
     _texturePathList(texturePathList),
     _prevState(false)
@@ -360,7 +360,7 @@ public:
   virtual void operator()(osg::Node* node, osg::NodeVisitor* nv)
   {
     osg::StateSet* stateSet = node->getStateSet();
-    if ((!_condition || _condition->test()) && stateSet) {
+    if (stateSet) {
       if (_textureProp) {
         std::string textureName = _textureProp->getStringValue();
         if (_textureName != textureName) {
@@ -400,7 +400,6 @@ public:
     traverse(node, nv);
   }
 private:
-  SGSharedPtr<const SGCondition> _condition;
   SGSharedPtr<const SGPropertyNode> _textureProp;
   SGSharedPtr<const SGPropertyNode> _thresholdProp;
   std::string _textureName;
@@ -413,14 +412,15 @@ private:
 
 SGMaterialAnimation::SGMaterialAnimation(const SGPropertyNode* configNode,
                                          SGPropertyNode* modelRoot,
-                                         const osgDB::ReaderWriter::Options*
-                                         options) :
+                                         const osgDB::Options*
+                                         options, const string &path) :
   SGAnimation(configNode, modelRoot),
   texturePathList(options->getDatabasePathList())
 {
   if (configNode->hasChild("global"))
-    SG_LOG(SG_IO, SG_ALERT, "Use of <global> in material animation is "
-           "no longer supported");
+    SG_LOG(SG_IO, SG_ALERT, path <<
+           ": Use of <global> in material animation is "
+           "no longer supported.");
 }
 
 osg::Group*
@@ -557,13 +557,23 @@ SGMaterialAnimation::createAnimationGroup(osg::Group& parent)
       || getConfig()->hasChild("threshold-prop") || getCondition()) {
     stateSet->setDataVariance(osg::Object::DYNAMIC);
     group->setUpdateCallback(new UpdateCallback(texturePathList,
-                                                getCondition(),
                                                 getConfig(), inputRoot));
   } else {
     stateSet->setDataVariance(osg::Object::STATIC);
   }
-  parent.addChild(group);
-  return group;
+  if (getCondition()) {
+    ConditionNode* cn = new ConditionNode;
+    cn->setCondition(getCondition());
+    osg::Group* modelGroup = new osg::Group;
+    group->addChild(modelGroup);
+    cn->addChild(group);
+    cn->addChild(modelGroup);
+    parent.addChild(cn);
+    return modelGroup;
+  } else {
+    parent.addChild(group);
+    return group;
+  }
 }
 
 void