X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fshadowmap.cpp;h=96539f1d4d70c2241e0699e60dc5da757595a961;hb=656b4577fccfb02bea747871e5ab10148f002443;hp=bedfcfd51c0f1e2aa4d1f5bd374e1c5b8a342620;hpb=3663bed18358a2399b2a8a8f7779d85e0ed81bd0;p=libs%2Fgl.git

diff --git a/source/shadowmap.cpp b/source/shadowmap.cpp
index bedfcfd5..96539f1d 100644
--- a/source/shadowmap.cpp
+++ b/source/shadowmap.cpp
@@ -10,7 +10,6 @@ Distributed under the LGPL
 #include "light.h"
 #include "matrix.h"
 #include "misc.h"
-#include "projection.h"
 #include "scene.h"
 #include "shadowmap.h"
 #include "texunit.h"
@@ -31,8 +30,7 @@ ShadowMap::ShadowMap(unsigned s, const Scene &c, const Light &l):
 	depth_buf.set_compare_enabled(true);
 	depth_buf.set_compare_func(LEQUAL);
 	depth_buf.set_wrap(CLAMP_TO_EDGE);
-	depth_buf.storage(DEPTH_COMPONENT, size, size, 0);
-	depth_buf.image(0, DEPTH_COMPONENT, UNSIGNED_BYTE, 0);
+	depth_buf.storage(DEPTH_COMPONENT, size, size);
 	fbo.attach(DEPTH_ATTACHMENT, depth_buf, 0);
 }
 
@@ -98,22 +96,15 @@ void ShadowMap::prepare()
 	matrix[15] = 1;
 
 	{
-		matrix_mode(PROJECTION);
-		push_matrix();
-		load_identity();
-		ortho(-radius, radius, -radius, radius, -radius, radius);
-		matrix_mode(MODELVIEW);
-		push_matrix();
-		load_matrix(matrix);
+		MatrixStack::Push push_mv(MatrixStack::modelview());
+		MatrixStack::Push push_proj(MatrixStack::projection());
+
+		MatrixStack::projection() = Matrix::ortho(-radius, radius, -radius, radius, -radius, radius);
+		MatrixStack::modelview() = matrix;
 
 		Bind bind_fbo(fbo, true);
 		fbo.clear(DEPTH_BUFFER_BIT);
 		scene.render("shadow");
-
-		matrix_mode(PROJECTION);
-		pop_matrix();
-		matrix_mode(MODELVIEW);
-		pop_matrix();
 	}
 
 	depth_buf.bind_to(unit);