X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fanimationplayer.cpp;h=7c693ad2c3eef32ce7ec2a8aa74f4e754d130258;hp=a3676ac90543331ddcba021b60d1c1f2c038f10b;hb=bf1f59c4dca6b651e39c126c63a0780b65a34927;hpb=3d8438922e24b787587d0c8f1883c5567a4af573

diff --git a/source/animationplayer.cpp b/source/animationplayer.cpp
index a3676ac9..7c693ad2 100644
--- a/source/animationplayer.cpp
+++ b/source/animationplayer.cpp
@@ -1,3 +1,4 @@
+#include <msp/core/algorithm.h>
 #include "animatedobject.h"
 #include "animationplayer.h"
 #include "armature.h"
@@ -44,6 +45,34 @@ unsigned AnimationPlayer::get_n_active_animations(const AnimatedObject &obj) con
 	return (i!=objects.end() ? i->second.animations.size() : 0);
 }
 
+void AnimationPlayer::observe_events(AnimatedObject &obj, AnimationEventObserver &observer)
+{
+	Target &target = get_slot(obj);
+	if(find(target.event_observers, &observer)==target.event_observers.end())
+		target.event_observers.push_back(&observer);
+}
+
+void AnimationPlayer::unobserve_events(AnimatedObject &obj, AnimationEventObserver &observer)
+{
+	ObjectMap::iterator i = objects.find(&obj);
+	if(i==objects.end())
+		return;
+
+	vector<AnimationEventObserver *>::iterator j = find(i->second.event_observers, &observer);
+	if(j!=i->second.event_observers.end())
+		i->second.event_observers.erase(j);
+}
+
+void AnimationPlayer::unobserve_events(AnimationEventObserver &observer)
+{
+	for(ObjectMap::iterator i=objects.begin(); i!=objects.end(); ++i)
+	{
+		vector<AnimationEventObserver *>::iterator j = find(i->second.event_observers, &observer);
+		if(j!=i->second.event_observers.end())
+			i->second.event_observers.erase(j);
+	}
+}
+
 void AnimationPlayer::stop(AnimatedObject &obj)
 {
 	objects.erase(&obj);
@@ -70,20 +99,19 @@ void AnimationPlayer::tick(const Time::TimeDelta &dt)
 {
 	for(ObjectMap::iterator i=objects.begin(); i!=objects.end(); )
 	{
-		bool keep = false;
 		if(i->second.stacked)
-			keep = tick_stacked(i->second, dt);
-		else
-			keep = tick_single(i->second, dt);
+			tick_stacked(i->second, dt);
+		else if(!i->second.animations.empty())
+			tick_single(i->second, dt);
 
-		if(!keep)
+		if(i->second.animations.empty() && i->second.event_observers.empty())
 			objects.erase(i++);
 		else
 			++i;
 	}
 }
 
-bool AnimationPlayer::tick_single(Target &target, const Time::TimeDelta &dt)
+void AnimationPlayer::tick_single(Target &target, const Time::TimeDelta &dt)
 {
 	PlayingAnimation &anim = target.animations.front();
 	anim.iterator += dt;
@@ -100,10 +128,13 @@ bool AnimationPlayer::tick_single(Target &target, const Time::TimeDelta &dt)
 			target.object.set_pose_matrix(i, anim.iterator.get_pose_matrix(i));
 	}
 
-	return !anim.iterator.is_end();
+	anim.iterator.dispatch_events(target);
+
+	if(anim.iterator.is_end())
+		target.animations.clear();
 }
 
-bool AnimationPlayer::tick_stacked(Target &target, const Time::TimeDelta &dt)
+void AnimationPlayer::tick_stacked(Target &target, const Time::TimeDelta &dt)
 {
 	Matrix matrix = target.base_matrix;
 	for(vector<PlayingAnimation>::iterator i=target.animations.begin(); i!=target.animations.end(); ++i)
@@ -134,13 +165,16 @@ bool AnimationPlayer::tick_stacked(Target &target, const Time::TimeDelta &dt)
 
 	for(vector<PlayingAnimation>::iterator i=target.animations.begin(); i!=target.animations.end(); )
 	{
+		i->iterator.dispatch_events(target);
+
 		if(i->iterator.is_end())
 			i = target.animations.erase(i);
 		else
 			++i;
 	}
 
-	return !target.animations.empty();
+	if(target.animations.empty())
+		target.stacked = false;
 }
 
 void AnimationPlayer::set_object_uniform(AnimatedObject &obj, const string &name, const KeyFrame::AnimatedUniform &uni)
@@ -158,17 +192,23 @@ void AnimationPlayer::set_object_uniform(AnimatedObject &obj, const string &name
 }
 
 
+AnimationPlayer::PlayingAnimation::PlayingAnimation(const Animation &a):
+	animation(&a),
+	iterator(*animation)
+{ }
+
+
 AnimationPlayer::Target::Target(AnimatedObject &o):
 	object(o),
 	armature(0),
 	stacked(false)
 { }
 
-
-AnimationPlayer::PlayingAnimation::PlayingAnimation(const Animation &a):
-	animation(&a),
-	iterator(*animation)
-{ }
+void AnimationPlayer::Target::animation_event(AnimatedObject *, const string &name, const Variant &value)
+{
+	for(vector<AnimationEventObserver *>::const_iterator i=event_observers.begin(); i!=event_observers.end(); ++i)
+		(*i)->animation_event(&object, name, value);
+}
 
 } // namespace GL
 } // namespace Msp