mesh and other random adjustments

[chaz/yoink] / src / Scene.hh

diff --git a/src/Scene.hh b/src/Scene.hh
index 85a6716953109c9739c7b0c6ba97108c18a01912..8c60cc50bb0f533b9e3fa1c83b24b0fbc153b30b 100644 (file)
--- 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);
 };