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

diff --git a/source/renderer.h b/source/renderer.h
index b114f687..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,17 +82,6 @@ private:
 		State();
 	};
 
-	class MtxStack: public MatrixStack
-	{
-	private:
-		Renderer &renderer;
-
-	public:
-		MtxStack(Renderer &);
-	private:
-		virtual void update();
-	};
-
 	enum ChangeMask
 	{
 		LEGACY_MATRIX = 1,
@@ -104,7 +94,6 @@ private:
 		STANDARD_SHDATA = 64
 	};
 
-	MtxStack mtx_stack;
 	unsigned char changed;
 	bool matrices_loaded;
 	unsigned shdata_applied;
@@ -124,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 &);
 
@@ -134,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; }