Skip to content

[TF2] Fixed Stat Clocks not drawing correctly in UI using playermodelpanel (3D playermodels) #1771

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

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

[TF2] Fixed Stat Clocks not drawing correctly in UI using playermodelpanel (3D playermodels) #1771

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3185432
Fixed Stat Clocks not rendering in playermodelpanel
rabscootle Jan 16, 2026
c5d28a1
Added logic to update team skin when necessary
rabscootle Jan 16, 2026
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
64 changes: 51 additions & 13 deletions src/game/client/tf/vgui/tf_playermodelpanel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,7 @@ void CTFPlayerModelPanel::SwitchHeldItemTo( CEconItemView *pItem )

m_StatTrackModel.m_bDisabled = true;
m_StatTrackModel.m_MDL.SetMDL( MDLHANDLE_INVALID );
m_StatTrackModel.m_pStudioHdr = NULL; // ADDED: Clear the studio header

CAttribute_String attrModule;
if ( GetStattrak( m_pHeldItem, &attrModule ) )
Expand Down Expand Up @@ -589,13 +590,28 @@ void CTFPlayerModelPanel::SwitchHeldItemTo( CEconItemView *pItem )
{
hStatTrackMDL = MDLHANDLE_INVALID;
}
m_StatTrackModel.m_MDL.SetMDL( hStatTrackMDL );
mdlcache->Release( hStatTrackMDL ); // counterbalance addref from within FindMDL

m_StatTrackModel.m_MDL.m_pProxyData = static_cast<IClientRenderable*>(pItem);
m_StatTrackModel.m_bDisabled = false;
m_StatTrackModel.m_MDL.m_nSequence = ACT_IDLE;
SetIdentityMatrix( m_StatTrackModel.m_MDLToWorld );
if ( hStatTrackMDL != MDLHANDLE_INVALID )
{
m_StatTrackModel.m_MDL.SetMDL( hStatTrackMDL );

studiohdr_t* pStudioHdr = mdlcache->GetStudioHdr( hStatTrackMDL );
if ( pStudioHdr )
{
if ( !m_StatTrackModel.m_pStudioHdr )
{
m_StatTrackModel.m_pStudioHdr = new CStudioHdr();
}
m_StatTrackModel.m_pStudioHdr->Init( pStudioHdr, mdlcache );
}

mdlcache->Release( hStatTrackMDL );

m_StatTrackModel.m_MDL.m_pProxyData = static_cast<IClientRenderable*>( pItem );
m_StatTrackModel.m_bDisabled = false;
m_StatTrackModel.m_MDL.m_nSequence = ACT_IDLE;
SetIdentityMatrix( m_StatTrackModel.m_MDLToWorld );
}
}
}

Expand Down Expand Up @@ -1252,6 +1268,14 @@ void CTFPlayerModelPanel::UpdatePreviewVisuals()
SetMDLSkinForTeam( GetMergeMDL( m_MergeMDL ), GetPreviewItem( m_pHeldItem ), m_iTeam );
}

// Set the StatTrack model skin
if ( !m_StatTrackModel.m_bDisabled )
{
int iSkin = 0;
iSkin = m_iTeam == TF_TEAM_RED ? 0 : 1;
m_StatTrackModel.m_MDL.m_nSkin = iSkin;
}

// Set the skin for all other equipped items (wearables, etc).
for ( int i=0; i<m_vecDynamicAssetsLoaded.Count(); i++ )
{
Expand Down Expand Up @@ -1518,17 +1542,31 @@ bool CTFPlayerModelPanel::RenderStatTrack( CStudioHdr *pStudioHdr, matrix3x4_t *
{
matrix3x4_t matMergeBoneToWorld[MAXSTUDIOBONES];

// Get the merge studio header.
CStudioHdr *pStatTrackStudioHdr = m_StatTrackModel.m_pStudioHdr;
matrix3x4_t *pMergeBoneToWorld = &matMergeBoneToWorld[0];
// Get the StatTrak model's studio header from the MDL cache
CStudioHdr* pStatTrackStudioHdr = m_StatTrackModel.m_pStudioHdr;

// If m_pStudioHdr isn't set, try to get it from the MDL directly
if ( !pStatTrackStudioHdr )
{
MDLHandle_t hStatTrackMDL = m_StatTrackModel.m_MDL.GetMDL();
if ( hStatTrackMDL != MDLHANDLE_INVALID )
{
pStatTrackStudioHdr = GetMergeMDLStudioHdr( hStatTrackMDL );
}
}

matrix3x4_t* pMergeBoneToWorld = &matMergeBoneToWorld[0];

// If we have a valid mesh, bonemerge it. If we have an invalid mesh we can't bonemerge because
// it'll crash trying to pull data from the missing header.
if ( pStatTrackStudioHdr != NULL )
if ( pStatTrackStudioHdr != NULL && pStudioHdr != NULL )
{
CStudioHdr &mergeHdr = *m_RootMDL.m_pStudioHdr;
m_StatTrackModel.m_MDL.SetupBonesWithBoneMerge( &mergeHdr, pMergeBoneToWorld, pStudioHdr, pWorldMatrix, m_StatTrackModel.m_MDLToWorld );
for ( int i=0; i<mergeHdr.numbones(); ++i )
// The StatTrak model should bone-merge with the WEAPON (pStudioHdr), not the player model
// Parameters: (source header, output matrices, parent header, parent matrices, local transform)
m_StatTrackModel.m_MDL.SetupBonesWithBoneMerge( pStatTrackStudioHdr, pMergeBoneToWorld, pStudioHdr, pWorldMatrix, m_StatTrackModel.m_MDLToWorld );

// Scale the StatTrak model's bones, not the player model bones
for ( int i = 0; i < pStatTrackStudioHdr->numbones(); ++i )
{
MatrixScaleBy( m_flStatTrackScale, pMergeBoneToWorld[i] );
}
Expand Down