Check the flat qualifier from the correct member

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

diff --git a/source/render/orderedscene.cpp b/source/render/orderedscene.cpp
index bf1a62481310d4b5fe9e556ee24cdb27b9d8b25a..a62087e34dac1bd54a94e7d65e690277bbb81555 100644 (file)
--- a/source/render/orderedscene.cpp
+++ b/source/render/orderedscene.cpp
@@ -1,4 +1,5 @@
 #include <msp/core/algorithm.h>
+#include "camera.h"
 #include "orderedscene.h"
 #include "renderer.h"
 
@@ -7,57 +8,57 @@ namespace GL {
 
 void OrderedScene::add(Renderable &r)
 {
-       renderables.push_back(&r);
+       content.push_back(&r);
 }
 
 void OrderedScene::remove(Renderable &r)
 {
-       auto end = std::remove(renderables.begin(), renderables.end(), &r);
-       renderables.erase(end, renderables.end());
+       auto end = std::remove(content.begin(), content.end(), &r);
+       content.erase(end, content.end());
 }
 
 void OrderedScene::prepend(Renderable &r)
 {
-       renderables.insert(renderables.begin(), &r);
+       content.insert(content.begin(), &r);
 }
 
 void OrderedScene::insert(unsigned index, Renderable &r)
 {
-       auto i = renderables.begin();
-       for(; (i!=renderables.end() && index); ++i, --index) ;
-       renderables.insert(i, &r);
+       auto i = content.begin();
+       for(; (i!=content.end() && index); ++i, --index) ;
+       content.insert(i, &r);
 }
 
 void OrderedScene::insert_after(Renderable &after, Renderable &r)
 {
-       auto i = find(renderables, &after);
-       renderables.insert(i, &r);
+       auto i = find(content, &after);
+       content.insert(i, &r);
 }
 
 void OrderedScene::setup_frame(Renderer &renderer)
 {
-       for(Renderable *r: renderables)
+       for(Renderable *r: content)
                r->setup_frame(renderer);
 }
 
 void OrderedScene::finish_frame()
 {
-       for(Renderable *r: renderables)
+       for(Renderable *r: content)
                r->finish_frame();
 }
 
 void OrderedScene::render(Renderer &renderer, Tag tag) const
 {
-       if(setup_frustum(renderer))
+       if(const Camera *camera = renderer.get_camera())
        {
-               for(Renderable *r: renderables)
-                       if(!frustum_cull(*r))
-                               renderer.render(*r, tag);
+               for(Renderable *r: content)
+                       if(camera->is_in_frustum(*r))
+                               r->render(renderer, tag);
        }
        else
        {
-               for(Renderable *r: renderables)
-                       renderer.render(*r, tag);
+               for(Renderable *r: content)
+                       r->render(renderer, tag);
        }
 }