X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cl_particles.c;h=11e0b4b4cbe32a402cda91e2d9d98eef5622bc6a;hp=c33c4b1b728a591bfabee25f26c428aacaea3123;hb=59e91e85a8f84adf31e1c3e69b7089b77098b24e;hpb=178ba9610d23da1274d07235fe73299f6060ed8f diff --git a/cl_particles.c b/cl_particles.c index c33c4b1b..11e0b4b4 100644 --- a/cl_particles.c +++ b/cl_particles.c @@ -19,13 +19,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "quakedef.h" +#include "cl_collision.h" -#define MAX_PARTICLES 16384 // default max # of particles at one time +#define MAX_PARTICLES 8192 // default max # of particles at one time #define ABSOLUTE_MIN_PARTICLES 512 // no fewer than this no matter what's on the command line typedef enum { - pt_static, pt_grav, pt_blob, pt_blob2, pt_bulletsmoke, pt_smoke, pt_snow, pt_rain, pt_spark, pt_bubble, pt_fade, pt_steam, pt_splash, pt_splashpuff, pt_flame, pt_blood, pt_oneframe, pt_lavasplash, pt_raindropsplash, pt_underwaterspark, pt_explosionsplash + pt_static, pt_rain, pt_bubble, pt_blood } ptype_t; @@ -34,29 +35,27 @@ ptype_t; #define P_ORIENTATION_FIRSTBIT (P_TEXNUM_FIRSTBIT + P_TEXNUM_BITS) #define P_ORIENTATION_BITS 2 #define P_FLAGS_FIRSTBIT (P_ORIENTATION_FIRSTBIT + P_ORIENTATION_BITS) -#define P_DYNLIGHT (1 << (P_FLAGS_FIRSTBIT + 0)) +//#define P_DYNLIGHT (1 << (P_FLAGS_FIRSTBIT + 0)) #define P_ADDITIVE (1 << (P_FLAGS_FIRSTBIT + 1)) typedef struct particle_s { ptype_t type; - unsigned int flags; - //int orientation; // typically PARTICLE_BILLBOARD + unsigned int flags; // dynamically lit, orientation, additive blending, texnum vec3_t org; vec3_t vel; - //int additive; - //int tex; float die; float scalex; float scaley; float alpha; // 0-255 + float alphafade; // how much alpha reduces per second float time2; // used for various things (snow fluttering, for example) float bounce; // how much bounce-back from a surface the particle hits (0 = no physics, 1 = stop and slide, 2 = keep bouncing forever, 1.5 is typical) + float gravity; // how much gravity affects this particle (1.0 = normal gravity, 0.0 = none) vec3_t oldorg; vec3_t vel2; // used for snow fluttering (base velocity, wind for instance) float friction; // how much air friction affects this object (objects with a low mass/size ratio tend to get more air friction) float pressure; // if non-zero, apply pressure to other particles - //int dynlight; // if set the particle will be dynamically lit (if cl_dynamicparticles is on), used for smoke and blood qbyte color[4]; } particle_t; @@ -97,8 +96,7 @@ static int particlepalette[256] = 0x8b0000,0xb30000,0xd70000,0xff0000,0xfff393,0xfff7c7,0xffffff,0x9f5b53 }; -static int explosparkramp[8] = {0x4b0700, 0x6f0f00, 0x931f07, 0xb7330f, 0xcf632b, 0xe3974f, 0xffe7b5, 0xffffff}; -//static int explounderwatersparkramp[8] = {0x00074b, 0x000f6f, 0x071f93, 0x0f33b7, 0x2b63cf, 0x4f97e3, 0xb5e7ff, 0xffffff}; +//static int explosparkramp[8] = {0x4b0700, 0x6f0f00, 0x931f07, 0xb7330f, 0xcf632b, 0xe3974f, 0xffe7b5, 0xffffff}; // these must match r_part.c's textures static const int tex_smoke[8] = {0, 1, 2, 3, 4, 5, 6, 7}; @@ -106,25 +104,22 @@ static const int tex_rainsplash[16] = {8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, static const int tex_particle = 24; static const int tex_rain = 25; static const int tex_bubble = 26; -//static const int tex_rocketglow = 27; static int cl_maxparticles; static int cl_numparticles; static particle_t *particles; static particle_t **freeparticles; // list used only in compacting particles array -//static renderparticle_t *cl_renderparticles; - -static cvar_t cl_particles = {CVAR_SAVE, "cl_particles", "1"}; -static cvar_t cl_particles_size = {CVAR_SAVE, "cl_particles_size", "1"}; -static cvar_t cl_particles_bloodshowers = {CVAR_SAVE, "cl_particles_bloodshowers", "1"}; -static cvar_t cl_particles_blood = {CVAR_SAVE, "cl_particles_blood", "1"}; -static cvar_t cl_particles_blood_size_min = {CVAR_SAVE, "cl_particles_blood_size_min", "5"}; -static cvar_t cl_particles_blood_size_max = {CVAR_SAVE, "cl_particles_blood_size_max", "10"}; -static cvar_t cl_particles_blood_alpha = {CVAR_SAVE, "cl_particles_blood_alpha", "0.5"}; -static cvar_t cl_particles_smoke = {CVAR_SAVE, "cl_particles_smoke", "1"}; -static cvar_t cl_particles_sparks = {CVAR_SAVE, "cl_particles_sparks", "1"}; -static cvar_t cl_particles_bubbles = {CVAR_SAVE, "cl_particles_bubbles", "1"}; -static cvar_t cl_particles_explosions = {CVAR_SAVE, "cl_particles_explosions", "0"}; + +cvar_t cl_particles = {CVAR_SAVE, "cl_particles", "1"}; +cvar_t cl_particles_size = {CVAR_SAVE, "cl_particles_size", "1"}; +cvar_t cl_particles_bloodshowers = {CVAR_SAVE, "cl_particles_bloodshowers", "1"}; +cvar_t cl_particles_blood = {CVAR_SAVE, "cl_particles_blood", "1"}; +cvar_t cl_particles_blood_size = {CVAR_SAVE, "cl_particles_blood_size", "8"}; +cvar_t cl_particles_blood_alpha = {CVAR_SAVE, "cl_particles_blood_alpha", "0.5"}; +cvar_t cl_particles_bulletimpacts = {CVAR_SAVE, "cl_particles_bulletimpacts", "1"}; +cvar_t cl_particles_smoke = {CVAR_SAVE, "cl_particles_smoke", "1"}; +cvar_t cl_particles_sparks = {CVAR_SAVE, "cl_particles_sparks", "1"}; +cvar_t cl_particles_bubbles = {CVAR_SAVE, "cl_particles_bubbles", "1"}; static mempool_t *cl_part_mempool; @@ -145,7 +140,7 @@ void CL_Particles_Init (void) i = COM_CheckParm ("-particles"); - if (i) + if (i && i < com_argc - 1) { cl_maxparticles = (int)(atoi(com_argv[i+1])); if (cl_maxparticles < ABSOLUTE_MIN_PARTICLES) @@ -160,24 +155,20 @@ void CL_Particles_Init (void) Cvar_RegisterVariable (&cl_particles_size); Cvar_RegisterVariable (&cl_particles_bloodshowers); Cvar_RegisterVariable (&cl_particles_blood); - Cvar_RegisterVariable (&cl_particles_blood_size_min); - Cvar_RegisterVariable (&cl_particles_blood_size_max); + Cvar_RegisterVariable (&cl_particles_blood_size); Cvar_RegisterVariable (&cl_particles_blood_alpha); + Cvar_RegisterVariable (&cl_particles_bulletimpacts); Cvar_RegisterVariable (&cl_particles_smoke); Cvar_RegisterVariable (&cl_particles_sparks); Cvar_RegisterVariable (&cl_particles_bubbles); - Cvar_RegisterVariable (&cl_particles_explosions); cl_part_mempool = Mem_AllocPool("CL_Part"); particles = (particle_t *) Mem_Alloc(cl_part_mempool, cl_maxparticles * sizeof(particle_t)); freeparticles = (void *) Mem_Alloc(cl_part_mempool, cl_maxparticles * sizeof(particle_t *)); cl_numparticles = 0; - - // FIXME: r_refdef stuff should be allocated somewhere else? - //r_refdef.particles = cl_renderparticles = Mem_Alloc(cl_refdef_mempool, cl_maxparticles * sizeof(renderparticle_t)); } -#define particle(ptype, porientation, pcolor1, pcolor2, ptex, plight, padditive, pscalex, pscaley, palpha, ptime, pbounce, px, py, pz, pvx, pvy, pvz, ptime2, pvx2, pvy2, pvz2, pfriction, ppressure)\ +#define particle(ptype, porientation, pcolor1, pcolor2, ptex, plight, padditive, pscalex, pscaley, palpha, palphafade, ptime, pgravity, pbounce, px, py, pz, pvx, pvy, pvz, ptime2, pvx2, pvy2, pvz2, pfriction, ppressure)\ {\ if (cl_numparticles >= cl_maxparticles)\ return;\ @@ -188,8 +179,8 @@ void CL_Particles_Init (void) partflags = ((porientation) << P_ORIENTATION_FIRSTBIT) | ((ptex) << P_TEXNUM_FIRSTBIT);\ if (padditive)\ partflags |= P_ADDITIVE;\ - if (plight)\ - partflags |= P_DYNLIGHT;\ + /*if (plight)*/\ + /* partflags |= P_DYNLIGHT;*/\ tempcolor = (pcolor1);\ tempcolor2 = (pcolor2);\ cr2 = ((tempcolor2) >> 16) & 0xFF;\ @@ -212,14 +203,12 @@ void CL_Particles_Init (void) part->color[2] = cb2;\ part->color[3] = 0xFF;\ part->flags = partflags;\ - /*part->tex = (ptex);*/\ - /*part->orientation = (porientation);*/\ - /*part->dynlight = (plight);*/\ - /*part->additive = (padditive);*/\ part->scalex = (pscalex);\ part->scaley = (pscaley);\ part->alpha = (palpha);\ + part->alphafade = (palphafade);\ part->die = cl.time + (ptime);\ + part->gravity = (pgravity);\ part->bounce = (pbounce);\ part->org[0] = (px);\ part->org[1] = (py);\ @@ -272,7 +261,7 @@ void CL_EntityParticles (entity_t *ent) forward[1] = cp*sy; forward[2] = -sp; - particle(pt_oneframe, PARTICLE_BILLBOARD, particlepalette[0x6f], particlepalette[0x6f], tex_particle, false, false, 2, 2, 255, 9999, 0, ent->render.origin[0] + m_bytenormals[i][0]*dist + forward[0]*beamlength, ent->render.origin[1] + m_bytenormals[i][1]*dist + forward[1]*beamlength, ent->render.origin[2] + m_bytenormals[i][2]*dist + forward[2]*beamlength, 0, 0, 0, 0, 0, 0, 0, 0, 0); + particle(pt_static, PARTICLE_BILLBOARD, particlepalette[0x6f], particlepalette[0x6f], tex_particle, false, false, 2, 2, 255, 0, 0, 0, 0, ent->render.origin[0] + m_bytenormals[i][0]*dist + forward[0]*beamlength, ent->render.origin[1] + m_bytenormals[i][1]*dist + forward[1]*beamlength, ent->render.origin[2] + m_bytenormals[i][2]*dist + forward[2]*beamlength, 0, 0, 0, 0, 0, 0, 0, 0, 0); } } @@ -316,7 +305,7 @@ void CL_ReadPointFile_f (void) Con_Printf ("Not enough free particles\n"); break; } - particle(pt_static, PARTICLE_BILLBOARD, particlepalette[(-c)&15], particlepalette[(-c)&15], tex_particle, false, false, 2, 2, 255, 99999, 0, org[0], org[1], org[2], 0, 0, 0, 0, 0, 0, 0, 0, 0); + particle(pt_static, PARTICLE_BILLBOARD, particlepalette[(-c)&15], particlepalette[(-c)&15], tex_particle, false, false, 2, 2, 255, 0, 99999, 0, 0, org[0], org[1], org[2], 0, 0, 0, 0, 0, 0, 0, 0, 0); } Mem_Free(pointfile); @@ -359,98 +348,20 @@ CL_ParticleExplosion void CL_ParticleExplosion (vec3_t org, int smoke) { int i; - R_Stain(org, 96, 80, 80, 80, 128, 176, 176, 176, 128); + if (cl_stainmaps.integer) + R_Stain(org, 96, 80, 80, 80, 64, 176, 176, 176, 64); - i = Mod_PointInLeaf(org, cl.worldmodel)->contents; - if (i == CONTENTS_SLIME || i == CONTENTS_WATER) - for (i = 0;i < 128;i++) - particle(pt_bubble, PARTICLE_BILLBOARD, 0x808080, 0xFFFFFF, tex_bubble, false, true, 2, 2, 255, 9999, 1.5, org[0] + lhrandom(-16, 16), org[1] + lhrandom(-16, 16), org[2] + lhrandom(-16, 16), lhrandom(-96, 96), lhrandom(-96, 96), lhrandom(-96, 96), 0, 0, 0, 0, 0, 0); - - if (cl_particles.integer && cl_particles_explosions.integer) + i = Mod_PointContents(org, cl.worldmodel); + if ((i == CONTENTS_SLIME || i == CONTENTS_WATER) && cl_particles.integer && cl_particles_bubbles.integer) { - int j, k; - float f; - vec3_t v, end, ang; - qbyte noise1[32*32], noise2[32*32]; - - VectorClear(end); // hush MSVC - i = Mod_PointInLeaf(org, cl.worldmodel)->contents; - if (i == CONTENTS_SLIME || i == CONTENTS_WATER) - { - //for (i = 0;i < 128;i++) - // particle(pt_bubble, PARTICLE_BILLBOARD, 0x808080, 0xFFFFFF, tex_bubble, false, true, 2, 2, 255, 9999, 1.5, org[0] + lhrandom(-16, 16), org[1] + lhrandom(-16, 16), org[2] + lhrandom(-16, 16), lhrandom(-96, 96), lhrandom(-96, 96), lhrandom(-96, 96), 0, 0, 0, 0, 0, 0); - - ang[2] = lhrandom(0, 360); - fractalnoisequick(noise1, 32, 4); - fractalnoisequick(noise2, 32, 8); - for (i = 0;i < 32;i++) - { - for (j = 0;j < 32;j++) - { - VectorRandom(v); - VectorMA(org, 16, v, v); - TraceLine(org, v, end, NULL, 0, true); - ang[0] = (j + 0.5f) * (360.0f / 32.0f); - ang[1] = (i + 0.5f) * (360.0f / 32.0f); - AngleVectors(ang, v, NULL, NULL); - f = noise1[j*32+i] * 1.5f; - VectorScale(v, f, v); - k = noise2[j*32+i] * 0x010101; - particle(pt_underwaterspark, PARTICLE_BILLBOARD, k, k, tex_smoke[rand()&7], false, true, 10, 10, lhrandom(128, 255), 9999, 1.5, end[0], end[1], end[2], v[0], v[1], v[2], 512.0f, 0, 0, 0, 2, 0); - VectorScale(v, 0.75, v); - k = explosparkramp[(noise2[j*32+i] >> 5)]; - particle(pt_underwaterspark, PARTICLE_BILLBOARD, k, k, tex_particle, false, true, 10, 10, lhrandom(128, 255), 9999, 1.5, end[0], end[1], end[2], v[0], v[1], v[2], 512.0f, 0, 0, 0, 2, 0); - } - } - } - else + for (i = 0;i < 128;i++) { - ang[2] = lhrandom(0, 360); - fractalnoisequick(noise1, 32, 4); - fractalnoisequick(noise2, 32, 8); - for (i = 0;i < 32;i++) - { - for (j = 0;j < 32;j++) - { - VectorRandom(v); - VectorMA(org, 16, v, v); - TraceLine(org, v, end, NULL, 0, true); - ang[0] = (j + 0.5f) * (360.0f / 32.0f); - ang[1] = (i + 0.5f) * (360.0f / 32.0f); - AngleVectors(ang, v, NULL, NULL); - f = noise1[j*32+i] * 1.5f; - VectorScale(v, f, v); - k = noise2[j*32+i] * 0x010101; - particle(pt_spark, PARTICLE_BILLBOARD, k, k, tex_smoke[rand()&7], false, true, 10, 10, lhrandom(128, 255), 9999, 1.5, end[0], end[1], end[2], v[0], v[1], v[2] + 160.0f, 512.0f, 0, 0, 0, 2, 0); - VectorScale(v, 0.75, v); - k = explosparkramp[(noise2[j*32+i] >> 5)]; - particle(pt_spark, PARTICLE_BILLBOARD, k, k, tex_particle, false, true, 10, 10, lhrandom(128, 255), 9999, 1.5, end[0], end[1], end[2], v[0], v[1], v[2] + 160.0f, 512.0f, 0, 0, 0, 2, 0); - // VectorRandom(v); - // VectorScale(v, 384, v); - // particle(pt_spark, PARTICLE_BILLBOARD, explosparkramp[rand()&7], tex_particle, false, true, 2, 2, lhrandom(16, 255), 9999, 1.5, end[0], end[1], end[2], v[0], v[1], v[2] + 160.0f, 512.0f, 0, 0, 0, 2, 0); - } - } + particle(pt_bubble, PARTICLE_BILLBOARD, 0x404040, 0x808080, tex_bubble, false, true, 2, 2, lhrandom(128, 255), 256, 9999, -0.25, 1.5, org[0] + lhrandom(-16, 16), org[1] + lhrandom(-16, 16), org[2] + lhrandom(-16, 16), lhrandom(-96, 96), lhrandom(-96, 96), lhrandom(-96, 96), 0, 0, 0, 0, (1.0 / 16.0), 0); } } - else - { - /* - int i; - vec3_t v; - for (i = 0;i < 256;i++) - { - do - { - VectorRandom(v); - } - while(DotProduct(v,v) < 0.75); - VectorScale(v, 512, v); - k = explosparkramp[rand()&7]; - particle(pt_spark, PARTICLE_BILLBOARD, k, k, tex_particle, false, true, 4, 4, 255, 9999, 1.5, org[0], org[1], org[2], v[0], v[1], v[2] + 160.0f, 512.0f, 0, 0, 0, 2, 0); - } - */ + + if (cl_explosions.integer) R_NewExplosion(org); - } } /* @@ -467,7 +378,7 @@ void CL_ParticleExplosion2 (vec3_t org, int colorStart, int colorLength) for (i = 0;i < 512;i++) { k = particlepalette[colorStart + (i % colorLength)]; - particle(pt_fade, PARTICLE_BILLBOARD, k, k, tex_particle, false, false, 1.5, 1.5, 255, 0.3, 0, org[0] + lhrandom(-8, 8), org[1] + lhrandom(-8, 8), org[2] + lhrandom(-8, 8), lhrandom(-192, 192), lhrandom(-192, 192), lhrandom(-192, 192), 384, 0, 0, 0, 1, 0); + particle(pt_static, PARTICLE_BILLBOARD, k, k, tex_particle, false, false, 1.5, 1.5, 255, 384, 0.3, 0, 0, org[0] + lhrandom(-8, 8), org[1] + lhrandom(-8, 8), org[2] + lhrandom(-8, 8), lhrandom(-192, 192), lhrandom(-192, 192), lhrandom(-192, 192), 0, 0, 0, 0, 1, 0); } } @@ -479,18 +390,11 @@ CL_BlobExplosion */ void CL_BlobExplosion (vec3_t org) { - //int i; - if (!cl_particles.integer) return; - - R_Stain(org, 96, 80, 80, 80, 128, 176, 176, 176, 128); - //R_Stain(org, 96, 96, 64, 96, 128, 160, 128, 160, 128); + if (cl_stainmaps.integer) + R_Stain(org, 96, 80, 80, 80, 64, 176, 176, 176, 64); - R_NewExplosion(org); - - //for (i = 0;i < 256;i++) - // particle(pt_blob , PARTICLE_BILLBOARD, particlepalette[ 66+(rand()%6)], tex_particle, false, true, 4, 4, 255, 9999, 0, org[0] + lhrandom(-16, 16), org[1] + lhrandom(-16, 16), org[2] + lhrandom(-16, 16), lhrandom(-4, 4), lhrandom(-4, 4), lhrandom(-128, 128), 0, 0, 0, 0, 0, 0); - //for (i = 0;i < 256;i++) - // particle(pt_blob2, PARTICLE_BILLBOARD, particlepalette[150+(rand()%6)], tex_particle, false, true, 4, 4, 255, 9999, 0, org[0] + lhrandom(-16, 16), org[1] + lhrandom(-16, 16), org[2] + lhrandom(-16, 16), lhrandom(-4, 4), lhrandom(-4, 4), lhrandom(-128, 128), 0, 0, 0, 0, 0, 0); + if (cl_explosions.integer) + R_NewExplosion(org); } /* @@ -502,17 +406,17 @@ CL_RunParticleEffect void CL_RunParticleEffect (vec3_t org, vec3_t dir, int color, int count) { int k; - if (!cl_particles.integer) return; if (count == 1024) { CL_ParticleExplosion(org, false); return; } + if (!cl_particles.integer) return; while (count--) { k = particlepalette[color + (rand()&7)]; - particle(pt_fade, PARTICLE_BILLBOARD, k, k, tex_particle, false, false, 1, 1, 128, 9999, 0, org[0] + lhrandom(-8, 8), org[1] + lhrandom(-8, 8), org[2] + lhrandom(-8, 8), lhrandom(-15, 15), lhrandom(-15, 15), lhrandom(-15, 15), 384, 0, 0, 0, 0, 0); + particle(pt_static, PARTICLE_BILLBOARD, k, k, tex_particle, false, false, 1, 1, 255, 512, 9999, 0, 0, org[0] + lhrandom(-8, 8), org[1] + lhrandom(-8, 8), org[2] + lhrandom(-8, 8), lhrandom(-15, 15), lhrandom(-15, 15), lhrandom(-15, 15), 0, 0, 0, 0, 0, 0); } } @@ -527,35 +431,38 @@ void CL_SparkShower (vec3_t org, vec3_t dir, int count) int k; if (!cl_particles.integer) return; - R_Stain(org, 32, 96, 96, 96, 32, 128, 128, 128, 32); + if (cl_stainmaps.integer) + R_Stain(org, 32, 96, 96, 96, 2, 128, 128, 128, 2); - // smoke puff - if (cl_particles_smoke.integer) - particle(pt_bulletsmoke, PARTICLE_BILLBOARD, 0xA0A0A0, 0xFFFFFF, tex_smoke[rand()&7], true, true, 2, 2, 255, 9999, 0, org[0], org[1], org[2], lhrandom(-8, 8), lhrandom(-8, 8), lhrandom(0, 16), 0, 0, 0, 0, 0, 0); - - if (cl_particles_sparks.integer) + if (cl_particles_bulletimpacts.integer) { - // sparks - while(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); + + if (cl_particles_sparks.integer) { - k = particlepalette[0x68 + (rand() & 7)]; - particle(pt_spark, PARTICLE_BILLBOARD, k, k, tex_particle, false, true, 1, 1, lhrandom(64, 128), 9999, 0, org[0], org[1], org[2], lhrandom(-64, 64) + dir[0], lhrandom(-64, 64) + dir[1], lhrandom(0, 128) + dir[2], 480, 0, 0, 0, 1, 0); + // sparks + while(count--) + { + k = particlepalette[0x68 + (rand() & 7)]; + particle(pt_static, PARTICLE_BILLBOARD, k, k, tex_particle, false, true, 1, 1, lhrandom(64, 255), 512, 9999, 1, 0, org[0], org[1], org[2], lhrandom(-64, 64) + dir[0], lhrandom(-64, 64) + dir[1], lhrandom(0, 128) + dir[2], 0, 0, 0, 0, 0, 0); + } } } } void CL_PlasmaBurn (vec3_t org) { - if (!cl_particles.integer) return; - - R_Stain(org, 48, 96, 96, 96, 48, 128, 128, 128, 48); + if (cl_stainmaps.integer) + R_Stain(org, 48, 96, 96, 96, 3, 128, 128, 128, 3); } +static float bloodcount = 0; void CL_BloodPuff (vec3_t org, vec3_t vel, int count) { - float r, s; + float s, r, a; // bloodcount is used to accumulate counts too small to cause a blood particle - static int bloodcount = 0; if (!cl_particles.integer) return; if (!cl_particles_blood.integer) return; @@ -564,18 +471,19 @@ void CL_BloodPuff (vec3_t org, vec3_t vel, int count) if (count > 1000) count = 1000; bloodcount += count; + r = cl_particles_blood_size.value; + a = cl_particles_blood_alpha.value * 255; while(bloodcount > 0) { - r = lhrandom(cl_particles_blood_size_min.value, cl_particles_blood_size_max.value); - particle(pt_blood, PARTICLE_BILLBOARD, 0x000000, 0x200000, tex_smoke[rand()&7], true, false, r, r, cl_particles_blood_alpha.value * 255, 9999, -1, org[0], org[1], org[2], vel[0] + lhrandom(-s, s), vel[1] + lhrandom(-s, s), vel[2] + lhrandom(-s, s), 0, 0, 0, 0, 1, 0); + particle(pt_blood, PARTICLE_BILLBOARD, 0x000000, 0x200000, tex_smoke[rand()&7], true, false, r, r, a, a * 0.5, 9999, 0, -1, org[0], org[1], org[2], vel[0] + lhrandom(-s, s), vel[1] + lhrandom(-s, s), vel[2] + lhrandom(-s, s), 0, 0, 0, 0, 1, 0); bloodcount -= r; } } void CL_BloodShower (vec3_t mins, vec3_t maxs, float velspeed, int count) { - float c; float r; + float a; vec3_t diff, center, velscale; if (!cl_particles.integer) return; if (!cl_particles_bloodshowers.integer) return; @@ -590,8 +498,10 @@ void CL_BloodShower (vec3_t mins, vec3_t maxs, float velspeed, int count) velscale[1] = velspeed * 2.0 / diff[1]; velscale[2] = velspeed * 2.0 / diff[2]; - c = count * 5; - while (c > 0) + bloodcount += count * 5.0f; + r = cl_particles_blood_size.value; + a = cl_particles_blood_alpha.value * 255; + while (bloodcount > 0) { vec3_t org, vel; org[0] = lhrandom(mins[0], maxs[0]); @@ -600,9 +510,8 @@ void CL_BloodShower (vec3_t mins, vec3_t maxs, float velspeed, int count) vel[0] = (org[0] - center[0]) * velscale[0]; vel[1] = (org[1] - center[1]) * velscale[1]; vel[2] = (org[2] - center[2]) * velscale[2]; - r = lhrandom(cl_particles_blood_size_min.value, cl_particles_blood_size_max.value); - c -= r; - particle(pt_blood, PARTICLE_BILLBOARD, 0x000000, 0x200000, tex_smoke[rand()&7], true, false, r, r, cl_particles_blood_alpha.value * 255, 9999, -1, org[0], org[1], org[2], vel[0], vel[1], vel[2], 0, 0, 0, 0, 1, 0); + bloodcount -= r; + particle(pt_blood, PARTICLE_BILLBOARD, 0x000000, 0x200000, tex_smoke[rand()&7], true, false, r, r, a, a * 0.5, 9999, 0, -1, org[0], org[1], org[2], vel[0], vel[1], vel[2], 0, 0, 0, 0, 1, 0); } } @@ -618,15 +527,14 @@ void CL_ParticleCube (vec3_t mins, vec3_t maxs, vec3_t dir, int count, int color while (count--) { k = particlepalette[colorbase + (rand()&3)]; - particle(gravity ? pt_grav : pt_static, PARTICLE_BILLBOARD, k, k, tex_particle, false, false, 2, 2, 255, lhrandom(1, 2), 0, lhrandom(mins[0], maxs[0]), lhrandom(mins[1], maxs[1]), lhrandom(mins[2], maxs[2]), dir[0] + lhrandom(-randomvel, randomvel), dir[1] + lhrandom(-randomvel, randomvel), dir[2] + lhrandom(-randomvel, randomvel), 0, 0, 0, 0, 0, 0); + particle(pt_static, PARTICLE_BILLBOARD, k, k, tex_particle, false, false, 2, 2, 255, 0, lhrandom(1, 2), gravity ? 1 : 0, 0, lhrandom(mins[0], maxs[0]), lhrandom(mins[1], maxs[1]), lhrandom(mins[2], maxs[2]), dir[0] + lhrandom(-randomvel, randomvel), dir[1] + lhrandom(-randomvel, randomvel), dir[2] + lhrandom(-randomvel, randomvel), 0, 0, 0, 0, 0, 0); } } void CL_ParticleRain (vec3_t mins, vec3_t maxs, vec3_t dir, int count, int colorbase, int type) { int k; - vec3_t vel; - float t, z; + float t, z, minz, maxz; if (!cl_particles.integer) return; if (maxs[0] <= mins[0]) {t = mins[0];mins[0] = maxs[0];maxs[0] = t;} if (maxs[1] <= mins[1]) {t = mins[1];mins[1] = maxs[1];maxs[1] = t;} @@ -644,6 +552,11 @@ void CL_ParticleRain (vec3_t mins, vec3_t maxs, vec3_t dir, int count, int color if (t < 0 || t > 2) // sanity check t = 2; + minz = z - fabs(dir[2]) * 0.1; + maxz = z + fabs(dir[2]) * 0.1; + minz = bound(mins[2], minz, maxs[2]); + maxz = bound(mins[2], maxz, maxs[2]); + switch(type) { case 0: @@ -651,21 +564,15 @@ void CL_ParticleRain (vec3_t mins, vec3_t maxs, vec3_t dir, int count, int color while(count--) { - vel[0] = dir[0] + lhrandom(-16, 16); - vel[1] = dir[1] + lhrandom(-16, 16); - vel[2] = dir[2] + lhrandom(-32, 32); k = particlepalette[colorbase + (rand()&3)]; - particle(pt_rain, PARTICLE_UPRIGHT_FACING, k, k, tex_particle, true, true, 1, 64, 64, t, 0, lhrandom(mins[0], maxs[0]), lhrandom(mins[1], maxs[1]), z, vel[0], vel[1], vel[2], 0, vel[0], vel[1], vel[2], 0, 0); + particle(pt_rain, PARTICLE_UPRIGHT_FACING, k, k, tex_particle, true, true, 0.5, 8, lhrandom(8, 16), 0, t, 0, 0, lhrandom(mins[0], maxs[0]), lhrandom(mins[1], maxs[1]), lhrandom(minz, maxz), dir[0], dir[1], dir[2], cl.time + 9999, dir[0], dir[1], dir[2], 0, 0); } break; case 1: while(count--) { - vel[0] = dir[0] + lhrandom(-16, 16); - vel[1] = dir[1] + lhrandom(-16, 16); - vel[2] = dir[2] + lhrandom(-32, 32); k = particlepalette[colorbase + (rand()&3)]; - particle(pt_snow, PARTICLE_BILLBOARD, k, k, tex_particle, false, true, 2, 2, 255, t, 0, lhrandom(mins[0], maxs[0]), lhrandom(mins[1], maxs[1]), z, vel[0], vel[1], vel[2], 0, vel[0], vel[1], vel[2], 0, 0); + particle(pt_rain, PARTICLE_BILLBOARD, k, k, tex_particle, false, true, 1, 1, lhrandom(64, 128), 0, t, 0, 0, lhrandom(mins[0], maxs[0]), lhrandom(mins[1], maxs[1]), lhrandom(minz, maxz), dir[0], dir[1], dir[2], 0, dir[0], dir[1], dir[2], 0, 0); } break; default: @@ -673,6 +580,35 @@ void CL_ParticleRain (vec3_t mins, vec3_t maxs, vec3_t dir, int count, int color } } +void CL_Stardust (vec3_t mins, vec3_t maxs, int count) +{ + int k; + float t; + vec3_t o, v, center; + if (!cl_particles.integer) return; + + if (maxs[0] <= mins[0]) {t = mins[0];mins[0] = maxs[0];maxs[0] = t;} + if (maxs[1] <= mins[1]) {t = mins[1];mins[1] = maxs[1];maxs[1] = t;} + if (maxs[2] <= mins[2]) {t = mins[2];mins[2] = maxs[2];maxs[2] = t;} + + center[0] = (mins[0] + maxs[0]) * 0.5f; + center[1] = (mins[1] + maxs[1]) * 0.5f; + center[2] = (mins[2] + maxs[2]) * 0.5f; + + while (count--) + { + k = particlepalette[224 + (rand()&15)]; + o[0] = lhrandom(mins[0], maxs[0]); + o[1] = lhrandom(mins[1], maxs[1]); + o[2] = lhrandom(mins[2], maxs[2]); + VectorSubtract(o, center, v); + VectorNormalizeFast(v); + VectorScale(v, 100, v); + v[2] += sv_gravity.value * 0.15f; + particle(pt_static, PARTICLE_BILLBOARD, 0x903010, 0xFFD030, tex_particle, false, true, 1.5, 1.5, lhrandom(64, 128), 128, 9999, 1, 0, o[0], o[1], o[2], v[0], v[1], v[2], 0, 0, 0, 0, 0, 0); + } +} + void CL_FlameCube (vec3_t mins, vec3_t maxs, int count) { int k; @@ -685,7 +621,9 @@ void CL_FlameCube (vec3_t mins, vec3_t maxs, int count) while (count--) { k = particlepalette[224 + (rand()&15)]; - particle(pt_flame, PARTICLE_BILLBOARD, k, k, tex_particle, false, true, 8, 8, 255, 9999, 1.1, lhrandom(mins[0], maxs[0]), lhrandom(mins[1], maxs[1]), lhrandom(mins[2], maxs[2]), lhrandom(-32, 32), lhrandom(-32, 32), lhrandom(-32, 64), 0, 0, 0, 0, 1, 0); + particle(pt_static, PARTICLE_BILLBOARD, k, k, tex_particle, false, true, 4, 4, lhrandom(64, 128), 384, 9999, -1, 0, lhrandom(mins[0], maxs[0]), lhrandom(mins[1], maxs[1]), lhrandom(mins[2], maxs[2]), lhrandom(-32, 32), lhrandom(-32, 32), lhrandom(0, 64), 0, 0, 0, 0, 1, 0); + if (count & 1) + particle(pt_static, PARTICLE_BILLBOARD, 0x303030, 0x606060, tex_smoke[rand()&7], false, true, 6, 6, lhrandom(48, 96), 64, 9999, 0, 0, lhrandom(mins[0], maxs[0]), lhrandom(mins[1], maxs[1]), lhrandom(mins[2], maxs[2]), lhrandom(-8, 8), lhrandom(-8, 8), lhrandom(0, 32), 0, 0, 0, 0, 0, 0); } } @@ -697,7 +635,7 @@ void CL_Flames (vec3_t org, vec3_t vel, int count) while (count--) { k = particlepalette[224 + (rand()&15)]; - particle(pt_flame, PARTICLE_BILLBOARD, k, k, tex_particle, false, true, 8, 8, 255, 9999, 1.1, org[0], org[1], org[2], vel[0] + lhrandom(-128, 128), vel[1] + lhrandom(-128, 128), vel[2] + lhrandom(-128, 128), 0, 0, 0, 0, 1, 0); + particle(pt_static, PARTICLE_BILLBOARD, k, k, tex_particle, false, true, 4, 4, lhrandom(64, 128), 384, 9999, -1, 1.1, org[0], org[1], org[2], vel[0] + lhrandom(-128, 128), vel[1] + lhrandom(-128, 128), vel[2] + lhrandom(-128, 128), 0, 0, 0, 0, 1, 0); } } @@ -728,7 +666,7 @@ void CL_LavaSplash (vec3_t origin) org[2] = origin[2] + lhrandom(0, 64); vel = lhrandom(50, 120) / VectorLength(dir); // normalize and scale k = particlepalette[224 + (rand()&7)]; - particle(pt_lavasplash, PARTICLE_BILLBOARD, k, k, tex_particle, false, true, 7, 7, 255, 9999, 0, org[0], org[1], org[2], dir[0] * vel, dir[1] * vel, dir[2] * vel, 0, 0, 0, 0, 0, 0); + particle(pt_static, PARTICLE_BILLBOARD, k, k, tex_particle, false, true, 7, 7, 255, 192, 9999, 0.05, 0, org[0], org[1], org[2], dir[0] * vel, dir[1] * vel, dir[2] * vel, 0, 0, 0, 0, 0, 0); } } } @@ -739,31 +677,28 @@ CL_TeleportSplash =============== */ +/* void CL_TeleportSplash (vec3_t org) { - int i, j, k; + int i, j, k; if (!cl_particles.integer) return; for (i=-16 ; i<16 ; i+=8) for (j=-16 ; j<16 ; j+=8) for (k=-24 ; k<32 ; k+=8) - //particle(pt_fade, PARTICLE_BILLBOARD, 0xA0A0A0, 0xFFFFFF, tex_particle, false, true, 1.5, 1.5, lhrandom(64, 128), 9999, 0, org[0] + i + lhrandom(0, 8), org[1] + j + lhrandom(0, 8), org[2] + k + lhrandom(0, 8), i*2 + lhrandom(-12.5, 12.5), j*2 + lhrandom(-12.5, 12.5), k*2 + lhrandom(27.5, 52.5), 384.0f, 0, 0, 0, 1, 0); - particle(pt_fade, PARTICLE_BILLBOARD, 0xA0A0A0, 0xFFFFFF, tex_particle, false, true, 10, 10, lhrandom(64, 128), 9999, 0, org[0] + i + lhrandom(0, 8), org[1] + j + lhrandom(0, 8), org[2] + k + lhrandom(0, 8), lhrandom(-64, 64), lhrandom(-64, 64), lhrandom(-256, 256), 256.0f, 0, 0, 0, 1, 0); + particle(pt_static, PARTICLE_BILLBOARD, 0xA0A0A0, 0xFFFFFF, tex_particle, false, true, 10, 10, lhrandom(64, 128), 256, 9999, 0, 0, org[0] + i + lhrandom(0, 8), org[1] + j + lhrandom(0, 8), org[2] + k + lhrandom(0, 8), lhrandom(-64, 64), lhrandom(-64, 64), lhrandom(-256, 256), 0, 0, 0, 0, 1, 0); } +*/ void CL_RocketTrail (vec3_t start, vec3_t end, int type, entity_t *ent) { - vec3_t vec, dir, vel, pos; - float len, dec, speed; - int contents, bubbles; - if (!cl_particles.integer) return; + vec3_t vec, dir, vel, pos; + float len, dec, speed, r; + int contents, smoke, blood, bubbles; VectorSubtract(end, start, dir); VectorNormalize(dir); - //if (type == 0 && host_frametime != 0) // rocket glow - // particle(pt_oneframe, PARTICLE_BILLBOARD, 0xFFFFFF, 0xFFFFFF, tex_rocketglow, false, true, 24, 24, 255, 9999, 0, end[0] - 12 * dir[0], end[1] - 12 * dir[1], end[2] - 12 * dir[2], 0, 0, 0, 0, 0, 0, 0, 0, 0); - VectorSubtract (end, start, vec); len = VectorNormalizeLength (vec); dec = -ent->persistent.trail_time; @@ -782,100 +717,81 @@ void CL_RocketTrail (vec3_t start, vec3_t end, int type, entity_t *ent) // if we skip out, leave it reset ent->persistent.trail_time = 0.0f; - contents = Mod_PointInLeaf(pos, cl.worldmodel)->contents; + contents = Mod_PointContents(pos, cl.worldmodel); if (contents == CONTENTS_SKY || contents == CONTENTS_LAVA) return; - bubbles = (contents == CONTENTS_WATER || contents == CONTENTS_SLIME); + smoke = cl_particles.integer && cl_particles_smoke.integer; + blood = cl_particles.integer && cl_particles_blood.integer; + bubbles = cl_particles.integer && cl_particles_bubbles.integer && (contents == CONTENTS_WATER || contents == CONTENTS_SLIME); while (len >= 0) { switch (type) { case 0: // rocket trail - if (!cl_particles_smoke.integer) - return; - //dec = 5; - //particle(pt_fade, PARTICLE_BILLBOARD, 0x202020, 0x404040, tex_particle, true, false, dec, dec, 128, 9999, 0, pos[0], pos[1], pos[2], lhrandom(-8, 8), lhrandom(-8, 8), lhrandom(-8, 8), 256.0f, 0, 0, 0, 0, 0); - dec = 6; - particle(pt_fade, PARTICLE_BILLBOARD, 0x202020, 0x404040, tex_smoke[rand()&7], true, true, dec, dec, 128, 9999, 0, pos[0], pos[1], pos[2], lhrandom(-5, 5), lhrandom(-5, 5), lhrandom(-5, 5), 256.0f, 0, 0, 0, 0, 0); - //particle(pt_fade, PARTICLE_BILLBOARD, 0x202020, 0x404040, tex_smoke[rand()&7], false, true, dec, dec, 128, 9999, 0, pos[0], pos[1], pos[2], lhrandom(-10, 10), lhrandom(-10, 10), lhrandom(-10, 10), 128.0f, 0, 0, 0, 0, 0); - //dec = 10; - //particle(pt_smoke, PARTICLE_BILLBOARD, 0x202020, 0x404040, tex_smoke[rand()&7], false, true, 2, 2, 160, 9999, 0, pos[0], pos[1], pos[2], 0, 0, 0, 0, 0, 0, 0, 0, 0); - if (bubbles && cl_particles_bubbles.integer) + dec = 3; + if (smoke) { - particle(pt_bubble, PARTICLE_BILLBOARD, 0x404040, 0x808080, tex_bubble, false, true, 2, 2, 255, 9999, 1.5, pos[0], pos[1], pos[2], lhrandom(-16, 16), lhrandom(-16, 16), lhrandom(-16, 16), 0, 0, 0, 0, 0, 0); - //particle(pt_bubble, PARTICLE_BILLBOARD, 0x404040, 0x808080, tex_bubble, false, true, 2, 2, 255, 9999, 1.5, pos[0], pos[1], pos[2], lhrandom(-16, 16), lhrandom(-16, 16), lhrandom(-16, 16), 0, 0, 0, 0, 0, 0); + particle(pt_static, PARTICLE_BILLBOARD, 0x303030, 0x606060, tex_smoke[rand()&7], false, true, dec, dec, 32, 64, 9999, 0, 0, pos[0], pos[1], pos[2], lhrandom(-5, 5), lhrandom(-5, 5), lhrandom(-5, 5), 0, 0, 0, 0, 0, 0); + particle(pt_static, PARTICLE_BILLBOARD, 0x801010, 0xFFA020, tex_smoke[rand()&7], false, true, dec, dec, 128, 768, 9999, 0, 0, pos[0], pos[1], pos[2], lhrandom(-20, 20), lhrandom(-20, 20), lhrandom(-20, 20), 0, 0, 0, 0, 0, 0); } - else + if (bubbles) { - //particle(pt_spark, PARTICLE_BILLBOARD, particlepalette[0x68 + (rand() & 7)], tex_particle, false, true, 2, 2, lhrandom(128, 255), 9999, 1.5, pos[0], pos[1], pos[2], lhrandom(-64, 64), lhrandom(-64, 64), lhrandom(-64, 64), 512.0f, 0, 0, 0, 1, 0); - //particle(pt_spark, PARTICLE_BILLBOARD, particlepalette[0x68 + (rand() & 7)], tex_particle, false, true, 2, 2, lhrandom(128, 255), 9999, 1.5, pos[0], pos[1], pos[2], lhrandom(-64, 64), lhrandom(-64, 64), lhrandom(-64, 64), 512.0f, 0, 0, 0, 1, 0); - //particle(pt_spark, PARTICLE_BILLBOARD, particlepalette[0x68 + (rand() & 7)], tex_particle, false, true, 1, 1, lhrandom(128, 255), 9999, 1.5, pos[0], pos[1], pos[2], lhrandom(-64, 64) - vel[0] * 0.0625, lhrandom(-64, 64) - vel[1] * 0.0625, lhrandom(-64, 64) - vel[2] * 0.0625, 512.0f, 0, 0, 0, 1, 0); - //particle(pt_spark, PARTICLE_BILLBOARD, particlepalette[0x68 + (rand() & 7)], tex_particle, false, true, 1, 1, lhrandom(128, 255), 9999, 1.5, pos[0], pos[1], pos[2], lhrandom(-64, 64) - vel[0] * 0.0625, lhrandom(-64, 64) - vel[1] * 0.0625, lhrandom(-64, 64) - vel[2] * 0.0625, 512.0f, 0, 0, 0, 1, 0); - //particle(pt_spark, PARTICLE_BILLBOARD, particlepalette[0x68 + (rand() & 7)], tex_particle, false, true, 1, 1, lhrandom(128, 255), 9999, 1.5, pos[0], pos[1], pos[2], lhrandom(-64, 64) - vel[0] * 0.0625, lhrandom(-64, 64) - vel[1] * 0.0625, lhrandom(-64, 64) - vel[2] * 0.0625, 512.0f, 0, 0, 0, 1, 0); - //particle(pt_spark, PARTICLE_BILLBOARD, particlepalette[0x68 + (rand() & 7)], tex_particle, false, true, 1, 1, lhrandom(128, 255), 9999, 1.5, pos[0], pos[1], pos[2], lhrandom(-64, 64) - vel[0] * 0.0625, lhrandom(-64, 64) - vel[1] * 0.0625, lhrandom(-64, 64) - vel[2] * 0.0625, 512.0f, 0, 0, 0, 1, 0); + r = lhrandom(1, 2); + particle(pt_bubble, PARTICLE_BILLBOARD, 0x404040, 0x808080, tex_bubble, false, true, r, r, lhrandom(64, 255), 256, 9999, -0.25, 1.5, pos[0], pos[1], pos[2], lhrandom(-16, 16), lhrandom(-16, 16), lhrandom(-16, 16), 0, 0, 0, 0, (1.0 / 16.0), 0); } break; case 1: // grenade trail // FIXME: make it gradually stop smoking - if (!cl_particles_smoke.integer) - return; - //dec = 5; - //particle(pt_fade, PARTICLE_BILLBOARD, 0x202020, 0x404040, tex_particle, true, false, dec, dec, 128, 9999, 0, pos[0], pos[1], pos[2], lhrandom(-8, 8), lhrandom(-8, 8), lhrandom(-8, 8), 256.0f, 0, 0, 0, 0, 0); - dec = 6; - particle(pt_fade, PARTICLE_BILLBOARD, 0x202020, 0x404040, tex_smoke[rand()&7], true, true, dec, dec, 128, 9999, 0, pos[0], pos[1], pos[2], lhrandom(-5, 5), lhrandom(-5, 5), lhrandom(-5, 5), 256.0f, 0, 0, 0, 0, 0); - //particle(pt_smoke, PARTICLE_BILLBOARD, 0x202020, 0x404040, tex_smoke[rand()&7], false, true, 2, 2, 160, 9999, 0, pos[0], pos[1], pos[2], 0, 0, 0, 0, 0, 0, 0, 0, 0); - if (bubbles && cl_particles_bubbles.integer) + dec = 3; + if (cl_particles.integer && cl_particles_smoke.integer) { - particle(pt_bubble, PARTICLE_BILLBOARD, 0x404040, 0x808080, tex_bubble, false, true, 2, 2, 255, 9999, 1.5, pos[0], pos[1], pos[2], lhrandom(-16, 16), lhrandom(-16, 16), lhrandom(-16, 16), 0, 0, 0, 0, 0, 0); - //particle(pt_bubble, PARTICLE_BILLBOARD, c * 2, tex_bubble, false, true, 2, 2, 255, 9999, 1.5, pos[0], pos[1], pos[2], lhrandom(-16, 16), lhrandom(-16, 16), lhrandom(-16, 16), 0, 0, 0, 0, 0, 0); + particle(pt_static, PARTICLE_BILLBOARD, 0x303030, 0x606060, tex_smoke[rand()&7], false, true, dec, dec, 32, 96, 9999, 0, 0, pos[0], pos[1], pos[2], lhrandom(-5, 5), lhrandom(-5, 5), lhrandom(-5, 5), 0, 0, 0, 0, 0, 0); } break; case 2: // blood - if (!cl_particles_blood.integer) - return; - dec = lhrandom(cl_particles_blood_size_min.value, cl_particles_blood_size_max.value); - particle(pt_blood, PARTICLE_BILLBOARD, 0x000000, 0x200000, tex_smoke[rand()&7], true, false, dec, dec, cl_particles_blood_alpha.value * 255.0f, 9999, -1, pos[0], pos[1], pos[2], vel[0] * 0.5f + lhrandom(-64, 64), vel[1] * 0.5f + lhrandom(-64, 64), vel[2] * 0.5f + lhrandom(-64, 64), 0, 0, 0, 0, 1, 0); - //particle(pt_blood, PARTICLE_BILLBOARD, 0x000000, 0x200000, tex_smoke[rand()&7], true, false, dec, dec, cl_particles_blood_alpha.value * 255.0f, 9999, -1, pos[0], pos[1], pos[2], lhrandom(-64, 64), lhrandom(-64, 64), lhrandom(-64, 64), 0, 0, 0, 0, 1, 0); - //particle(pt_blood, PARTICLE_BILLBOARD, 0x000000, 0x200000, tex_particle, true, false, dec, dec, cl_particles_blood_alpha.value * 255.0f, 9999, -1, pos[0], pos[1], pos[2], lhrandom(-64, 64), lhrandom(-64, 64), lhrandom(-64, 64), 0, 0, 0, 0, 1, 0); - break; - case 4: // slight blood - if (!cl_particles_blood.integer) - return; - dec = lhrandom(cl_particles_blood_size_min.value, cl_particles_blood_size_max.value); - particle(pt_blood, PARTICLE_BILLBOARD, 0x000000, 0x200000, tex_smoke[rand()&7], true, false, dec, dec, cl_particles_blood_alpha.value * 255.0f, 9999, -1, pos[0], pos[1], pos[2], vel[0] * 0.5f + lhrandom(-64, 64), vel[1] * 0.5f + lhrandom(-64, 64), vel[2] * 0.5f + lhrandom(-64, 64), 0, 0, 0, 0, 1, 0); - //particle(pt_blood, PARTICLE_BILLBOARD, 0x000000, 0x200000, tex_smoke[rand()&7], true, false, dec, dec, cl_particles_blood_alpha.value * 128.0f, 9999, -1, pos[0], pos[1], pos[2], lhrandom(-64, 64), lhrandom(-64, 64), lhrandom(-64, 64), 0, 0, 0, 0, 1, 0); - //particle(pt_blood, PARTICLE_BILLBOARD, 0x000000, 0x200000, tex_particle, true, false, dec, dec, cl_particles_blood_alpha.value * 128.0f, 9999, -1, pos[0], pos[1], pos[2], lhrandom(-64, 64), lhrandom(-64, 64), lhrandom(-64, 64), 0, 0, 0, 0, 1, 0); + dec = cl_particles_blood_size.value; + if (blood) + { + particle(pt_blood, PARTICLE_BILLBOARD, 0x100000, 0x280000, tex_smoke[rand()&7], true, false, dec, dec, cl_particles_blood_alpha.value * 255.0f, cl_particles_blood_alpha.value * 255.0f * 0.5, 9999, 0, -1, pos[0], pos[1], pos[2], vel[0] * 0.5f + lhrandom(-64, 64), vel[1] * 0.5f + lhrandom(-64, 64), vel[2] * 0.5f + lhrandom(-64, 64), 0, 0, 0, 0, 1, 0); + } break; case 3: // green tracer dec = 6; - //particle(pt_fade, PARTICLE_BILLBOARD, 0x373707, 0x373707, tex_particle, false, true, dec, dec, 128, 9999, 0, pos[0], pos[1], pos[2], 0, 0, 0, 384.0f, 0, 0, 0, 0, 0); - particle(pt_fade, PARTICLE_BILLBOARD, 0x373707, 0x373707, tex_particle, false, true, dec, dec, 128, 9999, 0, pos[0], pos[1], pos[2], lhrandom(-8, 8), lhrandom(-8, 8), lhrandom(-8, 8), 384.0f, 0, 0, 0, 0, 0); + if (smoke) + { + particle(pt_static, PARTICLE_BILLBOARD, 0x002000, 0x003000, tex_particle, false, true, dec, dec, 128, 384, 9999, 0, 0, pos[0], pos[1], pos[2], lhrandom(-8, 8), lhrandom(-8, 8), lhrandom(-8, 8), 0, 0, 0, 0, 0, 0); + } break; case 5: // flame tracer dec = 6; - //particle(pt_fade, PARTICLE_BILLBOARD, 0xCF632B, 0xCF632B, tex_particle, false, true, dec, dec, 128, 9999, 0, pos[0], pos[1], pos[2], 0, 0, 0, 384.0f, 0, 0, 0, 0, 0); - particle(pt_fade, PARTICLE_BILLBOARD, 0xCF632B, 0xCF632B, tex_particle, false, true, dec, dec, 128, 9999, 0, pos[0], pos[1], pos[2], lhrandom(-8, 8), lhrandom(-8, 8), lhrandom(-8, 8), 384.0f, 0, 0, 0, 0, 0); + if (smoke) + { + particle(pt_static, PARTICLE_BILLBOARD, 0x301000, 0x502000, tex_particle, false, true, dec, dec, 128, 384, 9999, 0, 0, pos[0], pos[1], pos[2], lhrandom(-8, 8), lhrandom(-8, 8), lhrandom(-8, 8), 0, 0, 0, 0, 0, 0); + } break; case 6: // voor trail dec = 6; - //particle(pt_fade, PARTICLE_BILLBOARD, 0x47232B, 0x47232B, tex_particle, false, true, dec, dec, 128, 9999, 0, pos[0], pos[1], pos[2], 0, 0, 0, 384.0f, 0, 0, 0, 0, 0); - particle(pt_fade, PARTICLE_BILLBOARD, 0x47232B, 0x47232B, tex_particle, false, true, dec, dec, 128, 9999, 0, pos[0], pos[1], pos[2], lhrandom(-8, 8), lhrandom(-8, 8), lhrandom(-8, 8), 384.0f, 0, 0, 0, 0, 0); + if (smoke) + { + particle(pt_static, PARTICLE_BILLBOARD, 0x502030, 0x502030, tex_particle, false, true, dec, dec, 128, 384, 9999, 0, 0, pos[0], pos[1], pos[2], lhrandom(-8, 8), lhrandom(-8, 8), lhrandom(-8, 8), 0, 0, 0, 0, 0, 0); + } break; case 7: // Nehahra smoke tracer - if (!cl_particles_smoke.integer) - return; - dec = 10; - particle(pt_smoke, PARTICLE_BILLBOARD, 0x202020, 0x404040, tex_smoke[rand()&7], true, false, dec, dec, 64, 9999, 0, pos[0], pos[1], pos[2], 0, 0, 0, 0, 0, 0, 0, 0, 0); + dec = 7; + if (smoke) + { + particle(pt_static, PARTICLE_BILLBOARD, 0x303030, 0x606060, tex_smoke[rand()&7], true, false, dec, dec, 64, 320, 9999, 0, 0, pos[0], pos[1], pos[2], lhrandom(-4, 4), lhrandom(-4, 4), lhrandom(0, 16), 0, 0, 0, 0, 0, 0); + } break; } @@ -888,8 +804,8 @@ void CL_RocketTrail (vec3_t start, vec3_t end, int type, entity_t *ent) void CL_RocketTrail2 (vec3_t start, vec3_t end, int color, entity_t *ent) { - vec3_t vec, pos; - int len; + vec3_t vec, pos; + int len; if (!cl_particles.integer) return; if (!cl_particles_smoke.integer) return; @@ -900,7 +816,7 @@ void CL_RocketTrail2 (vec3_t start, vec3_t end, int color, entity_t *ent) color = particlepalette[color]; while (len--) { - particle(pt_smoke, PARTICLE_BILLBOARD, color, color, tex_particle, false, false, 5, 5, 128, 9999, 0, pos[0], pos[1], pos[2], 0, 0, 0, 0, 0, 0, 0, 0, 0); + particle(pt_static, PARTICLE_BILLBOARD, color, color, tex_particle, false, false, 5, 5, 128, 320, 9999, 0, 0, pos[0], pos[1], pos[2], 0, 0, 0, 0, 0, 0, 0, 0, 0); VectorAdd (pos, vec, pos); } } @@ -914,47 +830,37 @@ CL_MoveParticles void CL_MoveParticles (void) { particle_t *p; - //renderparticle_t *r, *rend; int i, activeparticles, maxparticle, j, a, pressureused = false, content; - float gravity, dvel, frametime, f, dist, normal[3], v[3], org[3]; + float gravity, dvel, bloodwaterfade, frametime, f, dist, normal[3], v[3], org[3]; // LordHavoc: early out condition if (!cl_numparticles) - { - //r_refdef.numparticles = 0; return; - } frametime = cl.time - cl.oldtime; - if (!frametime) - return; // if absolutely still, don't update particles gravity = frametime * sv_gravity.value; dvel = 1+4*frametime; + bloodwaterfade = max(cl_particles_blood_alpha.value, 0.01f) * frametime * 128.0f; activeparticles = 0; maxparticle = -1; j = 0; - for (i = 0, p = particles/*, r = r_refdef.particles, rend = r + cl_maxparticles*/;i < cl_numparticles;i++, p++) + for (i = 0, p = particles;i < cl_numparticles;i++, p++) { - if (p->die < cl.time) - { - freeparticles[j++] = p; - continue; - } - content = 0; VectorCopy(p->org, p->oldorg); VectorMA(p->org, frametime, p->vel, p->org); VectorCopy(p->org, org); if (p->bounce) { - if (TraceLine(p->oldorg, p->org, v, normal, 0, true) < 1) + if (CL_TraceLine(p->oldorg, p->org, v, normal, 0, true) < 1) { VectorCopy(v, p->org); if (p->bounce < 0) { // assume it's blood (lame, but...) - R_Stain(v, 64, 32, 16, 16, p->alpha * p->scalex * (1.0f / 100.0f), 128, 48, 48, p->alpha * p->scalex * (1.0f / 100.0f)); + if (cl_stainmaps.integer) + R_Stain(v, 32, 32, 16, 16, p->alpha * p->scalex * (1.0f / 400.0f), 192, 48, 48, p->alpha * p->scalex * (1.0f / 400.0f)); p->die = -1; freeparticles[j++] = p; continue; @@ -968,291 +874,74 @@ void CL_MoveParticles (void) } } } + p->vel[2] -= p->gravity * gravity; + p->alpha -= p->alphafade * frametime; if (p->friction) { f = p->friction * frametime; if (!content) - content = Mod_PointInLeaf(p->org, cl.worldmodel)->contents; + content = Mod_PointContents(p->org, cl.worldmodel); if (content != CONTENTS_EMPTY) f *= 4; f = 1.0f - f; VectorScale(p->vel, f, p->vel); } - switch (p->type) + if (p->type != pt_static) { - case pt_static: - break; - - // LordHavoc: drop-through because of shared code - case pt_blob: - p->vel[2] *= dvel; - case pt_blob2: - p->vel[0] *= dvel; - p->vel[1] *= dvel; - p->alpha -= frametime * 256; - if (p->alpha < 1) - p->die = -1; - break; - - case pt_grav: - p->vel[2] -= gravity; - break; - case pt_lavasplash: - p->vel[2] -= gravity * 0.05; - p->alpha -= frametime * 192; - if (p->alpha < 1) - p->die = -1; - break; - case pt_snow: - if (cl.time > p->time2) + switch (p->type) { - p->time2 = cl.time + (rand() & 3) * 0.1; - p->vel[0] = (rand()&63)-32 + p->vel2[0]; - p->vel[1] = (rand()&63)-32 + p->vel2[1]; - p->vel[2] = (rand()&63)-32 + p->vel2[2]; - } - if (!content) - content = Mod_PointInLeaf(p->org, cl.worldmodel)->contents; - a = content; - if (a != CONTENTS_EMPTY && a != CONTENTS_SKY) - { - p->die = -1; - /* - if (a == CONTENTS_SOLID && Mod_PointInLeaf(p->oldorg, cl.worldmodel)->contents == CONTENTS_SOLID) - break; // still in solid - p->die = cl.time + 1000; - p->vel[0] = p->vel[1] = p->vel[2] = 0; - switch (a) - { - case CONTENTS_LAVA: - case CONTENTS_SLIME: - p->tex = tex_smoke[rand()&7]; - p->orientation = PARTICLE_BILLBOARD; - p->type = pt_steam; - p->alpha = 96; - p->scalex = 5; - p->scaley = 5; - p->vel[2] = 96; - break; - case CONTENTS_WATER: - p->tex = tex_smoke[rand()&7]; - p->orientation = PARTICLE_BILLBOARD; - p->type = pt_splash; - p->alpha = 96; - p->scalex = 5; - p->scaley = 5; - p->vel[2] = 96; - break; - default: // CONTENTS_SOLID and any others - TraceLine(p->oldorg, p->org, v, normal, 0, true); - VectorCopy(v, p->org); - p->tex = tex_smoke[rand()&7]; - p->orientation = PARTICLE_BILLBOARD; - p->type = pt_fade; - p->time2 = 384.0f; - p->scalex = 5; - p->scaley = 5; - VectorClear(p->vel); - break; - } - */ - } - break; - case pt_blood: - p->friction = 1; - if (!content) - content = Mod_PointInLeaf(p->org, cl.worldmodel)->contents; - a = content; - if (a != CONTENTS_EMPTY) - { - if (a == CONTENTS_WATER || a == CONTENTS_SLIME) + case pt_blood: + if (!content) + content = Mod_PointContents(p->org, cl.worldmodel); + a = content; + if (a != CONTENTS_EMPTY) { - //p->friction = 5; - p->scalex += frametime * (cl_particles_blood_size_min.value + cl_particles_blood_size_max.value); - p->scaley += frametime * (cl_particles_blood_size_min.value + cl_particles_blood_size_max.value); - p->alpha -= frametime * max(cl_particles_blood_alpha.value, 0.01f) * 128.0f; - //p->vel[2] += gravity * 0.25f; - if (p->alpha < 1) + if (a == CONTENTS_WATER || a == CONTENTS_SLIME) + { + p->scalex += frametime * cl_particles_blood_size.value; + p->scaley += frametime * cl_particles_blood_size.value; + //p->alpha -= bloodwaterfade; + } + else p->die = -1; } else - p->die = -1; - } - else - p->vel[2] -= gravity; - break; - case pt_spark: - p->alpha -= frametime * p->time2; - p->vel[2] -= gravity; - if (p->alpha < 1) - p->die = -1; - else - { - if (!content) - content = Mod_PointInLeaf(p->org, cl.worldmodel)->contents; - if (content != CONTENTS_EMPTY) - p->die = -1; - } - break; - case pt_explosionsplash: - if (Mod_PointInLeaf(p->org, cl.worldmodel)->contents == CONTENTS_EMPTY) - p->vel[2] -= gravity; - else - p->alpha = 0; - p->scalex += frametime * 64.0f; - p->scaley += frametime * 64.0f; - p->alpha -= frametime * 1024.0f; - if (p->alpha < 1) - p->die = -1; - break; - case pt_fade: - p->alpha -= frametime * p->time2; - if (p->alpha < 1) - p->die = -1; - break; - case pt_bubble: - if (!content) - content = Mod_PointInLeaf(p->org, cl.worldmodel)->contents; - if (content != CONTENTS_WATER && content != CONTENTS_SLIME) - { - p->die = -1; - break; - /* - p->tex = tex_smoke[rand()&7]; - p->orientation = PARTICLE_BILLBOARD; - p->type = pt_splashpuff; - p->scalex = 4; - p->scaley = 4; - p->vel[0] = p->vel[1] = p->vel[2] = 0; + p->vel[2] -= gravity; break; - */ - } - p->vel[0] *= (1 - (frametime * 0.0625)); - p->vel[1] *= (1 - (frametime * 0.0625)); - p->vel[2] = (p->vel[2] + gravity * 0.25) * (1 - (frametime * 0.0625)); - if (cl.time > p->time2) - { - p->time2 = cl.time + lhrandom(0, 0.5); - p->vel[0] += lhrandom(-32,32); - p->vel[1] += lhrandom(-32,32); - p->vel[2] += lhrandom(-32,32); - } - p->alpha -= frametime * 256; - if (p->alpha < 1) - p->die = -1; - break; - case pt_bulletsmoke: - p->scalex += frametime * 16; - p->scaley += frametime * 16; - p->alpha -= frametime * 1024; - p->vel[2] += gravity * 0.2; - if (p->alpha < 1) - p->die = -1; - break; - case pt_smoke: - p->scalex += frametime * 16; - p->scaley += frametime * 16; - p->alpha -= frametime * 320; - //p->vel[2] += gravity * 0.2; - if (p->alpha < 1) - p->die = -1; - break; - case pt_steam: - p->scalex += frametime * 48; - p->scaley += frametime * 48; - p->alpha -= frametime * 512; - p->vel[2] += gravity * 0.05; - if (p->alpha < 1) - p->die = -1; - break; - case pt_splashpuff: - p->alpha -= frametime * 1024; - if (p->alpha < 1) - p->die = -1; - break; - case pt_rain: - if (!content) - content = Mod_PointInLeaf(p->org, cl.worldmodel)->contents; - a = content; - if (a != CONTENTS_EMPTY && a != CONTENTS_SKY) - p->die = -1; - /* - f = 0; - b = Mod_PointInLeaf(p->oldorg, cl.worldmodel)->contents; - VectorCopy(p->oldorg, o); - while (f < 1) - { - a = b; - f = TraceLine(o, p->org, v, normal, a, true); - b = traceline_endcontents; - if (f < 1 && b != CONTENTS_EMPTY && b != CONTENTS_SKY) + case pt_bubble: + if (!content) + content = Mod_PointContents(p->org, cl.worldmodel); + if (content != CONTENTS_WATER && content != CONTENTS_SLIME) { - #if 1 p->die = -1; - #else - p->die = cl.time + 1000; - p->vel[0] = p->vel[1] = p->vel[2] = 0; - VectorCopy(v, p->org); - switch (b) - { - case CONTENTS_LAVA: - case CONTENTS_SLIME: - p->tex = tex_smoke[rand()&7]; - p->orientation = PARTICLE_BILLBOARD; - p->type = pt_steam; - p->scalex = 3; - p->scaley = 3; - p->vel[2] = 96; - break; - default: // water, solid, and anything else - p->tex = tex_rainsplash[0]; - p->orientation = PARTICLE_ORIENTED_DOUBLESIDED; - p->time2 = 0; - VectorCopy(normal, p->vel2); - // VectorAdd(p->org, normal, p->org); - p->type = pt_raindropsplash; - p->scalex = 8; - p->scaley = 8; - break; - } - #endif break; } - } - */ - break; - /* - case pt_raindropsplash: - p->time2 += frametime * 64.0f; - if (p->time2 >= 16.0f) - { + break; + case pt_rain: + if (cl.time > p->time2) + { + // snow flutter + p->time2 = cl.time + (rand() & 3) * 0.1; + p->vel[0] = lhrandom(-32, 32) + p->vel2[0]; + p->vel[1] = lhrandom(-32, 32) + p->vel2[1]; + p->vel[2] = /*lhrandom(-32, 32) +*/ p->vel2[2]; + } + if (!content) + content = Mod_PointContents(p->org, cl.worldmodel); + a = content; + if (a != CONTENTS_EMPTY && a != CONTENTS_SKY) + p->die = -1; + break; + default: + printf("unknown particle type %i\n", p->type); p->die = -1; break; } - p->tex = tex_rainsplash[(int) p->time2]; - p->orientation = PARTICLE_ORIENTED_DOUBLESIDED; - break; - */ - case pt_flame: - p->alpha -= frametime * 512; - p->vel[2] += gravity; - if (p->alpha < 16) - p->die = -1; - break; - case pt_oneframe: - if (p->time2) - p->die = -1; - p->time2 = 1; - break; - default: - printf("unknown particle type %i\n", p->type); - p->die = -1; - break; } - // LordHavoc: immediate removal of unnecessary particles (must be done to ensure compactor below operates properly in all cases) - if (p->die < cl.time) + // remove dead particles + if (p->alpha < 1 || p->die < cl.time) freeparticles[j++] = p; else { @@ -1260,30 +949,8 @@ void CL_MoveParticles (void) activeparticles++; if (p->pressure) pressureused = true; - - /* - // build renderparticle for renderer to use - r->orientation = p->orientation; - r->additive = p->additive; - r->dir[0] = p->vel2[0]; - r->dir[1] = p->vel2[1]; - r->dir[2] = p->vel2[2]; - r->org[0] = p->org[0]; - r->org[1] = p->org[1]; - r->org[2] = p->org[2]; - r->tex = p->tex; - r->scalex = p->scalex * cl_particles_size.value; - r->scaley = p->scaley * cl_particles_size.value; - r->dynlight = p->dynlight; - r->color[0] = p->color[0] * (1.0f / 255.0f); - r->color[1] = p->color[1] * (1.0f / 255.0f); - r->color[2] = p->color[2] * (1.0f / 255.0f); - r->color[3] = p->alpha * (1.0f / 255.0f); - r++; - */ } } - //r_refdef.numparticles = r - r_refdef.particles; // fill in gaps to compact the array i = 0; while (maxparticle >= activeparticles) @@ -1316,8 +983,6 @@ void CL_MoveParticles (void) { dist = freeparticles[j]->scalex * 4.0f * frametime / sqrt(dist); VectorMA(p->vel, dist, diff, p->vel); - //dist = freeparticles[j]->scalex * 4.0f * frametime / dist; - //VectorMA(p->vel, dist, freeparticles[j]->vel, p->vel); } } } @@ -1326,14 +991,20 @@ void CL_MoveParticles (void) } } +#define MAX_PARTICLETEXTURES 64 +// particletexture_t is a rectangle in the particlefonttexture +typedef struct +{ + float s1, t1, s2, t2; +} +particletexture_t; + static rtexturepool_t *particletexturepool; static rtexture_t *particlefonttexture; -// [0] is normal, [1] is fog, they may be the same -static particletexture_t particletexture[MAX_PARTICLETEXTURES][2]; +static particletexture_t particletexture[MAX_PARTICLETEXTURES]; static cvar_t r_drawparticles = {0, "r_drawparticles", "1"}; -static cvar_t r_particles_lighting = {0, "r_particles_lighting", "1"}; static qbyte shadebubble(float dx, float dy, vec3_t light) { @@ -1368,15 +1039,15 @@ static qbyte shadebubble(float dx, float dy, vec3_t light) return 0; } -static void setuptex(int cltexnum, int fog, int rtexnum, qbyte *data, qbyte *particletexturedata) +static void setuptex(int cltexnum, int rtexnum, qbyte *data, qbyte *particletexturedata) { int basex, basey, y; basex = ((rtexnum >> 0) & 7) * 32; basey = ((rtexnum >> 3) & 7) * 32; - particletexture[cltexnum][fog].s1 = (basex + 1) / 256.0f; - particletexture[cltexnum][fog].t1 = (basey + 1) / 256.0f; - particletexture[cltexnum][fog].s2 = (basex + 31) / 256.0f; - particletexture[cltexnum][fog].t2 = (basey + 31) / 256.0f; + particletexture[cltexnum].s1 = (basex + 1) / 256.0f; + particletexture[cltexnum].t1 = (basey + 1) / 256.0f; + particletexture[cltexnum].s2 = (basex + 31) / 256.0f; + particletexture[cltexnum].t2 = (basey + 31) / 256.0f; for (y = 0;y < 32;y++) memcpy(particletexturedata + ((basey + y) * 256 + basex) * 4, data + y * 32 * 4, 32 * 4); } @@ -1420,45 +1091,8 @@ static void R_InitParticleTexture (void) } while (m < 224); - setuptex(i + 0, 0, i + 0, &data[0][0][0], particletexturedata); - setuptex(i + 0, 1, i + 0, &data[0][0][0], particletexturedata); + setuptex(i + 0, i + 0, &data[0][0][0], particletexturedata); } - /* - for (i = 0;i < 8;i++) - { - do - { - fractalnoise(&noise1[0][0], 64, 4); - fractalnoise(&noise2[0][0], 64, 8); - m = 0; - for (y = 0;y < 32;y++) - { - dy = y - 16; - for (x = 0;x < 32;x++) - { - d = (noise1[y][x] - 128) * 2 + 128; - d = bound(0, d, 255); - data[y][x][0] = data[y][x][1] = data[y][x][2] = d; - dx = x - 16; - d = (noise2[y][x] - 128) * 3 + 192; - if (d > 0) - d = (d * (256 - (int) (dx*dx+dy*dy))) >> 8; - d = bound(0, d, 255); - data[y][x][3] = (qbyte) d; - if (m < d) - m = d; - } - } - } - while (m < 224); - - setuptex(i + 0, 0, i + 0, &data[0][0][0], particletexturedata); - for (y = 0;y < 32;y++) - for (x = 0;x < 32;x++) - data[y][x][0] = data[y][x][1] = data[y][x][2] = 255; - setuptex(i + 0, 1, i + 8, &data[0][0][0], particletexturedata); - } - */ // rain splash for (i = 0;i < 16;i++) @@ -1477,8 +1111,7 @@ static void R_InitParticleTexture (void) data[y][x][3] = (int) f; } } - setuptex(i + 8, 0, i + 16, &data[0][0][0], particletexturedata); - setuptex(i + 8, 1, i + 16, &data[0][0][0], particletexturedata); + setuptex(i + 8, i + 16, &data[0][0][0], particletexturedata); } // normal particle @@ -1494,8 +1127,7 @@ static void R_InitParticleTexture (void) data[y][x][3] = (qbyte) d; } } - setuptex(24, 0, 32, &data[0][0][0], particletexturedata); - setuptex(24, 1, 32, &data[0][0][0], particletexturedata); + setuptex(24, 32, &data[0][0][0], particletexturedata); // rain light[0] = 1;light[1] = 1;light[2] = 1; @@ -1508,8 +1140,7 @@ static void R_InitParticleTexture (void) data[y][x][3] = shadebubble((x - 16) * (1.0 / 8.0), y < 24 ? (y - 24) * (1.0 / 24.0) : (y - 24) * (1.0 / 8.0), light); } } - setuptex(25, 0, 33, &data[0][0][0], particletexturedata); - setuptex(25, 1, 33, &data[0][0][0], particletexturedata); + setuptex(25, 33, &data[0][0][0], particletexturedata); // bubble light[0] = 1;light[1] = 1;light[2] = 1; @@ -1522,30 +1153,7 @@ static void R_InitParticleTexture (void) data[y][x][3] = shadebubble((x - 16) * (1.0 / 16.0), (y - 16) * (1.0 / 16.0), light); } } - setuptex(26, 0, 34, &data[0][0][0], particletexturedata); - setuptex(26, 1, 34, &data[0][0][0], particletexturedata); - - // rocket flare - /* - for (y = 0;y < 32;y++) - { - dy = y - 16; - for (x = 0;x < 32;x++) - { - dx = x - 16; - d = (2048.0f / (dx*dx+dy*dy+1)) - 8.0f; - data[y][x][0] = bound(0, d * 1.0f, 255); - data[y][x][1] = bound(0, d * 0.8f, 255); - data[y][x][2] = bound(0, d * 0.5f, 255); - data[y][x][3] = bound(0, d * 1.0f, 255); - } - } - setuptex(27, 0, 35, &data[0][0][0], particletexturedata); - for (y = 0;y < 32;y++) - for (x = 0;x < 32;x++) - data[y][x][0] = data[y][x][1] = data[y][x][2] = 255; - setuptex(28, 1, 36, &data[0][0][0], particletexturedata); - */ + setuptex(26, 34, &data[0][0][0], particletexturedata); particlefonttexture = R_LoadTexture (particletexturepool, "particlefont", 256, 256, particletexturedata, TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE); } @@ -1568,226 +1176,127 @@ static void r_part_newmap(void) void R_Particles_Init (void) { Cvar_RegisterVariable(&r_drawparticles); - Cvar_RegisterVariable(&r_particles_lighting); R_RegisterModule("R_Particles", r_part_start, r_part_shutdown, r_part_newmap); } -int partindexarray[6] = {0, 1, 2, 0, 2, 3}; - -void R_DrawParticles (void) +void R_DrawParticleCallback(const void *calldata1, int calldata2) { - //renderparticle_t *r; - int i, lighting, dynlight, additive, texnum, orientation; - float minparticledist, org[3], uprightangles[3], up2[3], right2[3], v[3], right[3], up[3], tvxyz[4][4], tvst[4][2], fog, ifog, fogvec[3]; - mleaf_t *leaf; - particletexture_t *tex, *texfog; - rmeshinfo_t m; - particle_t *p; + int additive, texnum, orientation; + float org[3], up2[3], right2[3], v[3], right[3], up[3], fog, ifog, fogvec[3], cr, cg, cb, ca; + particletexture_t *tex; + rmeshstate_t m; + const particle_t *p = calldata1; + + VectorCopy(p->org, org); + orientation = (p->flags >> P_ORIENTATION_FIRSTBIT) & ((1 << P_ORIENTATION_BITS) - 1); + texnum = (p->flags >> P_TEXNUM_FIRSTBIT) & ((1 << P_TEXNUM_BITS) - 1); + //dynlight = p->flags & P_DYNLIGHT; + additive = p->flags & P_ADDITIVE; - // LordHavoc: early out conditions - //if ((!r_refdef.numparticles) || (!r_drawparticles.integer)) - if ((!cl_numparticles) || (!r_drawparticles.integer)) - return; - - lighting = r_particles_lighting.integer; - if (!r_dynamic.integer) - lighting = 0; - - c_particles += cl_numparticles; //r_refdef.numparticles; - - uprightangles[0] = 0; - uprightangles[1] = r_refdef.viewangles[1]; - uprightangles[2] = 0; - AngleVectors (uprightangles, NULL, right2, up2); - - minparticledist = DotProduct(r_origin, vpn) + 16.0f; - - // LordHavoc: this meshinfo must match up with R_Mesh_DrawDecal - // LordHavoc: the commented out lines are hardwired behavior in R_Mesh_DrawDecal memset(&m, 0, sizeof(m)); - m.transparent = true; m.blendfunc1 = GL_SRC_ALPHA; - m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA; - m.numtriangles = 2; - m.index = partindexarray; - m.numverts = 4; - m.vertex = &tvxyz[0][0]; - m.vertexstep = sizeof(float[4]); + if (additive) + m.blendfunc2 = GL_ONE; + else + m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA; m.tex[0] = R_GetTexture(particlefonttexture); - m.texcoords[0] = &tvst[0][0]; - m.texcoordstep[0] = sizeof(float[2]); + R_Mesh_Matrix(&r_identitymatrix); + R_Mesh_State(&m); - for (i = 0/*, r = r_refdef.particles*/, p = particles;i < /*r_refdef.numparticles*/cl_numparticles;i++, p++) + if (orientation == PARTICLE_BILLBOARD) { - // LordHavoc: only render if not too close - if (DotProduct(p->org, vpn) < minparticledist) - continue; - - // LordHavoc: check if it's in a visible leaf - leaf = Mod_PointInLeaf(p->org, cl.worldmodel); - if (leaf->visframe != r_framecount) - continue; - - VectorCopy(p->org, org); - orientation = (p->flags >> P_ORIENTATION_FIRSTBIT) & ((1 << P_ORIENTATION_BITS) - 1); - texnum = (p->flags >> P_TEXNUM_FIRSTBIT) & ((1 << P_TEXNUM_BITS) - 1); - dynlight = p->flags & P_DYNLIGHT; - additive = p->flags & P_ADDITIVE; - if (orientation == PARTICLE_BILLBOARD) - { - VectorScale(vright, p->scalex, right); - VectorScale(vup, p->scaley, up); - } - else if (orientation == PARTICLE_UPRIGHT_FACING) - { - VectorScale(right2, p->scalex, right); - VectorScale(up2, p->scaley, up); - } - else if (orientation == PARTICLE_ORIENTED_DOUBLESIDED) + VectorScale(vright, p->scalex, right); + VectorScale(vup, p->scaley, up); + } + else if (orientation == PARTICLE_UPRIGHT_FACING) + { + v[0] = r_origin[0] - org[0]; + v[1] = r_origin[1] - org[1]; + v[2] = 0; + VectorNormalizeFast(v); + VectorVectors(v, right2, up2); + VectorScale(right2, p->scalex, right); + VectorScale(up2, p->scaley, up); + } + else if (orientation == PARTICLE_ORIENTED_DOUBLESIDED) + { + // double-sided + if (DotProduct(p->vel2, r_origin) > DotProduct(p->vel2, org)) { - // double-sided - if (DotProduct(p->vel2, r_origin) > DotProduct(p->vel2, org)) - { - VectorNegate(p->vel2, v); - VectorVectors(v, right, up); - } - else - VectorVectors(p->vel2, right, up); - VectorScale(right, p->scalex, right); - VectorScale(up, p->scaley, up); - } - else - Host_Error("R_DrawParticles: unknown particle orientation %i\n", orientation); - - m.cr = p->color[0] * (1.0f / 255.0f); - m.cg = p->color[1] * (1.0f / 255.0f); - m.cb = p->color[2] * (1.0f / 255.0f); - m.ca = p->alpha * (1.0f / 255.0f); - if (lighting >= 1 && (dynlight || lighting >= 2)) - { - R_CompleteLightPoint(v, org, true, leaf); - m.cr *= v[0]; - m.cg *= v[1]; - m.cb *= v[2]; - } - - tex = &particletexture[texnum][0]; - - tvxyz[0][0] = org[0] - right[0] - up[0]; - tvxyz[0][1] = org[1] - right[1] - up[1]; - tvxyz[0][2] = org[2] - right[2] - up[2]; - tvxyz[1][0] = org[0] - right[0] + up[0]; - tvxyz[1][1] = org[1] - right[1] + up[1]; - tvxyz[1][2] = org[2] - right[2] + up[2]; - tvxyz[2][0] = org[0] + right[0] + up[0]; - tvxyz[2][1] = org[1] + right[1] + up[1]; - tvxyz[2][2] = org[2] + right[2] + up[2]; - tvxyz[3][0] = org[0] + right[0] - up[0]; - tvxyz[3][1] = org[1] + right[1] - up[1]; - tvxyz[3][2] = org[2] + right[2] - up[2]; - tvst[0][0] = tex->s1; - tvst[0][1] = tex->t1; - tvst[1][0] = tex->s1; - tvst[1][1] = tex->t2; - tvst[2][0] = tex->s2; - tvst[2][1] = tex->t2; - tvst[3][0] = tex->s2; - tvst[3][1] = tex->t1; - - if (additive) - { - m.blendfunc2 = GL_ONE; - fog = 0; - if (fogenabled) - { - texfog = &particletexture[texnum][1]; - VectorSubtract(org, r_origin, fogvec); - ifog = 1 - exp(fogdensity/DotProduct(fogvec,fogvec)); - if (ifog < (1.0f - (1.0f / 64.0f))) - { - if (ifog >= (1.0f / 64.0f)) - { - // partially fogged, darken it - m.cr *= ifog; - m.cg *= ifog; - m.cb *= ifog; - R_Mesh_Draw(&m); - } - } - else - R_Mesh_Draw(&m); - } - else - R_Mesh_Draw(&m); + VectorNegate(p->vel2, v); + VectorVectors(v, right, up); } else + VectorVectors(p->vel2, right, up); + VectorScale(right, p->scalex, right); + VectorScale(up, p->scaley, up); + } + else + Host_Error("R_DrawParticles: unknown particle orientation %i\n", orientation); + varray_vertex[0] = org[0] - right[0] - up[0]; + varray_vertex[1] = org[1] - right[1] - up[1]; + varray_vertex[2] = org[2] - right[2] - up[2]; + varray_vertex[4] = org[0] - right[0] + up[0]; + varray_vertex[5] = org[1] - right[1] + up[1]; + varray_vertex[6] = org[2] - right[2] + up[2]; + varray_vertex[8] = org[0] + right[0] + up[0]; + varray_vertex[9] = org[1] + right[1] + up[1]; + varray_vertex[10] = org[2] + right[2] + up[2]; + varray_vertex[12] = org[0] + right[0] - up[0]; + varray_vertex[13] = org[1] + right[1] - up[1]; + varray_vertex[14] = org[2] + right[2] - up[2]; + tex = &particletexture[texnum]; + varray_texcoord[0][0] = tex->s1; + varray_texcoord[0][1] = tex->t1; + varray_texcoord[0][2] = tex->s1; + varray_texcoord[0][3] = tex->t2; + varray_texcoord[0][4] = tex->s2; + varray_texcoord[0][5] = tex->t2; + varray_texcoord[0][6] = tex->s2; + varray_texcoord[0][7] = tex->t1; + cr = p->color[0] * (1.0f / 255.0f); + cg = p->color[1] * (1.0f / 255.0f); + cb = p->color[2] * (1.0f / 255.0f); + ca = p->alpha * (1.0f / 255.0f); + if (fogenabled) + { + VectorSubtract(org, r_origin, fogvec); + fog = exp(fogdensity/DotProduct(fogvec,fogvec)); + ifog = 1 - fog; + cr = cr * ifog; + cg = cg * ifog; + cb = cb * ifog; + if (!additive) { - m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA; - fog = 0; - if (fogenabled) - { - texfog = &particletexture[texnum][1]; - VectorSubtract(org, r_origin, fogvec); - fog = exp(fogdensity/DotProduct(fogvec,fogvec)); - if (fog >= (1.0f / 64.0f)) - { - if (fog >= (1.0f - (1.0f / 64.0f))) - { - // fully fogged, just use the fog texture and render as alpha - m.cr = fogcolor[0]; - m.cg = fogcolor[1]; - m.cb = fogcolor[2]; - tvst[0][0] = texfog->s1; - tvst[0][1] = texfog->t1; - tvst[1][0] = texfog->s1; - tvst[1][1] = texfog->t2; - tvst[2][0] = texfog->s2; - tvst[2][1] = texfog->t2; - tvst[3][0] = texfog->s2; - tvst[3][1] = texfog->t1; - R_Mesh_Draw(&m); - } - else - { - // partially fogged, darken the first pass - ifog = 1 - fog; - m.cr *= ifog; - m.cg *= ifog; - m.cb *= ifog; - if (tex->s1 == texfog->s1 && tex->t1 == texfog->t1) - { - // fog texture is the same as the base, just change the color - m.cr += fogcolor[0] * fog; - m.cg += fogcolor[1] * fog; - m.cb += fogcolor[2] * fog; - R_Mesh_Draw(&m); - } - else - { - // render the first pass (alpha), then do additive fog - R_Mesh_Draw(&m); - - m.blendfunc2 = GL_ONE; - m.cr = fogcolor[0] * fog; - m.cg = fogcolor[1] * fog; - m.cb = fogcolor[2] * fog; - tvst[0][0] = texfog->s1; - tvst[0][1] = texfog->t1; - tvst[1][0] = texfog->s1; - tvst[1][1] = texfog->t2; - tvst[2][0] = texfog->s2; - tvst[2][1] = texfog->t2; - tvst[3][0] = texfog->s2; - tvst[3][1] = texfog->t1; - R_Mesh_Draw(&m); - } - } - } - else - R_Mesh_Draw(&m); - } - else - R_Mesh_Draw(&m); + cr += fogcolor[0] * fog; + cg += fogcolor[1] * fog; + cb += fogcolor[2] * fog; } } + varray_color[0] = varray_color[4] = varray_color[8] = varray_color[12] = cr * mesh_colorscale; + varray_color[1] = varray_color[5] = varray_color[9] = varray_color[13] = cg * mesh_colorscale; + varray_color[2] = varray_color[6] = varray_color[10] = varray_color[14] = cb * mesh_colorscale; + varray_color[3] = varray_color[7] = varray_color[11] = varray_color[15] = ca; + R_Mesh_Draw(4, 2, polygonelements); } + +void R_DrawParticles (void) +{ + int i; + float minparticledist; + particle_t *p; + + // LordHavoc: early out conditions + if ((!cl_numparticles) || (!r_drawparticles.integer)) + return; + + c_particles += cl_numparticles; + + minparticledist = DotProduct(r_origin, vpn) + 16.0f; + + // LordHavoc: only render if not too close + for (i = 0, p = particles;i < cl_numparticles;i++, p++) + if (DotProduct(p->org, vpn) >= minparticledist) + R_MeshQueue_AddTransparent(p->org, R_DrawParticleCallback, p, 0); +} +