new lua scripting for scene loading

[chaz/yoink] / src / YoinkApp.hh

diff --git a/src/YoinkApp.hh b/src/YoinkApp.hh
index 66406d2d4447c0979ddb0ef94f1bced85da45569..950d31983002443dd83abe9c3c70d4a57321f1b8 100644 (file)
--- a/src/YoinkApp.hh
+++ b/src/YoinkApp.hh
@@ -43,9 +43,10 @@
 #include <Moof/Interpolator.hh>
 #include <Moof/Math.hh>
 #include <Moof/Scene.hh>
+#include <Moof/Sound.hh>
 
 #include "Character.hh"
-#include "TilemapFont.hh"
+#include "Hud.hh"
 
 
 class YoinkApp : public Mf::Engine
@@ -63,21 +64,20 @@ 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);
 
-       Character* someChar;
-       TilemapFont *font;
+       Mf::Sound music;
 
-       Mf::Cerpv2 interp;
-       Mf::Lerps fadeIn;
+       CharacterP heroine;
+       Mf::Sound punchSound;
 
-       Mf::Camera camera;
-       Mf::Scene* testScene;
+       Mf::PolynomialInterpolator<5> interp;
+       Mf::Lerp fadeIn;
 
-       Mf::Scalar x, y, z;
+       Mf::Camera camera;
+       Mf::OctreeP octree;
 
-       Mf::Scalar state;
-       Mf::Scalar prevstate;
+       Hud hud;
 };