X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=cl_particles.c;h=25d90792310494f33d6399195cc65dd88c9a0e05;hb=d48093d3ac481d32bd6eabd6c36e3a026779ecde;hp=2ac1966e973a468a01a990312ed2078f6ec67e29;hpb=969a5304d11783e7d389054669659e84c2b5fb98;p=xonotic%2Fdarkplaces.git diff --git a/cl_particles.c b/cl_particles.c index 2ac1966e..25d90792 100644 --- a/cl_particles.c +++ b/cl_particles.c @@ -25,7 +25,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define NUMVERTEXNORMALS 162 siextern float r_avertexnormals[NUMVERTEXNORMALS][3]; #define m_bytenormals r_avertexnormals -#define VectorNormalizeFast VectorNormalize #define CL_PointQ1Contents(v) (Mod_PointInLeaf(v,cl.worldmodel)->contents) typedef unsigned char qbyte; #define cl_stainmaps.integer 0 @@ -46,16 +45,16 @@ void R_CalcBeam_Vertex3f (float *vert, vec3_t org1, vec3_t org2, float width) vec3_t right1, right2, diff, normal; VectorSubtract (org2, org1, normal); - VectorNormalizeFast (normal); + VectorNormalize (normal); // calculate 'right' vector for start VectorSubtract (r_vieworigin, org1, diff); - VectorNormalizeFast (diff); + VectorNormalize (diff); CrossProduct (normal, diff, right1); // calculate 'right' vector for end VectorSubtract (r_vieworigin, org2, diff); - VectorNormalizeFast (diff); + VectorNormalize (diff); CrossProduct (normal, diff, right2); vert[ 0] = org1[0] + width * right1[0]; @@ -79,11 +78,17 @@ void fractalnoise(qbyte *noise, int size, int startgrid) for (sizepower = 0;(1 << sizepower) < size;sizepower++); if (size != (1 << sizepower)) - Sys_Error("fractalnoise: size must be power of 2\n"); + { + Con_Printf("fractalnoise: size must be power of 2\n"); + return; + } for (gridpower = 0;(1 << gridpower) < startgrid;gridpower++); if (startgrid != (1 << gridpower)) - Sys_Error("fractalnoise: grid must be power of 2\n"); + { + Con_Printf("fractalnoise: grid must be power of 2\n"); + return; + } startgrid = bound(0, startgrid, size); @@ -145,14 +150,14 @@ void VectorVectors(const vec3_t forward, vec3_t right, vec3_t up) right[0] -= d * forward[0]; right[1] -= d * forward[1]; right[2] -= d * forward[2]; - VectorNormalizeFast(right); + VectorNormalize(right); CrossProduct(right, forward, up); } #if QW #include "pmove.h" extern qboolean PM_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f, vec3_t p1, vec3_t p2, pmtrace_t *trace); #endif -float CL_TraceLine (vec3_t start, vec3_t end, vec3_t impact, vec3_t normal, int hitbmodels, int *hitent, int hitsupercontentsmask) +trace_t CL_TraceBox (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, int hitbmodels, int *hitent, int hitsupercontentsmask, qboolean hitplayers) { #if QW pmtrace_t trace; @@ -167,9 +172,7 @@ float CL_TraceLine (vec3_t start, vec3_t end, vec3_t impact, vec3_t normal, int #else RecursiveHullCheck (cl.worldmodel->hulls, 0, 0, 1, start, end, &trace); #endif - VectorCopy(trace.endpos, impact); - VectorCopy(trace.plane.normal, normal); - return trace.fraction; + return trace; } #else #include "cl_collision.h" @@ -241,12 +244,10 @@ typedef struct particle_s float gravity; // how much gravity affects this particle (1.0 = normal gravity, 0.0 = none) float friction; // how much air friction affects this object (objects with a low mass/size ratio tend to get more air friction) qbyte color[4]; -#ifndef WORKINGLQUAKE unsigned short owner; // decal stuck to this entity model_t *ownermodel; // model the decal is stuck to (used to make sure the entity is still alive) vec3_t relativeorigin; // decal at this location in entity's coordinate space vec3_t relativedirection; // decal oriented this way relative to entity's coordinate space -#endif } particle_t; @@ -476,20 +477,21 @@ void CL_SpawnDecalParticleForPoint(const vec3_t org, float maxdist, float size, { int i; float bestfrac, bestorg[3], bestnormal[3]; - float frac, v[3], normal[3], org2[3]; + float org2[3]; int besthitent = 0, hitent; + trace_t trace; bestfrac = 10; for (i = 0;i < 32;i++) { VectorRandom(org2); VectorMA(org, maxdist, org2, org2); - frac = CL_TraceLine(org, org2, v, normal, true, &hitent, SUPERCONTENTS_SOLID); - if (bestfrac > frac) + trace = CL_TraceBox(org, vec3_origin, vec3_origin, org2, true, &hitent, SUPERCONTENTS_SOLID, false); + if (bestfrac > trace.fraction) { - bestfrac = frac; + bestfrac = trace.fraction; besthitent = hitent; - VectorCopy(v, bestorg); - VectorCopy(normal, bestnormal); + VectorCopy(trace.endpos, bestorg); + VectorCopy(trace.plane.normal, bestnormal); } } if (bestfrac < 1) @@ -655,6 +657,7 @@ CL_ParticleExplosion void CL_ParticleExplosion (vec3_t org) { int i; + trace_t trace; //vec3_t v; //vec3_t v2; if (cl_stainmaps.integer) @@ -688,10 +691,11 @@ void CL_ParticleExplosion (vec3_t org) v[0] = org[0] + lhrandom(-48, 48); v[1] = org[1] + lhrandom(-48, 48); v[2] = org[2] + lhrandom(-48, 48); - if (CL_TraceLine(org, v, v2, NULL, true, NULL, SUPERCONTENTS_SOLID) >= 0.1) + trace = CL_TraceBox(org, vec3_origin, vec3_origin, v, true, NULL, SUPERCONTENTS_SOLID, false); + if (trace.fraction >= 0.1) break; } - VectorSubtract(v2, org, v2); + VectorSubtract(trace.endpos, org, v2); #endif VectorScale(v2, 2.0f, v2); particle(particletype + pt_smoke, 0x202020, 0x404040, tex_smoke[rand()&7], 12, 32, 64, 0, 0, org[0], org[1], org[2], v2[0], v2[1], v2[2], 0); @@ -796,8 +800,9 @@ void CL_SparkShower (vec3_t org, vec3_t dir, int count, vec_t gravityscale) void CL_Smoke (vec3_t org, vec3_t dir, int count) { - vec3_t org2, org3; + vec3_t org2; int k; + trace_t trace; if (!cl_particles.integer) return; @@ -810,8 +815,8 @@ void CL_Smoke (vec3_t org, vec3_t dir, int count) 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(particletype + pt_smoke, 0x101010, 0x202020, tex_smoke[rand()&7], 3, (1.0f / cl_particles_quality.value) * 255, (1.0f / cl_particles_quality.value) * 1024, 0, 0, org3[0], org3[1], org3[2], lhrandom(-8, 8), lhrandom(-8, 8), lhrandom(-8, 8), 0); + trace = CL_TraceBox(org, vec3_origin, vec3_origin, org2, true, NULL, SUPERCONTENTS_SOLID, false); + particle(particletype + pt_smoke, 0x101010, 0x202020, tex_smoke[rand()&7], 3, (1.0f / cl_particles_quality.value) * 255, (1.0f / cl_particles_quality.value) * 1024, 0, 0, trace.endpos[0], trace.endpos[1], trace.endpos[2], lhrandom(-8, 8), lhrandom(-8, 8), lhrandom(-8, 8), 0); } } } @@ -834,7 +839,8 @@ static float bloodcount = 0; void CL_BloodPuff (vec3_t org, vec3_t vel, int count) { float s; - vec3_t org2, org3; + vec3_t org2; + trace_t trace; // bloodcount is used to accumulate counts too small to cause a blood particle if (!cl_particles.integer) return; if (!cl_particles_blood.integer) return; @@ -849,8 +855,8 @@ void CL_BloodPuff (vec3_t org, vec3_t vel, int count) org2[0] = org[0] + 0.125f * lhrandom(-bloodcount, bloodcount); org2[1] = org[1] + 0.125f * lhrandom(-bloodcount, bloodcount); org2[2] = org[2] + 0.125f * lhrandom(-bloodcount, bloodcount); - CL_TraceLine(org, org2, org3, NULL, true, NULL, SUPERCONTENTS_SOLID); - particle(particletype + pt_blood, 0xFFFFFF, 0xFFFFFF, tex_bloodparticle[rand()&7], 8, cl_particles_blood_alpha.value * 768 / cl_particles_quality.value, cl_particles_blood_alpha.value * 384 / cl_particles_quality.value, 0, -1, org3[0], org3[1], org3[2], vel[0] + lhrandom(-s, s), vel[1] + lhrandom(-s, s), vel[2] + lhrandom(-s, s), 1); + trace = CL_TraceBox(org, vec3_origin, vec3_origin, org2, true, NULL, SUPERCONTENTS_SOLID, false); + particle(particletype + pt_blood, 0xFFFFFF, 0xFFFFFF, tex_bloodparticle[rand()&7], 8, cl_particles_blood_alpha.value * 768 / cl_particles_quality.value, cl_particles_blood_alpha.value * 384 / cl_particles_quality.value, 0, -1, trace.endpos[0], trace.endpos[1], trace.endpos[2], vel[0] + lhrandom(-s, s), vel[1] + lhrandom(-s, s), vel[2] + lhrandom(-s, s), 1); bloodcount -= 16 / cl_particles_quality.value; } } @@ -905,6 +911,7 @@ void CL_ParticleRain (vec3_t mins, vec3_t maxs, vec3_t dir, int count, int color { int k; float t, z, minz, maxz; + particle_t *p; 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;} @@ -940,13 +947,15 @@ void CL_ParticleRain (vec3_t mins, vec3_t maxs, vec3_t dir, int count, int color { k = particlepalette[colorbase + (rand()&3)]; if (gamemode == GAME_GOODVSBAD2) - particle(particletype + pt_snow, k, k, tex_particle, 20, lhrandom(64, 128) / cl_particles_quality.value, 0, 0, -1, lhrandom(mins[0], maxs[0]), lhrandom(mins[1], maxs[1]), lhrandom(minz, maxz), dir[0], dir[1], dir[2], 0); + p = particle(particletype + pt_snow, k, k, tex_particle, 20, lhrandom(64, 128) / cl_particles_quality.value, 0, 0, -1, lhrandom(mins[0], maxs[0]), lhrandom(mins[1], maxs[1]), lhrandom(minz, maxz), dir[0], dir[1], dir[2], 0); else - particle(particletype + pt_snow, k, k, tex_particle, 1, lhrandom(64, 128) / cl_particles_quality.value, 0, 0, -1, lhrandom(mins[0], maxs[0]), lhrandom(mins[1], maxs[1]), lhrandom(minz, maxz), dir[0], dir[1], dir[2], 0); + p = particle(particletype + pt_snow, k, k, tex_particle, 1, lhrandom(64, 128) / cl_particles_quality.value, 0, 0, -1, lhrandom(mins[0], maxs[0]), lhrandom(mins[1], maxs[1]), lhrandom(minz, maxz), dir[0], dir[1], dir[2], 0); + if (p) + VectorCopy(p->vel, p->relativedirection); } break; default: - Host_Error("CL_ParticleRain: unknown type %i (0 = rain, 1 = snow)\n", type); + Con_Printf ("CL_ParticleRain: unknown type %i (0 = rain, 1 = snow)\n", type); } } @@ -973,7 +982,7 @@ void CL_Stardust (vec3_t mins, vec3_t maxs, int count) o[1] = lhrandom(mins[1], maxs[1]); o[2] = lhrandom(mins[2], maxs[2]); VectorSubtract(o, center, v); - VectorNormalizeFast(v); + VectorNormalize(v); VectorScale(v, 100, v); v[2] += sv_gravity.value * 0.15f; particle(particletype + pt_static, 0x903010, 0xFFD030, tex_particle, 1.5, lhrandom(64, 128) / cl_particles_quality.value, 128 / cl_particles_quality.value, 1, 0, o[0], o[1], o[2], v[0], v[1], v[2], 0.2); @@ -1205,6 +1214,8 @@ void CL_RocketTrail (vec3_t start, vec3_t end, int type, int color, entity_t *en particle(particletype + pt_alphastatic, color, color, tex_particle, 5, qd*128, qd*320, 0, 0, pos[0], pos[1], pos[2], 0, 0, 0, 0); break; #endif + default: + Sys_Error("CL_RocketTrail: unknown trail type %i\n", type); } // advance to next time and position @@ -1266,8 +1277,9 @@ void CL_MoveParticles (void) { particle_t *p; int i, maxparticle, j, a, content; - float gravity, dvel, bloodwaterfade, frametime, f, dist, normal[3], v[3], org[3], oldorg[3]; + float gravity, dvel, bloodwaterfade, frametime, f, dist, org[3], oldorg[3]; int hitent; + trace_t trace; // LordHavoc: early out condition if (!cl_numparticles) @@ -1312,17 +1324,17 @@ void CL_MoveParticles (void) if (p->type == particletype + pt_rain) { // raindrop - splash on solid/water/slime/lava - if (CL_TraceLine(oldorg, p->org, v, normal, true, NULL, SUPERCONTENTS_SOLID | SUPERCONTENTS_LIQUIDSMASK) < 1) + trace = CL_TraceBox(oldorg, vec3_origin, vec3_origin, p->org, true, NULL, SUPERCONTENTS_SOLID | SUPERCONTENTS_LIQUIDSMASK, false); + if (trace.fraction < 1) { - VectorCopy(v, p->org); - // splash - p->type = particletype + pt_raindecal; // convert from a raindrop particle to a rainsplash decal + VectorCopy(trace.endpos, p->org); + VectorCopy(trace.plane.normal, p->vel); + VectorAdd(p->org, p->vel, p->org); + p->type = particletype + pt_raindecal; p->texnum = tex_rainsplash[0]; p->time2 = cl.time; p->alphafade = p->alpha / 0.4; - VectorCopy(normal, p->vel); - VectorAdd(p->org, normal, p->org); p->bounce = 0; p->friction = 0; p->gravity = 0; @@ -1332,12 +1344,16 @@ void CL_MoveParticles (void) else if (p->type == particletype + pt_blood) { // blood - splash on solid - if (CL_TraceLine(oldorg, p->org, v, normal, true, &hitent, SUPERCONTENTS_SOLID) < 1) + trace = CL_TraceBox(oldorg, vec3_origin, vec3_origin, p->org, true, &hitent, SUPERCONTENTS_SOLID, false); + if (trace.fraction < 1) { - VectorCopy(v, p->org); + // convert from a blood particle to a blood decal + VectorCopy(trace.endpos, p->org); + VectorCopy(trace.plane.normal, p->vel); + VectorAdd(p->org, p->vel, p->org); #ifndef WORKINGLQUAKE if (cl_stainmaps.integer) - R_Stain(v, 32, 32, 16, 16, p->alpha * p->size * (1.0f / 40.0f), 192, 48, 48, p->alpha * p->size * (1.0f / 40.0f)); + R_Stain(p->org, 32, 32, 16, 16, p->alpha * p->size * (1.0f / 40.0f), 192, 48, 48, p->alpha * p->size * (1.0f / 40.0f)); #endif if (!cl_decals.integer) { @@ -1346,19 +1362,15 @@ void CL_MoveParticles (void) } p->type = particletype + pt_decal; - // convert from a blood particle to a blood decal p->texnum = tex_blooddecal[rand()&7]; #ifndef WORKINGLQUAKE p->owner = hitent; p->ownermodel = cl_entities[hitent].render.model; - Matrix4x4_Transform(&cl_entities[hitent].render.inversematrix, v, p->relativeorigin); - Matrix4x4_Transform3x3(&cl_entities[hitent].render.inversematrix, normal, p->relativedirection); - VectorAdd(p->relativeorigin, p->relativedirection, p->relativeorigin); + Matrix4x4_Transform(&cl_entities[hitent].render.inversematrix, p->org, p->relativeorigin); + Matrix4x4_Transform3x3(&cl_entities[hitent].render.inversematrix, p->vel, p->relativedirection); #endif p->time2 = cl.time; p->alphafade = 0; - VectorCopy(normal, p->vel); - VectorAdd(p->org, normal, p->org); p->bounce = 0; p->friction = 0; p->gravity = 0; @@ -1367,9 +1379,10 @@ void CL_MoveParticles (void) } else { - if (CL_TraceLine(oldorg, p->org, v, normal, true, NULL, SUPERCONTENTS_SOLID) < 1) + trace = CL_TraceBox(oldorg, vec3_origin, vec3_origin, p->org, true, NULL, SUPERCONTENTS_SOLID, false); + if (trace.fraction < 1) { - VectorCopy(v, p->org); + VectorCopy(trace.endpos, p->org); if (p->bounce < 0) { p->type = NULL; @@ -1377,8 +1390,8 @@ void CL_MoveParticles (void) } else { - dist = DotProduct(p->vel, normal) * -p->bounce; - VectorMA(p->vel, dist, normal, p->vel); + dist = DotProduct(p->vel, trace.plane.normal) * -p->bounce; + VectorMA(p->vel, dist, trace.plane.normal, p->vel); if (DotProduct(p->vel, p->vel) < 0.03) VectorClear(p->vel); } @@ -1461,9 +1474,9 @@ void CL_MoveParticles (void) { // snow flutter p->time2 = cl.time + (rand() & 3) * 0.1; - p->vel[0] += lhrandom(-32, 32); - p->vel[1] += lhrandom(-32, 32); - p->vel[2] += lhrandom(-32, 32); + p->vel[0] = p->relativedirection[0] + lhrandom(-32, 32); + p->vel[1] = p->relativedirection[1] + lhrandom(-32, 32); + //p->vel[2] = p->relativedirection[2] + lhrandom(-32, 32); } #ifdef WORKINGLQUAKE a = CL_PointQ1Contents(p->org); @@ -2005,7 +2018,7 @@ void R_DrawParticleCallback(const void *calldata1, int calldata2) { R_CalcBeam_Vertex3f(particle_vertex3f, p->org, p->vel, size); VectorSubtract(p->vel, p->org, up); - VectorNormalizeFast(up); + VectorNormalize(up); v[0] = DotProduct(p->org, up) * (1.0f / 64.0f); v[1] = DotProduct(p->vel, up) * (1.0f / 64.0f); particle_texcoord2f[0] = 1;particle_texcoord2f[1] = v[0]; @@ -2014,7 +2027,10 @@ void R_DrawParticleCallback(const void *calldata1, int calldata2) particle_texcoord2f[6] = 1;particle_texcoord2f[7] = v[1]; } else - Host_Error("R_DrawParticles: unknown particle orientation %i\n", p->type->orientation); + { + Con_Printf("R_DrawParticles: unknown particle orientation %i\n", p->type->orientation); + return; + } #if WORKINGLQUAKE if (blendmode == PBLEND_ALPHA)