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

diff --git a/source/render/zsortedscene.cpp b/source/render/zsortedscene.cpp
index 7b64fb2b..af3c5b86 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(renderables, &r);
+	if(i==renderables.end() || *i!=&r)
+	{
+		renderables.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(renderables, &r);
+	if(i!=renderables.end() && *i==&r)
+	{
+		renderables.erase(i);
+		sorted_cache.clear();
+	}
 }
 
 void ZSortedScene::set_order(SortOrder o)
@@ -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;
 	}
 
@@ -118,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);
 }