X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fshadowmap.cpp;h=eaf6e1373cb126a387d535e9e2b1352199eed2e7;hp=7575051e6e7d956e89299a8eed47db54ca8f9546;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hpb=1d24ddbc35f9e0480d30c66d47b7ea3834c15fbf

diff --git a/source/shadowmap.cpp b/source/shadowmap.cpp
index 7575051e..eaf6e137 100644
--- a/source/shadowmap.cpp
+++ b/source/shadowmap.cpp
@@ -2,21 +2,19 @@
 #include <cstdlib>
 #include "camera.h"
 #include "light.h"
-#include "matrix.h"
-#include "misc.h"
 #include "renderer.h"
 #include "scene.h"
 #include "shadowmap.h"
 #include "tests.h"
-#include "texgen.h"
-#include "texunit.h"
 
 using namespace std;
 
 namespace Msp {
 namespace GL {
 
-ShadowMap::ShadowMap(unsigned s, const Renderable &r, const Light &l):
+WeakPtr<Sampler> ShadowMap::shadow_sampler;
+
+ShadowMap::ShadowMap(unsigned s, Renderable &r, const Light &l):
 	Effect(r),
 	size(s),
 	light(l),
@@ -24,11 +22,16 @@ ShadowMap::ShadowMap(unsigned s, const Renderable &r, const Light &l):
 	depth_bias(4),
 	rendered(false)
 {
-	depth_buf.set_min_filter(LINEAR);
-	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);
+	sampler = shadow_sampler;
+	if(!sampler)
+	{
+		sampler = new Sampler;
+		sampler->set_filter(LINEAR);
+		sampler->set_compare(LEQUAL);
+		sampler->set_wrap(CLAMP_TO_EDGE);
+		shadow_sampler = sampler;
+	}
+	depth_buf.storage(DEPTH_COMPONENT32F, size, size, 1);
 	fbo.attach(DEPTH_ATTACHMENT, depth_buf, 0);
 	fbo.require_complete();
 
@@ -57,49 +60,23 @@ void ShadowMap::set_depth_bias(float b)
 	depth_bias = b;
 }
 
-void ShadowMap::setup_frame() const
+void ShadowMap::setup_frame(Renderer &renderer)
 {
 	if(rendered)
 		return;
 
-	renderable.setup_frame();
 	rendered = true;
+	renderable.setup_frame(renderer);
 
-	const Vector4 &lpos = light.get_position();
-	Vector3 back;
-	if(lpos.w)
-	{
-		/* XXX Not really proper way to support positional lights, but good
-		enough when the light source is far away */
-		back = Vector3(lpos)-target;
-	}
-	else
-		back = Vector3(lpos);
-	back.normalize();
-
-	Vector3 up;
-	if(abs(back.z)<0.99)
-		up = Vector3(0, 0, 1);
-	else
-		up = Vector3(0, 1, 0);
+	Camera camera;
+	camera.set_object_matrix(*light.get_matrix());
+	camera.set_position(target);
+	// TODO support point and spot lights with a frustum projection.
+	// Omnidirectional lights also need a cube shadow map.
+	camera.set_orthographic(radius*2, radius*2);
+	camera.set_depth_clip(-radius, radius);
 
-	Vector3 right = normalize(cross(up, back));
-
-	Vector4 columns[4];
-	columns[0] = Vector4(right, 0.0f);
-	columns[1] = Vector4(normalize(cross(back, right)), 0.0f);
-	columns[2] = Vector4(back, 0.0f);
-	columns[3] = Vector4(target, 1.0f);
-	light_matrix = Matrix::from_columns(columns);
-	view_matrix = invert(light_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() = view_matrix;
-
-	shadow_matrix = light_matrix;
+	shadow_matrix = camera.get_object_matrix();
 	shadow_matrix.scale(radius*2, radius*2, -radius*2);
 	shadow_matrix.translate(-0.5, -0.5, depth_bias/size-0.5);
 	shadow_matrix.invert();
@@ -107,10 +84,14 @@ void ShadowMap::setup_frame() const
 	BindRestore bind_fbo(fbo);
 	Bind bind_depth(DepthTest::lequal());
 	fbo.clear(DEPTH_BUFFER_BIT);
-	renderable.render("shadow");
+
+	Renderer::Push push(renderer);
+	renderer.set_camera(camera);
+
+	renderer.render(renderable, "shadow");
 }
 
-void ShadowMap::finish_frame() const
+void ShadowMap::finish_frame()
 {
 	renderable.finish_frame();
 	rendered = false;
@@ -125,17 +106,10 @@ 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);
+	shdata.uniform("shadow_map", iunit);
 
+	Bind _bind_sampler(*sampler, unit);
 	Bind _bind_depth(depth_buf, 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);
 
 	if(const Camera *camera = renderer.get_camera())
 		/* Multiply by camera's object matrix to form a matrix that transforms
@@ -146,10 +120,6 @@ void ShadowMap::render(Renderer &renderer, const Tag &tag) const
 
 	renderer.add_shader_data(shdata);
 	renderer.render(renderable, tag);
-
-	TexGen::unbind_from(unit, SCOORD);
-	TexGen::unbind_from(unit, TCOORD);
-	TexGen::unbind_from(unit, RCOORD);
 }
 
 } // namespace GL