X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Fscene.cpp;h=3c101b8a172cdba1fc421eecc5a182946bb3f308;hb=31ae3e3c4a28ac2ec97cc3efaa25adbf1511aadc;hp=70a9e94b6c354d2519b5b49041b085dd3fd70497;hpb=82282de52e8e8f3bbafefaf92bf76f53f2c2495e;p=libs%2Fgl.git

diff --git a/source/render/scene.cpp b/source/render/scene.cpp
index 70a9e94b..3c101b8a 100644
--- a/source/render/scene.cpp
+++ b/source/render/scene.cpp
@@ -1,6 +1,8 @@
 #include <msp/datafile/collection.h>
+#include <msp/fs/utils.h>
 #include "camera.h"
 #include "objectinstance.h"
+#include "occludedscene.h"
 #include "orderedscene.h"
 #include "renderer.h"
 #include "scene.h"
@@ -12,12 +14,6 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Scene::~Scene()
-{
-	for(vector<Renderable *>::iterator i=owned_data.begin(); i!=owned_data.end(); ++i)
-		delete *i;
-}
-
 bool Scene::setup_frustum(const Renderer &renderer) const
 {
 	const Camera *camera = renderer.get_camera();
@@ -86,8 +82,7 @@ Scene::SceneRegistry &Scene::get_scene_registry()
 		register_type<SimpleScene>("simple");
 		register_type<ZSortedScene>("zsorted");
 		register_type<OrderedScene>("ordered");
-		// TODO OccludedScene requires a collection as a constructor parameter
-		//register_type<OccludedScene>("occluded");
+		register_type<OccludedScene>("occluded");
 	}
 	return registry;
 }
@@ -109,6 +104,8 @@ Scene::Loader::Loader(Scene &s, Collection &c, ContentMap &m):
 
 void Scene::Loader::init()
 {
+	inst_counter = 0;
+
 	add("object", &Loader::object);
 	add("object", &Loader::object_tagged);
 	add("scene", &Loader::scene);
@@ -123,10 +120,10 @@ void Scene::Loader::object_tagged(const string &n, const string &t)
 {
 	RefPtr<ObjectInstance> inst = new ObjectInstance(get_collection().get<GL::Object>(n));
 	load_sub(*inst);
-	obj.add(*inst);
+	get_collection().add(format("%s/%d.inst", FS::basename(get_source()), inst_counter++), inst.get());
 	if(content && !t.empty())
 		(*content)[t] = inst.get();
-	obj.owned_data.push_back(inst.release());
+	obj.add(*inst.release());
 }
 
 void Scene::Loader::scene(const string &n)