Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Theoretically better unlag based on bose position restoring #624

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Theoretically better unlag based on bose position restoring #624

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
61d4844
Theoretically better unlag based on bose position restoring
a1batross Jun 7, 2018
a4f4e34
Implement bone position interpolation
a1batross Jun 7, 2018
0799c56
Fix crash in saving bone state for current frame
a1batross Jun 12, 2018
b13d85e
Fix compiling
Jun 13, 2018
b095191
Don't hide math functions under REHLDS_FIXES
a1batross Jul 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions rehlds/engine/r_studio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,11 @@ hull_t *R_StudioHull(model_t *pModel, float frame, int sequence, const vec_t *an
pstudiohdr = (studiohdr_t *)Mod_Extradata(pModel);

vec_t angles2[3] = { -angles[0], angles[1], angles[2] };
#ifdef REHLDS_FIXES
SV_StudioSetupUnlagBones( pModel, frame, sequence, angles2, origin, pcontroller, pblending, -1, pEdict );
#else
g_pSvBlendingAPI->SV_StudioSetupBones(pModel, frame, sequence, angles2, origin, pcontroller, pblending, -1, pEdict);
#endif

mstudiobbox_t *pbbox = (mstudiobbox_t *)((char *)pstudiohdr + pstudiohdr->hitboxindex);
for (int i = 0; i < pstudiohdr->numhitboxes; i++)
Expand Down Expand Up @@ -874,6 +878,17 @@ void EXT_FUNC AnimationAutomove(const edict_t *pEdict, float flTime)
void EXT_FUNC GetBonePosition(const edict_t *pEdict, int iBone, float *rgflOrigin, float *rgflAngles)
{
pstudiohdr = (studiohdr_t *)Mod_Extradata(g_psv.models[pEdict->v.modelindex]);
#ifdef REHLDS_FIXES
SV_StudioSetupUnlagBones( g_psv.models[pEdict->v.modelindex],
pEdict->v.frame,
pEdict->v.sequence,
pEdict->v.angles,
pEdict->v.origin,
pEdict->v.controller,
pEdict->v.blending,
iBone,
pEdict );
#else
g_pSvBlendingAPI->SV_StudioSetupBones(
g_psv.models[pEdict->v.modelindex],
pEdict->v.frame,
Expand All @@ -885,6 +900,7 @@ void EXT_FUNC GetBonePosition(const edict_t *pEdict, int iBone, float *rgflOrigi
iBone,
pEdict
);
#endif

if (rgflOrigin)
{
Expand All @@ -907,6 +923,20 @@ void EXT_FUNC GetAttachment(const edict_t *pEdict, int iAttachment, float *rgflO
pattachment = (mstudioattachment_t *)((char *)pstudiohdr + pstudiohdr->attachmentindex);
pattachment += iAttachment;

#ifdef REHLDS_FIXES
SV_StudioSetupUnlagBones(
g_psv.models[pEdict->v.modelindex],
pEdict->v.frame,
pEdict->v.sequence,
angles,
pEdict->v.origin,
pEdict->v.controller,
pEdict->v.blending,
pattachment->bone,
pEdict
);
#else

g_pSvBlendingAPI->SV_StudioSetupBones(
g_psv.models[pEdict->v.modelindex],
pEdict->v.frame,
Expand All @@ -918,6 +948,7 @@ void EXT_FUNC GetAttachment(const edict_t *pEdict, int iAttachment, float *rgflO
pattachment->bone,
pEdict
);
#endif

if (rgflOrigin)
VectorTransform(pattachment->org, bonetransform[pattachment->bone], rgflOrigin);
Expand Down
15 changes: 15 additions & 0 deletions rehlds/engine/server.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ const int MAX_NAME = 32;
#include "pm_defs.h"
#include "inst_baseline.h"
#include "net_ws.h"
#include "studio_rehlds.h"

const int DEFAULT_SOUND_PACKET_VOLUME = 255;
const float DEFAULT_SOUND_PACKET_ATTENUATION = 1.0f;
Expand Down Expand Up @@ -175,13 +176,27 @@ struct rehlds_server_t {
#endif
};

#ifdef REHLDS_FIXES
// a1batross: "bone position"-based unlag
typedef struct client_bone_state_s
{
bonetransform_t bonetransform;
float rotationmatrix[3][4];
int numbones;
qboolean valid;
} client_bone_state_t;
#endif // REHLDS_FIXES

typedef struct client_frame_s
{
double senttime;
float ping_time;
clientdata_t clientdata;
weapon_data_t weapondata[64];
packet_entities_t entities;
#ifdef REHLDS_FIXES // a1batross: "bone position"-based unlag
client_bone_state_t bonestate;
#endif // REHLDS_FIXES
} client_frame_t;

typedef struct client_s
Expand Down
3 changes: 3 additions & 0 deletions rehlds/engine/sv_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7717,6 +7717,9 @@ void SV_Init(void)
Cvar_RegisterVariable(&sv_instancedbaseline);
Cvar_RegisterVariable(&sv_contact);
Cvar_RegisterVariable(&sv_unlag);
#ifdef REHLDS_FIXES
Cvar_RegisterVariable(&sv_bone_unlag);
#endif
Cvar_RegisterVariable(&sv_maxunlag);
Cvar_RegisterVariable(&sv_unlagpush);
Cvar_RegisterVariable(&sv_unlagsamples);
Expand Down
195 changes: 192 additions & 3 deletions rehlds/engine/sv_user.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ cvar_t sv_footsteps = { "mp_footsteps", "1", FCVAR_SERVER, 0.0f, NULL };
cvar_t sv_rollspeed = { "sv_rollspeed", "0.0", 0, 0.0f, NULL };
cvar_t sv_rollangle = { "sv_rollangle", "0.0", 0, 0.0f, NULL };
cvar_t sv_unlag = { "sv_unlag", "1", 0, 0.0f, NULL };
#ifdef REHLDS_FIXES
cvar_t sv_bone_unlag = { "sv_bone_unlag", "0", 0, 0.0f, NULL };
#endif // REHLDS_FIXES
cvar_t sv_maxunlag = { "sv_maxunlag", "0.5", 0, 0.0f, NULL };
cvar_t sv_unlagpush = { "sv_unlagpush", "0.0", 0, 0.0f, NULL };
cvar_t sv_unlagsamples = { "sv_unlagsamples", "1", 0, 0.0f, NULL };
Expand Down Expand Up @@ -1008,9 +1011,13 @@ void SV_RunCmd(usercmd_t *ucmd, int random_seed)
gGlobalVariables.frametime = frametime;
gEntityInterface.pfnPlayerPostThink(sv_player);
gEntityInterface.pfnCmdEnd(sv_player);

if (!host_client->fakeclient)
SV_RestoreMove(host_client);

#ifdef REHLDS_FIXES
SV_SaveBoneState( host_client, sv_player );
#endif
}

int SV_ValidateClientCommand(char *pszCommand)
Expand Down Expand Up @@ -1152,6 +1159,89 @@ entity_state_t *SV_FindEntInPack(int index, packet_entities_t *pack)
return NULL;
}

#ifdef REHLDS_FIXES
void VectorsAngles( const vec3_t forward, const vec3_t right, const vec3_t up, vec3_t angles )
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need to include this under REHLDS_FIXES

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@In-line ok, will remove in next commit.

{
float pitch, cpitch, yaw, roll;

pitch = -asin( forward[2] );
cpitch = cos( pitch );

if( fabs( cpitch ) > 0.001f ) // gimball lock?
{
cpitch = 1.0f / cpitch;
pitch = RAD2DEG( pitch );
yaw = RAD2DEG( atan2( forward[1] * cpitch, forward[0] * cpitch ));
roll = RAD2DEG( atan2( -right[2] * cpitch, up[2] * cpitch ));
}
else
{
pitch = forward[2] > 0 ? -90.0f : 90.0f;
yaw = RAD2DEG( atan2( right[0], -right[1] ));
roll = 180.0f;
}

angles[0] = pitch;
angles[1] = yaw;
angles[2] = roll;
}

static void LerpRotationMatrix(const float from[3][4], const float to[3][4], float s, float out[3][4])
{
vec3_t f1, r1, u1, pos1, ang1;
vec3_t f2, r2, u2, pos2, ang2;
vec4_t q1, q2, q3;
float s1 = 1.0f - s; // backlerp

for( int j = 0; j < 3; j++ )
{
f1[j] = from[j][0];
r1[j] = from[j][1];
u2[j] = from[j][2];
pos1[j] = from[j][3];

f1[j] = to[j][0];
r1[j] = to[j][1];
u1[j] = to[j][2];
pos2[j] = to[j][3];
}

VectorsAngles( f1, r1, u1, ang1 );
VectorsAngles( f2, r2, u2, ang2 );

AngleQuaternion( ang1, q1 );
AngleQuaternion( ang2, q2 );

QuaternionSlerp(q1, q2, s, q3);
pos1[0] = pos1[0] * s1 + pos2[0] * s;
pos1[1] = pos1[1] * s1 + pos2[1] * s;
pos1[2] = pos1[2] * s1 + pos2[2] * s;

// result
QuaternionMatrix(q3, out);
out[0][3] = pos1[0];
out[1][3] = pos1[1];
out[2][3] = pos1[2];
}

static client_bone_state_t SV_StudioUnlagSlerpBones(const client_bone_state_t *from, const client_bone_state_t *to, float s)
{
client_bone_state_t ret;

ret.valid = true;
ret.numbones = from->numbones;

for (int i = 0; i < from->numbones; i++)
{
LerpRotationMatrix(from->bonetransform[i], to->bonetransform[i], s, ret.bonetransform[i]);
}

LerpRotationMatrix(from->rotationmatrix, to->rotationmatrix, s, ret.rotationmatrix);

return ret;
}
#endif // REHLDS_FIXES

void SV_SetupMove(client_t *_host_client)
{
struct client_s *cl;
Expand Down Expand Up @@ -1320,7 +1410,7 @@ void SV_SetupMove(client_t *_host_client)
frame = nextFrame;
frac = 0.0;
}

for (i = 0; i < nextFrame->entities.num_entities; i++)
{
state = &nextFrame->entities.entities[i];
Expand All @@ -1342,6 +1432,24 @@ void SV_SetupMove(client_t *_host_client)
}

pnextstate = SV_FindEntInPack(state->number, &frame->entities);

#ifdef REHLDS_FIXES
if( nextFrame->bonestate.valid )
{
if( frame->bonestate.valid )
{
pos->bonestate = SV_StudioUnlagSlerpBones(&frame->bonestate, &nextFrame->bonestate, frac);
}
else
{
pos->bonestate = nextFrame->bonestate;
}
}
else
{
pos->bonestate.valid = false;
}
#endif // REHLDS_FIXES

if (pnextstate)
{
Expand Down Expand Up @@ -1409,7 +1517,11 @@ void SV_RestoreMove(client_t *_host_client)
Con_DPrintf("SV_RestoreMove: Tried to restore 'inactive' player %i/%s\n", i, &cli->name[4]);
continue;
}


#ifdef REHLDS_FIXES
pos->bonestate.valid = false;
#endif // REHLDS_FIXES

if (VectorCompare(pos->initial_correction_org, cli->edict->v.origin))
{
cli->edict->v.origin[0] = pos->oldorg[0];
Expand Down Expand Up @@ -1910,3 +2022,80 @@ void SV_FullUpdate_f(void)
gEntityInterface.pfnClientCommand(sv_player);
#endif // REHLDS_FIXES
}

#ifdef REHLDS_FIXES
void SV_SaveBoneState(client_t *_host_client, const edict_t *edict)
{
int num = NUM_FOR_EDICT( edict );
client_frame_t *frame;
extern bonetransform_t bonetransform; // in r_studio.cpp
extern float rotationmatrix[3][4]; // in r_studio.cpp

if( !SV_IsPlayerIndex( num )) // just in case
return;

// get last outgoing frame
frame = &_host_client->frames[SV_UPDATE_MASK & (_host_client->netchan.outgoing_sequence)];

// not a studio model
if( g_psv.models[edict->v.modelindex]->type != mod_studio )
{
frame->bonestate.valid = false;
return;
}

studiohdr_t *hdr = (studiohdr_t*)Mod_Extradata(g_psv.models[edict->v.modelindex]);

// shouldn't really happen
if( !hdr )
{
frame->bonestate.valid = false;
return;
}

// set up bones
g_pSvBlendingAPI->SV_StudioSetupBones(
g_psv.models[edict->v.modelindex],
edict->v.frame, edict->v.sequence, edict->v.angles, edict->v.origin,
edict->v.controller, edict->v.blending, -1, edict
);

// copy bones
frame->bonestate.valid = true;
frame->bonestate.numbones = hdr->numbones;
Q_memcpy( frame->bonestate.bonetransform, bonetransform, sizeof( bonetransform ));
Q_memcpy( frame->bonestate.rotationmatrix, rotationmatrix, sizeof( rotationmatrix ));

}

void SV_StudioSetupUnlagBones( model_t *pModel, float frame, int sequence, const vec_t *angles, const vec_t *origin, const unsigned char *pcontroller, const unsigned char *pblending, int iBone, const edict_t *edict )
{
// a1ba: carefully check everything, otherwise we may get broken bones!
if( edict && sv_bone_unlag.value ) // check is this a server or disabled
{
if( !nofind ) // unlag is enabled
{
if( edict->v.flags & FL_CLIENT )
{
int num = NUM_FOR_EDICT( edict );

if( truepositions[num].active &&
!truepositions[num].needrelink && // TODO: will this work for moving clients?
truepositions[num].bonestate.valid ) // bones are correct
{
// in r_studio.cpp
extern bonetransform_t bonetransform;
extern float rotationmatrix[3][4];

Q_memcpy( bonetransform, truepositions[num].bonestate.bonetransform, sizeof( bonetransform ));
Q_memcpy( rotationmatrix, truepositions[num].bonestate.rotationmatrix, sizeof( rotationmatrix ));
return;
}
}
}
}

// fallback to original SV_StudioSetupBones
g_pSvBlendingAPI->SV_StudioSetupBones(pModel, frame, sequence, angles, origin, pcontroller, pblending, iBone, edict);
}
#endif // REHLDS_FIXES
13 changes: 13 additions & 0 deletions rehlds/engine/sv_user.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ typedef struct sv_adjusted_positions_s
int deadflag;
vec3_t temp_org;
int temp_org_setflag;
#ifdef REHLDS_FIXES
client_bone_state_t bonestate;
#endif // REHLDS_FIXES
} sv_adjusted_positions_t;

typedef struct clc_func_s
Expand All @@ -71,6 +74,9 @@ extern cvar_t sv_footsteps;
extern cvar_t sv_rollspeed;
extern cvar_t sv_rollangle;
extern cvar_t sv_unlag;
#ifdef REHLDS_FIXES
extern cvar_t sv_bone_unlag;
#endif
extern cvar_t sv_maxunlag;
extern cvar_t sv_unlagpush;
extern cvar_t sv_unlagsamples;
Expand Down Expand Up @@ -117,3 +123,10 @@ qboolean SV_SetPlayer(int idnum);
void SV_ShowServerinfo_f(void);
void SV_SendEnts_f(void);
void SV_FullUpdate_f(void);

#ifdef REHLDS_FIXES
void SV_SaveBoneState( client_t *cl, const edict_t *edict );

// "bone position"-based sv_unlag
void SV_StudioSetupUnlagBones( model_t *pModel, float frame, int sequence, const vec_t *angles, const vec_t *origin, const unsigned char *pcontroller, const unsigned char *pblending, int iBone, const edict_t *edict );
#endif // REHLDS_FIXES