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

diff --git a/source/scene.h b/source/scene.h
index 27656a59..639a467f 100644
--- a/source/scene.h
+++ b/source/scene.h
@@ -1,8 +1,9 @@
 #ifndef MSP_GL_SCENE_H_
 #define MSP_GL_SCENE_H_
 
-#include <list>
+#include <vector>
 #include <msp/datafile/objectloader.h>
+#include "matrix.h"
 #include "renderable.h"
 #include "vector.h"
 
@@ -20,14 +21,25 @@ public:
 	class Loader: public DataFile::CollectionObjectLoader<Scene>
 	{
 	public:
-		Loader(Scene &, Collection &);
+		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<Renderable *> owned_data;
+	// 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() { }
@@ -37,11 +49,8 @@ private:
 public:
 	virtual ~Scene();
 
-	virtual void add(const Renderable &) = 0;
-	virtual void remove(const Renderable &) = 0;
-
-	using Renderable::render;
-	virtual void render(const Tag & = Tag()) const;
+	virtual void add(Renderable &) = 0;
+	virtual void remove(Renderable &) = 0;
 
 protected:
 	bool setup_frustum(const Renderer &) const;