X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=cl_particles.c;h=3d129b61f4081ff6f3663e67d23445f1458d8112;hb=815acba79ba17ee4cc19b332346649b35053ec43;hp=a07ecbdad9ae16e1f800465725abefe2397996ab;hpb=14f9eeb18092745b92bc0b1285f572c5838c824a;p=xonotic%2Fdarkplaces.git diff --git a/cl_particles.c b/cl_particles.c index a07ecbda..3d129b61 100644 --- a/cl_particles.c +++ b/cl_particles.c @@ -40,7 +40,6 @@ void R_Stain (vec3_t origin, float radius, int cr1, int cg1, int cb1, int ca1, i #define CL_BlobExplosion R_BlobExplosion #define CL_RunParticleEffect R_RunParticleEffect #define CL_LavaSplash R_LavaSplash -#define CL_RocketTrail2 R_RocketTrail2 void R_CalcBeam_Vertex3f (float *vert, vec3_t org1, vec3_t org2, float width) { vec3_t right1, right2, diff, normal; @@ -181,7 +180,7 @@ float CL_TraceLine (vec3_t start, vec3_t end, vec3_t impact, vec3_t normal, int typedef enum { - pt_dead, pt_static, pt_rain, pt_bubble, pt_blood, pt_grow, pt_decal, pt_decalfade, pt_ember + pt_dead, pt_static, pt_rain, pt_bubble, pt_blood, pt_grow, pt_decal, pt_ember } ptype_t; @@ -328,6 +327,7 @@ void CL_Particles_Init (void) { int i; +// COMMANDLINEOPTION: Client: -particles changes maximum number of particles at once, default 32768 i = COM_CheckParm ("-particles"); if (i && i < com_argc - 1) @@ -371,6 +371,15 @@ void CL_Particles_Init (void) CL_Particles_Clear(); } +void CL_Particles_Shutdown (void) +{ +#ifdef WORKINGLQUAKE + // No clue what to do here... +#else + Mem_FreePool (&cl_part_mempool); +#endif +} + // list of all 26 parameters: // ptype - any of the pt_ enum values (pt_static, pt_blood, etc), see ptype_t near the top of this file // porientation - PARTICLE_ enum values (PARTICLE_BILLBOARD, PARTICLE_SPARK, etc) @@ -613,7 +622,7 @@ void CL_ParseParticleEffect (void) vec3_t org, dir; int i, count, msgcount, color; - MSG_ReadVector(org); + MSG_ReadVector(org, cl.protocol); for (i=0 ; i<3 ; i++) dir[i] = MSG_ReadChar () * (1.0/16); msgcount = MSG_ReadByte (); @@ -782,46 +791,53 @@ void CL_RunParticleEffect (vec3_t org, vec3_t dir, int color, int count) CL_SparkShower =============== */ -void CL_SparkShower (vec3_t org, vec3_t dir, int count) +void CL_SparkShower (vec3_t org, vec3_t dir, int count, vec_t gravityscale) { - vec3_t org2, org3; int k; - if (cl_stainmaps.integer) - R_Stain(org, 32, 96, 96, 96, 24, 128, 128, 128, 24); - CL_SpawnDecalParticleForPoint(org, 6, 3, 255, tex_bulletdecal[rand()&7], 0xFFFFFF, 0xFFFFFF); - if (!cl_particles.integer) return; - if (cl_particles_bulletimpacts.integer) + if (cl_particles_sparks.integer) { - // smoke puff - if (cl_particles_smoke.integer) + // sparks + count *= cl_particles_quality.value; + while(count--) { - k = count * 0.25 * cl_particles_quality.value; - while(k--) - { - org2[0] = org[0] + 0.125f * lhrandom(-count, count); - org2[1] = org[1] + 0.125f * lhrandom(-count, count); - org2[2] = org[2] + 0.125f * lhrandom(-count, count); - CL_TraceLine(org, org2, org3, NULL, true, NULL, SUPERCONTENTS_SOLID); - particle(pt_grow, PARTICLE_BILLBOARD, 0x101010, 0x202020, tex_smoke[rand()&7], true, PBLEND_ADD, 3, 3, (1.0f / cl_particles_quality.value) * 255, (1.0f / cl_particles_quality.value) * 1024, 9999, -0.2, 0, org3[0], org3[1], org3[2], lhrandom(-8, 8), lhrandom(-8, 8), lhrandom(0, 16), 15, 0, 0, 0, 0.2, 0); - } + k = particlepalette[0x68 + (rand() & 7)]; + particle(pt_static, PARTICLE_SPARK, k, k, tex_particle, false, PBLEND_ADD, 0.4f, 0.015f, (1.0f / cl_particles_quality.value) * lhrandom(64, 255), (1.0f / cl_particles_quality.value) * 512, 9999, gravityscale, 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_Smoke (vec3_t org, vec3_t dir, int count) +{ + vec3_t org2, org3; + int k; - if (cl_particles_sparks.integer) + if (!cl_particles.integer) return; + + // smoke puff + if (cl_particles_smoke.integer) + { + k = count * 0.25 * cl_particles_quality.value; + while(k--) { - // sparks - count *= cl_particles_quality.value; - while(count--) - { - k = particlepalette[0x68 + (rand() & 7)]; - particle(pt_static, PARTICLE_SPARK, k, k, tex_particle, false, PBLEND_ADD, 0.4f, 0.015f, (1.0f / cl_particles_quality.value) * lhrandom(64, 255), (1.0f / cl_particles_quality.value) * 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.2, 0); - } + org2[0] = org[0] + 0.125f * lhrandom(-count, count); + org2[1] = org[1] + 0.125f * lhrandom(-count, count); + org2[2] = org[2] + 0.125f * lhrandom(-count, count); + CL_TraceLine(org, org2, org3, NULL, true, NULL, SUPERCONTENTS_SOLID); + particle(pt_grow, PARTICLE_BILLBOARD, 0x101010, 0x202020, tex_smoke[rand()&7], true, PBLEND_ADD, 3, 3, (1.0f / cl_particles_quality.value) * 255, (1.0f / cl_particles_quality.value) * 1024, 9999, 0, 0, org3[0], org3[1], org3[2], lhrandom(-8, 8), lhrandom(-8, 8), lhrandom(-8, 8), 15, 0, 0, 0, 0, 0); } } } +void CL_BulletMark (vec3_t org) +{ + if (cl_stainmaps.integer) + R_Stain(org, 32, 96, 96, 96, 24, 128, 128, 128, 24); + CL_SpawnDecalParticleForPoint(org, 6, 3, 255, tex_bulletdecal[rand()&7], 0xFFFFFF, 0xFFFFFF); +} + void CL_PlasmaBurn (vec3_t org) { if (cl_stainmaps.integer) @@ -1092,7 +1108,7 @@ void R_TeleportSplash (vec3_t org) #ifdef WORKINGLQUAKE void R_RocketTrail (vec3_t start, vec3_t end, int type) #else -void CL_RocketTrail (vec3_t start, vec3_t end, int type, entity_t *ent) +void CL_RocketTrail (vec3_t start, vec3_t end, int type, int color, entity_t *ent) #endif { vec3_t vec, dir, vel, pos; @@ -1125,6 +1141,7 @@ void CL_RocketTrail (vec3_t start, vec3_t end, int type, entity_t *ent) if (speed) speed = 1.0f / speed; VectorSubtract(ent->state_current.origin, ent->state_previous.origin, vel); + color = particlepalette[color]; #endif VectorScale(vel, speed, vel); @@ -1200,7 +1217,7 @@ void CL_RocketTrail (vec3_t start, vec3_t end, int type, entity_t *ent) particle(pt_static, PARTICLE_BILLBOARD, 0x502030, 0x502030, tex_particle, false, PBLEND_ADD, 6, 6, qd*128, qd*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; - +#ifndef WORKINGLQUAKE case 7: // Nehahra smoke tracer dec = qd*7; if (smoke) @@ -1211,6 +1228,12 @@ void CL_RocketTrail (vec3_t start, vec3_t end, int type, entity_t *ent) if (smoke) particle(pt_static, PARTICLE_BILLBOARD, 0x283880, 0x283880, tex_particle, false, PBLEND_ADD, 4, 4, qd*255, qd*1024, 9999, 0, 0, pos[0], pos[1], pos[2], 0, 0, 0, 0, 0, 0, 0, 0, 0); break; + case 9: // glow trail + dec = qd*3; + if (smoke) + particle(pt_static, PARTICLE_BILLBOARD, color, color, tex_particle, false, PBLEND_ALPHA, 5, 5, qd*128, qd*320, 9999, 0, 0, pos[0], pos[1], pos[2], 0, 0, 0, 0, 0, 0, 0, 0, 0); + break; +#endif } // advance to next time and position @@ -1222,30 +1245,6 @@ void CL_RocketTrail (vec3_t start, vec3_t end, int type, entity_t *ent) #endif } -void CL_RocketTrail2 (vec3_t start, vec3_t end, int color, entity_t *ent) -{ - float dec, len; - vec3_t vec, pos; - if (!cl_particles.integer) return; - if (!cl_particles_smoke.integer) return; - - VectorCopy(start, pos); - VectorSubtract(end, start, vec); -#ifdef WORKINGLQUAKE - len = VectorNormalize(vec); -#else - len = VectorNormalizeLength(vec); -#endif - color = particlepalette[color]; - dec = 3.0f / cl_particles_quality.value; - while (len > 0) - { - particle(pt_static, PARTICLE_BILLBOARD, color, color, tex_particle, false, PBLEND_ALPHA, 5, 5, 128 / cl_particles_quality.value, 320 / cl_particles_quality.value, 9999, 0, 0, pos[0], pos[1], pos[2], 0, 0, 0, 0, 0, 0, 0, 0, 0); - len -= dec; - VectorMA(pos, dec, vec, pos); - } -} - void CL_BeamParticle (const vec3_t start, const vec3_t end, vec_t radius, float red, float green, float blue, float alpha, float lifetime) { int tempcolor2, cr, cg, cb; @@ -1359,8 +1358,8 @@ void CL_MoveParticles (void) Matrix4x4_Transform3x3(&hitent->inversematrix, normal, p->relativedirection); VectorAdd(p->relativeorigin, p->relativedirection, p->relativeorigin); #endif - p->time2 = cl.time + cl_decals_time.value; - p->die = p->time2 + cl_decals_fadetime.value; + p->time2 = cl.time; + p->die = p->time2 + cl_decals_time.value + cl_decals_fadetime.value; p->alphafade = 0; VectorCopy(normal, p->vel2); VectorClear(p->vel); @@ -1368,8 +1367,8 @@ void CL_MoveParticles (void) p->bounce = 0; p->friction = 0; p->gravity = 0; - p->scalex *= 1.25f; - p->scaley *= 1.25f; + p->scalex *= 2.0f; + p->scaley *= 2.0f; } else { @@ -1453,22 +1452,7 @@ void CL_MoveParticles (void) p->scaley += frametime * p->time2; break; case pt_decal: -#ifndef WORKINGLQUAKE - if (p->owner->model == p->ownermodel) - { - Matrix4x4_Transform(&p->owner->matrix, p->relativeorigin, p->org); - Matrix4x4_Transform3x3(&p->owner->matrix, p->relativedirection, p->vel2); - if (cl.time > p->time2) - { - p->alphafade = p->alpha / (p->die - cl.time); - p->type = pt_decalfade; - } - } - else - p->type = pt_dead; -#endif - break; - case pt_decalfade: + p->alphafade = cl.time > (p->time2 + cl_decals_time.value) ? (p->alpha / cl_decals_fadetime.value) : 0; #ifndef WORKINGLQUAKE if (p->owner->model == p->ownermodel) { @@ -1516,6 +1500,9 @@ static particletexture_t particletexture[MAX_PARTICLETEXTURES]; static cvar_t r_drawparticles = {0, "r_drawparticles", "1"}; +#define PARTICLETEXTURESIZE 64 +#define PARTICLEFONTSIZE (PARTICLETEXTURESIZE*8) + static qbyte shadebubble(float dx, float dy, vec3_t light) { float dz, f, dot; @@ -1552,14 +1539,14 @@ static qbyte shadebubble(float dx, float dy, vec3_t light) static void setuptex(int texnum, qbyte *data, qbyte *particletexturedata) { int basex, basey, y; - basex = ((texnum >> 0) & 7) * 32; - basey = ((texnum >> 3) & 7) * 32; - particletexture[texnum].s1 = (basex + 1) / 256.0f; - particletexture[texnum].t1 = (basey + 1) / 256.0f; - particletexture[texnum].s2 = (basex + 31) / 256.0f; - particletexture[texnum].t2 = (basey + 31) / 256.0f; - for (y = 0;y < 32;y++) - memcpy(particletexturedata + ((basey + y) * 256 + basex) * 4, data + y * 32 * 4, 32 * 4); + basex = ((texnum >> 0) & 7) * PARTICLETEXTURESIZE; + basey = ((texnum >> 3) & 7) * PARTICLETEXTURESIZE; + particletexture[texnum].s1 = (basex + 1) / (float)PARTICLEFONTSIZE; + particletexture[texnum].t1 = (basey + 1) / (float)PARTICLEFONTSIZE; + particletexture[texnum].s2 = (basex + PARTICLETEXTURESIZE - 1) / (float)PARTICLEFONTSIZE; + particletexture[texnum].t2 = (basey + PARTICLETEXTURESIZE - 1) / (float)PARTICLEFONTSIZE; + for (y = 0;y < PARTICLETEXTURESIZE;y++) + memcpy(particletexturedata + ((basey + y) * PARTICLEFONTSIZE + basex) * 4, data + y * PARTICLETEXTURESIZE * 4, PARTICLETEXTURESIZE * 4); } void particletextureblotch(qbyte *data, float radius, float red, float green, float blue, float alpha) @@ -1567,20 +1554,20 @@ void particletextureblotch(qbyte *data, float radius, float red, float green, fl int x, y; float cx, cy, dx, dy, f, iradius; qbyte *d; - cx = lhrandom(radius + 1, 30 - radius); - cy = lhrandom(radius + 1, 30 - radius); + cx = (lhrandom(radius + 1, PARTICLETEXTURESIZE - 2 - radius) + lhrandom(radius + 1, PARTICLETEXTURESIZE - 2 - radius)) * 0.5f; + cy = (lhrandom(radius + 1, PARTICLETEXTURESIZE - 2 - radius) + lhrandom(radius + 1, PARTICLETEXTURESIZE - 2 - radius)) * 0.5f; iradius = 1.0f / radius; alpha *= (1.0f / 255.0f); - for (y = 0;y < 32;y++) + for (y = 0;y < PARTICLETEXTURESIZE;y++) { - for (x = 0;x < 32;x++) + for (x = 0;x < PARTICLETEXTURESIZE;x++) { dx = (x - cx); dy = (y - cy); f = (1.0f - sqrt(dx * dx + dy * dy) * iradius) * alpha; if (f > 0) { - d = data + (y * 32 + x) * 4; + d = data + (y * PARTICLETEXTURESIZE + x) * 4; d[0] += f * (red - d[0]); d[1] += f * (green - d[1]); d[2] += f * (blue - d[2]); @@ -1592,7 +1579,7 @@ void particletextureblotch(qbyte *data, float radius, float red, float green, fl void particletextureclamp(qbyte *data, int minr, int ming, int minb, int maxr, int maxg, int maxb) { int i; - for (i = 0;i < 32*32;i++, data += 4) + for (i = 0;i < PARTICLETEXTURESIZE*PARTICLETEXTURESIZE;i++, data += 4) { data[0] = bound(minr, data[0], maxr); data[1] = bound(ming, data[1], maxg); @@ -1603,7 +1590,7 @@ void particletextureclamp(qbyte *data, int minr, int ming, int minb, int maxr, i void particletextureinvert(qbyte *data) { int i; - for (i = 0;i < 32*32;i++, data += 4) + for (i = 0;i < PARTICLETEXTURESIZE*PARTICLETEXTURESIZE;i++, data += 4) { data[0] = 255 - data[0]; data[1] = 255 - data[1]; @@ -1615,9 +1602,9 @@ static void R_InitParticleTexture (void) { int x, y, d, i, j, k, m; float dx, dy, radius, f, f2; - qbyte data[32][32][4], noise1[64][64], noise2[64][64], data2[64][16][4]; + qbyte data[PARTICLETEXTURESIZE][PARTICLETEXTURESIZE][4], noise1[PARTICLETEXTURESIZE*2][PARTICLETEXTURESIZE*2], noise2[PARTICLETEXTURESIZE*2][PARTICLETEXTURESIZE*2], noise3[64][64], data2[64][16][4]; vec3_t light; - qbyte particletexturedata[256*256*4]; + qbyte *particletexturedata; // a note: decals need to modulate (multiply) the background color to // properly darken it (stain), and they need to be able to alpha fade, @@ -1628,7 +1615,8 @@ static void R_InitParticleTexture (void) // and white on black background) so we can alpha fade it to black, then // we invert it again during the blendfunc to make it work... - memset(particletexturedata, 255, sizeof(particletexturedata)); + particletexturedata = Mem_Alloc(tempmempool, PARTICLEFONTSIZE*PARTICLEFONTSIZE*4); + memset(particletexturedata, 255, PARTICLEFONTSIZE*PARTICLEFONTSIZE*4); // smoke for (i = 0;i < 8;i++) @@ -1636,18 +1624,18 @@ static void R_InitParticleTexture (void) memset(&data[0][0][0], 255, sizeof(data)); do { - fractalnoise(&noise1[0][0], 64, 4); - fractalnoise(&noise2[0][0], 64, 8); + fractalnoise(&noise1[0][0], PARTICLETEXTURESIZE*2, PARTICLETEXTURESIZE/8); + fractalnoise(&noise2[0][0], PARTICLETEXTURESIZE*2, PARTICLETEXTURESIZE/4); m = 0; - for (y = 0;y < 32;y++) + for (y = 0;y < PARTICLETEXTURESIZE;y++) { - dy = y - 16; - for (x = 0;x < 32;x++) + dy = (y - 0.5f*PARTICLETEXTURESIZE) / (PARTICLETEXTURESIZE*0.5f-1); + for (x = 0;x < PARTICLETEXTURESIZE;x++) { - dx = x - 16; + dx = (x - 0.5f*PARTICLETEXTURESIZE) / (PARTICLETEXTURESIZE*0.5f-1); d = (noise2[y][x] - 128) * 3 + 192; if (d > 0) - d = d * (256 - (int) (dx*dx+dy*dy)) / 256; + d = d * (1-(dx*dx+dy*dy)); d = (d * noise1[y][x]) >> 7; d = bound(0, d, 255); data[y][x][3] = (qbyte) d; @@ -1664,15 +1652,15 @@ static void R_InitParticleTexture (void) for (i = 0;i < 16;i++) { memset(&data[0][0][0], 255, sizeof(data)); - radius = i * 3.0f / 16.0f; + radius = i * 3.0f / 4.0f / 16.0f; f2 = 255.0f * ((15.0f - i) / 15.0f); - for (y = 0;y < 32;y++) + for (y = 0;y < PARTICLETEXTURESIZE;y++) { - dy = (y - 16) * 0.25f; - for (x = 0;x < 32;x++) + dy = (y - 0.5f*PARTICLETEXTURESIZE) / (PARTICLETEXTURESIZE*0.5f-1); + for (x = 0;x < PARTICLETEXTURESIZE;x++) { - dx = (x - 16) * 0.25f; - f = (1.0 - fabs(radius - sqrt(dx*dx+dy*dy))) * f2; + dx = (x - 0.5f*PARTICLETEXTURESIZE) / (PARTICLETEXTURESIZE*0.5f-1); + f = f2 * (1.0 - 4.0f * fabs(radius - sqrt(dx*dx+dy*dy))); data[y][x][3] = (int) (bound(0.0f, f, 255.0f)); } } @@ -1681,13 +1669,13 @@ static void R_InitParticleTexture (void) // normal particle memset(&data[0][0][0], 255, sizeof(data)); - for (y = 0;y < 32;y++) + for (y = 0;y < PARTICLETEXTURESIZE;y++) { - dy = y - 16; - for (x = 0;x < 32;x++) + dy = (y - 0.5f*PARTICLETEXTURESIZE) / (PARTICLETEXTURESIZE*0.5f-1); + for (x = 0;x < PARTICLETEXTURESIZE;x++) { - dx = x - 16; - d = (256 - (dx*dx+dy*dy)); + dx = (x - 0.5f*PARTICLETEXTURESIZE) / (PARTICLETEXTURESIZE*0.5f-1); + d = 256 * (1 - (dx*dx+dy*dy)); d = bound(0, d, 255); data[y][x][3] = (qbyte) d; } @@ -1698,18 +1686,38 @@ static void R_InitParticleTexture (void) memset(&data[0][0][0], 255, sizeof(data)); light[0] = 1;light[1] = 1;light[2] = 1; VectorNormalize(light); - for (y = 0;y < 32;y++) - for (x = 0;x < 32;x++) - 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); + for (y = 0;y < PARTICLETEXTURESIZE;y++) + { + dy = (y - 0.5f*PARTICLETEXTURESIZE) / (PARTICLETEXTURESIZE*0.5f-1); + // stretch upper half of bubble by +50% and shrink lower half by -50% + // (this gives an elongated teardrop shape) + if (dy > 0.5f) + dy = (dy - 0.5f) * 2.0f; + else + dy = (dy - 0.5f) / 1.5f; + for (x = 0;x < PARTICLETEXTURESIZE;x++) + { + dx = (x - 0.5f*PARTICLETEXTURESIZE) / (PARTICLETEXTURESIZE*0.5f-1); + // shrink bubble width to half + dx *= 2.0f; + data[y][x][3] = shadebubble(dx, dy, light); + } + } setuptex(tex_raindrop, &data[0][0][0], particletexturedata); // bubble memset(&data[0][0][0], 255, sizeof(data)); light[0] = 1;light[1] = 1;light[2] = 1; VectorNormalize(light); - for (y = 0;y < 32;y++) - for (x = 0;x < 32;x++) - data[y][x][3] = shadebubble((x - 16) * (1.0 / 16.0), (y - 16) * (1.0 / 16.0), light); + for (y = 0;y < PARTICLETEXTURESIZE;y++) + { + dy = (y - 0.5f*PARTICLETEXTURESIZE) / (PARTICLETEXTURESIZE*0.5f-1); + for (x = 0;x < PARTICLETEXTURESIZE;x++) + { + dx = (x - 0.5f*PARTICLETEXTURESIZE) / (PARTICLETEXTURESIZE*0.5f-1); + data[y][x][3] = shadebubble(dx, dy, light); + } + } setuptex(tex_bubble, &data[0][0][0], particletexturedata); // blood particles @@ -1717,7 +1725,7 @@ static void R_InitParticleTexture (void) { memset(&data[0][0][0], 255, sizeof(data)); for (k = 0;k < 24;k++) - particletextureblotch(&data[0][0][0], 2, 96, 0, 0, 160); + particletextureblotch(&data[0][0][0], PARTICLETEXTURESIZE/16, 96, 0, 0, 160); //particletextureclamp(&data[0][0][0], 32, 32, 32, 255, 255, 255); particletextureinvert(&data[0][0][0]); setuptex(tex_bloodparticle[i], &data[0][0][0], particletexturedata); @@ -1727,11 +1735,10 @@ static void R_InitParticleTexture (void) for (i = 0;i < 8;i++) { memset(&data[0][0][0], 255, sizeof(data)); - for (k = 0;k < 24;k++) - particletextureblotch(&data[0][0][0], 2, 96, 0, 0, 96); - for (j = 3;j < 7;j++) - for (k = 0, m = rand() % 12;k < m;k++) - particletextureblotch(&data[0][0][0], j, 96, 0, 0, 192); + m = 8; + for (j = 1;j < 10;j++) + for (k = min(j, m - 1);k < m;k++) + particletextureblotch(&data[0][0][0], (float)j*PARTICLETEXTURESIZE/64.0f, 96, 0, 0, 192 - j * 8); //particletextureclamp(&data[0][0][0], 32, 32, 32, 255, 255, 255); particletextureinvert(&data[0][0][0]); setuptex(tex_blooddecal[i], &data[0][0][0], particletexturedata); @@ -1742,9 +1749,9 @@ static void R_InitParticleTexture (void) { memset(&data[0][0][0], 255, sizeof(data)); for (k = 0;k < 12;k++) - particletextureblotch(&data[0][0][0], 2, 0, 0, 0, 128); + particletextureblotch(&data[0][0][0], PARTICLETEXTURESIZE/16, 0, 0, 0, 128); for (k = 0;k < 3;k++) - particletextureblotch(&data[0][0][0], 14, 0, 0, 0, 160); + particletextureblotch(&data[0][0][0], PARTICLETEXTURESIZE/2, 0, 0, 0, 160); //particletextureclamp(&data[0][0][0], 64, 64, 64, 255, 255, 255); particletextureinvert(&data[0][0][0]); setuptex(tex_bulletdecal[i], &data[0][0][0], particletexturedata); @@ -1755,29 +1762,36 @@ static void R_InitParticleTexture (void) glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); #else + +#if 0 + Image_WriteTGARGBA ("particles/particlefont.tga", PARTICLEFONTSIZE, PARTICLEFONTSIZE, particletexturedata); +#endif + particlefonttexture = loadtextureimage(particletexturepool, "particles/particlefont.tga", 0, 0, false, TEXF_ALPHA | TEXF_PRECACHE); if (!particlefonttexture) - particlefonttexture = R_LoadTexture2D(particletexturepool, "particlefont", 256, 256, particletexturedata, TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL); + particlefonttexture = R_LoadTexture2D(particletexturepool, "particlefont", PARTICLEFONTSIZE, PARTICLEFONTSIZE, particletexturedata, TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL); for (i = 0;i < MAX_PARTICLETEXTURES;i++) particletexture[i].texture = particlefonttexture; // nexbeam - fractalnoise(&noise1[0][0], 64, 4); + fractalnoise(&noise3[0][0], 64, 4); m = 0; for (y = 0;y < 64;y++) { + dy = (y - 0.5f*64) / (64*0.5f-1); for (x = 0;x < 16;x++) { - if (x < 8) - d = x; - else - d = (15 - x); - d = d * d * noise1[y][x] / (7 * 7); + dx = (x - 0.5f*16) / (16*0.5f-2); + d = (1 - sqrt(fabs(dx))) * noise3[y][x]; data2[y][x][0] = data2[y][x][1] = data2[y][x][2] = (qbyte) bound(0, d, 255); data2[y][x][3] = 255; } } +#if 0 + Image_WriteTGARGBA ("particles/nexbeam.tga", 64, 64, &data2[0][0][0]); +#endif + particletexture[tex_beam].texture = loadtextureimage(particletexturepool, "particles/nexbeam.tga", 0, 0, false, TEXF_ALPHA | TEXF_PRECACHE); if (!particletexture[tex_beam].texture) particletexture[tex_beam].texture = R_LoadTexture2D(particletexturepool, "nexbeam", 16, 64, &data2[0][0][0], TEXTYPE_RGBA, TEXF_PRECACHE, NULL); @@ -1786,6 +1800,7 @@ static void R_InitParticleTexture (void) particletexture[tex_beam].s2 = 1; particletexture[tex_beam].t2 = 1; #endif + Mem_Free(particletexturedata); } static void r_part_start(void) @@ -1943,8 +1958,8 @@ void R_DrawParticleCallback(const void *calldata1, int calldata2) R_CalcBeam_Vertex3f(particle_vertex3f, p->org, p->vel2, p->scalex); VectorSubtract(p->vel2, p->org, up); VectorNormalizeFast(up); - v[0] = DotProduct(p->org, up) * (1.0f / 64.0f) - cl.time * 0.25; - v[1] = DotProduct(p->vel2, up) * (1.0f / 64.0f) - cl.time * 0.25; + v[0] = DotProduct(p->org, up) * (1.0f / 64.0f); + v[1] = DotProduct(p->vel2, up) * (1.0f / 64.0f); particle_texcoord2f[0] = 1;particle_texcoord2f[1] = v[0]; particle_texcoord2f[2] = 0;particle_texcoord2f[3] = v[0]; particle_texcoord2f[4] = 0;particle_texcoord2f[5] = v[1]; @@ -2008,7 +2023,12 @@ void R_DrawParticles (void) { c_particles++; if (DotProduct(p->org, r_viewforward) >= minparticledist || p->orientation == PARTICLE_BEAM) - R_MeshQueue_AddTransparent(p->org, R_DrawParticleCallback, p, 0); + { + if (p->type == pt_decal) + R_DrawParticleCallback(p, 0); + else + R_MeshQueue_AddTransparent(p->org, R_DrawParticleCallback, p, 0); + } } } #endif