Add a class to unify loading coordinate transforms

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

diff --git a/source/animatedobject.h b/source/animatedobject.h
index b7f480054275d44148ca714c659af2ad548ce0d2..73c39e2ca8b2a240e5647ef6d8b6ae02914a0609 100644 (file)
--- a/source/animatedobject.h
+++ b/source/animatedobject.h
@@ -11,8 +11,7 @@ namespace Msp {
 namespace GL {
 
 /**
-An object instance that can be animated.  Despite the name, this can also be
-useful for displaying objects at a static position.
+An object instance that can be animated by an AnimationPlayer.
 */
 class AnimatedObject: public ObjectInstance
 {
@@ -27,10 +26,10 @@ public:
                void rotation(float, float, float, float);
                void scale(float, float, float);
                void scale_uniform(float);
+               void transform();
        };
 
 private:
-       Matrix matrix;
        std::vector<float> pose_data;
        ProgramData *shdata;
 
@@ -38,8 +37,11 @@ public:
        AnimatedObject(const Object &);
        ~AnimatedObject();
 
-       void set_matrix(const Matrix &);
        void set_pose_matrix(unsigned, const Matrix &);
+       ProgramData &get_shader_data();
+       const ProgramData &get_shader_data() const;
+
+       // Deprecated
        void set_uniform(const std::string &, const KeyFrame::AnimatedUniform &);
 
        virtual const Matrix *get_matrix() const { return &matrix; }