thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-02-18 11:32:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix + improve podium camera movement

Browse source 
- Record starting position properly for easing
- Uses linear easing now (everything else ended up looking bad with multiple waypoints, would to calculate splines if you wanted to ease that)
- arg4 is now how long the camera spends between each waypoint
This commit is contained in:
Sally Coolatta 2023-03-02 17:25:46 -05:00
parent 3850f2d579
commit 32c6baf2fc
2 changed files with 34 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/p_mobj.c
View file

@ -9493,24 +9493,23 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
{
mobj->momx = mobj->momy = mobj->momz = 0;
if (mobj->movefactor <= 0)
{
mobj->movefactor = FRACUNIT / TICRATE; // default speed
}
if (mobj->tracer != NULL && P_MobjWasRemoved(mobj->tracer) == false)
{
fixed_t dist = P_AproxDistance(
P_AproxDistance(
mobj->tracer->x - mobj->x,
mobj->tracer->y - mobj->y
),
mobj->tracer->z - mobj->z
);
mobj->movecount += mobj->movefactor;
mobj->angle = Easing_OutSine(FRACUNIT/8, mobj->angle, mobj->tracer->angle);
mobj->pitch = Easing_OutSine(FRACUNIT/8, mobj->pitch, mobj->tracer->pitch);
if (dist > mobj->radius)
if (mobj->movecount < FRACUNIT)
{
fixed_t newX = Easing_OutSine(FRACUNIT/8, mobj->x, mobj->tracer->x);
fixed_t newY = Easing_OutSine(FRACUNIT/8, mobj->y, mobj->tracer->y);
fixed_t newZ = Easing_OutSine(FRACUNIT/8, mobj->z, mobj->tracer->z);
fixed_t newX = Easing_Linear(mobj->movecount, mobj->extravalue1, mobj->tracer->x);
fixed_t newY = Easing_Linear(mobj->movecount, mobj->extravalue2, mobj->tracer->y);
fixed_t newZ = Easing_Linear(mobj->movecount, mobj->cusval, mobj->tracer->z);
mobj->angle = Easing_Linear(mobj->movecount, mobj->movedir, mobj->tracer->angle);
mobj->pitch = Easing_Linear(mobj->movecount, mobj->lastlook, mobj->tracer->pitch);
mobj->momx = newX - mobj->x;
mobj->momy = newY - mobj->y;
@ -9519,6 +9518,12 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
else
{
P_SetTarget(&mobj->tracer, P_GetNextTubeWaypoint(mobj->tracer, false));
mobj->movecount = 0; // time
mobj->movedir = mobj->angle; // start angle
mobj->lastlook = mobj->pitch; // start pitch
mobj->extravalue1 = mobj->x; // start x
mobj->extravalue2 = mobj->y; // start y
mobj->cusval = mobj->z; // start z
}
}

15
src/p_spec.c
View file

@ -3105,6 +3105,21 @@ boolean P_ProcessSpecial(activator_t *activator, INT16 special, INT32 *args, cha
&newViewMobj->tracer,
P_GetFirstTubeWaypoint(args[3] - 1)
);
newViewMobj->movecount = 0; // time
newViewMobj->movedir = newViewMobj->angle; // start angle
newViewMobj->lastlook = newViewMobj->pitch; // start pitch
newViewMobj->extravalue1 = newViewMobj->x; // start x
newViewMobj->extravalue2 = newViewMobj->y; // start y
newViewMobj->cusval = newViewMobj->z; // start z
if (args[4] > 0)
{
newViewMobj->movefactor = FRACUNIT / args[4];
}
else
{
newViewMobj->movefactor = FRACUNIT / TICRATE; // default speed
}
}
else
{