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

diff --git a/source/render/scene.cpp b/source/render/scene.cpp
index d916def8..75d1859b 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"
@@ -72,9 +73,9 @@ bool Scene::frustum_cull(const Renderable &renderable) const
 	return false;
 }
 
-Scene::SceneRegistry &Scene::get_scene_registry()
+Scene::GenericLoader::TypeRegistry &Scene::get_scene_registry()
 {
-	static SceneRegistry registry;
+	static Scene::GenericLoader::TypeRegistry registry;
 	static bool initialized = false;
 	if(!initialized)
 	{
@@ -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);
@@ -129,32 +119,5 @@ void Scene::Loader::scene(const string &n)
 	obj.add(get_collection().get<Scene>(n));
 }
 
-
-DataFile::Loader::ActionMap Scene::GenericLoader::shared_actions;
-
-Scene::GenericLoader::GenericLoader(DataFile::Collection &c):
-	coll(c),
-	scene(0),
-	scene_loader(0)
-{
-	set_actions(shared_actions);
-}
-
-Scene::GenericLoader::~GenericLoader()
-{
-	delete scene;
-	delete scene_loader;
-}
-
-void Scene::GenericLoader::init_actions()
-{
-	add("type", &GenericLoader::type);
-}
-
-void Scene::GenericLoader::type(const DataFile::Symbol &sym)
-{
-	get_scene_registry().invoke(sym.name, *this);
-}
-
 } // namespace GL
 } // namespace Msp