X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=r_explosion.c;h=3c40edbf8ed2b16035d94677af82caaf6c71c678;hp=74e7dd425febc869285dc302fab95b2a3c8b271d;hb=cf6a3c352f94742ae2a5410299504e4a036e4761;hpb=e411cc7d14dad08cbbe27f5b3af86700f7eb5184

diff --git a/r_explosion.c b/r_explosion.c
index 74e7dd42..3c40edbf 100644
--- a/r_explosion.c
+++ b/r_explosion.c
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -19,99 +19,118 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "quakedef.h"
+#include "cl_collision.h"
 
-float TraceLine (vec3_t start, vec3_t end, vec3_t impact, vec3_t normal);
-
-#define MAX_EXPLOSIONS 64
-#define EXPLOSIONGRID 16
+#ifdef MAX_EXPLOSIONS
+#define EXPLOSIONGRID 8
 #define EXPLOSIONVERTS ((EXPLOSIONGRID+1)*(EXPLOSIONGRID+1))
-#define EXPLOSIONTRIS (EXPLOSIONVERTS*2)
-#define EXPLOSIONSTARTRADIUS (0.0f)
-#define EXPLOSIONSTARTVELOCITY (500.0f)
-#define EXPLOSIONFADESTART (1.5f)
-#define EXPLOSIONFADERATE (6.0f)
+#define EXPLOSIONTRIS (EXPLOSIONGRID*EXPLOSIONGRID*2)
+
+static int numexplosions = 0;
 
