X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frender%2Frenderer.h;h=23ced9e4fc567bc124a80fefd70b330937f149cc;hp=1a84d8bf8507c50d596bc3d1490a289f8c2f5855;hb=2b2676392aff2eb6b38c3e463cc67f4d67a4ef8b;hpb=acb4aba95c22fa7c72eeef10befd611570d35182

diff --git a/source/render/renderer.h b/source/render/renderer.h
index 1a84d8bf..23ced9e4 100644
--- a/source/render/renderer.h
+++ b/source/render/renderer.h
@@ -4,6 +4,7 @@
 #include <set>
 #include <vector>
 #include "matrix.h"
+#include "pipelinestate.h"
 #include "programdata.h"
 #include "tag.h"
 
@@ -21,7 +22,6 @@ class Program;
 class Renderable;
 class Sampler;
 class Texture;
-class Texturing;
 class VertexSetup;
 class WindingTest;
 
@@ -86,19 +86,18 @@ private:
 	struct State
 	{
 		const Camera *camera;
-		Matrix modelview_matrix;
+		Matrix model_matrix;
 		unsigned texture_count;
 		unsigned lowest_effect_texunit;
-		const Material *material;
-		const Lighting *lighting;
-		Matrix lighting_matrix;
 		const Clipping *clipping;
-		Matrix clipping_matrix;
 		const Program *shprog;
 		unsigned shdata_count;
 		const VertexSetup *vertex_setup;
-		const WindingTest *winding_test;
-		bool reverse_winding;
+		FaceWinding front_face;
+		CullMode face_cull;
+		const DepthTest *depth_test;
+		const StencilTest *stencil_test;
+		const Blend *blend;
 		unsigned object_lod_bias;
 
 		State();
@@ -107,12 +106,9 @@ private:
 	enum ChangeMask
 	{
 		MATRIX = 2,
-		SHADER_DATA = 16,
-		MATERIAL_SHDATA = 32,
-		STANDARD_SHDATA = 64
+		SHADER_DATA = 16
 	};
 
-	const Camera *default_camera;
 	unsigned char changed;
 	std::vector<State> state_stack;
 	State *state;
@@ -120,44 +116,33 @@ private:
 	ProgramData standard_shdata;
 	std::vector<BoundProgramData> shdata_stack;
 	std::set<const Renderable *> excluded;
+	PipelineState pipeline_state;
 
 public:
 	Renderer();
-	DEPRECATED Renderer(const Camera *);
-private:
-	void init();
-public:
 	~Renderer();
 
-	/** Sets the camera to render from.  The modelview matrix is reset to the
-	camera's view matrix. */
+	/** 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; }
 
-	/** Replaces the Renderer's modelview matrix. */
+	/** Replaces the Renderer's model matrix. */
 	void set_matrix(const Matrix &);
 
-	/** Applies a transform to the Renderer's modelview matrix. */
+	/** Applies a transform to the Renderer's model matrix. */
 	void transform(const Matrix &);
 
-	/** Returns the current modelview matrix. */
-	const Matrix &get_matrix() const { return state->modelview_matrix; }
+	/** Returns the current model matrix. */
+	const Matrix &get_matrix() const { return state->model_matrix; }
 
 	void set_texture(Tag, const Texture *, const Sampler * = 0);
 private:
-	void set_texture(Tag, int, const Texture *, const Sampler *);
 	void flush_textures();
 public:
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-	DEPRECATED void set_texture(const Texture *, const Sampler * = 0);
-	DEPRECATED void set_texturing(const Texturing *);
-	DEPRECATED unsigned allocate_effect_texunit();
-#pragma GCC diagnostic pop
-	void set_material(const Material *);
-
-	void set_lighting(const Lighting *);
+	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
@@ -169,11 +154,18 @@ public:
 	Renderer state is popped. */
 	void add_shader_data(const ProgramData &data);
 
-	void flush_shader_data();
+	DEPRECATED void flush_shader_data() { flush_shader_data_(); }
+private:
+	void flush_shader_data_();
 
+public:
 	void set_vertex_setup(const VertexSetup *);
-	void set_winding_test(const WindingTest *);
-	void set_reverse_winding(bool);
+	void set_front_face(FaceWinding);
+	void set_face_cull(CullMode);
+
+	void set_depth_test(const DepthTest *);
+	void set_stencil_test(const StencilTest *);
+	void set_blend(const Blend *);
 
 	void set_object_lod_bias(unsigned);
 	unsigned get_object_lod_bias() const { return state->object_lod_bias; }