X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fscene.h;h=639a467fa849cb526c19ac31744b957f820af7ea;hp=fbc57a80e46e396b4128b31d6f86c5562c2b86ab;hb=aa9873652630db493b5bd9faee4117e9c30ef226;hpb=c87860db3b23a98eda1adfe59acddffdb6eb8420

diff --git a/source/scene.h b/source/scene.h
index fbc57a80..639a467f 100644
--- a/source/scene.h
+++ b/source/scene.h
@@ -1,13 +1,15 @@
 #ifndef MSP_GL_SCENE_H_
 #define MSP_GL_SCENE_H_
 
+#include <vector>
+#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.  Examples of available Scene types are SimpleScene,
@@ -15,25 +17,44 @@ InstancedScene and OrderedScene.
 */
 class Scene: public Renderable
 {
+public:
+	class Loader: public DataFile::CollectionObjectLoader<Scene>
+	{
+	public:
+		typedef std::map<std::string, Renderable *> ContentMap;
+
+	private:
+		ContentMap *content;
+
+	public:
+		Loader(Scene &, Collection &);
+		Loader(Scene &, Collection &, ContentMap &);
+	private:
+		void init();
+
+		void object(const std::string &);
+		void object_tagged(const std::string &, const std::string &);
+	};
+
 protected:
-	std::list<Culler *> cullers;
+	// XXX If a loaded renderable is removed from the scene it needs to be removed from here as well
+	std::vector<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