vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

NS{Entity,RenderableEntity,SurfacePropEntity}: network avelocity in a separate check

Browse source
This commit is contained in:
Marco Cawthorne 2022-08-11 14:19:10 -07:00
parent 55427f718a
commit 7228c0d43a
Signed by: eukara
GPG key ID: CE2032F0A2882A22
6 changed files with 46 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/shared/NSEntity.h
View file

@ -26,6 +26,7 @@ enumflags
BASEFL_CHANGED_VELOCITY_X,
BASEFL_CHANGED_VELOCITY_Y,
BASEFL_CHANGED_VELOCITY_Z,
BASEFL_CHANGED_ANGULARVELOCITY,
BASEFL_CHANGED_SIZE,
BASEFL_CHANGED_FLAGS,
BASEFL_CHANGED_SOLID,
@ -67,6 +68,7 @@ class NSEntity:NSTrigger
PREDICTED_FLOAT_N(scale);
PREDICTED_FLOAT_N(flags);
PREDICTED_VECTOR_N(velocity);
PREDICTED_VECTOR_N(avelocity);
/* not needed to be saved right now */
float m_flTouchTime;

9
src/shared/NSEntity.qc
View file

@ -308,6 +308,9 @@ NSEntity::ReceiveEntity(float flNew, float flChanged)
READENTITY_COORD(velocity[0], BASEFL_CHANGED_VELOCITY_X)
READENTITY_COORD(velocity[1], BASEFL_CHANGED_VELOCITY_Y)
READENTITY_COORD(velocity[2], BASEFL_CHANGED_VELOCITY_Z)
READENTITY_COORD(avelocity[0], BASEFL_CHANGED_ANGULARVELOCITY)
READENTITY_COORD(avelocity[1], BASEFL_CHANGED_ANGULARVELOCITY)
READENTITY_COORD(avelocity[2], BASEFL_CHANGED_ANGULARVELOCITY)
if (modelindex) {
drawmask = MASK_ENGINE;
@ -388,6 +391,9 @@ NSEntity::SendEntity(entity ePEnt, float flChanged)
SENDENTITY_COORD(velocity[0], BASEFL_CHANGED_VELOCITY_X)
SENDENTITY_COORD(velocity[1], BASEFL_CHANGED_VELOCITY_Y)
SENDENTITY_COORD(velocity[2], BASEFL_CHANGED_VELOCITY_Z)
SENDENTITY_COORD(avelocity[0], BASEFL_CHANGED_ANGULARVELOCITY)
SENDENTITY_COORD(avelocity[1], BASEFL_CHANGED_ANGULARVELOCITY)
SENDENTITY_COORD(avelocity[2], BASEFL_CHANGED_ANGULARVELOCITY)
return (1);
}
@ -418,6 +424,9 @@ NSEntity::EvaluateEntity(void)
EVALUATE_VECTOR(velocity, 0, BASEFL_CHANGED_VELOCITY_X)
EVALUATE_VECTOR(velocity, 1, BASEFL_CHANGED_VELOCITY_Y)
EVALUATE_VECTOR(velocity, 2, BASEFL_CHANGED_VELOCITY_Z)
EVALUATE_VECTOR(avelocity, 0, BASEFL_CHANGED_ANGULARVELOCITY)
EVALUATE_VECTOR(avelocity, 1, BASEFL_CHANGED_ANGULARVELOCITY)
EVALUATE_VECTOR(avelocity, 2, BASEFL_CHANGED_ANGULARVELOCITY)
}
/* Make sure StartFrame calls this */

5
src/shared/NSRenderableEntity.h
View file

@ -25,14 +25,14 @@ enumflags
RDENT_CHANGED_MODELINDEX,
RDENT_CHANGED_SIZE,
RDENT_CHANGED_FLAGS,
RDENT_CHANGED_SOLID,
RDENT_CHANGED_SOLIDMOVETYPE,
RDENT_CHANGED_FRAME,
RDENT_CHANGED_SKIN,
RDENT_CHANGED_MOVETYPE,
RDENT_CHANGED_EFFECTS,
RDENT_CHANGED_BODY,
RDENT_CHANGED_SCALE,
RDENT_CHANGED_VELOCITY,
RDENT_CHANGED_ANGULARVELOCITY,
RDENT_CHANGED_RENDERCOLOR,
RDENT_CHANGED_RENDERAMT,
RDENT_CHANGED_RENDERMODE,
@ -113,6 +113,7 @@ class NSRenderableEntity:NSEntity
PREDICTED_INT(m_iBody);
PREDICTED_FLOAT_N(colormap);
PREDICTED_VECTOR_N(glowmod);
/* model events */
float m_flBaseTime;

