cleaned up dispatcher

[chaz/yoink] / src / YoinkApp.cc

diff --git a/src/YoinkApp.cc b/src/YoinkApp.cc
index a1c2dbbf8133f273e2aca98efdf2dc3f8db133ef..bf6d71ab8d462d81507ee6525be954287111a51e 100644 (file)
--- a/src/YoinkApp.cc
+++ b/src/YoinkApp.cc
@@ -111,6 +111,8 @@ YoinkApp::YoinkApp(int argc, char* argv[]) :
                        boost::bind(&YoinkApp::contextRecreated, this, _1), this);
        setupGL();
 
+       Mf::Scalar fade[2] = {0.0, 1.0};
+       musicFade.init(fade, 0.0);
        music.play();
 
        state = 0.0;
@@ -176,7 +178,7 @@ void YoinkApp::setupGL()
        //glLineWidth(10.0f);
 }
 
-void YoinkApp::contextRecreated(const Mf::Notification& note)
+void YoinkApp::contextRecreated(const Mf::Notification* note)
 {
        // Whenever the context and a new one created, it probably won't contain our
        // state so we need to set that up again.
@@ -187,6 +189,10 @@ void YoinkApp::contextRecreated(const Mf::Notification& note)
 void YoinkApp::update(Mf::Scalar t, Mf::Scalar dt)
 {
        //dt *= 0.2;
+
+       musicFade.update(dt);
+       music.update(t, dt);
+       music.setGain(musicFade.getValue());
        
        fadeIn.update(dt);
 
@@ -404,6 +410,10 @@ void YoinkApp::handleEvent(const Mf::Event& event)
                        {
                                testScene->refresh();
                        }
+                       else if (event.key.keysym.sym == SDLK_p)
+                       {
+                               music.togglePlayPause();
+                       }
                        else if (event.key.keysym.sym == SDLK_l)
                        {
                                getVideo().toggleCursorGrab();
@@ -415,7 +425,7 @@ void YoinkApp::handleEvent(const Mf::Event& event)
 
                case SDL_MOUSEMOTION:
                case SDL_MOUSEBUTTONDOWN:
-                       camera.adjustFromInput(event);
+                       camera.handleEvent(event);
                        break;
 
                case SDL_QUIT: