Use the Blend and DepthTest classes

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

diff --git a/source/shadowmap.cpp b/source/shadowmap.cpp
index 7a761e7ad2bf15c6e35a5576f645f2980ab441c7..bedfcfd51c0f1e2aa4d1f5bd374e1c5b8a342620 100644 (file)
--- a/source/shadowmap.cpp
+++ b/source/shadowmap.cpp
@@ -28,17 +28,12 @@ ShadowMap::ShadowMap(unsigned s, const Scene &c, const Light &l):
        radius(1)
 {
        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, 0);
        depth_buf.image(0, DEPTH_COMPONENT, UNSIGNED_BYTE, 0);
-       depth_buf.parameter(GL_DEPTH_TEXTURE_MODE, GL_LUMINANCE);
-       depth_buf.parameter(GL_TEXTURE_COMPARE_MODE, GL_COMPARE_R_TO_TEXTURE);
-       depth_buf.parameter(GL_TEXTURE_COMPARE_FUNC, GL_LEQUAL);
-       depth_buf.parameter(GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-       depth_buf.parameter(GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
        fbo.attach(DEPTH_ATTACHMENT, depth_buf, 0);
-       draw_buffer(NO_BUFFER);
-       Framebuffer::unbind();
-       Texture::unbind();
 }
 
 void ShadowMap::set_target(const Vector3 &t, float r)
@@ -111,19 +106,14 @@ void ShadowMap::prepare()
                push_matrix();
                load_matrix(matrix);
 
-               const Framebuffer *old_fbo = Framebuffer::current();
-               fbo.bind();
-               clear(DEPTH_BUFFER_BIT);
+               Bind bind_fbo(fbo, true);
+               fbo.clear(DEPTH_BUFFER_BIT);
                scene.render("shadow");
 
                matrix_mode(PROJECTION);
                pop_matrix();
                matrix_mode(MODELVIEW);
                pop_matrix();
-               if(old_fbo)
-                       old_fbo->bind();
-               else
-                       Framebuffer::unbind();
        }
 
        depth_buf.bind_to(unit);
@@ -146,8 +136,7 @@ void ShadowMap::prepare()
 
 void ShadowMap::cleanup()
 {
-       TexUnit::activate(unit);
-       Texture::unbind();
+       Texture::unbind_from(unit);
        disable(GL_TEXTURE_GEN_S);
        disable(GL_TEXTURE_GEN_T);
        disable(GL_TEXTURE_GEN_R);