Changeset 10689 for OpenSceneGraph/trunk/include/osgAnimation/UpdateCallback

Timestamp:

10/23/09 22:35:31 (4 years ago)

Author:

cedricpinson

Message:

From Cedric Pinson, Simplify update callback api in osgAnimation, the decision to link is on the manager or user

Files:

• OpenSceneGraph/trunk/include/osgAnimation/UpdateCallback (modified) (5 diffs)

OpenSceneGraph/trunk/include/osgAnimation/UpdateCallback

@@ -27 +27 @@
 {
 
-    class AnimationUpdateCallbackBase
+    class AnimationUpdateCallbackBase : public virtual osg::Object
     {
     public:
-        virtual osg::Object* clone(const osg::CopyOp& copyop) const = 0;
-        virtual AnimationManagerBase* getAnimationManager() = 0;
-        virtual bool needLink() const = 0;
         virtual bool link(osgAnimation::Channel* channel) = 0;
         virtual int link(osgAnimation::Animation* animation) = 0;
-        virtual void updateLink() = 0;
-        virtual const std::string& getName() const = 0;
     };
 
@@ -42 +37 @@
     class AnimationUpdateCallback : public AnimationUpdateCallbackBase, public T
     {
-    protected:
-
-        osg::observer_ptr<osgAnimation::AnimationManagerBase> _manager;
-
     public:
         AnimationUpdateCallback(const std::string& name) { T::setName(name);}
         AnimationUpdateCallback(const AnimationUpdateCallback& apc,const osg::CopyOp& copyop):
-            T(apc, copyop),
-            _manager(apc._manager) {}
+            T(apc, copyop) {}
 
-        osgAnimation::AnimationManagerBase* getAnimationManager() { return _manager.get(); }
-        
         const std::string& getName() const { return T::getName(); }
         int link(osgAnimation::Animation* animation)
@@ -73 +61 @@
             }
             return nbLinks;
-        }
-
-        void updateLink()
-        {
-            if (_manager.valid())
-            {
-                if (needLink())
-                {
-                    /** this item is not linked yet then we do it for all animation
-                        registered in the manager.
-                        Maybe this function should be on the manager side like
-                        _manager->linkItem(Bone);
-                    */
-                    const AnimationList& animationList = _manager->getAnimationList();
-                    for (AnimationList::const_iterator it = animationList.begin(); it != animationList.end(); it++) 
-                    {
-                        AnimationUpdateCallbackBase* a = this;
-                        a->link(it->get());
-                    }
-                    _manager->buildTargetReference();
-                }
-            }
         }
     };
@@ -119 +85 @@
         void update(osg::MatrixTransform& mat);
         void update(osg::PositionAttitudeTransform& pat);
-        bool needLink() const;
         bool link(osgAnimation::Channel* channel);
 
@@ -144 +109 @@
         virtual void operator () (osg::StateAttribute*, osg::NodeVisitor*);
         void update(osg::Material& material);
-        bool needLink() const;
         bool link(osgAnimation::Channel* channel);
         osgAnimation::Vec4Target* getDiffuse();