X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderer.h;h=b114f6873648574032e8566bc3897d9e581fa348;hb=346ed5bd91f10489acd280e2165a951d6938f0df;hp=1f198dae7007b00db30d4c699f0832ce06d0cca1;hpb=5df9e64424dd157da1410b4498f53a4ac21e6aee;p=libs%2Fgl.git

diff --git a/source/renderer.h b/source/renderer.h
index 1f198dae..b114f687 100644
--- a/source/renderer.h
+++ b/source/renderer.h
@@ -13,6 +13,7 @@ namespace GL {
 class Batch;
 class Buffer;
 class Camera;
+class Clipping;
 class Material;
 class Mesh;
 class Lighting;
@@ -69,6 +70,8 @@ private:
 		const Material *material;
 		const Lighting *lighting;
 		Matrix lighting_matrix;
+		const Clipping *clipping;
+		Matrix clipping_matrix;
 		const Program *shprog;
 		unsigned shdata_count;
 		const Mesh *mesh;
@@ -94,8 +97,11 @@ private:
 		LEGACY_MATRIX = 1,
 		MODERN_MATRIX = 2,
 		MATRIX = LEGACY_MATRIX|MODERN_MATRIX,
-		LIGHTING = 4,
-		SHADER_DATA = 8
+		LEGACY_LIGHTING = 4,
+		LEGACY_CLIPPING = 8,
+		SHADER_DATA = 16,
+		MATERIAL_SHDATA = 32,
+		STANDARD_SHDATA = 64
 	};
 
 	MtxStack mtx_stack;
@@ -107,7 +113,6 @@ private:
 	State *state;
 	ProgramData standard_shdata;
 	std::vector<const ProgramData *> shdata_stack;
-	const Buffer *element_buffer;
 	std::set<const Renderable *> excluded;
 
 public:
@@ -119,8 +124,18 @@ public:
 	times without an intervening end(). */
 	void begin(const Camera *);
 
+	/** Deprecated as unsafe.  Use set_matrix() or transform() instead. */
 	MatrixStack &matrix_stack() { return mtx_stack; }
 
+	/** Replaces the Renderer's modelview matrix. */
+	void set_matrix(const Matrix &);
+
+	/** Applies a transform to the Renderer's modelview matrix. */
+	void transform(const Matrix &);
+
+	/** Returns the current modelview matrix. */
+	const Matrix &get_matrix() const { return mtx_stack.top(); }
+
 	const Camera *get_camera() const { return camera; }
 
 	void set_texture(const Texture *);
@@ -129,6 +144,7 @@ public:
 	void set_material(const Material *);
 
 	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
 	well, with the same semantics as add_shader_data. */
@@ -140,7 +156,6 @@ public:
 	void add_shader_data(const ProgramData &data);
 
 	void set_mesh(const Mesh *);
-	void set_element_buffer(const Buffer *);
 	void set_winding_test(const WindingTest *);
 	void set_reverse_winding(bool);