Better state tracking for bound objects

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

diff --git a/source/light.cpp b/source/light.cpp
index 215b9d567eb6e357781015cd4f5f5e58844f3baf..d4b45aaf82cc66371c4a73f11174eaf7356af611 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,7 +9,6 @@ namespace Msp {
 namespace GL {
 
 Light::Light():
-       ambient(0),
        diffuse(1),
        specular(1),
        position(0, 0, 1, 0),
@@ -28,39 +21,72 @@ Light::Light():
        attenuation[2] = 0;
 }
 
-void Light::set_ambient(const Color &c)
+void Light::update_parameter(int mask, int index) const
 {
-       ambient = c;
+       if(index<0)
+       {
+               LightUnit *unit = LightUnit::find_unit(this);
+               if(!unit)
+                       return;
+
+               index = unit->get_index();
+       }
+
+       GLenum l = GL_LIGHT0+index;
+       if(mask&DIFFUSE)
+               glLightfv(l, GL_DIFFUSE, &diffuse.r);
+       if(mask&SPECULAR)
+               glLightfv(l, GL_SPECULAR, &specular.r);
+       if(mask&POSITION)
+               glLightfv(l, GL_POSITION, &position.x);
+       if(mask&SPOT_DIR)
+               glLightfv(l, GL_SPOT_DIRECTION, &spot_dir.x);
+       if(mask&SPOT_EXP)
+               glLightf(l, GL_SPOT_EXPONENT, spot_exp);
+       if(mask&SPOT_CUTOFF)
+               glLightf(l, GL_SPOT_CUTOFF, spot_cutoff);
+       if(mask&ATTENUATION)
+       {
+               glLightf(l, GL_CONSTANT_ATTENUATION, attenuation[0]);
+               glLightf(l, GL_LINEAR_ATTENUATION, attenuation[1]);
+               glLightf(l, GL_QUADRATIC_ATTENUATION, attenuation[2]);
+       }
 }
 
 void Light::set_diffuse(const Color &c)
 {
        diffuse = c;
+       update_parameter(DIFFUSE);
 }
 
 void Light::set_specular(const Color &c)
 {
        specular = c;
+       update_parameter(SPECULAR);
 }
 
 void Light::set_position(const Vector4 &p)
 {
        position = p;
+       update_parameter(POSITION);
 }
 
 void Light::set_spot_direction(const Vector3 &d)
 {
        spot_dir = d;
+       update_parameter(SPOT_DIR);
 }
 
 void Light::set_spot_exponent(float e)
 {
        spot_exp = e;
+       update_parameter(SPOT_EXP);
 }
 
 void Light::set_spot_cutoff(float c)
 {
        spot_cutoff = c;
+       update_parameter(SPOT_CUTOFF);
 }
 
 void Light::set_attenuation(float c, float l, float q)
@@ -68,64 +94,30 @@ void Light::set_attenuation(float c, float l, float q)
        attenuation[0] = c;
        attenuation[1] = l;
        attenuation[2] = q;
+       update_parameter(ATTENUATION);
 }
 
-void Light::bind() const
+void Light::bind_to(unsigned i) const
 {
-       if(current_lights[current_unit]!=this)
+       LightUnit &unit = LightUnit::get_unit(i);
+       if(unit.set_light(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, &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;
+               enable(GL_LIGHT0+unit.get_index());
+               update_parameter(-1, unit.get_index());
        }
 }
 
-void Light::bind_to(unsigned i) const
-{
-       activate(i);
-       bind();
-}
-
-void Light::activate(unsigned i)
-{
-       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);
-
-       current_unit = i;
-}
-
-void Light::unbind()
+const Light *Light::current(unsigned i)
 {
-       if(current_lights[current_unit])
-       {
-               disable(GL_LIGHT0+current_unit);
-               current_lights[current_unit] = 0;
-       }
+       return LightUnit::get_unit(i).get_light();
 }
 
 void Light::unbind_from(unsigned i)
 {
-       activate(i);
-       unbind();
+       LightUnit &unit = LightUnit::get_unit(i);
+       if(unit.set_light(0))
+               disable(GL_LIGHT0+unit.get_index());
 }
 
-unsigned Light::current_unit = 0;
-vector<const Light *> Light::current_lights(1);
-
 } // namespace GL
 } // namespace Msp