X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=shader_glsl.h;h=33cbb95e9587f651ded24ad4f8c0146532198c43;hb=834224ba3a9182fc05f0b9c7f8c73b38dd5491cd;hp=b09cb80f177783dfdbdc5c6eed4687a762c5e6cb;hpb=f48057e92592646ad3a444aece218b57696491b0;p=xonotic%2Fdarkplaces.git

diff --git a/shader_glsl.h b/shader_glsl.h
index b09cb80f..33cbb95e 100644
--- a/shader_glsl.h
+++ b/shader_glsl.h
@@ -16,10 +16,11 @@
 "# define dp_offsetmapping_dFdx dFdx\n"
 "# define dp_offsetmapping_dFdy dFdy\n"
 "# define dp_textureGrad textureGrad\n"
+"# define dp_textureOffset(a,b,c,d) textureOffset(a,b,ivec2(c,d))\n"
 "# define dp_texture2D texture\n"
 "# define dp_texture3D texture\n"
 "# define dp_textureCube texture\n"
-"# define dp_shadow2D(a,b) texture(a,b)\n"
+"# define dp_shadow2D(a,b) float(texture(a,b))\n"
 "#else\n"
 "# ifdef FRAGMENT_SHADER\n"
 "#  define dp_FragColor gl_FragColor\n"
@@ -29,6 +30,7 @@
 "# define dp_offsetmapping_dFdx(a) vec2(0.0, 0.0)\n"
 "# define dp_offsetmapping_dFdy(a) vec2(0.0, 0.0)\n"
 "# define dp_textureGrad(a,b,c,d) texture2D(a,b)\n"
+"# define dp_textureOffset(a,b,c,d) texture2DOffset(a,b,ivec2(c,d))\n"
 "# define dp_texture2D texture2D\n"
 "# define dp_texture3D texture3D\n"
 "# define dp_textureCube textureCube\n"
@@ -332,7 +334,12 @@
 "	dp_FragColor = vec4(1.0, 1.0, 1.0, 1.0);\n"
 "#endif\n"
 "#ifdef USEDIFFUSE\n"
+"# ifdef USEREFLECTCUBE\n"
+"	// suppress texture alpha\n"
+"	dp_FragColor.rgb *= dp_texture2D(Texture_First, TexCoord1).rgb;\n"
+"# else\n"
 "	dp_FragColor *= dp_texture2D(Texture_First, TexCoord1);\n"
+"# endif\n"
 "#endif\n"
 "\n"
 "#ifdef USESPECULAR\n"
@@ -746,20 +753,19 @@
 "vec3 GetShadowMapTC2D(vec3 dir)\n"
 "{\n"
 "	vec3 adir = abs(dir);\n"
-"	vec2 aparams = ShadowMap_Parameters.xy / max(max(adir.x, adir.y), adir.z);\n"
+"	vec2 mparams = ShadowMap_Parameters.xy / max(max(adir.x, adir.y), adir.z);\n"
 "	vec4 proj = dp_textureCube(Texture_CubeProjection, dir);\n"
-"	return vec3(mix(dir.xy, dir.zz, proj.xy) * aparams.x + proj.zw * ShadowMap_Parameters.z, aparams.y + ShadowMap_Parameters.w);\n"
+"	return vec3(mix(dir.xy, dir.zz, proj.xy) * mparams.x + proj.zw * ShadowMap_Parameters.z, mparams.y + ShadowMap_Parameters.w);\n"
 "}\n"
 "#  else\n"
 "vec3 GetShadowMapTC2D(vec3 dir)\n"
 "{\n"
 "	vec3 adir = abs(dir);\n"
-"	float ma = adir.z;\n"
-"	vec4 proj = vec4(dir, 2.5);\n"
-"	if (adir.x > ma) { ma = adir.x; proj = vec4(dir.zyx, 0.5); }\n"
-"	if (adir.y > ma) { ma = adir.y; proj = vec4(dir.xzy, 1.5); }\n"
-"	vec2 aparams = ShadowMap_Parameters.xy / ma;\n"
-"	return vec3(proj.xy * aparams.x + vec2(proj.z < 0.0 ? 1.5 : 0.5, proj.w) * ShadowMap_Parameters.z, aparams.y + ShadowMap_Parameters.w);\n"
+"	float m; vec4 proj;\n"
+"	if (adir.x > adir.y) { m = adir.x; proj = vec4(dir.zyx, 0.5); } else { m = adir.y; proj = vec4(dir.xzy, 1.5); }\n"
+"	if (adir.z > m) { m = adir.z; proj = vec4(dir, 2.5); }\n"
+"	vec2 mparams = ShadowMap_Parameters.xy / m;\n"
+"	return vec3(proj.xy * mparams.x + vec2(proj.z < 0.0 ? 1.5 : 0.5, proj.w) * ShadowMap_Parameters.z, mparams.y + ShadowMap_Parameters.w);\n"
 "}\n"
 "#  endif\n"
 "# endif\n"
@@ -819,7 +825,7 @@
 "#      endif\n"
 "#     else\n"
 "#      ifdef GL_EXT_gpu_shader4\n"
-"#        define texval(x, y) texture2DOffset(Texture_ShadowMap2D, center, ivec2(x, y)).r\n"
+"#        define texval(x, y) dp_textureOffset(Texture_ShadowMap2D, center, x, y).r\n"
 "#      else\n"
 "#        define texval(x, y) dp_texture2D(Texture_ShadowMap2D, center + vec2(x, y)*ShadowMap_TextureScale).r  \n"
 "#      endif\n"