X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flight.h;h=1c6a52272f56db8597103093c99a3050602fa7b3;hb=126161d1d44ab9503bc747d24a07b7b9d15e527a;hp=2375c7c909899b7ac22fc3fc13992d8f3c31307f;hpb=f14435e58bfa0fa697a06ba9a454bb30cd37d9d8;p=libs%2Fgl.git

diff --git a/source/light.h b/source/light.h
index 2375c7c9..1c6a5227 100644
--- a/source/light.h
+++ b/source/light.h
@@ -11,7 +11,17 @@ namespace GL {
 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;
@@ -20,16 +30,15 @@ private:
 	float spot_cutoff;
 	float attenuation[3];
 
-	static unsigned current_unit;
-	static std::vector<const Light *> current_lights;
-
 public:
 	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; }
 
@@ -44,14 +53,11 @@ public:
 	void set_attenuation(float, float, float);
 	const float *get_attenuation() const { return attenuation; }
 
-	void bind() 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);
 };