X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2FYoinkApp.hh;h=475dca35cd6d6259bacad22e4d8eb798976e5df9;hb=87bc17e55b0c1dc73ecc66df856d3f08fd7a7724;hp=69b53d92e6eb93f98809c5d05127660114b036ac;hpb=79b5f738f2e38acb60cda7e09f54802933a17105;p=chaz%2Fyoink

diff --git a/src/YoinkApp.hh b/src/YoinkApp.hh
index 69b53d9..475dca3 100644
--- 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,35 @@ 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 x, y, z;
+
+	dc::scalar state;
+	dc::scalar prevstate;
 };
 
 
 #endif // _YOINKAPP_HH_
 
+/** vim: set ts=4 sw=4 tw=80: *************************************************/
+