X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Fscene.cpp;h=87d8c423852ac749ec29a45e9af7331c5f214031;hb=5bb193f930fb8738d099d630c4d625d82c1215b5;hp=b8cdc04516191226b76fd9a89f16b65721106b70;hpb=a3a59b5ff2364ad657de1f385c99546c32b2bfb4;p=libs%2Fgl.git

diff --git a/source/render/scene.cpp b/source/render/scene.cpp
index b8cdc045..87d8c423 100644
--- a/source/render/scene.cpp
+++ b/source/render/scene.cpp
@@ -1,6 +1,9 @@
 #include <msp/datafile/collection.h>
+#include <msp/fs/utils.h>
+#include <msp/strings/format.h>
 #include "camera.h"
 #include "objectinstance.h"
+#include "occludedscene.h"
 #include "orderedscene.h"
 #include "renderer.h"
 #include "scene.h"
@@ -12,19 +15,13 @@ 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();
 	if(!camera)
 		return false;
 
-	culling_matrix = renderer.get_matrix();
+	culling_matrix = camera->get_view_matrix()*renderer.get_matrix();
 
 	if(camera->is_orthographic())
 	{
@@ -86,8 +83,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,8 +105,11 @@ 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);
 }
 
 void Scene::Loader::object(const string &n)
@@ -122,10 +121,15 @@ 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)
+{
+	obj.add(get_collection().get<Scene>(n));
 }