X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fscene.cpp;h=e6c62e802f8c9672fafce477d3eae50c9f2efaac;hp=1e72d5dca36285f5664eb8151668fb107a5d0a0e;hb=8bc776f177c7cf9d0c6fd9590273f086d38c23ca;hpb=b617c5d7b5283ad260a77f01e42e6170cabbc03d

diff --git a/source/scene.cpp b/source/scene.cpp
index 1e72d5dc..e6c62e80 100644
--- a/source/scene.cpp
+++ b/source/scene.cpp
@@ -1,48 +1,112 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include "object.h"
-#include "objectinstance.h"
+#include <msp/datafile/collection.h>
+#include "animatedobject.h"
+#include "camera.h"
+#include "renderer.h"
 #include "scene.h"
 
+using namespace std;
+
 namespace Msp {
 namespace GL {
 
-void Scene::add(const Renderable &r)
+Scene::~Scene()
 {
-	if(const ObjectInstance *oi = dynamic_cast<const ObjectInstance *>(&r))
-		objects[&oi->get_object()].insert(oi);
-	else
-		renderables.insert(&r);
+	for(vector<Renderable *>::iterator i=owned_data.begin(); i!=owned_data.end(); ++i)
+		delete *i;
 }
 
-void Scene::remove(const Renderable &r)
+bool Scene::setup_frustum(const Renderer &renderer) const
 {
-	if(const ObjectInstance *oi = dynamic_cast<const ObjectInstance *>(&r))
+	const Camera *camera = renderer.get_camera();
+	if(!camera)
+		return false;
+
+	culling_matrix = renderer.get_matrix();
+
+	if(camera->is_orthographic())
 	{
-		ObjectMap::iterator i = objects.find(&oi->get_object());
-		if(i!=objects.end())
-		{
-			i->second.erase(oi);
-			if(i->second.empty())
-				objects.erase(i);
-		}
+		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
-		renderables.erase(&r);
+	{
+		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::Loader::Loader(Scene &s, Collection &c):
+	DataFile::CollectionObjectLoader<Scene>(s, &c),
+	content(0)
+{
+	init();
 }
 
-void Scene::render(const Tag &tag) const
+Scene::Loader::Loader(Scene &s, Collection &c, ContentMap &m):
+	DataFile::CollectionObjectLoader<Scene>(s, &c),
+	content(&m)
 {
-	for(ObjectMap::const_iterator i=objects.begin(); i!=objects.end(); ++i)
-		i->first->render(i->second.begin(), i->second.end(), tag);
+	init();
+}
+
+void Scene::Loader::init()
+{
+	add("object", &Loader::object);
+	add("object", &Loader::object_tagged);
+}
 
-	for(RenderableSet::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-		(*i)->render(tag);
+void Scene::Loader::object(const string &n)
+{
+	object_tagged(n, string());
+}
+
+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);
+	if(content && !t.empty())
+		(*content)[t] = anob.get();
+	obj.owned_data.push_back(anob.release());
 }
 
 } // namespace GL