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

diff --git a/src/YoinkApp.hh b/src/YoinkApp.hh
index 475dca3..ad8d694 100644
--- a/src/YoinkApp.hh
+++ b/src/YoinkApp.hh
@@ -37,50 +37,51 @@
 #include <iostream>
 #include <string>
 
-#include "dispatcher.hh"
-#include "math.hh"
-#include "interpolator.hh"
-#include "engine.hh"
+#include <Moof/Camera.hh>
+#include <Moof/Dispatcher.hh>
+#include <Moof/Engine.hh>
+#include <Moof/Interpolator.hh>
+#include <Moof/Math.hh>
+#include <Moof/Scene.hh>
 
 #include "Character.hh"
-
 #include "TilemapFont.hh"
 
-#include "scene.hh"
+#include <Moof/Sound.hh>
+
+#include "Hud.hh"
 
 
-class YoinkApp : public dc::engine
+class YoinkApp : public Mf::Engine
 {
 public:
 	YoinkApp(int argc, char* argv[]);
 	~YoinkApp();
 
 private:
-	void update(dc::scalar t, dc::scalar dt);
-	void draw(dc::scalar alpha);
-	void handleEvent(const dc::event& e);
+	void update(Mf::Scalar t, Mf::Scalar dt);
+	void draw(Mf::Scalar alpha);
+	void handleEvent(const Mf::Event& event);
 
 	/**
 	 * Set OpenGL to a state we can know and depend on.
 	 */
 	void setupGL();
-	void contextRecreated(const dc::notification& note);
+	void contextRecreated(const Mf::Notification* note);
 
-	//dc::animation* heroAnimation;
-	//dc::tilemap* heroineTexture;
-	Character* someChar;
-	//dc::binomial_interpolator<dc::vector2,2> interp;
-	dc::cerpv2 interp;
-	dc::lerps fadeIn;
-
-	dc::scene* testScene;
+	Mf::Sound music;
 
+	CharacterP heroine;
+	Mf::Sound punchSound;
 	TilemapFont *font;
 
-	dc::scalar x, y, z;
+	Mf::Cerps interp;
+	Mf::Lerps fadeIn;
+
+	Mf::Camera camera;
+	Mf::SceneP testScene;
 
-	dc::scalar state;
-	dc::scalar prevstate;
+	Hud hud;
 };