X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fanimationplayer.h;h=b6575304f4072d03f489590e599b370ad0ea816b;hp=4158627dbaa66fc26cceee5bb9d4dfb93600decf;hb=42c1534d95e1551c37e64a1dae288e8b75e8d8ba;hpb=332352298ef41b8ac3a4c57b467dd146c0b05e0b

diff --git a/source/animationplayer.h b/source/animationplayer.h
index 4158627d..b6575304 100644
--- a/source/animationplayer.h
+++ b/source/animationplayer.h
@@ -21,9 +21,10 @@ private:
 	struct PlayingAnimation
 	{
 		const Animation *animation;
+		float speed;
 		Animation::Iterator iterator;
 
-		PlayingAnimation(const Animation &);
+		PlayingAnimation(const Animation &, float);
 	};
 
 	struct Target: AnimationEventObserver
@@ -48,18 +49,18 @@ private:
 private:
 	Target &get_slot(Placeable &);
 
-	Target &play_(Placeable &, const Animation &, bool);
+	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 &);
+	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 &);
+	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;