X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flight.cpp;h=26cc896358d46f4a7de30cd0bd40e4d811f27ad8;hb=b617c5d7b5283ad260a77f01e42e6170cabbc03d;hp=899e22c9853d964ed7c0a591d4585cbfb2591c0c;hpb=efe80f5a696b4a3be2378dc6d635c89676afa12d;p=libs%2Fgl.git

diff --git a/source/light.cpp b/source/light.cpp
index 899e22c9..26cc8963 100644
--- a/source/light.cpp
+++ b/source/light.cpp
@@ -18,46 +18,75 @@ Light::Light():
 	ambient(0),
 	diffuse(1),
 	specular(1),
-	x(0), y(0), z(1), w(0),
-	sdx(0), sdy(0), sdz(-1),
+	position(0, 0, 1, 0),
+	spot_dir(0, 0, -1),
 	spot_exp(0),
 	spot_cutoff(180)
-{ }
+{
+	attenuation[0] = 1;
+	attenuation[1] = 0;
+	attenuation[2] = 0;
+}
 
 void Light::set_ambient(const Color &c)
 {
-	ambient=c;
+	ambient = c;
 }
 
 void Light::set_diffuse(const Color &c)
 {
-	diffuse=c;
+	diffuse = c;
 }
 
 void Light::set_specular(const Color &c)
 {
-	specular=c;
+	specular = c;
+}
+
+void Light::set_position(const Vector4 &p)
+{
+	position = p;
+}
+
+void Light::set_spot_direction(const Vector3 &d)
+{
+	spot_dir = d;
+}
+
+void Light::set_spot_exponent(float e)
+{
+	spot_exp = e;
+}
+
+void Light::set_spot_cutoff(float c)
+{
+	spot_cutoff = c;
 }
 
-void Light::set_position(float x_, float y_, float z_, float w_)
+void Light::set_attenuation(float c, float l, float q)
 {
-	x=x_;
-	y=y_;
-	z=z_;
-	w=w_;
+	attenuation[0] = c;
+	attenuation[1] = l;
+	attenuation[2] = q;
 }
 
 void Light::bind() const
 {
 	if(current_lights[current_unit]!=this)
 	{
-		GLenum l=GL_LIGHT0+current_unit;
+		GLenum l = GL_LIGHT0+current_unit;
 		enable(l);
 		glLightfv(l, GL_AMBIENT, &ambient.r);
 		glLightfv(l, GL_DIFFUSE, &diffuse.r);
 		glLightfv(l, GL_SPECULAR, &specular.r);
-		glLightfv(l, GL_POSITION, &x);
-		current_lights[current_unit]=this;
+		glLightfv(l, GL_POSITION, &position.x);
+		glLightfv(l, GL_SPOT_DIRECTION, &spot_dir.x);
+		glLightf(l, GL_SPOT_EXPONENT, spot_exp);
+		glLightf(l, GL_SPOT_CUTOFF, spot_cutoff);
+		glLightf(l, GL_CONSTANT_ATTENUATION, attenuation[0]);
+		glLightf(l, GL_LINEAR_ATTENUATION, attenuation[1]);
+		glLightf(l, GL_QUADRATIC_ATTENUATION, attenuation[2]);
+		current_lights[current_unit] = this;
 	}
 }
 
@@ -69,7 +98,7 @@ void Light::bind_to(unsigned i) const
 
 void Light::activate(unsigned i)
 {
-	static unsigned max_lights=get_i(GL_MAX_LIGHTS);
+	static unsigned max_lights = get_i(GL_MAX_LIGHTS);
 
 	if(i>=max_lights)
 		throw InvalidParameterValue("Light unit index out of range");
@@ -77,7 +106,7 @@ void Light::activate(unsigned i)
 	if(i>=current_lights.size())
 		current_lights.resize(i+1);
 
-	current_unit=i;
+	current_unit = i;
 }
 
 void Light::unbind()
@@ -85,11 +114,11 @@ void Light::unbind()
 	if(current_lights[current_unit])
 	{
 		disable(GL_LIGHT0+current_unit);
-		current_lights[current_unit]=0;
+		current_lights[current_unit] = 0;
 	}
 }
 
-unsigned Light::current_unit=0;
+unsigned Light::current_unit = 0;
 vector<const Light *> Light::current_lights(1);
 
 } // namespace GL