X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frender%2Forderedscene.cpp;h=48ad7d644c43c4b39047528cb5d772584c667e10;hp=ab1ba454a7d495ee553847acf161fb42249d59c3;hb=HEAD;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266

diff --git a/source/render/orderedscene.cpp b/source/render/orderedscene.cpp
index ab1ba454..a62087e3 100644
--- a/source/render/orderedscene.cpp
+++ b/source/render/orderedscene.cpp
@@ -1,4 +1,5 @@
-#include <algorithm>
+#include <msp/core/algorithm.h>
+#include "camera.h"
 #include "orderedscene.h"
 #include "renderer.h"
 
@@ -7,58 +8,57 @@ namespace GL {
 
 void OrderedScene::add(Renderable &r)
 {
-	renderables.push_back(&r);
+	content.push_back(&r);
 }
 
 void OrderedScene::remove(Renderable &r)
 {
-	RenderableList::iterator 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.push_front(&r);
+	content.insert(content.begin(), &r);
 }
 
 void OrderedScene::insert(unsigned index, Renderable &r)
 {
-	RenderableList::iterator 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)
 {
-	RenderableList::iterator i = renderables.begin();
-	for(; (i!=renderables.end() && *i!=&after); ++i) ;
-	renderables.insert(i, &r);
+	auto i = find(content, &after);
+	content.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: content)
+		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: content)
+		r->finish_frame();
 }
 
-void OrderedScene::render(Renderer &renderer, const Tag &tag) const
+void OrderedScene::render(Renderer &renderer, Tag tag) const
 {
-	if(setup_frustum(renderer))
+	if(const Camera *camera = renderer.get_camera())
 	{
-		for(RenderableList::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-			if(!frustum_cull(**i))
-				renderer.render(**i, tag);
+		for(Renderable *r: content)
+			if(camera->is_in_frustum(*r))
+				r->render(renderer, tag);
 	}
 	else
 	{
-		for(RenderableList::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-			renderer.render(**i, tag);
+		for(Renderable *r: content)
+			r->render(renderer, tag);
 	}
 }