X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterial.cpp;h=1d5a4087af2b3b8f6c9db232792c7eff45732a1c;hb=cf17331b8ddc0e00c3ba452e0f4dfa183dc8e019;hp=13f2d1d9d9f785ddefa152a22ad3f4dd0fed3a01;hpb=e37851b98dde5082ee92570354746f2f92e21940;p=libs%2Fgl.git

diff --git a/source/material.cpp b/source/material.cpp
index 13f2d1d9..1d5a4087 100644
--- a/source/material.cpp
+++ b/source/material.cpp
@@ -12,64 +12,43 @@ Material::Material()
 	set_specular(0);
 	set_emission(0);
 	set_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);
+	set_reflectivity(0);
 }
 
 void Material::set_ambient(const Color &a)
 {
 	ambient = a;
 	shdata.uniform("material.ambient", ambient);
-	update_parameter(AMBIENT);
 }
 
 void Material::set_diffuse(const Color &d)
 {
 	diffuse = d;
 	shdata.uniform("material.diffuse", diffuse);
-	update_parameter(DIFFUSE);
 }
 
 void Material::set_specular(const Color &s)
 {
 	specular = s;
 	shdata.uniform("material.specular", specular);
-	update_parameter(SPECULAR);
 }
 
 void Material::set_emission(const Color &e)
 {
 	emission = e;
 	shdata.uniform("material.emission", emission);
-	update_parameter(EMISSION);
 }
 
 void Material::set_shininess(float s)
 {
 	shininess = s;
 	shdata.uniform("material.shininess", shininess);
-	update_parameter(SHININESS);
 }
 
-void Material::bind() const
+void Material::set_reflectivity(float r)
 {
-	if(set_current(this))
-		update_parameter(-1);
+	reflectivity = r;
+	shdata.uniform("reflectivity", reflectivity);
 }
 
 
@@ -97,6 +76,7 @@ void Material::Loader::init()
 	add("specular",  &Loader::specular);
 	add("emission",  &Loader::emission);
 	add("shininess", &Loader::shininess);
+	add("reflectivity", &Loader::reflectivity);
 }
 
 Color Material::Loader::make_color(float r, float g, float b, float a)
@@ -132,5 +112,10 @@ void Material::Loader::shininess(float s)
 	obj.set_shininess(s);
 }
 
+void Material::Loader::reflectivity(float r)
+{
+	obj.set_reflectivity(r);
+}
+
 } // namespace GL
 } // namespace Msp