Changeset 10576

Timestamp:

09/09/09 11:52:54 (4 years ago)

Author:

cedricpinson

Message:

From Michael Platings, I have removed Target::normalize() as calling it was incorrect - the interpolation is already done in such a way that the Target's value is always normalized.
Finally, I have fixed TemplateTarget?<osg::Quat>::lerp() as it was giving incorrect results when interpolating between some small rotations.
From Cedric Pinson, i renamed the method in channel to be more general. Adjusted the CubicBezier? key constructor to use a single value as input.

Location:

OpenSceneGraph/trunk

Files:

• include/osgAnimation/AnimationManagerBase (modified) (1 diff)
• include/osgAnimation/Channel (modified) (4 diffs)
• include/osgAnimation/CubicBezier (modified) (2 diffs)
• include/osgAnimation/Target (modified) (5 diffs)
• src/osgAnimation/AnimationManagerBase.cpp (modified) (1 diff)
• src/osgAnimation/BasicAnimationManager.cpp (modified) (1 diff)
• src/osgAnimation/CMakeLists.txt (modified) (1 diff)
• src/osgAnimation/TimelineAnimationManager.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/include/osgAnimation/AnimationManagerBase

@@ -47 +47 @@
         /// Operation that must be done each frame
         void clearTargets();
-        void normalizeTargets();
 
         LinkVisitor* getOrCreateLinkVisitor();

OpenSceneGraph/trunk/include/osgAnimation/Channel

@@ -55 +55 @@
         virtual const Sampler* getSampler() const = 0;
 
+        // create a keyframe container from current target value
+        // with one key only, can be used for debug or to create
+        // easily a default channel from an existing one
+        virtual bool createKeyframeContainerFromTargetValue() = 0;
+
     protected:
     
@@ -72 +77 @@
         Channel* clone() const { return new TemplateChannel<SamplerType>(*this); }
 
-        TemplateChannel (const TemplateChannel& channel) : 
+        TemplateChannel (const TemplateChannel& channel) :
             Channel(channel),
-            _target(new TargetType),
+            _target(new TargetType(*channel.getTargetTyped())),
             _sampler(channel._sampler.get())
         {
@@ -86 +91 @@
                 _target = new TargetType;
             _sampler = s;
+        }
+
+        virtual bool createKeyframeContainerFromTargetValue()
+        {
+            if (!_target.valid()) // no target it does not make sense to do it
+            {
+                return false;
+            }
+
+            // create a key from current target value
+            typename KeyframeContainerType::KeyType key(0, _target->getValue());
+            // recreate the keyframe container
+            getOrCreateSampler()->setKeyframeContainer(0);
+            getOrCreateSampler()->getOrCreateKeyframeContainer();
+            // add the key
+            _sampler->getKeyframeContainerTyped()->push_back(key);
+            return true;
         }
 
@@ -121 +143 @@
 
         TargetType* getTargetTyped() { return _target.get(); }
+        const TargetType* getTargetTyped() const { return _target.get(); }
         void setTarget(TargetType* target) { _target = target; }
 

OpenSceneGraph/trunk/include/osgAnimation/CubicBezier

@@ -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  
@@ -37 +37 @@
             mPoint[2] = v2;
         }
+        // Constructor with value only
+        TemplateCubicBezier(const T& v0) 
+        {
+            mPoint[0] = v0;
+            mPoint[1] = v0;
+            mPoint[2] = v0;
+        }
 
         TemplateCubicBezier() {}

OpenSceneGraph/trunk/include/osgAnimation/Target

@@ -36 +36 @@
         Target();
         virtual ~Target() {}
-        virtual void normalize() = 0;
         void reset() { _weight = 0; _priorityWeight = 0; }
         int getCount() const { return referenceCount(); }
@@ -54 +53 @@
         TemplateTarget() {}
         TemplateTarget(const T& v) { setValue(v); }
+        TemplateTarget(const TemplateTarget& v) { setValue(v.getValue()); }
 
         inline void lerp(float t, const T& a, const T& b);
@@ -92 +92 @@
         const T& getValue() const { return _target; }
 
-        inline void normalize();
-
         void setValue(const T& value) { _target = value; }
 
@@ -100 +98 @@
         T _target;
     };
-
-    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
-    }
 
     template <class T>
@@ -119 +108 @@
     inline void TemplateTarget<osg::Quat>::lerp(float t, const osg::Quat& a, const osg::Quat& b)
     {
-        _target = a * (1.0f - t) + b * t;
+        if (a.asVec4() * b.asVec4() < 0.0)
+        {
+            _target = a * (1.0f - t) + b * -t;
+        }
+        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)
-            {
-                osg::Quat::value_type len2 = _target.length2(); // normalize
-                if ( len2 != 1.0 && len2 != 0.0)
-                    _target *= 1.0/sqrt(len2);
-            }
-    }
-  
+
     typedef TemplateTarget<osg::Quat> QuatTarget;
     typedef TemplateTarget<osg::Vec3> Vec3Target;

OpenSceneGraph/trunk/src/osgAnimation/AnimationManagerBase.cpp

@@ -30 +30 @@
     for (TargetSet::iterator it = _targets.begin(); it != _targets.end(); it++)
         (*it).get()->reset();
-}
-void AnimationManagerBase::normalizeTargets()
-{
-    for (TargetSet::iterator it = _targets.begin(); it != _targets.end(); it++)
-        (*it).get()->normalize();
 }
 

OpenSceneGraph/trunk/src/osgAnimation/BasicAnimationManager.cpp

@@ -114 +114 @@
         }
     }
-
-    for (TargetSet::iterator it = _targets.begin(); it != _targets.end(); it++)
-        (*it).get()->normalize();
 }
 

OpenSceneGraph/trunk/src/osgAnimation/CMakeLists.txt

@@ -54 +54 @@
     Animation.cpp
     AnimationManagerBase.cpp
-    AnimationManager.cpp
     BasicAnimationManager.cpp
     Bone.cpp

OpenSceneGraph/trunk/src/osgAnimation/TimelineAnimationManager.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  
@@ -37 +37 @@
     clearTargets();
     _timeline->update(time);
-    normalizeTargets();
 }