Have Object provide an identity matrix from get_matrix

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

diff --git a/source/keyframe.h b/source/keyframe.h
index 4b0fa5bdcafd1c9b313654a4cb27cca7a3c65ed1..7854a928863c86ea7d2a30891d97a3687ac44b22 100644 (file)
--- a/source/keyframe.h
+++ b/source/keyframe.h
@@ -1,34 +1,74 @@
 #ifndef MSP_GL_KEYFRAME_H_
 #define MSP_GL_KEYFRAME_H_
 
+#include <msp/core/refptr.h>
 #include <msp/datafile/objectloader.h>
 #include "matrix.h"
 
 namespace Msp {
 namespace GL {
 
+class Pose;
+
 /**
 Keyframes are used to encapsulate object state for animation.
 */
 class KeyFrame
 {
 public:
-       class Loader: public DataFile::ObjectLoader<KeyFrame>
+       class Loader: public DataFile::CollectionObjectLoader<KeyFrame>
        {
        public:
                Loader(KeyFrame &);
+               Loader(KeyFrame &, Collection &);
        private:
+               void init();
+
+               void pose(const std::string &);
+               void pose_inline();
                void position(float, float, float);
                void rotation(float, float, float, float);
                void scaling_uniform(float);
                void scaling(float, float, float);
+               void uniforms();
+       };
+
+       class UniformsLoader: public DataFile::ObjectLoader<KeyFrame>
+       {
+       public:
+               UniformsLoader(KeyFrame &);
+
+       private:
+               void uniform1f(const std::string &, float);
+               void uniform2f(const std::string &, float, float);
+               void uniform3f(const std::string &, float, float, float);
+               void uniform4f(const std::string &, float, float, float, float);
        };
 
+       struct AnimatedUniform
+       {
+               unsigned size;
+               float values[4];
+
+               AnimatedUniform(unsigned, float, float = 0.0f, float = 0.0f, float = 0.0f);
+       };
+
+       typedef std::map<std::string, AnimatedUniform> UniformMap;
+
 private:
        Matrix matrix;
+       UniformMap uniforms;
+       RefPtr<const Pose> pose;
 
 public:
+       KeyFrame();
+       ~KeyFrame();
+
+       void set_matrix(const Matrix &);
+       void set_pose(const Pose &);
        const Matrix &get_matrix() const { return matrix; }
+       const UniformMap &get_uniforms() const { return uniforms; }
+       const Pose *get_pose() const { return pose.get(); }
 };
 
 } // namespace GL