-#include <algorithm>
+#include <msp/core/algorithm.h>
#include "orderedscene.h"
#include "renderer.h"
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());
}
void OrderedScene::prepend(Renderable &r)
{
- renderables.push_front(&r);
+ renderables.insert(renderables.begin(), &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, const Tag &tag) const
+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);
}
}