X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frender%2Fzsortedscene.cpp;fp=source%2Frender%2Fzsortedscene.cpp;h=bdce8aa9cd4f9cab7126d2dd0d7630f99219ebc2;hp=9c56f26e8ca39a3f583f836fd0ede67fb5922b33;hb=23e368883b01ebb08ba2df56db91f19f26cf990d;hpb=ea708c5b2fad7e5a9f1787fa1422bcf7fab69dc4

diff --git a/source/render/zsortedscene.cpp b/source/render/zsortedscene.cpp
index 9c56f26e..bdce8aa9 100644
--- a/source/render/zsortedscene.cpp
+++ b/source/render/zsortedscene.cpp
@@ -14,8 +14,8 @@ void ZSortedScene::add(Renderable &r)
 	if(i==content.end() || *i!=&r)
 	{
 		content.insert(i, &r);
-		if(!sorted_cache.empty())
-			sorted_cache.push_back(&r);
+		for(auto &kvp: sorted_cache)
+			kvp.second.push_back(&r);
 	}
 }
 
@@ -39,26 +39,16 @@ void ZSortedScene::set_reference(DepthReference r)
 	reference = r;
 }
 
-void ZSortedScene::populate_cache() const
-{
-	if(sorted_cache.empty() && !content.empty())
-	{
-		sorted_cache.reserve(content.size());
-		sorted_cache.insert(sorted_cache.end(), content.begin(), content.end());
-	}
-}
-
 void ZSortedScene::setup_frame(Renderer &renderer)
 {
-	populate_cache();
-	for(const SortedRenderable &r: sorted_cache)
-		r.renderable->setup_frame(renderer);
+	for(Renderable *r: content)
+		r->setup_frame(renderer);
 }
 
 void ZSortedScene::finish_frame()
 {
-	for(const SortedRenderable &r: sorted_cache)
-		r.renderable->finish_frame();
+	for(Renderable *r: content)
+		r->finish_frame();
 }
 
 void ZSortedScene::render(Renderer &renderer, Tag tag) const
@@ -66,22 +56,27 @@ void ZSortedScene::render(Renderer &renderer, Tag tag) const
 	if(content.empty())
 		return;
 
-	populate_cache();
-
 	const Camera *camera = renderer.get_camera();
 	if(!camera)
 	{
-		for(const SortedRenderable &r: sorted_cache)
-			r.renderable->render(renderer, tag);
+		for(Renderable *r: content)
+			r->render(renderer, tag);
 		return;
 	}
 
+	vector<SortedRenderable> &cache = sorted_cache[camera];
+	if(cache.empty() && !content.empty())
+	{
+		cache.reserve(content.size());
+		cache.insert(cache.end(), content.begin(), content.end());
+	}
+
 	const Vector3 &camera_pos = camera->get_position();
 	const Vector3 &look_dir = camera->get_look_direction();
 	float radius_factor = reference-1.0f;
 	float sign = 1.0f-order*2.0f;
 
-	for(SortedRenderable &r: sorted_cache)
+	for(SortedRenderable &r: cache)
 	{
 		r.in_frustum = camera->is_in_frustum(*r.renderable);
 		if(!r.in_frustum)
@@ -99,18 +94,18 @@ void ZSortedScene::render(Renderer &renderer, Tag tag) const
 			r.depth = 0;
 	}
 
-	for(auto i=sorted_cache.begin(), j=i; i!=sorted_cache.end(); ++i)
+	for(auto i=cache.begin(), j=i; i!=cache.end(); ++i)
 		if(i->in_frustum)
 		{
 			if(i!=j)
 				swap(*i, *j);
 
-			if(j!=sorted_cache.begin() && *j<*(j-1))
+			if(j!=cache.begin() && *j<*(j-1))
 			{
 				SortedRenderable sr = *j;
 				auto k = j-1;
 				*j = *k;
-				while(k!=sorted_cache.begin() && sr<*(k-1))
+				while(k!=cache.begin() && sr<*(k-1))
 				{
 					*k = *(k-1);
 					--k;
@@ -121,7 +116,7 @@ void ZSortedScene::render(Renderer &renderer, Tag tag) const
 			++j;
 		}
 
-	for(auto i=sorted_cache.begin(); (i!=sorted_cache.end() && i->in_frustum); ++i)
+	for(auto i=cache.begin(); (i!=cache.end() && i->in_frustum); ++i)
 		i->renderable->render(renderer, tag);
 }