more featureful sound class

[chaz/yoink] / src / YoinkApp.hh

diff --git a/src/YoinkApp.hh b/src/YoinkApp.hh
index 055a64c25ea97415d6a2f47bb844ae3188b46164..ad8d694e62619aee1c947e50f901e864310db95d 100644 (file)
--- a/src/YoinkApp.hh
+++ b/src/YoinkApp.hh
@@ -37,48 +37,51 @@
 #include <iostream>
 #include <string>
 
-#include "dispatcher.hh"
-#include "math.hh"
-#include "interpolator.hh"
-#include "engine.hh"
+#include <Moof/Camera.hh>
+#include <Moof/Dispatcher.hh>
+#include <Moof/Engine.hh>
+#include <Moof/Interpolator.hh>
+#include <Moof/Math.hh>
+#include <Moof/Scene.hh>
 
 #include "Character.hh"
-
 #include "TilemapFont.hh"
 
-#include "scene.hh"
+#include <Moof/Sound.hh>
+
+#include "Hud.hh"
 
 
-class YoinkApp : public dc::engine
+class YoinkApp : public Mf::Engine
 {
 public:
        YoinkApp(int argc, char* argv[]);
        ~YoinkApp();
 
 private:
-       void update(dc::scalar t, dc::scalar dt);
-       void draw(dc::scalar alpha);
-       void handleEvent(const dc::event& e);
+       void update(Mf::Scalar t, Mf::Scalar dt);
+       void draw(Mf::Scalar alpha);
+       void handleEvent(const Mf::Event& event);
 
        /**
         * Set OpenGL to a state we can know and depend on.
         */
        void setupGL();
-       void contextRecreated(const dc::notification& note);
-
-       //dc::animation* heroAnimation;
-       //dc::tilemap* heroineTexture;
-       Character* someChar;
-       //dc::binomial_interpolator<dc::vector2,2> interp;
-       dc::cerpv2 interp;
-       dc::lerps fadeIn;
+       void contextRecreated(const Mf::Notification* note);
 
-       dc::scene* testScene;
+       Mf::Sound music;
 
+       CharacterP heroine;
+       Mf::Sound punchSound;
        TilemapFont *font;
 
-       dc::scalar state;
-       dc::scalar prevstate;
+       Mf::Cerps interp;
+       Mf::Lerps fadeIn;
+
+       Mf::Camera camera;
+       Mf::SceneP testScene;
+
+       Hud hud;
 };