From 7a780bf898bad4e7eff5c7993f0ada40c72a4204 Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 29 Sep 2023 21:07:58 +0200 Subject: [PATCH] make precip interpolation toggable saves a few frames while looking basically the same --- src/r_fps.c | 24 +++++++++++++----------- src/r_fps.h | 1 + src/r_main.c | 1 + 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/r_fps.c b/src/r_fps.c index 8ae69e435..dd211a015 100644 --- a/src/r_fps.c +++ b/src/r_fps.c @@ -37,6 +37,8 @@ static CV_PossibleValue_t fpscap_cons_t[] = { }; consvar_t cv_fpscap = {"fpscap", "Match refresh rate", CV_SAVE, fpscap_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_precipinterp = {"precipinterpolation", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; + UINT32 R_GetFramerateCap(void) { if (rendermode == render_none) @@ -315,7 +317,7 @@ void R_InterpolateMobjState(mobj_t *mobj, fixed_t frac, interpmobjstate_t *out) void R_InterpolatePrecipMobjState(precipmobj_t *mobj, fixed_t frac, interpmobjstate_t *out) { - if (frac == FRACUNIT) + if (frac == FRACUNIT || !cv_precipinterp.value) { out->x = mobj->x; out->y = mobj->y; @@ -330,18 +332,18 @@ void R_InterpolatePrecipMobjState(precipmobj_t *mobj, fixed_t frac, interpmobjst return; } - out->x = mobj->x; - out->y = mobj->y; - out->z = mobj->z; - out->scale = FRACUNIT; - out->spritexscale = mobj->spritexscale; - out->spriteyscale = mobj->spriteyscale; - out->spritexoffset = mobj->spritexoffset; - out->spriteyoffset = mobj->spriteyoffset; + out->x = R_LerpFixed(mobj->old_x, mobj->x, frac); + out->y = R_LerpFixed(mobj->old_y, mobj->y, frac); + out->z = R_LerpFixed(mobj->old_z, mobj->z, frac); + out->scale = FRACUNIT; + out->spritexscale = mobj->spritexscale; + out->spriteyscale = mobj->spriteyscale; + out->spritexoffset = mobj->spritexoffset; + out->spriteyoffset = mobj->spriteyoffset; - out->subsector = mobj->subsector; + out->subsector = R_PointInSubsector(out->x, out->y); - out->angle = mobj->angle; + out->angle = R_LerpAngle(mobj->old_angle, mobj->angle, frac); } static void AddInterpolator(levelinterpolator_t* interpolator) diff --git a/src/r_fps.h b/src/r_fps.h index 625a23b49..520843fd2 100644 --- a/src/r_fps.h +++ b/src/r_fps.h @@ -20,6 +20,7 @@ #include "r_state.h" extern consvar_t cv_fpscap; +extern consvar_t cv_precipinterp; UINT32 R_GetFramerateCap(void); boolean R_UsingFrameInterpolation(void); diff --git a/src/r_main.c b/src/r_main.c index 0e8fc9361..0afb4b16f 100644 --- a/src/r_main.c +++ b/src/r_main.c @@ -2010,4 +2010,5 @@ void R_RegisterEngineStuff(void) // Frame interpolation/uncapped CV_RegisterVar(&cv_fpscap); + CV_RegisterVar(&cv_precipinterp); }