X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fanimation.h;h=dd3cc688c41290316450858a7d540a79e93dcfb8;hp=58a76583392270e5f1c0dd7a348d0fe10cff23d7;hb=89a1ada18430079896cfb28862e61bb32d66b8a0;hpb=8b9d1625ac367114612b57a83901033ffc2bc7e0

diff --git a/source/animation.h b/source/animation.h
index 58a76583..dd3cc688 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
@@ -60,26 +60,32 @@ private:
 
 	struct TimedKeyFrame
 	{
-		const Animation &animation;
 		const TimedKeyFrame *prev;
 		Time::TimeDelta time;
 		Time::TimeDelta delta_t;
 		RefPtr<const KeyFrame> keyframe;
 		MatrixInterpolation matrix;
+		std::vector<KeyFrame::AnimatedUniform> uniforms;
 		std::vector<MatrixInterpolation> pose_matrices;
 
-		TimedKeyFrame(const Animation &);
-		void prepare();
+		TimedKeyFrame();
+		void prepare(const Animation &);
 	};
 
-	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;
 
@@ -90,13 +96,15 @@ public:
 
 		bool is_end() const { return end; }
 		Matrix get_matrix() const;
+		KeyFrame::AnimatedUniform get_uniform(unsigned) const;
 		Matrix get_pose_matrix(unsigned) const;
 	};
 
 private:
 	const Armature *armature;
-	KeyFrameList keyframes;
+	std::vector<TimedKeyFrame> keyframes;
 	bool looping;
+	std::vector<UniformInfo> uniforms;
 
 public:
 	Animation();
@@ -105,8 +113,13 @@ public:
 	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 add_keyframe(const Time::TimeDelta &, const RefPtr<const KeyFrame> &);
 	void prepare_keyframe(TimedKeyFrame &);
 
 public: