X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fmaterial.cc;h=6288ef4640dcee291a78c33c6534cb54b0f61370;hb=0429831551b044dc8e4d6ba7c842e1ce4761ed69;hp=f893175dc579a4387a496b7b273414770a78ae21;hpb=d4d7f73284783d2a50d71014789d196bef7d0e0e;p=laserbrain_demo

diff --git a/src/material.cc b/src/material.cc
index f893175..6288ef4 100644
--- a/src/material.cc
+++ b/src/material.cc
@@ -22,10 +22,17 @@ void Material::setup() const
 	glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, ks);
 	glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, shininess);
 
+	/*
 	int ntex = std::min((int)textures.size(), 8);	// TODO: use max texture units
 	for(int i=0; i<ntex; i++) {
 		bind_texture(textures[i], i);
 	}
+	*/
+	for(int i=0; i<NUM_MTL_TEXTURES; i++) {
+		if(stdtex[i]) {
+			bind_texture(stdtex[i], i);
+		}
+	}
 
 	if(stdtex[MTL_TEX_LIGHTMAP]) {
 		bind_program(stdtex[MTL_TEX_DIFFUSE] ? sdr_ltmap : sdr_ltmap_notex);
@@ -34,13 +41,29 @@ void Material::setup() const
 
 void Material::add_texture(Texture *tex, int type)
 {
-	textures.push_back(tex);
+	if(std::find(textures.begin(), textures.end(), tex) == textures.end()) {
+		textures.push_back(tex);
+	}
 
 	if(type != MTL_TEX_UNKNOWN) {
 		stdtex[type] = tex;
 	}
 }
 
+void Material::remove_texture(Texture *tex)
+{
+	std::vector<Texture*>::iterator it = std::find(textures.begin(), textures.end(), tex);
+	if(it != textures.end()) {
+		textures.erase(it);
+	}
+
+	for(int i=0; i<NUM_MTL_TEXTURES; i++) {
+		if(stdtex[i] == tex) {
+			stdtex[i] = 0;
+		}
+	}
+}
+
 int mtl_parse_type(const char *str)
 {
 	if(strcmp(str, "diffuse") == 0) {