Added the togglemenu command for both menus and the chr builtin command (menu qc)

[xonotic/darkplaces.git] / r_explosion.c

diff --git a/r_explosion.c b/r_explosion.c
index 6feff62ca4db5b66c8e68cfdadf02dd317714a5f..45b7f5ce12b336a5489651bbb27eb809ab8ae4ae 100644 (file)
--- a/r_explosion.c
+++ b/r_explosion.c
@@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define EXPLOSIONFADESTART (1.5f)
 #define EXPLOSIONFADERATE (3.0f)
 
-float explosiontexcoords[EXPLOSIONVERTS][4];
+float explosiontexcoord2f[EXPLOSIONVERTS][2];
 int explosiontris[EXPLOSIONTRIS][3];
 int explosionnoiseindex[EXPLOSIONVERTS];
 vec3_t explosionpoint[EXPLOSIONVERTS];
@@ -101,22 +101,21 @@ void r_explosion_newmap(void)
 int R_ExplosionVert(int column, int row)
 {
        int i;
-       float a, b, c;
+       float yaw, pitch;
+       // top and bottom rows are all one position...
+       if (row == 0 || row == EXPLOSIONGRID)
+               column = 0;
        i = row * (EXPLOSIONGRID + 1) + column;
-       a = ((double) row / EXPLOSIONGRID) * M_PI * 2;
-       b = (((double) column / EXPLOSIONGRID) + 0.5) * M_PI;
-       c = cos(b);
-       explosionpoint[i][0] = cos(a) * c;
-       explosionpoint[i][1] = sin(a) * c;
-       explosionpoint[i][2] = -sin(b);
+       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);
        explosionspherevertvel[i][0] = explosionpoint[i][0] * EXPLOSIONSTARTVELOCITY;
        explosionspherevertvel[i][1] = explosionpoint[i][1] * EXPLOSIONSTARTVELOCITY;
        explosionspherevertvel[i][2] = explosionpoint[i][2] * EXPLOSIONSTARTVELOCITY;
-       explosiontexcoords[i][0] = (float) column / (float) EXPLOSIONGRID;
-       explosiontexcoords[i][1] = (float) row / (float) EXPLOSIONGRID;
-       // top and bottom rows are all one position...
-       if (row == 0 || row == EXPLOSIONGRID)
-               column = 0;
+       explosiontexcoord2f[i][0] = (float) column / (float) EXPLOSIONGRID;
+       explosiontexcoord2f[i][1] = (float) row / (float) EXPLOSIONGRID;
        explosionnoiseindex[i] = (row % EXPLOSIONGRID) * EXPLOSIONGRID + (column % EXPLOSIONGRID);
        return i;
 }
@@ -175,73 +174,28 @@ void R_NewExplosion(vec3_t org)
 
 void R_DrawExplosionCallback(const void *calldata1, int calldata2)
 {
-       int i, numtriangles, numverts;
-       float *c, *v, diff[3], centerdir[3], ifog, alpha, dist;
+       int numtriangles, numverts;
+       float alpha;
        rmeshstate_t m;
        const explosion_t *e;
        e = calldata1;
 
-       memset(&m, 0, sizeof(m));
-       m.blendfunc1 = GL_SRC_ALPHA;
-       m.blendfunc2 = GL_ONE;
-       m.tex[0] = R_GetTexture(explosiontexture);
+       GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
+       GL_DepthMask(false);
+       GL_DepthTest(true);
        R_Mesh_Matrix(&r_identitymatrix);
-       R_Mesh_State(&m);
 
        numtriangles = EXPLOSIONTRIS;
        numverts = EXPLOSIONVERTS;
-       GL_UseColorArray();
-       R_Mesh_GetSpace(numverts);
-
-       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[4]));
        alpha = e->alpha;
-       VectorSubtract(r_origin, e->origin, centerdir);
-       VectorNormalizeFast(centerdir);
-       if (fogenabled)
-       {
-               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)
-                       {
-                               // use inverse fog alpha
-                               VectorSubtract(e->vert[i], r_origin, diff);
-                               ifog = 1 - exp(fogdensity/DotProduct(diff,diff));
-                               dist = dist * ifog;
-                               if (dist < 0)
-                                       dist = 0;
-                               else
-                                       dist *= r_colorscale;
-                       }
-                       else
-                               dist = 0;
-                       c[0] = c[1] = c[2] = dist;
-                       c[3] = 1;
-               }
-       }
-       else
-       {
-               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;
-                       else
-                               dist *= r_colorscale;
-                       c[0] = c[1] = c[2] = dist;
-                       c[3] = 1;
-               }
-       }
+       GL_Color(alpha, alpha, alpha, 1);
+       GL_VertexPointer(e->vert[0]);
+
+       memset(&m, 0, sizeof(m));
+       m.tex[0] = R_GetTexture(explosiontexture);
+       m.pointer_texcoord[0] = explosiontexcoord2f[0];
+       R_Mesh_State_Texture(&m);
+
        R_Mesh_Draw(numverts, numtriangles, explosiontris[0]);
 }
 
@@ -268,7 +222,7 @@ void R_MoveExplosion(explosion_t *e)
                        VectorMA(e->vert[i], frametime, e->vertvel[i], end);
                        if (r_explosionclip.integer)
                        {
-                               if (CL_TraceLine(e->vert[i], end, impact, normal, 0, true, NULL) < 1)
+                               if (CL_TraceLine(e->vert[i], end, impact, normal, true, NULL, SUPERCONTENTS_SOLID) < 1)
                                {
                                        // clip velocity against the wall
                                        dot = DotProduct(e->vertvel[i], normal) * -1.125f;
@@ -280,9 +234,6 @@ void R_MoveExplosion(explosion_t *e)
                                VectorCopy(end, e->vert[i]);
                }
        }
-       for (i = 0;i < EXPLOSIONGRID;i++)
-               VectorCopy(e->vert[i * (EXPLOSIONGRID + 1)], e->vert[i * (EXPLOSIONGRID + 1) + EXPLOSIONGRID]);
-       memcpy(e->vert[EXPLOSIONGRID * (EXPLOSIONGRID + 1)], e->vert[0], sizeof(float[3]) * (EXPLOSIONGRID + 1));
 }