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

diff --git a/source/animationplayer.h b/source/animationplayer.h
index 4c6e9cec..4158627d 100644
--- a/source/animationplayer.h
+++ b/source/animationplayer.h
@@ -28,33 +28,39 @@ private:
 
 	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);
 public:
 	/// Plays an animation on an object.  Any previous animations are replaced.
 	void play(AnimatedObject &, const Animation &);
 
+	void play(Placeable &, const Animation &);
+
 	/** 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(Placeable &, const Animation &);
+
 	/// Returns the number of animations currently affecting an object.
 	unsigned get_n_active_animations(const AnimatedObject &) const;