xutaxkamay/css_enhanced_waf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Corrected smoothed out interp amount

Browse source
This commit is contained in:
unknown 2024-08-24 04:40:01 +02:00
parent cdad67973d
commit 1856a9ee30
2 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
engine/host.cpp
View file

@ -4,6 +4,7 @@
// //
//===========================================================================// //===========================================================================//
#include "datamap.h"
#include "dbg.h" #include "dbg.h"
#include "tier0/fasttimer.h" #include "tier0/fasttimer.h"
@ -3167,10 +3168,18 @@ void _Host_RunFrame (float time)
// //
// Now includes smoothing. // Now includes smoothing.
static ConVar cl_interpolation_amount_fix("cl_interpolation_amount_fix", "1");
static float flLastInterpolationAmountOnTick = 0.0f; static float flLastInterpolationAmountOnTick = 0.0f;
float flInterpAmount = cl.m_tickRemainder / host_state.interval_per_tick; float flInterpAmount = cl.m_tickRemainder / host_state.interval_per_tick;
if (numticks > 0) if (!cl_interpolation_amount_fix.GetBool())
{
g_ClientGlobalVariables.interpolation_amount = flInterpAmount;
return;
}
if (numticks > 0 || host_frametime >= host_state.interval_per_tick)
{ {
#ifdef false #ifdef false
printf("interpolation amount was %f, corrected to " printf("interpolation amount was %f, corrected to "
@ -3182,11 +3191,16 @@ void _Host_RunFrame (float time)
} }
else else
{ {
// Just subtract the amount, so we can get a smooth interpolation being on a correct amount. float flEstimatedAmountToAdd = host_frametime / host_state.interval_per_tick;
g_ClientGlobalVariables.interpolation_amount = flInterpAmount - flLastInterpolationAmountOnTick;
g_ClientGlobalVariables.interpolation_amount += flEstimatedAmountToAdd;
// Accumulate also the one we diddn't account for.
g_ClientGlobalVariables.interpolation_amount += flLastInterpolationAmountOnTick * flEstimatedAmountToAdd;
ErrorIfNot(g_ClientGlobalVariables.interpolation_amount >= 0.0f, ErrorIfNot(g_ClientGlobalVariables.interpolation_amount >= 0.0f,
("Interpolation amount was lower than 0 (%f)\n", g_ClientGlobalVariables.interpolation_amount)); ("Interpolation amount was lower than 0 (%f)\n", g_ClientGlobalVariables.interpolation_amount));
ErrorIfNot(g_ClientGlobalVariables.interpolation_amount < 1.0f,
("Interpolation amount was higher than or equal to 1 (%f)\n", g_ClientGlobalVariables.interpolation_amount));
#ifdef false #ifdef false
printf("current interp: %f, old amount: %f, time: %f, frametime: %f, last remainder not interpolated: %f\n", printf("current interp: %f, old amount: %f, time: %f, frametime: %f, last remainder not interpolated: %f\n",
g_ClientGlobalVariables.interpolation_amount, g_ClientGlobalVariables.interpolation_amount,
@ -3217,7 +3231,7 @@ void _Host_RunFrame (float time)
// Msg( "Running %i ticks (%f remainder) for frametime %f total %f tick %f delta %f\n", numticks, remainder, host_frametime, host_time ); // Msg( "Running %i ticks (%f remainder) for frametime %f total %f tick %f delta %f\n", numticks, remainder, host_frametime, host_time );
g_ServerGlobalVariables.interpolation_amount = 0.0f; g_ServerGlobalVariables.interpolation_amount = 0.0f;
#ifndef SWDS #ifndef SWDS
g_ClientGlobalVariables.interpolation_amount = 0.0f; // g_ClientGlobalVariables.interpolation_amount = 0.0f;
cl.insimulation = true; cl.insimulation = true;
#endif #endif

3
game/server/cstrike/cs_player.cpp
View file

@ -608,8 +608,7 @@ void CCSPlayer::PlayerRunCommand( CUserCmd *ucmd, IMoveHelper *moveHelper )
// don't run commands in the future // don't run commands in the future
if (!IsEngineThreaded() if (!IsEngineThreaded()
&& ((ucmd->tick_count > (gpGlobals->tickcount + sv_max_usercmd_future_ticks.GetInt())) && (ucmd->tick_count > (gpGlobals->tickcount + sv_max_usercmd_future_ticks.GetInt())) && !IsBot())
|| ( ucmd->tick_count < (gpGlobals->tickcount - sv_max_usercmd_future_ticks.GetInt()) )) && !IsBot())
{ {
DevMsg( "Client cmd out of sync (delta: %i, client: %i != server: %i).\n", ucmd->tick_count - gpGlobals->tickcount, ucmd->tick_count, gpGlobals->tickcount); DevMsg( "Client cmd out of sync (delta: %i, client: %i != server: %i).\n", ucmd->tick_count - gpGlobals->tickcount, ucmd->tick_count, gpGlobals->tickcount);
return; return;