FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.

Browse Source 
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.
This commit is contained in:
Cedric Pinson
2009-09-09 09:52:54 +00:00
parent a851b0b412
commit 9b95a78e5d
8 changed files with 45 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
include/osgAnimation/Target
View File

@@ -35,7 +35,6 @@ namespace osgAnimation
Target();
virtual ~Target() {}
virtual void normalize() = 0;
void reset() { _weight = 0; _priorityWeight = 0; }
int getCount() const { return referenceCount(); }
float getWeight() const { return _weight; }
@@ -53,6 +52,7 @@ namespace osgAnimation
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);
@@ -91,8 +91,6 @@ namespace osgAnimation
}
const T& getValue() const { return _target; }
inline void normalize();
void setValue(const T& value) { _target = value; }
protected:
@@ -100,15 +98,6 @@ namespace osgAnimation
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>
inline void TemplateTarget<T>::lerp(float t, const T& a, const T& b)
{
@@ -118,24 +107,20 @@ namespace osgAnimation
template <>
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;
typedef TemplateTarget<osg::Vec4> Vec4Target;