X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flighting.cpp;h=4cd4858b438fc99ef51a8ffb4702da674b3efd3d;hb=fb5da1dff367740868f3cbc5badffb1b4837d82a;hp=0d6e7dc4ab6e5da6a1521677a9a8689398ed6ca5;hpb=b617c5d7b5283ad260a77f01e42e6170cabbc03d;p=libs%2Fgl.git

diff --git a/source/lighting.cpp b/source/lighting.cpp
index 0d6e7dc4..4cd4858b 100644
--- a/source/lighting.cpp
+++ b/source/lighting.cpp
@@ -39,33 +39,28 @@ 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(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