thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-post-race-camera-follow' into 'master'

Browse source 
Revert smoother camera turning

Closes #764 and #763

See merge request KartKrew/Kart!1621
This commit is contained in:
Oni 2023-11-14 19:12:21 +00:00
commit ac2bd65b74
3 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/r_fps.c
View file

@ -140,6 +140,10 @@ void R_InterpolateView(fixed_t frac)
prevview = newview; prevview = newview;
} }
viewx = R_LerpFixed(prevview->x, newview->x, frac);
viewy = R_LerpFixed(prevview->y, newview->y, frac);
viewz = R_LerpFixed(prevview->z, newview->z, frac);
viewangle = R_LerpAngle(prevview->angle, newview->angle, frac); viewangle = R_LerpAngle(prevview->angle, newview->angle, frac);
aimingangle = R_LerpAngle(prevview->aim, newview->aim, frac); aimingangle = R_LerpAngle(prevview->aim, newview->aim, frac);
viewroll = R_LerpAngle(prevview->roll, newview->roll, frac); viewroll = R_LerpAngle(prevview->roll, newview->roll, frac);
@ -147,12 +151,6 @@ void R_InterpolateView(fixed_t frac)
viewsin = FINESINE(viewangle>>ANGLETOFINESHIFT); viewsin = FINESINE(viewangle>>ANGLETOFINESHIFT);
viewcos = FINECOSINE(viewangle>>ANGLETOFINESHIFT); viewcos = FINECOSINE(viewangle>>ANGLETOFINESHIFT);
fixed_t zoom = R_LerpFixed(prevview->zoom, newview->zoom, frac);
viewx = R_LerpFixed(prevview->x, newview->x, frac) - FixedMul(viewcos, zoom);
viewy = R_LerpFixed(prevview->y, newview->y, frac) - FixedMul(viewsin, zoom);
viewz = R_LerpFixed(prevview->z, newview->z, frac);
viewplayer = newview->player; viewplayer = newview->player;
viewsector = R_PointInSubsector(viewx, viewy)->sector; viewsector = R_PointInSubsector(viewx, viewy)->sector;

1
src/r_fps.h
View file

@ -48,7 +48,6 @@ struct viewvars_t {
fixed_t x; fixed_t x;
fixed_t y; fixed_t y;
fixed_t z; fixed_t z;
fixed_t zoom;
boolean sky; boolean sky;
sector_t *sector; sector_t *sector;
player_t *player; player_t *player;

11
src/r_main.cpp
View file

@ -1244,7 +1244,6 @@ void R_SetupFrame(int s)
newview->x = r_viewmobj->x; newview->x = r_viewmobj->x;
newview->y = r_viewmobj->y; newview->y = r_viewmobj->y;
newview->z = r_viewmobj->z; newview->z = r_viewmobj->z;
newview->zoom = 0;
R_SetupCommonFrame(player, r_viewmobj->subsector); R_SetupCommonFrame(player, r_viewmobj->subsector);
} }
@ -1253,13 +1252,9 @@ void R_SetupFrame(int s)
{ {
r_viewmobj = NULL; r_viewmobj = NULL;
fixed_t x = player->mo ? player->mo->x : thiscam->x; newview->x = thiscam->x;
fixed_t y = player->mo ? player->mo->y : thiscam->y; newview->y = thiscam->y;
newview->x = x;
newview->y = y;
newview->z = thiscam->z + (thiscam->height>>1); newview->z = thiscam->z + (thiscam->height>>1);
newview->zoom = FixedHypot(thiscam->x - x, thiscam->y - y);
R_SetupCommonFrame(player, thiscam->subsector); R_SetupCommonFrame(player, thiscam->subsector);
} }
@ -1272,7 +1267,6 @@ void R_SetupFrame(int s)
newview->x = r_viewmobj->x; newview->x = r_viewmobj->x;
newview->y = r_viewmobj->y; newview->y = r_viewmobj->y;
newview->z = player->viewz; newview->z = player->viewz;
newview->zoom = 0;
R_SetupCommonFrame(player, r_viewmobj->subsector); R_SetupCommonFrame(player, r_viewmobj->subsector);
} }
@ -1303,7 +1297,6 @@ void R_SkyboxFrame(int s)
newview->x = r_viewmobj->x; newview->x = r_viewmobj->x;
newview->y = r_viewmobj->y; newview->y = r_viewmobj->y;
newview->z = r_viewmobj->z; // 26/04/17: use actual Z position instead of spawnpoint angle! newview->z = r_viewmobj->z; // 26/04/17: use actual Z position instead of spawnpoint angle!
newview->zoom = 0;
if (mapheaderinfo[gamemap-1]) if (mapheaderinfo[gamemap-1])
{ {