destroyed global classes; view hierarchy instead

[chaz/yoink] / src / GameLayer.hh

diff --git a/src/GameLayer.hh b/src/GameLayer.hh
index 885a49daa3392d07de25369573c9f5112b3a005b..145cf76cba75a0d58d6c3c77ecd8369fefc651e4 100644 (file)
--- a/src/GameLayer.hh
+++ b/src/GameLayer.hh
@@ -23,7 +23,6 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include <Moof/Layer.hh>
 #include <Moof/Math.hh>
 #include <Moof/Sound.hh>
 
@@ -32,6 +31,7 @@
 #include <Moof/Ray.hh>
 #include <Moof/Sphere.hh>
 #include <Moof/Timer.hh>
+#include <Moof/View.hh>
 
 #include "GameState.hh"
 #include "Hud.hh"
@@ -40,18 +40,17 @@
 class GameLayer;
 typedef boost::shared_ptr<GameLayer> GameLayerP;
 
-class GameLayer : public Mf::Layer
+class GameLayer : public Mf::View
 {
 public:
 
-       GameLayer();
-
        static GameLayerP alloc()
        {
                return GameLayerP(new GameLayer);
        }
+       GameLayer();
 
-       void pushedOntoEngine();
+       void didAddToView();
 
        void update(Mf::Scalar t, Mf::Scalar dt);
        void draw(Mf::Scalar alpha) const;
@@ -60,7 +59,7 @@ public:
 private:
 
        void loadSceneLoader();
-       void advanceScene();
+       void advanceScene(Mf::Settings& settings);
 
        void thinkTimer();
 
@@ -75,9 +74,9 @@ private:
        Mf::SoundStream mMusic;
        Mf::Sound               mPunchSound;
 
-       Mf::Ray<2>              mRay;
-       Mf::Line<2>             mLine;
-       Mf::Sphere<2>   mSphere;
+       Mf::Ray2                mRay;
+       Mf::Line2               mLine;
+       Mf::Circle              mCircle;
 
        Mf::Timer               mRayTimer;
        void rayTimer();