21
src/shared/NSRenderableEntity.qc
View file

@ -80,8 +80,8 @@ NSRenderableEntity::EvaluateEntity(void)
EVALUATE_VECTOR(angles, 2, RDENT_CHANGED_ANGLES_Z)
EVALUATE_FIELD(modelindex, RDENT_CHANGED_MODELINDEX)
EVALUATE_FIELD(colormap, RDENT_CHANGED_MODELINDEX)
EVALUATE_FIELD(solid, RDENT_CHANGED_SOLID)
EVALUATE_FIELD(movetype, RDENT_CHANGED_FLAGS)
EVALUATE_FIELD(solid, RDENT_CHANGED_SOLIDMOVETYPE)
EVALUATE_FIELD(movetype, RDENT_CHANGED_SOLIDMOVETYPE)
EVALUATE_FIELD(flags, RDENT_CHANGED_FLAGS)
EVALUATE_VECTOR(mins, 0, RDENT_CHANGED_SIZE)
EVALUATE_VECTOR(mins, 1, RDENT_CHANGED_SIZE)
@ -97,6 +97,9 @@ NSRenderableEntity::EvaluateEntity(void)
EVALUATE_VECTOR(velocity, 0, RDENT_CHANGED_VELOCITY)
EVALUATE_VECTOR(velocity, 1, RDENT_CHANGED_VELOCITY)
EVALUATE_VECTOR(velocity, 2, RDENT_CHANGED_VELOCITY)
EVALUATE_VECTOR(avelocity, 0, RDENT_CHANGED_ANGULARVELOCITY)
EVALUATE_VECTOR(avelocity, 1, RDENT_CHANGED_ANGULARVELOCITY)
EVALUATE_VECTOR(avelocity, 2, RDENT_CHANGED_ANGULARVELOCITY)
EVALUATE_FIELD(m_iRenderMode, RDENT_CHANGED_RENDERMODE)
EVALUATE_FIELD(m_iRenderFX, RDENT_CHANGED_RENDERMODE)
EVALUATE_VECTOR(m_vecRenderColor, 0, RDENT_CHANGED_RENDERCOLOR)
@ -136,8 +139,8 @@ NSRenderableEntity::SendEntity(entity ePEnt, float flChanged)
SENDENTITY_ANGLE(angles[2], RDENT_CHANGED_ANGLES_Z)
SENDENTITY_SHORT(modelindex, RDENT_CHANGED_MODELINDEX)
SENDENTITY_BYTE(colormap, RDENT_CHANGED_MODELINDEX)
SENDENTITY_BYTE(solid, RDENT_CHANGED_SOLID)
SENDENTITY_BYTE(movetype, RDENT_CHANGED_FLAGS)
SENDENTITY_BYTE(solid, RDENT_CHANGED_SOLIDMOVETYPE)
SENDENTITY_BYTE(movetype, RDENT_CHANGED_SOLIDMOVETYPE)
SENDENTITY_INT(flags, RDENT_CHANGED_FLAGS)
SENDENTITY_COORD(mins[0], RDENT_CHANGED_SIZE)
SENDENTITY_COORD(mins[1], RDENT_CHANGED_SIZE)
@ -153,6 +156,9 @@ NSRenderableEntity::SendEntity(entity ePEnt, float flChanged)
SENDENTITY_COORD(velocity[0], RDENT_CHANGED_VELOCITY)
SENDENTITY_COORD(velocity[1], RDENT_CHANGED_VELOCITY)
SENDENTITY_COORD(velocity[2], RDENT_CHANGED_VELOCITY)
SENDENTITY_COORD(avelocity[0], RDENT_CHANGED_ANGULARVELOCITY)
SENDENTITY_COORD(avelocity[1], RDENT_CHANGED_ANGULARVELOCITY)
SENDENTITY_COORD(avelocity[2], RDENT_CHANGED_ANGULARVELOCITY)
SENDENTITY_BYTE(m_iRenderMode, RDENT_CHANGED_RENDERMODE)
SENDENTITY_BYTE(m_iRenderFX, RDENT_CHANGED_RENDERMODE)
SENDENTITY_ANGLE(m_vecRenderColor[0], RDENT_CHANGED_RENDERCOLOR)
@ -187,8 +193,8 @@ NSRenderableEntity::ReceiveEntity(float flNew, float flChanged)
READENTITY_ANGLE(angles[2], RDENT_CHANGED_ANGLES_Z)
READENTITY_SHORT(modelindex, RDENT_CHANGED_MODELINDEX)
READENTITY_BYTE(colormap, RDENT_CHANGED_MODELINDEX)
READENTITY_BYTE(solid, RDENT_CHANGED_SOLID)
READENTITY_BYTE(movetype, RDENT_CHANGED_FLAGS)
READENTITY_BYTE(solid, RDENT_CHANGED_SOLIDMOVETYPE)
READENTITY_BYTE(movetype, RDENT_CHANGED_SOLIDMOVETYPE)
READENTITY_INT(flags, RDENT_CHANGED_FLAGS)
READENTITY_COORD(mins[0], RDENT_CHANGED_SIZE)
READENTITY_COORD(mins[1], RDENT_CHANGED_SIZE)
@ -204,6 +210,9 @@ NSRenderableEntity::ReceiveEntity(float flNew, float flChanged)
READENTITY_COORD(velocity[0], RDENT_CHANGED_VELOCITY)
READENTITY_COORD(velocity[1], RDENT_CHANGED_VELOCITY)
READENTITY_COORD(velocity[2], RDENT_CHANGED_VELOCITY)
READENTITY_COORD(avelocity[0], RDENT_CHANGED_ANGULARVELOCITY)
READENTITY_COORD(avelocity[1], RDENT_CHANGED_ANGULARVELOCITY)
READENTITY_COORD(avelocity[2], RDENT_CHANGED_ANGULARVELOCITY)
READENTITY_BYTE(m_iRenderMode, RDENT_CHANGED_RENDERMODE)
READENTITY_BYTE(m_iRenderFX, RDENT_CHANGED_RENDERMODE)
READENTITY_ANGLE(m_vecRenderColor[0], RDENT_CHANGED_RENDERCOLOR)

