simplified win32 installer build script

[chaz/yoink] / src / GameLayer.hh

diff --git a/src/GameLayer.hh b/src/GameLayer.hh
index d75d9dc467e07ca998c57374e4482ac816b48112..73b6a23e6a141ec2315cb9f5f2a5f34e91e90dc8 100644 (file)
--- a/src/GameLayer.hh
+++ b/src/GameLayer.hh
@@ -47,6 +47,12 @@
 #include <Moof/Script.hh>
 #include <Moof/Sound.hh>
 
+#include <Moof/Line.hh>
+#include <Moof/Plane.hh>
+#include <Moof/Ray.hh>
+#include <Moof/Sphere.hh>
+#include <Moof/Timer.hh>
+
 #include "Character.hh"
 #include "Heroine.hh"
 #include "Scene.hh"
@@ -58,6 +64,7 @@ typedef boost::shared_ptr<GameLayer> GameLayerP;
 class GameLayer : public Mf::Layer
 {
 public:
+
        GameLayer();
 
        static GameLayerP alloc()
@@ -73,9 +80,7 @@ public:
 
        struct State
        {
-               // the script object must be mutable because some script functions must be
-               // called during draw
-               mutable Mf::Script                      script;
+               Mf::Script                                      script;
                std::vector<std::string>        sceneList;
 
                HeroineP                heroine;
@@ -91,14 +96,23 @@ 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;
-       Mf::Sound       mMusic;
-       Mf::Sound       mPunchSound;
+       State                   mState;
+       Mf::Timer               mThinkTimer;
+
+       Mf::SoundStream mMusic;
+       Mf::Sound               mPunchSound;
+
+       Mf::Ray<2>              mRay;
+       Mf::Line<2>             mLine;
+       Mf::Sphere<2>   mSphere;
+
+       Mf::Timer               mRayTimer;
+       void rayTimer();
 };