Changeset 10693

Timestamp:

10/27/09 16:37:13 (4 years ago)

Author:

cedricpinson

Message:

From Cedric Pinson, The following commit include:
* Refactore of RigGeometry? to support hardware skinning
* Refactore of Timeline to split Action in differents files
* Add example how to use hardware skinning

Location:

OpenSceneGraph/trunk

Files:

• include/osgAnimation/Action (modified) (3 diffs)
• include/osgAnimation/ActionAnimation (added)
• include/osgAnimation/ActionBlendIn (added)
• include/osgAnimation/ActionBlendOut (added)
• include/osgAnimation/ActionStripAnimation (added)
• include/osgAnimation/ActionVisitor (modified) (4 diffs)
• include/osgAnimation/RigGeometry (modified) (6 diffs)
• include/osgAnimation/RigTransform (added)
• include/osgAnimation/RigTransformHardware (added)
• include/osgAnimation/RigTransformSoftware (added)
• include/osgAnimation/StatsVisitor (modified) (1 diff)
• include/osgAnimation/Timeline (modified) (1 diff)
• include/osgAnimation/VertexInfluence (modified) (4 diffs)
• src/osgAnimation/Action.cpp (modified) (4 diffs)
• src/osgAnimation/ActionAnimation.cpp (added)
• src/osgAnimation/ActionBlendIn.cpp (added)
• src/osgAnimation/ActionBlendOut.cpp (added)
• src/osgAnimation/ActionStripAnimation.cpp (added)
• src/osgAnimation/ActionVisitor.cpp (modified) (9 diffs)
• src/osgAnimation/Bone.cpp (modified) (1 diff)
• src/osgAnimation/CMakeLists.txt (modified) (4 diffs)
• src/osgAnimation/RigGeometry.cpp (modified) (4 diffs)
• src/osgAnimation/RigTransformHardware.cpp (added)
• src/osgAnimation/RigTransformSoftware.cpp (added)
• src/osgAnimation/StatsVisitor.cpp (modified) (7 diffs)
• src/osgAnimation/VertexInfluence.cpp (modified) (8 diffs)

OpenSceneGraph/trunk/include/osgAnimation/Action

@@ -58 +58 @@
             }
 
+            void removeCallback(Callback* cb)
+            { 
+                if (!cb)
+                    return;
+
+                if (_nestedCallback.get() == cb)
+                    _nestedCallback = _nestedCallback->getNestedCallback();
+                else
+                    _nestedCallback->removeCallback(cb);
+            }
+
         protected:
             osg::ref_ptr<Callback> _nestedCallback;
@@ -88 +99 @@
             return _framesCallback[frame].get();
         }
-        
+
+        void removeCallback(Callback*);
+
         Callback* getFrameCallback(unsigned int frame);
         Callback* getFrameCallback(double time);
@@ -128 +141 @@
 
 
-    // blend in from 0 to weight in duration
-    class OSGANIMATION_EXPORT BlendIn : public Action
-    {
-        double _weight;
-        osg::ref_ptr<Animation> _animation;
-
-    public:
-        META_Action(osgAnimation, BlendIn);
-        BlendIn() : _weight(0) {}
-        BlendIn(const BlendIn& a, const osg::CopyOp& c) : Action(a,c) { _weight = a._weight; _animation = a._animation;}
-        BlendIn(Animation* animation, double duration, double weight);
-        double getWeight() const { return _weight;}
-        Animation* getAnimation() { return _animation.get(); }
-        void computeWeight(unsigned int frame);
-    };
-
-    // blend in from 0 to weight in duration
-    class OSGANIMATION_EXPORT BlendOut : public Action
-    {
-        double _weight;
-        osg::ref_ptr<Animation> _animation;
-    public:
-        META_Action(osgAnimation, BlendOut);
-        BlendOut() : _weight(0) {}
-        BlendOut(const BlendOut& a, const osg::CopyOp& c) : Action(a,c) { _weight = a._weight; _animation = a._animation;}
-        BlendOut(Animation* animation, double duration);
-        Animation* getAnimation() { return _animation.get(); }
-        double getWeight() const { return _weight;}
-        void computeWeight(unsigned int frame);
-    };
-
-
-    class OSGANIMATION_EXPORT ActionAnimation : public Action
-    {
-    public:
-        META_Action(osgAnimation, ActionAnimation);
-        ActionAnimation() {}
-        ActionAnimation(const ActionAnimation& a, const osg::CopyOp& c) : Action(a,c) { _animation = a._animation;}
-        ActionAnimation(Animation* animation);
-        void updateAnimation(unsigned int frame, int priority);
-        Animation* getAnimation() { return _animation.get(); }
-
-    protected:
-        osg::ref_ptr<Animation> _animation;
-    };
-
-
-    // encapsulate animation with blend in blend out for classic usage
-    class OSGANIMATION_EXPORT StripAnimation : public Action
-    {
-    public:
-        META_Action(osgAnimation, StripAnimation);
-        StripAnimation() {}
-        StripAnimation(const StripAnimation& a, const osg::CopyOp& c);
-        StripAnimation(Animation* animation, double blendInDuration = 0.0, double blendOutDuration = 0.0, double blendInWeightTarget = 1.0  );
-        ActionAnimation* getActionAnimation() { return _animation.get(); }
-        BlendIn* getBlendIn() { return _blendIn.get(); }
-        BlendOut* getBlendOut() { return _blendOut.second.get(); }
-        const ActionAnimation* getActionAnimation() const { return _animation.get(); }
-        const BlendIn* getBlendIn() const { return _blendIn.get(); }
-        const BlendOut* getBlendOut() const { return _blendOut.second.get(); }
-        unsigned int getBlendOutStartFrame() const { return _blendOut.first; }
-        
-        unsigned int getLoop() const { return _animation->getLoop(); }
-        void setLoop(unsigned int loop);
-        void traverse(ActionVisitor& visitor);
-
-    protected:
-        typedef std::pair<unsigned int, osg::ref_ptr<BlendOut> > FrameBlendOut;
-        osg::ref_ptr<BlendIn> _blendIn;
-        FrameBlendOut _blendOut;
-        osg::ref_ptr<ActionAnimation> _animation;
-    };
-
-
-
 }
 

