X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Fscene.cpp;h=229588679af54726cb3a203ed3d8b21a1e4330c9;hb=f19366d32cc29287a2730cfba90893e407754081;hp=d916def84a95448a2dcababd938f3de16bc89322;hpb=3ac3a51c623271da815c8ee60c484445871753bf;p=libs%2Fgl.git

diff --git a/source/render/scene.cpp b/source/render/scene.cpp
index d916def8..22958867 100644
--- a/source/render/scene.cpp
+++ b/source/render/scene.cpp
@@ -1,5 +1,6 @@
 #include <msp/datafile/collection.h>
 #include <msp/fs/utils.h>
+#include <msp/strings/format.h>
 #include "camera.h"
 #include "objectinstance.h"
 #include "occludedscene.h"
@@ -88,21 +89,10 @@ Scene::SceneRegistry &Scene::get_scene_registry()
 }
 
 
-Scene::Loader::Loader(Scene &s, Collection &c):
+Scene::Loader::Loader(Scene &s, Collection &c, ContentMap *m):
 	DataFile::CollectionObjectLoader<Scene>(s, &c),
-	content(0)
-{
-	init();
-}
-
-Scene::Loader::Loader(Scene &s, Collection &c, ContentMap &m):
-	DataFile::CollectionObjectLoader<Scene>(s, &c),
-	content(&m)
-{
-	init();
-}
-
-void Scene::Loader::init()
+	content(m),
+	inst_counter(0)
 {
 	add("object", &Loader::object);
 	add("object", &Loader::object_tagged);