From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 11 Nov 2003 04:56:32 +0000 (+0000)
Subject: q3bsp transparency support (note: makes maps that abuse alpha in shaders for special... 
X-Git-Tag: xonotic-v0.1.0preview~6274
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d9874cf23c807b710b3466fa25de097cc12df790;p=xonotic%2Fdarkplaces.git

q3bsp transparency support (note: makes maps that abuse alpha in shaders for special effects look quite weird)


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

diff --git a/gl_rsurf.c b/gl_rsurf.c
index 16b77efb..fdab82c1 100644
--- a/gl_rsurf.c
+++ b/gl_rsurf.c
@@ -1917,8 +1917,23 @@ void R_Q3BSP_DrawFace_OpaqueWall_Pass_TextureVertex(entity_render_t *ent, q3mfac
 	GL_DepthTest(true);
 	m.tex[0] = R_GetTexture(face->texture->skin.base);
 	m.pointer_texcoord[0] = face->data_texcoordtexture2f;
-	m.texrgbscale[0] = 2;
-	GL_ColorPointer(face->data_color4f);
+	if (gl_combine.integer)
+	{
+		m.texrgbscale[0] = 2;
+		GL_ColorPointer(face->data_color4f);
+	}
+	else
+	{
+		int i;
+		for (i = 0;i < face->num_vertices;i++)
+		{
+			varray_color4f[i*4+0] = face->data_color4f[i*4+0] * 2.0f;
+			varray_color4f[i*4+1] = face->data_color4f[i*4+1] * 2.0f;
+			varray_color4f[i*4+2] = face->data_color4f[i*4+2] * 2.0f;
+			varray_color4f[i*4+3] = face->data_color4f[i*4+3];
+		}
+		GL_ColorPointer(varray_color4f);
+	}
 	R_Mesh_State_Texture(&m);
 	GL_VertexPointer(face->data_vertex3f);
 	R_Mesh_Draw(face->num_vertices, face->num_triangles, face->data_element3i);
@@ -1939,6 +1954,68 @@ void R_Q3BSP_DrawFace_OpaqueWall_Pass_AddTextureAmbient(entity_render_t *ent, q3
 	R_Mesh_Draw(face->num_vertices, face->num_triangles, face->data_element3i);
 }
 
+void R_Q3BSP_DrawFace_TransparentCallback(const void *voident, int facenumber)
+{
+	const entity_render_t *ent = voident;
+	q3mface_t *face = ent->model->brushq3.data_faces + facenumber;
+	rmeshstate_t m;
+	R_Mesh_Matrix(&ent->matrix);
+	memset(&m, 0, sizeof(m));
+	if (ent->effects & EF_ADDITIVE)
+		GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
+	else
+		GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	GL_DepthMask(false);
+	GL_DepthTest(true);
+	m.tex[0] = R_GetTexture(face->texture->skin.base);
+	m.pointer_texcoord[0] = face->data_texcoordtexture2f;
+	// LordHavoc: quake3 was not able to do this; lit transparent surfaces
+	if (gl_combine.integer)
+	{
+		m.texrgbscale[0] = 2;
+		if (r_textureunits.integer >= 2)
+		{
+			m.tex[1] = R_GetTexture(face->lightmaptexture);
+			m.pointer_texcoord[1] = face->data_texcoordlightmap2f;
+			GL_Color(1, 1, 1, ent->alpha);
+		}
+		else
+		{
+			if (ent->alpha == 1)
+				GL_ColorPointer(face->data_color4f);
+			else
+			{
+				int i;
+				for (i = 0;i < face->num_vertices;i++)
+				{
+					varray_color4f[i*4+0] = face->data_color4f[i*4+0];
+					varray_color4f[i*4+1] = face->data_color4f[i*4+1];
+					varray_color4f[i*4+2] = face->data_color4f[i*4+2];
+					varray_color4f[i*4+3] = face->data_color4f[i*4+3] * ent->alpha;
+				}
+				GL_ColorPointer(varray_color4f);
+			}
+		}
+	}
+	else
+	{
+		int i;
+		for (i = 0;i < face->num_vertices;i++)
+		{
+			varray_color4f[i*4+0] = face->data_color4f[i*4+0] * 2.0f;
+			varray_color4f[i*4+1] = face->data_color4f[i*4+1] * 2.0f;
+			varray_color4f[i*4+2] = face->data_color4f[i*4+2] * 2.0f;
+			varray_color4f[i*4+3] = face->data_color4f[i*4+3] * ent->alpha;
+		}
+		GL_ColorPointer(varray_color4f);
+	}
+	R_Mesh_State_Texture(&m);
+	GL_VertexPointer(face->data_vertex3f);
+	qglDisable(GL_CULL_FACE);
+	R_Mesh_Draw(face->num_vertices, face->num_triangles, face->data_element3i);
+	qglEnable(GL_CULL_FACE);
+}
+
 void R_Q3BSP_DrawFace(entity_render_t *ent, q3mface_t *face)
 {
 	if (!face->num_triangles)
@@ -1950,10 +2027,18 @@ void R_Q3BSP_DrawFace(entity_render_t *ent, q3mface_t *face)
 		if (face->texture->renderflags & Q3MTEXTURERENDERFLAGS_NODRAW)
 			return;
 	}
-	if (face->texture->nativecontents & CONTENTSQ3_TRANSLUCENT)
-		qglDisable(GL_CULL_FACE);
-	R_Mesh_Matrix(&ent->matrix);
 	face->visframe = r_framecount;
+	if ((face->texture->renderflags & Q3MTEXTURERENDERFLAGS_TRANSPARENT) || ent->alpha < 1 || (ent->effects & EF_ADDITIVE))
+	{
+		vec3_t facecenter, center;
+		facecenter[0] = (face->mins[0] + face->maxs[0]) * 0.5f;
+		facecenter[1] = (face->mins[1] + face->maxs[1]) * 0.5f;
+		facecenter[2] = (face->mins[2] + face->maxs[2]) * 0.5f;
+		Matrix4x4_Transform(&ent->matrix, facecenter, center);
+		R_MeshQueue_AddTransparent(center, R_Q3BSP_DrawFace_TransparentCallback, ent, face - ent->model->brushq3.data_faces);
+		return;
+	}
+	R_Mesh_Matrix(&ent->matrix);
 	if (r_shadow_realtime_world.integer)
 		R_Q3BSP_DrawFace_OpaqueWall_Pass_OpaqueGlow(ent, face);
 	else if ((ent->effects & EF_FULLBRIGHT) || r_fullbright.integer)
@@ -1982,8 +2067,6 @@ void R_Q3BSP_DrawFace(entity_render_t *ent, q3mface_t *face)
 	}
 	if (r_ambient.value)
 		R_Q3BSP_DrawFace_OpaqueWall_Pass_AddTextureAmbient(ent, face);
-	if (face->texture->nativecontents & CONTENTSQ3_TRANSLUCENT)
-		qglEnable(GL_CULL_FACE);
 }
 
 void R_Q3BSP_RecursiveWorldNode(entity_render_t *ent, q3mnode_t *node, const vec3_t modelorg, qbyte *pvs, int markframe)
