X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=inline;f=source%2Fshadowmap.cpp;h=ea4982fe9f60bb67e31c66b2761f6e70331056c9;hb=2e6a73a93eac0a18063ec675a24a8e6eeeb80a0c;hp=a9edacfc3f9282ca6c1128d351c21712922494c7;hpb=29f2d9da4ef0a0134c56bd2f8c7e6acac7773a61;p=libs%2Fgl.git

diff --git a/source/shadowmap.cpp b/source/shadowmap.cpp
index a9edacfc..ea4982fe 100644
--- a/source/shadowmap.cpp
+++ b/source/shadowmap.cpp
@@ -18,7 +18,6 @@ ShadowMap::ShadowMap(unsigned s, const Renderable &r, const Light &l):
 	Effect(r),
 	size(s),
 	light(l),
-	unit(3),
 	radius(1)
 {
 	depth_buf.set_min_filter(LINEAR);
@@ -27,6 +26,8 @@ ShadowMap::ShadowMap(unsigned s, const Renderable &r, const Light &l):
 	depth_buf.set_wrap(CLAMP_TO_EDGE);
 	depth_buf.storage(DEPTH_COMPONENT, size, size);
 	fbo.attach(DEPTH_ATTACHMENT, depth_buf, 0);
+
+	set_texture_unit(3);
 }
 
 void ShadowMap::set_target(const Vector3 &t, float r)
@@ -38,12 +39,16 @@ void ShadowMap::set_target(const Vector3 &t, float r)
 void ShadowMap::set_texture_unit(unsigned u)
 {
 	unit = u;
+
+	int i = unit;
+	shdata.uniform("shadow", i);
+	shdata.uniform("shadow_unit", i);
 }
 
 void ShadowMap::render(Renderer &renderer, const Tag &tag) const
 {
 	if(!enabled_passes.count(tag))
-		return renderable.render(renderer, tag);
+		return renderer.render(renderable, tag);
 
 	Vector4 lpos = light.get_position();
 	if(lpos.w)
@@ -119,7 +124,9 @@ void ShadowMap::render(Renderer &renderer, const Tag &tag) const
 	tg_r.bind_to(RCOORD);
 	TexUnit::activate(0);
 
-	renderable.render(renderer, tag);
+	Renderer::Push _push_rend(renderer);
+	renderer.add_shader_data(shdata);
+	renderer.render(renderable, tag);
 
 	Texture::unbind_from(unit);
 	TexGen::unbind_from(SCOORD);