X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flight.h;h=fa5bf28752b00a2a7e4735b8c0096d319c12b7af;hb=922fac753e31d97fc88daa166e93e4c5572bd2ba;hp=3be561d71c7dc1b5ba08a3ef0d882786dc39ea3f;hpb=b824398c547964c2862c4bf9f76426e1e8a4c1cb;p=libs%2Fgl.git

diff --git a/source/light.h b/source/light.h
index 3be561d7..fa5bf287 100644
--- a/source/light.h
+++ b/source/light.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_LIGHT_H_
 #define MSP_GL_LIGHT_H_
 
@@ -15,10 +8,23 @@ Distributed under the LGPL
 namespace Msp {
 namespace GL {
 
+class Matrix;
+class ProgramData;
+
 class Light
 {
 private:
-	Color ambient;
+	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;
@@ -27,16 +33,16 @@ private:
 	float spot_cutoff;
 	float attenuation[3];
 
-	static unsigned current_unit;
-	static std::vector<const Light *> current_lights;
-
 public:
 	Light();
+	~Light();
 
-	void set_ambient(const Color &c);
+private:
+	void update_parameter(int, int = -1) const;
+
+public:
 	void set_diffuse(const Color &c);
 	void set_specular(const Color &c);
-	const Color &get_ambient() const { return ambient; }
 	const Color &get_diffuse() const { return diffuse; }
 	const Color &get_specular() const { return specular; }
 
@@ -51,14 +57,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;
 
-	// Deprecated
-	void set_position(float x, float y, float z, float w) { set_position(Vector4(x, y, z, w)); }
-
-	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);
 };