Rework Bind and enable it to restore the old binding

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

diff --git a/source/lighting.cpp b/source/lighting.cpp
index 0d6e7dc4ab6e5da6a1521677a9a8689398ed6ca5..44a01a5e6ab6ade990bd324d0ea7a0f97a5c8e85 100644 (file)
--- a/source/lighting.cpp
+++ b/source/lighting.cpp
@@ -39,33 +39,30 @@ void Lighting::detach(unsigned 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(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;
 
-const Lighting *Lighting::current = 0;
+       for(unsigned i=0; i<old->lights.size(); ++i)
+               if(old->lights[i])
+               {
+                       Light::activate(i);
+                       Light::unbind();
+               }
+       disable(LIGHTING);
+}
 
 } // namespace GL
 } // namespace Msp