X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FYoinkApp.hh;h=950d31983002443dd83abe9c3c70d4a57321f1b8;hp=1613707730ea0d6a3efc7d499556d73d162e65a5;hb=7e898e8ec0ff716e2fc722b883a626a6c346f107;hpb=bfa6212d09d8735d8fd5e2638188e4a99f21ada4

diff --git a/src/YoinkApp.hh b/src/YoinkApp.hh
index 1613707..950d319 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"
 
 
@@ -67,22 +64,18 @@ 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);
 
-	Mf::SoundStream music;
+	Mf::Sound music;
 
-	CharacterPtr heroine;
+	CharacterP heroine;
 	Mf::Sound punchSound;
-	TilemapFont *font;
 
-	Mf::Cerps interp;
-	Mf::Lerps fadeIn;
+	Mf::PolynomialInterpolator<5> interp;
+	Mf::Lerp fadeIn;
 
 	Mf::Camera camera;
-	Mf::Scene* testScene;
-
-	Mf::Scalar state;
-	Mf::Scalar prevstate;
+	Mf::OctreeP octree;
 
 	Hud hud;
 };