Don't store ProgramData in Lighting

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

diff --git a/source/lighting.cpp b/source/lighting.cpp
index 0d6e7dc4ab6e5da6a1521677a9a8689398ed6ca5..f5fbca6ac7ac954c5a2c63cd75590557e4245660 100644 (file)
--- a/source/lighting.cpp
+++ b/source/lighting.cpp
@@ -1,14 +1,11 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2008  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
+#include <stdexcept>
 #include "light.h"
 #include "lighting.h"
+#include "lightunit.h"
 #include "misc.h"
 
+using namespace std;
+
 namespace Msp {
 namespace GL {
 
@@ -23,10 +20,15 @@ void Lighting::set_ambient(const Color &a)
 
 void Lighting::attach(unsigned i, const Light &l)
 {
+       if(i>=LightUnit::get_n_units())
+               throw out_of_range("Lighting::attach");
+
        if(i>=lights.size())
                lights.resize(i+1);
 
        lights[i] = &l;
+       if(current()==this)
+               l.bind_to(i);
 }
 
 void Lighting::detach(unsigned i)
@@ -35,37 +37,42 @@ void Lighting::detach(unsigned i)
                return;
 
        lights[i] = 0;
+       if(current()==this)
+               Light::unbind_from(i);
+}
+
+void Lighting::update_shader_data(ProgramData &shdata, const Matrix &view_matrix) const
+{
+       shdata.uniform("ambient_color", ambient);
+       for(unsigned i=0; i<lights.size(); ++i)
+               if(lights[i])
+                       lights[i]->update_shader_data(shdata, view_matrix, i);
 }
 
 void Lighting::bind() const
 {
-       if(current!=this)
-       {
-               enable(LIGHTING);
-               glLightModelfv(GL_LIGHT_MODEL_AMBIENT, &ambient.r);
-               for(unsigned i=0; i<lights.size(); ++i)
-                       if(lights[i])
-                               lights[i]->bind_to(i);
-               current = this;
-       }
+       if(!set_current(this))
+               return;
+
+       enable(GL_LIGHTING);
+       glLightModelfv(GL_LIGHT_MODEL_AMBIENT, &ambient.r);
+       for(unsigned i=0; i<lights.size(); ++i)
+               if(lights[i])
+                       lights[i]->bind_to(i);
 }
 
 void Lighting::unbind()
 {
-       if(current)
-       {
-               for(unsigned i=0; i<current->lights.size(); ++i)
-                       if(current->lights[i])
-                       {
-                               Light::activate(i);
-                               Light::unbind();
-                       }
-               disable(LIGHTING);
-               current = 0;
-       }
-}
+       const Lighting *old = current();
+       if(!set_current(0))
+               return;
+
+       for(unsigned i=0; i<old->lights.size(); ++i)
+               if(old->lights[i])
+                       Light::unbind_from(i);
 
-const Lighting *Lighting::current = 0;
+       disable(GL_LIGHTING);
+}
 
 } // namespace GL
 } // namespace Msp