new lua scripting for scene loading

[chaz/yoink] / src / YoinkApp.hh

diff --git a/src/YoinkApp.hh b/src/YoinkApp.hh
index 6a947f9d8dfcb51408798258b2fea42f4c963589..950d31983002443dd83abe9c3c70d4a57321f1b8 100644 (file)
--- a/src/YoinkApp.hh
+++ b/src/YoinkApp.hh
@@ -43,12 +43,9 @@
 #include <Moof/Interpolator.hh>
 #include <Moof/Math.hh>
 #include <Moof/Scene.hh>
-
-#include "Character.hh"
-#include "TilemapFont.hh"
-
 #include <Moof/Sound.hh>
 
+#include "Character.hh"
 #include "Hud.hh"
 
 
@@ -69,21 +66,16 @@ private:
        void setupGL();
        void contextRecreated(const Mf::Notification* note);
 
-       Mf::Lerps musicFade;
-       Mf::SoundStream music;
+       Mf::Sound music;
 
        CharacterP heroine;
        Mf::Sound punchSound;
-       TilemapFont *font;
 
-       Mf::Cerps interp;
-       Mf::Lerps fadeIn;
+       Mf::PolynomialInterpolator<5> interp;
+       Mf::Lerp fadeIn;
 
        Mf::Camera camera;
-       Mf::SceneP testScene;
-
-       Mf::Scalar state;
-       Mf::Scalar prevstate;
+       Mf::OctreeP octree;
 
        Hud hud;
 };