Change AnimationPlayer::stop to take a Placeable

[libs/gl.git] / source / animationplayer.cpp

diff --git a/source/animationplayer.cpp b/source/animationplayer.cpp
index cbcb6b596f07addcdac87d3f7d6ab8bd3b992af4..ac16321874a7abd612ad6cf39fdb69cf1fdb8cf4 100644 (file)
--- 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())
@@ -209,7 +209,7 @@ void AnimationPlayer::set_object_uniform(AnimatedObject &obj, const string &name
                shdata.uniform(name, uni.values[0]);
        else if(uni.size==2)
                shdata.uniform2(name, uni.values);
-       else if(uni.size==2)
+       else if(uni.size==3)
                shdata.uniform3(name, uni.values);
        else if(uni.size==4)
                shdata.uniform4(name, uni.values);