X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=src%2Fmaterial.cc;h=a079c8366534b97996195e7cebce09c3555a8d3a;hp=6288ef4640dcee291a78c33c6534cb54b0f61370;hb=9480e20f4de41693ebd1f22e63d3bcecde878f70;hpb=68e71418a70dab4174981d5a579e96a9089f8682

diff --git a/src/material.cc b/src/material.cc
index 6288ef4..a079c83 100644
--- a/src/material.cc
+++ b/src/material.cc
@@ -11,6 +11,9 @@ Material::Material()
 	shininess = 0.0f;
 	alpha = 1.0f;
 	memset(stdtex, 0, sizeof stdtex);
+
+	reflect = 0.0f;
+	flat_mirror = false;
 }
 
 void Material::setup() const
@@ -34,9 +37,11 @@ void Material::setup() const
 		}
 	}
 
+	/*
 	if(stdtex[MTL_TEX_LIGHTMAP]) {
 		bind_program(stdtex[MTL_TEX_DIFFUSE] ? sdr_ltmap : sdr_ltmap_notex);
 	}
+	*/
 }
 
 void Material::add_texture(Texture *tex, int type)
@@ -75,7 +80,7 @@ int mtl_parse_type(const char *str)
 	} else if(strcmp(str, "lightmap") == 0) {
 		return MTL_TEX_LIGHTMAP;
 	} else if(strcmp(str, "envmap") == 0) {
-		return MTL_TEX_ENVMAP;
+		return MTL_TEX_REFLECT;
 	}
 	return MTL_TEX_UNKNOWN;
 }
@@ -91,7 +96,7 @@ const char *mtl_type_string(int type)
 		return "normalmap";
 	case MTL_TEX_LIGHTMAP:
 		return "lightmap";
-	case MTL_TEX_ENVMAP:
+	case MTL_TEX_REFLECT:
 		return "envmap";
 	default:
 		break;