X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=r_explosion.c;h=5ed511057be67b4a18fb181dc4bc975bd7e4afa0;hp=4a965964741d316c1e80d11ef23f7c9ac62cd3ab;hb=c85c1bf2fc2670c327b93c5a9b4aa6538ab1a472;hpb=d8b7fb259ae59abbcda9b6a366fdb1c234975475

diff --git a/r_explosion.c b/r_explosion.c
index 4a965964..5ed51105 100644
--- a/r_explosion.c
+++ b/r_explosion.c
@@ -50,7 +50,7 @@ explosion_t;
 static explosion_t explosion[MAX_EXPLOSIONS];
 
 static rtexture_t	*explosiontexture;
-static rtexture_t	*explosiontexturefog;
+//static rtexture_t	*explosiontexturefog;
 
 static rtexturepool_t	*explosiontexturepool;
 #endif
@@ -59,14 +59,14 @@ cvar_t r_explosionclip = {CVAR_SAVE, "r_explosionclip", "1", "enables collision
 #ifdef MAX_EXPLOSIONS
 static cvar_t r_drawexplosions = {0, "r_drawexplosions", "1", "enables rendering of explosion shells (see also cl_particles_explosions_shell)"};
 
-extern qboolean r_loadfog;
+//extern qboolean r_loadfog;
 static void r_explosion_start(void)
 {
 	int x, y;
-	unsigned char noise1[128][128], noise2[128][128], noise3[128][128], data[128][128][4];
+	static unsigned char noise1[128][128], noise2[128][128], noise3[128][128], data[128][128][4];
 	explosiontexturepool = R_AllocTexturePool();
 	explosiontexture = NULL;
-	explosiontexturefog = NULL;
+	//explosiontexturefog = NULL;
 	fractalnoise(&noise1[0][0], 128, 32);
 	fractalnoise(&noise2[0][0], 128, 4);
 	fractalnoise(&noise3[0][0], 128, 4);
@@ -86,14 +86,14 @@ 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_PRECACHE | TEXF_FORCELINEAR, 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_PRECACHE | 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++)
+//			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
 }
 
@@ -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
 }
 
@@ -210,22 +210,17 @@ static void R_DrawExplosion_TransparentCallback(const entity_render_t *ent, cons
 	GL_PolygonOffset(r_refdef.polygonfactor, r_refdef.polygonoffset);
 	GL_DepthTest(true);
 	GL_CullFace(r_refdef.view.cullface_back);
-	R_Mesh_Matrix(&identitymatrix);
+	R_EntityMatrix(&identitymatrix);
 
-	R_SetupGenericShader(true);
-	R_Mesh_ColorPointer(NULL, 0, 0);
-	R_Mesh_ResetTextureState();
-	R_Mesh_TexBind(0, R_GetTexture(explosiontexture));
-	R_Mesh_TexCoordPointer(0, 2, explosiontexcoord2f[0], 0, 0);
+//	R_Mesh_ResetTextureState();
+	R_SetupShader_Generic(explosiontexture, NULL, GL_MODULATE, 1);
 	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);
-		GL_LockArrays(0, numverts);
-		R_Mesh_Draw(0, numverts, 0, numtriangles, NULL, explosiontris[0], 0, 0);
-		GL_LockArrays(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);
 	}
 }