Alias texture lookup functions of all dimensionalities

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

diff --git a/source/animatedobject.cpp b/source/animatedobject.cpp
index 63a25112a769428374e37dd0634251b4f2c2c8b7..8b030978eecda6a6a10af0cb5dab83f121e1334f 100644 (file)
--- a/source/animatedobject.cpp
+++ b/source/animatedobject.cpp
@@ -37,16 +37,46 @@ void AnimatedObject::set_pose_matrix(unsigned link, const Matrix &m)
                if(link*16>=pose_data.size())
                        pose_data.resize((link+1)*16);
                copy(m.data(), m.data()+16, &pose_data[link*16]);
-               shdata->uniform_matrix4_array("pose[0]", pose_data.size()/16, &pose_data[0]);
+               shdata->uniform_matrix4_array("pose", pose_data.size()/16, &pose_data[0]);
        }
 }
 
 void AnimatedObject::setup_render(Renderer &renderer, const Tag &) const
 {
-       renderer.matrix_stack() *= matrix;
+       renderer.transform(matrix);
        if(shdata)
                renderer.add_shader_data(*shdata);
 }
 
+
+AnimatedObject::Loader::Loader(AnimatedObject &o):
+       DataFile::ObjectLoader<AnimatedObject>(o)
+{
+       add("position", &Loader::position);
+       add("rotation", &Loader::rotation);
+       add("scale", &Loader::scale);
+       add("scale", &Loader::scale_uniform);
+}
+
+void AnimatedObject::Loader::position(float x, float y, float z)
+{
+       obj.matrix.translate(x, y, z);
+}
+
+void AnimatedObject::Loader::rotation(float a, float x, float y, float z)
+{
+       obj.matrix.rotate_deg(a, x, y, z);
+}
+
+void AnimatedObject::Loader::scale(float x, float y, float z)
+{
+       obj.matrix.scale(x, y, z);
+}
+
+void AnimatedObject::Loader::scale_uniform(float s)
+{
+       obj.matrix.scale(s);
+}
+
 } // namespace GL
 } // namespace Msp