Refresh lighting and culling uniforms if the camera changes in pop_state

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

diff --git a/source/animationplayer.cpp b/source/animationplayer.cpp
index 9db88e78bb74ea6a5d01dc75e7cfa9ea1a88030a..59c6f595a0b45cb889b1e7b447084205a26cb22d 100644 (file)
--- a/source/animationplayer.cpp
+++ b/source/animationplayer.cpp
@@ -48,6 +48,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(); )
@@ -93,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)
+                       slot.object.set_uniform(i->animation.get_uniform_name(j), i->iterator.get_uniform(j));
        }
        slot.object.set_matrix(matrix);