Skip to content

Fix class select animation playback #1484

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix class select animation playback #1484

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3140fa9
CTFPlayerModelPanel: Clamp negative choreo scene time
k-vog Aug 8, 2025
fe6ea8d
CTFPlayerModelPanel: Replace lerp magic number with macro
k-vog Aug 8, 2025
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
7 changes: 5 additions & 2 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 @@ -34,6 +34,8 @@

DECLARE_BUILD_FACTORY( CTFPlayerModelPanel );

#define SCENE_LERP_TIME 0.1f

char g_szSceneTmpName[256];

static bool IsTauntItem( GameItemDefinition_t *pItemDef, const int iTeam, const int iClass, const char **ppSequence = NULL, const char **ppRequiredItem = NULL, const char **ppScene = NULL )
Expand Down Expand Up @@ -466,7 +468,7 @@ CChoreoScene *LoadSceneForModel( const char *filename, IChoreoEventCallback *pCa

if ( bSetEndTime )
{
*flSceneEndTime += 0.1f; // give time for lerp to idle pose
*flSceneEndTime += SCENE_LERP_TIME; // give time for lerp to idle pose
}
}

Expand Down Expand Up @@ -2291,10 +2293,11 @@ void CTFPlayerModelPanel::SetupFlexWeights( void )
// Advance time
if ( m_flLastTickTime < FLT_EPSILON )
{
m_flLastTickTime = m_RootMDL.m_MDL.m_flTime - 0.1;
m_flLastTickTime = m_RootMDL.m_MDL.m_flTime - SCENE_LERP_TIME;
}

m_flSceneTime += (m_RootMDL.m_MDL.m_flTime - m_flLastTickTime);
m_flSceneTime = Max( m_flSceneTime, -SCENE_LERP_TIME );
m_flLastTickTime = m_RootMDL.m_MDL.m_flTime;

if ( m_flSceneEndTime > FLT_EPSILON && m_flSceneTime > m_flSceneEndTime )
Expand Down