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

diff --git a/source/render/scene.cpp b/source/render/scene.cpp
index dd611536..0f773722 100644
--- a/source/render/scene.cpp
+++ b/source/render/scene.cpp
@@ -1,6 +1,9 @@
 #include <msp/datafile/collection.h>
-#include "animatedobject.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())
 	{
@@ -76,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)
 	{
@@ -86,31 +83,22 @@ 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;
 }
 
 
-Scene::Loader::Loader(Scene &s, Collection &c):
-	DataFile::CollectionObjectLoader<Scene>(s, &c),
-	content(0)
-{
-	init();
-}
+unsigned Scene::Loader::inline_counter = 0;
 
-Scene::Loader::Loader(Scene &s, Collection &c, ContentMap &m):
+Scene::Loader::Loader(Scene &s, Collection &c, ContentMap *m):
 	DataFile::CollectionObjectLoader<Scene>(s, &c),
-	content(&m)
-{
-	init();
-}
-
-void Scene::Loader::init()
+	content(m)
 {
 	add("object", &Loader::object);
 	add("object", &Loader::object_tagged);
+	add("scene", &Loader::scene);
+	add("scene", &Loader::scene_inline);
 }
 
 void Scene::Loader::object(const string &n)
@@ -120,39 +108,25 @@ 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);
+	get_collection().add(format("_scene_object_%d.inst", ++inline_counter), inst.get());
 	if(content && !t.empty())
-		(*content)[t] = anob.get();
-	obj.owned_data.push_back(anob.release());
-}
-
-
-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;
+		(*content)[t] = inst.get();
+	obj.add(*inst.release());
 }
 
-void Scene::GenericLoader::init_actions()
+void Scene::Loader::scene(const string &n)
 {
-	add("type", &GenericLoader::type);
+	obj.add(get_collection().get<Scene>(n));
 }
 
-void Scene::GenericLoader::type(const DataFile::Symbol &sym)
+void Scene::Loader::scene_inline()
 {
-	get_scene_registry().invoke(sym.name, *this);
+	GenericLoader ldr(get_collection());
+	load_sub_with(ldr);
+	Scene *scene = ldr.store_object(get_collection(), format("_scene_%d.scene", ++inline_counter));
+	obj.add(*scene);
 }
 
 } // namespace GL