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

diff --git a/source/render/scene.cpp b/source/render/scene.cpp
index dd611536..70a9e94b 100644
--- a/source/render/scene.cpp
+++ b/source/render/scene.cpp
@@ -1,6 +1,6 @@
 #include <msp/datafile/collection.h>
-#include "animatedobject.h"
 #include "camera.h"
+#include "objectinstance.h"
 #include "orderedscene.h"
 #include "renderer.h"
 #include "scene.h"
@@ -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)
@@ -120,12 +121,17 @@ void Scene::Loader::object(const string &n)
 
 void Scene::Loader::object_tagged(const string &n, const string &t)
 {
-	RefPtr<AnimatedObject> anob = new AnimatedObject(get_collection().get<GL::Object>(n));
-	load_sub(*anob);
-	obj.add(*anob);
+	RefPtr<ObjectInstance> inst = new ObjectInstance(get_collection().get<GL::Object>(n));
+	load_sub(*inst);
+	obj.add(*inst);
 	if(content && !t.empty())
-		(*content)[t] = anob.get();
-	obj.owned_data.push_back(anob.release());
+		(*content)[t] = inst.get();
+	obj.owned_data.push_back(inst.release());
+}
+
+void Scene::Loader::scene(const string &n)
+{
+	obj.add(get_collection().get<Scene>(n));
 }