Remove the deprecated ProgramBuilder class

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

diff --git a/source/instancescene.h b/source/instancescene.h
index ecbd63df8d1413cfa1e8669672624f92000fd320..a5ac2cd1c743e9fd250d5489d3e13c5902d552a7 100644 (file)
--- a/source/instancescene.h
+++ b/source/instancescene.h
@@ -3,6 +3,7 @@
 
 #include <map>
 #include <set>
+#include <msp/core/inttypes.h>
 #include "scene.h"
 
 namespace Msp {
@@ -16,19 +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() const;
-       virtual void finish_frame() const;
+       virtual void setup_frame(Renderer &);
+       virtual void finish_frame();
 
-       using Scene::render;
        virtual void render(Renderer &, const Tag &tag = Tag()) const;
 };