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

diff --git a/source/lighting.cpp b/source/lighting.cpp
index 0d6e7dc4..517530a2 100644
--- 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,34 @@ void Lighting::detach(unsigned i)
 		return;
 
 	lights[i] = 0;
+	if(current()==this)
+		Light::unbind_from(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;
 
-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