summaryrefslogtreecommitdiff
path: root/source/cl_pred.c
diff options
context:
space:
mode:
Diffstat (limited to 'source/cl_pred.c')
-rw-r--r--source/cl_pred.c365
1 files changed, 168 insertions, 197 deletions
diff --git a/source/cl_pred.c b/source/cl_pred.c
index 5b56a9f..edf43dc 100644
--- a/source/cl_pred.c
+++ b/source/cl_pred.c
@@ -27,124 +27,92 @@ CL_CheckPredictionError
===================
*/
void CL_CheckPredictionError( void ) {
- int frame;
- int delta[3];
- unsigned cmd;
- int len;
- player_state_t *ps;
-
- if( !cls.netchan ) {
- return;
- }
+ int frame;
+ int delta[3];
+ unsigned cmd;
+ int len;
+ player_state_t *ps;
+
+ if( !cls.netchan ) {
+ return;
+ }
- if( sv_paused->integer ) {
- VectorClear( cl.prediction_error );
- return;
- }
+ if( sv_paused->integer ) {
+ VectorClear( cl.prediction_error );
+ return;
+ }
- ps = &cl.frame.ps;
+ ps = &cl.frame.ps;
- if( !cl_predict->integer || ( ps->pmove.pm_flags & PMF_NO_PREDICTION ) )
- return;
+ if( !cl_predict->integer || ( ps->pmove.pm_flags & PMF_NO_PREDICTION ) )
+ return;
- // calculate the last usercmd_t we sent that the server has processed
- frame = cls.netchan->incoming_acknowledged & CMD_MASK;
- cmd = cl.history[frame].cmdNumber;
+ // calculate the last usercmd_t we sent that the server has processed
+ frame = cls.netchan->incoming_acknowledged & CMD_MASK;
+ cmd = cl.history[frame].cmdNumber;
// don't predict steps against server returned data
if( cl.predicted_step_frame < cmd + 1 ) {
cl.predicted_step_frame = cmd + 1;
}
- cmd &= CMD_MASK;
+ cmd &= CMD_MASK;
- // compare what the server returned with what we had predicted it to be
- VectorSubtract( ps->pmove.origin, cl.predicted_origins[cmd], delta );
+ // compare what the server returned with what we had predicted it to be
+ VectorSubtract( ps->pmove.origin, cl.predicted_origins[cmd], delta );
- // save the prediction error for interpolation
- len = abs( delta[0] ) + abs( delta[1] ) + abs( delta[2] );
- if( len > 640 ) { // 80 world units
- // a teleport or something
- VectorClear( cl.prediction_error );
- } else {
- if( cl_showmiss->integer && ( delta[0] || delta[1] || delta[2] ) ) {
- Com_Printf( "prediction miss on %i: %i\n", cl.frame.number, len );
- }
+ // save the prediction error for interpolation
+ len = abs( delta[0] ) + abs( delta[1] ) + abs( delta[2] );
+ if( len > 640 ) { // 80 world units
+ // a teleport or something
+ VectorClear( cl.prediction_error );
+ } else {
+ if( cl_showmiss->integer && ( delta[0] || delta[1] || delta[2] ) ) {
+ Com_Printf( "prediction miss on %i: %i\n", cl.frame.number, len );
+ }
- VectorCopy( ps->pmove.origin, cl.predicted_origins[cmd] );
-
- // save for error interpolation
- VectorScale( delta, 0.125f, cl.prediction_error );
- }
-}
+ VectorCopy( ps->pmove.origin, cl.predicted_origins[cmd] );
-void CL_BuildSolidList( void ) {
- int i, num;
- entity_state_t *ent;
-
- cl.numSolidEntities = 0;
- for( i = 0; i < cl.frame.numEntities; i++ ) {
- num = ( cl.frame.firstEntity + i ) & PARSE_ENTITIES_MASK;
- ent = &cl.entityStates[num];
-
- if( ent->number == cl.frame.clientNum + 1 ) {
- continue;
- }
- if( !ent->solid ) {
- continue;
- }
-
- cl.solidEntities[cl.numSolidEntities++] = ent;
- }
+ // save for error interpolation
+ VectorScale( delta, 0.125f, cl.prediction_error );
+ }
}
-
/*
====================
CL_ClipMoveToEntities
====================
*/
-static void CL_ClipMoveToEntities ( vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, trace_t *tr ) {
- int i, x, zd, zu;
- trace_t trace;
- cnode_t *headnode;
- entity_state_t *ent;
- cmodel_t *cmodel;
- vec3_t bmins, bmaxs;
-
- for (i=0 ; i<cl.numSolidEntities ; i++) {
- ent = cl.solidEntities[i];
-
- if (ent->solid == 31) {
+static void CL_ClipMoveToEntities( vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, trace_t *tr ) {
+ int i;
+ trace_t trace;
+ cnode_t *headnode;
+ centity_t *ent;
+ cmodel_t *cmodel;
+
+ for( i = 0; i < cl.numSolidEntities; i++ ) {
+ ent = cl.solidEntities[i];
+
+ if( ent->current.solid == 31 ) {
// special value for bmodel
- cmodel = cl.model_clip[ent->modelindex];
- if (!cmodel)
- continue;
- headnode = cmodel->headnode;
- } else {
- // encoded bbox
- x = 8*(ent->solid & 31);
- zd = 8*((ent->solid>>5) & 31);
- zu = 8*((ent->solid>>10) & 63) - 32;
-
- bmins[0] = bmins[1] = -x;
- bmaxs[0] = bmaxs[1] = x;
- bmins[2] = -zd;
- bmaxs[2] = zu;
-
- headnode = CM_HeadnodeForBox (bmins, bmaxs);
- }
-
- if (tr->allsolid)
- return;
-
- CM_TransformedBoxTrace (&trace, start, end,
- mins, maxs, headnode, MASK_PLAYERSOLID,
- ent->origin, ent->angles);
-
- CM_ClipEntity( tr, &trace, ( struct edict_s * )ent );
- }
+ cmodel = cl.model_clip[ent->current.modelindex];
+ if( !cmodel )
+ continue;
+ headnode = cmodel->headnode;
+ } else {
+ headnode = CM_HeadnodeForBox( ent->mins, ent->maxs );
+ }
+
+ if( tr->allsolid )
+ return;
+
+ CM_TransformedBoxTrace( &trace, start, end,
+ mins, maxs, headnode, MASK_PLAYERSOLID,
+ ent->current.origin, ent->current.angles );
+
+ CM_ClipEntity( tr, &trace, ( struct edict_s * )ent );
+ }
}
@@ -154,41 +122,44 @@ CL_PMTrace
================
*/
static trace_t CL_Trace (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end) {
- trace_t t;
+ trace_t t;
- // check against world
- CM_BoxTrace (&t, start, end, mins, maxs, cl.cm.cache->nodes, MASK_PLAYERSOLID);
- if (t.fraction < 1.0)
- t.ent = (struct edict_s *)1;
+ // check against world
+ CM_BoxTrace (&t, start, end, mins, maxs, cl.cm.cache->nodes, MASK_PLAYERSOLID);
+ if (t.fraction < 1.0)
+ t.ent = (struct edict_s *)1;
- // check all other solid models
- CL_ClipMoveToEntities (start, mins, maxs, end, &t);
+ // check all other solid models
+ CL_ClipMoveToEntities (start, mins, maxs, end, &t);
- return t;
+ return t;
}
static int CL_PointContents (vec3_t point) {
- int i;
- entity_state_t *ent;
- cmodel_t *cmodel;
- int contents;
+ int i;
+ centity_t *ent;
+ cmodel_t *cmodel;
+ int contents;
- contents = CM_PointContents (point, cl.cm.cache->nodes);
+ contents = CM_PointContents (point, cl.cm.cache->nodes);
- for (i=0 ; i<cl.numSolidEntities ; i++) {
- ent = cl.solidEntities[i];
+ for (i=0 ; i<cl.numSolidEntities ; i++) {
+ ent = cl.solidEntities[i];
- if (ent->solid != 31) // special value for bmodel
- continue;
+ if (ent->current.solid != 31) // special value for bmodel
+ continue;
- cmodel = cl.model_clip[ent->modelindex];
- if (!cmodel)
- continue;
+ cmodel = cl.model_clip[ent->current.modelindex];
+ if (!cmodel)
+ continue;
- contents |= CM_TransformedPointContents (point, cmodel->headnode, ent->origin, ent->angles);
- }
+ contents |= CM_TransformedPointContents(
+ point, cmodel->headnode,
+ ent->current.origin,
+ ent->current.angles );
+ }
- return contents;
+ return contents;
}
@@ -200,96 +171,96 @@ Sets cl.predicted_origin and cl.predicted_angles
=================
*/
void CL_PredictMovement( void ) {
- unsigned ack, current, frame;
- pmove_t pm;
- int step, oldz;
- player_state_t *ps;
-
- if( cls.state != ca_active ) {
- return;
- }
-
- if( cls.demo.playback ) {
- return;
- }
-
- if( sv_paused->integer ) {
- return;
- }
-
- ps = &cl.frame.ps;
-
- if( !cl_predict->integer || ( ps->pmove.pm_flags & PMF_NO_PREDICTION ) ) {
- // just set angles
- cl.predicted_angles[0] = cl.viewangles[0] + SHORT2ANGLE( ps->pmove.delta_angles[0] );
- cl.predicted_angles[1] = cl.viewangles[1] + SHORT2ANGLE( ps->pmove.delta_angles[1] );
- cl.predicted_angles[2] = cl.viewangles[2] + SHORT2ANGLE( ps->pmove.delta_angles[2] );
- return;
- }
-
- ack = cl.history[cls.netchan->incoming_acknowledged & CMD_MASK].cmdNumber;
- current = cl.cmdNumber;
-
- // if we are too far out of date, just freeze
- if( current - ack > CMD_BACKUP - 1 ) {
- if( cl_showmiss->integer ) {
- Com_Printf( "%i: exceeded CMD_BACKUP\n", cl.frame.number );
- }
- return;
- }
-
- if( !cl.cmd.msec && current == ack ) {
- if( cl_showmiss->integer ) {
- Com_Printf( "%i: not moved\n", cl.frame.number );
- }
- return;
- }
-
- // copy current state to pmove
- memset( &pm, 0, sizeof( pm ) );
- pm.trace = CL_Trace;
- pm.pointcontents = CL_PointContents;
-
- pm.s = ps->pmove;
+ unsigned ack, current, frame;
+ pmove_t pm;
+ int step, oldz;
+ player_state_t *ps;
+
+ if( cls.state != ca_active ) {
+ return;
+ }
+
+ if( cls.demo.playback ) {
+ return;
+ }
+
+ if( sv_paused->integer ) {
+ return;
+ }
+
+ ps = &cl.frame.ps;
+
+ if( !cl_predict->integer || ( ps->pmove.pm_flags & PMF_NO_PREDICTION ) ) {
+ // just set angles
+ cl.predicted_angles[0] = cl.viewangles[0] + SHORT2ANGLE( ps->pmove.delta_angles[0] );
+ cl.predicted_angles[1] = cl.viewangles[1] + SHORT2ANGLE( ps->pmove.delta_angles[1] );
+ cl.predicted_angles[2] = cl.viewangles[2] + SHORT2ANGLE( ps->pmove.delta_angles[2] );
+ return;
+ }
+
+ ack = cl.history[cls.netchan->incoming_acknowledged & CMD_MASK].cmdNumber;
+ current = cl.cmdNumber;
+
+ // if we are too far out of date, just freeze
+ if( current - ack > CMD_BACKUP - 1 ) {
+ if( cl_showmiss->integer ) {
+ Com_Printf( "%i: exceeded CMD_BACKUP\n", cl.frame.number );
+ }
+ return;
+ }
+
+ if( !cl.cmd.msec && current == ack ) {
+ if( cl_showmiss->integer ) {
+ Com_Printf( "%i: not moved\n", cl.frame.number );
+ }
+ return;
+ }
+
+ // copy current state to pmove
+ memset( &pm, 0, sizeof( pm ) );
+ pm.trace = CL_Trace;
+ pm.pointcontents = CL_PointContents;
+
+ pm.s = ps->pmove;
#if USE_SMOOTH_DELTA_ANGLES
VectorCopy( cl.delta_angles, pm.s.delta_angles );
#endif
- // run frames
- while( ++ack <= current ) {
- pm.cmd = cl.cmds[ack & CMD_MASK];
- Pmove( &pm, &cl.pmp );
+ // run frames
+ while( ++ack <= current ) {
+ pm.cmd = cl.cmds[ack & CMD_MASK];
+ Pmove( &pm, &cl.pmp );
- // save for debug checking
- VectorCopy( pm.s.origin, cl.predicted_origins[ack & CMD_MASK] );
- }
+ // save for debug checking
+ VectorCopy( pm.s.origin, cl.predicted_origins[ack & CMD_MASK] );
+ }
- // run pending cmd
+ // run pending cmd
if( cl.cmd.msec ) {
pm.cmd = cl.cmd;
pm.cmd.forwardmove = cl.move[0];
pm.cmd.sidemove = cl.move[1];
pm.cmd.upmove = cl.move[2];
Pmove( &pm, &cl.pmp );
- frame = current;
-
- // save for debug checking
- VectorCopy( pm.s.origin, cl.predicted_origins[( current + 1 ) & CMD_MASK] );
- } else {
- frame = current - 1;
- }
-
- oldz = cl.predicted_origins[cl.predicted_step_frame & CMD_MASK][2];
- step = pm.s.origin[2] - oldz;
- if( step > 63 && step < 160 && ( pm.s.pm_flags & PMF_ON_GROUND ) ) {
- cl.predicted_step = step * 0.125f;
- cl.predicted_step_time = cls.realtime;/// - cls.frametime * 500;
- }
- cl.predicted_step_frame = frame;
-
- // copy results out for rendering
- VectorScale( pm.s.origin, 0.125f, cl.predicted_origin );
- VectorScale( pm.s.velocity, 0.125f, cl.predicted_velocity );
- VectorCopy( pm.viewangles, cl.predicted_angles );
+ frame = current;
+
+ // save for debug checking
+ VectorCopy( pm.s.origin, cl.predicted_origins[( current + 1 ) & CMD_MASK] );
+ } else {
+ frame = current - 1;
+ }
+
+ oldz = cl.predicted_origins[cl.predicted_step_frame & CMD_MASK][2];
+ step = pm.s.origin[2] - oldz;
+ if( step > 63 && step < 160 && ( pm.s.pm_flags & PMF_ON_GROUND ) ) {
+ cl.predicted_step = step * 0.125f;
+ cl.predicted_step_time = cls.realtime;/// - cls.frametime * 500;
+ }
+ cl.predicted_step_frame = frame;
+
+ // copy results out for rendering
+ VectorScale( pm.s.origin, 0.125f, cl.predicted_origin );
+ VectorScale( pm.s.velocity, 0.125f, cl.predicted_velocity );
+ VectorCopy( pm.viewangles, cl.predicted_angles );
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 10:34:04 +0000