Skip to content

Spectator fixes and improvements #267

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

Merged
Velaron merged 2 commits into from
Jan 17, 2026
+170 −12
Merged

Spectator fixes and improvements #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1df894
client: allow toggling hud_saytext in the spectator GUI
Vladislav4KZ Jan 13, 2026
f9f8570
spectator_gui: add checkboxes, arrow icons instead of `<` and `>` sym…
Vladislav4KZ Jan 13, 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
5 changes: 5 additions & 0 deletions cl_dll/hud.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -918,6 +918,11 @@ class CHudSpectatorGui: public CHudBase
char m_szNameAndHealth[80];
} label;
int m_hTimerTexture;
int m_hChecked;
int m_hArrowDown;
int m_hArrowUp;
int m_hArrowLeft;
int m_hArrowRight;

enum {
ROOT_MENU = (1<<0),
Expand Down
123 changes: 116 additions & 7 deletions cl_dll/hud/spectator_gui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,21 +99,69 @@ int CHudSpectatorGui::VidInit()
}

m_hTimerTexture = gRenderAPI.GL_LoadTexture("gfx/vgui/timer.tga", NULL, 0, TF_NEAREST |TF_NOMIPMAP|TF_CLAMP );
m_hChecked = gRenderAPI.GL_LoadTexture("gfx/vgui/640_checked.tga", NULL, 0, TF_NEAREST | TF_NOMIPMAP | TF_CLAMP );
m_hArrowDown = gRenderAPI.GL_LoadTexture("gfx/vgui/1920_arrowdown.tga", NULL, 0, TF_NEAREST | TF_NOMIPMAP | TF_CLAMP );
m_hArrowUp = gRenderAPI.GL_LoadTexture("gfx/vgui/1920_arrowup.tga", NULL, 0, TF_NEAREST | TF_NOMIPMAP | TF_CLAMP );
m_hArrowLeft = gRenderAPI.GL_LoadTexture("gfx/vgui/1920_arrowleft.tga", NULL, 0, TF_NEAREST | TF_NOMIPMAP | TF_CLAMP );
m_hArrowRight = gRenderAPI.GL_LoadTexture("gfx/vgui/1920_arrowright.tga", NULL, 0, TF_NEAREST | TF_NOMIPMAP | TF_CLAMP );
return 1;
}

void CHudSpectatorGui::Shutdown()
{
gRenderAPI.GL_FreeTexture( m_hTimerTexture );
gRenderAPI.GL_FreeTexture( m_hChecked );
gRenderAPI.GL_FreeTexture( m_hArrowDown );
gRenderAPI.GL_FreeTexture( m_hArrowUp );
gRenderAPI.GL_FreeTexture( m_hArrowLeft );
gRenderAPI.GL_FreeTexture( m_hArrowRight );
}

inline void DrawButtonWithText( int x1, int y1, int wide, int tall, const char *sz, int r, int g, int b )
inline void DrawButtonWithText( int x1, int y1, int wide, int tall, const char *sz, int r, int g, int b, bool highlight = false )
{
DrawUtils::DrawRectangle(x1, y1, wide, tall);

if ( highlight )
{
FillRGBABlend(x1, y1, wide, tall, r, g, b, 48);
}

DrawUtils::DrawHudString(x1 + INT_XPOS(0.5), y1 + tall*0.5 - gHUD.GetCharHeight() * 0.5, x1 + wide, sz,
r, g, b );
}

// Unified icon drawing helper. align: -1 = left, 0 = center, 1 = right
static void DrawIconOnButton( int x1, int y1, int wide, int tall, int hTex, int align = -1, int r = 255, int g = 255, int b = 255, float alpha = 1.0f, int pad = 15 )
{
if( !hTex )
return;

gRenderAPI.GL_SelectTexture( 0 );
gRenderAPI.GL_Bind( 0, hTex );
gEngfuncs.pTriAPI->RenderMode( kRenderTransAlpha );
gEngfuncs.pTriAPI->Color4f( r / 255.0f, g / 255.0f, b / 255.0f, alpha );

int uploadW = (int)gRenderAPI.RenderGetParm( PARM_TEX_WIDTH, hTex );
int uploadH = (int)gRenderAPI.RenderGetParm( PARM_TEX_HEIGHT, hTex );


// compute quad position in pixels
float quadX = x1;
float quadY = y1 + ( tall - uploadH ) / 2.0f;

if( align == -1 ) // left
quadX = x1 + pad; // small padding from left
else if( align == 0 ) // center
quadX = x1 + ( wide - uploadW ) * 0.5f;
else if( align == 1 ) // right
quadX = x1 + wide - uploadW - pad; // small padding from right

DrawUtils::Draw2DQuad( quadX * gHUD.m_flScale,
quadY * gHUD.m_flScale,
(quadX + (float)uploadW) * gHUD.m_flScale,
(quadY + (float)uploadH) * gHUD.m_flScale );
}

