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

diff --git a/source/light.h b/source/light.h
index e9b03269..2375c7c9 100644
--- a/source/light.h
+++ b/source/light.h
@@ -1,15 +1,9 @@
-/* $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_
 
 #include <vector>
 #include "color.h"
+#include "vector.h"
 
 namespace Msp {
 namespace GL {
@@ -20,8 +14,8 @@ private:
 	Color ambient;
 	Color diffuse;
 	Color specular;
-	float x, y, z, w;
-	float sdx, sdy, sdz;
+	Vector4 position;
+	Vector3 spot_dir;
 	float spot_exp;
 	float spot_cutoff;
 	float attenuation[3];
@@ -31,15 +25,34 @@ private:
 
 public:
 	Light();
+
 	void set_ambient(const Color &c);
 	void set_diffuse(const Color &c);
 	void set_specular(const Color &c);
-	void set_position(float, float, float, float);
+	const Color &get_ambient() const { return ambient; }
+	const Color &get_diffuse() const { return diffuse; }
+	const Color &get_specular() const { return specular; }
+
+	void set_position(const Vector4 &);
+	const Vector4 &get_position() const { return position; }
+	void set_spot_direction(const Vector3 &);
+	void set_spot_exponent(float);
+	void set_spot_cutoff(float);
+	const Vector3 &get_spot_direction() const { return spot_dir; }
+	float get_spot_exponent() const { return spot_exp; }
+	float get_spot_cutoff() const { return spot_cutoff; }
+	void set_attenuation(float, float, float);
+	const float *get_attenuation() const { return attenuation; }
+
 	void bind() const;
 	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 void unbind_from(unsigned);
 };
 
 } // namespace GL