X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Feffects%2Fshadowmap.cpp;h=639a352562bc062768e4303b89505afccd65f757;hb=0d765be40336decc966932e0143fe9496f3eab4b;hp=0af9327132cf88c8222b31e11d2846329219f605;hpb=7db40551e9197142b0b6cb7fd883b325684bb8c2;p=libs%2Fgl.git

diff --git a/source/effects/shadowmap.cpp b/source/effects/shadowmap.cpp
index 0af93271..639a3525 100644
--- a/source/effects/shadowmap.cpp
+++ b/source/effects/shadowmap.cpp
@@ -13,15 +13,31 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
+ShadowMap::ShadowMap(Resources &resources, unsigned s, Renderable &r, const Light &l, Renderable &c):
+	Effect(r),
+	light(l),
+	shadow_caster(c),
+	sampler(resources.get<Sampler>("_linear_clamp_shadow.samp"))
+{
+	init(s);
+}
+
 ShadowMap::ShadowMap(Resources &resources, unsigned s, Renderable &r, const Light &l):
 	Effect(r),
-	size(s),
 	light(l),
-	sampler(resources.get<Sampler>("_linear_clamp_shadow.samp")),
-	radius(1),
-	depth_bias(4),
-	rendered(false)
+	shadow_caster(r),
+	sampler(resources.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.attach(DEPTH_ATTACHMENT, depth_buf, 0);
 	fbo.require_complete();
@@ -58,6 +74,7 @@ void ShadowMap::setup_frame(Renderer &renderer)
 
 	rendered = true;
 	renderable.setup_frame(renderer);
+	shadow_caster.setup_frame(renderer);
 
 	shadow_camera.set_object_matrix(*light.get_matrix());
 	shadow_camera.set_position(target);
@@ -78,7 +95,7 @@ void ShadowMap::setup_frame(Renderer &renderer)
 	Renderer::Push push(renderer);
 	renderer.set_camera(shadow_camera);
 
-	renderer.render(renderable, "shadow");
+	renderer.render(shadow_caster);
 }
 
 void ShadowMap::finish_frame()