X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finstancescene.h;h=a5ac2cd1c743e9fd250d5489d3e13c5902d552a7;hb=b0059bd068c99dadfc922584911fcb25a21b737b;hp=18229d72cc59b59a43408c6bd2e6dd9de1decdb3;hpb=0e8ffd3b59e9b5c52c66c22c9ae4f9d3544aa6bf;p=libs%2Fgl.git

diff --git a/source/instancescene.h b/source/instancescene.h
index 18229d72..a5ac2cd1 100644
--- a/source/instancescene.h
+++ b/source/instancescene.h
@@ -1,15 +1,9 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007-2008, 2010-2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_INSTANCESCENE_H_
 #define MSP_GL_INSTANCESCENE_H_
 
 #include <map>
 #include <set>
+#include <msp/core/inttypes.h>
 #include "scene.h"
 
 namespace Msp {
@@ -23,16 +17,18 @@ the same key rendering order is unspecified.
 class InstanceScene: public Scene
 {
 private:
-	typedef std::set<const Renderable *> RenderableSet;
-	typedef std::map<long, RenderableSet> InstanceMap;
+	typedef std::set<Renderable *> RenderableSet;
+	typedef std::map<IntPtr, RenderableSet> InstanceMap;
 
 	InstanceMap renderables;
 
 public:
-	virtual void add(const Renderable &);
-	virtual void remove(const Renderable &);
+	virtual void add(Renderable &);
+	virtual void remove(Renderable &);
+
+	virtual void setup_frame(Renderer &);
+	virtual void finish_frame();
 
-	using Scene::render;
 	virtual void render(Renderer &, const Tag &tag = Tag()) const;
 };