big batch of progress

[chaz/yoink] / src / YoinkApp.hh

diff --git a/src/YoinkApp.hh b/src/YoinkApp.hh
index 69b53d92e6eb93f98809c5d05127660114b036ac..055a64c25ea97415d6a2f47bb844ae3188b46164 100644 (file)
--- a/src/YoinkApp.hh
+++ b/src/YoinkApp.hh
@@ -29,12 +29,24 @@
 #ifndef _YOINKAPP_HH_
 #define _YOINKAPP_HH_
 
+/**
+ * @file YoinkApp.hh
+ * This is the big enchilada.
+ */
+
 #include <iostream>
 #include <string>
 
+#include "dispatcher.hh"
+#include "math.hh"
+#include "interpolator.hh"
 #include "engine.hh"
 
-#include "texture.hh"
+#include "Character.hh"
+
+#include "TilemapFont.hh"
+
+#include "scene.hh"
 
 
 class YoinkApp : public dc::engine
@@ -44,16 +56,33 @@ public:
        ~YoinkApp();
 
 private:
-       void update(double t, double dt);
-       void draw(double alpha);
-       void dispatchEvent(const SDL_Event& event);
+       void update(dc::scalar t, dc::scalar dt);
+       void draw(dc::scalar alpha);
+       void handleEvent(const dc::event& e);
+
+       /**
+        * Set OpenGL to a state we can know and depend on.
+        */
+       void setupGL();
+       void contextRecreated(const dc::notification& note);
 
-       dc::texture* heroineTexture;
+       //dc::animation* heroAnimation;
+       //dc::tilemap* heroineTexture;
+       Character* someChar;
+       //dc::binomial_interpolator<dc::vector2,2> interp;
+       dc::cerpv2 interp;
+       dc::lerps fadeIn;
 
-       double state;
-       double prevstate;
+       dc::scene* testScene;
+
+       TilemapFont *font;
+
+       dc::scalar state;
+       dc::scalar prevstate;
 };
 
 
 #endif // _YOINKAPP_HH_
 
+/** vim: set ts=4 sw=4 tw=80: *************************************************/
+