X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsimplescene.cpp;h=137873dad8808b99a0717b31721e4fb67db5b1f5;hb=d031a80ea06e3ccd01041e9c6024fa62adf25160;hp=c537ff3b87eef6ff3158b206accd0ab7b9d0c9c6;hpb=4edd75061a1e24572bd672fb72e1bc1838008ce7;p=libs%2Fgl.git

diff --git a/source/simplescene.cpp b/source/simplescene.cpp
index c537ff3b..137873da 100644
--- a/source/simplescene.cpp
+++ b/source/simplescene.cpp
@@ -4,34 +4,55 @@
 namespace Msp {
 namespace GL {
 
-void SimpleScene::add(const Renderable &r)
+void SimpleScene::add(Renderable &r)
 {
-	renderables.insert(&r);
+	// Add to cache as well if the cache is valid
+	if(renderables.insert(&r).second && !cache.empty())
+		cache.push_back(&r);
 }
 
-void SimpleScene::remove(const Renderable &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());
+	}
 }
 
 void SimpleScene::setup_frame() const
 {
-	for(RenderableSet::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
+	populate_cache();
+	for(RenderableArray::const_iterator i=cache.begin(); i!=cache.end(); ++i)
 		(*i)->setup_frame();
 }
 
 void SimpleScene::finish_frame() const
 {
-	for(RenderableSet::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
+	for(RenderableArray::const_iterator i=cache.begin(); i!=cache.end(); ++i)
 		(*i)->finish_frame();
 }
 
 void SimpleScene::render(Renderer &renderer, const Tag &tag) const
 {
-	setup_cullers(renderer);
-	for(RenderableSet::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-		if(!cull(renderer, **i))
+	populate_cache();
+	if(setup_frustum(renderer))
+	{
+		for(RenderableArray::const_iterator i=cache.begin(); i!=cache.end(); ++i)
+			if(!frustum_cull(**i))
+				renderer.render(**i, tag);
+	}
+	else
+	{
+		for(RenderableArray::const_iterator i=cache.begin(); i!=cache.end(); ++i)
 			renderer.render(**i, tag);
+	}
 }
 
 } // namespace GL