X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flight.cpp;h=4b2e289c6c5d7c1b21ebb7f749a0a963523412e4;hb=ead146649adf96c50055c5d43cf7ea6e2be08dfd;hp=39693c4091a6b1579885bf79104ef60e38ca0426;hpb=f14435e58bfa0fa697a06ba9a454bb30cd37d9d8;p=libs%2Fgl.git diff --git a/source/light.cpp b/source/light.cpp index 39693c40..4b2e289c 100644 --- a/source/light.cpp +++ b/source/light.cpp @@ -1,4 +1,4 @@ -#include "except.h" +#include #include "light.h" #include "misc.h" @@ -7,6 +7,9 @@ using namespace std; namespace Msp { namespace GL { +unsigned Light::current_unit = 0; +vector Light::current_lights(1); + Light::Light(): ambient(0), diffuse(1), @@ -94,7 +97,7 @@ void Light::activate(unsigned i) static unsigned max_lights = get_i(GL_MAX_LIGHTS); if(i>=max_lights) - throw InvalidParameterValue("Light unit index out of range"); + throw out_of_range("Light::activate"); if(i>=current_lights.size()) current_lights.resize(i+1); @@ -117,8 +120,5 @@ void Light::unbind_from(unsigned i) unbind(); } -unsigned Light::current_unit = 0; -vector Light::current_lights(1); - } // namespace GL } // namespace Msp