]> git.tdb.fi Git - libs/gl.git/blobdiff - source/pose.cpp
Add OffscreenView class
[libs/gl.git] / source / pose.cpp
index 4d58939775b592ffa37366ce7aa75996116795e8..99fa6bb3dfe812265a8e2372ddd9c1daad5f887a 100644 (file)
@@ -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 = GL::Matrix::translation(base.x-new_base.x, base.y-new_base.y, base.z-new_base.z)*links[i].local_matrix;
+       links[i].local_matrix = Matrix::translation(base-new_base)*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;
@@ -68,7 +68,7 @@ void Pose::Loader::armature(const string &n)
 void Pose::Loader::link(const string &n)
 {
        if(!obj.armature)
-               error("Armature must be specified first");
+               throw logic_error("Armature must be specified first");
        LinkLoader ldr(obj, obj.armature->get_link(n).get_index());
        load_sub_with(ldr);
 }