Add support for playing multiple stacked animations on an object

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

diff --git a/source/animationplayer.h b/source/animationplayer.h
index fe53a359d800ce588c8bbbce300c9e3ae94ebfa6..cc34e16a513f411f1c427364f91eee18bda10b11 100644 (file)
--- a/source/animationplayer.h
+++ b/source/animationplayer.h
@@ -16,24 +16,52 @@ can handle an arbitrary number of animations simultaneously.
 class AnimationPlayer
 {
 private:
-       struct Slot
+       struct AnimationSlot
        {
-               AnimatedObject &object;
                const Animation &animation;
                Animation::Iterator iterator;
 
-               Slot(AnimatedObject &, const Animation &);
+               AnimationSlot(const Animation &);
+       };
+
+       typedef std::list<AnimationSlot> AnimationList;
+
+       struct ObjectSlot
+       {
+               AnimatedObject &object;
+               Matrix base_matrix;
+               const Armature *armature;
+               AnimationList animations;
+               bool stacked;
+
+               ObjectSlot(AnimatedObject &);
        };
 
-       std::list<Slot> slots;
+       typedef std::map<AnimatedObject *, ObjectSlot> ObjectMap;
+
+       ObjectMap objects;
+
+private:
+       ObjectSlot &get_slot(AnimatedObject &);
 
 public:
-       /** Plays an animation on an object. */
+       /// Plays an animation on an object.  Any previous animations are replaced.
        void play(AnimatedObject &, 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 &);
+
+       /// Stops any animations affecting an object.
+       void stop(AnimatedObject &);
+
        /** Advances all playing animations.  Should be called in a regular manner,
        preferably just before rendering. */
        void tick(const Time::TimeDelta &);
+
+private:
+       bool tick_single(ObjectSlot &, const Time::TimeDelta &);
+       bool tick_stacked(ObjectSlot &, const Time::TimeDelta &);
 };
 
 } // namespace GL