X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Foccludedscene.cpp;h=bfe17349fd13ee836234c9297ec5476e6039d9f7;hb=be6ffe96ecb4707599fe1a6f620c348760213d46;hp=81af42b3598e1f1cdc7054d0dabc8d41b29a05b9;hpb=5bb193f930fb8738d099d630c4d625d82c1215b5;p=libs%2Fgl.git

diff --git a/source/render/occludedscene.cpp b/source/render/occludedscene.cpp
index 81af42b3..bfe17349 100644
--- a/source/render/occludedscene.cpp
+++ b/source/render/occludedscene.cpp
@@ -1,4 +1,4 @@
-#include <algorithm>
+#include <msp/core/algorithm.h>
 #include "camera.h"
 #include "mesh.h"
 #include "occludedscene.h"
@@ -13,25 +13,30 @@ namespace GL {
 
 OccludedScene::OccludedScene():
 	bounding_mesh(Resources::get_global().get<Mesh>("_occluder.mesh")),
-	bounding_shader(Resources::get_global().get<Program>("_occluder.glsl.shader")),
-	no_depth_write(LEQUAL, false),
-	occluder_min_size(0.25f),
-	queries(OCCLUSION_QUERY, 0),
-	cache_dirty(false)
+	bounding_shader(Resources::get_global().get<Program>("occluder.glsl.shader")),
+	queries(OCCLUSION_QUERY, 0)
 {
 	no_color_write.write_mask = WRITE_NONE;
 }
 
 void OccludedScene::add(Renderable &r)
 {
-	renderables.insert(&r);
-	cache_dirty = true;
+	auto i = lower_bound(renderables, &r);
+	if(i==renderables.end() || *i!=&r)
+	{
+		renderables.insert(i, &r);
+		cache_dirty = true;
+	}
 }
 
 void OccludedScene::remove(Renderable &r)
 {
-	renderables.erase(&r);
-	cache_dirty = true;
+	auto i = lower_bound(renderables, &r);
+	if(i!=renderables.end() && *i==&r)
+	{
+		renderables.erase(i);
+		cache_dirty = true;
+	}
 }
 
 void OccludedScene::populate_cache() const
@@ -80,7 +85,7 @@ void OccludedScene::render(Renderer &renderer, Tag tag) const
 	if(!camera)
 	{
 		for(const OccludedRenderable &o: occluded_cache)
-			renderer.render(*o.renderable, tag);
+			o.renderable->render(renderer, tag);
 		return;
 	}
 
@@ -110,7 +115,7 @@ void OccludedScene::render(Renderer &renderer, Tag tag) const
 			i->occluder = true;
 
 		if(i->occluder)
-			renderer.render(*i->renderable, tag);
+			i->renderable->render(renderer, tag);
 	}
 
 	// Move all objects within the frustum to the beginning of the array
@@ -148,16 +153,8 @@ void OccludedScene::render(Renderer &renderer, Tag tag) const
 	// Render anything that has a chance of being visible
 	for(auto i=occluded_cache.begin(); (i!=occluded_cache.end() && i->in_frustum); ++i)
 		if(!i->occluder && queries.get_result(i-occluded_cache.begin()))
-			renderer.render(*i->renderable, tag);
+			i->renderable->render(renderer, tag);
 }
 
-
-OccludedScene::OccludedRenderable::OccludedRenderable():
-	renderable(0),
-	bounding_sphere(0),
-	in_frustum(false),
-	occluder(false)
-{ }
-
 } // namespace GL
 } // namespace Msp