Store Renderables as non-const pointers or references

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

diff --git a/source/orderedscene.cpp b/source/orderedscene.cpp
index e738cad7ace50fb84a096aea52c6eafde68cbb2a..f104562f3de9f2d0255aa2d6a1d4829c372002fd 100644 (file)
--- a/source/orderedscene.cpp
+++ b/source/orderedscene.cpp
@@ -5,30 +5,30 @@
 namespace Msp {
 namespace GL {
 
-void OrderedScene::add(const Renderable &r)
+void OrderedScene::add(Renderable &r)
 {
        renderables.push_back(&r);
 }
 
-void OrderedScene::remove(const Renderable &r)
+void OrderedScene::remove(Renderable &r)
 {
        RenderableList::iterator end = std::remove(renderables.begin(), renderables.end(), &r);
        renderables.erase(end, renderables.end());
 }
 
-void OrderedScene::prepend(const Renderable &r)
+void OrderedScene::prepend(Renderable &r)
 {
        renderables.push_front(&r);
 }
 
-void OrderedScene::insert(unsigned index, const Renderable &r)
+void OrderedScene::insert(unsigned index, Renderable &r)
 {
        RenderableList::iterator i = renderables.begin();
        for(; (i!=renderables.end() && index); ++i, --index) ;
        renderables.insert(i, &r);
 }
 
-void OrderedScene::insert_after(const Renderable &after, const Renderable &r)
+void OrderedScene::insert_after(Renderable &after, Renderable &r)
 {
        RenderableList::iterator i = renderables.begin();
        for(; (i!=renderables.end() && *i!=&after); ++i) ;
@@ -49,8 +49,17 @@ void OrderedScene::finish_frame() const
 
 void OrderedScene::render(Renderer &renderer, const Tag &tag) const
 {
-       for(RenderableList::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-               renderer.render(**i, tag);
+       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