Changeset 10556

Timestamp:

08/26/09 11:24:02 (4 years ago)

Author:

cedricpinson

Message:

From Michael Platings,
- Animations with equal priority are now weighted correctly relative to each other
- (minor) Channels no longer store their weight as the only time it's used is in update() when Animation can pass in the weight directly
From Cedric Pinson,
- I adjusted the quaternion blending to keep the commutativy property

Location:

OpenSceneGraph/trunk

Files:

• include/osgAnimation/Animation (modified) (2 diffs)
• include/osgAnimation/Channel (modified) (4 diffs)
• include/osgAnimation/Target (modified) (3 diffs)
• src/osgAnimation/Animation.cpp (modified) (3 diffs)
• src/osgAnimation/BasicAnimationManager.cpp (modified) (2 diffs)
• src/osgAnimation/Channel.cpp (modified) (3 diffs)
• src/osgAnimation/MorphGeometry.cpp (modified) (2 diffs)
• src/osgAnimation/Target.cpp (modified) (2 diffs)
• src/osgPlugins/osgAnimation/ReaderWriter.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/include/osgAnimation/Animation

@@ -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  
@@ -72 +72 @@
         float getWeight() const;
 
-        bool update (float time);
+        bool update (float time, int priority = 0);
         void resetTargets();
 

OpenSceneGraph/trunk/include/osgAnimation/Channel

@@ -38 +38 @@
         virtual Channel* clone() const = 0;
 
-        virtual void update(float time) = 0;
+        virtual void update(float time, float weight, int priority) = 0;
         virtual void reset() = 0;
         virtual Target* getTarget() = 0;
@@ -52 +52 @@
         void setTargetName(const std::string& name);
 
-        float getWeight() const;
-        void setWeight(float w);
-
         virtual Sampler* getSampler() = 0;
         virtual const Sampler* getSampler() const = 0;
@@ -62 +59 @@
         std::string _targetName;
         std::string _name;
-        float _weight;
     };
 
@@ -93 +89 @@
 
         virtual ~TemplateChannel() {}
-        virtual void update(float time) 
+        virtual void update(float time, float weight, int priority) 
         {
             // skip if weight == 0
-            if (_weight < 1e-4)
+            if (weight < 1e-4)
                 return;
             typename SamplerType::UsingType value;
             _sampler->getValueAt(time, value);
-            _target->update(_weight, value);
+            _target->update(weight, value, priority);
         }
         virtual void reset() { _target->reset(); }

OpenSceneGraph/trunk/include/osgAnimation/Target

@@ -37 +37 @@
         virtual ~Target();
         virtual void normalize() = 0;
+        void reset() { _weight = 0; _priorityWeight = 0; }
+        int getCount() const { return referenceCount(); }
         float getWeight() const { return _weight; }
-        void reset() { _weight = 0;}
-        int getCount() const { return referenceCount(); }
     protected:
-
-        void addWeight(float w) { _weight += w; }
         float _weight;
+        float _priorityWeight;
+        int _lastPriority;
     };
 
@@ -55 +55 @@
         TemplateTarget(const T& v) { setValue(v); }
 
-        void update(float weight, const T& val)
+        inline void lerp(float t, const T& a, const T& b);
+
+        /**
+         *  The priority is used to detect a change of priority
+         *  It's important to update animation target in priority
+         *  order. eg:
+         *  all animation with priority 1
+         *  all animation with priority 0
+         *  all animation with priority -1
+         *  ...
+         */
+        void update(float weight, const T& val, int priority)
         {
-            if (!_weight)
-                _target = val * weight;
+            if (_weight || _priorityWeight)
+            {
+                if (_lastPriority != priority)
+                {
+                    // change in priority
+                    // add to weight with the same previous priority cumulated weight
+                    _weight += _priorityWeight * (1.0 - _weight);
+                    _priorityWeight = 0;
+                    _lastPriority = priority;
+                }
+
+                _priorityWeight += weight;
+                float t = (1.0 - _weight) * weight / _priorityWeight;
+                lerp(t, _target, val);
+            }
             else
             {
-                weight = (1.0 - _weight) * weight;
-                _target += val * weight;
+                _priorityWeight = weight;
+                _lastPriority = priority;
+                _target = val;
             }
-            addWeight(weight);
         }
-        const T& getValue() const { return _target;}
+        const T& getValue() const { return _target; }
 
-        void normalize()
-        {
-            float weightSummed = getWeight();
-            if (fabs(weightSummed) < 1e-4 || fabs(weightSummed-1) < 1e-4)
-                return;
-            (_target) /= weightSummed;
-        }
+        inline void normalize();
 
-        void setValue(const T& value) { _target = value;}
+        void setValue(const T& value) { _target = value; }
 
     protected:
@@ -83 +101 @@
     };
 
+    template <class T>
+    inline void TemplateTarget<T>::normalize()
+    {
+        _weight += _priorityWeight * (1.0f - _weight);
+        if (_weight < 0.9999f )
+            if (_weight > 0.0001f)
+                _target /= _weight; // rescale by default
+    }
 
-    // Target Specialisation for Quaternions
+    template <class T>
+    inline void TemplateTarget<T>::lerp(float t, const T& a, const T& b)
+    {
+        _target = a * (1.0f - t) + b * t;
+    }
+
     template <>
