X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Feffects%2Fshadowmap.h;h=63d946c20e04c4aa4710dad2c345ce4e4e254a35;hb=5bb193f930fb8738d099d630c4d625d82c1215b5;hp=5d8bf5095287423827e71f32b988a22811d1777e;hpb=0d765be40336decc966932e0143fe9496f3eab4b;p=libs%2Fgl.git

diff --git a/source/effects/shadowmap.h b/source/effects/shadowmap.h
index 5d8bf509..63d946c2 100644
--- a/source/effects/shadowmap.h
+++ b/source/effects/shadowmap.h
@@ -2,6 +2,7 @@
 #define MSP_GL_SHADOWMAP_H_
 
 #include "camera.h"
+#include "depthtest.h"
 #include "effect.h"
 #include "framebuffer.h"
 #include "programdata.h"
@@ -12,7 +13,6 @@ namespace Msp {
 namespace GL {
 
 class Light;
-class Resources;
 
 /**
 Creates shadows on a renderable through a shadow map texture.  In the setup
@@ -30,20 +30,17 @@ private:
 	Camera shadow_camera;
 	Matrix shadow_matrix;
 	Texture2D depth_buf;
+	DepthTest depth_test;
 	const Sampler &sampler;
 	Vector3 target;
 	float radius;
 	float depth_bias;
-	mutable ProgramData shdata;
+	ProgramData shdata;
 	bool rendered;
 
 public:
-	ShadowMap(Resources &, unsigned, Renderable &, const Light &, Renderable &);
-	DEPRECATED ShadowMap(Resources &, unsigned, Renderable &, const Light &);
-private:
-	void init(unsigned);
+	ShadowMap(unsigned, Renderable &, const Light &, Renderable &);
 
-public:
 	/** Sets the ShadowMap target point and radius.  The transformation matrix is
 	computed so that a sphere with the specified parameters will be completely
 	covered by the ShadowMap. */
@@ -67,6 +64,8 @@ public:
 	virtual void finish_frame();
 
 	virtual void render(Renderer &, Tag = Tag()) const;
+
+	virtual void set_debug_name(const std::string &);
 };
 
 } // namespace GL