X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FScene.hh;h=7f36f9b897f7536446a04d522e31751582c708ad;hp=07db30dba32ac449cf3836e57682a5d6d9b33cc3;hb=574af38ed616d1adfa5e6ce35f67cda1f707f89d;hpb=76b3f4be992514a740ac03cdbdd57844142a0b4c

diff --git a/src/Scene.hh b/src/Scene.hh
index 07db30d..7f36f9b 100644
--- a/src/Scene.hh
+++ b/src/Scene.hh
@@ -1,13 +1,11 @@
 
-/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+/*]  Copyright (c) 2009-2011, 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 _SCENE_HH_
 #define _SCENE_HH_
@@ -17,22 +15,24 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include <Moof/Cullable.hh>
-#include <Moof/Drawable.hh>
-#include <Moof/Resource.hh>
-#include <Moof/Script.hh>
+#include <moof/cullable.hh>
+#include <moof/drawable.hh>
+#include <moof/script.hh>
 
 
+// forward declarations
+namespace moof {
+class settings;
+}
 class Character;
 
-
 class Scene;
 typedef boost::shared_ptr<Scene> SceneP;
 
-class Scene : public Mf::Cullable, public Mf::Drawable, public Mf::Resource
+class Scene : public moof::cullable, public moof::drawable
 {
-	class Impl;
-	boost::shared_ptr<Impl> mImpl;
+	class impl;
+	boost::shared_ptr<impl> impl_;
 
 public:
 
@@ -43,18 +43,16 @@ public:
 		return SceneP(new Scene(name));
 	}
 
-	Mf::Script::Result load(Mf::Script& script);
+	moof::script::status load(moof::settings& settings, moof::script& script);
 
-	void draw(Mf::Scalar alpha) const;
-	void drawIfVisible(Mf::Scalar alpha, const Mf::Frustum& frustum) const;
+	void draw(moof::scalar alpha) const;
+	void draw_if_visible(moof::scalar alpha, const moof::frustum& frustum) const;
 
-	Mf::Scalar getZCoord(const Mf::Vector2& position) const;
+	moof::scalar getZCoord(const moof::vector2& position) const;
 
-	bool castRay(const Mf::Ray<2>& ray,
-			std::list<Mf::Ray<2>::Contact>& hits) const;
+	bool castRay(const moof::ray<2>& ray,
+			std::list<moof::ray<2>::contact>& hits) const;
 	bool checkForCollision(Character& character);
-
-	static std::string getPath(const std::string& name);
 };