X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fanimationplayer.h;h=93482c74f9b88daac2744e343f2bc04ab6bbdb42;hp=34a282d6b5bba2f36dce446a243c84b841176714;hb=573ea4e5602c4321cc1d75daf9ed0beed5cde280;hpb=dfc784f7acd3132e5fcb9c43c0bda638df3b52f2

diff --git a/source/animationplayer.h b/source/animationplayer.h
index 34a282d6..93482c74 100644
--- a/source/animationplayer.h
+++ b/source/animationplayer.h
@@ -19,20 +19,18 @@ class AnimationPlayer
 private:
 	struct AnimationSlot
 	{
-		const Animation &animation;
+		const Animation *animation;
 		Animation::Iterator iterator;
 
 		AnimationSlot(const Animation &);
 	};
 
-	typedef std::list<AnimationSlot> AnimationList;
-
 	struct ObjectSlot
 	{
 		AnimatedObject &object;
 		Matrix base_matrix;
 		const Armature *armature;
-		AnimationList animations;
+		std::vector<AnimationSlot> animations;
 		bool stacked;
 
 		ObjectSlot(AnimatedObject &);
@@ -69,6 +67,7 @@ public:
 private:
 	bool tick_single(ObjectSlot &, const Time::TimeDelta &);
 	bool tick_stacked(ObjectSlot &, const Time::TimeDelta &);
+	static void set_object_uniform(AnimatedObject &, const std::string &, const KeyFrame::AnimatedUniform &);
 };
 
 } // namespace GL