X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flight.h;h=77542a54f7404b3a346ff8ec5de3cb1399ee6ffc;hb=5a93cc603eef43617a10b76bc9c19a3272ac1d49;hp=658e828781ae32af78f1e70fafe99e984cb99ac7;hpb=787e0f5daaccb912fd351b26f9cb9026719ab384;p=libs%2Fgl.git

diff --git a/source/light.h b/source/light.h
index 658e8287..77542a54 100644
--- a/source/light.h
+++ b/source/light.h
@@ -8,9 +8,23 @@
 namespace Msp {
 namespace GL {
 
+class Matrix;
+class ProgramData;
+
 class Light
 {
 private:
+	enum ParameterMask
+	{
+		DIFFUSE = 1,
+		SPECULAR = 2,
+		POSITION = 4,
+		SPOT_DIR = 8,
+		SPOT_EXP = 16,
+		SPOT_CUTOFF = 32,
+		ATTENUATION = 64
+	};
+
 	Color diffuse;
 	Color specular;
 	Vector4 position;
@@ -19,12 +33,13 @@ private:
 	float spot_cutoff;
 	float attenuation[3];
 
-	static unsigned current_unit;
-	static std::vector<const Light *> current_lights;
-
 public:
 	Light();
 
+private:
+	void update_parameter(int, int = -1) const;
+
+public:
 	void set_diffuse(const Color &c);
 	void set_specular(const Color &c);
 	const Color &get_diffuse() const { return diffuse; }
@@ -41,11 +56,12 @@ public:
 	void set_attenuation(float, float, float);
 	const float *get_attenuation() const { return attenuation; }
 
-	void bind() const;
+	void update_shader_data(ProgramData &, const Matrix &, unsigned) const;
+	void bind() const { return bind_to(0); }
 	void bind_to(unsigned) const;
 
-	static void activate(unsigned);
-	static void unbind();
+	static const Light *current(unsigned = 0);
+	static void unbind() { return unbind_from(0); }
 	static void unbind_from(unsigned);
 };