-vec3_t explosionspherevert[EXPLOSIONVERTS];
-vec3_t explosionspherevertvel[EXPLOSIONVERTS];
-float explosiontexcoords[EXPLOSIONVERTS][2];
-int explosiontris[EXPLOSIONTRIS][3];
-int explosionnoiseindex[EXPLOSIONVERTS];
-vec3_t explosionpoint[EXPLOSIONVERTS];
+static float explosiontexcoord2f[EXPLOSIONVERTS][2];
+static unsigned short explosiontris[EXPLOSIONTRIS][3];
+static int explosionnoiseindex[EXPLOSIONVERTS];
+static vec3_t explosionpoint[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;
 
-explosion_t explosion[128];
+static explosion_t explosion[MAX_EXPLOSIONS];
 
-rtexture_t	*explosiontexture;
-rtexture_t	*explosiontexturefog;
+static rtexture_t	*explosiontexture;
+//static rtexture_t	*explosiontexturefog;
 
-cvar_t r_explosionclip = {"r_explosionclip", "0", true};
-cvar_t r_drawexplosions = {"r_drawexplosions", "1"};
+static rtexturepool_t	*explosiontexturepool;
+#endif
 
-int R_ExplosionVert(int column, int row)
-{
-	int i;
-	float a, b, c;
-	i = row * (EXPLOSIONGRID + 1) + column;
-	a = row * M_PI * 2 / EXPLOSIONGRID;
-	b = column * M_PI * 2 / EXPLOSIONGRID;
-	c = cos(b);
-	explosionpoint[i][0] = cos(a) * c;
-	explosionpoint[i][1] = sin(a) * c;
-	explosionpoint[i][2] = -sin(b);
-	explosionnoiseindex[i] = (row & (EXPLOSIONGRID - 1)) * EXPLOSIONGRID + (column & (EXPLOSIONGRID - 1));
-	explosiontexcoords[i][0] = (float) column / (float) EXPLOSIONGRID;
-	explosiontexcoords[i][1] = (float) row / (float) EXPLOSIONGRID;
-	return i;
-}
+cvar_t r_explosionclip = {CVAR_SAVE, "r_explosionclip", "1", "enables collision detection for explosion shell (so that it flattens against walls and floors)"};
+#ifdef MAX_EXPLOSIONS
+static cvar_t r_drawexplosions = {0, "r_drawexplosions", "1", "enables rendering of explosion shells (see also cl_particles_explosions_shell)"};
 
-void r_explosion_start(void)
+//extern qboolean r_loadfog;
+static void r_explosion_start(void)
 {
 	int x, y;
-	byte noise1[128][128], noise2[128][128], data[128][128][4];
-	fractalnoise(&noise1[0][0], 128, 2);
-	fractalnoise(&noise2[0][0], 128, 2);
+	static unsigned char noise1[128][128], noise2[128][128], noise3[128][128], data[128][128][4];
+	explosiontexturepool = R_AllocTexturePool();
+	explosiontexture = NULL;
+	//explosiontexturefog = NULL;
+	fractalnoise(&noise1[0][0], 128, 32);
+	fractalnoise(&noise2[0][0], 128, 4);
+	fractalnoise(&noise3[0][0], 128, 4);
 	for (y = 0;y < 128;y++)
 	{
 		for (x = 0;x < 128;x++)
 		{
 			int j, r, g, b, a;
-			j = noise1[y][x] * 3 - 128;
+			j = (noise1[y][x] * noise2[y][x]) * 3 / 256 - 128;
 			r = (j * 512) / 256;
 			g = (j * 256) / 256;
 			b = (j * 128) / 256;
-			a = noise2[y][x];
-			data[y][x][0] = bound(0, r, 255);
+			a = noise3[y][x] * 3 - 128;
+			data[y][x][2] = bound(0, r, 255);
 			data[y][x][1] = bound(0, g, 255);
-			data[y][x][2] = bound(0, b, 255);
+			data[y][x][0] = bound(0, b, 255);
 			data[y][x][3] = bound(0, a, 255);
 		}
 	}
-	explosiontexture = R_LoadTexture ("explosiontexture", 128, 128, &data[0][0][0], TEXF_MIPMAP | TEXF_ALPHA | TEXF_RGBA | TEXF_PRECACHE);
-	for (y = 0;y < 128;y++)
-		for (x = 0;x < 128;x++)
-			data[y][x][0] = data[y][x][1] = data[y][x][2] = 255;
-	explosiontexturefog = R_LoadTexture ("explosiontexturefog", 128, 128, &data[0][0][0], TEXF_MIPMAP | TEXF_ALPHA | TEXF_RGBA | TEXF_PRECACHE);
+	explosiontexture = R_LoadTexture2D(explosiontexturepool, "explosiontexture", 128, 128, &data[0][0][0], TEXTYPE_BGRA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_FORCELINEAR, -1, NULL);
+//	if (r_loadfog)
+//	{
+//		for (y = 0;y < 128;y++)
+//			for (x = 0;x < 128;x++)
+//				data[y][x][0] = data[y][x][1] = data[y][x][2] = 255;
+//		explosiontexturefog = R_LoadTexture2D(explosiontexturepool, "explosiontexture_fog", 128, 128, &data[0][0][0], TEXTYPE_BGRA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_FORCELINEAR, NULL);
+//	}
+	// note that explosions survive the restart
 }
 
-void r_explosion_shutdown(void)
+static void r_explosion_shutdown(void)
 {
+	R_FreeTexturePool(&explosiontexturepool);
 }
 
-void r_explosion_newmap(void)
+static void r_explosion_newmap(void)
 {
+	numexplosions = 0;
 	memset(explosion, 0, sizeof(explosion));
 }
 
+static int R_ExplosionVert(int column, int row)
+{
+	int i;
+	float yaw, pitch;
+	// top and bottom rows are all one position...
+	if (row == 0 || row == EXPLOSIONGRID)
+		column = 0;
+	i = row * (EXPLOSIONGRID + 1) + column;
+	yaw = ((double) column / EXPLOSIONGRID) * M_PI * 2;
+	pitch = (((double) row / EXPLOSIONGRID) - 0.5) * M_PI;
+	explosionpoint[i][0] = cos(yaw) *  cos(pitch);
+	explosionpoint[i][1] = sin(yaw) *  cos(pitch);
+	explosionpoint[i][2] =        1 * -sin(pitch);
+	explosiontexcoord2f[i][0] = (float) column / (float) EXPLOSIONGRID;
+	explosiontexcoord2f[i][1] = (float) row / (float) EXPLOSIONGRID;
+	explosionnoiseindex[i] = (row % EXPLOSIONGRID) * EXPLOSIONGRID + (column % EXPLOSIONGRID);
+	return i;
+}
+#endif
+
 void R_Explosion_Init(void)
 {
+#ifdef MAX_EXPLOSIONS
 	int i, x, y;
 	i = 0;
 	for (y = 0;y < EXPLOSIONGRID;y++)
@@ -128,147 +147,139 @@ void R_Explosion_Init(void)
 			i++;
 		}
 	}
-	for (i = 0;i < EXPLOSIONVERTS;i++)
-	{
-		explosionspherevert[i][0] = explosionpoint[i][0] * EXPLOSIONSTARTRADIUS;
-		explosionspherevert[i][1] = explosionpoint[i][1] * EXPLOSIONSTARTRADIUS;
-		explosionspherevert[i][2] = explosionpoint[i][2] * EXPLOSIONSTARTRADIUS;
-		explosionspherevertvel[i][0] = explosionpoint[i][0] * EXPLOSIONSTARTVELOCITY;
-		explosionspherevertvel[i][1] = explosionpoint[i][1] * EXPLOSIONSTARTVELOCITY;
-		explosionspherevertvel[i][2] = explosionpoint[i][2] * EXPLOSIONSTARTVELOCITY;
-	}
 
