X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Feffects%2Fshadowmap.h;h=c3c7bd55a7f53430937cce8faf6f6955b220f61d;hb=a2b0d155023ca23afe7848ae5d17e0f7bc328525;hp=67f2cf6c30a0b1b264759b0090265b89cec7a5b6;hpb=2b2676392aff2eb6b38c3e463cc67f4d67a4ef8b;p=libs%2Fgl.git

diff --git a/source/effects/shadowmap.h b/source/effects/shadowmap.h
index 67f2cf6c..c3c7bd55 100644
--- a/source/effects/shadowmap.h
+++ b/source/effects/shadowmap.h
@@ -2,10 +2,10 @@
 #define MSP_GL_SHADOWMAP_H_
 
 #include "camera.h"
-#include "depthtest.h"
 #include "effect.h"
 #include "framebuffer.h"
 #include "programdata.h"
+#include "rect.h"
 #include "texture2d.h"
 #include "vector.h"
 
@@ -13,7 +13,6 @@ namespace Msp {
 namespace GL {
 
 class Light;
-class Resources;
 
 /**
 Creates shadows on a renderable through a shadow map texture.  In the setup
@@ -24,28 +23,37 @@ texture coordinate generation to determine whether each fragment is lit.
 class ShadowMap: public Effect
 {
 private:
-	unsigned size;
-	const Light &light;
+	struct ShadowedLight
+	{
+		const Light *light;
+		unsigned index;
+		Rect region;
+		Camera shadow_camera;
+	};
+
+	unsigned width;
+	unsigned height;
+	const Lighting *lighting;
+	std::vector<ShadowedLight> lights;
 	Renderable &shadow_caster;
 	Framebuffer fbo;
-	Camera shadow_camera;
-	Matrix shadow_matrix;
 	Texture2D depth_buf;
-	DepthTest depth_test;
 	const Sampler &sampler;
 	Vector3 target;
 	float radius;
 	float depth_bias;
+	float darkness;
 	ProgramData shdata;
 	bool rendered;
+	std::string debug_name;
 
+	ShadowMap(unsigned, unsigned, Renderable &, const Lighting *, Renderable &);
 public:
 	ShadowMap(unsigned, Renderable &, const Light &, Renderable &);
-	DEPRECATED ShadowMap(unsigned, Renderable &, const Light &);
-private:
-	void init(unsigned);
+	ShadowMap(unsigned, unsigned, Renderable &, const Lighting &, Renderable &);
+
+	void add_light(const Light &, unsigned);
 
-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. */
@@ -63,7 +71,6 @@ public:
 	void set_depth_bias(float);
 
 	const Texture2D &get_depth_texture() const { return depth_buf; }
-	const Matrix &get_shadow_matrix() const { return shadow_matrix; }
 
 	virtual void setup_frame(Renderer &);
 	virtual void finish_frame();