Rewrite light binding to match textures

[libs/gl.git] / source / light.cpp

diff --git a/source/light.cpp b/source/light.cpp
index 899e22c9853d964ed7c0a591d4585cbfb2591c0c..f9b45c87bfeac3bf5712dec6001fe29f7419d1f6 100644 (file)
--- a/source/light.cpp
+++ b/source/light.cpp
@@ -1,12 +1,6 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include "except.h"
+#include <stdexcept>
 #include "light.h"
+#include "lightunit.h"
 #include "misc.h"
 
 using namespace std;
@@ -15,82 +9,85 @@ namespace Msp {
 namespace GL {
 
 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)
-{ }
-
-void Light::set_ambient(const Color &c)
 {
-       ambient=c;
+       attenuation[0] = 1;
+       attenuation[1] = 0;
+       attenuation[2] = 0;
 }
 
 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(float x_, float y_, float z_, float w_)
+void Light::set_position(const Vector4 &p)
 {
-       x=x_;
-       y=y_;
-       z=z_;
-       w=w_;
+       position = p;
 }
 
-void Light::bind() const
+void Light::set_spot_direction(const Vector3 &d)
 {
-       if(current_lights[current_unit]!=this)
-       {
-               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;
-       }
+       spot_dir = d;
 }
 
-void Light::bind_to(unsigned i) const
+void Light::set_spot_exponent(float e)
 {
-       activate(i);
-       bind();
+       spot_exp = e;
 }
 
-void Light::activate(unsigned i)
+void Light::set_spot_cutoff(float c)
 {
-       static unsigned max_lights=get_i(GL_MAX_LIGHTS);
-
-       if(i>=max_lights)
-               throw InvalidParameterValue("Light unit index out of range");
-
-       if(i>=current_lights.size())
-               current_lights.resize(i+1);
+       spot_cutoff = c;
+}
 
-       current_unit=i;
+void Light::set_attenuation(float c, float l, float q)
+{
+       attenuation[0] = c;
+       attenuation[1] = l;
+       attenuation[2] = q;
 }
 
-void Light::unbind()
+void Light::bind_to(unsigned i) const
 {
-       if(current_lights[current_unit])
+       LightUnit &unit = LightUnit::get_unit(i);
+       if(unit.set_light(this))
        {
-               disable(GL_LIGHT0+current_unit);
-               current_lights[current_unit]=0;
+               GLenum l = GL_LIGHT0+unit.get_index();
+               enable(l);
+               glLightfv(l, GL_DIFFUSE, &diffuse.r);
+               glLightfv(l, GL_SPECULAR, &specular.r);
+               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]);
        }
 }
 
-unsigned Light::current_unit=0;
-vector<const Light *> Light::current_lights(1);
+const Light *Light::current(unsigned i)
+{
+       return LightUnit::get_unit(i).get_light();
+}
+
+void Light::unbind_from(unsigned i)
+{
+       LightUnit &unit = LightUnit::get_unit(i);
+       if(unit.set_light(0))
+               disable(GL_LIGHT0+unit.get_index());
+}
 
 } // namespace GL
 } // namespace Msp