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

diff --git a/source/shadowmap.cpp b/source/shadowmap.cpp
index a9edacfc..ad40442f 100644
--- a/source/shadowmap.cpp
+++ b/source/shadowmap.cpp
@@ -6,6 +6,7 @@
 #include "renderer.h"
 #include "scene.h"
 #include "shadowmap.h"
+#include "tests.h"
 #include "texgen.h"
 #include "texunit.h"
 
@@ -18,8 +19,9 @@ ShadowMap::ShadowMap(unsigned s, const Renderable &r, const Light &l):
 	Effect(r),
 	size(s),
 	light(l),
-	unit(3),
-	radius(1)
+	radius(1),
+	depth_bias(4),
+	rendered(false)
 {
 	depth_buf.set_min_filter(LINEAR);
 	depth_buf.set_compare_enabled(true);
@@ -27,6 +29,9 @@ 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_darkness(0.7);
+	set_texture_unit(3);
 }
 
 void ShadowMap::set_target(const Vector3 &t, float r)
@@ -35,15 +40,38 @@ void ShadowMap::set_target(const Vector3 &t, float r)
 	radius = r;
 }
 
+void ShadowMap::set_darkness(float d)
+{
+	if(d<0.0f || d>1.0f)
+		throw invalid_argument("ShadowMap::set_darkness");
+
+	shdata.uniform("shadow_darkness", d);
+}
+
+void ShadowMap::set_depth_bias(float b)
+{
+	if(b<0.0f)
+		throw invalid_argument("ShadowMap::set_depth_bias");
+
+	depth_bias = b;
+}
+
 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
+void ShadowMap::setup_frame() const
 {
-	if(!enabled_passes.count(tag))
-		return renderable.render(renderer, tag);
+	if(rendered)
+		return;
+
+	renderable.setup_frame();
+	rendered = true;
 
 	Vector4 lpos = light.get_position();
 	if(lpos.w)
@@ -93,19 +121,32 @@ void ShadowMap::render(Renderer &renderer, const Tag &tag) const
 	matrix[11] = 0;
 	matrix[15] = 1;
 
-	renderer.escape();
+	light_matrix = matrix;
 
-	{
-		MatrixStack::Push push_mv(MatrixStack::modelview());
-		MatrixStack::Push push_proj(MatrixStack::projection());
+	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;
+	MatrixStack::projection() = Matrix::ortho(-radius, radius, -radius, radius, -radius, radius);
+	MatrixStack::modelview() = light_matrix;
 
-		Bind bind_fbo(fbo, true);
-		fbo.clear(DEPTH_BUFFER_BIT);
-		renderable.render("shadow");
-	}
+	Bind bind_fbo(fbo, true);
+	Bind bind_depth(DepthTest::lequal());
+	fbo.clear(DEPTH_BUFFER_BIT);
+	renderable.render("shadow");
+}
+
+void ShadowMap::finish_frame() const
+{
+	renderable.finish_frame();
+	rendered = false;
+}
+
+void ShadowMap::render(Renderer &renderer, const Tag &tag) const
+{
+	if(!enabled_passes.count(tag))
+		return renderer.render(renderable, tag);
+
+	const double *matrix = light_matrix.data();
 
 	// Has side effect of changing the current unit
 	depth_buf.bind_to(unit);
@@ -113,13 +154,15 @@ void ShadowMap::render(Renderer &renderer, const Tag &tag) const
 	TexGen tg_s, tg_t, tg_r;
 	tg_s.set_plane(Vector4(matrix[0]/diam, matrix[4]/diam, matrix[8]/diam, matrix[12]/diam+0.5f));
 	tg_t.set_plane(Vector4(matrix[1]/diam, matrix[5]/diam, matrix[9]/diam, matrix[13]/diam+0.5f));
-	tg_r.set_plane(Vector4(-matrix[2]/diam, -matrix[6]/diam, -matrix[10]/diam, 0.5f-matrix[14]/diam-4.0f/size));
+	tg_r.set_plane(Vector4(-matrix[2]/diam, -matrix[6]/diam, -matrix[10]/diam, 0.5f-matrix[14]/diam-depth_bias/size));
 	tg_s.bind_to(SCOORD);
 	tg_t.bind_to(TCOORD);
 	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);