X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fkeyframe.cpp;h=f610de2d42afbd08dd118cf97e7f54afa75da7de;hp=8eba17292368a33b576a0ae0186ee9388aacaa6b;hb=99d25b5ef615a23ef63645fea87596b3384b5ede;hpb=a4549c55a6d47129bd9e42c6a49a671b759ce6d9

diff --git a/source/keyframe.cpp b/source/keyframe.cpp
index 8eba1729..f610de2d 100644
--- a/source/keyframe.cpp
+++ b/source/keyframe.cpp
@@ -24,6 +24,12 @@ void KeyFrame::set_matrix(const 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)
 {
 	pose = &p;
@@ -115,6 +121,12 @@ 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);