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 3e0e50d83d80290a08642b81b978cc3048152c35..eb23e96dab8deb8d8c10ec384bca387ef21b7085 100644 (file)
--- a/source/render/renderer.h
+++ b/source/render/renderer.h
@@ -4,7 +4,6 @@
 #include <set>
 #include <vector>
 #include "commands.h"
-#include "framebuffer.h"
 #include "matrix.h"
 #include "pipelinestate.h"
 #include "programdata.h"
@@ -16,7 +15,7 @@ namespace GL {
 class Batch;
 class Buffer;
 class Camera;
-class Clipping;
+union ClearValue;
 class Material;
 class Mesh;
 class Lighting;
@@ -54,57 +53,41 @@ 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
        {
                Tag tag;
-               mutable int unit;
-               const Texture *texture;
-               const Sampler *sampler;
-               int replaced;
-
-               BoundTexture();
+               mutable int unit = -1;
+               const Texture *texture = 0;
+               const Sampler *sampler = 0;
+               int replaced = -1;
        };
 
        struct BoundProgramData
        {
                const ProgramData *shdata;
-               mutable unsigned generation;
+               mutable unsigned generation = 0;
 
                BoundProgramData(const ProgramData *);
        };
 
        struct State
        {
-               const Camera *camera;
+               const Camera *camera = 0;
                Matrix model_matrix;
-               const Framebuffer *framebuffer;
-               const Rect *viewport;
-               const Rect *scissor;
-               unsigned texture_count;
-               const Clipping *clipping;
-               const Program *shprog;
-               unsigned shdata_count;
-               const VertexSetup *vertex_setup;
-               FaceWinding front_face;
-               CullMode face_cull;
-               const DepthTest *depth_test;
-               const StencilTest *stencil_test;
-               const Blend *blend;
-               unsigned object_lod_bias;
-
-               State();
+               const Framebuffer *framebuffer = 0;
+               const Rect *viewport = 0;
+               const Rect *scissor = 0;
+               unsigned texture_count = 0;
+               const Program *shprog = 0;
+               unsigned shdata_count = 0;
+               const VertexSetup *vertex_setup = 0;
+               FaceWinding front_face = NON_MANIFOLD;
+               CullMode face_cull = NO_CULL;
+               const DepthTest *depth_test = 0;
+               const StencilTest *stencil_test = 0;
+               const Blend *blend = 0;
+               unsigned object_lod_bias = 0;
        };
 
        enum ChangeMask
@@ -113,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;
 
@@ -154,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. */
@@ -193,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);