Reimplement Animation using splines

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

diff --git a/source/animation.h b/source/animation.h
index a4bdabdd95401757b32c032ca56b646c2e58c92b..83b369bfca1f1e975df889de113d9655ca77db80 100644 (file)
--- a/source/animation.h
+++ b/source/animation.h
@@ -3,13 +3,17 @@
 
 #include <msp/core/refptr.h>
 #include <msp/datafile/objectloader.h>
+#include <msp/interpolate/spline.h>
 #include <msp/time/timedelta.h>
+#include "keyframe.h"
 
 namespace Msp {
 namespace GL {
 
-class KeyFrame;
+class AnimationEventObserver;
+class Armature;
 class Matrix;
+class Pose;
 
 /**
 An Animation is a sequence of KeyFrames combined with timing information.  The
@@ -22,85 +26,143 @@ public:
        {
        private:
                Time::TimeDelta current_time;
+               float start_slope;
+               float end_slope;
 
        public:
                Loader(Animation &);
                Loader(Animation &, Collection &);
        private:
                void init();
-
+               virtual void finish();
+
+               void event(const std::string &);
+               void event1i(const std::string &, int);
+               void event1f(const std::string &, float);
+               void event2f(const std::string &, float, float);
+               void event3f(const std::string &, float, float, float);
+               void event4f(const std::string &, float, float, float, float);
+               void interval(float);
                void keyframe(const std::string &);
                void keyframe_inline();
-               void interval(float);
+               void slopes(float, float);
        };
 
 private:
-       struct AxisInterpolation
+       enum CurveTarget
+       {
+               POSITION,
+               EULER,
+               SCALE,
+               UNIFORM
+       };
+
+       class Curve
        {
-               float slope;
-               float scale;
+       protected:
+               CurveTarget target;
 
-               AxisInterpolation();
-               AxisInterpolation(const double *, const double *);
+               Curve(CurveTarget);
+       public:
+               virtual ~Curve() { }
+
+               virtual void apply(float, Matrix &) const = 0;
+               virtual void apply(float, KeyFrame::AnimatedUniform &) const = 0;
        };
 
-       struct MatrixInterpolation
+       template<unsigned N>
+       class ValueCurve: public Curve
        {
-               const Matrix *matrix1;
-               const Matrix *matrix2;
-               AxisInterpolation axes[3];
+       public:
+               typedef typename Interpolate::SplineKnot<float, N> Knot;
 
-               MatrixInterpolation();
-               MatrixInterpolation(const Matrix &, const Matrix &);
+       private:
+               Interpolate::Spline<float, 1, N> spline;
+
+       public:
+               ValueCurve(CurveTarget, const std::vector<Knot> &);
 
-               Matrix get(float) const;
+               virtual void apply(float, Matrix &) const;
+               virtual void apply(float, KeyFrame::AnimatedUniform &) const;
        };
 
        struct TimedKeyFrame
        {
-               const Animation &animation;
-               const TimedKeyFrame *prev;
                Time::TimeDelta time;
-               Time::TimeDelta delta_t;
+               float start_slope;
+               float end_slope;
                RefPtr<const KeyFrame> keyframe;
-               MatrixInterpolation matrix;
+       };
 
-               TimedKeyFrame(const Animation &);
-               void prepare();
+       struct Event
+       {
+               Time::TimeDelta time;
+               std::string name;
+               Variant value;
        };
 
-       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;
-               Time::TimeDelta time_since_keyframe;
+               const Animation *animation;
+               Time::TimeDelta elapsed;
+               std::vector<Event>::const_iterator event_iter;
                bool end;
 
        public:
                Iterator(const Animation &);
 
                Iterator &operator+=(const Time::TimeDelta &);
+               void dispatch_events(AnimationEventObserver &);
 
                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;
+       std::vector<Event> events;
        bool looping;
+       std::vector<UniformInfo> uniforms;
+       std::vector<Curve *> curves;
 
 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 &);
+       void add_keyframe(const Time::TimeDelta &, const KeyFrame &, float);
+       void add_keyframe(const Time::TimeDelta &, const KeyFrame &, float, float);
 private:
+       void add_keyframe(const Time::TimeDelta &, const RefPtr<const KeyFrame> &, float, float);
        void prepare_keyframe(TimedKeyFrame &);
-
+       void create_curves();
+       template<unsigned N>
+       void create_uniform_curve(const std::string &);
 public:
+       void add_event(const Time::TimeDelta &, const std::string &, const Variant & = Variant());
+
+       const Msp::Time::TimeDelta &get_duration() const;
+
        void set_looping(bool);
 };