xutaxkamay/css_enhanced_waf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Reverted some regression & pitch should be set in FinishMove

Browse source
This commit is contained in:
Kamay Xutax 2024-07-14 04:30:25 +02:00
parent cfa5b12eea
commit b750f22f08
5 changed files with 40 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
game/client/cstrike/c_cs_player.cpp
View file

@ -905,7 +905,7 @@ const QAngle& C_CSPlayer::GetRenderAngles()
}
else
{
return GetAbsAngles();
return BaseClass::GetRenderAngles();
}
}

2
game/client/prediction.cpp
View file

@ -708,6 +708,8 @@ void CPrediction::FinishMove( C_BasePlayer *player, CUserCmd *ucmd, CMoveData *m
player->SetPoseParameter(player->LookupPoseParameter("body_pitch"), pitch);
move->m_vecAngles[PITCH] = 0.0f;
player->SetLocalAngles(move->m_vecAngles);
// NOTE: Don't copy this. the movement code modifies its local copy but is not expecting to be authoritative

4
game/server/cstrike/cs_player.cpp
View file

@ -1614,10 +1614,6 @@ void CCSPlayer::PostThink()
}
}
QAngle angles = GetLocalAngles();
angles[PITCH] = 0;
SetLocalAngles( angles );
// Store the eye angles pitch so the client can compute its animation state correctly.
m_angEyeAngles = EyeAngles();

1
game/server/player_command.cpp
View file

@ -229,6 +229,7 @@ void CPlayerMove::FinishMove( CBasePlayer *player, CUserCmd *ucmd, CMoveData *mo
player->SetBodyPitch( pitch );
move->m_vecAngles[ PITCH ] = 0.0f;
player->SetLocalAngles( move->m_vecAngles );
// The class had better not have changed during the move!!

37
game/shared/base_playeranimstate.cpp
View file

@ -669,6 +669,41 @@ void CBasePlayerAnimState::ComputePoseParam_MoveYaw( CStudioHdr *pStudioHdr )
{
GetOuter()->SetPoseParameter( pStudioHdr, iMoveYaw, flYaw );
m_flLastMoveYaw = flYaw;
// Now blend in his idle animation.
// This makes the 8-way blend act like a 9-way blend by blending to
// an idle sequence as he slows down.
#if defined(CLIENT_DLL)
bool bIsMoving;
CAnimationLayer *pLayer = m_pOuter->GetAnimOverlay( MAIN_IDLE_SEQUENCE_LAYER );
pLayer->m_flWeight = 1 - CalcMovementPlaybackRate( &bIsMoving );
if ( !bIsMoving )
{
pLayer->m_flWeight = 1;
}
if ( ShouldChangeSequences() )
{
// Whenever this layer stops blending, we can choose a new idle sequence to blend to, so he
// doesn't always use the same idle.
if ( pLayer->m_flWeight < 0.02f || m_iCurrent8WayIdleSequence == -1 )
{
m_iCurrent8WayIdleSequence = m_pOuter->SelectWeightedSequence( ACT_IDLE );
m_iCurrent8WayCrouchIdleSequence = m_pOuter->SelectWeightedSequence( ACT_CROUCHIDLE );
}
if ( m_eCurrentMainSequenceActivity == ACT_CROUCHIDLE || m_eCurrentMainSequenceActivity == ACT_RUN_CROUCH )
pLayer->m_nSequence = m_iCurrent8WayCrouchIdleSequence;
else
pLayer->m_nSequence = m_iCurrent8WayIdleSequence;
}
pLayer->m_flPlaybackRate = 1;
pLayer->m_flCycle += m_pOuter->GetSequenceCycleRate( pStudioHdr, pLayer->m_nSequence ) * gpGlobals->frametime;
pLayer->m_flCycle = fmod( pLayer->m_flCycle, 1 );
pLayer->m_nOrder = MAIN_IDLE_SEQUENCE_LAYER;
#endif
}
}
}
@ -884,7 +919,7 @@ const QAngle& CBasePlayerAnimState::GetRenderAngles()
void CBasePlayerAnimState::GetOuterAbsVelocity( Vector& vel ) const
{
#if defined( CLIENT_DLL )
vel = GetOuter()->GetAbsVelocity();
GetOuter()->EstimateAbsVelocity( vel );
#else
vel = GetOuter()->GetAbsVelocity();
#endif