X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=r_explosion.c;h=48ce2ef3ec4e3566f524cd74b7085d4633aaff0d;hb=1a90aa350d2f535d6918bf71d941c471a63ddb6f;hp=4dd9f853ed6832c4750842db2998364d80851fb5;hpb=7842db054947d1818134fc9eefebd37516ab683a;p=xonotic%2Fdarkplaces.git

diff --git a/r_explosion.c b/r_explosion.c
index 4dd9f853..48ce2ef3 100644
--- a/r_explosion.c
+++ b/r_explosion.c
@@ -151,7 +151,7 @@ void R_NewExplosion(const vec3_t org)
 	fractalnoisequick(noise, EXPLOSIONGRID, 4); // adjust noise grid size according to explosion
 	for (i = 0, e = explosion;i < MAX_EXPLOSIONS;i++, e++)
 	{
-		if (cl.time >= e->endtime)
+		if (!e->alpha)
 		{
 			e->starttime = cl.time;
 			e->endtime = cl.time + cl_explosions_lifetime.value;
@@ -171,7 +171,7 @@ void R_NewExplosion(const vec3_t org)
 				// clip start origin
 				if (e->clipping)
 				{
-					trace = CL_TraceBox(e->origin, vec3_origin, vec3_origin, e->vert[j], true, NULL, SUPERCONTENTS_SOLID, false);
+					trace = CL_Move(e->origin, vec3_origin, vec3_origin, e->vert[j], MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID, true, false, NULL, false);
 					VectorCopy(trace.endpos, e->vert[i]);
 				}
 			}
@@ -180,34 +180,34 @@ void R_NewExplosion(const vec3_t org)
 	}
 }
 
-static void R_DrawExplosion_TransparentCallback(const entity_render_t *ent, int surfacenumber, const rtlight_t *rtlight)
+static void R_DrawExplosion_TransparentCallback(const entity_render_t *ent, const rtlight_t *rtlight, int numsurfaces, int *surfacelist)
 {
-	const explosion_t *e = explosion + surfacenumber;
-	int numtriangles, numverts;
-	float alpha;
+	int surfacelistindex = 0;
+	const int numtriangles = EXPLOSIONTRIS, numverts = EXPLOSIONVERTS;
 	rmeshstate_t m;
-
 	GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
 	GL_DepthMask(false);
+	GL_DepthRange(0, 1);
+	GL_PolygonOffset(r_refdef.polygonfactor, r_refdef.polygonoffset);
 	GL_DepthTest(true);
+	GL_CullFace(GL_FRONT); // quake is backwards, this culls back faces
 	R_Mesh_Matrix(&identitymatrix);
 
-	numtriangles = EXPLOSIONTRIS;
-	numverts = EXPLOSIONVERTS;
-	alpha = e->alpha;
-
-	R_Mesh_VertexPointer(e->vert[0]);
-	R_Mesh_ColorPointer(NULL);
+	R_Mesh_ColorPointer(NULL, 0, 0);
 	memset(&m, 0, sizeof(m));
 	m.tex[0] = R_GetTexture(explosiontexture);
 	m.pointer_texcoord[0] = explosiontexcoord2f[0];
 	R_Mesh_TextureState(&m);
-
-	GL_Color(alpha, alpha, alpha, 1);
-
-	GL_LockArrays(0, numverts);
-	R_Mesh_Draw(0, numverts, numtriangles, explosiontris[0]);
-	GL_LockArrays(0, 0);
+	for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++)
+	{
+		const explosion_t *e = explosion + surfacelist[surfacelistindex];
+		R_Mesh_VertexPointer(e->vert[0], 0, 0);
+		// FIXME: fixed function path can't properly handle r_view.colorscale > 1
+		GL_Color(e->alpha * r_view.colorscale, e->alpha * r_view.colorscale, e->alpha * r_view.colorscale, 1);
+		GL_LockArrays(0, numverts);
+		R_Mesh_Draw(0, numverts, numtriangles, explosiontris[0], 0, 0);
+		GL_LockArrays(0, 0);
+	}
 }
 
 static void R_MoveExplosion(explosion_t *e)
@@ -219,6 +219,11 @@ static void R_MoveExplosion(explosion_t *e)
 	frametime = cl.time - e->time;
 	e->time = cl.time;
 	e->alpha = e->alpha - (e->fade * frametime);
+	if (e->alpha < 0 || cl.time > e->endtime)
+	{
+		e->alpha = 0;
+		return;
+	}
 	for (i = 0;i < EXPLOSIONVERTS;i++)
 	{
 		if (e->vertvel[i][0] || e->vertvel[i][1] || e->vertvel[i][2])
@@ -226,7 +231,7 @@ static void R_MoveExplosion(explosion_t *e)
 			VectorMA(e->vert[i], frametime, e->vertvel[i], end);
 			if (e->clipping)
 			{
-				trace = CL_TraceBox(e->vert[i], vec3_origin, vec3_origin, end, true, NULL, SUPERCONTENTS_SOLID, false);
+				trace = CL_Move(e->vert[i], vec3_origin, vec3_origin, end, MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID, true, false, NULL, false);
 				if (trace.fraction < 1)
 				{
 					// clip velocity against the wall
@@ -246,7 +251,7 @@ void R_MoveExplosions(void)
 {
 	int i;
 	for (i = 0;i < MAX_EXPLOSIONS;i++)
-		if (cl.time < explosion[i].endtime)
+		if (explosion[i].alpha)
 			R_MoveExplosion(&explosion[i]);
 }
 
@@ -257,7 +262,7 @@ void R_DrawExplosions(void)
 	if (!r_drawexplosions.integer)
 		return;
 	for (i = 0;i < MAX_EXPLOSIONS;i++)
-		if (r_refdef.time < explosion[i].endtime)
+		if (explosion[i].alpha)
 			R_MeshQueue_AddTransparent(explosion[i].origin, R_DrawExplosion_TransparentCallback, NULL, i, NULL);
 }