X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Fscene.h;h=6fb45d6102b9fc422f71ba360da33b2e5a87c926;hb=23d4100160bfa33359ce297b6b36244abcaa5f82;hp=fcf5d33e8eb9645caccdbc9bff5f7d34a3427f27;hpb=3ac3a51c623271da815c8ee60c484445871753bf;p=libs%2Fgl.git

diff --git a/source/render/scene.h b/source/render/scene.h
index fcf5d33e..6fb45d61 100644
--- a/source/render/scene.h
+++ b/source/render/scene.h
@@ -1,12 +1,11 @@
 #ifndef MSP_GL_SCENE_H_
 #define MSP_GL_SCENE_H_
 
-#include <vector>
+#include <map>
 #include <msp/core/typeregistry.h>
 #include <msp/datafile/objectloader.h>
 #include "matrix.h"
 #include "renderable.h"
-#include "vector.h"
 
 namespace Msp {
 namespace GL {
@@ -29,10 +28,10 @@ protected:
 		unsigned inst_counter;
 
 	public:
-		Loader(Scene &, Collection &);
-		Loader(Scene &, Collection &, ContentMap &);
+		Loader(Scene &s, Collection &c): Loader(s, c, 0) { }
+		Loader(Scene &s, Collection &c, ContentMap &m) : Loader(s, c, &m) { }
 	private:
-		void init();
+		Loader(Scene &, Collection &, ContentMap *);
 
 		void object(const std::string &);
 		void object_tagged(const std::string &, const std::string &);
@@ -59,7 +58,7 @@ public:
 		GenericLoader(DataFile::Collection &);
 		~GenericLoader();
 
-		Scene *get_scene() { Scene *s = scene; scene = 0; return s; }
+		Scene *get_object() { Scene *s = scene; scene = 0; return s; }
 	private:
 		virtual void init_actions();