FWGS
/
Xash3DArchive
Archived
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

15 Sep 2018

This commit is contained in:
g-cont 2018-09-15 00:00:00 +03:00 committed by Alibek Omarov
parent 7cf8d1688b
commit 1ed50ba6cd
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/const.h
View File

@ -123,7 +123,6 @@
// entity flags
#define EFLAG_SLERP 1 // do studio interpolation of this entity
#define EFLAG_DOINTERP 128 // interpolation is ready
//
// temp entity events

12
engine/client/cl_frame.c
View File

@ -270,8 +270,8 @@ void CL_ProcessEntityUpdate( cl_entity_t *ent )
ent->model = CL_ModelHandle( ent->curstate.modelindex );
ent->index = ent->curstate.number;
// g-cont. make sure what it's no broke XashXT physics
COM_NormalizeAngles( ent->curstate.angles );
if( FBitSet( ent->curstate.entityType, ENTITY_NORMAL ))
COM_NormalizeAngles( ent->curstate.angles );
parametric = CL_ParametricMove( ent );
@ -1037,6 +1037,7 @@ void CL_LinkPacketEntities( frame_t *frame )
cl_entity_t *ent;
entity_state_t *state;
qboolean parametric;
qboolean interpolate;
int i;
for( i = 0; i < frame->num_entities; i++ )
@ -1059,7 +1060,8 @@ void CL_LinkPacketEntities( frame_t *frame )
continue;
}
ent->curstate = *state;
// ent->curstate = *state;
interpolate = false;
if( !ent->model ) continue;
@ -1088,7 +1090,7 @@ void CL_LinkPacketEntities( frame_t *frame )
if( ent->lastmove >= cl.time )
VectorCopy( ent->curstate.origin, ent->latched.prevorigin );
if( FBitSet( host.features, ENGINE_COMPUTE_STUDIO_LERP ))
SetBits( ent->curstate.eflags, EFLAG_DOINTERP );
interpolate = true;
else ent->curstate.movetype = MOVETYPE_STEP;
#else
if( ent->lastmove >= cl.time )
@ -1142,7 +1144,7 @@ void CL_LinkPacketEntities( frame_t *frame )
if( ent->model->type == mod_studio )
{
if( FBitSet( ent->curstate.eflags, EFLAG_DOINTERP ) && FBitSet( host.features, ENGINE_COMPUTE_STUDIO_LERP ))
if( interpolate && FBitSet( host.features, ENGINE_COMPUTE_STUDIO_LERP ))
R_StudioLerpMovement( ent, cl.time, ent->origin, ent->angles );
}
}

2
engine/client/gl_beams.c
View File

@ -1486,7 +1486,7 @@ void CL_DrawBeams( int fTrans )
BEAM *pPrev = NULL;
int i, flags;
if( !cl_draw_beams->value )
if( !CVAR_TO_BOOL( cl_draw_beams ))
return;
pglShadeModel( GL_SMOOTH );

2
engine/client/gl_studio.c
View File

@ -560,7 +560,7 @@ void R_StudioLerpMovement( cl_entity_t *e, double time, vec3_t origin, vec3_t an
// Con_Printf( "%4.2f %.2f %.2f\n", f, e->curstate.animtime, g_studio.time );
VectorLerp( e->latched.prevorigin, f, e->curstate.origin, origin );
if( !VectorCompare( e->curstate.angles, e->latched.prevangles ))
if( !VectorCompareEpsilon( e->curstate.angles, e->latched.prevangles, ON_EPSILON ))
{
vec4_t q, q1, q2;