From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sat, 10 Mar 2012 12:39:29 +0000 (+0000)
Subject: allow MATERIALFLAG_CAMERA to fade out
X-Git-Tag: xonotic-v0.7.0~204
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=38d3ea0e05d69c99a1e3d560ba877d1a907f1718;p=xonotic%2Fdarkplaces.git

allow MATERIALFLAG_CAMERA to fade out

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11752 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=a88e0e48a46d64181a5891114d0ebb19e1424a9f
---

diff --git a/dpsoftrast.h b/dpsoftrast.h
index 69228ef8..eb3df2ba 100644
--- a/dpsoftrast.h
+++ b/dpsoftrast.h
@@ -188,7 +188,7 @@ typedef enum shaderpermutation_e
 	SHADERPERMUTATION_SHADOWMAPVSDCT = 1<<19, ///< (lightsource) use virtual shadow depth cube texture for shadowmap indexing
 	SHADERPERMUTATION_SHADOWMAPORTHO = 1<<20, ///< (lightsource) use orthographic shadowmap projection
 	SHADERPERMUTATION_DEFERREDLIGHTMAP = 1<<21, ///< (lightmap) read Texture_ScreenDiffuse/Specular textures and add them on top of lightmapping
-	SHADERPERMUTATION_ALPHAKILL = 1<<22, ///< (deferredgeometry) discard pixel if diffuse texture alpha below 0.5
+	SHADERPERMUTATION_ALPHAKILL = 1<<22, ///< (deferredgeometry) discard pixel if diffuse texture alpha below 0.5, (generic) apply global alpha
 	SHADERPERMUTATION_REFLECTCUBE = 1<<23, ///< fake reflections using global cubemap (not HDRI light probe)
 	SHADERPERMUTATION_NORMALMAPSCROLLBLEND = 1<<24, ///< (water) counter-direction normalmaps scrolling
 	SHADERPERMUTATION_BOUNCEGRID = 1<<25, ///< (lightmap) use Texture_BounceGrid as an additional source of ambient light
diff --git a/gl_rmain.c b/gl_rmain.c
index 40fb7a0e..184aa423 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -2172,9 +2172,9 @@ void R_SetupShader_Surface(const vec3_t lightcolorbase, qboolean modellighting,
 		else
 		{
 			mode = SHADERMODE_GENERIC;
-			permutation |= SHADERPERMUTATION_DIFFUSE;
-			GL_BlendFunc(GL_ONE, GL_ZERO);
-			blendfuncflags = R_BlendFuncFlags(GL_ONE, GL_ZERO);
+			permutation |= SHADERPERMUTATION_DIFFUSE | SHADERPERMUTATION_ALPHAKILL;
+			GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+			blendfuncflags = R_BlendFuncFlags(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 		}
 		if (vid.allowalphatocoverage)
 			GL_AlphaToCoverage(false);
diff --git a/shader_glsl.h b/shader_glsl.h
index c7b5ebff..41dac64e 100644
--- a/shader_glsl.h
+++ b/shader_glsl.h
@@ -310,6 +310,7 @@
 "#ifdef USESPECULAR\n"
 "dp_varying mediump vec2 TexCoord2;\n"
 "#endif\n"
+"uniform myhalf Alpha;\n"
 "#ifdef VERTEX_SHADER\n"
 "void main(void)\n"
 "{\n"
@@ -371,6 +372,9 @@
 "	dp_FragColor.g = dp_texture2D(Texture_GammaRamps, vec2(dp_FragColor.g, 0)).g;\n"
 "	dp_FragColor.b = dp_texture2D(Texture_GammaRamps, vec2(dp_FragColor.b, 0)).b;\n"
 "#endif\n"
+"#ifdef USEALPHAKILL\n"
+"	dp_FragColor.a *= Alpha;\n"
+"#endif\n"
 "}\n"
 "#endif\n"
 "#else // !MODE_GENERIC\n"
diff --git a/shader_hlsl.h b/shader_hlsl.h
index 8e9ee064..20770d18 100644
--- a/shader_hlsl.h
+++ b/shader_hlsl.h
@@ -298,6 +298,7 @@
 "#ifdef USEGAMMARAMPS\n"
 "uniform sampler Texture_GammaRamps : register(s2),\n"
 "#endif\n"
+"uniform half Alpha : register(c0),\n"
 "out float4 dp_FragColor : COLOR\n"
 ")\n"
 "{\n"
@@ -332,6 +333,9 @@
 "	dp_FragColor.g = tex2D(Texture_GammaRamps, vec2(dp_FragColor.g, 0)).g;\n"
 "	dp_FragColor.b = tex2D(Texture_GammaRamps, vec2(dp_FragColor.b, 0)).b;\n"
 "#endif\n"
+"#ifdef USEALPHAKILL\n"
+"	dp_FragColor.a *= Alpha;\n"
+"#endif\n"
 "}\n"
 "#endif\n"
 "#else // !MODE_GENERIC\n"