preliminary physics, sound, hud

[chaz/yoink] / src / YoinkApp.hh

diff --git a/src/YoinkApp.hh b/src/YoinkApp.hh
index 66406d2d4447c0979ddb0ef94f1bced85da45569..1613707730ea0d6a3efc7d499556d73d162e65a5 100644 (file)
--- a/src/YoinkApp.hh
+++ b/src/YoinkApp.hh
@@ -47,6 +47,10 @@
 #include "Character.hh"
 #include "TilemapFont.hh"
 
 #include "Character.hh"
 #include "TilemapFont.hh"
 

+#include <Moof/Sound.hh>
+
+#include "Hud.hh"
+

 
 class YoinkApp : public Mf::Engine
 {
 
 class YoinkApp : public Mf::Engine
 {


@@ -65,19 +69,22 @@ private:
        void setupGL();
        void contextRecreated(const Mf::Notification& note);
 
        void setupGL();
        void contextRecreated(const Mf::Notification& note);
 

-       Character* someChar;
+       Mf::SoundStream music;
+
+       CharacterPtr heroine;
+       Mf::Sound punchSound;

        TilemapFont *font;
 
        TilemapFont *font;
 

-       Mf::Cerpv2 interp;
+       Mf::Cerps interp;

        Mf::Lerps fadeIn;
 
        Mf::Camera camera;
        Mf::Scene* testScene;
 
        Mf::Lerps fadeIn;
 
        Mf::Camera camera;
        Mf::Scene* testScene;
 

-       Mf::Scalar x, y, z;
-

        Mf::Scalar state;
        Mf::Scalar prevstate;
        Mf::Scalar state;
        Mf::Scalar prevstate;

+
+       Hud hud;

 };
 
 
 };