X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Feffects%2Fshadowmap.cpp;h=35e851cd784ddae6a623f760e753979d106016a1;hb=cd5f37b066352119cf92d53d0001af7ff99be437;hp=f11ea7a710558085c4ce059289fac848baff3cc9;hpb=fe2fc291a4fc618425c64112c9ffd3519f0b8a3e;p=libs%2Fgl.git

diff --git a/source/effects/shadowmap.cpp b/source/effects/shadowmap.cpp
index f11ea7a7..35e851cd 100644
--- a/source/effects/shadowmap.cpp
+++ b/source/effects/shadowmap.cpp
@@ -6,7 +6,6 @@
 #include "resources.h"
 #include "scene.h"
 #include "shadowmap.h"
-#include "tests.h"
 
 using namespace std;
 
@@ -40,9 +39,11 @@ void ShadowMap::init(unsigned s)
 
 	depth_buf.storage(DEPTH_COMPONENT32F, size, size, 1);
 	fbo.attach(DEPTH_ATTACHMENT, depth_buf, 0);
-	fbo.require_complete();
 
-	set_darkness(0.7);
+	depth_test.enabled = true;
+	depth_test.compare = LEQUAL;
+
+	set_darkness(1.0f);
 	shdata.uniform("shd_world_matrix", Matrix());
 }
 
@@ -91,12 +92,11 @@ void ShadowMap::setup_frame(Renderer &renderer)
 
 	shdata.uniform("shd_world_matrix", shadow_matrix);
 
-	BindRestore bind_fbo(fbo);
-	Bind bind_depth(DepthTest::lequal());
-	fbo.clear(DEPTH_BUFFER_BIT);
-
 	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,5 +122,17 @@ void ShadowMap::render(Renderer &renderer, Tag tag) const
 	renderer.render(renderable, tag);
 }
 
+void ShadowMap::set_debug_name(const std::string &name)
+{
+#ifdef DEBUG
+	fbo.set_debug_name(name+" [FBO]");
+	shadow_camera.set_debug_name(name+".camera");
+	depth_buf.set_debug_name(name+"/depth.tex2d");
+	shdata.set_debug_name(name+" [UBO]");
+#else
+	(void)name;
+#endif
+}
+
 } // namespace GL
 } // namespace Msp