initial mesh testing

[chaz/yoink] / src / GameLayer.hh

diff --git a/src/GameLayer.hh b/src/GameLayer.hh
index c194e9f2935f87cec180c9f8f2c4960c4f188d85..54b49962d0ab2a26a8ba4bb889ee9ee2564c5938 100644 (file)
--- a/src/GameLayer.hh
+++ b/src/GameLayer.hh
@@ -24,6 +24,7 @@
 #include <boost/shared_ptr.hpp>
 
 #include <moof/math.hh>
+#include <moof/mesh.hh>
 #include <moof/sound.hh>
 
 #include <moof/line.hh>                // TODO
@@ -71,12 +72,15 @@ private:
 
        HudP                    mHud;
 
-       moof::sound_stream      mMusic;
-       moof::sound             mPunchSound;
+       //moof::sound_stream    mMusic;
+       moof::sound     punch_sound_;
+       moof::sound             music_;
+
+       moof::mesh_handle       sceneMesh;
 
        moof::ray2              mRay;
        moof::line2             mLine;
-       moof::circle            mCircle;
+       moof::circle    mCircle;
 
        moof::timer             mRayTimer;
        void rayTimer();