X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fanimatedobject.h;h=f9b8824e1832932786189a99a9b2ca8a58eb2f3d;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hp=6bcd37ce4b609dbecadece72bfc336bc75317827;hpb=f2592f0e67d92043952eb7a2e39df182720cd990;p=libs%2Fgl.git

diff --git a/source/animatedobject.h b/source/animatedobject.h
index 6bcd37ce..f9b8824e 100644
--- a/source/animatedobject.h
+++ b/source/animatedobject.h
@@ -2,6 +2,9 @@
 #define MSP_GL_ANIMATEDOBJECT_H_
 
 #include <vector>
+#include <msp/core/attributes.h>
+#include <msp/datafile/objectloader.h>
+#include "keyframe.h"
 #include "matrix.h"
 #include "objectinstance.h"
 
@@ -9,13 +12,24 @@ 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
 {
+public:
+	class Loader: public DataFile::DerivedObjectLoader<AnimatedObject, ObjectInstance::Loader>
+	{
+	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;
 
@@ -23,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; }