X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FYoinkApp.hh;h=24865c93fa741089fdd4b5fefdae6b097f7dfe77;hp=66406d2d4447c0979ddb0ef94f1bced85da45569;hb=33842c860fe18ca8cf087905992885687434320c;hpb=29e3d45f7bbbf31eadf793c41ff2b3d9c47b7539

diff --git a/src/YoinkApp.hh b/src/YoinkApp.hh
index 66406d2..24865c9 100644
--- 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,24 @@ 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::PolynomialInterpolator<5> interp;
+	Mf::Lerp fadeIn;
 
 	Mf::Camera camera;
-	Mf::Scene* testScene;
+	Mf::OctreeP octree;
 
-	Mf::Scalar x, y, z;
+	void myFunc(Mf::Timer& timer, Mf::Scalar t);
+	Mf::Timer myTimer;
+	int myThread();
 
-	Mf::Scalar state;
-	Mf::Scalar prevstate;
+	Hud hud;
 };