#include <msp/datafile/collection.h>
#include "keyframe.h"
#include "pose.h"
-#include "transform.h"
using namespace std;
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)
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()
{
- Transform trn;
- load_sub(trn);
- obj.matrix = trn.to_matrix();
+ load_sub(obj.transform);
}
void KeyFrame::Loader::uniforms()
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);