X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=r_explosion.c;h=3c40edbf8ed2b16035d94677af82caaf6c71c678;hp=031d664944d3dfe469cc16afb69a2b7f13b166e8;hb=06300d2599046a8484430131455780e71b4dc41a;hpb=76e259b17603c4ab2c22bf7238c72847c5dbe505

diff --git a/r_explosion.c b/r_explosion.c
index 031d6649..3c40edbf 100644
--- a/r_explosion.c
+++ b/r_explosion.c
@@ -86,7 +86,7 @@ static void r_explosion_start(void)
 			data[y][x][3] = bound(0, a, 255);
 		}
 	}
-	explosiontexture = R_LoadTexture2D(explosiontexturepool, "explosiontexture", 128, 128, &data[0][0][0], TEXTYPE_BGRA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_FORCELINEAR, NULL);
+	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++)
@@ -153,7 +153,7 @@ void R_Explosion_Init(void)
 #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
 }
 
@@ -189,7 +189,7 @@ void R_NewExplosion(const vec3_t org)
 				// clip start origin
 				if (e->clipping)
 				{
-					trace = CL_TraceLine(e->origin, e->vert[j], MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID, true, false, NULL, false);
+					trace = CL_TraceLine(e->origin, e->vert[j], MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID, true, false, NULL, false, false);
 					VectorCopy(trace.endpos, e->vert[i]);
 				}
 			}
@@ -212,17 +212,15 @@ static void R_DrawExplosion_TransparentCallback(const entity_render_t *ent, cons
 	GL_CullFace(r_refdef.view.cullface_back);
 	R_EntityMatrix(&identitymatrix);
 
-	R_Mesh_ColorPointer(NULL, 0, 0);
-	R_Mesh_ResetTextureState();
-	R_SetupShader_Generic(explosiontexture, NULL, GL_MODULATE, 1);
-	R_Mesh_TexCoordPointer(0, 2, explosiontexcoord2f[0], 0, 0);
+//	R_Mesh_ResetTextureState();
+	R_SetupShader_Generic(explosiontexture, NULL, GL_MODULATE, 1, false, false, false);
 	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_refdef.view.colorscale > 1
+		// 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_Draw(0, numverts, 0, numtriangles, NULL, explosiontris[0], 0, 0);
+		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);
 	}
 }
 
@@ -247,7 +245,7 @@ static void R_MoveExplosion(explosion_t *e)
 			VectorMA(e->vert[i], frametime, e->vertvel[i], end);
 			if (e->clipping)
 			{
-				trace = CL_TraceLine(e->vert[i], end, MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID, true, false, NULL, false);
+				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
@@ -277,7 +275,7 @@ void R_DrawExplosions(void)
 		{
 			R_MoveExplosion(&explosion[i]);
 			if (explosion[i].alpha)
-				R_MeshQueue_AddTransparent(explosion[i].origin, R_DrawExplosion_TransparentCallback, NULL, i, NULL);
+				R_MeshQueue_AddTransparent(TRANSPARENTSORT_DISTANCE, explosion[i].origin, R_DrawExplosion_TransparentCallback, NULL, i, NULL);
 		}
 	}
 	while (numexplosions > 0 && explosion[i-1].alpha <= 0)