ray-scene intersection

[chaz/yoink] / src / GameLayer.hh

diff --git a/src/GameLayer.hh b/src/GameLayer.hh
index d75d9dc467e07ca998c57374e4482ac816b48112..4692611789f7cfbc1829be8b67cf13677d94a87d 100644 (file)
--- a/src/GameLayer.hh
+++ b/src/GameLayer.hh
@@ -47,6 +47,11 @@
 #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 "Character.hh"
 #include "Heroine.hh"
 #include "Scene.hh"
@@ -58,6 +63,7 @@ typedef boost::shared_ptr<GameLayer> GameLayerP;
 class GameLayer : public Mf::Layer
 {
 public:
+
        GameLayer();
 
        static GameLayerP alloc()
@@ -96,9 +102,15 @@ 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::Ray<3>              mRay3;
+       Mf::Line<2>             mLine;
+       Mf::Plane               mPlane;
+       Mf::Sphere<2>   mSphere;
 };