stream-based logging classes

[chaz/yoink] / src / Scene.hh

diff --git a/src/Scene.hh b/src/Scene.hh
index ca96aeaca15d93d5053919afa98d5cbd5b38822b..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,10 @@
 #include <Moof/Cullable.hh>
 #include <Moof/Drawable.hh>
 #include <Moof/Resource.hh>
+#include <Moof/Script.hh>
+
+
+class Character;
 
 
 class Scene;
@@ -44,20 +49,28 @@ typedef boost::shared_ptr<Scene> SceneP;
 class Scene : public Mf::Cullable, public Mf::Drawable, public Mf::Resource
 {
        class Impl;
-       boost::shared_ptr<Impl> impl_;
+       boost::shared_ptr<Impl> mImpl;
 
 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);
 };