dispatch class not a singleton, engine is static

[chaz/yoink] / src / GameLayer.hh

diff --git a/src/GameLayer.hh b/src/GameLayer.hh
index 4e0a84f07752c4742417930073cf5e1f53f0a71d..53613617b513aa7e95ef993fe376b21ec1bf335a 100644 (file)
--- a/src/GameLayer.hh
+++ b/src/GameLayer.hh
@@ -40,11 +40,8 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include <Moof/Camera.hh>
-#include <Moof/Interpolator.hh>
 #include <Moof/Layer.hh>
 #include <Moof/Math.hh>
-#include <Moof/Script.hh>
 #include <Moof/Sound.hh>
 
 #include <Moof/Line.hh>
@@ -53,9 +50,8 @@
 #include <Moof/Sphere.hh>
 #include <Moof/Timer.hh>
 
-#include "Character.hh"
-#include "Heroine.hh"
-#include "Scene.hh"
+#include "Hud.hh"
+#include "GameState.hh"
 
 
 class GameLayer;
@@ -72,38 +68,27 @@ public:
                return GameLayerP(new GameLayer);
        }
 
-       void pushed(Mf::Engine& engine);
+       void pushedOntoEngine();
 
-       void update(Mf::Engine& engine, Mf::Scalar t, Mf::Scalar dt);
-       void draw(Mf::Engine& engine, Mf::Scalar alpha) const;
-       bool handleEvent(Mf::Engine& engine, const Mf::Event& event);
-
-       struct State
-       {
-               // the script object must be mutable because some script functions must be
-               // called during draw
-               mutable Mf::Script                      script;
-               std::vector<std::string>        sceneList;
-
-               HeroineP                heroine;
-               SceneP                  scene;
-
-               Mf::PolynomialInterpolator<5> interp;
-
-               Mf::Camera              camera;
-       };
+       void update(Mf::Scalar t, Mf::Scalar dt);
+       void draw(Mf::Scalar alpha) const;
+       bool handleEvent(const Mf::Event& event);
 
 private:
 
        void loadSceneLoader();
        void advanceScene();
 
-       Mf::Scalar getZCoord(const Mf::Vector2& position) const;
+       void thinkTimer();
 
        void setProjection();
        void setProjection(Mf::Scalar width, Mf::Scalar height);
 
-       State                   mState;
+       GameState               mState;
+       Mf::Timer               mThinkTimer;
+
+       HudP                    mHud;
+
        Mf::SoundStream mMusic;
        Mf::Sound               mPunchSound;