now uses more smoke particles for gunshots, looks better

[xonotic/darkplaces.git] / cl_particles.c

diff --git a/cl_particles.c b/cl_particles.c
index 4cc8ec062848cd6e1ab378f766ffbd5cdbb4021d..30a799c0dd53802a9e24b0d0588a9008b01f542e 100644 (file)
--- a/cl_particles.c
+++ b/cl_particles.c
@@ -71,6 +71,83 @@ void R_CalcBeamVerts (float *vert, vec3_t org1, vec3_t org2, float width)
        vert[13] = org2[1] + width * right2[1];
        vert[14] = org2[2] + width * right2[2];
 }
+void fractalnoise(qbyte *noise, int size, int startgrid)
+{
+       int x, y, g, g2, amplitude, min, max, size1 = size - 1, sizepower, gridpower;
+       int *noisebuf;
+#define n(x,y) noisebuf[((y)&size1)*size+((x)&size1)]
+
+       for (sizepower = 0;(1 << sizepower) < size;sizepower++);
+       if (size != (1 << sizepower))
+               Sys_Error("fractalnoise: size must be power of 2\n");
+
+       for (gridpower = 0;(1 << gridpower) < startgrid;gridpower++);
+       if (startgrid != (1 << gridpower))
+               Sys_Error("fractalnoise: grid must be power of 2\n");
+
+       startgrid = bound(0, startgrid, size);
+
+       amplitude = 0xFFFF; // this gets halved before use
+       noisebuf = malloc(size*size*sizeof(int));
+       memset(noisebuf, 0, size*size*sizeof(int));
+
+       for (g2 = startgrid;g2;g2 >>= 1)
+       {
+               // brownian motion (at every smaller level there is random behavior)
+               amplitude >>= 1;
+               for (y = 0;y < size;y += g2)
+                       for (x = 0;x < size;x += g2)
+                               n(x,y) += (rand()&amplitude);
+
+               g = g2 >> 1;
+               if (g)
+               {
+                       // subdivide, diamond-square algorithm (really this has little to do with squares)
+                       // diamond
+                       for (y = 0;y < size;y += g2)
+                               for (x = 0;x < size;x += g2)
+                                       n(x+g,y+g) = (n(x,y) + n(x+g2,y) + n(x,y+g2) + n(x+g2,y+g2)) >> 2;
+                       // square
+                       for (y = 0;y < size;y += g2)
+                               for (x = 0;x < size;x += g2)
+                               {
+                                       n(x+g,y) = (n(x,y) + n(x+g2,y) + n(x+g,y-g) + n(x+g,y+g)) >> 2;
+                                       n(x,y+g) = (n(x,y) + n(x,y+g2) + n(x-g,y+g) + n(x+g,y+g)) >> 2;
+                               }
+               }
+       }
+       // find range of noise values
+       min = max = 0;
+       for (y = 0;y < size;y++)
+               for (x = 0;x < size;x++)
+               {
+                       if (n(x,y) < min) min = n(x,y);
+                       if (n(x,y) > max) max = n(x,y);
+               }
+       max -= min;
+       max++;
+       // normalize noise and copy to output
+       for (y = 0;y < size;y++)
+               for (x = 0;x < size;x++)
+                       *noise++ = (qbyte) (((n(x,y) - min) * 256) / max);
+       free(noisebuf);
+#undef n
+}
+void VectorVectors(const vec3_t forward, vec3_t right, vec3_t up)
+{
+       float d;
+
+       right[0] = forward[2];
+       right[1] = -forward[0];
+       right[2] = forward[1];
+
+       d = DotProduct(forward, right);
+       right[0] -= d * forward[0];
+       right[1] -= d * forward[1];
+       right[2] -= d * forward[2];
+       VectorNormalizeFast(right);
+       CrossProduct(right, forward, up);
+}
 #else
 #include "cl_collision.h"
 #endif
