mirror
/
source-sdk-2013
mirror of https://github.com/ValveSoftware/source-sdk-2013
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 2c0bc79bb8 into 7191ecc418

This commit is contained in:
FlaminSarge 2025-12-16 01:19:52 -08:00 committed by GitHub
parent 7191ecc418 2c0bc79bb8
commit c1609adda3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/game/client/tf/c_tf_player.cpp
View File

@ -8394,10 +8394,12 @@ void BuildBigHeadTransformations( CBaseAnimating *pObject, CStudioHdr *hdr, Vect
// Scale the head.
MatrixScaleBy ( flScale, transform );
const int cMaxNumHelms = 2;
const int cMaxNumHelms = 4;
int iHelmIndex[cMaxNumHelms];
iHelmIndex[0] = pObject->LookupBone( "prp_helmet" );
iHelmIndex[1] = pObject->LookupBone( "prp_hat" );
iHelmIndex[2] = pObject->LookupBone( "prp_cig" );
iHelmIndex[3] = pObject->LookupBone( "prp_glasses" );
for ( int i = 0; i < cMaxNumHelms; i++ )
{
@ -8444,6 +8446,20 @@ void BuildDecapitatedTransformations( CBaseAnimating *pObject, CStudioHdr *hdr,
matrix3x4_t &transformhelmet = pObject->GetBoneForWrite( iHelm );
MatrixScaleByZero ( transformhelmet );
}
iHelm = pObject->LookupBone( "prp_cig" );
if ( iHelm != -1 )
{
matrix3x4_t &transformhelmet = pObject->GetBoneForWrite( iHelm );
MatrixScaleByZero ( transformhelmet );
}
iHelm = pObject->LookupBone( "prp_glasses" );
if ( iHelm != -1 )
{
matrix3x4_t &transformhelmet = pObject->GetBoneForWrite( iHelm );
MatrixScaleByZero ( transformhelmet );
}
}
@ -8486,6 +8502,16 @@ void BuildNeckScaleTransformations( CBaseAnimating *pObject, CStudioHdr *hdr, Ve
}
}
if ( iClass == TF_CLASS_MEDIC )
{
int iGlasses = pObject->LookupBone( "prp_glasses" );
if ( iGlasses != -1 )
{
matrix3x4_t &glasses_transform = pObject->GetBoneForWrite( iGlasses );
MatrixScaleByZero ( glasses_transform );
}
}
// Compress the head into the neck.
int iHead = pObject->LookupBone( "bip_head" );
if ( iHead != -1 )
@ -8543,7 +8569,7 @@ void AppendChildren_R( CUtlVector< const mstudiobone_t * > *pChildBones, const s
//-----------------------------------------------------------------------------
// Purpose:
//-----------------------------------------------------------------------------
void BuildTorsoScaleTransformations( CBaseAnimating *pObject, CStudioHdr *hdr, Vector *pos, Quaternion q[], const matrix3x4_t& cameraTransform, int boneMask, CBoneBitList &boneComputed, float flScale, int iClass )
void BuildTorsoScaleTransformations( CBaseAnimating *pObject, CStudioHdr *hdr, Vector *pos, Quaternion q[], const matrix3x4_t& cameraTransform, int boneMask, CBoneBitList &boneComputed, float flScale )
{
if ( !pObject || flScale == 1.f )
return;
@ -8712,7 +8738,7 @@ void C_TFPlayer::BuildTransformations( CStudioHdr *hdr, Vector *pos, Quaternion
m_BoneAccessor.SetWritableBones( BONE_USED_BY_ANYTHING );
float flHeadScale = m_Shared.InCond( TF_COND_HALLOWEEN_GHOST_MODE ) ? 1.5 : m_flHeadScale;
BuildBigHeadTransformations( this, hdr, pos, q, cameraTransform, boneMask, boneComputed, flHeadScale );
BuildTorsoScaleTransformations( this, hdr, pos, q, cameraTransform, boneMask, boneComputed, m_flTorsoScale, GetPlayerClass()->GetClassIndex() );
BuildTorsoScaleTransformations( this, hdr, pos, q, cameraTransform, boneMask, boneComputed, m_flTorsoScale );
BuildHandScaleTransformations( this, hdr, pos, q, cameraTransform, boneMask, boneComputed, m_flHandScale );
BuildFirstPersonMeathookTransformations( hdr, pos, q, cameraTransform, boneMask, boneComputed, "bip_head" );
@ -8728,7 +8754,7 @@ void C_TFRagdoll::BuildTransformations( CStudioHdr *hdr, Vector *pos, Quaternion
m_BoneAccessor.SetWritableBones( BONE_USED_BY_ANYTHING );
BuildBigHeadTransformations( this, hdr, pos, q, cameraTransform, boneMask, boneComputed, m_flHeadScale );
BuildTorsoScaleTransformations( this, hdr, pos, q, cameraTransform, boneMask, boneComputed, m_flTorsoScale, GetClass() );
BuildTorsoScaleTransformations( this, hdr, pos, q, cameraTransform, boneMask, boneComputed, m_flTorsoScale );
BuildHandScaleTransformations( this, hdr, pos, q, cameraTransform, boneMask, boneComputed, m_flHandScale );
if ( IsDecapitation() && !m_bBaseTransform )