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

diff --git a/source/animationplayer.h b/source/animationplayer.h
index 5d5f4cb8..b6575304 100644
--- a/source/animationplayer.h
+++ b/source/animationplayer.h
@@ -3,6 +3,7 @@
 
 #include <msp/time/timedelta.h>
 #include "animation.h"
+#include "animationeventobserver.h"
 #include "matrix.h"
 
 namespace Msp {
@@ -20,40 +21,61 @@ private:
 	struct PlayingAnimation
 	{
 		const Animation *animation;
+		float speed;
 		Animation::Iterator iterator;
 
-		PlayingAnimation(const Animation &);
+		PlayingAnimation(const Animation &, float);
 	};
 
 	struct Target: AnimationEventObserver
 	{
-		AnimatedObject &object;
+		Placeable &placeable;
+		AnimatedObject *object;
 		Matrix base_matrix;
 		const Armature *armature;
 		std::vector<PlayingAnimation> animations;
 		bool stacked;
+		std::vector<AnimationEventObserver *> event_observers;
 
-		Target(AnimatedObject &);
+		Target(Placeable &);
+
+		virtual void animation_event(Placeable *, const std::string &, const Variant &);
 	};
 
-	typedef std::map<const AnimatedObject *, Target> ObjectMap;
+	typedef std::map<const Placeable *, Target> ObjectMap;
 
 	ObjectMap objects;
 
 private:
-	Target &get_slot(AnimatedObject &);
+	Target &get_slot(Placeable &);
 
+	Target &play_(Placeable &, const Animation &, bool, float);
 public:
 	/// Plays an animation on an object.  Any previous animations are replaced.
-	void play(AnimatedObject &, const Animation &);
+	void play(AnimatedObject &, const Animation &, float = 1.0f);
+
+	void play(Placeable &, const Animation &, float = 1.0f);
 
 	/** Plays an animation, stacked with other animations.  If no animations are
 	playing yet, the object's current matrix is used as the base. */
-	void play_stacked(AnimatedObject &, const Animation &);
+	void play_stacked(AnimatedObject &, const Animation &, float = 1.0f);
+
+	void play_stacked(Placeable &, const Animation &, float = 1.0f);
 
 	/// Returns the number of animations currently affecting an object.
 	unsigned get_n_active_animations(const AnimatedObject &) const;
 
+	/** Request delivery of animation events for the given object.  Events will
+	be delivered from all current and future animations until the observer is
+	removed. */
+	void observe_events(AnimatedObject &, AnimationEventObserver &);
+
+	/// Remove an event observer from one object.
+	void unobserve_events(AnimatedObject &, AnimationEventObserver &);
+
+	/// Remove an event observer from all objects.
+	void unobserve_events(AnimationEventObserver &);
+
 	/// Stops all animations affecting an object.
 	void stop(AnimatedObject &);