Remove dynamic allocation from VertexFormat

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

diff --git a/source/orderedscene.cpp b/source/orderedscene.cpp
index 296ad5105447583309e50de85c864fed82eb47f4..965300cc25500d2f069f0d20e5c8da5bbd5b84f4 100644 (file)
--- a/source/orderedscene.cpp
+++ b/source/orderedscene.cpp
@@ -1,12 +1,6 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2010-2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <algorithm>
 #include "orderedscene.h"
+#include "renderer.h"
 
 namespace Msp {
 namespace GL {
@@ -41,10 +35,31 @@ void OrderedScene::insert_after(const Renderable &after, const Renderable &r)
        renderables.insert(i, &r);
 }
 
-void OrderedScene::render(Renderer &renderer, const Tag &tag) const
+void OrderedScene::setup_frame() const
 {
        for(RenderableList::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-               (*i)->render(renderer, tag);
+               (*i)->setup_frame();
+}
+
+void OrderedScene::finish_frame() const
+{
+       for(RenderableList::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
+               (*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