X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frender%2Fsimplescene.cpp;h=68db812b2db18c34f5338b0844932d5146dc2a74;hp=bcc4af21dc1779f086348c1b054883733cf01425;hb=HEAD;hpb=e9a898f315b5d1396f196d785913a283c30940f2

diff --git a/source/render/simplescene.cpp b/source/render/simplescene.cpp
index bcc4af21..e78b4709 100644
--- a/source/render/simplescene.cpp
+++ b/source/render/simplescene.cpp
@@ -1,3 +1,5 @@
+#include <msp/core/algorithm.h>
+#include "camera.h"
 #include "renderer.h"
 #include "simplescene.h"
 
@@ -6,52 +8,42 @@ namespace GL {
 
 void SimpleScene::add(Renderable &r)
 {
-	// Add to cache as well if the cache is valid
-	if(renderables.insert(&r).second && !cache.empty())
-		cache.push_back(&r);
+	auto i = lower_bound(content, &r);
+	if(i==content.end() || *i!=&r)
+		content.insert(i, &r);
 }
 
 void SimpleScene::remove(Renderable &r)
 {
-	renderables.erase(&r);
-	cache.clear();
-}
-
-void SimpleScene::populate_cache() const
-{
-	if(cache.empty() && !renderables.empty())
-	{
-		cache.reserve(renderables.size());
-		cache.insert(cache.end(), renderables.begin(), renderables.end());
-	}
+	auto i = find(content, &r);
+	if(i!=content.end())
+		content.erase(i);
 }
 
 void SimpleScene::setup_frame(Renderer &renderer)
 {
-	populate_cache();
-	for(Renderable *r: cache)
+	for(Renderable *r: content)
 		r->setup_frame(renderer);
 }
 
 void SimpleScene::finish_frame()
 {
-	for(Renderable *r: cache)
+	for(Renderable *r: content)
 		r->finish_frame();
 }
 
 void SimpleScene::render(Renderer &renderer, Tag tag) const
 {
-	populate_cache();
-	if(setup_frustum(renderer))
+	if(const Camera *camera = renderer.get_camera())
 	{
-		for(Renderable *r: cache)
-			if(!frustum_cull(*r))
-				renderer.render(*r, tag);
+		for(Renderable *r: content)
+			if(camera->is_in_frustum(*r))
+				r->render(renderer, tag);
 	}
 	else
 	{
-		for(Renderable *r: cache)
-			renderer.render(*r, tag);
+		for(Renderable *r: content)
+			r->render(renderer, tag);
 	}
 }