X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Forderedscene.cpp;h=ab1ba454a7d495ee553847acf161fb42249d59c3;hp=547af77aa1d852bb63a3757d6492ad657e026193;hb=99d25b5ef615a23ef63645fea87596b3384b5ede;hpb=f14435e58bfa0fa697a06ba9a454bb30cd37d9d8

diff --git a/source/orderedscene.cpp b/source/orderedscene.cpp
index 547af77a..ab1ba454 100644
--- a/source/orderedscene.cpp
+++ b/source/orderedscene.cpp
@@ -1,43 +1,65 @@
 #include <algorithm>
 #include "orderedscene.h"
+#include "renderer.h"
 
 namespace Msp {
 namespace GL {
 
-void OrderedScene::add(const Renderable &r)
+void OrderedScene::add(Renderable &r)
 {
 	renderables.push_back(&r);
 }
 
-void OrderedScene::remove(const Renderable &r)
+void OrderedScene::remove(Renderable &r)
 {
 	RenderableList::iterator end = std::remove(renderables.begin(), renderables.end(), &r);
 	renderables.erase(end, renderables.end());
 }
 
-void OrderedScene::prepend(const Renderable &r)
+void OrderedScene::prepend(Renderable &r)
 {
 	renderables.push_front(&r);
 }
 
-void OrderedScene::insert(unsigned index, const Renderable &r)
+void OrderedScene::insert(unsigned index, Renderable &r)
 {
 	RenderableList::iterator i = renderables.begin();
 	for(; (i!=renderables.end() && index); ++i, --index) ;
 	renderables.insert(i, &r);
 }
 
-void OrderedScene::insert_after(const Renderable &after, const Renderable &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);
 }
 
-void OrderedScene::render(Renderer &renderer, const Tag &tag) const
+void OrderedScene::setup_frame(Renderer &renderer)
+{
+	for(RenderableList::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
+		(*i)->setup_frame(renderer);
+}
+
+void OrderedScene::finish_frame()
 {
 	for(RenderableList::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-		(*i)->render(renderer, tag);
+		(*i)->finish_frame();
+}
+
+void OrderedScene::render(Renderer &renderer, const 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);
+	}
+	else
+	{
+		for(RenderableList::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
+			renderer.render(**i, tag);
+	}
 }
 
 } // namespace GL