OpenSceneGraph/trunk/include/osgAnimation/ActionVisitor

@@ -26 +26 @@
     class Timeline;
     class Action;
-    class BlendIn;
-    class BlendOut;
+    class ActionBlendIn;
+    class ActionBlendOut;
     class ActionAnimation;
-    class StripAnimation;
+    class ActionStripAnimation;
 
 #define META_ActionVisitor(library,name) \
@@ -57 +57 @@
         virtual void apply(Action& action);
         virtual void apply(Timeline& tm);
-        virtual void apply(BlendIn& action);
-        virtual void apply(BlendOut& action);
+        virtual void apply(ActionBlendIn& action);
+        virtual void apply(ActionBlendOut& action);
         virtual void apply(ActionAnimation& action);
-        virtual void apply(StripAnimation& action);
+        virtual void apply(ActionStripAnimation& action);
 
     protected:
@@ -73 +73 @@
     protected:
         unsigned int _frame;
-
+        unsigned int _currentAnimationPriority;
     public:
         META_ActionVisitor(osgAnimation, UpdateActionVisitor);
@@ -84 +84 @@
         void apply(Timeline& action);
         void apply(Action& action);
-        void apply(BlendIn& action);
-        void apply(BlendOut& action);
+        void apply(ActionBlendIn& action);
+        void apply(ActionBlendOut& action);
         void apply(ActionAnimation& action);
-        void apply(StripAnimation& action);
+        void apply(ActionStripAnimation& action);
 
     };

OpenSceneGraph/trunk/include/osgAnimation/RigGeometry

@@ -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  
@@ -17 +17 @@
 
 #include <osgAnimation/Export>
-#include <osgAnimation/Skinning>
 #include <osgAnimation/Skeleton>
+#include <osgAnimation/RigTransform>
 #include <osg/Geometry>
 
@@ -34 +34 @@
         META_Object(osgAnimation, RigGeometry);
 
-        void setInfluenceMap(osgAnimation::VertexInfluenceMap* vertexInfluenceMap) { _vertexInfluenceMap = vertexInfluenceMap; }
-        const osgAnimation::VertexInfluenceMap* getInfluenceMap() const { return _vertexInfluenceMap.get();}
-        osgAnimation::VertexInfluenceMap* getInfluenceMap() { return _vertexInfluenceMap.get();}
+        void setInfluenceMap(VertexInfluenceMap* vertexInfluenceMap) { _vertexInfluenceMap = vertexInfluenceMap; }
+        const VertexInfluenceMap* getInfluenceMap() const { return _vertexInfluenceMap.get();}
+        VertexInfluenceMap* getInfluenceMap() { return _vertexInfluenceMap.get();}
  
         const Skeleton* getSkeleton() const;
         Skeleton* getSkeleton();
+        // will be used by the update callback to init correctly the rig mesh
+        void setSkeleton(Skeleton*);
         
         void setNeedToComputeMatrix(bool state) { _needToComputeMatrix = state;}
         bool getNeedToComputeMatrix() const { return _needToComputeMatrix;}
         
-        void buildVertexSet();
-        void buildTransformer(Skeleton* root);
+
+        // this build the internal database about vertex influence and bones
+        void buildVertexInfluenceSet();
+        const VertexInfluenceSet& getVertexInfluenceSet() const;
+
         void computeMatrixFromRootSkeleton();
 
-        virtual void transformSoftwareMethod();
-        const osgAnimation::VertexInfluenceSet& getVertexInfluenceSet() const { return _vertexInfluenceSet;}
 
-        const std::vector<osg::Vec3>& getPositionSource() const { return _positionSource;}
-        const std::vector<osg::Vec3>& getNormalSource() const { return _normalSource;}
+        // set implementation of rig method
+        void setRigTransformImplementation(RigTransform*);
+        RigTransform* getRigTransformImplementation();
+
+        virtual void drawImplementation(osg::RenderInfo& renderInfo) const;
+        void update();
+
+        const osg::Matrix& getMatrixFromSkeletonToGeometry() const;
+        const osg::Matrix& getInvMatrixFromSkeletonToGeometry() const;
 
     protected:
 
-        std::vector<osg::Vec3> _positionSource;
-        std::vector<osg::Vec3> _normalSource;
+        osg::ref_ptr<RigTransform> _rigTransformImplementation;
 
-        osgAnimation::VertexInfluenceSet _vertexInfluenceSet;
-        osg::ref_ptr<osgAnimation::VertexInfluenceMap> _vertexInfluenceMap;
-        osgAnimation::TransformVertexFunctor _transformVertexes;
+        VertexInfluenceSet _vertexInfluenceSet;
+        osg::ref_ptr<VertexInfluenceMap> _vertexInfluenceMap;
 
         osg::Matrix _matrixFromSkeletonToGeometry;
