X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fshadowmap.cpp;h=dd689935055093c5b5652b9e0c7a216099265bfd;hb=f1b12c992db974c679d85ae6ec22cd318199d0d5;hp=8151a7cffe48c41429005470ac3595916fb309e1;hpb=db2fd517dcd215e9d16345287d413f2a64f5ba03;p=libs%2Fgl.git

diff --git a/source/shadowmap.cpp b/source/shadowmap.cpp
index 8151a7cf..dd689935 100644
--- a/source/shadowmap.cpp
+++ b/source/shadowmap.cpp
@@ -8,7 +8,6 @@
 #include "scene.h"
 #include "shadowmap.h"
 #include "tests.h"
-#include "texgen.h"
 #include "texunit.h"
 
 using namespace std;
@@ -104,7 +103,7 @@ void ShadowMap::setup_frame() const
 	shadow_matrix.translate(-0.5, -0.5, depth_bias/size-0.5);
 	shadow_matrix.invert();
 
-	Bind bind_fbo(fbo, true);
+	BindRestore bind_fbo(fbo);
 	Bind bind_depth(DepthTest::lequal());
 	fbo.clear(DEPTH_BUFFER_BIT);
 	renderable.render("shadow");
@@ -126,16 +125,8 @@ void ShadowMap::render(Renderer &renderer, const Tag &tag) const
 	unsigned unit = renderer.allocate_effect_texunit();
 	int iunit = unit;
 	shdata.uniform("shadow", iunit);
-	shdata.uniform("shadow_unit", iunit);
 
-	depth_buf.bind_to(unit);
-	TexGen tg_s, tg_t, tg_r;
-	tg_s.set_plane(Vector4(shadow_matrix(0, 0), shadow_matrix(0, 1), shadow_matrix(0, 2), shadow_matrix(0, 3)));
-	tg_t.set_plane(Vector4(shadow_matrix(1, 0), shadow_matrix(1, 1), shadow_matrix(1, 2), shadow_matrix(1, 3)));
-	tg_r.set_plane(Vector4(shadow_matrix(2, 0), shadow_matrix(2, 1), shadow_matrix(2, 2), shadow_matrix(2, 3)));
-	tg_s.bind_to(unit, SCOORD);
-	tg_t.bind_to(unit, TCOORD);
-	tg_r.bind_to(unit, RCOORD);
+	Bind _bind_depth(depth_buf, unit);
 
 	if(const Camera *camera = renderer.get_camera())
 		/* Multiply by camera's object matrix to form a matrix that transforms
@@ -146,11 +137,6 @@ void ShadowMap::render(Renderer &renderer, const Tag &tag) const
 
 	renderer.add_shader_data(shdata);
 	renderer.render(renderable, tag);
-
-	Texture::unbind_from(unit);
-	TexGen::unbind_from(unit, SCOORD);
-	TexGen::unbind_from(unit, TCOORD);
-	TexGen::unbind_from(unit, RCOORD);
 }
 
 } // namespace GL