X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fanimationplayer.h;h=c45027d9e82bacfb0358981dfadcc0fded8c5eb9;hp=4c6e9ceca50bbc2fc0c7beeb5f256658a81c7150;hb=56beca9d8b4f7b4edac81411d31e24df88e84ac3;hpb=19555043d70f972feedb89786fc24a2b83b4f7e9

diff --git a/source/animationplayer.h b/source/animationplayer.h
index 4c6e9cec..c45027d9 100644
--- a/source/animationplayer.h
+++ b/source/animationplayer.h
@@ -21,39 +21,46 @@ 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(AnimatedObject *, const std::string &, const Variant &);
+		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;
@@ -70,10 +77,10 @@ public:
 	void unobserve_events(AnimationEventObserver &);
 
 	/// Stops all animations affecting an object.
-	void stop(AnimatedObject &);
+	void stop(Placeable &);
 
 	/// Stops a single animation affecting an object.
-	void stop(AnimatedObject &, const Animation &);
+	void stop(Placeable &, const Animation &);
 
 	/** Advances all playing animations.  Should be called in a regular manner,
 	preferably just before rendering. */