Don't use an internal depth test in ShadowMap

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

diff --git a/source/effects/shadowmap.cpp b/source/effects/shadowmap.cpp
index 35e851cd784ddae6a623f760e753979d106016a1..39cf3c450a484f7a909f01bfbbd8c7ef74bb475c 100644 (file)
--- a/source/effects/shadowmap.cpp
+++ b/source/effects/shadowmap.cpp
@@ -1,10 +1,6 @@
-#include <cmath>
-#include <cstdlib>
-#include "camera.h"
 #include "light.h"
 #include "renderer.h"
 #include "resources.h"
-#include "scene.h"
 #include "shadowmap.h"
 
 using namespace std;
@@ -14,35 +10,18 @@ namespace GL {
 
 ShadowMap::ShadowMap(unsigned s, Renderable &r, const Light &l, Renderable &c):
        Effect(r),
+       size(s),
        light(l),
        shadow_caster(c),
-       sampler(Resources::get_global().get<Sampler>("_linear_clamp_shadow.samp"))
+       sampler(Resources::get_global().get<Sampler>("_linear_clamp_shadow.samp")),
+       radius(1),
+       depth_bias(4),
+       rendered(false)
 {
-       init(s);
-}
-
-ShadowMap::ShadowMap(unsigned s, Renderable &r, const Light &l):
-       Effect(r),
-       light(l),
-       shadow_caster(r),
-       sampler(Resources::get_global().get<Sampler>("_linear_clamp_shadow.samp"))
-{
-       init(s);
-}
-
-void ShadowMap::init(unsigned s)
-{
-       size = s;
-       radius = 1;
-       depth_bias = 4;
-       rendered = false;
-
        depth_buf.storage(DEPTH_COMPONENT32F, size, size, 1);
+       fbo.set_format((DEPTH_ATTACHMENT,DEPTH_COMPONENT32F));
        fbo.attach(DEPTH_ATTACHMENT, depth_buf, 0);
 
-       depth_test.enabled = true;
-       depth_test.compare = LEQUAL;
-
        set_darkness(1.0f);
        shdata.uniform("shd_world_matrix", Matrix());
 }
@@ -94,9 +73,7 @@ void ShadowMap::setup_frame(Renderer &renderer)
 
        Renderer::Push push(renderer);
        renderer.set_framebuffer(&fbo);
-       renderer.clear(DEPTH_BUFFER_BIT);
        renderer.set_camera(shadow_camera);
-       renderer.set_depth_test(&depth_test);
 
        renderer.render(shadow_caster);
 }
@@ -122,7 +99,7 @@ void ShadowMap::render(Renderer &renderer, Tag tag) const
        renderer.render(renderable, tag);
 }
 
-void ShadowMap::set_debug_name(const std::string &name)
+void ShadowMap::set_debug_name(const string &name)
 {
 #ifdef DEBUG
        fbo.set_debug_name(name+" [FBO]");