Fix several bugs in the animation system

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

diff --git a/source/pose.cpp b/source/pose.cpp
index b5c5781b630be2365c5dcb06841acd3060291180..4d58939775b592ffa37366ce7aa75996116795e8 100644 (file)
--- a/source/pose.cpp
+++ b/source/pose.cpp
@@ -37,7 +37,7 @@ void Pose::rotate_link(unsigned i, float angle, const Vector3 &axis)
        // Keep the base point stationary
        Vector3 base = arm_link.get_base();
        Vector3 new_base = links[i].local_matrix*base;
-       links[i].local_matrix.translate(base.x-new_base.x, base.y-new_base.y, base.z-new_base.z);
+       links[i].local_matrix = GL::Matrix::translation(base.x-new_base.x, base.y-new_base.y, base.z-new_base.z)*links[i].local_matrix;
 
        if(const Armature::Link *parent = arm_link.get_parent())
                links[i].matrix = links[parent->get_index()].matrix*links[i].local_matrix;
@@ -56,10 +56,15 @@ const Matrix &Pose::get_link_matrix(unsigned i) const
 Pose::Loader::Loader(Pose &p, Collection &c):
        DataFile::CollectionObjectLoader<Pose>(p, &c)
 {
-       add("armature", &Pose::armature);
+       add("armature", &Loader::armature);
        add("link",     &Loader::link);
 }
 
+void Pose::Loader::armature(const string &n)
+{
+       obj.set_armature(get_collection().get<Armature>(n));
+}
+
 void Pose::Loader::link(const string &n)
 {
        if(!obj.armature)