Remove the culler abstraction and move frustum culling to Scene

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

diff --git a/source/instancescene.cpp b/source/instancescene.cpp
index ffbfa558f42e4bf2ad35f799579c2b438544e91d..fef3e9697e602051248bfe35f827078eac8a4117 100644 (file)
--- a/source/instancescene.cpp
+++ b/source/instancescene.cpp
@@ -22,11 +22,27 @@ void InstanceScene::remove(const Renderable &r)
        }
 }
 
+void InstanceScene::setup_frame() const
+{
+       for(InstanceMap::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
+               for(RenderableSet::const_iterator j=i->second.begin(); j!=i->second.end(); ++j)
+                       (*j)->setup_frame();
+}
+
+void InstanceScene::finish_frame() const
+{
+       for(InstanceMap::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
+               for(RenderableSet::const_iterator j=i->second.begin(); j!=i->second.end(); ++j)
+                       (*j)->finish_frame();
+}
+
 void InstanceScene::render(Renderer &renderer, const Tag &tag) const
 {
+       setup_frustum(renderer);
        for(InstanceMap::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
                for(RenderableSet::const_iterator j=i->second.begin(); j!=i->second.end(); ++j)
-                       (*j)->render(renderer, tag);
+                       if(!frustum_cull(renderer, **j))
+                               renderer.render(**j, tag);
 }
 
 } // namespace GL