Remove dynamic allocation from VertexFormat

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

diff --git a/source/instancescene.cpp b/source/instancescene.cpp
index fb99dda881f83ca8630a4cfcba36e42b3ca5a51a..b3a89f338a42cfff32500ccace3256e0b1e7727b 100644 (file)
--- a/source/instancescene.cpp
+++ b/source/instancescene.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007-2008, 2010-2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include "object.h"
 #include "objectinstance.h"
 #include "instancescene.h"
@@ -29,11 +22,35 @@ void InstanceScene::remove(const Renderable &r)
        }
 }
 
-void InstanceScene::render(Renderer &renderer, const Tag &tag) const
+void InstanceScene::setup_frame() const
+{
+       for(InstanceMap::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
+               for(RenderableSet::const_iterator j=i->second.begin(); j!=i->second.end(); ++j)
+                       (*j)->setup_frame();
+}
+
+void InstanceScene::finish_frame() const
 {
        for(InstanceMap::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
                for(RenderableSet::const_iterator j=i->second.begin(); j!=i->second.end(); ++j)
-                       (*j)->render(renderer, tag);
+                       (*j)->finish_frame();
+}
+
+void InstanceScene::render(Renderer &renderer, const Tag &tag) const
+{
+       if(setup_frustum(renderer))
+       {
+               for(InstanceMap::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
+                       for(RenderableSet::const_iterator j=i->second.begin(); j!=i->second.end(); ++j)
+                               if(!frustum_cull(**j))
+                                       renderer.render(**j, tag);
+       }
+       else
+       {
+               for(InstanceMap::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
+                       for(RenderableSet::const_iterator j=i->second.begin(); j!=i->second.end(); ++j)
+                               renderer.render(**j, tag);
+       }
 }
 
 } // namespace GL