X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FScene.hh;h=8c60cc50bb0f533b9e3fa1c83b24b0fbc153b30b;hp=85a6716953109c9739c7b0c6ba97108c18a01912;hb=6f1b787a10d8ab1a3117a4b8c004dd2d90599608;hpb=837bae9f2bf7b25e1d3d2625eeaf39c1d2f48827

diff --git a/src/Scene.hh b/src/Scene.hh
index 85a6716..8c60cc5 100644
--- a/src/Scene.hh
+++ b/src/Scene.hh
@@ -17,22 +17,25 @@
 
 #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>
 
 
 class Character;
 
 
+namespace moof {
+class settings;
+}
+
 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 +46,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>::Intersection>& 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);
 };