X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderer.h;h=157282a5398f6a18a23f0f80684a9765a16e7a3e;hb=f632bf388a58b036e265f3789c797beff5ab063a;hp=3d561b4fd8f0daea3cc69afa0fc0d1c7b8be86f1;hpb=cdfdcecd046c494470bfb4cc1de66f6cfca5efec;p=libs%2Fgl.git

diff --git a/source/renderer.h b/source/renderer.h
index 3d561b4f..157282a5 100644
--- a/source/renderer.h
+++ b/source/renderer.h
@@ -64,6 +64,7 @@ public:
 private:
 	struct State
 	{
+		Matrix modelview_matrix;
 		const Texture *texture;
 		const Texturing *texturing;
 		unsigned lowest_effect_texunit;
@@ -81,28 +82,18 @@ private:
 		State();
 	};
 
-	class MtxStack: public MatrixStack
-	{
-	private:
-		Renderer &renderer;
-
-	public:
-		MtxStack(Renderer &);
-	private:
-		virtual void update();
-	};
-
 	enum ChangeMask
 	{
 		LEGACY_MATRIX = 1,
 		MODERN_MATRIX = 2,
 		MATRIX = LEGACY_MATRIX|MODERN_MATRIX,
-		LIGHTING = 4,
-		CLIPPING = 8,
-		SHADER_DATA = 16
+		LEGACY_LIGHTING = 4,
+		LEGACY_CLIPPING = 8,
+		SHADER_DATA = 16,
+		MATERIAL_SHDATA = 32,
+		STANDARD_SHDATA = 64
 	};
 
-	MtxStack mtx_stack;
 	unsigned char changed;
 	bool matrices_loaded;
 	unsigned shdata_applied;
@@ -122,9 +113,6 @@ 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 &);
 
@@ -132,7 +120,7 @@ public:
 	void transform(const Matrix &);
 
 	/** Returns the current modelview matrix. */
-	const Matrix &get_matrix() const { return mtx_stack.top(); }
+	const Matrix &get_matrix() const { return state->modelview_matrix; }
 
 	const Camera *get_camera() const { return camera; }