Refactor the Animation reference out of TimedKeyFrame

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

diff --git a/source/animation.h b/source/animation.h
index a4bdabdd95401757b32c032ca56b646c2e58c92b..dd3cc688c41290316450858a7d540a79e93dcfb8 100644 (file)
--- a/source/animation.h
+++ b/source/animation.h
@@ -4,12 +4,14 @@
 #include <msp/core/refptr.h>
 #include <msp/datafile/objectloader.h>
 #include <msp/time/timedelta.h>
+#include "keyframe.h"
 
 namespace Msp {
 namespace GL {
 
-class KeyFrame;
+class Armature;
 class Matrix;
+class Pose;
 
 /**
 An Animation is a sequence of KeyFrames combined with timing information.  The
@@ -41,7 +43,7 @@ private:
                float scale;
 
                AxisInterpolation();
-               AxisInterpolation(const double *, const double *);
+               AxisInterpolation(const float *, const float *);
        };
 
        struct MatrixInterpolation
@@ -58,25 +60,32 @@ private:
 
        struct TimedKeyFrame
        {
-               const Animation &animation;
                const TimedKeyFrame *prev;
                Time::TimeDelta time;
                Time::TimeDelta delta_t;
                RefPtr<const KeyFrame> keyframe;
                MatrixInterpolation matrix;
+               std::vector<KeyFrame::AnimatedUniform> uniforms;
+               std::vector<MatrixInterpolation> pose_matrices;
 
-               TimedKeyFrame(const Animation &);
-               void prepare();
+               TimedKeyFrame();
+               void prepare(const Animation &);
        };
 
-       typedef std::list<TimedKeyFrame> KeyFrameList;
+       struct UniformInfo
+       {
+               std::string name;
+               unsigned size;
+
+               UniformInfo(const std::string &, unsigned);
+       };
 
 public:
        class Iterator
        {
        private:
-               const Animation &animation;
-               KeyFrameList::const_iterator iter;
+               const Animation *animation;
+               std::vector<TimedKeyFrame>::const_iterator iter;
                Time::TimeDelta time_since_keyframe;
                bool end;
 
@@ -87,17 +96,30 @@ public:
 
                bool is_end() const { return end; }
                Matrix get_matrix() const;
+               KeyFrame::AnimatedUniform get_uniform(unsigned) const;
+               Matrix get_pose_matrix(unsigned) const;
        };
 
 private:
-       KeyFrameList keyframes;
+       const Armature *armature;
+       std::vector<TimedKeyFrame> keyframes;
        bool looping;
+       std::vector<UniformInfo> uniforms;
 
 public:
        Animation();
+       ~Animation();
+
+       void set_armature(const Armature &);
+       const Armature *get_armature() const { return armature; }
+
+       unsigned get_n_uniforms() const { return uniforms.size(); }
+       unsigned get_slot_for_uniform(const std::string &) const;
+       const std::string &get_uniform_name(unsigned) const;
 
        void add_keyframe(const Time::TimeDelta &, const KeyFrame &);
 private:
+       void add_keyframe(const Time::TimeDelta &, const RefPtr<const KeyFrame> &);
        void prepare_keyframe(TimedKeyFrame &);
 
 public: