Remove dynamic allocation from VertexFormat

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

diff --git a/source/orderedscene.h b/source/orderedscene.h
index 6bb12192a851877887dd1b21dc1100c4554a7e18..340ecedab3b52c5cd307119ec104b6a5a37436ae 100644 (file)
--- a/source/orderedscene.h
+++ b/source/orderedscene.h
@@ -1,15 +1,8 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_ORDEREDSCENE_H_
 #define MSP_GL_ORDEREDSCENE_H_
 
 #include <list>
-#include <msp/gl/scene.h>
+#include "scene.h"
 
 namespace Msp {
 namespace GL {
@@ -32,7 +25,11 @@ public:
        void insert(unsigned, const Renderable &);
        void insert_after(const Renderable &, const Renderable &);
 
-       virtual void render(const Tag & = Tag()) const;
+       virtual void setup_frame() const;
+       virtual void finish_frame() const;
+
+       using Scene::render;
+       virtual void render(Renderer &, const Tag & = Tag()) const;
 };
 
 } // namespace GL