X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fanimation.h;h=1ae571e7db217e8e624c6475dc6c4731ebf08a9d;hp=6b890ea369811d58ee7ae1aae42046dfef6cf173;hb=d713e5391dc5d85759c7aab36f6df7a85c3d8eff;hpb=57fc4142e0b19a21f61c60b00f8310d5d2c27871

diff --git a/source/animation.h b/source/animation.h
index 6b890ea3..1ae571e7 100644
--- a/source/animation.h
+++ b/source/animation.h
@@ -4,12 +4,12 @@
 #include <msp/core/refptr.h>
 #include <msp/datafile/objectloader.h>
 #include <msp/time/timedelta.h>
+#include "keyframe.h"
 
 namespace Msp {
 namespace GL {
 
 class Armature;
-class KeyFrame;
 class Matrix;
 class Pose;
 
@@ -43,7 +43,7 @@ private:
 		float scale;
 
 		AxisInterpolation();
-		AxisInterpolation(const double *, const double *);
+		AxisInterpolation(const float *, const float *);
 	};
 
 	struct MatrixInterpolation
@@ -66,6 +66,7 @@ private:
 		Time::TimeDelta delta_t;
 		RefPtr<const KeyFrame> keyframe;
 		MatrixInterpolation matrix;
+		std::vector<KeyFrame::AnimatedUniform> uniforms;
 		std::vector<MatrixInterpolation> pose_matrices;
 
 		TimedKeyFrame(const Animation &);
@@ -74,6 +75,14 @@ private:
 
 	typedef std::list<TimedKeyFrame> KeyFrameList;
 
+	struct UniformInfo
+	{
+		std::string name;
+		unsigned size;
+
+		UniformInfo(const std::string &, unsigned);
+	};
+
 public:
 	class Iterator
 	{
@@ -90,6 +99,7 @@ public:
 
 		bool is_end() const { return end; }
 		Matrix get_matrix() const;
+		KeyFrame::AnimatedUniform get_uniform(unsigned) const;
 		Matrix get_pose_matrix(unsigned) const;
 	};
 
@@ -97,13 +107,19 @@ private:
 	const Armature *armature;
 	KeyFrameList keyframes;
 	bool looping;
+	std::vector<UniformInfo> uniforms;
 
 public:
 	Animation();
+	~Animation();
 
 	void set_armature(const Armature &);
 	const Armature *get_armature() const { return armature; }
 
+	unsigned get_n_uniforms() const { return uniforms.size(); }
+	unsigned get_slot_for_uniform(const std::string &) const;
+	const std::string &get_uniform_name(unsigned) const;
+
 	void add_keyframe(const Time::TimeDelta &, const KeyFrame &);
 private:
 	void prepare_keyframe(TimedKeyFrame &);