Drop Id tags and copyright notices from files

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

diff --git a/source/lighting.cpp b/source/lighting.cpp
index 6b6af57cc1f84a337acc227a5165265f41b79bf8..0af2416c14729788d411e747b91e8bcedfa0303c 100644 (file)
--- a/source/lighting.cpp
+++ b/source/lighting.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2008  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include "light.h"
 #include "lighting.h"
 #include "misc.h"
@@ -18,7 +11,7 @@ Lighting::Lighting():
 
 void Lighting::set_ambient(const Color &a)
 {
-       ambient=a;
+       ambient = a;
 }
 
 void Lighting::attach(unsigned i, const Light &l)
@@ -26,7 +19,7 @@ void Lighting::attach(unsigned i, const Light &l)
        if(i>=lights.size())
                lights.resize(i+1);
 
-       lights[i]=&l;
+       lights[i] = &l;
 }
 
 void Lighting::detach(unsigned i)
@@ -34,38 +27,33 @@ void Lighting::detach(unsigned i)
        if(i>=lights.size())
                return;
 
-       lights[i]=0;
+       lights[i] = 0;
 }
 
 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;
 
-const Lighting *Lighting::current=0;
+       for(unsigned i=0; i<old->lights.size(); ++i)
+               if(old->lights[i])
+                       Light::unbind_from(i);
+
+       disable(GL_LIGHTING);
+}
 
 } // namespace GL
 } // namespace Msp