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

diff --git a/src/GameLayer.hh b/src/GameLayer.hh
index 4e0a84f..145cf76 100644
--- a/src/GameLayer.hh
+++ b/src/GameLayer.hh
@@ -1,30 +1,13 @@
 
-/*******************************************************************************
-
- Copyright (c) 2009, Charles McGarvey
- All rights reserved.
- 
- Redistribution   and   use  in  source  and  binary  forms,  with  or  without
- modification, are permitted provided that the following conditions are met:
- 
-   * Redistributions  of  source  code  must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   * Redistributions  in binary form must reproduce the above copyright notice,
-     this  list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
- 
- THIS  SOFTWARE  IS  PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND  ANY  EXPRESS  OR  IMPLIED  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN  NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR  ANY  DIRECT,  INDIRECT,  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES  (INCLUDING,  BUT  NOT  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES;  LOSS  OF  USE,  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
+/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+**]  All rights reserved.
+*
+* vi:ts=4 sw=4 tw=75
+*
+* Distributable under the terms and conditions of the 2-clause BSD license;
+* see the file COPYING for a complete text of the license.
+*
+**************************************************************************/
 
 #ifndef _GAMELAYER_HH_
 #define _GAMELAYER_HH_
@@ -40,76 +23,60 @@
 
 #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>
+#include <Moof/Line.hh>		// TODO
 #include <Moof/Plane.hh>
 #include <Moof/Ray.hh>
 #include <Moof/Sphere.hh>
 #include <Moof/Timer.hh>
+#include <Moof/View.hh>
 
-#include "Character.hh"
-#include "Heroine.hh"
-#include "Scene.hh"
+#include "GameState.hh"
+#include "Hud.hh"
 
 
 class GameLayer;
 typedef boost::shared_ptr<GameLayer> GameLayerP;
 
-class GameLayer : public Mf::Layer
+class GameLayer : public Mf::View
 {
 public:
 
-	GameLayer();
-
 	static GameLayerP alloc()
 	{
 		return GameLayerP(new GameLayer);
 	}
+	GameLayer();
 
-	void pushed(Mf::Engine& engine);
-
-	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;
+	void didAddToView();
 
-		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();
+	void advanceScene(Mf::Settings& settings);
 
-	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;
 
-	Mf::Ray<2>		mRay;
-	Mf::Line<2>		mLine;
-	Mf::Sphere<2>	mSphere;
+	Mf::Ray2		mRay;
+	Mf::Line2		mLine;
+	Mf::Circle		mCircle;
 
 	Mf::Timer		mRayTimer;
 	void rayTimer();
@@ -118,5 +85,3 @@ private:
 
 #endif // _GAMELAYER_HH_
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-