considerable refactoring

[chaz/yoink] / src / YoinkApp.hh

diff --git a/src/YoinkApp.hh b/src/YoinkApp.hh
index 19564b5d903e559849bb1bb2865986a48c08eee1..65e730bccbeca19729edd2ae8a3330b5b1086280 100644 (file)
--- a/src/YoinkApp.hh
+++ b/src/YoinkApp.hh
@@ -37,6 +37,7 @@
 #include <iostream>
 #include <string>
 
+#include <Moof/Camera.hh>
 #include <Moof/Dispatcher.hh>
 #include <Moof/Engine.hh>
 #include <Moof/Interpolator.hh>
@@ -46,6 +47,10 @@
 #include "Character.hh"
 #include "TilemapFont.hh"
 
+#include <Moof/Sound.hh>
+
+#include "Hud.hh"
+
 
 class YoinkApp : public Mf::Engine
 {
@@ -62,20 +67,25 @@ private:
         * Set OpenGL to a state we can know and depend on.
         */
        void setupGL();
-       void contextRecreated(const Mf::Notification& note);
+       void contextRecreated(const Mf::Notification* note);
+
+       Mf::Lerps musicFade;
+       Mf::SoundStream music;
 
-       Character* someChar;
+       CharacterP heroine;
+       Mf::Sound punchSound;
        TilemapFont *font;
 
-       Mf::Cerpv2 interp;
+       Mf::Cerps interp;
        Mf::Lerps fadeIn;
 
+       Mf::Camera camera;
        Mf::Scene* testScene;
 
-       Mf::Scalar x, y, z;
-
        Mf::Scalar state;
        Mf::Scalar prevstate;
+
+       Hud hud;
 };