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

diff --git a/source/render/scene.cpp b/source/render/scene.cpp
index b8cdc045..70a9e94b 100644
--- a/source/render/scene.cpp
+++ b/source/render/scene.cpp
@@ -24,7 +24,7 @@ bool Scene::setup_frustum(const Renderer &renderer) const
 	if(!camera)
 		return false;
 
-	culling_matrix = renderer.get_matrix();
+	culling_matrix = camera->get_view_matrix()*renderer.get_matrix();
 
 	if(camera->is_orthographic())
 	{
@@ -111,6 +111,7 @@ void Scene::Loader::init()
 {
 	add("object", &Loader::object);
 	add("object", &Loader::object_tagged);
+	add("scene", &Loader::scene);
 }
 
 void Scene::Loader::object(const string &n)
@@ -128,6 +129,11 @@ void Scene::Loader::object_tagged(const string &n, const string &t)
 	obj.owned_data.push_back(inst.release());
 }
 
+void Scene::Loader::scene(const string &n)
+{
+	obj.add(get_collection().get<Scene>(n));
+}
+
 
 DataFile::Loader::ActionMap Scene::GenericLoader::shared_actions;