diff --git a/model_brush.c b/model_brush.c
index f2f9e833..4b473feb 100644
--- a/model_brush.c
+++ b/model_brush.c
@@ -3321,18 +3321,19 @@ static void Mod_Q3BSP_LoadTextures(lump_t *l)
 
 	for (i = 0;i < count;i++, in++, out++)
 	{
+		out->number = i;
 		strlcpy (out->name, in->name, sizeof (out->name));
 		out->surfaceflags = LittleLong(in->surfaceflags);
 		out->nativecontents = LittleLong(in->contents);
 		out->supercontents = Mod_Q3BSP_SuperContentsFromNativeContents(loadmodel, out->nativecontents);
+		Mod_LoadSkinFrame(&out->skin, out->name, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE, false, true, true);
 		out->renderflags = 0;
 		if (!strcmp(out->name, "caulk") || !strcmp(out->name, "common/caulk") || !strcmp(out->name, "textures/common/caulk"))
 			out->renderflags |= Q3MTEXTURERENDERFLAGS_NODRAW;
 		if (!strncmp(out->name, "textures/skies/", 15))
 			out->renderflags |= Q3MTEXTURERENDERFLAGS_SKY;
-
-		out->number = i;
-		Mod_LoadSkinFrame(&out->skin, out->name, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE, false, true, true);
+		if (R_TextureHasAlpha(out->skin.base))
+			out->renderflags |= Q3MTEXTURERENDERFLAGS_TRANSPARENT;
 	}
 }
 
diff --git a/model_shared.h b/model_shared.h
index ddeb1fff..9d85080e 100644
--- a/model_shared.h
+++ b/model_shared.h
@@ -281,6 +281,7 @@ model_brushq2_t;
 
 #define Q3MTEXTURERENDERFLAGS_NODRAW 1
 #define Q3MTEXTURERENDERFLAGS_SKY 2
+#define Q3MTEXTURERENDERFLAGS_TRANSPARENT 4
 
 typedef struct q3mtexture_s
 {