X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fanimationplayer.cpp;h=cbcb6b596f07addcdac87d3f7d6ab8bd3b992af4;hp=cd71679800fffea672ebea6c4ef84ed796622104;hb=d366b051df5543c46ebae383ce08e940788e950d;hpb=a993091fbb8fdb76a1d02be9de59529c14b59cf0 diff --git a/source/animationplayer.cpp b/source/animationplayer.cpp index cd716798..cbcb6b59 100644 --- a/source/animationplayer.cpp +++ b/source/animationplayer.cpp @@ -1,3 +1,4 @@ +#include #include "animatedobject.h" #include "animationplayer.h" #include "armature.h" @@ -8,7 +9,7 @@ using namespace std; namespace Msp { namespace GL { -AnimationPlayer::Target &AnimationPlayer::get_slot(AnimatedObject &obj) +AnimationPlayer::Target &AnimationPlayer::get_slot(Placeable &obj) { ObjectMap::iterator i = objects.find(&obj); if(i!=objects.end()) @@ -17,25 +18,43 @@ AnimationPlayer::Target &AnimationPlayer::get_slot(AnimatedObject &obj) return objects.insert(ObjectMap::value_type(&obj, Target(obj))).first->second; } -void AnimationPlayer::play(AnimatedObject &obj, const Animation &anim) +AnimationPlayer::Target &AnimationPlayer::play_(Placeable &obj, const Animation &anim, bool stacked, float speed) { Target &target = get_slot(obj); - target.animations.clear(); - target.base_matrix = Matrix(); - target.stacked = false; + if(!stacked) + { + target.animations.clear(); + target.base_matrix = Matrix(); + } + else if(target.animations.empty()) + target.base_matrix = *obj.get_matrix(); + target.stacked = stacked; + // TODO check for incompatible armature target.armature = anim.get_armature(); - target.animations.push_back(PlayingAnimation(anim)); + target.animations.push_back(PlayingAnimation(anim, speed)); + return target; } -void AnimationPlayer::play_stacked(AnimatedObject &obj, const Animation &anim) +void AnimationPlayer::play(AnimatedObject &obj, const Animation &anim, float speed) { - Target &target = get_slot(obj); - if(target.animations.empty()) - target.base_matrix = *obj.get_matrix(); - // TODO check for incompatible armature - target.stacked = true; - target.armature = anim.get_armature(); - target.animations.push_back(PlayingAnimation(anim)); + Target &target = play_(obj, anim, false, speed); + target.object = &obj; +} + +void AnimationPlayer::play(Placeable &obj, const Animation &anim, float speed) +{ + play_(obj, anim, false, speed); +} + +void AnimationPlayer::play_stacked(AnimatedObject &obj, const Animation &anim, float speed) +{ + Target &target = play_(obj, anim, true, speed); + target.object = &obj; +} + +void AnimationPlayer::play_stacked(Placeable &obj, const Animation &anim, float speed) +{ + play_(obj, anim, true, speed); } unsigned AnimationPlayer::get_n_active_animations(const AnimatedObject &obj) const @@ -44,6 +63,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::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::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); @@ -72,10 +119,10 @@ void AnimationPlayer::tick(const Time::TimeDelta &dt) { if(i->second.stacked) tick_stacked(i->second, dt); - else + else if(!i->second.animations.empty()) tick_single(i->second, dt); - if(i->second.animations.empty()) + if(i->second.animations.empty() && i->second.event_observers.empty()) objects.erase(i++); else ++i; @@ -85,21 +132,26 @@ void AnimationPlayer::tick(const Time::TimeDelta &dt) void AnimationPlayer::tick_single(Target &target, const Time::TimeDelta &dt) { PlayingAnimation &anim = target.animations.front(); - anim.iterator += dt; - target.object.set_matrix(anim.iterator.get_matrix()); + anim.iterator += dt*anim.speed; + target.placeable.set_matrix(anim.iterator.get_matrix()); - unsigned n_uniforms = anim.animation->get_n_uniforms(); - for(unsigned i=0; iget_uniform_name(i), anim.iterator.get_uniform(i)); - - if(target.armature) + if(target.object) { - unsigned max_index = target.armature->get_max_link_index(); - for(unsigned i=0; i<=max_index; ++i) - target.object.set_pose_matrix(i, anim.iterator.get_pose_matrix(i)); + unsigned n_uniforms = anim.animation->get_n_uniforms(); + for(unsigned i=0; iget_uniform_name(i), anim.iterator.get_uniform(i)); + + if(target.armature) + { + unsigned max_index = target.armature->get_max_link_index(); + for(unsigned i=0; i<=max_index; ++i) + target.object->set_pose_matrix(i, anim.iterator.get_pose_matrix(i)); + } } - if(!anim.iterator.is_end()) + anim.iterator.dispatch_events(target); + + if(anim.iterator.is_end()) target.animations.clear(); } @@ -108,16 +160,19 @@ void AnimationPlayer::tick_stacked(Target &target, const Time::TimeDelta &dt) Matrix matrix = target.base_matrix; for(vector::iterator i=target.animations.begin(); i!=target.animations.end(); ++i) { - i->iterator += dt; + i->iterator += dt*i->speed; matrix *= i->iterator.get_matrix(); - unsigned n_uniforms = i->animation->get_n_uniforms(); - for(unsigned j=0; janimation->get_uniform_name(j), i->iterator.get_uniform(j)); + if(target.object) + { + unsigned n_uniforms = i->animation->get_n_uniforms(); + for(unsigned j=0; janimation->get_uniform_name(j), i->iterator.get_uniform(j)); + } } - target.object.set_matrix(matrix); + target.placeable.set_matrix(matrix); - if(target.armature) + if(target.object && target.armature) { unsigned max_index = target.armature->get_max_link_index(); for(unsigned i=0; i<=max_index; ++i) @@ -128,12 +183,14 @@ void AnimationPlayer::tick_stacked(Target &target, const Time::TimeDelta &dt) for(vector::iterator j=target.animations.begin(); j!=target.animations.end(); ++j) if(j->animation->get_armature()) matrix *= j->iterator.get_pose_matrix(i); - target.object.set_pose_matrix(i, matrix); + target.object->set_pose_matrix(i, matrix); } } for(vector::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 @@ -159,17 +216,25 @@ void AnimationPlayer::set_object_uniform(AnimatedObject &obj, const string &name } -AnimationPlayer::Target::Target(AnimatedObject &o): - object(o), - armature(0), - stacked(false) +AnimationPlayer::PlayingAnimation::PlayingAnimation(const Animation &a, float s): + animation(&a), + speed(s), + iterator(*animation) { } -AnimationPlayer::PlayingAnimation::PlayingAnimation(const Animation &a): - animation(&a), - iterator(*animation) +AnimationPlayer::Target::Target(Placeable &p): + placeable(p), + object(0), + armature(0), + stacked(false) { } +void AnimationPlayer::Target::animation_event(Placeable *, const string &name, const Variant &value) +{ + for(vector::const_iterator i=event_observers.begin(); i!=event_observers.end(); ++i) + (*i)->animation_event(&placeable, name, value); +} + } // namespace GL } // namespace Msp