Merge CameraControl functionality into other classes

[libs/demoscene.git] / source / demo.cpp

diff --git a/source/demo.cpp b/source/demo.cpp
index 2072f297bc9ca1e84edeb9a3f5bd81cd17abcbee..08a92b4f0d6bd925709de855a30cec20201adcf2 100644 (file)
--- a/source/demo.cpp
+++ b/source/demo.cpp
@@ -7,6 +7,7 @@ using namespace Msp;
 Demo::Demo(Graphics::Window &window, Graphics::GLContext &gl_ctx, DataFile::Collection &r):
        resources(r),
        view(window, gl_ctx),
+       anim_action(anim_player),
        music_source(0),
        streamer(0),
        music_io(0),
@@ -14,6 +15,7 @@ Demo::Demo(Graphics::Window &window, Graphics::GLContext &gl_ctx, DataFile::Coll
 {
        things["window"] = static_cast<GL::View *>(&view);
 
+       sequencer.add_static_action(anim_action);
        sequencer.signal_finished.connect(signal_finished);
 }
 
@@ -77,3 +79,13 @@ void Demo::seek(const Time::TimeDelta &pos)
 {
        sequencer.seek(pos*sequencer.get_beats_per_minute()/Time::min);
 }
+
+
+Demo::AnimationAction::AnimationAction(GL::AnimationPlayer &p):
+       player(p)
+{ }
+
+void Demo::AnimationAction::tick(float, float d)
+{
+       player.tick(d*Time::sec);
+}