thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 20:41:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve splash particles

Browse source 
- Properly support cone
- Properly support spread
- Reduce impact speed
- Don't recalculate momentum for each particle
This commit is contained in:
Sally Coolatta 2022-09-14 00:02:02 -04:00
parent e89290f68d
commit ca641afcda
1 changed files with 30 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/k_terrain.c
View file

@ -527,14 +527,22 @@ static void K_SpawnSplashParticles(mobj_t *mo, t_splash_t *s, fixed_t impact)
{ {
const UINT8 numParticles = s->numParticles; const UINT8 numParticles = s->numParticles;
const angle_t particleSpread = ANGLE_MAX / numParticles; const angle_t particleSpread = ANGLE_MAX / numParticles;
fixed_t momH = INT32_MAX;
fixed_t momV = INT32_MAX;
size_t i; size_t i;
momH = FixedMul(impact, s->pushH);
momV = FixedMul(impact, s->pushV);
for (i = 0; i < numParticles; i++) for (i = 0; i < numParticles; i++)
{ {
mobj_t *dust = NULL; mobj_t *dust = NULL;
angle_t pushAngle = (particleSpread * i); angle_t pushAngle = (particleSpread * i);
fixed_t momH = INT32_MAX;
fixed_t momV = INT32_MAX; fixed_t xOff = 0;
fixed_t yOff = 0;
if (numParticles == 1) if (numParticles == 1)
{ {
@ -542,11 +550,23 @@ static void K_SpawnSplashParticles(mobj_t *mo, t_splash_t *s, fixed_t impact)
pushAngle = P_RandomRange(0, ANGLE_MAX); pushAngle = P_RandomRange(0, ANGLE_MAX);
} }
if (s->spread > 0)
{
xOff = P_RandomRange(-s->spread / FRACUNIT, s->spread / FRACUNIT) * FRACUNIT;
yOff = P_RandomRange(-s->spread / FRACUNIT, s->spread / FRACUNIT) * FRACUNIT;
}
if (s->cone > 0)
{
pushAngle += P_RandomRange(-s->cone / ANG1, s->cone / ANG1) * ANG1;
}
dust = P_SpawnMobjFromMobj( dust = P_SpawnMobjFromMobj(
mo, mo,
(12 * FINECOSINE(pushAngle >> ANGLETOFINESHIFT)), xOff + (12 * FINECOSINE(pushAngle >> ANGLETOFINESHIFT)),
(12 * FINESINE(pushAngle >> ANGLETOFINESHIFT)), yOff + (12 * FINESINE(pushAngle >> ANGLETOFINESHIFT)),
0, s->mobjType 0, //P_RandomRange(0, s->spread / FRACUNIT) * FRACUNIT,
s->mobjType
); );
P_SetTarget(&dust->target, mo); P_SetTarget(&dust->target, mo);
@ -559,12 +579,9 @@ static void K_SpawnSplashParticles(mobj_t *mo, t_splash_t *s, fixed_t impact)
dust->momy = mo->momy / 2; dust->momy = mo->momy / 2;
dust->momz = 0; dust->momz = 0;
momH = FixedMul(impact, s->pushH);
momV = FixedMul(impact, s->pushV);
dust->momx += FixedMul(momH, FINECOSINE(pushAngle >> ANGLETOFINESHIFT)); dust->momx += FixedMul(momH, FINECOSINE(pushAngle >> ANGLETOFINESHIFT));
dust->momy += FixedMul(momH, FINESINE(pushAngle >> ANGLETOFINESHIFT)); dust->momy += FixedMul(momH, FINESINE(pushAngle >> ANGLETOFINESHIFT));
dust->momz += momV * P_MobjFlip(mo); dust->momz += (momV / 16) * P_MobjFlip(mo);
if (s->color != SKINCOLOR_NONE) if (s->color != SKINCOLOR_NONE)
{ {
@ -585,7 +602,7 @@ static void K_SpawnSplashParticles(mobj_t *mo, t_splash_t *s, fixed_t impact)
--------------------------------------------------*/ --------------------------------------------------*/
void K_SpawnSplashForMobj(mobj_t *mo, fixed_t impact) void K_SpawnSplashForMobj(mobj_t *mo, fixed_t impact)
{ {
const fixed_t minImpact = 4 * mo->scale; const fixed_t minImpact = mo->scale;
t_splash_t *s = NULL; t_splash_t *s = NULL;
if (mo == NULL || P_MobjWasRemoved(mo) == true) if (mo == NULL || P_MobjWasRemoved(mo) == true)
@ -610,6 +627,8 @@ void K_SpawnSplashForMobj(mobj_t *mo, fixed_t impact)
return; return;
} }
impact /= 4;
if (impact < minImpact) if (impact < minImpact)
{ {
impact = minImpact; impact = minImpact;
@ -699,7 +718,7 @@ static void K_SpawnFootstepParticle(mobj_t *mo, t_footstep_t *fs, tic_t timer)
dust->momx = mo->momx; dust->momx = mo->momx;
dust->momy = mo->momy; dust->momy = mo->momy;
dust->momz = P_GetMobjZMovement(mo) / 2; dust->momz = P_GetMobjZMovement(mo);
momH = FixedMul(momentum, fs->pushH); momH = FixedMul(momentum, fs->pushH);
momV = FixedMul(momentum, fs->pushV); momV = FixedMul(momentum, fs->pushV);