X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fkeyframe.h;h=5b748add113c5432c0d3c5836e6fceaf4db8b590;hp=7854a928863c86ea7d2a30891d97a3687ac44b22;hb=d901696935a6bf9fdad6ac8abe65ffab79bd297d;hpb=3f7c493e13b7108098539078b729cffc095c304b

diff --git a/source/keyframe.h b/source/keyframe.h
index 7854a928..5b748add 100644
--- a/source/keyframe.h
+++ b/source/keyframe.h
@@ -4,6 +4,7 @@
 #include <msp/core/refptr.h>
 #include <msp/datafile/objectloader.h>
 #include "matrix.h"
+#include "transform.h"
 
 namespace Msp {
 namespace GL {
@@ -30,6 +31,7 @@ public:
 		void rotation(float, float, float, float);
 		void scaling_uniform(float);
 		void scaling(float, float, float);
+		void transform();
 		void uniforms();
 	};
 
@@ -56,7 +58,7 @@ public:
 	typedef std::map<std::string, AnimatedUniform> UniformMap;
 
 private:
-	Matrix matrix;
+	Transform transform;
 	UniformMap uniforms;
 	RefPtr<const Pose> pose;
 
@@ -64,9 +66,12 @@ public:
 	KeyFrame();
 	~KeyFrame();
 
+	void set_transform(const Transform &);
 	void set_matrix(const Matrix &);
+	void set_uniform(const std::string &, const AnimatedUniform &);
 	void set_pose(const Pose &);
-	const Matrix &get_matrix() const { return matrix; }
+	const Transform &get_transform() const { return transform; }
+	Matrix get_matrix() const { return transform.to_matrix(); }
 	const UniformMap &get_uniforms() const { return uniforms; }
 	const Pose *get_pose() const { return pose.get(); }
 };