Fix a bug in ProgramData when all uniforms in a block are removed

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

diff --git a/source/simplescene.h b/source/simplescene.h
index be86285bba84b21ea25f98aad1d3f51954a165b1..420b00901696c3f6178996e334314144be4a5cef 100644 (file)
--- a/source/simplescene.h
+++ b/source/simplescene.h
@@ -8,21 +8,27 @@ namespace Msp {
 namespace GL {
 
 /**
-The simplest possible Scene.  Rendering order is unspecified.
+A simple yet efficient scene.  Rendering order is unspecified.
 */
 class SimpleScene: public Scene
 {
 private:
-       typedef std::set<const Renderable *> RenderableSet;
+       typedef std::set<Renderable *> RenderableSet;
+       typedef std::vector<Renderable *> RenderableArray;
 
        RenderableSet renderables;
+       mutable RenderableArray cache;
 
 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;
+private:
+       void populate_cache() const;
+
+public:
+       virtual void setup_frame(Renderer &);
+       virtual void finish_frame();
 
        using Scene::render;
        virtual void render(Renderer &, const Tag & = Tag()) const;