X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fscene.cpp;h=ef1f246bac0c4f61b2ec5dc3bf402bf32067f10d;hp=ad9dcd151110724a62581f1a7190de332b3ea86e;hb=e1e69c49b7727223a43cdc2deac4f1c03a3e3aba;hpb=0a20dd14a0d1fd027a7d411b4d427bd4252342cc

diff --git a/source/scene.cpp b/source/scene.cpp
index ad9dcd15..ef1f246b 100644
--- a/source/scene.cpp
+++ b/source/scene.cpp
@@ -11,16 +11,10 @@ namespace GL {
 
 Scene::~Scene()
 {
-	for(list<Renderable *>::iterator i=owned_data.begin(); i!=owned_data.end(); ++i)
+	for(vector<Renderable *>::iterator i=owned_data.begin(); i!=owned_data.end(); ++i)
 		delete *i;
 }
 
-void Scene::render(const Tag &tag) const
-{
-	Renderer renderer(0);
-	render(renderer, tag);
-}
-
 bool Scene::setup_frustum(const Renderer &renderer) const
 {
 	const Camera *camera = renderer.get_camera();
@@ -29,15 +23,28 @@ bool Scene::setup_frustum(const Renderer &renderer) const
 
 	culling_matrix = renderer.get_matrix();
 
-	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();
-	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);
+	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());
@@ -53,11 +60,15 @@ bool Scene::frustum_cull(const Renderable &renderable) const
 		return false;
 
 	Vector4 center = culling_matrix*(*matrix*compose(bsphere->get_center(), 1.0f));
-	float radius = bsphere->get_radius();
+	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)
-		if(inner_product(center, frustum_edges[i])>radius)
+	{
+		float distance = inner_product(center, frustum_edges[i]);
+		if(distance>0 && distance*distance>radius_sq)
 			return true;
+	}
 
 	return false;
 }