X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FGameLayer.hh;h=4e0a84f07752c4742417930073cf5e1f53f0a71d;hp=d75d9dc467e07ca998c57374e4482ac816b48112;hb=7f3984f3f9524f5b6813e01ceb2fe576dadff94e;hpb=e495074443d9fd7bc16137084cf9de3d031b75c4

diff --git a/src/GameLayer.hh b/src/GameLayer.hh
index d75d9dc..4e0a84f 100644
--- 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()
@@ -96,9 +103,16 @@ private:
 	void setProjection();
 	void setProjection(Mf::Scalar width, Mf::Scalar height);
 
-	State		mState;
-	Mf::Sound	mMusic;
-	Mf::Sound 	mPunchSound;
+	State			mState;
+	Mf::SoundStream	mMusic;
+	Mf::Sound 		mPunchSound;
+
+	Mf::Ray<2>		mRay;
+	Mf::Line<2>		mLine;
+	Mf::Sphere<2>	mSphere;
+
+	Mf::Timer		mRayTimer;
+	void rayTimer();
 };