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

diff --git a/source/render/orderedscene.cpp b/source/render/orderedscene.cpp
index 2d018c70..48ad7d64 100644
--- a/source/render/orderedscene.cpp
+++ b/source/render/orderedscene.cpp
@@ -7,42 +7,42 @@ 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();
 }
 
@@ -50,13 +50,13 @@ void OrderedScene::render(Renderer &renderer, Tag tag) const
 {
 	if(setup_frustum(renderer))
 	{
-		for(Renderable *r: renderables)
+		for(Renderable *r: content)
 			if(!frustum_cull(*r))
 				r->render(renderer, tag);
 	}
 	else
 	{
-		for(Renderable *r: renderables)
+		for(Renderable *r: content)
 			r->render(renderer, tag);
 	}
 }