Use C++11 features with containers

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

diff --git a/source/render/orderedscene.cpp b/source/render/orderedscene.cpp
index 4386d3e79058f2ac7559f2f30ee1bcc92bce60d4..5912e747df787295bfbf91f83bf86756408f10db 100644 (file)
--- a/source/render/orderedscene.cpp
+++ b/source/render/orderedscene.cpp
@@ -1,4 +1,4 @@
-#include <algorithm>
+#include <msp/core/algorithm.h>
 #include "orderedscene.h"
 #include "renderer.h"
 
@@ -12,7 +12,7 @@ void OrderedScene::add(Renderable &r)
 
 void OrderedScene::remove(Renderable &r)
 {
-       RenderableList::iterator end = std::remove(renderables.begin(), renderables.end(), &r);
+       auto end = std::remove(renderables.begin(), renderables.end(), &r);
        renderables.erase(end, renderables.end());
 }
 
@@ -23,42 +23,41 @@ void OrderedScene::prepend(Renderable &r)
 
 void OrderedScene::insert(unsigned index, Renderable &r)
 {
-       RenderableList::iterator i = renderables.begin();
+       auto i = renderables.begin();
        for(; (i!=renderables.end() && index); ++i, --index) ;
        renderables.insert(i, &r);
 }
 
 void OrderedScene::insert_after(Renderable &after, Renderable &r)
 {
-       RenderableList::iterator i = renderables.begin();
-       for(; (i!=renderables.end() && *i!=&after); ++i) ;
+       auto i = find(renderables, &after);
        renderables.insert(i, &r);
 }
 
 void OrderedScene::setup_frame(Renderer &renderer)
 {
-       for(RenderableList::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-               (*i)->setup_frame(renderer);
+       for(Renderable *r: renderables)
+               r->setup_frame(renderer);
 }
 
 void OrderedScene::finish_frame()
 {
-       for(RenderableList::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-               (*i)->finish_frame();
+       for(Renderable *r: renderables)
+               r->finish_frame();
 }
 
 void OrderedScene::render(Renderer &renderer, Tag tag) const
 {
        if(setup_frustum(renderer))
        {
-               for(RenderableList::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-                       if(!frustum_cull(**i))
-                               renderer.render(**i, tag);
+               for(Renderable *r: renderables)
+                       if(!frustum_cull(*r))
+                               renderer.render(*r, tag);
        }
        else
        {
-               for(RenderableList::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-                       renderer.render(**i, tag);
+               for(Renderable *r: renderables)
+                       renderer.render(*r, tag);
        }
 }