@@ -439,8 +516,8 @@ CL_ParticleExplosion
 void CL_ParticleExplosion (vec3_t org)
 {
        int i, k;
-       vec3_t v;
-       vec3_t v2;
+       //vec3_t v;
+       //vec3_t v2;
        if (cl_stainmaps.integer)
                R_Stain(org, 96, 80, 80, 80, 64, 176, 176, 176, 64);
 
@@ -454,11 +531,18 @@ void CL_ParticleExplosion (vec3_t org)
        }
        else
        {
+               /*
+               // LordHavoc: smoke effect similar to UT2003, chews fillrate too badly up close
                // smoke puff
                if (cl_particles_smoke.integer)
                {
                        for (i = 0;i < 64;i++)
                        {
+#ifdef WORKINGLQUAKE
+                               v2[0] = lhrandom(-64, 64);
+                               v2[1] = lhrandom(-64, 64);
+                               v2[2] = lhrandom(-8, 24);
+#else
                                for (k = 0;k < 16;k++)
                                {
                                        v[0] = org[0] + lhrandom(-64, 64);
@@ -468,10 +552,12 @@ void CL_ParticleExplosion (vec3_t org)
                                                break;
                                }
                                VectorSubtract(v2, org, v2);
+#endif
                                VectorScale(v2, 2.0f, v2);
                                particle(pt_static, PARTICLE_BILLBOARD, 0x101010, 0x202020, tex_smoke[rand()&7], true, true, 12, 12, 255, 512, 9999, 0, 0, org[0], org[1], org[2], v2[0], v2[1], v2[2], 0, 0, 0, 0, 0, 0);
                        }
                }
+               */
 
                if (cl_particles_sparks.integer)
                {
@@ -562,7 +648,13 @@ void CL_SparkShower (vec3_t org, vec3_t dir, int count)
        {
                // smoke puff
                if (cl_particles_smoke.integer)
-                       particle(pt_static, PARTICLE_BILLBOARD, 0x606060, 0xA0A0A0, tex_smoke[rand()&7], true, true, 4, 4, 255, 1024, 9999, -0.2, 0, org[0], org[1], org[2], lhrandom(-8, 8), lhrandom(-8, 8), lhrandom(0, 16), 0, 0, 0, 0, 0, 0);
+               {
+                       k = count / 4;
+                       while(k--)
+                       {
+                               particle(pt_static, PARTICLE_BILLBOARD, 0x101010, 0x202020, tex_smoke[rand()&7], true, true, 4, 4, 255, 1024, 9999, -0.2, 0, org[0] + 0.125f * lhrandom(-count, count), org[1] + 0.125f * lhrandom (-count, count), org[2] + 0.125f * lhrandom(-count, count), lhrandom(-8, 8), lhrandom(-8, 8), lhrandom(0, 16), 0, 0, 0, 0, 0, 0);
+                       }
+               }
 
                if (cl_particles_sparks.integer)
                {
@@ -831,7 +923,7 @@ void CL_RocketTrail (vec3_t start, vec3_t end, int type, entity_t *ent)
 #ifdef WORKINGLQUAKE
        len = VectorNormalize (vec);
        dec = 0;
-       speed = 1.0f / (cl.time - cl.oldtime);
+       speed = 1.0f / cl.frametime;
        VectorSubtract(end, start, vel);
 #else
        len = VectorNormalizeLength (vec);
@@ -1327,6 +1419,7 @@ static void r_part_shutdown(void)
 
 static void r_part_newmap(void)
 {
+       cl_numparticles = 0;
 }
 
 void R_Particles_Init (void)
@@ -1486,6 +1579,10 @@ void R_DrawParticles (void)
        float minparticledist;
        particle_t *p;
 
+#ifdef WORKINGLQUAKE
+       CL_MoveParticles();
+#endif
+
        // LordHavoc: early out conditions
        if ((!cl_numparticles) || (!r_drawparticles.integer))
                return;
@@ -1493,16 +1590,17 @@ void R_DrawParticles (void)
        minparticledist = DotProduct(r_origin, vpn) + 16.0f;
 
 #ifdef WORKINGLQUAKE
-       // helper code if anyone wants to port this to stock glquake engines
        glBindTexture(GL_TEXTURE_2D, particlefonttexture);
        glEnable(GL_BLEND);
        glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+       glDepthMask(0);
        // LordHavoc: only render if not too close
        for (i = 0, p = particles;i < cl_numparticles;i++, p++)
                if (DotProduct(p->org, vpn) >= minparticledist)
                        R_DrawParticleCallback(p, 0);
-       // helper code if anyone wants to port this to stock glquake engines
+       glDepthMask(1);
        glDisable(GL_BLEND);
+       glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 #else
        // LordHavoc: only render if not too close
        c_particles += cl_numparticles;