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

diff --git a/source/material.cpp b/source/material.cpp
index a2814cff..1d5a4087 100644
--- a/source/material.cpp
+++ b/source/material.cpp
@@ -1,4 +1,3 @@
-#include <msp/gl/extensions/msp_legacy_features.h>
 #include "gl.h"
 #include "material.h"
 #include "resources.h"
@@ -16,56 +15,34 @@ Material::Material()
 	set_reflectivity(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;
 	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::set_reflectivity(float r)
@@ -74,14 +51,6 @@ void Material::set_reflectivity(float r)
 	shdata.uniform("reflectivity", reflectivity);
 }
 
-void Material::bind() const
-{
-	static Require _req(MSP_legacy_features);
-
-	if(set_current(this))
-		update_parameter(-1);
-}
-
 
 Material::Loader::Loader(Material &m):
 	DataFile::CollectionObjectLoader<Material>(m, 0)