X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=r_explosion.c;h=74d63bfb9389a5b1a68b63c35de0e5de27c0f9a4;hp=bf336b6351a62528b81f6265630e907d6cc81c05;hb=d3cbe906d0eedcff735096a08340d8ca90457fa9;hpb=32d2ef1df7b629964fa7871f98460afbca3367c1

diff --git a/r_explosion.c b/r_explosion.c
index bf336b63..74d63bfb 100644
--- a/r_explosion.c
+++ b/r_explosion.c
@@ -25,24 +25,23 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define EXPLOSIONGRID 8
 #define EXPLOSIONVERTS ((EXPLOSIONGRID+1)*(EXPLOSIONGRID+1))
 #define EXPLOSIONTRIS (EXPLOSIONGRID*EXPLOSIONGRID*2)
-#define EXPLOSIONSTARTVELOCITY (256.0f)
-#define EXPLOSIONFADESTART (1.5f)
-#define EXPLOSIONFADERATE (3.0f)
 
 float explosiontexcoord2f[EXPLOSIONVERTS][2];
 int explosiontris[EXPLOSIONTRIS][3];
 int explosionnoiseindex[EXPLOSIONVERTS];
 vec3_t explosionpoint[EXPLOSIONVERTS];
-vec3_t explosionspherevertvel[EXPLOSIONVERTS];
 
 typedef struct explosion_s
 {
 	float starttime;
+	float endtime;
 	float time;
 	float alpha;
+	float fade;
 	vec3_t origin;
 	vec3_t vert[EXPLOSIONVERTS];
 	vec3_t vertvel[EXPLOSIONVERTS];
+	qboolean clipping;
 }
 explosion_t;
 
@@ -111,9 +110,6 @@ int R_ExplosionVert(int column, int row)
 	explosionpoint[i][0] = cos(yaw) *  cos(pitch);
 	explosionpoint[i][1] = sin(yaw) *  cos(pitch);
 	explosionpoint[i][2] =        1 * -sin(pitch);
-	explosionspherevertvel[i][0] = explosionpoint[i][0] * EXPLOSIONSTARTVELOCITY;
-	explosionspherevertvel[i][1] = explosionpoint[i][1] * EXPLOSIONSTARTVELOCITY;
-	explosionspherevertvel[i][2] = explosionpoint[i][2] * EXPLOSIONSTARTVELOCITY;
 	explosiontexcoord2f[i][0] = (float) column / (float) EXPLOSIONGRID;
 	explosiontexcoord2f[i][1] = (float) row / (float) EXPLOSIONGRID;
 	explosionnoiseindex[i] = (row % EXPLOSIONGRID) * EXPLOSIONGRID + (column % EXPLOSIONGRID);
