X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fanimationplayer.cpp;h=e73d1113f2a1443948e082d44258f2f39208bc8a;hp=6148ed006bd0ebdfe0e27b15c0971b2bc7f56ac9;hb=72a13418cc19e750abf3f8d8a52aea5e1abe4983;hpb=cd7dff6e8cf6a7b678b359e1cf02695ad688468f

diff --git a/source/animationplayer.cpp b/source/animationplayer.cpp
index 6148ed00..e73d1113 100644
--- a/source/animationplayer.cpp
+++ b/source/animationplayer.cpp
@@ -1,6 +1,7 @@
 #include "animatedobject.h"
 #include "animationplayer.h"
 #include "armature.h"
+#include "programdata.h"
 
 using namespace std;
 
@@ -48,6 +49,23 @@ void AnimationPlayer::stop(AnimatedObject &obj)
 	objects.erase(&obj);
 }
 
+void AnimationPlayer::stop(AnimatedObject &obj, const Animation &anim)
+{
+	ObjectMap::iterator i = objects.find(&obj);
+	if(i==objects.end())
+		return;
+
+	for(AnimationList::iterator j=i->second.animations.begin(); j!=i->second.animations.end(); ++j)
+		if(&j->animation==&anim)
+		{
+			i->second.animations.erase(j);
+			break;
+		}
+
+	if(i->second.animations.empty())
+		objects.erase(i);
+}
+
 void AnimationPlayer::tick(const Time::TimeDelta &dt)
 {
 	for(ObjectMap::iterator i=objects.begin(); i!=objects.end(); )
@@ -67,15 +85,19 @@ void AnimationPlayer::tick(const Time::TimeDelta &dt)
 
 bool AnimationPlayer::tick_single(ObjectSlot &slot, const Time::TimeDelta &dt)
 {
-	AnimatedObject &obj = slot.object;
 	AnimationSlot &anim = slot.animations.front();
 	anim.iterator += dt;
-	obj.set_matrix(anim.iterator.get_matrix());
+	slot.object.set_matrix(anim.iterator.get_matrix());
+
+	unsigned n_uniforms = anim.animation.get_n_uniforms();
+	for(unsigned i=0; i<n_uniforms; ++i)
+		set_object_uniform(slot.object, anim.animation.get_uniform_name(i), anim.iterator.get_uniform(i));
+
 	if(slot.armature)
 	{
 		unsigned max_index = slot.armature->get_max_link_index();
 		for(unsigned i=0; i<=max_index; ++i)
-			obj.set_pose_matrix(i, anim.iterator.get_pose_matrix(i));
+			slot.object.set_pose_matrix(i, anim.iterator.get_pose_matrix(i));
 	}
 
 	return !anim.iterator.is_end();
@@ -88,6 +110,10 @@ bool AnimationPlayer::tick_stacked(ObjectSlot &slot, const Time::TimeDelta &dt)
 	{
 		i->iterator += dt;
 		matrix *= i->iterator.get_matrix();
+
+		unsigned n_uniforms = i->animation.get_n_uniforms();
+		for(unsigned j=0; j<n_uniforms; ++j)
+			set_object_uniform(slot.object, i->animation.get_uniform_name(j), i->iterator.get_uniform(j));
 	}
 	slot.object.set_matrix(matrix);
 
@@ -117,6 +143,20 @@ bool AnimationPlayer::tick_stacked(ObjectSlot &slot, const Time::TimeDelta &dt)
 	return !slot.animations.empty();
 }
 
+void AnimationPlayer::set_object_uniform(AnimatedObject &obj, const string &name, const KeyFrame::AnimatedUniform &uni)
+{
+	ProgramData &shdata = obj.get_shader_data();
+
+	if(uni.size==1)
+		shdata.uniform(name, uni.values[0]);
+	else if(uni.size==2)
+		shdata.uniform2(name, uni.values);
+	else if(uni.size==2)
+		shdata.uniform3(name, uni.values);
+	else if(uni.size==4)
+		shdata.uniform4(name, uni.values);
+}
+
 
 AnimationPlayer::ObjectSlot::ObjectSlot(AnimatedObject &o):
 	object(o),