X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Feffects%2Fshadowmap.cpp;h=e43e9bdeb97392f8439e22c2351b3fa8bc7fa787;hb=233dff2a6c552e08da832496aecd88ef4f8948f1;hp=eaf6e1373cb126a387d535e9e2b1352199eed2e7;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266;p=libs%2Fgl.git

diff --git a/source/effects/shadowmap.cpp b/source/effects/shadowmap.cpp
index eaf6e137..e43e9bde 100644
--- a/source/effects/shadowmap.cpp
+++ b/source/effects/shadowmap.cpp
@@ -3,6 +3,7 @@
 #include "camera.h"
 #include "light.h"
 #include "renderer.h"
+#include "resources.h"
 #include "scene.h"
 #include "shadowmap.h"
 #include "tests.h"
@@ -12,25 +13,15 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-WeakPtr<Sampler> ShadowMap::shadow_sampler;
-
-ShadowMap::ShadowMap(unsigned s, Renderable &r, const Light &l):
+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)
 {
-	sampler = shadow_sampler;
-	if(!sampler)
-	{
-		sampler = new Sampler;
-		sampler->set_filter(LINEAR);
-		sampler->set_compare(LEQUAL);
-		sampler->set_wrap(CLAMP_TO_EDGE);
-		shadow_sampler = sampler;
-	}
 	depth_buf.storage(DEPTH_COMPONENT32F, size, size, 1);
 	fbo.attach(DEPTH_ATTACHMENT, depth_buf, 0);
 	fbo.require_complete();
@@ -97,7 +88,7 @@ void ShadowMap::finish_frame()
 	rendered = false;
 }
 
-void ShadowMap::render(Renderer &renderer, const Tag &tag) const
+void ShadowMap::render(Renderer &renderer, Tag tag) const
 {
 	if(!enabled_passes.count(tag))
 		return renderer.render(renderable, tag);
@@ -108,7 +99,7 @@ void ShadowMap::render(Renderer &renderer, const Tag &tag) const
 	int iunit = unit;
 	shdata.uniform("shadow_map", iunit);
 
-	Bind _bind_sampler(*sampler, unit);
+	Bind _bind_sampler(sampler, unit);
 	Bind _bind_depth(depth_buf, unit);
 
 	if(const Camera *camera = renderer.get_camera())