X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Frenderer.h;h=575dbe67ee8af1e9adf758c3be0c7ca0caea3045;hb=175153f224916b92d02a325aac5628956cda8daf;hp=36fe6c919a5e063de7b5fa0e74353fe0643b700d;hpb=42c44db6aa2961cffea6263f337adbd9d161c59c;p=libs%2Fgl.git

diff --git a/source/render/renderer.h b/source/render/renderer.h
index 36fe6c91..575dbe67 100644
--- a/source/render/renderer.h
+++ b/source/render/renderer.h
@@ -100,10 +100,10 @@ private:
 
 	unsigned char changed = 0;
 	std::vector<State> state_stack;
-	State *state;
-	std::vector<BoundTexture> texture_stack;
+	State *current_state = 0;
 	ProgramData standard_shdata;
 	std::vector<BoundProgramData> shdata_stack;
+	std::vector<BoundTexture> texture_stack;
 	PipelineState pipeline_state;
 	Commands commands;
 
@@ -111,31 +111,41 @@ public:
 	Renderer();
 	~Renderer();
 
+	/** Begins rendering, allowing commands to be issued. */
+	void begin();
+
+	/** 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. */
+	void push_state();
+
+	/** Restores a previously saved state.  Must be matched with an earlier
+	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 &);
 
-	/** Applies a transform to the Renderer's model matrix. */
-	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; }
 
-	void set_texture(Tag, const Texture *, const Sampler * = 0);
-private:
-	void flush_textures();
-
-public:
 	/** Sets the shader program to use.  As a convenience, uniform values may be
 	specified at the same time. */
 	void set_shader_program(const Program *prog, const ProgramData *data = 0);
@@ -145,8 +155,11 @@ public:
 	last will be used. */
 	void add_shader_data(const ProgramData &data);
 
+	void set_texture(Tag, const Texture *, const Sampler * = 0);
+
 private:
 	void flush_shader_data();
+	void flush_textures();
 
 public:
 	void set_vertex_setup(const VertexSetup *);
@@ -158,19 +171,7 @@ public:
 	void set_blend(const Blend *);
 
 	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();
-
-	/** Restores a previously saved state.  Must be matched with an earlier
-	push_state call. */
-	void pop_state();
-
-	/** 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. */
-	void end();
+	unsigned get_object_lod_bias() const { return get_state().object_lod_bias; }
 
 	void clear(const ClearValue *);