Remove dynamic allocation from VertexFormat

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

diff --git a/source/animatedobject.h b/source/animatedobject.h
index 4f6085ff84ce146974bcfa2e64f84b23fa672c64..b7f480054275d44148ca714c659af2ad548ce0d2 100644 (file)
--- a/source/animatedobject.h
+++ b/source/animatedobject.h
@@ -1,6 +1,9 @@
 #ifndef MSP_GL_ANIMATEDOBJECT_H_
 #define MSP_GL_ANIMATEDOBJECT_H_
 
+#include <vector>
+#include <msp/datafile/objectloader.h>
+#include "keyframe.h"
 #include "matrix.h"
 #include "objectinstance.h"
 
@@ -13,13 +16,33 @@ useful for displaying objects at a static position.
 */
 class AnimatedObject: public ObjectInstance
 {
+public:
+       class Loader: public DataFile::ObjectLoader<AnimatedObject>
+       {
+       public:
+               Loader(AnimatedObject &);
+
+       private:
+               void position(float, float, float);
+               void rotation(float, float, float, float);
+               void scale(float, float, float);
+               void scale_uniform(float);
+       };
+
 private:
        Matrix matrix;
+       std::vector<float> pose_data;
+       ProgramData *shdata;
 
 public:
        AnimatedObject(const Object &);
+       ~AnimatedObject();
 
        void set_matrix(const Matrix &);
+       void set_pose_matrix(unsigned, const Matrix &);
+       void set_uniform(const std::string &, const KeyFrame::AnimatedUniform &);
+
+       virtual const Matrix *get_matrix() const { return &matrix; }
 
        virtual void setup_render(Renderer &, const Tag &) const;
 };