X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterial.cpp;h=d6e21683d2a7f3b8fb08498b269419d386d7d9d7;hb=f136af6873d7409daffe262b14f632af986bd7dc;hp=989bb12e71b7ac51e5fd2223abbc591fa9a72006;hpb=42ace9ac1350d3ae009bdd2fb335ac1e57d1b36b;p=libs%2Fgl.git

diff --git a/source/material.cpp b/source/material.cpp
index 989bb12e..d6e21683 100644
--- 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,46 +12,57 @@ 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(set_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);
-	}
-}
-
-void Material::unbind()
-{
-	set_current(0);
+		update_parameter(-1);
 }