Remove the deprecated ProgramBuilder class

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

diff --git a/source/renderer.h b/source/renderer.h
index 1f4624ce889476370c25fef2e0077db723c8ded1..2854bc8ff181f3ead7f0f19ec9b0ec56d79b0470 100644 (file)
--- a/source/renderer.h
+++ b/source/renderer.h
@@ -19,8 +19,10 @@ class Mesh;
 class Lighting;
 class Program;
 class Renderable;
+class Sampler;
 class Texture;
 class Texturing;
+class VertexSetup;
 class WindingTest;
 
 /**
@@ -67,6 +69,7 @@ private:
                const Camera *camera;
                Matrix modelview_matrix;
                const Texture *texture;
+               const Sampler *sampler;
                const Texturing *texturing;
                unsigned lowest_effect_texunit;
                const Material *material;
@@ -76,29 +79,24 @@ private:
                Matrix clipping_matrix;
                const Program *shprog;
                unsigned shdata_count;
-               const Mesh *mesh;
+               const VertexSetup *vertex_setup;
                const WindingTest *winding_test;
                bool reverse_winding;
+               unsigned object_lod_bias;
 
                State();
        };
 
        enum ChangeMask
        {
-               LEGACY_MATRIX = 1,
-               MODERN_MATRIX = 2,
-               MATRIX = LEGACY_MATRIX|MODERN_MATRIX,
-               LEGACY_LIGHTING = 4,
-               LEGACY_CLIPPING = 8,
+               MATRIX = 2,
                SHADER_DATA = 16,
                MATERIAL_SHDATA = 32,
-               STANDARD_SHDATA = 64,
-               LEGACY_PROJECTION = 128
+               STANDARD_SHDATA = 64
        };
 
+       const Camera *default_camera;
        unsigned char changed;
-       bool matrices_loaded;
-       unsigned shdata_applied;
        std::vector<State> state_stack;
        State *state;
        ProgramData standard_shdata;
@@ -106,14 +104,13 @@ private:
        std::set<const Renderable *> excluded;
 
 public:
-       Renderer(const Camera *);
+       Renderer();
+       DEPRECATED Renderer(const Camera *);
+private:
+       void init();
+public:
        ~Renderer();
 
-       /** Resets all internal state and restarts rendering.  There must be no
-       unpopped state in the stack.  It is permissible to call begin() multiple
-       times without an intervening end(). */
-       void begin(const Camera *);
-
        /** Sets the camera to render from.  The modelview matrix is reset to the
        camera's view matrix. */
        void set_camera(const Camera &);
@@ -129,7 +126,7 @@ public:
        /** Returns the current modelview matrix. */
        const Matrix &get_matrix() const { return state->modelview_matrix; }
 
-       void set_texture(const Texture *);
+       void set_texture(const Texture *, const Sampler * = 0);
        void set_texturing(const Texturing *);
        unsigned allocate_effect_texunit();
        void set_material(const Material *);
@@ -146,10 +143,15 @@ public:
        Renderer state is popped. */
        void add_shader_data(const ProgramData &data);
 
-       void set_mesh(const Mesh *);
+       void flush_shader_data();
+
+       void set_vertex_setup(const VertexSetup *);
        void set_winding_test(const WindingTest *);
        void set_reverse_winding(bool);
 
+       void set_object_lod_bias(unsigned);
+       unsigned get_object_lod_bias() const { return state->object_lod_bias; }
+
        /** Saves the current state so it can be restored later. */
        void push_state();
 
@@ -157,14 +159,9 @@ public:
        push_state call. */
        void pop_state();
 
-       /** Prepares for temporarily bypassing the Renderer by synchronizing the
-       current state with GL.  No additional call is necessary to resume using the
-       Renderer.  DEPRECATED. */
-       void escape();
-
        /** Unbinds all objects and resets related state.  There must be no unpopped
-       state in the stack.  Rendering with the same camera can be restarted without
-       an explicit begin() call. */
+       state in the stack.  The Renderer remains valid and may be reused for
+       further rendering. */
        void end();
 
        void exclude(const Renderable &);
@@ -172,10 +169,10 @@ public:
 
        void render(const Renderable &, const Tag & = Tag());
        void draw(const Batch &);
+       void draw_instanced(const Batch &, unsigned);
 
 private:
        void apply_state();
-       void reset_state();
 };
 
 } // namespace GL