fixed layer bugs; generalized octree

[chaz/yoink] / src / GameLayer.hh

diff --git a/src/GameLayer.hh b/src/GameLayer.hh
index b2df7ef11f3aa3433612fc17ed0fec8b86400152..c4c5420888b63e5f7b7e7067fd5a9df9172f11da 100644 (file)
--- 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,16 +72,18 @@ public:
 
 private:
 
+       void setProjection();
+       void setProjection(Mf::Scalar width, Mf::Scalar height);
+
        Mf::Sound music;
 
-       CharacterP heroine;
+       HeroineP        heroine;
+       SceneP          scene;
        Mf::Sound punchSound;
 
        Mf::PolynomialInterpolator<5> interp;
-       Mf::Lerp fadeIn;
 
        Mf::Camera camera;
-       Mf::OctreeP octree;
 
        HudP hud;
 };