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

diff --git a/source/animatedobject.h b/source/animatedobject.h
index 73c39e2c..f9b8824e 100644
--- a/source/animatedobject.h
+++ b/source/animatedobject.h
@@ -2,6 +2,7 @@
 #define MSP_GL_ANIMATEDOBJECT_H_
 
 #include <vector>
+#include <msp/core/attributes.h>
 #include <msp/datafile/objectloader.h>
 #include "keyframe.h"
 #include "matrix.h"
@@ -16,7 +17,7 @@ An object instance that can be animated by an AnimationPlayer.
 class AnimatedObject: public ObjectInstance
 {
 public:
-	class Loader: public DataFile::ObjectLoader<AnimatedObject>
+	class Loader: public DataFile::DerivedObjectLoader<AnimatedObject, ObjectInstance::Loader>
 	{
 	public:
 		Loader(AnimatedObject &);
@@ -26,7 +27,6 @@ public:
 		void rotation(float, float, float, float);
 		void scale(float, float, float);
 		void scale_uniform(float);
-		void transform();
 	};
 
 private:
@@ -41,8 +41,7 @@ public:
 	ProgramData &get_shader_data();
 	const ProgramData &get_shader_data() const;
 
-	// Deprecated
-	void set_uniform(const std::string &, const KeyFrame::AnimatedUniform &);
+	DEPRECATED void set_uniform(const std::string &, const KeyFrame::AnimatedUniform &);
 
 	virtual const Matrix *get_matrix() const { return &matrix; }