Changeset 10561

Timestamp:

08/31/09 11:40:56 (4 years ago)

Author:

cedricpinson

Message:

From Cedric Pinson, The following modification are
Update Timeline.cpp to add current layer to the ActionVisitor?, use correctly the priority
Add accessors in Action.cpp to retrieve protected data
Split files and rename them to classname
Change de default color of UpdateMaterial? to FFOOFF to detect unset value
Add accessors in LinkVisitor? instead of accessing data directly
Update osganimationtimeline example to fit the api callback

Location:

OpenSceneGraph/trunk

Files:

• include/osgAnimation/Action (modified) (2 diffs)
• include/osgAnimation/ActionVisitor (modified) (3 diffs)
• include/osgAnimation/Bone (modified) (2 diffs)
• include/osgAnimation/LinkVisitor (modified) (1 diff)
• include/osgAnimation/Target (modified) (1 diff)
• src/osgAnimation/Action.cpp (modified) (5 diffs)
• src/osgAnimation/ActionVisitor.cpp (modified) (3 diffs)
• src/osgAnimation/Bone.cpp (modified) (9 diffs)
• src/osgAnimation/CMakeLists.txt (modified) (2 diffs)
• src/osgAnimation/Target.cpp (modified) (1 diff)
• src/osgAnimation/Timeline.cpp (modified) (3 diffs)
• src/osgAnimation/UpdateCallback.cpp (modified) (1 diff)

OpenSceneGraph/trunk/include/osgAnimation/Action

@@ -167 +167 @@
         ActionAnimation(const ActionAnimation& a, const osg::CopyOp& c) : Action(a,c) { _animation = a._animation;}
         ActionAnimation(Animation* animation);
-        void updateAnimation(unsigned int frame);
+        void updateAnimation(unsigned int frame, int priority);
         Animation* getAnimation() { return _animation.get(); }
 
@@ -193 +193 @@
         unsigned int getLoop() const { return _animation->getLoop(); }
         void setLoop(unsigned int loop);
-        void computeWeightAndUpdateAnimation(unsigned int frame);
-
         void traverse(ActionVisitor& visitor);
 

OpenSceneGraph/trunk/include/osgAnimation/ActionVisitor

@@ -39 +39 @@
     {
     public:
-        std::vector<FrameAction> _stackFrameAction;
-        std::vector<Timeline*> _stackTimeline;
-
         META_ActionVisitor(osgAnimation, ActionVisitor);
+        ActionVisitor();
         void traverse(Action& visitor);
 
@@ -52 +50 @@
 
         Timeline* getCurrentTimeline();
+        void setCurrentLayer(int layer) { _currentLayer = layer;}
+        int getCurrentLayer() const { return _currentLayer; }
+
+        const std::vector<FrameAction>& getStackedFrameAction() const { return _stackFrameAction; }
 
         virtual void apply(Action& action);
@@ -59 +61 @@
         virtual void apply(ActionAnimation& action);
         virtual void apply(StripAnimation& action);
+
+    protected:
+        std::vector<FrameAction> _stackFrameAction;
+        std::vector<Timeline*> _stackTimeline;
+        int _currentLayer;
     };
 

OpenSceneGraph/trunk/include/osgAnimation/Bone

@@ -57 +57 @@
         void setDefaultUpdateCallback(const std::string& name = "");
 
-        struct BoneMapVisitor : public osg::NodeVisitor
-        {
-            BoneMap _map;
-            BoneMapVisitor(): osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN) {}
-
-            META_NodeVisitor("osgAnimation","BoneMapVisitor")
-
-            void apply(osg::Node&) { return; }
-            void apply(osg::Transform& node)
-            {
-                Bone* bone = dynamic_cast<Bone*>(&node);
-                if (bone) 
-                {
-                    _map[bone->getName()] = bone;
-                    traverse(node);
-                }
-            }
-        };
-
         class OSGANIMATION_EXPORT UpdateBone : public AnimationUpdateCallback <osg::NodeCallback>
         {
@@ -132 +113 @@
         const osg::Vec3& getTranslation() const { return _position;}
         const osg::Quat& getRotation() const { return _rotation;}
+        const osg::Vec3& getScale() const { return _scale;}
+
         osg::Matrix getMatrixInBoneSpace() const { return (osg::Matrix(getRotation())) * osg::Matrix::translate(getTranslation()) * _bindInBoneSpace;}
         const osg::Matrix& getBindMatrixInBoneSpace() const { return _bindInBoneSpace; }

OpenSceneGraph/trunk/include/osgAnimation/LinkVisitor

@@ -38 +38 @@
         AnimationList& getAnimationList();
         void reset();
+        unsigned int getNbLinkedTarget() const { return _nbLinkedTarget; }
 
     protected:

OpenSceneGraph/trunk/include/osgAnimation/Target

@@ -35 +35 @@
             
         Target();
-        virtual ~Target();
+        virtual ~Target() {}
         virtual void normalize() = 0;
         void reset() { _weight = 0; _priorityWeight = 0; }

OpenSceneGraph/trunk/src/osgAnimation/Action.cpp

@@ -104 +104 @@
     setName(animation->getName());
 }
