X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=r_explosion.c;h=15212ccd97a02709f28c224c4d3b545633233cf2;hp=d037ff17014ae41f206eee56781af3237c65e62d;hb=fedb845e665b669ff11df23ce713842bd89c4ec4;hpb=ea7c24e1fb41f3b1df984ac0eed6881c9fde16f5

diff --git a/r_explosion.c b/r_explosion.c
index d037ff17..15212ccd 100644
--- a/r_explosion.c
+++ b/r_explosion.c
@@ -173,32 +173,40 @@ void R_NewExplosion(vec3_t org)
 	}
 }
 
-void R_DrawExplosion(explosion_t *e)
+void R_DrawExplosionCallback(const void *calldata1, int calldata2)
 {
-	int i;
-	float c[EXPLOSIONVERTS][4], diff[3], centerdir[3], ifog, alpha, dist;
-	rmeshinfo_t m;
+	int i, numtriangles, numverts;
+	float *c, *v, diff[3], centerdir[3], ifog, alpha, dist;
+	rmeshstate_t m;
+	const explosion_t *e;
+	e = calldata1;
+
 	memset(&m, 0, sizeof(m));
-	m.transparent = true;
 	m.blendfunc1 = GL_SRC_ALPHA;
 	m.blendfunc2 = GL_ONE;
-	m.numtriangles = EXPLOSIONTRIS;
-	m.index = &explosiontris[0][0];
-	m.numverts = EXPLOSIONVERTS;
-	m.vertex = &e->vert[0][0];
-	m.vertexstep = sizeof(float[3]);
+	m.wantoverbright = false;
+	m.tex[0] = R_GetTexture(explosiontexture);
+	R_Mesh_Matrix(&r_identitymatrix);
+	R_Mesh_State(&m);
+
+	numtriangles = EXPLOSIONTRIS;
+	numverts = EXPLOSIONVERTS;
+	R_Mesh_ResizeCheck(numverts, numtriangles);
+
+	memcpy(varray_element, explosiontris, numtriangles * sizeof(int[3]));
+	for (i = 0, v = varray_vertex;i < numverts;i++, v += 4)
+	{
+		v[0] = e->vert[i][0];
+		v[1] = e->vert[i][1];
+		v[2] = e->vert[i][2];
+	}
+	memcpy(varray_texcoord[0], explosiontexcoords, numverts * sizeof(float[2]));
 	alpha = e->alpha;
-	m.cr = 1;
-	m.cg = 1;
-	m.cb = 1;
-	m.ca = 1; //alpha;
-	m.color = &c[0][0];
-	m.colorstep = sizeof(float[4]);
 	VectorSubtract(r_origin, e->origin, centerdir);
 	VectorNormalizeFast(centerdir);
 	if (fogenabled)
 	{
-		for (i = 0;i < EXPLOSIONVERTS;i++)
+		for (i = 0, c = varray_color;i < EXPLOSIONVERTS;i++, c += 4)
 		{
 			VectorSubtract(e->vert[i], e->origin, diff);
 			VectorNormalizeFast(diff);
@@ -211,31 +219,31 @@ void R_DrawExplosion(explosion_t *e)
 				dist = dist * ifog;
 				if (dist < 0)
 					dist = 0;
+				else
+					dist *= mesh_colorscale;
 			}
 			else
 				dist = 0;
-			c[i][0] = c[i][1] = c[i][2] = dist;
-			c[i][3] = 1;
+			c[0] = c[1] = c[2] = dist;
+			c[3] = 1;
 		}
 	}
 	else
 	{
-		for (i = 0;i < EXPLOSIONVERTS;i++)
+		for (i = 0, c = varray_color;i < EXPLOSIONVERTS;i++, c += 4)
 		{
 			VectorSubtract(e->vert[i], e->origin, diff);
 			VectorNormalizeFast(diff);
 			dist = (DotProduct(diff, centerdir) * 6.0f - 4.0f) * alpha;
 			if (dist < 0)
 				dist = 0;
-			c[i][0] = c[i][1] = c[i][2] = dist;
-			c[i][3] = 1;
+			else
+				dist *= mesh_colorscale;
+			c[0] = c[1] = c[2] = dist;
+			c[3] = 1;
 		}
 	}
-	m.tex[0] = R_GetTexture(explosiontexture);
-	m.texcoords[0] = &explosiontexcoords[0][0];
-	m.texcoordstep[0] = sizeof(float[2]);
-
-	R_Mesh_Draw(&m);
+	R_Mesh_Draw(numverts, numtriangles);
 }
 
 void R_MoveExplosion(explosion_t *e)
@@ -299,6 +307,6 @@ void R_DrawExplosions(void)
 		return;
 	for (i = 0;i < MAX_EXPLOSIONS;i++)
 		if (explosion[i].alpha > 0.01f)
-			R_DrawExplosion(&explosion[i]);
+			R_MeshQueue_AddTransparent(explosion[i].origin, R_DrawExplosionCallback, &explosion[i], 0);
 }