Check for OES_mapbuffer in Buffer::unmap

[libs/gl.git] / source / simplescene.cpp

diff --git a/source/simplescene.cpp b/source/simplescene.cpp
index f866f678280b2b4b2786aa2f5920fb9b816472fc..d1fd3c1cea2a4c4ad0349fb1a30017cfa2b52920 100644 (file)
--- a/source/simplescene.cpp
+++ b/source/simplescene.cpp
@@ -4,32 +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::setup_frame() const
+void SimpleScene::populate_cache() const
 {
-       for(RenderableSet::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-               (*i)->setup_frame();
+       if(cache.empty() && !renderables.empty())
+       {
+               cache.reserve(renderables.size());
+               cache.insert(cache.end(), renderables.begin(), renderables.end());
+       }
 }
 
-void SimpleScene::finish_frame() const
+void SimpleScene::setup_frame(Renderer &renderer)
 {
-       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(renderer);
+}
+
+void SimpleScene::finish_frame()
+{
+       for(RenderableArray::const_iterator i=cache.begin(); i!=cache.end(); ++i)
                (*i)->finish_frame();
 }
 
 void SimpleScene::render(Renderer &renderer, const Tag &tag) const
 {
-       for(RenderableSet::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-               renderer.render(**i, tag);
+       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