-void osgAnimation::ActionAnimation::updateAnimation(unsigned int frame)
+void osgAnimation::ActionAnimation::updateAnimation(unsigned int frame, int priority)
 {
-    _animation->update(frame * 1.0/_fps);
+    _animation->update(frame * 1.0/_fps, priority);
 }
 
@@ -150 +150 @@
     if (_blendIn.valid())
     {
-        unsigned int f = visitor._stackFrameAction.back().first;
+        unsigned int f = visitor.getStackedFrameAction().back().first;
         visitor.pushFrameActionOnStack(FrameAction(f,_blendIn.get()));
         _blendIn->accept(visitor);
@@ -157 +157 @@
     if (_blendOut.second.valid())
     {
-        unsigned int f = visitor._stackFrameAction.back().first;
+        unsigned int f = visitor.getStackedFrameAction().back().first;
         visitor.pushFrameActionOnStack(FrameAction(f + _blendOut.first,_blendOut.second.get()));
         _blendOut.second.get()->accept(visitor);
@@ -165 +165 @@
     if (_animation.valid())
     {
-        unsigned int f = visitor._stackFrameAction.back().first;
+        unsigned int f = visitor.getStackedFrameAction().back().first;
         visitor.pushFrameActionOnStack(FrameAction(f,_animation.get()));
         _animation->accept(visitor);
@@ -171 +171 @@
     }
 }
-
-void osgAnimation::StripAnimation::computeWeightAndUpdateAnimation(unsigned int frame)
-{
-    if (frame < _blendIn->getNumFrames())
-        _blendIn->computeWeight(frame);
-    if (frame >= _blendOut.first)
-        _blendOut.second->computeWeight(frame - _blendOut.first);
-    _animation->updateAnimation(frame);
-}

OpenSceneGraph/trunk/src/osgAnimation/ActionVisitor.cpp

@@ -17 +17 @@
 #include <osgAnimation/Timeline>
 
+osgAnimation::ActionVisitor::ActionVisitor()
+{
+    _currentLayer = 0;
+}
 void osgAnimation::ActionVisitor::pushFrameActionOnStack(const FrameAction& fa) { _stackFrameAction.push_back(fa); }
 void osgAnimation::ActionVisitor::popFrameAction() { _stackFrameAction.pop_back(); }
@@ -125 +129 @@
         unsigned int frame = getLocalFrame();
         apply(static_cast<Action&>(action));
-        action.updateAnimation(frame);
+        action.updateAnimation(frame, getCurrentLayer());
     }
 }
@@ -134 +138 @@
     {
         apply(static_cast<Action&>(action));
-
-#if 0
-        unsigned int frame = getLocalFrame();
-        // evaluate callback in blendin/blendout/animation
-        {
-            BlendIn* subAction = action.getBlendIn();
-            if (subAction)
-                apply(static_cast<Action&>(*subAction));
-        }
-        {
-            BlendOut* subAction = action.getBlendOut();
-            if (subAction)
-                apply(static_cast<Action&>(*subAction));
-        }
-        {
-            ActionAnimation* subAction = action.getActionAnimation();
-            if (subAction)
-                apply(static_cast<Action&>(*subAction));
-        }            
-        action.computeWeightAndUpdateAnimation(frame);
-#else
         action.traverse(*this);
-#endif
     }
 }

OpenSceneGraph/trunk/src/osgAnimation/Bone.cpp

