X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Fscene.cpp;h=3c101b8a172cdba1fc421eecc5a182946bb3f308;hb=e92de029768eef5f0fd744329e589161b46d0762;hp=e6c62e802f8c9672fafce477d3eae50c9f2efaac;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266;p=libs%2Fgl.git

diff --git a/source/render/scene.cpp b/source/render/scene.cpp
index e6c62e80..3c101b8a 100644
--- a/source/render/scene.cpp
+++ b/source/render/scene.cpp
@@ -1,27 +1,26 @@
 #include <msp/datafile/collection.h>
-#include "animatedobject.h"
+#include <msp/fs/utils.h>
 #include "camera.h"
+#include "objectinstance.h"
+#include "occludedscene.h"
+#include "orderedscene.h"
 #include "renderer.h"
 #include "scene.h"
+#include "simplescene.h"
+#include "zsortedscene.h"
 
 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())
 	{
@@ -73,6 +72,21 @@ bool Scene::frustum_cull(const Renderable &renderable) const
 	return false;
 }
 
+Scene::SceneRegistry &Scene::get_scene_registry()
+{
+	static SceneRegistry registry;
+	static bool initialized = false;
+	if(!initialized)
+	{
+		initialized = true;
+		register_type<SimpleScene>("simple");
+		register_type<ZSortedScene>("zsorted");
+		register_type<OrderedScene>("ordered");
+		register_type<OccludedScene>("occluded");
+	}
+	return registry;
+}
+
 
 Scene::Loader::Loader(Scene &s, Collection &c):
 	DataFile::CollectionObjectLoader<Scene>(s, &c),
@@ -90,8 +104,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)
@@ -101,12 +118,44 @@ 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("%s/%d.inst", FS::basename(get_source()), inst_counter++), inst.get());
 	if(content && !t.empty())
-		(*content)[t] = anob.get();
-	obj.owned_data.push_back(anob.release());
+		(*content)[t] = inst.get();
+	obj.add(*inst.release());
+}
+
+void Scene::Loader::scene(const string &n)
+{
+	obj.add(get_collection().get<Scene>(n));
+}
+
+
+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;
+}
+
+void Scene::GenericLoader::init_actions()
+{
+	add("type", &GenericLoader::type);
+}
+
+void Scene::GenericLoader::type(const DataFile::Symbol &sym)
+{
+	get_scene_registry().invoke(sym.name, *this);
 }
 
 } // namespace GL