X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fanimationplayer.h;h=5d5f4cb85a260f88f9d5a109004b71b982c05564;hp=cc34e16a513f411f1c427364f91eee18bda10b11;hb=a993091fbb8fdb76a1d02be9de59529c14b59cf0;hpb=5ba1446b314ddc914693cb9cbb9a7b54a4d30a45

diff --git a/source/animationplayer.h b/source/animationplayer.h
index cc34e16a..5d5f4cb8 100644
--- a/source/animationplayer.h
+++ b/source/animationplayer.h
@@ -3,6 +3,7 @@
 
 #include <msp/time/timedelta.h>
 #include "animation.h"
+#include "matrix.h"
 
 namespace Msp {
 namespace GL {
@@ -16,33 +17,31 @@ can handle an arbitrary number of animations simultaneously.
 class AnimationPlayer
 {
 private:
-	struct AnimationSlot
+	struct PlayingAnimation
 	{
-		const Animation &animation;
+		const Animation *animation;
 		Animation::Iterator iterator;
 
-		AnimationSlot(const Animation &);
+		PlayingAnimation(const Animation &);
 	};
 
-	typedef std::list<AnimationSlot> AnimationList;
-
-	struct ObjectSlot
+	struct Target: AnimationEventObserver
 	{
 		AnimatedObject &object;
 		Matrix base_matrix;
 		const Armature *armature;
-		AnimationList animations;
+		std::vector<PlayingAnimation> animations;
 		bool stacked;
 
-		ObjectSlot(AnimatedObject &);
+		Target(AnimatedObject &);
 	};
 
-	typedef std::map<AnimatedObject *, ObjectSlot> ObjectMap;
+	typedef std::map<const AnimatedObject *, Target> ObjectMap;
 
 	ObjectMap objects;
 
 private:
-	ObjectSlot &get_slot(AnimatedObject &);
+	Target &get_slot(AnimatedObject &);
 
 public:
 	/// Plays an animation on an object.  Any previous animations are replaced.
@@ -52,16 +51,23 @@ public:
 	playing yet, the object's current matrix is used as the base. */
 	void play_stacked(AnimatedObject &, const Animation &);
 
-	/// Stops any animations affecting an object.
+	/// Returns the number of animations currently affecting an object.
+	unsigned get_n_active_animations(const AnimatedObject &) const;
+
+	/// Stops all animations affecting an object.
 	void stop(AnimatedObject &);
 
+	/// Stops a single animation affecting an object.
+	void stop(AnimatedObject &, const Animation &);
+
 	/** Advances all playing animations.  Should be called in a regular manner,
 	preferably just before rendering. */
 	void tick(const Time::TimeDelta &);
 
 private:
-	bool tick_single(ObjectSlot &, const Time::TimeDelta &);
-	bool tick_stacked(ObjectSlot &, const Time::TimeDelta &);
+	void tick_single(Target &, const Time::TimeDelta &);
+	void tick_stacked(Target &, const Time::TimeDelta &);
+	static void set_object_uniform(AnimatedObject &, const std::string &, const KeyFrame::AnimatedUniform &);
 };
 
 } // namespace GL