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

diff --git a/source/render/zsortedscene.cpp b/source/render/zsortedscene.cpp
index 7b64fb2b..733e3d08 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);
+		for(auto &kvp: sorted_cache)
+			kvp.second.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)
@@ -34,52 +39,46 @@ void ZSortedScene::set_reference(DepthReference r)
 	reference = r;
 }
 
-void ZSortedScene::populate_cache() const
-{
-	if(sorted_cache.empty() && !renderables.empty())
-	{
-		sorted_cache.reserve(renderables.size());
-		sorted_cache.insert(sorted_cache.end(), renderables.begin(), renderables.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
 {
-	if(renderables.empty())
+	if(content.empty())
 		return;
 
-	populate_cache();
-
 	const Camera *camera = renderer.get_camera();
 	if(!camera)
 	{
-		for(const SortedRenderable &r: sorted_cache)
-			renderer.render(*r.renderable, 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;
 
-	bool use_frustum = setup_frustum(renderer);
-	for(SortedRenderable &r: sorted_cache)
+	for(SortedRenderable &r: cache)
 	{
-		r.in_frustum = (!use_frustum || !frustum_cull(*r.renderable));
+		r.in_frustum = camera->is_in_frustum(*r.renderable);
 		if(!r.in_frustum)
 			continue;
 
@@ -95,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;
@@ -117,16 +116,9 @@ void ZSortedScene::render(Renderer &renderer, Tag tag) const
 			++j;
 		}
 
-	for(auto i=sorted_cache.begin(); (i!=sorted_cache.end() && i->in_frustum); ++i)
-		renderer.render(*i->renderable, tag);
+	for(auto i=cache.begin(); (i!=cache.end() && i->in_frustum); ++i)
+		i->renderable->render(renderer, tag);
 }
 
-
-ZSortedScene::SortedRenderable::SortedRenderable(Renderable *r):
-	renderable(r),
-	in_frustum(false),
-	depth(0.0f)
-{ }
-
 } // namespace GL
 } // namespace Msp