+#endif
 	Cvar_RegisterVariable(&r_explosionclip);
+#ifdef MAX_EXPLOSIONS
 	Cvar_RegisterVariable(&r_drawexplosions);
 
-	R_RegisterModule("R_Explosions", r_explosion_start, r_explosion_shutdown, r_explosion_newmap);
+	R_RegisterModule("R_Explosions", r_explosion_start, r_explosion_shutdown, r_explosion_newmap, NULL, NULL);
+#endif
 }
 
-void R_NewExplosion(vec3_t org)
+void R_NewExplosion(const vec3_t org)
 {
+#ifdef MAX_EXPLOSIONS
 	int i, j;
-	float dist;
-	byte noise[EXPLOSIONGRID*EXPLOSIONGRID];
-	fractalnoise(noise, EXPLOSIONGRID, 2);
-	for (i = 0;i < MAX_EXPLOSIONS;i++)
+	float dist, n;
+	explosion_t *e;
+	trace_t trace;
+	unsigned char noise[EXPLOSIONGRID*EXPLOSIONGRID];
+	fractalnoisequick(noise, EXPLOSIONGRID, 4); // adjust noise grid size according to explosion
+	for (i = 0, e = explosion;i < MAX_EXPLOSIONS;i++, e++)
 	{
-		if (explosion[i].alpha <= 0.0f)
+		if (!e->alpha)
 		{
-			explosion[i].alpha = EXPLOSIONFADESTART;
+			numexplosions = max(numexplosions, i + 1);
+			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++)
 			{
-				dist = noise[explosionnoiseindex[j]] * (1.0f / 512.0f) + 0.5;
-				explosion[i].vert[j][0] = explosionspherevert[j][0] * dist + org[0];
-				explosion[i].vert[j][1] = explosionspherevert[j][1] * dist + org[1];
-				explosion[i].vert[j][2] = explosionspherevert[j][2] * dist + org[2];
-				explosion[i].vertvel[j][0] = explosionspherevertvel[j][0] * dist;
-				explosion[i].vertvel[j][1] = explosionspherevertvel[j][1] * dist;
-				explosion[i].vertvel[j][2] = explosionspherevertvel[j][2] * dist;
+				// 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_TraceLine(e->origin, e->vert[j], MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID, true, false, NULL, false, false);
+					VectorCopy(trace.endpos, e->vert[i]);
+				}
 			}
 			break;
 		}
 	}
+#endif
 }
 
-void R_DrawExplosion(explosion_t *e)
+#ifdef MAX_EXPLOSIONS
+static void R_DrawExplosion_TransparentCallback(const entity_render_t *ent, const rtlight_t *rtlight, int numsurfaces, int *surfacelist)
 {
-	int i, index, *indexlist = &explosiontris[0][0], alpha = bound(0, e->alpha * 128.0f, 128), texnum, fogtexnum;
-	float s, t;
-//	s = cl.time * 1;
-//	t = cl.time * 0.75;
-//	s -= (int) s;
-//	t -= (int) t;
-	s = 0;
-	t = 0;
-	/*
-	glColor4f(1,1,1,e->alpha);
-	glDisable(GL_TEXTURE_2D);
-//	glBindTexture(GL_TEXTURE_2D, explosiontexture);
-	glVertexPointer(3, GL_FLOAT, 0, (float *) &e->vert[0][0]);
-//	glTexCoordPointer(2, GL_FLOAT, 0, (float *) &explosiontexcoords[0][0]);
-	glEnableClientState(GL_VERTEX_ARRAY);
-//	glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-	glDrawElements(GL_TRIANGLES, EXPLOSIONTRIS, GL_UNSIGNED_INT, indexlist);
-//	glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-	glDisableClientState(GL_VERTEX_ARRAY);
-	glEnable(GL_TEXTURE_2D);
-	*/
-	texnum = R_GetTexture(explosiontexture);
-	fogtexnum = R_GetTexture(explosiontexturefog);
-	for (i = 0;i < EXPLOSIONTRIS;i++)
+	int surfacelistindex = 0;
+	const int numtriangles = EXPLOSIONTRIS, numverts = EXPLOSIONVERTS;
+	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(r_refdef.view.cullface_back);
+	R_EntityMatrix(&identitymatrix);
+
+//	R_Mesh_ResetTextureState();
+	R_SetupShader_Generic(explosiontexture, NULL, GL_MODULATE, 1, false, false, false);
+	for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++)
 	{
-		transpolybegin(texnum, 0, fogtexnum, TPOLYTYPE_ALPHA);
-		index = *indexlist++;transpolyvert(e->vert[index][0], e->vert[index][1], e->vert[index][2], explosiontexcoords[index][0] + s, explosiontexcoords[index][1] + t, 255, 255, 255, alpha);
-		index = *indexlist++;transpolyvert(e->vert[index][0], e->vert[index][1], e->vert[index][2], explosiontexcoords[index][0] + s, explosiontexcoords[index][1] + t, 255, 255, 255, alpha);
-		index = *indexlist++;transpolyvert(e->vert[index][0], e->vert[index][1], e->vert[index][2], explosiontexcoords[index][0] + s, explosiontexcoords[index][1] + t, 255, 255, 255, alpha);
-		transpolyend();
+		const explosion_t *e = explosion + surfacelist[surfacelistindex];
+		// FIXME: this can't properly handle r_refdef.view.colorscale > 1
+		GL_Color(e->alpha * r_refdef.view.colorscale, e->alpha * r_refdef.view.colorscale, e->alpha * r_refdef.view.colorscale, 1);
+		R_Mesh_PrepareVertices_Generic_Arrays(numverts, e->vert[0], NULL, explosiontexcoord2f[0]);
+		R_Mesh_Draw(0, numverts, 0, numtriangles, NULL, NULL, 0, explosiontris[0], NULL, 0);
 	}
 }
 
