YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-01-17 18:40:02 +00:00
Code Issues Projects Releases Wiki Activity

engine: client: more accurate decompilation of CL_LerpPoint and ComputeInterpolationAmount

Browse Source
This commit is contained in:
Alibek Omarov 2023-01-07 11:08:32 +03:00
parent 40ba0238f8
commit 9152bbf106
2 changed files with 16 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
engine/client/cl_main.c
View File

@ -242,11 +242,6 @@ void CL_SignonReply( void )
} }
} }
float CL_LerpInterval( void )
{
return Q_max( cl_interp->value, 1.f / cl_updaterate->value );
}
/* /*
=============== ===============
CL_LerpPoint CL_LerpPoint
@ -257,55 +252,26 @@ should be put at.
*/ */
static float CL_LerpPoint( void ) static float CL_LerpPoint( void )
{ {
float frac = 1.0f; double f = cl_serverframetime();
float server_frametime = cl_serverframetime(); double frac;
if( server_frametime == 0.0f || cls.timedemo ) if( f == 0.0 || cls.timedemo )
{ {
double fgap = cl_clientframetime();
cl.time = cl.mtime[0]; cl.time = cl.mtime[0];
// maybe don't need for Xash demos
if( cls.demoplayback )
cl.oldtime = cl.mtime[0] - fgap;
return 1.0f; return 1.0f;
} }
if( server_frametime > 0.1f ) if( cl_interp->value <= 0.001 )
{ return 1.0f;
// dropped packet, or start of demo
cl.mtime[1] = cl.mtime[0] - 0.1f; frac = ( cl.time - cl.mtime[0] ) / cl_interp->value;
server_frametime = 0.1f;
}
#if 0
/*
g-cont: this code more suitable for singleplayer
NOTE in multiplayer causes significant framerate stutter/jitter and
occuring frames with zero time delta and even with negative time delta.
game becomes more twitchy and as if without interpolation.
*/
frac = (cl.time - cl.mtime[1]) / f;
if( frac < 0.0f )
{
if( frac < -0.01f )
cl.time = cl.mtime[1];
frac = 0.0f;
}
else if( frac > 1.0f )
{
if( frac > 1.01f )
cl.time = cl.mtime[0];
frac = 1.0f;
}
#else
// for multiplayer
if( cl_interp->value > 0.001f )
{
// manual lerp value (goldsrc mode)
float td = Q_max( 0.f, cl.time - cl.mtime[0] );
frac = td / CL_LerpInterval();
}
else if( server_frametime > 0.001f )
{
// automatic lerp (classic mode)
frac = ( cl.time - cl.mtime[1] ) / server_frametime;
}
#endif
return frac; return frac;
} }
@ -347,7 +313,7 @@ Validate interpolation cvars, calc interpolation window
void CL_ComputeClientInterpolationAmount( usercmd_t *cmd ) void CL_ComputeClientInterpolationAmount( usercmd_t *cmd )
{ {
const float epsilon = 0.001f; // to avoid float invalid comparision const float epsilon = 0.001f; // to avoid float invalid comparision
float min_interp = MIN_EX_INTERP; float min_interp;
float max_interp = MAX_EX_INTERP; float max_interp = MAX_EX_INTERP;
float interpolation_time; float interpolation_time;
@ -367,7 +333,7 @@ void CL_ComputeClientInterpolationAmount( usercmd_t *cmd )
max_interp = 0.2f; max_interp = 0.2f;
min_interp = 1.0f / cl_updaterate->value; min_interp = 1.0f / cl_updaterate->value;
interpolation_time = CL_LerpInterval( ); interpolation_time = cl_interp->value * 1000.0;
if( (cl_interp->value + epsilon) < min_interp ) if( (cl_interp->value + epsilon) < min_interp )
{ {

1
engine/client/client.h
View File

@ -108,7 +108,6 @@ extern int CL_UPDATE_BACKUP;
#define MIN_UPDATERATE 10.0f #define MIN_UPDATERATE 10.0f
#define MAX_UPDATERATE 102.0f #define MAX_UPDATERATE 102.0f
#define MIN_EX_INTERP 0.005f
#define MAX_EX_INTERP 0.1f #define MAX_EX_INTERP 0.1f
#define CL_MIN_RESEND_TIME 1.5f // mininum time gap (in seconds) before a subsequent connection request is sent. #define CL_MIN_RESEND_TIME 1.5f // mininum time gap (in seconds) before a subsequent connection request is sent.