Add missing includes

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

diff --git a/source/animationplayer.h b/source/animationplayer.h
index cc34e16a513f411f1c427364f91eee18bda10b11..f4eb0c767c8c660296e35c204588c40f6d7da42e 100644 (file)
--- a/source/animationplayer.h
+++ b/source/animationplayer.h
@@ -3,6 +3,7 @@
 
 #include <msp/time/timedelta.h>
 #include "animation.h"
+#include "matrix.h"
 
 namespace Msp {
 namespace GL {
@@ -37,7 +38,7 @@ private:
                ObjectSlot(AnimatedObject &);
        };
 
-       typedef std::map<AnimatedObject *, ObjectSlot> ObjectMap;
+       typedef std::map<const AnimatedObject *, ObjectSlot> ObjectMap;
 
        ObjectMap objects;
 
@@ -52,9 +53,15 @@ public:
        playing yet, the object's current matrix is used as the base. */
        void play_stacked(AnimatedObject &, const Animation &);
 
-       /// Stops any animations affecting an object.
+       /// Returns the number of animations currently affecting an object.
+       unsigned get_n_active_animations(const AnimatedObject &) const;
+
+       /// Stops all animations affecting an object.
        void stop(AnimatedObject &);
 
+       /// Stops a single animation affecting an object.
+       void stop(AnimatedObject &, const Animation &);
+
        /** Advances all playing animations.  Should be called in a regular manner,
        preferably just before rendering. */
        void tick(const Time::TimeDelta &);
@@ -62,6 +69,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