X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FGameLayer.hh;h=a1b5d6d87f3a5dbf38922de6487d3981e5f76f1c;hb=a31d65a998121df0651c57bfb68782e2a07d2e2f;hp=b2df7ef11f3aa3433612fc17ed0fec8b86400152;hpb=892da43bf5796e7c5f593a6d0f53bd797a36bd3e;p=chaz%2Fyoink

diff --git a/src/GameLayer.hh b/src/GameLayer.hh
index b2df7ef..a1b5d6d 100644
--- a/src/GameLayer.hh
+++ b/src/GameLayer.hh
@@ -44,11 +44,12 @@
 #include <Moof/Interpolator.hh>
 #include <Moof/Layer.hh>
 #include <Moof/Math.hh>
-#include <Moof/Scene.hh>
 #include <Moof/Sound.hh>
 
 #include "Character.hh"
+#include "Heroine.hh"
 #include "Hud.hh"
+#include "Scene.hh"
 
 
 class GameLayer;
@@ -71,18 +72,21 @@ public:
 
 private:
 
-	Mf::Sound music;
+	void setProjection();
+	void setProjection(Mf::Scalar width, Mf::Scalar height);
 
-	CharacterP heroine;
-	Mf::Sound punchSound;
 
-	Mf::PolynomialInterpolator<5> interp;
-	Mf::Lerp fadeIn;
+	Mf::Sound		mMusic;
 
-	Mf::Camera camera;
-	Mf::OctreeP octree;
+	HeroineP		mHeroine;
+	SceneP			mScene;
+	Mf::Sound 		mPunchSound;
 
-	HudP hud;
+	Mf::PolynomialInterpolator<5> mInterp;
+
+	Mf::Camera		mCamera;
+
+	HudP			mHud;
 };