From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Wed, 4 Apr 2007 19:06:54 +0000 (+0000)
Subject: fixed compile error in GLSL shader with the new textured attenuation code
X-Git-Tag: xonotic-v0.1.0preview~3372
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=ca6c8f1d33f6306d97a74f3dd1e3f7c7cccf8460;p=xonotic%2Fdarkplaces.git

fixed compile error in GLSL shader with the new textured attenuation code


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@7047 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/gl_rmain.c b/gl_rmain.c
index 3837e8e8..10fa60d5 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -581,14 +581,14 @@ static const char *builtinshaderstring =
 "	myhvec3 specularnormal = normalize(diffusenormal + myhvec3(normalize(EyeVector)));\n"
 "\n"
 "	// calculate directional shading\n"
-"	color.rgb = LightColor * myhalf(texture2D(Texture_Attenuation, length(CubeVector))) * (color.rgb * (AmbientScale + DiffuseScale * myhalf(max(float(dot(surfacenormal, diffusenormal)), 0.0))) + (SpecularScale * pow(myhalf(max(float(dot(surfacenormal, specularnormal)), 0.0)), SpecularPower)) * myhvec3(texture2D(Texture_Gloss, TexCoord)));\n"
+"	color.rgb = LightColor * myhalf(texture2D(Texture_Attenuation, vec2(length(CubeVector), 0.0))) * (color.rgb * (AmbientScale + DiffuseScale * myhalf(max(float(dot(surfacenormal, diffusenormal)), 0.0))) + (SpecularScale * pow(myhalf(max(float(dot(surfacenormal, specularnormal)), 0.0)), SpecularPower)) * myhvec3(texture2D(Texture_Gloss, TexCoord)));\n"
 "#else\n"
 "#ifdef USEDIFFUSE\n"
 "	myhvec3 surfacenormal = normalize(myhvec3(texture2D(Texture_Normal, TexCoord)) - myhvec3(0.5));\n"
 "	myhvec3 diffusenormal = myhvec3(normalize(LightVector));\n"
 "\n"
 "	// calculate directional shading\n"
-"	color.rgb = LightColor * myhalf(texture2D(Texture_Attenuation, length(CubeVector))) * color.rgb * (AmbientScale + DiffuseScale * myhalf(max(float(dot(surfacenormal, diffusenormal)), 0.0)));\n"
+"	color.rgb = LightColor * myhalf(texture2D(Texture_Attenuation, vec2(length(CubeVector), 0.0))) * color.rgb * (AmbientScale + DiffuseScale * myhalf(max(float(dot(surfacenormal, diffusenormal)), 0.0)));\n"
 "#else\n"
 "	// calculate directionless shading\n"
 "	color.rgb = color.rgb * LightColor * myhalf(texture2D(Texture_Attenuation, length(CubeVector)));\n"