X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fanimationplayer.h;h=63e6e030d03aa68b30efa2a63aa169b077986402;hp=34a282d6b5bba2f36dce446a243c84b841176714;hb=3d8438922e24b787587d0c8f1883c5567a4af573;hpb=dfc784f7acd3132e5fcb9c43c0bda638df3b52f2

diff --git a/source/animationplayer.h b/source/animationplayer.h
index 34a282d6..63e6e030 100644
--- a/source/animationplayer.h
+++ b/source/animationplayer.h
@@ -17,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<const 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.
@@ -67,8 +65,9 @@ public:
 	void tick(const Time::TimeDelta &);
 
 private:
-	bool tick_single(ObjectSlot &, const Time::TimeDelta &);
-	bool tick_stacked(ObjectSlot &, const Time::TimeDelta &);
+	bool tick_single(Target &, const Time::TimeDelta &);
+	bool tick_stacked(Target &, const Time::TimeDelta &);
+	static void set_object_uniform(AnimatedObject &, const std::string &, const KeyFrame::AnimatedUniform &);
 };
 
 } // namespace GL