new lua scripting for scene loading

[chaz/yoink] / src / YoinkApp.hh

diff --git a/src/YoinkApp.hh b/src/YoinkApp.hh
index 69b53d92e6eb93f98809c5d05127660114b036ac..950d31983002443dd83abe9c3c70d4a57321f1b8 100644 (file)
--- a/src/YoinkApp.hh
+++ b/src/YoinkApp.hh
@@ -29,31 +29,59 @@
 #ifndef _YOINKAPP_HH_
 #define _YOINKAPP_HH_
 
+/**
+ * @file YoinkApp.hh
+ * This is the big enchilada.
+ */
+
 #include <iostream>
 #include <string>
 
-#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 <Moof/Sound.hh>
 
-#include "texture.hh"
+#include "Character.hh"
+#include "Hud.hh"
 
 
-class YoinkApp : public dc::engine
+class YoinkApp : public Mf::Engine
 {
 public:
        YoinkApp(int argc, char* argv[]);
        ~YoinkApp();
 
 private:
-       void update(double t, double dt);
-       void draw(double alpha);
-       void dispatchEvent(const SDL_Event& event);
+       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 Mf::Notification* note);
+
+       Mf::Sound music;
 
-       dc::texture* heroineTexture;
+       CharacterP heroine;
+       Mf::Sound punchSound;
 
-       double state;
-       double prevstate;
+       Mf::PolynomialInterpolator<5> interp;
+       Mf::Lerp fadeIn;
+
+       Mf::Camera camera;
+       Mf::OctreeP octree;
+
+       Hud hud;
 };
 
 
 #endif // _YOINKAPP_HH_
 
+/** vim: set ts=4 sw=4 tw=80: *************************************************/
+