X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fscene.h;h=e6e337b907388591ea82f8a769cb9f163b819f0f;hb=0807680edd94a7f14560831db4dd52e4e48d0d19;hp=e3aa1fabb2cd5829e6567b706712b1580192b991;hpb=4edd75061a1e24572bd672fb72e1bc1838008ce7;p=libs%2Fgl.git

diff --git a/source/scene.h b/source/scene.h
index e3aa1fab..e6e337b9 100644
--- a/source/scene.h
+++ b/source/scene.h
@@ -1,39 +1,50 @@
 #ifndef MSP_GL_SCENE_H_
 #define MSP_GL_SCENE_H_
 
+#include <list>
+#include <msp/datafile/objectloader.h>
+#include "matrix.h"
 #include "renderable.h"
+#include "vector.h"
 
 namespace Msp {
 namespace GL {
 
-class Culler;
-
 /**
 Scenes are containers for other Renderables.  This is a base class that can't
-be instantiated.  At the moment the available Scene types are SimpleScene,
+be instantiated.  Examples of available Scene types are SimpleScene,
 InstancedScene and OrderedScene.
 */
 class Scene: public Renderable
 {
+public:
+	class Loader: public DataFile::CollectionObjectLoader<Scene>
+	{
+	public:
+		Loader(Scene &, Collection &);
+
+	private:
+		void object(const std::string &);
+	};
+
 protected:
-	std::list<Culler *> cullers;
+	std::list<Renderable *> owned_data;
+	mutable Matrix culling_matrix;
+	mutable Vector4 frustum_edges[6];
 
 	Scene() { }
+private:
+	Scene(const Scene &);
+	Scene &operator=(const Scene &);
 public:
-	virtual ~Scene() { }
-
-	virtual void add(const Renderable &) = 0;
-	virtual void remove(const Renderable &) = 0;
-
-	void add_culler(Culler &);
-	void remove_culler(Culler &);
+	virtual ~Scene();
 
-	using Renderable::render;
-	virtual void render(const Tag & = Tag()) const;
+	virtual void add(Renderable &) = 0;
+	virtual void remove(Renderable &) = 0;
 
 protected:
-	virtual void setup_cullers(const Renderer &) const;
-	virtual bool cull(const Renderer &, const Renderable &) const;
+	bool setup_frustum(const Renderer &) const;
+	bool frustum_cull(const Renderable &) const;
 };
 
 } // namespace GL