Fix line endings on taskqueue.[ch]

[xonotic/darkplaces.git] / shader_glsl.h

diff --git a/shader_glsl.h b/shader_glsl.h
index 90d5d770db2fe73fc52326f6e4dcb1479dc51a28..d51cd6726551a003daeeafffb89e271ed67fd03f 100644 (file)
--- a/shader_glsl.h
+++ b/shader_glsl.h
@@ -1,5 +1,5 @@
 "// ambient+diffuse+specular+normalmap+attenuation+cubemap+fog shader\n",
-"// written by Forest 'LordHavoc' Hale\n",
+"// written by Ashley Rose Hale (LadyHavoc)\n",
 "// shadowmapping enhancements by Lee 'eihrul' Salzman\n",
 "\n",
 "#if defined(USESKELETAL) || defined(USEOCCLUDE)\n",
@@ -37,6 +37,9 @@
 "# endif\n",
 "#endif\n",
 "\n",
+"#if (defined(GLSL120) || defined(GLSL130) || defined(GLSL140) || defined(GLES)) && defined(VERTEX_SHADER)\n"
+"invariant gl_Position; // fix for lighting polygons not matching base surface\n",
+"# endif\n",
 "#if defined(GLSL130) || defined(GLSL140)\n",
 "precision highp float;\n",
 "# ifdef VERTEX_SHADER\n",
@@ -116,7 +119,7 @@
 "#if defined(MODE_LIGHTMAP) || defined(MODE_LIGHTDIRECTIONMAP_MODELSPACE) || defined(MODE_LIGHTDIRECTIONMAP_TANGENTSPACE) || defined(MODE_LIGHTDIRECTIONMAP_FORCED_LIGHTMAP)\n",
 "# define USELIGHTMAP\n",
 "#endif\n",
-"#if defined(USESPECULAR) || defined(USEOFFSETMAPPING) || defined(USEREFLECTCUBE) || defined(MODE_FAKELIGHT) || defined(USEFOG)\n",
+"#if defined(USESPECULAR) || defined(USEOFFSETMAPPING) || defined(USEREFLECTCUBE) || defined(USEFOG)\n",
 "# define USEEYEVECTOR\n",
 "#endif\n",
 "\n",
@@ -146,7 +149,7 @@
 "\n",
 "#ifdef VERTEX_SHADER\n",
 "#ifdef USETRIPPY\n",
-"// LordHavoc: based on shader code linked at: http://www.youtube.com/watch?v=JpksyojwqzE\n",
+"// LadyHavoc: based on shader code linked at: http://www.youtube.com/watch?v=JpksyojwqzE\n",
 "// tweaked scale\n",
 "uniform highp float ClientTime;\n",
 "vec4 TrippyVertex(vec4 position)\n",
@@ -1418,12 +1421,6 @@
 "uniform sampler2D Texture_ReflectMask;\n",
 "uniform samplerCube Texture_ReflectCube;\n",
 "#endif\n",
-"#ifdef MODE_LIGHTDIRECTION\n",
-"uniform myhalf3 LightColor;\n",
-"#endif\n",
-"#ifdef MODE_LIGHTSOURCE\n",
-"uniform myhalf3 LightColor;\n",
-"#endif\n",
 "#ifdef USEBOUNCEGRID\n",
 "uniform sampler3D Texture_BounceGrid;\n",
 "uniform float BounceGridIntensity;\n",
@@ -1525,7 +1522,6 @@
 "#else\n",
 "      color.rgb = diffusetex * Color_Ambient;\n",
 "#endif\n",
-"      color.rgb *= LightColor;\n",
 "      color.rgb *= cast_myhalf(dp_texture2D(Texture_Attenuation, vec2(length(CubeVector), 0.0)));\n",
 "#if defined(USESHADOWMAP2D)\n",
 "      color.rgb *= ShadowMapCompare(CubeVector);\n",
@@ -1543,7 +1539,7 @@
 "      #ifdef USEDIFFUSE\n",
 "              myhalf3 lightnormal = cast_myhalf3(normalize(LightVector));\n",
 "      #endif\n",
-"      #define lightcolor LightColor\n",
+"      #define lightcolor 1\n",
 "#endif // MODE_LIGHTDIRECTION\n",
 "#ifdef MODE_LIGHTDIRECTIONMAP_MODELSPACE\n",
 "   #define SHADING\n",
@@ -1583,11 +1579,6 @@
 "              myhalf3 lightcolor = cast_myhalf3(VertexColor.rgb);\n",
 "   #endif\n",
 "#endif\n",
-"#ifdef MODE_FAKELIGHT\n",
-"      #define SHADING\n",
-"      myhalf3 lightnormal = cast_myhalf3(normalize(EyeVectorFogDepth.xyz));\n",
-"      myhalf3 lightcolor = cast_myhalf3(1.0);\n",
-"#endif // MODE_FAKELIGHT\n",
 "\n",
 "\n",
 "\n",