X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Fzsortedscene.cpp;h=9c56f26e8ca39a3f583f836fd0ede67fb5922b33;hb=4f2f558123db15393607d8b21b949d7798561dec;hp=7b64fb2b478387b448eac09acd32e9e418af31f2;hpb=e9a898f315b5d1396f196d785913a283c30940f2;p=libs%2Fgl.git

diff --git a/source/render/zsortedscene.cpp b/source/render/zsortedscene.cpp
index 7b64fb2b..9c56f26e 100644
--- a/source/render/zsortedscene.cpp
+++ b/source/render/zsortedscene.cpp
@@ -1,3 +1,4 @@
+#include <msp/core/algorithm.h>
 #include "camera.h"
 #include "renderer.h"
 #include "zsortedscene.h"
@@ -7,21 +8,25 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-ZSortedScene::ZSortedScene():
-	order(BACK_TO_FRONT),
-	reference(FURTHEST)
-{ }
-
 void ZSortedScene::add(Renderable &r)
 {
-	if(renderables.insert(&r).second && !sorted_cache.empty())
-		sorted_cache.push_back(&r);
+	auto i = lower_bound(content, &r);
+	if(i==content.end() || *i!=&r)
+	{
+		content.insert(i, &r);
+		if(!sorted_cache.empty())
+			sorted_cache.push_back(&r);
+	}
 }
 
 void ZSortedScene::remove(Renderable &r)
 {
-	renderables.erase(&r);
-	sorted_cache.clear();
+	auto i = lower_bound(content, &r);
+	if(i!=content.end() && *i==&r)
+	{
+		content.erase(i);
+		sorted_cache.clear();
+	}
 }
 
 void ZSortedScene::set_order(SortOrder o)
@@ -36,10 +41,10 @@ void ZSortedScene::set_reference(DepthReference r)
 
 void ZSortedScene::populate_cache() const
 {
-	if(sorted_cache.empty() && !renderables.empty())
+	if(sorted_cache.empty() && !content.empty())
 	{
-		sorted_cache.reserve(renderables.size());
-		sorted_cache.insert(sorted_cache.end(), renderables.begin(), renderables.end());
+		sorted_cache.reserve(content.size());
+		sorted_cache.insert(sorted_cache.end(), content.begin(), content.end());
 	}
 }
 
@@ -58,7 +63,7 @@ void ZSortedScene::finish_frame()
 
 void ZSortedScene::render(Renderer &renderer, Tag tag) const
 {
-	if(renderables.empty())
+	if(content.empty())
 		return;
 
 	populate_cache();
@@ -67,7 +72,7 @@ void ZSortedScene::render(Renderer &renderer, Tag tag) const
 	if(!camera)
 	{
 		for(const SortedRenderable &r: sorted_cache)
-			renderer.render(*r.renderable, tag);
+			r.renderable->render(renderer, tag);
 		return;
 	}
 
@@ -76,10 +81,9 @@ void ZSortedScene::render(Renderer &renderer, Tag tag) const
 	float radius_factor = reference-1.0f;
 	float sign = 1.0f-order*2.0f;
 
-	bool use_frustum = setup_frustum(renderer);
 	for(SortedRenderable &r: sorted_cache)
 	{
-		r.in_frustum = (!use_frustum || !frustum_cull(*r.renderable));
+		r.in_frustum = camera->is_in_frustum(*r.renderable);
 		if(!r.in_frustum)
 			continue;
 
@@ -118,7 +122,7 @@ void ZSortedScene::render(Renderer &renderer, Tag tag) const
 		}
 
 	for(auto i=sorted_cache.begin(); (i!=sorted_cache.end() && i->in_frustum); ++i)
-		renderer.render(*i->renderable, tag);
+		i->renderable->render(renderer, tag);
 }