@@ -67 +75 @@
         osg::observer_ptr<Skeleton> _root;
         bool _needToComputeMatrix;
-
  
         struct FindNearestParentSkeleton : public osg::NodeVisitor
         {
-            osg::ref_ptr<osgAnimation::Skeleton> _root;
+            osg::ref_ptr<Skeleton> _root;
             FindNearestParentSkeleton() : osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_PARENTS) {}
             void apply(osg::Transform& node) 
@@ -99 +106 @@
                     if (!finder._root.valid())
                         return;
-                    geom->buildVertexSet();
-                    geom->buildTransformer(finder._root.get());
+                    geom->buildVertexInfluenceSet();
+                    geom->setSkeleton(finder._root.get());
                 }
 
@@ -108 +115 @@
                 if (geom->getNeedToComputeMatrix())
                     geom->computeMatrixFromRootSkeleton();
-                geom->transformSoftwareMethod();
+
+                geom->update();
             }
         };
-
-        /** BuildVertexTransformerVisitor is used to setup RigGeometry drawable
-         *  throw a subgraph. 
-         */
-        struct BuildVertexTransformerVisitor : public osg::NodeVisitor
-        {
-            osg::ref_ptr<Skeleton> _root;
-            BuildVertexTransformerVisitor(Skeleton* root): osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN) { _root = root;}
-
-            META_NodeVisitor("osgAnimation","BuildVertexTransformerVisitor")
-
-            void apply(osg::Geode& node) 
-            { 
-                int num = node.getNumDrawables();
-                for (int i = 0; i < num; i++) {
-                    RigGeometry* geom = dynamic_cast<RigGeometry*>(node.getDrawable(i));
-                    if (geom) 
-                    {
-                        geom->buildVertexSet();
-                        geom->buildTransformer(_root.get());
-                    }
-                }
-            }
-        };
-
    };
 

OpenSceneGraph/trunk/include/osgAnimation/StatsVisitor

@@ -42 +42 @@
         void apply(Timeline& action);
         void apply(Action& action);
-        void apply(BlendIn& action);
-        void apply(BlendOut& action);
+        void apply(ActionBlendIn& action);
+        void apply(ActionBlendOut& action);
         void apply(ActionAnimation& action);
-        void apply(StripAnimation& action);
+        void apply(ActionStripAnimation& action);
 
     };

OpenSceneGraph/trunk/include/osgAnimation/Timeline

@@ -63 +63 @@
         virtual void addActionAt(double t, Action* action, int priority = 0);
         void addActionNow(Action* action, int priority = 0);
-
+        
         void clearActions();
 

OpenSceneGraph/trunk/include/osgAnimation/VertexInfluence

@@ -13 +13 @@
 */
 
-#ifndef OSGANIMATION_VERTEX_INFLUENCES_H
-#define OSGANIMATION_VERTEX_INFLUENCES_H
+#ifndef OSGANIMATION_VERTEX_INFLUENCE_H
+#define OSGANIMATION_VERTEX_INFLUENCE_H 1
 
 #include <osg/Object>
@@ -38 +38 @@
         std::string _name;
     };
-
-    //  typedef std::map<std::string, VertexInfluence> VertexInfluenceMap;
 
     class VertexInfluenceMap : public std::map<std::string, VertexInfluence> , public osg::Object
@@ -74 +72 @@
         typedef std::map<int,BoneWeightList> VertexIndexToBoneWeightMap;
     
