From: Mikko Rasa Date: Sun, 23 Jun 2019 21:25:26 +0000 (+0300) Subject: Change AnimationPlayer::stop to take a Placeable X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=d9d576e116507f17829af0a0d42585f9843b542e;p=libs%2Fgl.git Change AnimationPlayer::stop to take a Placeable --- diff --git a/source/animationplayer.cpp b/source/animationplayer.cpp index a3c6ee22..ac163218 100644 --- a/source/animationplayer.cpp +++ b/source/animationplayer.cpp @@ -91,12 +91,12 @@ void AnimationPlayer::unobserve_events(AnimationEventObserver &observer) } } -void AnimationPlayer::stop(AnimatedObject &obj) +void AnimationPlayer::stop(Placeable &obj) { objects.erase(&obj); } -void AnimationPlayer::stop(AnimatedObject &obj, const Animation &anim) +void AnimationPlayer::stop(Placeable &obj, const Animation &anim) { ObjectMap::iterator i = objects.find(&obj); if(i==objects.end()) diff --git a/source/animationplayer.h b/source/animationplayer.h index b6575304..c45027d9 100644 --- a/source/animationplayer.h +++ b/source/animationplayer.h @@ -77,10 +77,10 @@ public: void unobserve_events(AnimationEventObserver &); /// Stops all animations affecting an object. - void stop(AnimatedObject &); + void stop(Placeable &); /// Stops a single animation affecting an object. - void stop(AnimatedObject &, const Animation &); + void stop(Placeable &, const Animation &); /** Advances all playing animations. Should be called in a regular manner, preferably just before rendering. */