4
src/shared/NSSurfacePropEntity.h
View file

@ -25,14 +25,14 @@ enumflags
SRFENT_CHANGED_MODELINDEX,
SRFENT_CHANGED_SIZE,
SRFENT_CHANGED_FLAGS,
SRFENT_CHANGED_SOLID,
SRFENT_CHANGED_SOLIDMOVETYPE,
SRFENT_CHANGED_FRAME,
SRFENT_CHANGED_SKIN,
SRFENT_CHANGED_MOVETYPE,
SRFENT_CHANGED_EFFECTS,
SRFENT_CHANGED_BODY,
SRFENT_CHANGED_SCALE,
SRFENT_CHANGED_VELOCITY,
SRFENT_CHANGED_ANGULARVELOCITY,
SRFENT_CHANGED_RENDERCOLOR,
SRFENT_CHANGED_RENDERAMT,
SRFENT_CHANGED_RENDERMODE,

21
src/shared/NSSurfacePropEntity.qc
View file

@ -203,8 +203,8 @@ NSSurfacePropEntity::EvaluateEntity(void)
EVALUATE_VECTOR(angles, 1, SRFENT_CHANGED_ANGLES_Y)
EVALUATE_VECTOR(angles, 2, SRFENT_CHANGED_ANGLES_Z)
EVALUATE_FIELD(modelindex, SRFENT_CHANGED_MODELINDEX)
EVALUATE_FIELD(solid, SRFENT_CHANGED_SOLID)
EVALUATE_FIELD(movetype, SRFENT_CHANGED_FLAGS)
EVALUATE_FIELD(solid, SRFENT_CHANGED_SOLIDMOVETYPE)
EVALUATE_FIELD(movetype, SRFENT_CHANGED_SOLIDMOVETYPE)
EVALUATE_FIELD(flags, SRFENT_CHANGED_FLAGS)
EVALUATE_VECTOR(mins, 0, SRFENT_CHANGED_SIZE)
EVALUATE_VECTOR(mins, 1, SRFENT_CHANGED_SIZE)
@ -220,6 +220,9 @@ NSSurfacePropEntity::EvaluateEntity(void)
EVALUATE_VECTOR(velocity, 0, SRFENT_CHANGED_VELOCITY)
EVALUATE_VECTOR(velocity, 1, SRFENT_CHANGED_VELOCITY)
EVALUATE_VECTOR(velocity, 2, SRFENT_CHANGED_VELOCITY)
EVALUATE_VECTOR(avelocity, 0, SRFENT_CHANGED_ANGULARVELOCITY)
EVALUATE_VECTOR(avelocity, 1, SRFENT_CHANGED_ANGULARVELOCITY)
EVALUATE_VECTOR(avelocity, 2, SRFENT_CHANGED_ANGULARVELOCITY)
EVALUATE_FIELD(m_iRenderMode, SRFENT_CHANGED_RENDERMODE)
EVALUATE_FIELD(m_iRenderFX, SRFENT_CHANGED_RENDERMODE)
EVALUATE_VECTOR(m_vecRenderColor, 0, SRFENT_CHANGED_RENDERCOLOR)
@ -254,8 +257,8 @@ NSSurfacePropEntity::SendEntity(entity ePEnt, float flChanged)
SENDENTITY_ANGLE(angles[1], SRFENT_CHANGED_ANGLES_Y)
SENDENTITY_ANGLE(angles[2], SRFENT_CHANGED_ANGLES_Z)
SENDENTITY_SHORT(modelindex, SRFENT_CHANGED_MODELINDEX)
SENDENTITY_BYTE(solid, SRFENT_CHANGED_SOLID)
SENDENTITY_BYTE(movetype, SRFENT_CHANGED_FLAGS)
SENDENTITY_BYTE(solid, SRFENT_CHANGED_SOLIDMOVETYPE)
SENDENTITY_BYTE(movetype, SRFENT_CHANGED_SOLIDMOVETYPE)
SENDENTITY_INT(flags, SRFENT_CHANGED_FLAGS)
SENDENTITY_COORD(mins[0], SRFENT_CHANGED_SIZE)
SENDENTITY_COORD(mins[1], SRFENT_CHANGED_SIZE)
@ -271,6 +274,9 @@ NSSurfacePropEntity::SendEntity(entity ePEnt, float flChanged)
SENDENTITY_COORD(velocity[0], SRFENT_CHANGED_VELOCITY)
SENDENTITY_COORD(velocity[1], SRFENT_CHANGED_VELOCITY)
SENDENTITY_COORD(velocity[2], SRFENT_CHANGED_VELOCITY)
SENDENTITY_COORD(avelocity[0], SRFENT_CHANGED_ANGULARVELOCITY)
SENDENTITY_COORD(avelocity[1], SRFENT_CHANGED_ANGULARVELOCITY)
SENDENTITY_COORD(avelocity[2], SRFENT_CHANGED_ANGULARVELOCITY)
SENDENTITY_BYTE(m_iRenderMode, SRFENT_CHANGED_RENDERMODE)
SENDENTITY_BYTE(m_iRenderFX, SRFENT_CHANGED_RENDERMODE)
SENDENTITY_ANGLE(m_vecRenderColor[0], SRFENT_CHANGED_RENDERCOLOR)
@ -303,8 +309,8 @@ NSSurfacePropEntity::ReceiveEntity(float flNew, float flChanged)
READENTITY_ANGLE(angles[1], SRFENT_CHANGED_ANGLES_Y)
READENTITY_ANGLE(angles[2], SRFENT_CHANGED_ANGLES_Z)
READENTITY_SHORT(modelindex, SRFENT_CHANGED_MODELINDEX)
READENTITY_BYTE(solid, SRFENT_CHANGED_SOLID)
READENTITY_BYTE(movetype, SRFENT_CHANGED_FLAGS)
READENTITY_BYTE(solid, SRFENT_CHANGED_SOLIDMOVETYPE)
READENTITY_BYTE(movetype, SRFENT_CHANGED_SOLIDMOVETYPE)
READENTITY_INT(flags, SRFENT_CHANGED_FLAGS)
READENTITY_COORD(mins[0], SRFENT_CHANGED_SIZE)
READENTITY_COORD(mins[1], SRFENT_CHANGED_SIZE)
@ -320,6 +326,9 @@ NSSurfacePropEntity::ReceiveEntity(float flNew, float flChanged)
READENTITY_COORD(velocity[0], SRFENT_CHANGED_VELOCITY)
READENTITY_COORD(velocity[1], SRFENT_CHANGED_VELOCITY)
READENTITY_COORD(velocity[2], SRFENT_CHANGED_VELOCITY)
READENTITY_COORD(avelocity[0], SRFENT_CHANGED_ANGULARVELOCITY)
READENTITY_COORD(avelocity[1], SRFENT_CHANGED_ANGULARVELOCITY)
READENTITY_COORD(avelocity[2], SRFENT_CHANGED_ANGULARVELOCITY)
READENTITY_BYTE(m_iRenderMode, SRFENT_CHANGED_RENDERMODE)
READENTITY_BYTE(m_iRenderFX, SRFENT_CHANGED_RENDERMODE)
READENTITY_ANGLE(m_vecRenderColor[0], SRFENT_CHANGED_RENDERCOLOR)