Fix some incorrect whitespace

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

diff --git a/source/material.cpp b/source/material.cpp
index eee1ebc6152057d8799db1a118fa3dcda2bfcd2c..d6e21683d2a7f3b8fb08498b269419d386d7d9d7 100644 (file)
--- a/source/material.cpp
+++ b/source/material.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007-2008  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include "gl.h"
 #include "material.h"
 
@@ -19,51 +12,59 @@ Material::Material():
        shininess(0)
 { }
 
+void Material::update_parameter(int mask) const
+{
+       if(cur_obj!=this)
+               return;
+
+       if(mask&AMBIENT)
+               glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, &ambient.r);
+       if(mask&DIFFUSE)
+               glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, &diffuse.r);
+       if(mask&SPECULAR)
+               glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, &specular.r);
+       if(mask&EMISSION)
+               glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, &emission.r);
+       if(mask&SHININESS)
+               glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, shininess);
+}
+
 void Material::set_ambient(const Color &a)
 {
        ambient = a;
+       update_parameter(AMBIENT);
 }
 
 void Material::set_diffuse(const Color &d)
 {
        diffuse = d;
+       update_parameter(DIFFUSE);
 }
 
 void Material::set_specular(const Color &s)
 {
        specular = s;
+       update_parameter(SPECULAR);
 }
 
 void Material::set_emission(const Color &e)
 {
        emission = e;
+       update_parameter(EMISSION);
 }
 
 void Material::set_shininess(float s)
 {
        shininess = s;
+       update_parameter(SHININESS);
 }
 
 void Material::bind() const
 {
-       if(current!=this)
-       {
-               glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, &ambient.r);
-               glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, &diffuse.r);
-               glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, &specular.r);
-               glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, &emission.r);
-               glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, shininess);
-               current = this;
-       }
-}
-
-void Material::unbind()
-{
-       current = 0;
+       if(set_current(this))
+               update_parameter(-1);
 }
 
-const Material *Material::current = 0;
-
 
 Material::Loader::Loader(Material &m):
        DataFile::ObjectLoader<Material>(m)