-    class TemplateTarget< osg::Quat > : public Target
+    inline void TemplateTarget<osg::Quat>::lerp(float t, const osg::Quat& a, const osg::Quat& b)
     {
-    public:
-            
-        TemplateTarget () {}
-        TemplateTarget (const osg::Quat& q) { setValue(q); }
-
-        const osg::Quat& getValue() const { return _target;}
-        void update(float weight, const osg::Quat& val) 
-        { 
-            if (!_weight)
-                _target = val * weight;
-            else
+        _target = a * (1.0f - t) + b * t;
+        osg::Quat::value_type len2 = _target.length2();
+        if ( len2 != 1.0 && len2 != 0.0) 
+            _target *= 1.0/sqrt(len2);
+    }
+    template <>
+    inline void TemplateTarget<osg::Quat>::normalize()
+    {
+        _weight += _priorityWeight * (1.0f - _weight);
+        if (_weight < 0.9999f )
+            if (_weight > 0.0001f)
             {
-                weight = (1.0 - _weight) * weight;
-                _target += val * weight;
+                osg::Quat::value_type len2 = _target.length2(); // normalize
+                if ( len2 != 1.0 && len2 != 0.0)
+                    _target *= 1.0/sqrt(len2);
             }
-            addWeight(weight);
-        }
-
-        // maybe normalize could be non virtual and put on ITarget
-        void normalize() 
-        {
-            float weightSummed = getWeight();
-            if (fabs(weightSummed) < 1e-4 || fabs(weightSummed-1.0) < 1e-4)
-                return;
-            (_target) /= weightSummed;
-        }
-
-        void setValue(const osg::Quat& value) { _target = value;}
- 
-    protected:
-
-        osg::Quat _target;
-    };
+    }
   
     typedef TemplateTarget<osg::Quat> QuatTarget;

OpenSceneGraph/trunk/src/osgAnimation/Animation.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  
@@ -96 +96 @@
 }
 
-bool Animation::update (float time)
+bool Animation::update (float time, int priority)
 {
     if (!_duration) // if not initialized then do it
@@ -139 +139 @@
     for( chan=_channels.begin(); chan!=_channels.end(); ++chan)
     {
-        (*chan)->setWeight(_weight);
-        (*chan)->update(t);
+        (*chan)->update(t, _weight, priority);
     }
     return true;

OpenSceneGraph/trunk/src/osgAnimation/BasicAnimationManager.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  
@@ -91 +91 @@
         // update all animation
         std::vector<int> toremove;
+        int priority = iterAnim->first;
         AnimationList& list = iterAnim->second;
         for (unsigned int i = 0; i < list.size(); i++)
         {
-            if (! list[i]->update(time)) 
+            if (! list[i]->update(time, priority)) 
             {
                 // debug

OpenSceneGraph/trunk/src/osgAnimation/Channel.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 @@
 using namespace osgAnimation;
 
-Channel::Channel() { _weight=1; }
+Channel::Channel() {}
 Channel::~Channel() {}
 Channel::Channel(const Channel& channel) : osg::Referenced(channel),
                                            _targetName(channel._targetName),
-                                           _name(channel._name),
-                                           _weight(channel._weight)
+                                           _name(channel._name)
 {
 }
@@ -30 +29 @@
 const std::string& Channel::getTargetName() const { return _targetName;}
 void Channel::setTargetName (const std::string& name) { _targetName = name; }
-
-float Channel::getWeight() const { return _weight;}
-void Channel::setWeight(float w) { _weight = w;}
-

OpenSceneGraph/trunk/src/osgAnimation/MorphGeometry.cpp

@@ -203 +203 @@
 }
 
-UpdateMorph::UpdateMorph(const UpdateMorph& apc,const osg::CopyOp& copyop) : AnimationUpdateCallback<osg::NodeCallback>(apc, copyop)
+UpdateMorph::UpdateMorph(const UpdateMorph& apc,const osg::CopyOp& copyop) : 
+    osg::Object(apc, copyop),
+    AnimationUpdateCallback<osg::NodeCallback>(apc, copyop)
 {
 }
@@ -272 +274 @@
     else
   {
-      std::cerr << "Channel " << channel->getName() << " does not contain a valid symbolic name for this class" << std::endl;
+      osg::notify(osg::WARN) << "Channel " << channel->getName() << " does not contain a valid symbolic name for this class" << std::endl;
   }
   return false;

OpenSceneGraph/trunk/src/osgAnimation/Target.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  
@@ -19 +19 @@
 using namespace osgAnimation;
 
-Target::Target() { reset();}
+Target::Target() : _weight(0), _priorityWeight(0), _lastPriority(0) {}
 Target::~Target() {}

OpenSceneGraph/trunk/src/osgPlugins/osgAnimation/ReaderWriter.cpp

@@ -147 +147 @@
     pChannel->setTargetName(target);
 
+// we dont need this info
     float weight = 1.0;
     if (fr.matchSequence("weight %f")) 
@@ -154 +155 @@
         iteratorAdvanced = true;
     }
-    pChannel->setWeight(weight);
+//    pChannel->setWeight(weight);
     return iteratorAdvanced;
 }
@@ -547 +548 @@
     fw.indent() << "target \"" << pChannel->getTargetName() << "\"" << std::endl;
 
-    fw.indent() << "weight " << pChannel->getWeight() << std::endl;
+//    fw.indent() << "weight " << pChannel->getWeight() << std::endl;
 
     ContainerType* kfc  = pChannel->getSamplerTyped()->getKeyframeContainerTyped();