-void R_MoveExplosion(explosion_t *e, float frametime)
+static void R_MoveExplosion(explosion_t *e)
 {
 	int i;
-	vec3_t end;
-	e->alpha -= frametime * EXPLOSIONFADERATE;
+	float dot, end[3], frametime;
+	trace_t trace;
+
+	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])
 		{
-			end[0] = e->vert[i][0] + frametime * e->vertvel[i][0];
-			end[1] = e->vert[i][1] + frametime * e->vertvel[i][1];
-			end[2] = e->vert[i][2] + frametime * e->vertvel[i][2];
-			if (r_explosionclip.value)
+			VectorMA(e->vert[i], frametime, e->vertvel[i], end);
+			if (e->clipping)
 			{
-				float f, dot;
-				vec3_t impact, normal;
-				f = TraceLine(e->vert[i], end, impact, normal);
-				VectorCopy(impact, e->vert[i]);
-				if (f < 1)
+				trace = CL_TraceLine(e->vert[i], end, MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID, true, false, NULL, false, false);
+				if (trace.fraction < 1)
 				{
 					// clip velocity against the wall
-					dot = -DotProduct(e->vertvel[i], normal);
-					e->vertvel[i][0] += normal[0] * dot;
-					e->vertvel[i][1] += normal[1] * dot;
-					e->vertvel[i][2] += normal[2] * dot;
+					dot = -DotProduct(e->vertvel[i], trace.plane.normal);
+					VectorMA(e->vertvel[i], dot, trace.plane.normal, e->vertvel[i]);
 				}
+				VectorCopy(trace.endpos, e->vert[i]);
 			}
 			else
-			{
 				VectorCopy(end, e->vert[i]);
-			}
-		}
-	}
-}
-
-void R_MoveExplosions(void)
-{
-	int i;
-	float frametime;
-	frametime = cl.time - cl.oldtime;
-	for (i = 0;i < MAX_EXPLOSIONS;i++)
-	{
-		if (explosion[i].alpha > 0.0f)
-		{
-			if (explosion[i].starttime > cl.time)
-			{
-				explosion[i].alpha = 0;
-				continue;
-			}
-			R_MoveExplosion(&explosion[i], frametime);
 		}
 	}
 }
+#endif
 
 void R_DrawExplosions(void)
 {
+#ifdef MAX_EXPLOSIONS
 	int i;
-	if (!r_drawexplosions.value)
+
+	if (!r_drawexplosions.integer)
 		return;
-	for (i = 0;i < MAX_EXPLOSIONS;i++)
+
+	for (i = 0;i < numexplosions;i++)
 	{
-		if (explosion[i].alpha > 0.0f)
+		if (explosion[i].alpha)
 		{
-			R_DrawExplosion(&explosion[i]);
+			R_MoveExplosion(&explosion[i]);
+			if (explosion[i].alpha)
+				R_MeshQueue_AddTransparent(TRANSPARENTSORT_DISTANCE, explosion[i].origin, R_DrawExplosion_TransparentCallback, NULL, i, NULL);
 		}
 	}
+	while (numexplosions > 0 && explosion[i-1].alpha <= 0)
+		numexplosions--;
+#endif
 }
+