X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Fzsortedscene.cpp;h=25255dc693569a9d34b2adfc7b64f709089af63e;hb=f1e31ee641f0cafdfe2015bff206b9ee2ad85abf;hp=b9833dadff84ed31f5418bd2a526b3a905d9cd51;hpb=38712d8ecc57d043a2419ffbaeeb57f7a6586f14;p=libs%2Fgl.git

diff --git a/source/render/zsortedscene.cpp b/source/render/zsortedscene.cpp
index b9833dad..25255dc6 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"
@@ -9,14 +10,23 @@ namespace GL {
 
 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)
@@ -31,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());
 	}
 }
 
@@ -53,7 +63,7 @@ void ZSortedScene::finish_frame()
 
 void ZSortedScene::render(Renderer &renderer, Tag tag) const
 {
-	if(renderables.empty())
+	if(content.empty())
 		return;
 
 	populate_cache();
@@ -62,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;
 	}
 
@@ -113,7 +123,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);
 }