no longer uses -Werror on exe builds

[xonotic/darkplaces.git] / r_explosion.c

diff --git a/r_explosion.c b/r_explosion.c
index aa08b1bfcd1204fd50cc9ba30de96795be2cea7f..80f4909fa1abeb7a49fc177a70806842ceaab9b1 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];
@@ -103,8 +103,8 @@ 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;
+       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;
@@ -112,8 +112,8 @@ int R_ExplosionVert(int column, int row)
        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;
+       explosiontexcoord2f[i][0] = (float) column / (float) EXPLOSIONGRID;
+       explosiontexcoord2f[i][1] = (float) row / (float) EXPLOSIONGRID;
        // top and bottom rows are all one position...
        if (row == 0 || row == EXPLOSIONGRID)
                column = 0;
@@ -175,8 +175,8 @@ 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;
@@ -186,62 +186,25 @@ void R_DrawExplosionCallback(const void *calldata1, int calldata2)
        m.blendfunc2 = GL_ONE;
        m.tex[0] = R_GetTexture(explosiontexture);
        R_Mesh_Matrix(&r_identitymatrix);
-       R_Mesh_State(&m);
 
        numtriangles = EXPLOSIONTRIS;
        numverts = EXPLOSIONVERTS;
-       R_Mesh_ResizeCheck(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)
+       alpha = e->alpha * r_colorscale;
+       GL_Color(alpha, alpha, alpha, 1);
+       if (gl_mesh_copyarrays.integer)
        {
-               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;
-               }
+               R_Mesh_State(&m);
+               R_Mesh_GetSpace(numverts);
+               R_Mesh_CopyVertex3f(e->vert[0], numverts);
+               R_Mesh_CopyTexCoord2f(0, explosiontexcoord2f[0], numverts);
        }
        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;
-               }
+               m.pointervertexcount = numverts;
+               m.pointer_vertex = e->vert[0];
+               m.pointer_texcoord[0] = explosiontexcoord2f[0];
+               R_Mesh_State(&m);
        }
-       GL_UseColorArray();
        R_Mesh_Draw(numverts, numtriangles, explosiontris[0]);
 }