X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fanimatedobject.h;h=b7f480054275d44148ca714c659af2ad548ce0d2;hb=5c5d094255ae5b0a07f99392a5a099ad9c8e8e38;hp=acec4322af1d08ee15c755fe1cdea9368c9af41e;hpb=57fc4142e0b19a21f61c60b00f8310d5d2c27871;p=libs%2Fgl.git

diff --git a/source/animatedobject.h b/source/animatedobject.h
index acec4322..b7f48005 100644
--- 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,15 +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;
 };