Improvements for shadow mapping

[libs/gl.git] / source / shadowmap.cpp

diff --git a/source/shadowmap.cpp b/source/shadowmap.cpp
index ea4982fe9f60bb67e31c66b2761f6e70331056c9..b930315f626140d43c461910a8c8bfc01fdfd580 100644 (file)
--- a/source/shadowmap.cpp
+++ b/source/shadowmap.cpp
@@ -18,7 +18,8 @@ ShadowMap::ShadowMap(unsigned s, const Renderable &r, const Light &l):
        Effect(r),
        size(s),
        light(l),
-       radius(1)
+       radius(1),
+       depth_bias(4)
 {
        depth_buf.set_min_filter(LINEAR);
        depth_buf.set_compare_enabled(true);
@@ -27,6 +28,7 @@ ShadowMap::ShadowMap(unsigned s, const Renderable &r, const Light &l):
        depth_buf.storage(DEPTH_COMPONENT, size, size);
        fbo.attach(DEPTH_ATTACHMENT, depth_buf, 0);
 
+       set_darkness(0.7);
        set_texture_unit(3);
 }
 
@@ -36,6 +38,22 @@ 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;
@@ -118,7 +136,7 @@ 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);