considerable refactoring

[chaz/yoink] / src / Moof / Scene.hh

diff --git a/src/Moof/Scene.hh b/src/Moof/Scene.hh
index 08ab6cc2441c7f58497fa01bffbe42853fb80e4c..f0e829db5e671edcead2652f6aca811f54efea92 100644 (file)
--- a/src/Moof/Scene.hh
+++ b/src/Moof/Scene.hh
@@ -34,27 +34,39 @@
 #include <boost/shared_ptr.hpp>
 
 #include <Moof/Drawable.hh>
+#include <Moof/Octree.hh>
 #include <Moof/Resource.hh>
 
 
 namespace Mf {
 
 
+class Scene;
+typedef boost::shared_ptr<Scene> SceneP;
+
 class Camera;
 
+
 class Scene : public Resource
 {
+       class Impl;
+       boost::shared_ptr<Impl> impl_;
+
 public:
+
+       inline static SceneP alloc(const std::string& name)
+       {
+               return SceneP(new Scene(name));
+       }
+
        Scene(const std::string& name);
 
        void draw(Scalar alpha, const Camera& cam) const;
        void refresh();
 
-       static std::string getPathToResource(const std::string& name);
+       OctreeP getOctree() const;
 
-private:
-       class SceneImpl;
-       boost::shared_ptr<SceneImpl> impl_;
+       static std::string getPath(const std::string& name);
 };