zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-01-19 16:11:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

View fixes when predicting

Browse source 
View interpolation paths are now reset properly when predicting, fixing portals. Teleporters disabling view interpolation is now handled before every movement instead of only once at the start of predicting. Enabled FoV interpolation when playing online.
This commit is contained in:
Boondorl 2024-04-25 16:10:00 -04:00 committed by Ricardo Luís Vaz Silva
parent cf6bad97e8
commit ca95e18742
2 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/playsim/p_mobj.cpp
View file

@ -3662,10 +3662,6 @@ void AActor::SetViewAngle(DAngle ang, int fflags)
double AActor::GetFOV(double ticFrac) double AActor::GetFOV(double ticFrac)
{ {
// [B] Disable interpolation when playing online, otherwise it gets vomit inducing
if (netgame)
return player ? player->FOV : CameraFOV;
double fov; double fov;
if (player) if (player)
{ {

21
src/playsim/p_user.cpp
View file

@ -1437,7 +1437,6 @@ void P_PredictPlayer (player_t *player)
act->flags &= ~MF_PICKUP; act->flags &= ~MF_PICKUP;
act->flags2 &= ~MF2_PUSHWALL; act->flags2 &= ~MF2_PUSHWALL;
act->renderflags &= ~RF_NOINTERPOLATEVIEW;
player->cheats |= CF_PREDICTING; player->cheats |= CF_PREDICTING;
BackupNodeList(act, act->touching_sectorlist, &sector_t::touching_thinglist, PredictionTouchingSectors_sprev_Backup, PredictionTouchingSectorsBackup); BackupNodeList(act, act->touching_sectorlist, &sector_t::touching_thinglist, PredictionTouchingSectors_sprev_Backup, PredictionTouchingSectorsBackup);
@ -1474,11 +1473,16 @@ void P_PredictPlayer (player_t *player)
act->BlockNode = NULL; act->BlockNode = NULL;
// Values too small to be usable for lerping can be considered "off". // Values too small to be usable for lerping can be considered "off".
bool CanLerp = (!(cl_predict_lerpscale < 0.01f) && (ticdup == 1)), DoLerp = false, NoInterpolateOld = R_GetViewInterpolationStatus(); bool CanLerp = (!(cl_predict_lerpscale < 0.01f) && (ticdup == 1)), DoLerp = false;
// This essentially acts like a mini P_Ticker where only the stuff relevant to the client is actually
// called. Call order is preserved.
for (int i = gametic; i < maxtic; ++i) for (int i = gametic; i < maxtic; ++i)
{ {
if (!NoInterpolateOld) // Make sure any portal paths have been cleared from the previous movement.
R_RebuildViewInterpolation(player); R_ClearInterpolationPath();
r_NoInterpolate = false;
// Because we're always predicting, this will get set by teleporters and then can never unset itself in the renderer properly.
player->mo->renderflags &= ~RF_NOINTERPOLATEVIEW;
player->cmd = localcmds[i % LOCALCMDTICS]; player->cmd = localcmds[i % LOCALCMDTICS];
player->mo->ClearInterpolation(); player->mo->ClearInterpolation();
@ -1486,7 +1490,7 @@ void P_PredictPlayer (player_t *player)
P_PlayerThink (player); P_PlayerThink (player);
player->mo->Tick (); player->mo->Tick ();
if (CanLerp && PredictionLast.gametic > 0 && i == PredictionLast.gametic && !NoInterpolateOld) if (CanLerp && PredictionLast.gametic > 0 && i == PredictionLast.gametic)
{ {
// Z is not compared as lifts will alter this with no apparent change // Z is not compared as lifts will alter this with no apparent change
// Make lerping less picky by only testing whole units // Make lerping less picky by only testing whole units
@ -1503,12 +1507,11 @@ void P_PredictPlayer (player_t *player)
} }
} }
// TODO: This should be changed to a proper rubberbanding solution in the near future (only rubberband if there was
// a mismatch between client's last predicted pos and current predicted pos).
if (CanLerp) if (CanLerp)
{ {
if (NoInterpolateOld) if (DoLerp)
P_PredictionLerpReset();
else if (DoLerp)
{ {
// If lerping is already in effect, use the previous camera postion so the view doesn't suddenly snap // If lerping is already in effect, use the previous camera postion so the view doesn't suddenly snap
PredictionLerpFrom = (PredictionLerptics == 0) ? PredictionLast : PredictionLerpResult; PredictionLerpFrom = (PredictionLerptics == 0) ? PredictionLast : PredictionLerpResult;