Add functions for setting arrays of 2x2 and 3x3 matrix uniforms

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

diff --git a/source/instancescene.h b/source/instancescene.h
index d23fbb1f4001043379f3bc564a7eab23796618b0..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 {
@@ -17,7 +18,7 @@ class InstanceScene: public Scene
 {
 private:
        typedef std::set<Renderable *> RenderableSet;
-       typedef std::map<long, RenderableSet> InstanceMap;
+       typedef std::map<IntPtr, RenderableSet> InstanceMap;
 
        InstanceMap renderables;
 
@@ -25,10 +26,9 @@ public:
        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;
 };