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

diff --git a/source/render/scene.cpp b/source/render/scene.cpp
index 70a9e94b..a05e7110 100644
--- a/source/render/scene.cpp
+++ b/source/render/scene.cpp
@@ -1,6 +1,10 @@
 #include <msp/datafile/collection.h>
+#include <msp/fs/utils.h>
+#include <msp/strings/format.h>
 #include "camera.h"
+#include "instancearray.h"
 #include "objectinstance.h"
+#include "occludedscene.h"
 #include "orderedscene.h"
 #include "renderer.h"
 #include "scene.h"
@@ -12,73 +16,9 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Scene::~Scene()
+Scene::GenericLoader::TypeRegistry &Scene::get_scene_registry()
 {
-	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 = camera->get_view_matrix()*renderer.get_matrix();
-
-	if(camera->is_orthographic())
-	{
-		float h = camera->get_orthographic_height();
-		frustum_edges[0] = Vector4(0, 1, 0, -h);
-		frustum_edges[1] = Vector4(0, -1, 0, -h);
-
-		float w = camera->get_orthographic_width();
-		frustum_edges[2] = Vector4(1, 0, 0, -w);
-		frustum_edges[3] = Vector4(-1, 0, 0, -w);
-	}
-	else
-	{
-		float y = tan(camera->get_field_of_view()/2.0f);
-		float s = sqrt(y*y+1);
-		frustum_edges[0] = Vector4(0, 1/s, y/s, 0);
-		frustum_edges[1] = Vector4(0, -1/s, y/s, 0);
-
-		float x = y*camera->get_aspect_ratio();
-		s = sqrt(x*x+1);
-		frustum_edges[2] = Vector4(1/s, 0, x/s, 0);
-		frustum_edges[3] = Vector4(-1/s, 0, x/s, 0);
-	}
-
-	frustum_edges[4] = Vector4(0, 0, -1, -camera->get_far_clip());
-	frustum_edges[5] = Vector4(0, 0, 1, camera->get_near_clip());
-
-	return true;
-}
-
-bool Scene::frustum_cull(const Renderable &renderable) const
-{
-	const Matrix *matrix = renderable.get_matrix();
-	const Geometry::BoundingSphere<float, 3> *bsphere = renderable.get_bounding_sphere();
-	if(!matrix || !bsphere)
-		return false;
-
-	Vector4 center = culling_matrix*(*matrix*compose(bsphere->get_center(), 1.0f));
-	Vector3 x_axis = (matrix->column(0)*bsphere->get_radius()).slice<3>(0);
-	float radius_sq = inner_product(x_axis, x_axis);
-
-	for(unsigned i=0; i<6; ++i)
-	{
-		float distance = inner_product(center, frustum_edges[i]);
-		if(distance>0 && distance*distance>radius_sq)
-			return true;
-	}
-
-	return false;
-}
-
-Scene::SceneRegistry &Scene::get_scene_registry()
-{
-	static SceneRegistry registry;
+	static Scene::GenericLoader::TypeRegistry registry;
 	static bool initialized = false;
 	if(!initialized)
 	{
@@ -86,32 +26,31 @@ 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("array", &Loader::array);
 	add("object", &Loader::object);
 	add("object", &Loader::object_tagged);
 	add("scene", &Loader::scene);
+	add("scene", &Loader::scene_inline);
+}
+
+void Scene::Loader::array(const string &n)
+{
+	RefPtr<InstanceArray<> > arr = new InstanceArray<>(get_collection().get<GL::Object>(n));
+	load_sub(*arr);
+	get_collection().add(format("_scene_array_%d.array", ++inline_counter), arr.get());
+	obj.add(*arr.release());
 }
 
 void Scene::Loader::object(const string &n)
@@ -123,10 +62,10 @@ 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("_scene_object_%d.inst", ++inline_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)
@@ -134,31 +73,12 @@ 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)
+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