From 221079e39350c17c6d8555bc81b391ec7681468b Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 28 Sep 2025 16:19:51 +0200 Subject: [PATCH 1/2] another attempt to rectify engine timing issues much more sane than spamming i_updatetime everywhere lmao lets see if this still reduces interpolation jitters --- src/d_main.c | 4 ++-- src/i_time.c | 32 +++++++++++++++++++++++++++++++- src/i_time.h | 2 ++ 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index fd3e93649..485103898 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -866,12 +866,12 @@ void D_SRB2Loop(void) // I looked at the possibility of putting in a float drawer for // perfstats and it's very complicated, so we'll just do this instead... - ps_interp_frac.value.p = (precise_t)((FIXED_TO_FLOAT(g_time.timefrac)) * 1000.0f); + ps_interp_frac.value.p = (precise_t)((FIXED_TO_FLOAT(I_GetTimeFrac())) * 1000.0f); ps_interp_lag.value.p = (precise_t)((deltasecs) * 1000.0); const boolean lagging = ((deltatics >= 1.0) || hu_stopped); - R_SetTimeFrac(lagging ? FRACUNIT : g_time.timefrac); + R_SetTimeFrac(lagging ? FRACUNIT : I_GetTimeFrac()); } else { diff --git a/src/i_time.c b/src/i_time.c index 7414ed6f7..6b9ee8537 100644 --- a/src/i_time.c +++ b/src/i_time.c @@ -30,9 +30,39 @@ static precise_t enterprecise, oldenterprecise; static fixed_t entertic, oldentertics; static double tictimer; +// experiment to prevent timing issues +// this returns the global time state accounted with how much time has passed +// since it was last updated +static void I_GetTimeAndFrac(tic_t *outtics, fixed_t *outfrac) +{ + double ticratescaled; + double elapsedseconds; + + ticratescaled = (double)TICRATE * FixedToDouble(cv_timescale.value); + + elapsedseconds = (double)(I_GetPreciseTime() - oldenterprecise) / I_GetPrecisePrecision(); + + double fractional, integral; + fractional = modf((tictimer + elapsedseconds) * ticratescaled, &integral); + + if (outtics) + *outtics = g_time.time + (tic_t)integral; + if (outfrac) + *outfrac = DoubleToFixed(fractional); +} + tic_t I_GetTime(void) { - return g_time.time; + tic_t tic; + I_GetTimeAndFrac(&tic, NULL); + return tic; +} + +fixed_t I_GetTimeFrac(void) +{ + fixed_t frac; + I_GetTimeAndFrac(NULL, &frac); + return frac; } void I_InitializeTime(void) diff --git a/src/i_time.h b/src/i_time.h index cab36133b..cf5639f87 100644 --- a/src/i_time.h +++ b/src/i_time.h @@ -34,6 +34,8 @@ extern consvar_t cv_timescale; */ tic_t I_GetTime(void); +fixed_t I_GetTimeFrac(void); + /** \brief Initializes timing system. */ void I_InitializeTime(void); From ab79a02462704bd7c34ed6b8f9c4080f875546f3 Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 2 Oct 2025 16:20:15 +0200 Subject: [PATCH 2/2] reuse ticratescaled from I_UpdateTime fixes major performance regression + prob shouldnt take this into account this later eitherway --- src/i_time.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/i_time.c b/src/i_time.c index 6b9ee8537..63fc8a88a 100644 --- a/src/i_time.c +++ b/src/i_time.c @@ -29,17 +29,15 @@ consvar_t cv_timescale = {"timescale", "1.0", CV_NETVAR|CV_CHEAT|CV_FLOAT, times static precise_t enterprecise, oldenterprecise; static fixed_t entertic, oldentertics; static double tictimer; +static double ticratescaled; // experiment to prevent timing issues // this returns the global time state accounted with how much time has passed // since it was last updated static void I_GetTimeAndFrac(tic_t *outtics, fixed_t *outfrac) { - double ticratescaled; double elapsedseconds; - ticratescaled = (double)TICRATE * FixedToDouble(cv_timescale.value); - elapsedseconds = (double)(I_GetPreciseTime() - oldenterprecise) / I_GetPrecisePrecision(); double fractional, integral; @@ -81,11 +79,11 @@ void I_InitializeTime(void) entertic = 0; oldentertics = 0; tictimer = 0.0; + ticratescaled = 1.0; } void I_UpdateTime(fixed_t timescale) { - double ticratescaled; double elapsedseconds; tic_t realtics;