X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Feffects%2Fshadowmap.cpp;h=bcdb0c9f39ef6ec24ac5ac3121f8a8b3bd0be64b;hb=6353307898cd397e2bcde13e2448a8a678a60004;hp=cd9ad8274c7f6f61a7ee1a68347c5b4c4201f757;hpb=40db45bc521aa8cc154d745ef4b51c1358124ad3;p=libs%2Fgl.git

diff --git a/source/effects/shadowmap.cpp b/source/effects/shadowmap.cpp
index cd9ad827..bcdb0c9f 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;
 
@@ -39,8 +38,11 @@ void ShadowMap::init(unsigned s)
 	rendered = false;
 
 	depth_buf.storage(DEPTH_COMPONENT32F, size, size, 1);
+	fbo.set_format((DEPTH_ATTACHMENT,DEPTH_COMPONENT32F));
 	fbo.attach(DEPTH_ATTACHMENT, depth_buf, 0);
-	fbo.require_complete();
+
+	depth_test.enabled = true;
+	depth_test.compare = LEQUAL;
 
 	set_darkness(1.0f);
 	shdata.uniform("shd_world_matrix", Matrix());
@@ -91,12 +93,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 +123,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