Move transform loading to ObjectInstance

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

diff --git a/source/simplescene.h b/source/simplescene.h
index ae7d169e408df3f790cd93f7daa3955b17f033cf..e56aeb0c982592b5e8995f5ac2d78b47fc972091 100644 (file)
--- a/source/simplescene.h
+++ b/source/simplescene.h
@@ -12,25 +12,24 @@ A simple yet efficient scene.  Rendering order is unspecified.
 */
 class SimpleScene: public Scene
 {
-protected:
-       typedef std::set<const Renderable *> RenderableSet;
-       typedef std::vector<const Renderable *> RenderableArray;
+private:
+       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 &);
 
 private:
        void populate_cache() const;
 
 public:
-       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()) const;
 };