Remove the exclusion mechanism from Renderer

[libs/gl.git] / source / render / renderer.h

diff --git a/source/render/renderer.h b/source/render/renderer.h
index fa7de736d1ff868b0be1874acb04c997b48254da..eb23e96dab8deb8d8c10ec384bca387ef21b7085 100644 (file)
--- a/source/render/renderer.h
+++ b/source/render/renderer.h
@@ -16,7 +16,6 @@ class Batch;
 class Buffer;
 class Camera;
 union ClearValue;
-class Clipping;
 class Material;
 class Mesh;
 class Lighting;
@@ -54,17 +53,6 @@ public:
                ~Push() { renderer.pop_state(); }
        };
 
-       class Exclude
-       {
-       private:
-               Renderer &renderer;
-               const Renderable &renderable;
-
-       public:
-               Exclude(Renderer &r, const Renderable &e): renderer(r), renderable(e) { renderer.exclude(renderable); }
-               ~Exclude() { renderer.include(renderable); }
-       };
-
 private:
        struct BoundTexture
        {
@@ -91,7 +79,6 @@ private:
                const Rect *viewport = 0;
                const Rect *scissor = 0;
                unsigned texture_count = 0;
-               const Clipping *clipping = 0;
                const Program *shprog = 0;
                unsigned shdata_count = 0;
                const VertexSetup *vertex_setup = 0;
@@ -109,13 +96,12 @@ private:
                SHADER_DATA = 16
        };
 
-       unsigned char changed;
+       unsigned char changed = 0;
        std::vector<State> state_stack;
        State *state;
        std::vector<BoundTexture> texture_stack;
        ProgramData standard_shdata;
        std::vector<BoundProgramData> shdata_stack;
-       std::set<const Renderable *> excluded;
        PipelineState pipeline_state;
        Commands commands;
 
@@ -150,7 +136,6 @@ public:
        DEPRECATED void set_material(const Material *);
 
        DEPRECATED void set_lighting(const Lighting *);
-       void set_clipping(const Clipping *);
 
        /** Sets the shader program to use.  An initial set of data can be set as
        well, with the same semantics as add_shader_data. */
@@ -189,12 +174,8 @@ public:
        further rendering. */
        void end();
 
-       void exclude(const Renderable &);
-       void include(const Renderable &);
-
        void clear(const ClearValue *);
 
-       void render(const Renderable &, Tag = Tag());
        void draw(const Batch &);
        void draw_instanced(const Batch &, unsigned);