X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fanimation.h;h=929cb13f497318c3a91492cc1cf18d36584f267e;hp=1460c944894350ed5aa44ea57f5c0465c8da6a44;hb=573ea4e5602c4321cc1d75daf9ed0beed5cde280;hpb=4c5ba8f7d3bc755d6256cb6bf75907a1b10fc290

diff --git a/source/animation.h b/source/animation.h
index 1460c944..929cb13f 100644
--- a/source/animation.h
+++ b/source/animation.h
@@ -4,12 +4,14 @@
 #include <msp/core/refptr.h>
 #include <msp/datafile/objectloader.h>
 #include <msp/time/timedelta.h>
+#include "keyframe.h"
 
 namespace Msp {
 namespace GL {
 
-class KeyFrame;
+class Armature;
 class Matrix;
+class Pose;
 
 /**
 An Animation is a sequence of KeyFrames combined with timing information.  The
@@ -41,25 +43,50 @@ private:
 		float scale;
 
 		AxisInterpolation();
+		AxisInterpolation(const float *, const float *);
+	};
+
+	struct MatrixInterpolation
+	{
+		const Matrix *matrix1;
+		const Matrix *matrix2;
+		AxisInterpolation axes[3];
+
+		MatrixInterpolation();
+		MatrixInterpolation(const Matrix &, const Matrix &);
+
+		Matrix get(float) const;
 	};
 
 	struct TimedKeyFrame
 	{
+		const Animation &animation;
 		const TimedKeyFrame *prev;
 		Time::TimeDelta time;
 		Time::TimeDelta delta_t;
 		RefPtr<const KeyFrame> keyframe;
-		AxisInterpolation axes[3];
+		MatrixInterpolation matrix;
+		std::vector<KeyFrame::AnimatedUniform> uniforms;
+		std::vector<MatrixInterpolation> pose_matrices;
+
+		TimedKeyFrame(const Animation &);
+		void prepare();
 	};
 
-	typedef std::list<TimedKeyFrame> KeyFrameList;
+	struct UniformInfo
+	{
+		std::string name;
+		unsigned size;
+
+		UniformInfo(const std::string &, unsigned);
+	};
 
 public:
 	class Iterator
 	{
 	private:
-		const Animation &animation;
-		KeyFrameList::const_iterator iter;
+		const Animation *animation;
+		std::vector<TimedKeyFrame>::const_iterator iter;
 		Time::TimeDelta time_since_keyframe;
 		bool end;
 
@@ -70,21 +97,33 @@ public:
 
 		bool is_end() const { return end; }
 		Matrix get_matrix() const;
+		KeyFrame::AnimatedUniform get_uniform(unsigned) const;
+		Matrix get_pose_matrix(unsigned) const;
 	};
 
 private:
-	KeyFrameList keyframes;
+	const Armature *armature;
+	std::vector<TimedKeyFrame> 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 &);
-	void set_looping(bool);
 private:
 	void prepare_keyframe(TimedKeyFrame &);
 
-	Matrix compute_matrix(const TimedKeyFrame &, const Time::TimeDelta &) const;
+public:
+	void set_looping(bool);
 };
 
 } // namespace GL