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

diff --git a/source/animation.h b/source/animation.h
index 6b890ea3..b9e9fe1f 100644
--- a/source/animation.h
+++ b/source/animation.h
@@ -4,12 +4,13 @@
 #include <msp/core/refptr.h>
 #include <msp/datafile/objectloader.h>
 #include <msp/time/timedelta.h>
+#include "keyframe.h"
 
 namespace Msp {
 namespace GL {
 
+class AnimationEventObserver;
 class Armature;
-class KeyFrame;
 class Matrix;
 class Pose;
 
@@ -24,6 +25,8 @@ public:
 	{
 	private:
 		Time::TimeDelta current_time;
+		float start_slope;
+		float end_slope;
 
 	public:
 		Loader(Animation &);
@@ -31,9 +34,16 @@ public:
 	private:
 		void init();
 
+		void event(const std::string &);
+		void event1i(const std::string &, int);
+		void event1f(const std::string &, float);
+		void event2f(const std::string &, float, float);
+		void event3f(const std::string &, float, float, float);
+		void event4f(const std::string &, float, float, float, float);
+		void interval(float);
 		void keyframe(const std::string &);
 		void keyframe_inline();
-		void interval(float);
+		void slopes(float, float);
 	};
 
 private:
@@ -43,7 +53,7 @@ private:
 		float scale;
 
 		AxisInterpolation();
-		AxisInterpolation(const double *, const double *);
+		AxisInterpolation(const float *, const float *);
 	};
 
 	struct MatrixInterpolation
@@ -60,55 +70,87 @@ private:
 
 	struct TimedKeyFrame
 	{
-		const Animation &animation;
 		const TimedKeyFrame *prev;
 		Time::TimeDelta time;
 		Time::TimeDelta delta_t;
+		float start_slope;
+		float end_slope;
 		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 Event
+	{
+		Time::TimeDelta time;
+		std::string name;
+		Variant value;
+	};
+
+	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;
+		std::vector<Event>::const_iterator event_iter;
 		Time::TimeDelta time_since_keyframe;
+		float x;
 		bool end;
 
 	public:
 		Iterator(const Animation &);
 
 		Iterator &operator+=(const Time::TimeDelta &);
+		void dispatch_events(AnimationEventObserver &);
 
 		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;
+	std::vector<Event> events;
 	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 add_keyframe(const Time::TimeDelta &, const KeyFrame &, float);
+	void add_keyframe(const Time::TimeDelta &, const KeyFrame &, float, float);
 private:
+	void add_keyframe(const Time::TimeDelta &, const RefPtr<const KeyFrame> &, float, float);
 	void prepare_keyframe(TimedKeyFrame &);
-
 public:
+	void add_event(const Time::TimeDelta &, const std::string &, const Variant & = Variant());
+
+	const Msp::Time::TimeDelta &get_duration() const;
+
 	void set_looping(bool);
 };