Remove dynamic allocation from VertexFormat

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

diff --git a/source/orderedscene.cpp b/source/orderedscene.cpp
index fe968f0c430ca2c127458dde5cafa6678047001c..965300cc25500d2f069f0d20e5c8da5bbd5b84f4 100644 (file)
--- a/source/orderedscene.cpp
+++ b/source/orderedscene.cpp
@@ -49,10 +49,17 @@ void OrderedScene::finish_frame() const
 
 void OrderedScene::render(Renderer &renderer, const Tag &tag) const
 {
-       setup_cullers(renderer);
-       for(RenderableList::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-               if(!cull(renderer, **i))
+       if(setup_frustum(renderer))
+       {
+               for(RenderableList::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
+                       if(!frustum_cull(**i))
+                               renderer.render(**i, tag);
+       }
+       else
+       {
+               for(RenderableList::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
                        renderer.render(**i, tag);
+       }
 }
 
 } // namespace GL