@@ -148,24 +144,36 @@ void R_Explosion_Init(void)
 void R_NewExplosion(vec3_t org)
 {
 	int i, j;
-	float dist;
+	float dist, n;
+	explosion_t *e;
+	trace_t trace;
 	qbyte noise[EXPLOSIONGRID*EXPLOSIONGRID];
 	fractalnoisequick(noise, EXPLOSIONGRID, 4); // adjust noise grid size according to explosion
-	for (i = 0;i < MAX_EXPLOSIONS;i++)
+	for (i = 0, e = explosion;i < MAX_EXPLOSIONS;i++, e++)
 	{
-		if (explosion[i].alpha <= 0.01f)
+		if (e->alpha <= cl_explosions_alpha_end.value)
 		{
-			explosion[i].starttime = cl.time;
-			explosion[i].time = explosion[i].starttime - 0.1;
-			explosion[i].alpha = EXPLOSIONFADESTART;
-			VectorCopy(org, explosion[i].origin);
+			e->starttime = cl.time;
+			e->endtime = cl.time + cl_explosions_lifetime.value;
+			e->time = e->starttime;
+			e->alpha = cl_explosions_alpha_start.value;
+			e->fade = (cl_explosions_alpha_start.value - cl_explosions_alpha_end.value) / cl_explosions_lifetime.value;
+			e->clipping = r_explosionclip.integer != 0;
+			VectorCopy(org, e->origin);
 			for (j = 0;j < EXPLOSIONVERTS;j++)
 			{
-				// calculate start
-				VectorCopy(explosion[i].origin, explosion[i].vert[j]);
-				// calculate velocity
-				dist = noise[explosionnoiseindex[j]] * (1.0f / 255.0f) + 0.5;
-				VectorScale(explosionspherevertvel[j], dist, explosion[i].vertvel[j]);
+				// calculate start origin and velocity
+				n = noise[explosionnoiseindex[j]] * (1.0f / 255.0f) + 0.5;
+				dist = n * cl_explosions_size_start.value;
+				VectorMA(e->origin, dist, explosionpoint[j], e->vert[j]);
+				dist = n * (cl_explosions_size_end.value - cl_explosions_size_start.value) / cl_explosions_lifetime.value;
+				VectorScale(explosionpoint[j], dist, e->vertvel[j]);
+				// clip start origin
+				if (e->clipping)
+				{
+					trace = CL_TraceBox(e->origin, vec3_origin, vec3_origin, e->vert[j], true, NULL, SUPERCONTENTS_SOLID, false);
+					VectorCopy(trace.endpos, e->vert[i]);
+				}
 			}
 			break;
 		}
@@ -198,40 +206,34 @@ void R_DrawExplosionCallback(const void *calldata1, int calldata2)
 	GL_Color(alpha, alpha, alpha, 1);
 
 	GL_LockArrays(0, numverts);
-	R_Mesh_Draw(numverts, numtriangles, explosiontris[0]);
+	R_Mesh_Draw(0, numverts, numtriangles, explosiontris[0]);
 	GL_LockArrays(0, 0);
 }
 
 void R_MoveExplosion(explosion_t *e)
 {
 	int i;
-	float dot, frictionscale, end[3], impact[3], normal[3], frametime;
+	float dot, end[3], frametime;
+	trace_t trace;
 
 	frametime = cl.time - e->time;
 	e->time = cl.time;
-	e->alpha = EXPLOSIONFADESTART - (cl.time - e->starttime) * EXPLOSIONFADERATE;
-	if (e->alpha <= 0.01f)
-	{
-		e->alpha = -1;
-		return;
-	}
-	frictionscale = 1 - frametime;
-	frictionscale = bound(0, frictionscale, 1);
+	e->alpha = e->alpha - (e->fade * frametime);
 	for (i = 0;i < EXPLOSIONVERTS;i++)
 	{
 		if (e->vertvel[i][0] || e->vertvel[i][1] || e->vertvel[i][2])
 		{
-			VectorScale(e->vertvel[i], frictionscale, e->vertvel[i]);
 			VectorMA(e->vert[i], frametime, e->vertvel[i], end);
-			if (r_explosionclip.integer)
+			if (e->clipping)
 			{
-				if (CL_TraceLine(e->vert[i], end, impact, normal, true, NULL, SUPERCONTENTS_SOLID) < 1)
+				trace = CL_TraceBox(e->vert[i], vec3_origin, vec3_origin, end, true, NULL, SUPERCONTENTS_SOLID, false);
+				if (trace.fraction < 1)
 				{
 					// clip velocity against the wall
-					dot = DotProduct(e->vertvel[i], normal) * -1.125f;
-					VectorMA(e->vertvel[i], dot, normal, e->vertvel[i]);
+					dot = -DotProduct(e->vertvel[i], trace.plane.normal);
+					VectorMA(e->vertvel[i], dot, trace.plane.normal, e->vertvel[i]);
 				}
-				VectorCopy(impact, e->vert[i]);
+				VectorCopy(trace.endpos, e->vert[i]);
 			}
 			else
 				VectorCopy(end, e->vert[i]);
@@ -248,7 +250,7 @@ void R_MoveExplosions(void)
 	frametime = cl.time - cl.oldtime;
 
 	for (i = 0;i < MAX_EXPLOSIONS;i++)
-		if (explosion[i].alpha > 0.01f)
+		if (cl.time < explosion[i].endtime)
 			R_MoveExplosion(&explosion[i]);
 }
 
@@ -259,7 +261,7 @@ void R_DrawExplosions(void)
 	if (!r_drawexplosions.integer)
 		return;
 	for (i = 0;i < MAX_EXPLOSIONS;i++)
-		if (explosion[i].alpha > 0.01f)
+		if (r_refdef.time < explosion[i].endtime)
 			R_MeshQueue_AddTransparent(explosion[i].origin, R_DrawExplosionCallback, &explosion[i], 0);
 }