Require explicit begin() and end() calls in Renderer

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

diff --git a/source/render/renderer.h b/source/render/renderer.h
index 0371e8374a6a9207faf913f13c16f653cf75fac1..4c24068e03cb7a4e792c020575c997623423d346 100644 (file)
--- a/source/render/renderer.h
+++ b/source/render/renderer.h
@@ -100,7 +100,7 @@ private:
 
        unsigned char changed = 0;
        std::vector<State> state_stack;
-       State *state;
+       State *current_state = 0;
        ProgramData standard_shdata;
        std::vector<BoundProgramData> shdata_stack;
        std::vector<BoundTexture> texture_stack;
@@ -111,10 +111,11 @@ public:
        Renderer();
        ~Renderer();
 
+       /** Begins rendering, allowing commands to be issued. */
+       void begin();
 
-       /** Unbinds all objects and resets related state.  There must be no unpopped
-       state in the stack.  The Renderer remains valid and may be reused for
-       further rendering. */
+       /** Ends rendering.  Any global state is reset to defaults.  No further
+       commands are allowed before the next call to begin(). */
        void end();
 
        /** Saves the current state so it can be restored later. */
@@ -124,10 +125,14 @@ public:
        push_state call. */
        void pop_state();
 
+private:
+       State &get_state() const;
+
+public:
        /** Sets the camera to render from.  The model matrix is reset to identity. */
        void set_camera(const Camera &);
 
-       const Camera *get_camera() const { return state->camera; }
+       const Camera *get_camera() const { return get_state().camera; }
 
        /** Replaces the Renderer's model matrix. */
        void set_matrix(const Matrix &);
@@ -136,13 +141,13 @@ public:
        void transform(const Matrix &);
 
        /** Returns the current model matrix. */
-       const Matrix &get_matrix() const { return state->model_matrix; }
+       const Matrix &get_matrix() const { return get_state().model_matrix; }
 
        void set_framebuffer(const Framebuffer *);
        void set_viewport(const Rect *);
        void set_scissor(const Rect *);
 
-       const Framebuffer *get_framebuffer() const { return state->framebuffer; }
+       const Framebuffer *get_framebuffer() const { return get_state().framebuffer; }
 
        /** Sets the shader program to use.  As a convenience, uniform values may be
        specified at the same time. */
@@ -169,7 +174,7 @@ public:
        void set_blend(const Blend *);
 
        void set_object_lod_bias(unsigned);
-       unsigned get_object_lod_bias() const { return state->object_lod_bias; }
+       unsigned get_object_lod_bias() const { return get_state().object_lod_bias; }
 
        void clear(const ClearValue *);