Use vector when there's no reason to use some other container

[libs/gl.git] / source / animationplayer.h

diff --git a/source/animationplayer.h b/source/animationplayer.h
index 34a282d6b5bba2f36dce446a243c84b841176714..93482c74f9b88daac2744e343f2bc04ab6bbdb42 100644 (file)
--- 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