stream-based logging classes

[chaz/yoink] / src / Scene.hh

diff --git a/src/Scene.hh b/src/Scene.hh
index b858c642abde7cc28b156eafd83956511fb6cb5a..7558e3a6fce7af7a09587dffd15860a04b34996f 100644 (file)
--- a/src/Scene.hh
+++ b/src/Scene.hh
@@ -29,6 +29,7 @@
 #ifndef _SCENE_HH_
 #define _SCENE_HH_
 
+#include <list>
 #include <string>
 
 #include <boost/shared_ptr.hpp>
@@ -36,6 +37,7 @@
 #include <Moof/Cullable.hh>
 #include <Moof/Drawable.hh>
 #include <Moof/Resource.hh>
+#include <Moof/Script.hh>
 
 
 class Character;
@@ -51,16 +53,22 @@ class Scene : public Mf::Cullable, public Mf::Drawable, public Mf::Resource
 
 public:
 
-       Scene(const std::string& name);
+       explicit Scene(const std::string& name);
 
        static SceneP alloc(const std::string& name)
        {
                return SceneP(new Scene(name));
        }
 
+       Mf::Script::Result load(Mf::Script& script);
+
        void draw(Mf::Scalar alpha) const;
        void drawIfVisible(Mf::Scalar alpha, const Mf::Frustum& frustum) const;
 
+       Mf::Scalar getZCoord(const Mf::Vector2& position) const;
+
+       bool castRay(const Mf::Ray<2>& ray,
+                       std::list<Mf::Ray<2>::Intersection>& hits) const;
        bool checkForCollision(Character& character);
 
        static std::string getPath(const std::string& name);