X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fanimatedobject.h;h=f9b8824e1832932786189a99a9b2ca8a58eb2f3d;hb=ed7ca8892daceebb963950945fed5e75bd96a8a1;hp=23333ee53dfb4e5e347c97ed97d7c05b033e737a;hpb=00d926c3fe134820139a925cfac28cd64729db93;p=libs%2Fgl.git

diff --git a/source/animatedobject.h b/source/animatedobject.h
index 23333ee5..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 &);
@@ -37,7 +38,10 @@ public:
 	~AnimatedObject();
 
 	void set_pose_matrix(unsigned, const Matrix &);
-	void set_uniform(const std::string &, const KeyFrame::AnimatedUniform &);
+	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; }