X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Feffects%2Fshadowmap.cpp;h=bbf602bc60f2ed483215074c0727eba0e8ea2634;hp=27b695443341c860337242d5c2908d0479b502d7;hb=HEAD;hpb=083a8227715fa32c841fc2b8126e4ab8d2840ba0

diff --git a/source/effects/shadowmap.cpp b/source/effects/shadowmap.cpp
index 27b69544..bbf602bc 100644
--- a/source/effects/shadowmap.cpp
+++ b/source/effects/shadowmap.cpp
@@ -12,8 +12,8 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-ShadowMap::ShadowMap(unsigned w, unsigned h, Renderable &r, const Lighting *l):
-	Effect(r),
+ShadowMap::ShadowMap(unsigned w, unsigned h, Renderable &c, const Lighting *l):
+	Effect(c),
 	width(w),
 	height(h),
 	lighting(l),
@@ -24,7 +24,7 @@ ShadowMap::ShadowMap(unsigned w, unsigned h, Renderable &r, const Lighting *l):
 	fbo.attach(DEPTH_ATTACHMENT, depth_buf, 0);
 
 	set_darkness(1.0f);
-	for(unsigned i=0; i<4; ++i)
+	for(unsigned i=0; i<6; ++i)
 	{
 		string base = format("shadows[%d]", i);
 		shdata.uniform(base+".type", 0);
@@ -38,10 +38,10 @@ ShadowMap::ShadowMap(unsigned w, unsigned h, Renderable &r, const Lighting *l):
 	shdata.uniform_array("shd_world_matrix", 1, &dummy_matrix);
 }
 
-ShadowMap::ShadowMap(unsigned s, Renderable &r, const DirectionalLight &l, Renderable &c):
-	ShadowMap(s, s, r, 0)
+ShadowMap::ShadowMap(unsigned s, Renderable &c, const DirectionalLight &l, Renderable &sc):
+	ShadowMap(s, s, c, 0)
 {
-	add_light(l, s, c);
+	add_light(l, s, sc);
 }
 
 ShadowMap::ShadowMap(unsigned w, unsigned h, Renderable &r, const Lighting &l):
@@ -183,7 +183,7 @@ void ShadowMap::setup_frame(Renderer &renderer)
 		return;
 
 	rendered = true;
-	renderable.setup_frame(renderer);
+	content.setup_frame(renderer);
 	for(const ShadowedLight &l: lights)
 		l.shadow_caster->setup_frame(renderer);
 
@@ -196,7 +196,7 @@ void ShadowMap::setup_frame(Renderer &renderer)
 		{
 			float distance = (sqrt(2.0f/3.0f)-sqrt(3.0f/8.0f))*2.0f;
 			float bias = depth_bias*2.0f/(distance*l.region.width);
-			shdata.uniform(base+".bias", -1001.0f/999.0f, 1.0f-bias);
+			shdata.uniform(base+".bias", views[l.view_index].camera.get_projection_matrix()(2, 2), 1.0f-bias);
 		}
 	}
 
@@ -219,7 +219,7 @@ void ShadowMap::setup_frame(Renderer &renderer)
 			v.camera.set_depth_clip(radius/1000.0f, radius);
 		}
 
-		Matrix to_texcoord = Matrix().translate(Vector3(0.5f, 0.5f, 0.5f)).scale(0.5f);
+		Matrix to_texcoord = Matrix().translate(Vector3(0.5f, 0.5f, 0.0f)).scale(Vector3(0.5f, 0.5f, 1.0f));
 		shadow_matrices.push_back(to_texcoord*v.camera.get_projection_matrix()*v.camera.get_view_matrix());
 	}
 
@@ -235,7 +235,7 @@ void ShadowMap::setup_frame(Renderer &renderer)
 		renderer.set_scissor(&light.region);
 		renderer.set_camera(v.camera);
 
-		renderer.render(*light.shadow_caster, (v.face>0 ? "noclear" : ""));
+		light.shadow_caster->render(renderer, (v.face>0 ? "noclear" : ""));
 	}
 }
 
@@ -244,20 +244,20 @@ void ShadowMap::finish_frame()
 	if(rendered)
 	{
 		rendered = false;
-		renderable.finish_frame();
+		content.finish_frame();
 	}
 }
 
 void ShadowMap::render(Renderer &renderer, Tag tag) const
 {
-	if(!enabled_methods.count(tag))
-		return renderer.render(renderable, tag);
+	if(!is_enabled_for_method(tag))
+		return content.render(renderer, tag);
 
 	Renderer::Push _push_rend(renderer);
 
 	renderer.set_texture("shadow_map", &depth_buf, &sampler);
 	renderer.add_shader_data(shdata);
-	renderer.render(renderable, tag);
+	content.render(renderer, tag);
 }
 
 void ShadowMap::set_debug_name(const string &name)
@@ -298,6 +298,8 @@ ShadowMap *ShadowMap::Template::create(const map<string, Renderable *> &renderab
 			throw invalid_operation("ShadowMap::Template::create");
 	}
 
+	create_base(*shadow_map);
+
 	return shadow_map.release();
 }