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

diff --git a/source/effects/shadowmap.cpp b/source/effects/shadowmap.cpp
index f11ea7a7..29358385 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;
 
@@ -15,34 +14,22 @@ 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);
-	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 +78,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 +108,17 @@ void ShadowMap::render(Renderer &renderer, Tag tag) const
 	renderer.render(renderable, tag);
 }
 
+void ShadowMap::set_debug_name(const 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