1 files changed, 3 insertions, 51 deletions

diff --git a/src/engine/animmodel.h b/src/engine/animmodel.h
index 420d7f2..a7ed257 100644
--- a/src/engine/animmodel.h
+++ b/src/engine/animmodel.h
@@ -1,4 +1,3 @@
-VARFP(envmapmodels, 0, 1, 1, preloadmodelshaders(true));
 VARFP(bumpmodels, 0, 1, 1, preloadmodelshaders(true));
 VARP(fullbrightmodels, 0, 0, 200);
 
@@ -69,9 +68,9 @@ struct animmodel : model
 
 	struct shaderparams
 	{
-		float spec, ambient, glow, glowdelta, glowpulse, specglare, glowglare, fullbright, envmapmin, envmapmax, scrollu, scrollv, alphatest;
+		float spec, ambient, fullbright, envmapmin, envmapmax, scrollu, scrollv, alphatest;
 
-		shaderparams() : spec(1.0f), ambient(0.3f), glow(3.0f), glowdelta(0), glowpulse(0), specglare(1), glowglare(1), fullbright(0), envmapmin(0), envmapmax(0), scrollu(0), scrollv(0), alphatest(0.9f) {}
+		shaderparams() : spec(1.0f), ambient(0.3f), fullbright(0), envmapmin(0), envmapmax(0), scrollu(0), scrollv(0), alphatest(0.9f) {}
 	};
 
 	struct shaderparamskey
@@ -160,7 +159,6 @@ struct animmodel : model
 				curpulse -= floor(curpulse);
 				curglow += glowdelta*2*fabs(curpulse - 0.5f);
 			}
-			LOCALPARAMF(maskscale, 0.5f*spec, 0.5f*curglow, 16*specglare, 4*glowglare);
 			LOCALPARAMF(texscroll, scrollu*lastmillis/1000.0f, scrollv*lastmillis/1000.0f);
 			if(envmapped()) LOCALPARAMF(envmapscale, envmapmin-envmapmax, envmapmax);
 		}
@@ -244,7 +242,7 @@ struct animmodel : model
 			{
 				if(alphablend)
 				{
-					if(!enablealphablend && !reflecting && !refracting)
+					if(!enablealphablend)
 					{
 						glEnable(GL_BLEND);
 						glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -1270,29 +1268,6 @@ struct animmodel : model
 		loopv(parts) loopvj(parts[i]->skins) parts[i]->skins[j].ambient = ambient;
 	}
 
-	void setglow(float glow, float delta, float pulse)
-	{
-		if(parts.empty()) loaddefaultparts();
-		loopv(parts) loopvj(parts[i]->skins)
-		{
-			skin &s = parts[i]->skins[j];
-			s.glow = glow;
-			s.glowdelta = delta;
-			s.glowpulse = pulse;
-		}
-	}
-
-	void setglare(float specglare, float glowglare)
-	{
-		if(parts.empty()) loaddefaultparts();
-		loopv(parts) loopvj(parts[i]->skins)
-		{
-			skin &s = parts[i]->skins[j];
-			s.specglare = specglare;
-			s.glowglare = glowglare;
-		}
-	}
-
 	void setalphatest(float alphatest)
 	{
 		if(parts.empty()) loaddefaultparts();
@@ -1521,20 +1496,6 @@ template<class MDL, class MESH> struct modelcommands
 		loopskins(meshname, s, s.ambient = ambient);
 	}
 
-	static void setglow(char *meshname, int *percent, int *delta, float *pulse)
-	{
-		float glow = 3.0f, glowdelta = *delta/100.0f, glowpulse = *pulse > 0 ? *pulse/1000.0f : 0;
-		if(*percent>0) glow = *percent/100.0f;
-		else if(*percent<0) glow = 0.0f;
-		glowdelta -= glow;
-		loopskins(meshname, s, { s.glow = glow; s.glowdelta = glowdelta; s.glowpulse = glowpulse; });
-	}
-
-	static void setglare(char *meshname, float *specglare, float *glowglare)
-	{
-		loopskins(meshname, s, { s.specglare = *specglare; s.glowglare = *glowglare; });
-	}
-
 	static void setalphatest(char *meshname, float *cutoff)
 	{
 		loopskins(meshname, s, s.alphatest = max(0.0f, min(1.0f, *cutoff)));
@@ -1550,12 +1511,6 @@ template<class MDL, class MESH> struct modelcommands
 		loopskins(meshname, s, s.cullface = *cullface!=0);
 	}
 
-	static void setenvmap(char *meshname, char *envmap)
-	{
-		Texture *tex = cubemapload(envmap);
-		loopskins(meshname, s, s.envmap = tex);
-	}
-
 	static void setbumpmap(char *meshname, char *normalmapfile)
 	{
 		Texture *normalmaptex = textureload(makerelpath(MDL::dir, normalmapfile), 0, true, false);
@@ -1603,12 +1558,9 @@ template<class MDL, class MESH> struct modelcommands
 			modelcommand(setskin, "skin", "sssff");
 			modelcommand(setspec, "spec", "si");
 			modelcommand(setambient, "ambient", "si");
-			modelcommand(setglow, "glow", "siif");
-			modelcommand(setglare, "glare", "sff");
 			modelcommand(setalphatest, "alphatest", "sf");
 			modelcommand(setalphablend, "alphablend", "si");
 			modelcommand(setcullface, "cullface", "si");
-			modelcommand(setenvmap, "envmap", "ss");
 			modelcommand(setbumpmap, "bumpmap", "ss");
 			modelcommand(setfullbright, "fullbright", "sf");
 			modelcommand(setshader, "shader", "ss");