Remove the deprecated ProgramBuilder class

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

diff --git a/source/keyframe.cpp b/source/keyframe.cpp
index 8e0d79044483f0fac6ba52c64476adb344e5b090..f610de2d42afbd08dd118cf97e7f54afa75da7de 100644 (file)
--- a/source/keyframe.cpp
+++ b/source/keyframe.cpp
@@ -14,9 +14,20 @@ KeyFrame::KeyFrame()
 KeyFrame::~KeyFrame()
 { }
 
+void KeyFrame::set_transform(const Transform &t)
+{
+       transform = t;
+}
+
 void KeyFrame::set_matrix(const Matrix &m)
 {
-       matrix = m;
+       transform = Transform::from_matrix(m);
+}
+
+void KeyFrame::set_uniform(const string &n, const AnimatedUniform &u)
+{
+       uniforms.erase(n);
+       uniforms.insert(UniformMap::value_type(n, u));
 }
 
 void KeyFrame::set_pose(const Pose &p)
@@ -26,6 +37,16 @@ void KeyFrame::set_pose(const Pose &p)
 }
 
 
+KeyFrame::AnimatedUniform::AnimatedUniform(unsigned s, float v0, float v1, float v2, float v3):
+       size(s)
+{
+       values[0] = v0;
+       values[1] = v1;
+       values[2] = v2;
+       values[3] = v3;
+}
+
+
 KeyFrame::Loader::Loader(KeyFrame &k):
        DataFile::CollectionObjectLoader<KeyFrame>(k, 0)
 {
@@ -42,6 +63,10 @@ void KeyFrame::Loader::init()
 {
        add("pose", &Loader::pose);
        add("pose", &Loader::pose_inline);
+       add("transform", &Loader::transform);
+       add("uniforms", &Loader::uniforms);
+
+       // Deprecated; use the transform statement instead
        add("position", &Loader::position);
        add("rotation", &Loader::rotation);
        add("scaling", &Loader::scaling_uniform);
@@ -63,22 +88,69 @@ void KeyFrame::Loader::pose_inline()
 
 void KeyFrame::Loader::position(float x, float y, float z)
 {
-       obj.matrix.translate(x, y, z);
+       obj.transform.set_position(Vector3(x, y, z));
 }
 
 void KeyFrame::Loader::rotation(float a, float x, float y, float z)
 {
-       obj.matrix.rotate_deg(a, x, y, z);
+       obj.transform.set_rotation(Transform::Angle::from_degrees(a), Vector3(x, y, z));
 }
 
 void KeyFrame::Loader::scaling_uniform(float s)
 {
-       obj.matrix.scale(s);
+       obj.transform.set_scale(s);
 }
 
 void KeyFrame::Loader::scaling(float x, float y, float z)
 {
-       obj.matrix.scale(x, y, z);
+       obj.transform.set_scale(Vector3(x, y, z));
+}
+
+void KeyFrame::Loader::transform()
+{
+       load_sub(obj.transform);
+}
+
+void KeyFrame::Loader::uniforms()
+{
+       UniformsLoader ldr(obj);
+       load_sub_with(ldr);
+}
+
+
+KeyFrame::UniformsLoader::UniformsLoader(KeyFrame &k):
+       DataFile::ObjectLoader<KeyFrame>(k)
+{
+       add("uniform", &UniformsLoader::uniform1f);
+       add("uniform", &UniformsLoader::uniform2f);
+       add("uniform", &UniformsLoader::uniform3f);
+       add("uniform", &UniformsLoader::uniform4f);
+
+       // Deprecated
+       add("uniform1f", &UniformsLoader::uniform1f);
+       add("uniform2f", &UniformsLoader::uniform2f);
+       add("uniform3f", &UniformsLoader::uniform3f);
+       add("uniform4f", &UniformsLoader::uniform4f);
+}
+
+void KeyFrame::UniformsLoader::uniform1f(const string &n, float v)
+{
+       obj.uniforms.insert(UniformMap::value_type(n, AnimatedUniform(1, v)));
+}
+
+void KeyFrame::UniformsLoader::uniform2f(const string &n, float v0, float v1)
+{
+       obj.uniforms.insert(UniformMap::value_type(n, AnimatedUniform(2, v0, v1)));
+}
+
+void KeyFrame::UniformsLoader::uniform3f(const string &n, float v0, float v1, float v2)
+{
+       obj.uniforms.insert(UniformMap::value_type(n, AnimatedUniform(3, v0, v1, v2)));
+}
+
+void KeyFrame::UniformsLoader::uniform4f(const string &n, float v0, float v1, float v2, float v3)
+{
+       obj.uniforms.insert(UniformMap::value_type(n, AnimatedUniform(4, v0, v1, v2, v3)));
 }
 
 } // namespace GL