@@ -1 +1 @@
 /*  -*-c++-*- 
- *  Copyright (C) 2008 Cedric Pinson <mornifle@plopbyte.net>
+ *  Copyright (C) 2008 Cedric Pinson <cedric.pinson@plopbyte.net>
  *
  * This library is open source and may be redistributed and/or modified under  
@@ -16 +16 @@
 #include <osgAnimation/Bone>
 #include <osgAnimation/Skeleton>
-
-
-struct FindNearestParentAnimationManager : public osg::NodeVisitor
-{
-    osg::ref_ptr<osgAnimation::AnimationManagerBase> _manager;
-    FindNearestParentAnimationManager() : osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_PARENTS) {}
-    void apply(osg::Node& node)
-    {
-        if (_manager.valid())
-            return;
-        osg::NodeCallback* callback = node.getUpdateCallback();
-        while (callback) 
-        {
-            _manager = dynamic_cast<osgAnimation::AnimationManagerBase*>(callback);
-            if (_manager.valid())
-                return;
-            callback = callback->getNestedCallback();
-        }
-        traverse(node);
-    }
-};
-
-
-struct ComputeBindMatrixVisitor : public osg::NodeVisitor
-{
-    ComputeBindMatrixVisitor(): osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN) {}
-    void apply(osg::Node& node) { return; }
-    void apply(osg::Transform& node) 
-    {
-        osgAnimation::Bone* bone = dynamic_cast<osgAnimation::Bone*>(&node);
-        if (!bone)
-            return;
-        if (bone->needToComputeBindMatrix())
-            bone->computeBindMatrix();
-
-        traverse(node);
-    }
-};
-
+#include <osgAnimation/FindParentAnimationManagerVisitor>
+#include <osgAnimation/BoneMapVisitor>
+#include <osgAnimation/ComputeBindMatrixVisitor>
 
 
@@ -108 +72 @@
         if (!_manager.valid())
         {
-            FindNearestParentAnimationManager finder;
+            FindParentAnimationManagerVisitor finder;
 
             if (b->getParents().size() > 1)
@@ -121 +85 @@
             b->getParents()[0]->accept(finder);
 
-            if (!finder._manager.valid())
+            if (!finder.getAnimationManager())
             {
                 osg::notify(osg::WARN) << "Warning can't update Bone, path to parent AnimationManagerBase not found" << std::endl;
@@ -127 +91 @@
             }
 
-            _manager = finder._manager.get();
+            _manager = finder.getAnimationManager();
         }
 
@@ -154 +118 @@
     _boneInSkeletonSpace(b._boneInSkeletonSpace)
 {
+#if 0
     osg::ref_ptr<osg::NodeCallback> updatecallback = getUpdateCallback();
     setUpdateCallback(0);
@@ -162 +127 @@
         updatecallback = updatecallback->getNestedCallback();
     }
+#endif
 }
 
@@ -193 +159 @@
 }
 
-osgAnimation::Bone* osgAnimation::Bone::getBoneParent() 
+osgAnimation::Bone* osgAnimation::Bone::getBoneParent()
 {
     if (getParents().empty())
@@ -239 +205 @@
     BoneMapVisitor mapVisitor;
     this->accept(mapVisitor);
-    return mapVisitor._map;
-}
+    return mapVisitor.getBoneMap();
+}

OpenSceneGraph/trunk/src/osgAnimation/CMakeLists.txt

@@ -19 +19 @@
     ${HEADER_PATH}/BasicAnimationManager
     ${HEADER_PATH}/Bone
+    ${HEADER_PATH}/BoneMapVisitor
     ${HEADER_PATH}/Channel
     ${HEADER_PATH}/CubicBezier
+    ${HEADER_PATH}/ComputeBindMatrixVisitor
     ${HEADER_PATH}/EaseMotion
     ${HEADER_PATH}/Export
+    ${HEADER_PATH}/FindParentAnimationManagerVisitor
     ${HEADER_PATH}/FrameAction
     ${HEADER_PATH}/Interpolator
@@ -54 +57 @@
     BasicAnimationManager.cpp
     Bone.cpp
+    BoneMapVisitor.cpp
     Channel.cpp
+    FindParentAnimationManagerVisitor.cpp
     LinkVisitor.cpp
     MorphGeometry.cpp

OpenSceneGraph/trunk/src/osgAnimation/Target.cpp

@@ -20 +20 @@
 
 Target::Target() : _weight(0), _priorityWeight(0), _lastPriority(0) {}
-Target::~Target() {}

OpenSceneGraph/trunk/src/osgAnimation/Timeline.cpp

@@ -1 +1 @@
 /*  -*-c++-*- 
- *  Copyright (C) 2008 Cedric Pinson <mornifle@plopbyte.net>
+ *  Copyright (C) 2008 Cedric Pinson <cedric.pinson@plopbyte.net>
  *
  * This library is open source and may be redistributed and/or modified under  
@@ -56 +56 @@
 void osgAnimation::Timeline::traverse(ActionVisitor& visitor)
 {
+    int layer = visitor.getCurrentLayer();
     visitor.pushTimelineOnStack(this);
     // update from high priority to low priority
     for( ActionLayers::reverse_iterator iterAnim = _actions.rbegin(); iterAnim != _actions.rend(); ++iterAnim )
     {
+        visitor.setCurrentLayer(iterAnim->first);
         ActionList& list = iterAnim->second;
         for (unsigned int i = 0; i < list.size(); i++)
@@ -69 +71 @@
     }
     visitor.popTimeline();
+    visitor.setCurrentLayer(layer);
 }
 

OpenSceneGraph/trunk/src/osgAnimation/UpdateCallback.cpp

@@ -131 +131 @@
     AnimationUpdateCallback<osg::StateAttribute::Callback>(name)
 {
-    _diffuse = new osgAnimation::Vec4Target(osg::Vec4(1,1,1,1));
+    _diffuse = new osgAnimation::Vec4Target(osg::Vec4(1,0,1,1));
 }