]> git.tdb.fi Git - libs/gl.git/blobdiff - source/animation.h
Add public functions for adding owned keyframes to Animation
[libs/gl.git] / source / animation.h
index 63b13f7224269443e9b562572be9447d263d6faf..d053ee9004835154acd8f22f3a91ab5655148c67 100644 (file)
@@ -3,13 +3,15 @@
 
 #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 AnimationEventObserver;
 class Armature;
-class KeyFrame;
 class Matrix;
 class Pose;
 
@@ -24,79 +26,149 @@ public:
        {
        private:
                Time::TimeDelta current_time;
+               float start_slope;
+               float end_slope;
+               int slopes_set;
 
        public:
                Loader(Animation &);
                Loader(Animation &, Collection &);
        private:
                void init();
-
+               virtual void finish();
+
+               void check_slopes_and_control(bool, bool);
+               void add_kf(const KeyFrame *, bool, bool);
+               void load_kf(const std::string &, bool);
+               void load_kf_inline(bool);
+
+               void control_keyframe(const std::string &);
+               void control_keyframe_inline();
+               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
        {
-               float slope;
-               float scale;
+               POSITION,
+               EULER,
+               SCALE,
+               UNIFORM
+       };
 
-               AxisInterpolation();
-               AxisInterpolation(const float *, const float *);
+       class Curve
+       {
+       protected:
+               CurveTarget target;
+               int component;
+
+               Curve(CurveTarget, int);
+       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, 3, N> spline;
+
+       public:
+               ValueCurve(CurveTarget, int, const std::vector<Knot> &);
 
-               Matrix get(float) const;
+               virtual void apply(float, Matrix &) const;
+               virtual void apply(float, KeyFrame::AnimatedUniform &) const;
+       };
+
+       struct ExtractComponent
+       {
+               typedef bool (*Extract)(const KeyFrame &, Vector3 &);
+
+               Extract extract;
+               unsigned index;
+               Transform::ComponentMask mask;
+
+               ExtractComponent(Extract e, unsigned i, Transform::ComponentMask m): extract(e), index(i), mask(m) { }
+
+               bool operator()(const KeyFrame &, float &) const;
+       };
+
+       template<unsigned N>
+       struct ExtractUniform
+       {
+               const std::string &name;
+
+               ExtractUniform(const std::string &n): name(n) { }
+
+               bool operator()(const KeyFrame &, typename Interpolate::SplineValue<float, N>::Type &) const;
        };
 
        struct TimedKeyFrame
        {
-               const Animation &animation;
-               const TimedKeyFrame *prev;
                Time::TimeDelta time;
-               Time::TimeDelta delta_t;
                RefPtr<const KeyFrame> keyframe;
-               MatrixInterpolation matrix;
-               std::vector<MatrixInterpolation> pose_matrices;
+               bool control;
+       };
 
-               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:
        const Armature *armature;
-       KeyFrameList keyframes;
+       std::vector<TimedKeyFrame> keyframes;
+       std::vector<Event> events;
        bool looping;
+       std::vector<UniformInfo> uniforms;
+       std::vector<Curve *> curves;
+       unsigned uniform_curve_offset;
 
 public:
        Animation();
@@ -105,12 +177,34 @@ public:
        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_owned(const Time::TimeDelta &, const KeyFrame *);
+       DEPRECATED void add_keyframe(const Time::TimeDelta &, const KeyFrame &, float);
+       DEPRECATED void add_keyframe(const Time::TimeDelta &, const KeyFrame &, float, float);
+       void add_control_keyframe(const KeyFrame &);
+       void add_control_keyframe_owned(const KeyFrame *);
 private:
+       void add_keyframe(const Time::TimeDelta &, const KeyFrame *, float, float, bool);
+       void add_keyframe(const Time::TimeDelta &, const KeyFrame *, bool, bool);
        void prepare_keyframe(TimedKeyFrame &);
-
+       void create_curves();
+       void create_curve(CurveTarget, Transform::ComponentMask, ExtractComponent::Extract);
+       template<unsigned N, typename T>
+       void create_curve(CurveTarget target, int, const T &);
+       static bool extract_position(const KeyFrame &, Vector3 &);
+       static bool extract_euler(const KeyFrame &, Vector3 &);
+       static bool extract_scale(const KeyFrame &, Vector3 &);
 public:
+       void add_event(const Time::TimeDelta &, const std::string &, const Variant & = Variant());
+
+       const Msp::Time::TimeDelta &get_duration() const;
+
        void set_looping(bool);
+       bool is_looping() const { return looping; }
 };
 
 } // namespace GL