Use RED format for ambient occlusion render target

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

diff --git a/source/orderedscene.cpp b/source/orderedscene.cpp
index fe968f0c430ca2c127458dde5cafa6678047001c..ab1ba454a7d495ee553847acf161fb42249d59c3 100644 (file)
--- a/source/orderedscene.cpp
+++ b/source/orderedscene.cpp
@@ -5,43 +5,43 @@
 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) ;
        renderables.insert(i, &r);
 }
 
-void OrderedScene::setup_frame() const
+void OrderedScene::setup_frame(Renderer &renderer)
 {
        for(RenderableList::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-               (*i)->setup_frame();
+               (*i)->setup_frame(renderer);
 }
 
-void OrderedScene::finish_frame() const
+void OrderedScene::finish_frame()
 {
        for(RenderableList::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
                (*i)->finish_frame();
@@ -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