preliminary physics, sound, hud

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

diff --git a/src/Moof/Scene.hh b/src/Moof/Scene.hh
index 66a54a97936c22c543203780b9a110cb076c9261..4c4f29775b2ae21033fb69e8e9017b2ee542c5ff 100644 (file)
--- a/src/Moof/Scene.hh
+++ b/src/Moof/Scene.hh
@@ -34,24 +34,30 @@
 #include <boost/shared_ptr.hpp>
 
 #include <Moof/Drawable.hh>
+#include <Moof/Octree.hh>
 #include <Moof/Resource.hh>
 
 
 namespace Mf {
 
 
-class Scene : public Resource, public Drawable
+class Camera;
+
+class Scene : public Resource
 {
 public:
        Scene(const std::string& name);
 
-       void draw(Scalar alpha);
+       void draw(Scalar alpha, const Camera& cam) const;
+       void refresh();
+
+       OctreePtr getOctree() const;
 
-       static std::string getPathToResource(const std::string& name);
+       static std::string getPath(const std::string& name);
 
 private:
-       class SceneImpl;
-       boost::shared_ptr<SceneImpl> impl_;
+       class Impl;
+       boost::shared_ptr<Impl> impl_;
 };