X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Frenderer.h;h=489cebb8f407b1f1cd8f4f76db9d5cbe39905580;hb=c5583e23cc7b064ac28f2b2b6993d1e5fa415d5b;hp=f8d297289085557c31cfc866ed1e1b2b2d5d952d;hpb=233dff2a6c552e08da832496aecd88ef4f8948f1;p=libs%2Fgl.git

diff --git a/source/render/renderer.h b/source/render/renderer.h
index f8d29728..489cebb8 100644
--- a/source/render/renderer.h
+++ b/source/render/renderer.h
@@ -64,19 +64,32 @@ public:
 	};
 
 private:
-	struct State
+	struct BoundTexture
 	{
-		const Camera *camera;
-		Matrix modelview_matrix;
+		Tag tag;
+		mutable int unit;
 		const Texture *texture;
 		const Sampler *sampler;
-		const Texturing *texturing;
+		int replaced;
+
+		BoundTexture();
+	};
+
+	struct BoundProgramData
+	{
+		const ProgramData *shdata;
+		mutable unsigned generation;
+
+		BoundProgramData(const ProgramData *);
+	};
+
+	struct State
+	{
+		const Camera *camera;
+		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;
@@ -91,16 +104,18 @@ private:
 	{
 		MATRIX = 2,
 		SHADER_DATA = 16,
-		MATERIAL_SHDATA = 32,
-		STANDARD_SHDATA = 64
+		STANDARD_SHDATA = 64,
+		CAMERA_SHDATA = 128,
+		CLIPPING_SHDATA = 512
 	};
 
 	const Camera *default_camera;
 	unsigned char changed;
 	std::vector<State> state_stack;
 	State *state;
+	std::vector<BoundTexture> texture_stack;
 	ProgramData standard_shdata;
-	std::vector<const ProgramData *> shdata_stack;
+	std::vector<BoundProgramData> shdata_stack;
 	std::set<const Renderable *> excluded;
 
 public:
@@ -111,27 +126,34 @@ private:
 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; }
-
-	void set_texture(const Texture *, const Sampler * = 0);
-	void set_texturing(const Texturing *);
-	unsigned allocate_effect_texunit();
-	void set_material(const Material *);
+	/** Returns the current model matrix. */
+	const Matrix &get_matrix() const { return state->model_matrix; }
 
-	void set_lighting(const Lighting *);
+	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
+	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
@@ -143,8 +165,11 @@ 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);