Work around apparent OSG 3.2.0 normal binding bug.

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

diff --git a/simgear/scene/model/SGPickAnimation.hxx b/simgear/scene/model/SGPickAnimation.hxx
index c0194c04d2b26650806ca4e970eee212489af0da..9770d2d96cf2b14e7a1d36e0bee7360e54b6cccf 100644 (file)
--- a/simgear/scene/model/SGPickAnimation.hxx
+++ b/simgear/scene/model/SGPickAnimation.hxx
@@ -23,9 +23,11 @@
 #define SG_SCENE_PICK_ANIMATION_HXX
 
 #include <simgear/scene/model/animation.hxx>
+#include <simgear/misc/strutils.hxx>
 
 // forward decls
 class SGPickCallback;
+class SGSceneUserData;
 
 //////////////////////////////////////////////////////////////////////
 // Pick animation
@@ -35,15 +37,22 @@ class SGPickAnimation : public SGAnimation {
 public:
   SGPickAnimation(const SGPropertyNode* configNode,
                   SGPropertyNode* modelRoot);
-  virtual osg::Group* createAnimationGroup(osg::Group& parent);
     
+  // override so we can treat object-name specially
+  virtual void apply(osg::Group& group);
     
+  void apply(osg::Node* node);
 protected:
-    void innerSetupPickGroup(osg::Group* commonGroup, osg::Group& parent);
-    
+
+      
+  virtual osg::Group* createMainGroup(osg::Group* pr);
+  
+  virtual void setupCallbacks(SGSceneUserData* ud, osg::Group* parent);
 private:
   class PickCallback;
   class VncCallback;
+  
+  string_list _proxyNames;
 };
 
 
@@ -52,7 +61,6 @@ class SGKnobAnimation : public SGPickAnimation
 public:
     SGKnobAnimation(const SGPropertyNode* configNode,
                     SGPropertyNode* modelRoot);
-    virtual osg::Group* createAnimationGroup(osg::Group& parent);
 
     /**
      * by default mouse wheel up corresponds to increment (CW)
@@ -75,6 +83,13 @@ public:
      * personal preference.
      */
     static void setDragSensitivity(double aFactor);
+    
+    
+protected:
+    virtual osg::Group* createMainGroup(osg::Group* pr);
+      
+    virtual void setupCallbacks(SGSceneUserData* ud, osg::Group* parent);
+    
 private:
     class UpdateCallback;
     
@@ -88,7 +103,12 @@ class SGSliderAnimation : public SGPickAnimation
 public:
     SGSliderAnimation(const SGPropertyNode* configNode,
                     SGPropertyNode* modelRoot);
-    virtual osg::Group* createAnimationGroup(osg::Group& parent);
+    
+    
+protected:
+    virtual osg::Group* createMainGroup(osg::Group* pr);
+    
+    virtual void setupCallbacks(SGSceneUserData* ud, osg::Group* parent);
     
 private:
     class UpdateCallback;