int CHudSpectatorGui::Draw( float flTime )
{
if( !g_iUser1 )
Expand Down Expand Up @@ -206,28 +254,89 @@ int CHudSpectatorGui::Draw( float flTime )
if( m_menuFlags & ROOT_MENU )
{
// draw the root menu
DrawButtonWithText(INT_XPOS(0.5), INT_YPOS(8.5), INT_XPOS(4), INT_YPOS(1), "Options", r, g, b);
DrawButtonWithText(INT_XPOS(5), INT_YPOS(8.5), INT_XPOS(1), INT_YPOS(1), "<", r, g, b);

// options
{
// highlight when opened
if( m_menuFlags & MENU_OPTIONS )
DrawButtonWithText(INT_XPOS(0.5), INT_YPOS(8.5), INT_XPOS(4), INT_YPOS(1), "Options", r, g, b, true);
else
DrawButtonWithText(INT_XPOS(0.5), INT_YPOS(8.5), INT_XPOS(4), INT_YPOS(1), "Options", r, g, b );
// arrow on right part of button: down when closed, up when open
if( m_menuFlags & MENU_OPTIONS )
DrawIconOnButton( INT_XPOS(0.5), INT_YPOS(8.5), INT_XPOS(4), INT_YPOS(1), m_hArrowUp, 1, r, g, b );
else
DrawIconOnButton( INT_XPOS(0.5), INT_YPOS(8.5), INT_XPOS(4), INT_YPOS(1), m_hArrowDown, 1, r, g, b );
}

DrawUtils::DrawRectangle(INT_XPOS(5), INT_YPOS(8.5), INT_XPOS(1), INT_YPOS(1));
DrawIconOnButton( INT_XPOS(5), INT_YPOS(8.5), INT_XPOS(1), INT_YPOS(1), m_hArrowLeft, 0, r, g, b );

DrawUtils::DrawRectangle(INT_XPOS(6), INT_YPOS(8.5), INT_XPOS(4), INT_YPOS(1));
// name will be drawn later

DrawButtonWithText(INT_XPOS(10), INT_YPOS(8.5), INT_XPOS(1), INT_YPOS(1), ">", r, g, b );
DrawButtonWithText(INT_XPOS(11.5), INT_YPOS(8.5), INT_XPOS(4), INT_YPOS(1), "Spectate Options", r, g, b);
DrawUtils::DrawRectangle(INT_XPOS(10), INT_YPOS(8.5), INT_XPOS(1), INT_YPOS(1));
DrawIconOnButton( INT_XPOS(10), INT_YPOS(8.5), INT_XPOS(1), INT_YPOS(1), m_hArrowRight, 0, r, g, b );

// spectate options
{
// highlight when opened
if( m_menuFlags & MENU_SPEC_OPTIONS )
DrawButtonWithText(INT_XPOS(11.5), INT_YPOS(8.5), INT_XPOS(4), INT_YPOS(1), "Spectate Options", r, g, b, true);
else
DrawButtonWithText(INT_XPOS(11.5), INT_YPOS(8.5), INT_XPOS(4), INT_YPOS(1), "Spectate Options", r, g, b );
// arrow on right part of button: down when closed, up when open
if( m_menuFlags & MENU_SPEC_OPTIONS )
DrawIconOnButton( INT_XPOS(11.5), INT_YPOS(8.5), INT_XPOS(4), INT_YPOS(1), m_hArrowUp, 1, r, g, b );
else
DrawIconOnButton( INT_XPOS(11.5), INT_YPOS(8.5), INT_XPOS(4), INT_YPOS(1), m_hArrowDown, 1, r, g, b );
}

if( m_menuFlags & MENU_OPTIONS )
{
DrawButtonWithText(INT_XPOS(0.5), INT_YPOS(2.5), INT_XPOS(4), INT_YPOS(1), "Close", r, g, b );
DrawButtonWithText(INT_XPOS(0.5), INT_YPOS(3.5), INT_XPOS(4), INT_YPOS(1), "Help", r, g, b );
DrawButtonWithText(INT_XPOS(0.5), INT_YPOS(4.5), INT_XPOS(4), INT_YPOS(1), "Settings", r, g, b );

// settings
{
// highlight when opened
if( m_menuFlags & MENU_OPTIONS_SETTINGS )
DrawButtonWithText(INT_XPOS(0.5), INT_YPOS(4.5), INT_XPOS(4), INT_YPOS(1), "Settings", r, g, b, true );
else
DrawButtonWithText(INT_XPOS(0.5), INT_YPOS(4.5), INT_XPOS(4), INT_YPOS(1), "Settings", r, g, b );

DrawIconOnButton( INT_XPOS(0.5), INT_YPOS(4.5), INT_XPOS(4), INT_YPOS(1), m_hArrowRight, 1, r, g, b );
}

DrawButtonWithText(INT_XPOS(0.5), INT_YPOS(5.5), INT_XPOS(4), INT_YPOS(1), "Picture-in-Picture", r, g, b );
if( gHUD.m_Spectator.m_pip && gHUD.m_Spectator.m_pip->value != INSET_OFF )
DrawIconOnButton( INT_XPOS(0.5), INT_YPOS(5.5), INT_XPOS(4), INT_YPOS(1), m_hChecked, -1, r, g, b );

DrawButtonWithText(INT_XPOS(0.5), INT_YPOS(6.5), INT_XPOS(4), INT_YPOS(1), "Autodirector", r, g, b );
if( gHUD.m_Spectator.m_autoDirector && gHUD.m_Spectator.m_autoDirector->value )
DrawIconOnButton( INT_XPOS(0.5), INT_YPOS(6.5), INT_XPOS(4), INT_YPOS(1), m_hChecked, -1, r, g, b );

DrawButtonWithText(INT_XPOS(0.5), INT_YPOS(7.5), INT_XPOS(4), INT_YPOS(1), "Show scores", r, g, b );
if( gHUD.m_Scoreboard.m_bForceDraw || gHUD.m_Scoreboard.m_bShowscoresHeld )
DrawIconOnButton( INT_XPOS(0.5), INT_YPOS(7.5), INT_XPOS(4), INT_YPOS(1), m_hChecked, -1, r, g, b );

if( m_menuFlags & MENU_OPTIONS_SETTINGS )
{
DrawButtonWithText(INT_XPOS(4.5), INT_YPOS(4.5), INT_XPOS(4), INT_YPOS(1), "Chat messages", r, g, b );
if( gHUD.m_Spectator.m_HUD_saytext && gHUD.m_Spectator.m_HUD_saytext->value )
DrawIconOnButton( INT_XPOS(4.5), INT_YPOS(4.5), INT_XPOS(4), INT_YPOS(1), m_hChecked, -1, r, g, b );

DrawButtonWithText(INT_XPOS(4.5), INT_YPOS(5.5), INT_XPOS(4), INT_YPOS(1), "Show status", r, g, b );
if( gHUD.m_Spectator.m_drawstatus && gHUD.m_Spectator.m_drawstatus->value )
DrawIconOnButton( INT_XPOS(4.5), INT_YPOS(5.5), INT_XPOS(4), INT_YPOS(1), m_hChecked, -1, r, g, b );

DrawButtonWithText(INT_XPOS(4.5), INT_YPOS(6.5), INT_XPOS(4), INT_YPOS(1), "View cone", r, g, b );
if( gHUD.m_Spectator.m_drawcone && gHUD.m_Spectator.m_drawcone->value )
DrawIconOnButton( INT_XPOS(4.5), INT_YPOS(6.5), INT_XPOS(4), INT_YPOS(1), m_hChecked, -1, r, g, b );

DrawButtonWithText(INT_XPOS(4.5), INT_YPOS(7.5), INT_XPOS(4), INT_YPOS(1), "Player names", r, g, b );
if( gHUD.m_Spectator.m_drawnames && gHUD.m_Spectator.m_drawnames->value )
DrawIconOnButton( INT_XPOS(4.5), INT_YPOS(7.5), INT_XPOS(4), INT_YPOS(1), m_hChecked, -1, r, g, b );
}
}

Expand Down Expand Up @@ -438,7 +547,7 @@ void CHudSpectatorGui::UserCmd_ToggleSpectatorMenuOptionsSettings()
if( !(m_menuFlags & MENU_OPTIONS_SETTINGS) )
{
m_menuFlags |= MENU_OPTIONS_SETTINGS;
gMobileAPI.pfnTouchAddClientButton( "_spec_opt_chat_msgs", "*white", "messagemode; _spec_toggle_menu_options_settings",
gMobileAPI.pfnTouchAddClientButton( "_spec_opt_chat_msgs", "*white", "hud_saytext t; _spec_toggle_menu_options_settings",
PLACE_DEFAULT_SIZE_BUTTON_AT_X_Y( 4.5f, 4.5f ), color, 0, 1.0f, 0 );
gMobileAPI.pfnTouchAddClientButton( "_spec_opt_set_status", "*white", "spec_drawstatus t; _spec_toggle_menu_options_settings",
PLACE_DEFAULT_SIZE_BUTTON_AT_X_Y( 4.5f, 5.5f ), color, 0, 1.0f, 0 );
Expand Down
38 changes: 38 additions & 0 deletions cl_dll/hud_spectator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,42 @@ void SpecPip( void )
const char *name = "spec_pip_internal";
char *arg = gEngfuncs.Cmd_Argv(1);

if( arg[0] == 't' && arg[1] == '\0' )
{
if ( gHUD.m_Spectator.m_pip && (int)gHUD.m_Spectator.m_pip->value != INSET_OFF )
{
gHUD.m_Spectator.SetModes( -1, INSET_OFF );
}
else
{
// ensure overview data and map sprite are loaded before enabling PiP
gHUD.m_Spectator.ParseOverviewFile();
gHUD.m_Spectator.LoadMapSprites();

// if map overview is open in fullscreen, show Locked Chase Cam in inset (player chase)
int insetMode = INSET_MAP_FREE;
if ( g_iUser1 == OBS_MAP_FREE || g_iUser1 == OBS_MAP_CHASE )
insetMode = INSET_CHASE_LOCKED;
gHUD.m_Spectator.SetModes( -1, insetMode );
}
}
else
{
gEngfuncs.Cvar_Set( name, gEngfuncs.Cmd_Argv(1) );
}
}

void HudSayText( void )
{
if ( gEngfuncs.Cmd_Argc() <= 1 )
{
gEngfuncs.Con_Printf( "usage: hud_saytext <0|1>\n" );
return;
}

const char *name = "hud_saytext_internal";
char *arg = gEngfuncs.Cmd_Argv(1);

if( arg[0] == 't' && arg[1] == '\0' )
gEngfuncs.Cvar_SetValue( name, !gEngfuncs.pfnGetCvarFloat(name) );
else
Expand Down Expand Up @@ -213,13 +249,15 @@ int CHudSpectator::Init()
gEngfuncs.pfnAddCommand ("spec_drawnames", SpecDrawNames );
gEngfuncs.pfnAddCommand ("spec_drawcone", SpecDrawCone );
gEngfuncs.pfnAddCommand ("spec_drawstatus", SpecDrawStatus );
gEngfuncs.pfnAddCommand ("hud_saytext", HudSayText );
gEngfuncs.pfnAddCommand ("spec_autodirector", SpecAutoDirector );
gEngfuncs.pfnAddCommand ("spec_pip", SpecPip );

m_drawnames = gEngfuncs.pfnRegisterVariable("spec_drawnames_internal","1",0);
m_drawcone = gEngfuncs.pfnRegisterVariable("spec_drawcone_internal","1",0);
m_drawstatus = gEngfuncs.pfnRegisterVariable("spec_drawstatus_internal","1",0);
m_autoDirector = gEngfuncs.pfnRegisterVariable("spec_autodirector_internal","1",0);
m_HUD_saytext = gEngfuncs.pfnRegisterVariable("hud_saytext_internal","1",0);
m_pip = gEngfuncs.pfnRegisterVariable("spec_pip_internal","1",0);
m_lastAutoDirector = 0.0f;

Expand Down
10 changes: 6 additions & 4 deletions cl_dll/hud_spectator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@


#define INSET_OFF 0
#define INSET_CHASE_FREE 1
#define INSET_IN_EYE 2
#define INSET_MAP_FREE 3
#define INSET_MAP_CHASE 4
#define INSET_CHASE_LOCKED 1
#define INSET_CHASE_FREE 2
#define INSET_IN_EYE 3
#define INSET_MAP_FREE 4
#define INSET_MAP_CHASE 5

#define MAX_SPEC_HUD_MESSAGES 8

Expand Down Expand Up @@ -99,6 +100,7 @@ class CHudSpectator : public CHudBase
cvar_t * m_drawnames;
cvar_t * m_drawcone;
cvar_t * m_drawstatus;
cvar_t * m_HUD_saytext;
cvar_t * m_autoDirector;
float m_lastAutoDirector;
cvar_t * m_pip;
Expand Down
2 changes: 1 addition & 1 deletion cl_dll/saytext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ int CHudSayText :: Init( void )

InitHUDData();

m_HUD_saytext = gEngfuncs.pfnRegisterVariable( "hud_saytext", "1", 0 );
m_HUD_saytext = gEngfuncs.pfnRegisterVariable( "hud_saytext_internal", "1", 0 );
m_HUD_saytext_time = gEngfuncs.pfnRegisterVariable( "hud_saytext_time", "5", 0 );

m_iFlags |= HUD_INTERMISSION; // is always drawn during an intermission
Expand Down
4 changes: 4 additions & 0 deletions cl_dll/view.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1725,6 +1725,10 @@ void V_CalcSpectatorRefdef ( struct ref_params_s * pparams )
// override some settings in certain modes
switch ( (int)gHUD.m_Spectator.m_pip->value )
{
case INSET_CHASE_LOCKED:
V_GetChasePos( g_iUser2, NULL, v_origin, v_angles );
break;

case INSET_CHASE_FREE:
V_GetChasePos( g_iUser2, v_cl_angles, v_origin, v_angles );
break;
Expand Down
Loading