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

diff --git a/src/YoinkApp.hh b/src/YoinkApp.hh
index 6a947f9..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"
 
 
@@ -69,21 +66,20 @@ private:
 	void setupGL();
 	void contextRecreated(const Mf::Notification* note);
 
-	Mf::Lerps musicFade;
-	Mf::SoundStream music;
+	Mf::Sound music;
 
 	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;
 
-	Mf::Scalar state;
-	Mf::Scalar prevstate;
+	void myFunc(Mf::Timer& timer, Mf::Scalar t);
+	Mf::Timer myTimer;
+	int myThread();
 
 	Hud hud;
 };