-        class UniqVertexSetToBoneSet 
+        class UniqVertexSetToBoneSet
         {
         public:
@@ -89 +87 @@
 
         const UniqVertexSetToBoneSetList& getUniqVertexSetToBoneSetList() const { return _uniqVertexSetToBoneSet;}
-        void addVertexInfluence(const VertexInfluence& v) { _bone2Vertexes.push_back(v); }
+        void addVertexInfluence(const VertexInfluence& v);
         void buildVertex2BoneList();
         void buildUniqVertexSetToBoneSetList();
-        void clear() 
-        {
-            _bone2Vertexes.clear(); 
-            _uniqVertexSetToBoneSet.clear();
-        }
+        void clear();
 
         const VertexIndexToBoneWeightMap& getVertexToBoneList() const;

OpenSceneGraph/trunk/src/osgAnimation/Action.cpp

@@ -15 +15 @@
 #include <osgAnimation/Action>
 
-osgAnimation::Action::Action()
+using namespace osgAnimation;
+
+Action::Action()
 {
     _numberFrame = 25;
@@ -22 +24 @@
     _loop = 1;
 }
-osgAnimation::Action::Action(const Action&,const osg::CopyOp&) {}
-osgAnimation::Action::Callback* osgAnimation::Action::getFrameCallback(unsigned int frame)
+Action::Action(const Action&,const osg::CopyOp&) {}
+Action::Callback* Action::getFrameCallback(unsigned int frame)
 {
     if (_framesCallback.find(frame) != _framesCallback.end())
@@ -32 +34 @@
 }
 
-osgAnimation::Action::Callback* osgAnimation::Action::getFrameCallback(double time)
+void Action::removeCallback(Callback* cb)
+{
+    std::vector<unsigned int> keyToRemove;
+    for (FrameCallback::iterator it = _framesCallback.begin(); it != _framesCallback.end(); it++) 
+    {
+        if (it->second.get())
+        {
+            if (it->second.get() == cb) 
+            {
+                it->second = it->second->getNestedCallback();
+                if (!it->second.valid())
+                    keyToRemove.push_back(it->first);
+            }
+            else 
+            {
+                it->second->removeCallback(cb);
+            }
+        }
+    }
+    for (std::vector<unsigned int>::iterator it = keyToRemove.begin(); it != keyToRemove.end(); it++)
+        _framesCallback.erase(*it);
+}
+
+Action::Callback* Action::getFrameCallback(double time)
 {
     unsigned int frame = static_cast<unsigned int>(floor(time * _fps));
@@ -57 +82 @@
     return true;
 }
-
-
-osgAnimation::BlendIn::BlendIn(Animation* animation, double duration, double weight)
-{
-    _animation = animation;
-    _weight = weight;
-    float d = duration * _fps;
-    setNumFrames(static_cast<unsigned int>(floor(d)) + 1);
-    setName("BlendIn");
-}
-
-void osgAnimation::BlendIn::computeWeight(unsigned int frame)
-{
-
-    // frame + 1 because the start is 0 and we want to start the blend in at the first
-    // frame.
-    double ratio = ( (frame+1) * 1.0 / (getNumFrames()) );
-    double w = _weight * ratio;
-
-    osg::notify(osg::DEBUG_INFO) << getName() << " BlendIn frame " << frame  << " weight " << w << std::endl;
-    _animation->setWeight(w);
-}
-
-
-osgAnimation::BlendOut::BlendOut(Animation* animation, double duration)
-{
-    _animation = animation;
-    float d = duration * _fps;
-    setNumFrames(static_cast<unsigned int>(floor(d) + 1));
-    _weight = 1.0;
-    setName("BlendOut");
-}
-
-void osgAnimation::BlendOut::computeWeight(unsigned int frame)
-{
-    double ratio = ( (frame+1) * 1.0 / (getNumFrames()) );
-    double w = _weight * (1.0-ratio);
-    osg::notify(osg::DEBUG_INFO) << getName() << " BlendOut frame " << frame  << " weight " << w << std::endl;
-    _animation->setWeight(w);
-}
-
-
-osgAnimation::ActionAnimation::ActionAnimation(Animation* animation) : _animation(animation)
-{
-    Action::setDuration(animation->getDuration());
-    setName(animation->getName());
-}
-void osgAnimation::ActionAnimation::updateAnimation(unsigned int frame, int priority)
-{
-    _animation->update(frame * 1.0/_fps, priority);
-}
-
-
-
-
-
-osgAnimation::StripAnimation::StripAnimation(const StripAnimation& a, const osg::CopyOp& c) : Action(a,c) 
-{
-    _animation = a._animation;
-    _blendIn = a._blendIn;
-    _blendOut = a._blendOut;
-}
-
-osgAnimation::StripAnimation::StripAnimation(Animation* animation, double blendInDuration, double blendOutDuration, double blendInWeightTarget)
-{
-    _blendIn = new BlendIn(animation, blendInDuration, blendInWeightTarget);
-    _animation = new ActionAnimation(animation);
-    unsigned int start = static_cast<unsigned int>(floor((_animation->getDuration() - blendOutDuration) * _fps));
-    _blendOut = FrameBlendOut(start, new BlendOut(animation, blendOutDuration));
-    setName(animation->getName() + "_Strip");
-    _blendIn->setName(_animation->getName() + "_" + _blendIn->getName());
-    _blendOut.second->setName(_animation->getName() + "_" + _blendOut.second->getName());
-    setDuration(animation->getDuration());
-}
-
-
-void osgAnimation::StripAnimation::setLoop(unsigned int loop)
-{
-    _animation->setLoop(loop);
-    if (!loop)
-        setDuration(-1);
-    else
-        setDuration(loop * _animation->getDuration());
-
-    // duration changed re evaluate the blendout duration
-    unsigned int start = static_cast<unsigned int>(floor((getDuration() - _blendOut.second->getDuration()) * _fps));
-    _blendOut = FrameBlendOut(start, _blendOut.second);
-}
-
-void osgAnimation::StripAnimation::traverse(ActionVisitor& visitor)
-{
-    if (_blendIn.valid())
-    {
-        unsigned int f = visitor.getStackedFrameAction().back().first;
-        visitor.pushFrameActionOnStack(FrameAction(f,_blendIn.get()));
-        _blendIn->accept(visitor);
-        visitor.popFrameAction();
-    }
-    if (_blendOut.second.valid())
-    {
-        unsigned int f = visitor.getStackedFrameAction().back().first;
-        visitor.pushFrameActionOnStack(FrameAction(f + _blendOut.first,_blendOut.second.get()));
-        _blendOut.second.get()->accept(visitor);
-        visitor.popFrameAction();
-    }
-
-    if (_animation.valid())
-    {
-        unsigned int f = visitor.getStackedFrameAction().back().first;
-        visitor.pushFrameActionOnStack(FrameAction(f,_animation.get()));
-        _animation->accept(visitor);
-        visitor.popFrameAction();
-    }
-}

OpenSceneGraph/trunk/src/osgAnimation/ActionVisitor.cpp

@@ -14 +14 @@
 
 #include <osgAnimation/Action>
+#include <osgAnimation/ActionBlendIn>
+#include <osgAnimation/ActionBlendOut>
+#include <osgAnimation/ActionStripAnimation>
+#include <osgAnimation/ActionAnimation>
 #include <osgAnimation/ActionVisitor>
 #include <osgAnimation/Timeline>
 
-osgAnimation::ActionVisitor::ActionVisitor()
+using namespace osgAnimation;
+
+ActionVisitor::ActionVisitor()
 {
     _currentLayer = 0;
 }
-void osgAnimation::ActionVisitor::pushFrameActionOnStack(const FrameAction& fa) { _stackFrameAction.push_back(fa); }
-void osgAnimation::ActionVisitor::popFrameAction() { _stackFrameAction.pop_back(); }
-void osgAnimation::ActionVisitor::pushTimelineOnStack(Timeline* tm) { _stackTimeline.push_back(tm); }
-void osgAnimation::ActionVisitor::popTimeline() { _stackTimeline.pop_back(); }
-void osgAnimation::ActionVisitor::apply(Action& action) { traverse(action); }
-void osgAnimation::ActionVisitor::apply(Timeline& tm) { tm.traverse(*this); }
-void osgAnimation::ActionVisitor::apply(BlendIn& action) { apply(static_cast<Action&>(action));}
-void osgAnimation::ActionVisitor::apply(BlendOut& action) { apply(static_cast<Action&>(action)); }
-void osgAnimation::ActionVisitor::apply(ActionAnimation& action) { apply(static_cast<Action&>(action)); }
-void osgAnimation::ActionVisitor::apply(StripAnimation& action) { apply(static_cast<Action&>(action)); }
-void osgAnimation::ActionVisitor::traverse(Action& action)
+void ActionVisitor::pushFrameActionOnStack(const FrameAction& fa) { _stackFrameAction.push_back(fa); }
+void ActionVisitor::popFrameAction() { _stackFrameAction.pop_back(); }
+void ActionVisitor::pushTimelineOnStack(Timeline* tm) { _stackTimeline.push_back(tm); }
+void ActionVisitor::popTimeline() { _stackTimeline.pop_back(); }
+void ActionVisitor::apply(Action& action) { traverse(action); }
+void ActionVisitor::apply(Timeline& tm) { tm.traverse(*this); }
+void ActionVisitor::apply(ActionBlendIn& action) { apply(static_cast<Action&>(action));}
+void ActionVisitor::apply(ActionBlendOut& action) { apply(static_cast<Action&>(action)); }
+void ActionVisitor::apply(ActionAnimation& action) { apply(static_cast<Action&>(action)); }
+void ActionVisitor::apply(ActionStripAnimation& action) { apply(static_cast<Action&>(action)); }
+void ActionVisitor::traverse(Action& action)
 {
     action.traverse(*this);
 }
 
-osgAnimation::Timeline* osgAnimation::ActionVisitor::getCurrentTimeline()
+Timeline* ActionVisitor::getCurrentTimeline()
 {
     if (_stackTimeline.empty())
@@ -43 +49 @@
 }
 
-osgAnimation::UpdateActionVisitor::UpdateActionVisitor() { _frame = 0; }
+UpdateActionVisitor::UpdateActionVisitor() 
+{
+    _frame = 0; 
+    _currentAnimationPriority = 0;
+}
 
 
-void osgAnimation::UpdateActionVisitor::apply(Timeline& tm)
+void UpdateActionVisitor::apply(Timeline& tm)
 {
+    _currentAnimationPriority = 0;
+
     tm.setEvaluating(true);
 
@@ -57 +69 @@
 }
 
-bool osgAnimation::UpdateActionVisitor::isActive(Action& action) const
+bool UpdateActionVisitor::isActive(Action& action) const
 {
     FrameAction fa = _stackFrameAction.back();
@@ -71 +83 @@
 }
 
-unsigned int osgAnimation::UpdateActionVisitor::getLocalFrame() const
+unsigned int UpdateActionVisitor::getLocalFrame() const
 {
     return _frame - _stackFrameAction.back().first;
 }
 
-void osgAnimation::UpdateActionVisitor::apply(Action& action)
+void UpdateActionVisitor::apply(Action& action)
 {
     if (isActive(action))
@@ -103 +115 @@
 }
 
-void osgAnimation::UpdateActionVisitor::apply(BlendIn& action)
+void UpdateActionVisitor::apply(ActionBlendIn& action)
 {
     if (isActive(action)) 
@@ -113 +125 @@
 }
 
-void osgAnimation::UpdateActionVisitor::apply(BlendOut& action)
+void UpdateActionVisitor::apply(ActionBlendOut& action)
 {
     if (isActive(action)) 
@@ -123 +135 @@
 }
 
-void osgAnimation::UpdateActionVisitor::apply(ActionAnimation& action)
+void UpdateActionVisitor::apply(ActionAnimation& action)
 {
-    if (isActive(action)) 
+    if (isActive(action))
     {
         unsigned int frame = getLocalFrame();
         apply(static_cast<Action&>(action));
-        action.updateAnimation(frame, getCurrentLayer());
+//        action.updateAnimation(frame, getCurrentLayer());
+        action.updateAnimation(frame, -_currentAnimationPriority++);
     }
 }
 
-void osgAnimation::UpdateActionVisitor::apply(StripAnimation& action)
+void UpdateActionVisitor::apply(ActionStripAnimation& action)
 {
     if (isActive(action))
@@ -144 +157 @@
 
 
-osgAnimation::ClearActionVisitor::ClearActionVisitor(ClearType type) : _clearType(type)
+ClearActionVisitor::ClearActionVisitor(ClearType type) : _clearType(type)
 {
 }
 
-void osgAnimation::ClearActionVisitor::apply(Timeline& tm)
+void ClearActionVisitor::apply(Timeline& tm)
 {
     _remove.clear();
@@ -155 +168 @@
         tm.removeAction(_remove[i].get());
 }
-void osgAnimation::ClearActionVisitor::apply(Action& action)
+void ClearActionVisitor::apply(Action& action)
 {
     FrameAction fa = _stackFrameAction.back();

OpenSceneGraph/trunk/src/osgAnimation/Bone.cpp

@@ -13 +13 @@
 */
 
-#include <osgAnimation/Skinning>
 #include <osgAnimation/Bone>
 #include <osgAnimation/Skeleton>

OpenSceneGraph/trunk/src/osgAnimation/CMakeLists.txt

@@ -12 +12 @@
 SET(LIB_PUBLIC_HEADERS
     ${HEADER_PATH}/Action
+    ${HEADER_PATH}/ActionAnimation
+    ${HEADER_PATH}/ActionBlendIn
+    ${HEADER_PATH}/ActionBlendOut
     ${HEADER_PATH}/ActionCallback
+    ${HEADER_PATH}/ActionStripAnimation
     ${HEADER_PATH}/ActionVisitor
     ${HEADER_PATH}/Animation
@@ -32 +36 @@
     ${HEADER_PATH}/MorphGeometry
     ${HEADER_PATH}/RigGeometry
+    ${HEADER_PATH}/RigTransform
+    ${HEADER_PATH}/RigTransformHardware
+    ${HEADER_PATH}/RigTransformSoftware
     ${HEADER_PATH}/Sampler
     ${HEADER_PATH}/Skeleton
-    ${HEADER_PATH}/Skinning
     ${HEADER_PATH}/StatsVisitor
     ${HEADER_PATH}/StatsHandler
@@ -50 +56 @@
     ${LIB_PUBLIC_HEADERS}
     Action.cpp
+    ActionAnimation.cpp
+    ActionBlendIn.cpp
+    ActionBlendOut.cpp
     ActionCallback.cpp
+    ActionStripAnimation.cpp
     ActionVisitor.cpp
     Animation.cpp
@@ -62 +72 @@
     MorphGeometry.cpp
     RigGeometry.cpp
+    RigTransformHardware.cpp
+    RigTransformSoftware.cpp
     Skeleton.cpp
     StatsVisitor.cpp

OpenSceneGraph/trunk/src/osgAnimation/RigGeometry.cpp

@@ -1 +1 @@
 /*  -*-c++-*- 
- *  Copyright (C) 2008 Cedric Pinson <mornifle@plopbyte.net>
+ *  Copyright (C) 2008 Cedric Pinson <cedric.pinson@plopbyte.net>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
+ * This library is open source and may be redistributed and/or modified under  
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
+ * (at your option) any later version.  The full license is in LICENSE file
+ * included with this distribution, and on the openscenegraph.org website.
+ * 
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * Authors:
- * 
- * Cedric Pinson <mornifle@plopbyte.net>
- *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * OpenSceneGraph Public License for more details.
  */
+
 #include <osgAnimation/RigGeometry>
+#include <osgAnimation/RigTransformSoftware>
+#include <sstream>
+#include <osg/GL2Extensions>
 
 using namespace osgAnimation;
@@ -27 +22 @@
 RigGeometry::RigGeometry()
 {
-    setUseDisplayList(false);
+    _supportsDisplayList = false;
+    setUseVertexBufferObjects(true);
     setUpdateCallback(new UpdateVertex);
     setDataVariance(osg::Object::DYNAMIC);
     _needToComputeMatrix = true;
     _matrixFromSkeletonToGeometry = _invMatrixFromSkeletonToGeometry = osg::Matrix::identity();
+
+    // disable the computation of boundingbox for the rig mesh
+    setComputeBoundingBoxCallback(new ComputeBoundingBoxCallback);
 }
 
 RigGeometry::RigGeometry(const osg::Geometry& b) : osg::Geometry(b, osg::CopyOp::SHALLOW_COPY)
 {
-    setUseDisplayList(false);
+    _supportsDisplayList = false;
+    setUseVertexBufferObjects(true);
     setUpdateCallback(new UpdateVertex);
     setDataVariance(osg::Object::DYNAMIC);
     _needToComputeMatrix = true;
     _matrixFromSkeletonToGeometry = _invMatrixFromSkeletonToGeometry = osg::Matrix::identity();
+
+    // disable the computation of boundingbox for the rig mesh
+    setComputeBoundingBoxCallback(new ComputeBoundingBoxCallback);
 }
 
-RigGeometry::RigGeometry(const RigGeometry& b, const osg::CopyOp& copyop) : 
+RigGeometry::RigGeometry(const RigGeometry& b, const osg::CopyOp& copyop) :
     osg::Geometry(b,copyop),
-    _positionSource(b._positionSource),
-    _normalSource(b._normalSource),
     _vertexInfluenceSet(b._vertexInfluenceSet),
     _vertexInfluenceMap(b._vertexInfluenceMap),
-    _transformVertexes(b._transformVertexes),
-    _needToComputeMatrix(b._needToComputeMatrix) 
+    _needToComputeMatrix(b._needToComputeMatrix)
 {
+    // we dont copy the RigImplementation yet. because the RigImplementation need to be initialized in a valid graph, with a skeleton ...
+    // dont know yet what to do with a clone of a RigGeometry
 }
 
-void RigGeometry::buildTransformer(Skeleton* root)
+
+const osg::Matrix& RigGeometry::getMatrixFromSkeletonToGeometry() const { return _matrixFromSkeletonToGeometry; }
+const osg::Matrix& RigGeometry::getInvMatrixFromSkeletonToGeometry() const { return _invMatrixFromSkeletonToGeometry;}
+
+
+void RigGeometry::drawImplementation(osg::RenderInfo& renderInfo) const
 {
-    Bone::BoneMap bm = root->getBoneMap();
-    _transformVertexes.init(bm, _vertexInfluenceSet.getUniqVertexSetToBoneSetList());
-    _root = root;
+    osg::Geometry::drawImplementation(renderInfo);
 }
 
-void RigGeometry::buildVertexSet() 
+void RigGeometry::buildVertexInfluenceSet()
 {
-    if (!_vertexInfluenceMap.valid()) 
+    if (!_vertexInfluenceMap.valid())
     {
-        osg::notify(osg::WARN) << "buildVertexSet can't be called without VertexInfluence already set to the RigGeometry ( " << getName() << " ) " << std::endl;
+        osg::notify(osg::WARN) << "buildVertexInfluenceSet can't be called without VertexInfluence already set to the RigGeometry ( " << getName() << " ) " << std::endl;
         return;
     }
@@ -76 +81 @@
     _vertexInfluenceSet.buildVertex2BoneList();
     _vertexInfluenceSet.buildUniqVertexSetToBoneSetList();
-    std::cout << "uniq groups " << _vertexInfluenceSet.getUniqVertexSetToBoneSetList().size() << " for " << getName() << std::endl;
+    osg::notify(osg::NOTICE) << "uniq groups " << _vertexInfluenceSet.getUniqVertexSetToBoneSetList().size() << " for " << getName() << std::endl;
 }
 
-void RigGeometry::computeMatrixFromRootSkeleton() 
+void RigGeometry::computeMatrixFromRootSkeleton()
 {
-    if (!_root.valid()) 
+    if (!_root.valid())
     {
         osg::notify(osg::WARN) << "Warning " << className() <<"::computeMatrixFromRootSkeleton if you have this message it means you miss to call buildTransformer(Skeleton* root), or your RigGeometry (" << getName() <<") is not attached to a Skeleton subgraph" << std::endl;
@@ -92 +97 @@
 }
 
-void RigGeometry::transformSoftwareMethod()
+void RigGeometry::update()
 {
-    setUseDisplayList(false);
-    setUseVertexBufferObjects(true);
-
-    //    std::cout << getName() << " _matrixFromSkeletonToGeometry" << _matrixFromSkeletonToGeometry << std::endl;
-    osg::Vec3Array* pos = dynamic_cast<osg::Vec3Array*>(getVertexArray());
-    if (pos && _positionSource.size() != pos->size()) 
+    if (!getRigTransformImplementation())
     {
-        _positionSource = std::vector<osg::Vec3>(pos->begin(),pos->end());
-        getVertexArray()->setDataVariance(osg::Object::DYNAMIC);
-    }
-    osg::Vec3Array* normal = dynamic_cast<osg::Vec3Array*>(getNormalArray());
-    if (normal && _normalSource.size() != normal->size()) 
-    {
-        _normalSource = std::vector<osg::Vec3>(normal->begin(),normal->end());
-        getNormalArray()->setDataVariance(osg::Object::DYNAMIC);
+        _rigTransformImplementation = new RigTransformSoftware;
     }
 
-    if (!_positionSource.empty()) 
-    {
-        _transformVertexes.compute<osg::Vec3>(_matrixFromSkeletonToGeometry, _invMatrixFromSkeletonToGeometry,  &_positionSource.front(), &pos->front());
-        pos->dirty();
-    }
-    if (!_normalSource.empty()) 
-    {
-        _transformVertexes.computeNormal<osg::Vec3>(_matrixFromSkeletonToGeometry, _invMatrixFromSkeletonToGeometry, &_normalSource.front(), &normal->front());
-        normal->dirty();
-    }
-    if (getUseDisplayList())
-        dirtyDisplayList();
-    dirtyBound();
+    if (getRigTransformImplementation()->needInit())
+        if (!getRigTransformImplementation()->init(*this))
+            return;
+    getRigTransformImplementation()->update(*this);
 }
 
-const osgAnimation::Skeleton* RigGeometry::getSkeleton() const { return _root.get(); }
-osgAnimation::Skeleton* RigGeometry::getSkeleton() { return _root.get(); }
+const VertexInfluenceSet& RigGeometry::getVertexInfluenceSet() const { return _vertexInfluenceSet;}
+
+const Skeleton* RigGeometry::getSkeleton() const { return _root.get(); }
+Skeleton* RigGeometry::getSkeleton() { return _root.get(); }
+void RigGeometry::setSkeleton(Skeleton* root) { _root = root;}
+RigTransform* RigGeometry::getRigTransformImplementation() { return _rigTransformImplementation.get(); }
+void RigGeometry::setRigTransformImplementation(RigTransform* rig) { _rigTransformImplementation = rig; }

OpenSceneGraph/trunk/src/osgAnimation/StatsVisitor.cpp

@@ -15 +15 @@
 #include <osgAnimation/StatsVisitor>
 #include <osgAnimation/Timeline>
+#include <osgAnimation/ActionBlendIn>
+#include <osgAnimation/ActionBlendOut>
+#include <osgAnimation/ActionStripAnimation>
+#include <osgAnimation/ActionAnimation>
 
-osgAnimation::StatsActionVisitor::StatsActionVisitor() {}
-void osgAnimation::StatsActionVisitor::reset() { _channels.clear(); }
+using namespace osgAnimation;
 
-osgAnimation::StatsActionVisitor::StatsActionVisitor(osg::Stats* stats,unsigned int frame)
+StatsActionVisitor::StatsActionVisitor() {}
+void StatsActionVisitor::reset() { _channels.clear(); }
+
+StatsActionVisitor::StatsActionVisitor(osg::Stats* stats,unsigned int frame)
 {
     _frame = frame;
@@ -25 +31 @@
 }
 
-void osgAnimation::StatsActionVisitor::apply(Timeline& tm)
+void StatsActionVisitor::apply(Timeline& tm)
 {
     _stats->setAttribute(_frame,"Timeline", tm.getCurrentTime());
@@ -31 +37 @@
 }
 
-void osgAnimation::StatsActionVisitor::apply(Action& action)
+void StatsActionVisitor::apply(Action& action)
 {
     if (isActive(action))
@@ -40 +46 @@
 }
 
-void osgAnimation::StatsActionVisitor::apply(BlendIn& action)
+void StatsActionVisitor::apply(ActionBlendIn& action)
 {
     if (isActive(action)) 
@@ -49 +55 @@
 }
 
-void osgAnimation::StatsActionVisitor::apply(BlendOut& action)
+void StatsActionVisitor::apply(ActionBlendOut& action)
 {
     if (isActive(action)) 
@@ -58 +64 @@
 }
 
-void osgAnimation::StatsActionVisitor::apply(ActionAnimation& action)
+void StatsActionVisitor::apply(ActionAnimation& action)
 {
     if (isActive(action)) 
@@ -67 +73 @@
 }
 
-void osgAnimation::StatsActionVisitor::apply(StripAnimation& action)
+void StatsActionVisitor::apply(ActionStripAnimation& action)
 {
     if (isActive(action))
     {
         _channels.push_back(action.getName());
-        _stats->setAttribute(_frame,action.getName(), action.getActionAnimation()->getAnimation()->getWeight());
+        _stats->setAttribute(_frame,action.getName(), action.getAnimation()->getAnimation()->getWeight());
     }
 }

OpenSceneGraph/trunk/src/osgAnimation/VertexInfluence.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  
@@ -11 +11 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
  * OpenSceneGraph Public License for more details.
-*/
+ */
 
 #include <osgAnimation/VertexInfluence>
@@ -20 +20 @@
 using namespace osgAnimation;
 
-const osgAnimation::VertexInfluenceSet::VertexIndexToBoneWeightMap& osgAnimation::VertexInfluenceSet::getVertexToBoneList() const { return _vertex2Bones;}
+void VertexInfluenceSet::addVertexInfluence(const VertexInfluence& v) { _bone2Vertexes.push_back(v); }
+const VertexInfluenceSet::VertexIndexToBoneWeightMap& VertexInfluenceSet::getVertexToBoneList() const { return _vertex2Bones;}
 // this class manage VertexInfluence database by mesh
 // reference bones per vertex ...
-void osgAnimation::VertexInfluenceSet::buildVertex2BoneList()
+void VertexInfluenceSet::buildVertex2BoneList()
 {
     _vertex2Bones.clear();
@@ -36 +37 @@
             float weight = viw.second;
             if (vi.getName().empty())
-                osg::notify(osg::WARN) << "osgAnimation::VertexInfluenceSet::buildVertex2BoneList warning vertex " << index << " is not assigned to a bone" << std::endl;
+                osg::notify(osg::WARN) << "VertexInfluenceSet::buildVertex2BoneList warning vertex " << index << " is not assigned to a bone" << std::endl;
             _vertex2Bones[index].push_back(BoneWeight(vi.getName(), weight));
         }
@@ -65 +66 @@
 
 // sort by name and weight
-struct SortByNameAndWeight : public std::less<osgAnimation::VertexInfluenceSet::BoneWeight>
+struct SortByNameAndWeight : public std::less<VertexInfluenceSet::BoneWeight>
 {
-    bool operator()(const osgAnimation::VertexInfluenceSet::BoneWeight& b0, 
-                    const osgAnimation::VertexInfluenceSet::BoneWeight& b1) const 
+    bool operator()(const VertexInfluenceSet::BoneWeight& b0, 
+                    const VertexInfluenceSet::BoneWeight& b1) const 
     {
         if (b0.getBoneName() < b1.getBoneName())
@@ -80 +81 @@
 };
 
-struct SortByBoneWeightList : public std::less<osgAnimation::VertexInfluenceSet::BoneWeightList>
+struct SortByBoneWeightList : public std::less<VertexInfluenceSet::BoneWeightList>
 {
-    bool operator()(const osgAnimation::VertexInfluenceSet::BoneWeightList& b0, 
-                    const osgAnimation::VertexInfluenceSet::BoneWeightList& b1) const 
+    bool operator()(const VertexInfluenceSet::BoneWeightList& b0, 
+                    const VertexInfluenceSet::BoneWeightList& b1) const 
     {
         if (b0.size() < b1.size())
@@ -103 +104 @@
 };
 
-void osgAnimation::VertexInfluenceSet::buildUniqVertexSetToBoneSetList()
+void VertexInfluenceSet::clear()
+{
+    _bone2Vertexes.clear(); 
+    _uniqVertexSetToBoneSet.clear();
+}
+
+void VertexInfluenceSet::buildUniqVertexSetToBoneSetList()
 {
     _uniqVertexSetToBoneSet.clear();
@@ -131 +138 @@
     }
 }
+