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

diff --git a/src/YoinkApp.hh b/src/YoinkApp.hh
index ad8d694..24865c9 100644
--- 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"
 
 
@@ -73,13 +70,16 @@ private:
 
 	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::OctreeP octree;
+
+	void myFunc(Mf::Timer& timer, Mf::Scalar t);
+	Mf::Timer myTimer;
+	int myThread();
 
 	Hud hud;
 };