Work around apparent OSG 3.2.0 normal binding bug.

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

diff --git a/simgear/scene/model/animation.hxx b/simgear/scene/model/animation.hxx
index 5afc8c1972d4a56c8338ffdf91022b625e9671fd..048d991f513a9ce31b0e341b48d673f59d5c9511 100644 (file)
--- a/simgear/scene/model/animation.hxx
+++ b/simgear/scene/model/animation.hxx
@@ -48,7 +48,7 @@ public:
   static bool animate(osg::Node* node, const SGPropertyNode* configNode,
                       SGPropertyNode* modelRoot,
                       const osgDB::Options* options,
-                      const string &path, int i);
+                      const std::string &path, int i);
 
 protected:
   void apply(osg::Node* node);
@@ -73,6 +73,8 @@ protected:
                     const SGVec3d& def = SGVec3d::zeros() ) const;
   void readRotationCenterAndAxis(SGVec3d& center, SGVec3d& axis) const;
 
+  SGExpressiond* readOffsetValue(const char* tag_name) const;
+
   void removeMode(osg::Node& node, osg::StateAttribute::GLMode mode);
   void removeAttribute(osg::Node& node, osg::StateAttribute::Type type);
   void removeTextureMode(osg::Node& node, unsigned unit,
@@ -352,11 +354,11 @@ public:
   SGLightAnimation(const SGPropertyNode* configNode,
                    SGPropertyNode* modelRoot,
                    const osgDB::Options* options,
-                   const string &path, int i);
+                   const std::string &path, int i);
   virtual osg::Group* createAnimationGroup(osg::Group& parent);
   virtual void install(osg::Node& node);
 private:
-  string _light_type;
+  std::string _light_type;
   SGVec3d _position;
   SGVec3d _direction;
   SGVec4d _ambient;
@@ -367,7 +369,7 @@ private:
   double _cutoff;
   double _near;
   double _far;
-  string _key;
+  std::string _key;
   class UpdateCallback;
   friend class UpdateCallback;
   SGSharedPtr<SGExpressiond> _animationValue;