X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FGameLayer.hh;h=54b49962d0ab2a26a8ba4bb889ee9ee2564c5938;hp=885a49daa3392d07de25369573c9f5112b3a005b;hb=1fb5f7e36af1a4de040bc2989133703b0e0d4a9f;hpb=837bae9f2bf7b25e1d3d2625eeaf39c1d2f48827

diff --git a/src/GameLayer.hh b/src/GameLayer.hh
index 885a49d..54b4996 100644
--- a/src/GameLayer.hh
+++ b/src/GameLayer.hh
@@ -23,15 +23,16 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include <Moof/Layer.hh>
-#include <Moof/Math.hh>
-#include <Moof/Sound.hh>
+#include <moof/math.hh>
+#include <moof/mesh.hh>
+#include <moof/sound.hh>
 
-#include <Moof/Line.hh>		// TODO
-#include <Moof/Plane.hh>
-#include <Moof/Ray.hh>
-#include <Moof/Sphere.hh>
-#include <Moof/Timer.hh>
+#include <moof/line.hh>		// TODO
+#include <moof/plane.hh>
+#include <moof/ray.hh>
+#include <moof/sphere.hh>
+#include <moof/timer.hh>
+#include <moof/view.hh>
 
 #include "GameState.hh"
 #include "Hud.hh"
@@ -40,46 +41,48 @@
 class GameLayer;
 typedef boost::shared_ptr<GameLayer> GameLayerP;
 
-class GameLayer : public Mf::Layer
+class GameLayer : public moof::view
 {
 public:
 
-	GameLayer();
-
 	static GameLayerP alloc()
 	{
 		return GameLayerP(new GameLayer);
 	}
+	GameLayer();
 
-	void pushedOntoEngine();
+	void did_add_to_view();
 
-	void update(Mf::Scalar t, Mf::Scalar dt);
-	void draw(Mf::Scalar alpha) const;
-	bool handleEvent(const Mf::Event& event);
+	void update(moof::scalar t, moof::scalar dt);
+	void draw(moof::scalar alpha) const;
+	bool handle_event(const moof::event& event);
 
 private:
 
 	void loadSceneLoader();
-	void advanceScene();
+	void advanceScene(moof::settings& settings);
 
 	void thinkTimer();
 
-	void setProjection();
-	void setProjection(Mf::Scalar width, Mf::Scalar height);
+	void projection();
+	void projection(moof::scalar width, moof::scalar height);
 
-	GameState		mState;
-	Mf::Timer		mThinkTimer;
+	GameState		state_;
+	moof::timer		mThinkTimer;
 
 	HudP			mHud;
 
-	Mf::SoundStream	mMusic;
-	Mf::Sound 		mPunchSound;
+	//moof::sound_stream	mMusic;
+	moof::sound 	punch_sound_;
+	moof::sound		music_;
+
+	moof::mesh_handle	sceneMesh;
 
-	Mf::Ray<2>		mRay;
-	Mf::Line<2>		mLine;
-	Mf::Sphere<2>	mSphere;
+	moof::ray2		mRay;
+	moof::line2		mLine;
+	moof::circle	mCircle;
 
-	Mf::Timer		mRayTimer;
+	moof::timer		mRayTimer;
 	void rayTimer();
 };