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

diff --git a/source/scene.h b/source/scene.h
index 9e90b128..639a467f 100644
--- a/source/scene.h
+++ b/source/scene.h
@@ -21,13 +21,23 @@ 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:
+	// 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];