MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2025-04-16 14:32:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Added a way for commentary node progress bars and subtitles to appear at the same time

Browse Source
This commit is contained in:
Blixibon 2021-07-31 14:47:10 -05:00
parent 8e8c34f958
commit 0faa6d9b1a
2 changed files with 99 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
sp/src/game/client/c_point_commentary_node.cpp
View File

@ -49,6 +49,8 @@ static bool g_bTracingVsCommentaryNodes = false;
ConVar commentary_type_force( "commentary_type_force", "-1", FCVAR_NONE, "Forces all commentary nodes to use the specified type." ); ConVar commentary_type_force( "commentary_type_force", "-1", FCVAR_NONE, "Forces all commentary nodes to use the specified type." );
ConVar commentary_type_text_endtime( "commentary_type_text_endtime", "120" ); ConVar commentary_type_text_endtime( "commentary_type_text_endtime", "120" );
ConVar commentary_type_image_endtime( "commentary_type_image_endtime", "120" ); ConVar commentary_type_image_endtime( "commentary_type_image_endtime", "120" );
ConVar commentary_audio_element_below_cc( "commentary_audio_element_below_cc", "1", FCVAR_NONE, "Allows commentary audio elements to display even when CC is enabled (although this is done by inverting their Y axis)" );
ConVar commentary_audio_element_below_cc_margin( "commentary_audio_element_below_cc_margin", "4" );
#endif #endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -828,6 +830,18 @@ void CHudCommentary::Paint()
if ( pHudCloseCaption ) if ( pHudCloseCaption )
{ {
pHudCloseCaption->Reset(); pHudCloseCaption->Reset();
#ifdef MAPBASE
// Reset close caption element if needed
if (pHudCloseCaption->IsUsingCommentaryDimensions())
{
int ccX, ccY;
pHudCloseCaption->GetPos( ccX, ccY );
pHudCloseCaption->SetPos( ccX, ccY + m_iTypeAudioT );
pHudCloseCaption->SetUsingCommentaryDimensions( false );
}
#endif
} }
} }
} }
@ -840,6 +854,17 @@ void CHudCommentary::Paint()
// Ensure that the scene is terminated // Ensure that the scene is terminated
if (m_iCommentaryType == COMMENTARY_TYPE_SCENE) if (m_iCommentaryType == COMMENTARY_TYPE_SCENE)
m_hActiveNode->StopLoopingSounds(); m_hActiveNode->StopLoopingSounds();
// Reset close caption element if needed
CHudCloseCaption *pHudCloseCaption = (CHudCloseCaption *)GET_HUDELEMENT( CHudCloseCaption );
if (pHudCloseCaption && pHudCloseCaption->IsUsingCommentaryDimensions())
{
int ccX, ccY;
pHudCloseCaption->GetPos( ccX, ccY );
pHudCloseCaption->SetPos( ccX, ccY + m_iTypeAudioT );
pHudCloseCaption->SetUsingCommentaryDimensions( false );
}
#endif #endif
m_hActiveNode = NULL; m_hActiveNode = NULL;
@ -1155,6 +1180,33 @@ void CHudCommentary::StartCommentary( C_PointCommentaryNode *pNode, char *pszSpe
{ {
m_bShouldPaint = true; m_bShouldPaint = true;
} }
#ifdef MAPBASE
if (!m_bShouldPaint && commentary_audio_element_below_cc.GetBool())
{
m_bShouldPaint = true;
// Invert the Y axis
//SetPos( m_iTypeAudioX, ScreenHeight() - m_iTypeAudioY );
// Place underneath the close caption element
CHudCloseCaption *pHudCloseCaption = (CHudCloseCaption *)GET_HUDELEMENT( CHudCloseCaption );
if (pHudCloseCaption)
{
int ccX, ccY;
pHudCloseCaption->GetPos( ccX, ccY );
ccY -= m_iTypeAudioT;
pHudCloseCaption->SetPos( ccX, ccY - commentary_audio_element_below_cc_margin.GetInt() );
SetPos( ccX, ccY + pHudCloseCaption->GetTall() );
SetWide( pHudCloseCaption->GetWide() );
pHudCloseCaption->SetUsingCommentaryDimensions( true );
}
}
#endif
SetPaintBackgroundEnabled( m_bShouldPaint ); SetPaintBackgroundEnabled( m_bShouldPaint );
char sz[MAX_COUNT_STRING]; char sz[MAX_COUNT_STRING];
@ -1332,6 +1384,31 @@ void CHudCommentary::StartSceneCommentary( C_PointCommentaryNode *pNode, char *p
{ {
m_bShouldPaint = true; m_bShouldPaint = true;
} }
if (!m_bShouldPaint && commentary_audio_element_below_cc.GetBool())
{
m_bShouldPaint = true;
// Invert the Y axis
//SetPos( m_iTypeAudioX, ScreenHeight() - m_iTypeAudioY );
// Place underneath the close caption element
CHudCloseCaption *pHudCloseCaption = (CHudCloseCaption *)GET_HUDELEMENT( CHudCloseCaption );
if (pHudCloseCaption)
{
int ccX, ccY;
pHudCloseCaption->GetPos( ccX, ccY );
ccY -= m_iTypeAudioT;
pHudCloseCaption->SetPos( ccX, ccY - commentary_audio_element_below_cc_margin.GetInt() );
SetPos( ccX, ccY + pHudCloseCaption->GetTall() );
SetWide( pHudCloseCaption->GetWide() );
pHudCloseCaption->SetUsingCommentaryDimensions( true );
}
}
SetPaintBackgroundEnabled( m_bShouldPaint ); SetPaintBackgroundEnabled( m_bShouldPaint );
char sz[MAX_COUNT_STRING]; char sz[MAX_COUNT_STRING];
@ -1357,6 +1434,19 @@ void CHudCommentary::StartSceneCommentary( C_PointCommentaryNode *pNode, char *p
void CHudCommentary::StopCommentary( void ) void CHudCommentary::StopCommentary( void )
{ {
m_hActiveNode = NULL; m_hActiveNode = NULL;
#ifdef MAPBASE
// Reset close caption element if needed
CHudCloseCaption *pHudCloseCaption = (CHudCloseCaption *)GET_HUDELEMENT( CHudCloseCaption );
if (pHudCloseCaption && pHudCloseCaption->IsUsingCommentaryDimensions())
{
int ccX, ccY;
pHudCloseCaption->GetPos( ccX, ccY );
pHudCloseCaption->SetPos( ccX, ccY + m_iTypeAudioT );
pHudCloseCaption->SetUsingCommentaryDimensions( false );
}
#endif
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

9
sp/src/game/client/hud_closecaption.h
View File

@ -138,6 +138,11 @@ public:
void FindSound( char const *pchANSI ); void FindSound( char const *pchANSI );
#ifdef MAPBASE
inline bool IsUsingCommentaryDimensions() const { return m_bUsingCommentaryDimensions; }
inline void SetUsingCommentaryDimensions( bool bToggle ) { m_bUsingCommentaryDimensions = bToggle; }
#endif
public: public:
struct CaptionRepeat struct CaptionRepeat
@ -217,6 +222,10 @@ private:
bool m_bVisibleDueToDirect; bool m_bVisibleDueToDirect;
bool m_bPaintDebugInfo; bool m_bPaintDebugInfo;
CUtlSymbol m_CurrentLanguage; CUtlSymbol m_CurrentLanguage;
#ifdef MAPBASE
bool m_bUsingCommentaryDimensions;
#endif
}; };
#endif // HUD_CLOSECAPTION_H #endif // HUD_CLOSECAPTION_H