Fix several bugs in the animation system

[libs/gl.git] / source / animation.cpp

diff --git a/source/animation.cpp b/source/animation.cpp
index e7174adc1bdab351a9799edb9af197d1b840c25f..efb67c972ded72ad916c286def76bd34bf5de28c 100644 (file)
--- a/source/animation.cpp
+++ b/source/animation.cpp
@@ -46,7 +46,6 @@ void Animation::prepare_keyframe(TimedKeyFrame &tkf)
                return;
 
        tkf.prepare();
-
 }
 
 
@@ -153,7 +152,7 @@ void Animation::TimedKeyFrame::prepare()
                pose_matrices.resize(max_index+1);
                const Pose *pose1 = prev->keyframe->get_pose();
                const Pose *pose2 = keyframe->get_pose();
-               Matrix identity;
+               static Matrix identity;
                for(unsigned i=0; i<=max_index; ++i)
                {
                        const Matrix &matrix1 = (pose1 ? pose1->get_link_matrix(i) : identity);
@@ -211,7 +210,20 @@ Matrix Animation::Iterator::get_pose_matrix(unsigned link) const
        if(link>animation.armature->get_max_link_index())
                throw out_of_range("Animation::Iterator::get_pose_matrix");
 
-       return iter->pose_matrices[link].get(time_since_keyframe/iter->delta_t);
+       if(!iter->prev)
+       {
+               if(const Pose *pose = iter->keyframe->get_pose())
+                       return pose->get_link_matrix(link);
+               else
+                       return Matrix();
+       }
+
+       // We must redo the base point correction since interpolation throws if off
+       Matrix result = iter->pose_matrices[link].get(time_since_keyframe/iter->delta_t);
+       const Vector3 &base = animation.armature->get_link(link).get_base();
+       Vector3 new_base = result*base;
+       result = Matrix::translation(base.x-new_base.x, base.y-new_base.y, base.z-new_base.z)*result;
+       return result;
 }
 
 
@@ -244,7 +256,10 @@ void Animation::Loader::keyframe(const string &n)
 void Animation::Loader::keyframe_inline()
 {
        RefPtr<KeyFrame> kf = new KeyFrame;
-       load_sub(*kf);
+       if(coll)
+               load_sub(*kf, get_collection());
+       else
+               load_sub(*kf);
 
        TimedKeyFrame tkf(obj);
        tkf.time = current_time;