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

Fix use of easing functions, add distance buffer

Browse source
This commit is contained in:
Sally Coolatta 2023-09-23 06:11:40 -04:00
parent e6a19362fc
commit ca0b5902ba
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/p_spec.c
View file

@ -9412,20 +9412,24 @@ void P_DoQuakeOffset(UINT8 view, mappoint_t *viewPos, mappoint_t *offset)
ir = quake->intensity; ir = quake->intensity;
// Modulate with time remaining. // Modulate with time remaining.
ir = Easing_InOutSine(FRACUNIT * (quake->time + 1) / quake->startTime, ir, 0); const fixed_t timeEase = (FRACUNIT * ((quake->startTime - quake->time) - 1)) / quake->startTime;
ir = Easing_InCubic(timeEase, ir, 0);
// Modulate with distance from epicenter, if it exists. // Modulate with distance from epicenter, if it exists.
if (quake->radius > 0 && quake->epicenter != NULL) if (quake->radius > 0 && quake->epicenter != NULL)
{ {
fixed_t epidist = P_AproxDistance( const fixed_t distBuffer = 256 * mapobjectscale; // add a small buffer zone before it starts to drop off
const fixed_t epidist = P_AproxDistance(
P_AproxDistance( P_AproxDistance(
viewPos->x - quake->epicenter->x, viewPos->x - quake->epicenter->x,
viewPos->y - quake->epicenter->y viewPos->y - quake->epicenter->y
), ),
viewPos->z - quake->epicenter->z viewPos->z - quake->epicenter->z
); ) - distBuffer;
ir = Easing_InOutSine(min(FRACUNIT, FixedDiv(epidist, quake->radius)), ir, 0);
const fixed_t distEase = min(FixedDiv(max(epidist, 0), quake->radius), FRACUNIT);
ir = Easing_InCubic(distEase, ir, 0);
} }
addZ += ir; addZ += ir;