]> git.tdb.fi Git - libs/gl.git/commitdiff
Also set uniforms in tick_stacked
authorMikko Rasa <tdb@tdb.fi>
Sat, 1 Aug 2015 19:53:35 +0000 (22:53 +0300)
committerMikko Rasa <tdb@tdb.fi>
Sat, 1 Aug 2015 19:53:35 +0000 (22:53 +0300)
source/animationplayer.cpp

index 9db88e78bb74ea6a5d01dc75e7cfa9ea1a88030a..ffb902a8f555e51ecd250c9a99422af8e9d35451 100644 (file)
@@ -93,6 +93,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);