From aaa2d8b3bf3eac859a85ffe87d93430fd9557164 Mon Sep 17 00:00:00 2001 From: terencehill Date: Sun, 26 May 2013 18:42:07 +0200 Subject: [PATCH] Get rid of the HUD_Panel_ApplyFadeAlpha macro --- qcsrc/client/hud.qc | 31 ++++++++++--------------------- qcsrc/client/hud.qh | 21 ++++++++------------- 2 files changed, 18 insertions(+), 34 deletions(-) diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 88526591d..c6c91c763 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -490,7 +490,6 @@ void HUD_Weapons(void) // update generic hud functions HUD_Panel_UpdateCvars(); - HUD_Panel_ApplyFadeAlpha(); draw_beginBoldFont(); @@ -950,7 +949,6 @@ void HUD_Ammo(void) } HUD_Panel_UpdateCvars(); - HUD_Panel_ApplyFadeAlpha(); draw_beginBoldFont(); @@ -1157,7 +1155,6 @@ void HUD_Powerups(void) } HUD_Panel_UpdateCvars(); - HUD_Panel_ApplyFadeAlpha(); draw_beginBoldFont(); @@ -1389,7 +1386,6 @@ void HUD_HealthArmor(void) } HUD_Panel_UpdateCvars(); - HUD_Panel_ApplyFadeAlpha(); vector pos, mySize; pos = panel_pos; mySize = panel_size; @@ -1630,7 +1626,6 @@ void HUD_Notify(void) } HUD_Panel_UpdateCvars(); - HUD_Panel_ApplyFadeAlpha(); vector pos, mySize; pos = panel_pos; mySize = panel_size; @@ -1767,7 +1762,6 @@ void HUD_Timer(void) } HUD_Panel_UpdateCvars(); - HUD_Panel_ApplyFadeAlpha(); draw_beginBoldFont(); @@ -1835,7 +1829,6 @@ void HUD_Radar(void) } HUD_Panel_UpdateCvars(); - HUD_Panel_ApplyFadeAlpha(); float f = 0; @@ -2127,7 +2120,6 @@ void HUD_Score(void) } HUD_Panel_UpdateCvars(); - HUD_Panel_ApplyFadeAlpha(); vector pos, mySize; pos = panel_pos; mySize = panel_size; @@ -2320,7 +2312,6 @@ void HUD_RaceTimer (void) } HUD_Panel_UpdateCvars(); - HUD_Panel_ApplyFadeAlpha(); draw_beginBoldFont(); @@ -2521,7 +2512,6 @@ void HUD_Vote(void) return; HUD_Panel_UpdateCvars(); - HUD_Panel_ApplyFadeAlpha(); if(uid2name_dialog) { @@ -3349,7 +3339,6 @@ void HUD_ModIcons(void) } HUD_Panel_UpdateCvars(); - HUD_Panel_ApplyFadeAlpha(); draw_beginBoldFont(); @@ -3391,7 +3380,6 @@ void HUD_PressedKeys(void) } HUD_Panel_UpdateCvars(); - HUD_Panel_ApplyFadeAlpha(); vector pos, mySize; pos = panel_pos; mySize = panel_size; @@ -3463,7 +3451,6 @@ void HUD_Chat(void) } HUD_Panel_UpdateCvars(); - HUD_Panel_ApplyFadeAlpha(); if(autocvar__con_chat_maximized && !autocvar__hud_configure) // draw at full screen height if maximized { @@ -3537,7 +3524,6 @@ void HUD_EngineInfo(void) } HUD_Panel_UpdateCvars(); - HUD_Panel_ApplyFadeAlpha(); vector pos, mySize; pos = panel_pos; mySize = panel_size; @@ -3598,7 +3584,6 @@ void HUD_InfoMessages(void) } HUD_Panel_UpdateCvars(); - HUD_Panel_ApplyFadeAlpha(); vector pos, mySize; pos = panel_pos; mySize = panel_size; @@ -3787,7 +3772,6 @@ void HUD_Physics(void) } HUD_Panel_UpdateCvars(); - HUD_Panel_ApplyFadeAlpha(); draw_beginBoldFont(); @@ -4177,14 +4161,19 @@ void HUD_CenterPrint (void) } } + // this panel fades only when the menu does + float hud_fade_alpha_save = 0; + if(scoreboard_fade_alpha) + { + hud_fade_alpha_save = hud_fade_alpha; + hud_fade_alpha = 1 - autocvar__menu_alpha; + } HUD_Panel_UpdateCvars(); - // this panel doesn't fade when showing the scoreboard - if(autocvar__menu_alpha) - HUD_Panel_ApplyFadeAlpha(); - if(scoreboard_fade_alpha) { + hud_fade_alpha = hud_fade_alpha_save; + // move the panel below the scoreboard if (scoreboard_bottom >= 0.96 * vid_conheight) return; @@ -4383,7 +4372,7 @@ void HUD_Main (void) hud_fade_alpha = 0; // panels that we want to be active together with the scoreboard - // they must call HUD_Panel_ApplyFadeAlpha(); only when showing the menu + // they must fade only when the menu does if(scoreboard_fade_alpha == 1) { (panel = HUD_PANEL(CENTERPRINT)).panel_draw(); diff --git a/qcsrc/client/hud.qh b/qcsrc/client/hud.qh index 5ff5e398d..e2a7442b8 100644 --- a/qcsrc/client/hud.qh +++ b/qcsrc/client/hud.qh @@ -198,14 +198,6 @@ if(panel_bg_color_team_str == "") {\ panel_bg_color_team = stof(panel_bg_color_team_str);\ } -// the check doesn't allow to fade this panel when showing the panel-specific menu dialog -#define HUD_Panel_ApplyFadeAlpha()\ -if(!(menu_enabled == 2 && panel == highlightedPanel))\ -{\ - panel_bg_alpha *= hud_fade_alpha;\ - panel_fg_alpha *= hud_fade_alpha;\ -} ENDS_WITH_CURLY_BRACE - // Get value for panel_bg_alpha: if "" fetch default, else use panel_bg_alpha. Also do various menu dialog fadeout/in checks, and minalpha checks // comment on line 3 of macro: // do not set a minalpha cap when showing the config dialog for this panel #define HUD_Panel_GetBgAlpha()\ @@ -302,31 +294,34 @@ if(panel.update_time <= time) { \ }\ HUD_Panel_GetFgAlpha()\ HUD_Panel_GetPadding()\ + panel.current_panel_bg_alpha = panel_bg_alpha; \ + panel.current_panel_fg_alpha = panel_fg_alpha; \ if(menu_enabled == 2 && panel == highlightedPanel) {\ HUD_Panel_UpdatePosSize_ForMenu()\ - } \ + } else {\ + panel_bg_alpha *= hud_fade_alpha;\ + panel_fg_alpha *= hud_fade_alpha;\ + }\ panel.current_panel_pos = panel_pos; \ panel.current_panel_size = panel_size; \ if(panel.current_panel_bg != "") \ strunzone(panel.current_panel_bg); \ panel.current_panel_bg = strzone(panel_bg); \ - panel.current_panel_bg_alpha = panel_bg_alpha; \ panel.current_panel_bg_border = panel_bg_border; \ panel.current_panel_bg_color = panel_bg_color; \ panel.current_panel_bg_color_team = panel_bg_color_team; \ panel.current_panel_bg_padding = panel_bg_padding; \ - panel.current_panel_fg_alpha = panel_fg_alpha; \ panel.update_time = (autocvar__hud_configure) ? time : time + autocvar_hud_panel_update_interval; \ } else { \ panel_pos = panel.current_panel_pos; \ panel_size = panel.current_panel_size; \ panel_bg = panel.current_panel_bg; \ - panel_bg_alpha = panel.current_panel_bg_alpha; \ + panel_bg_alpha = panel.current_panel_bg_alpha * hud_fade_alpha; \ panel_bg_border = panel.current_panel_bg_border; \ panel_bg_color = panel.current_panel_bg_color; \ panel_bg_color_team = panel.current_panel_bg_color_team; \ panel_bg_padding = panel.current_panel_bg_padding; \ - panel_fg_alpha = panel.current_panel_fg_alpha; \ + panel_fg_alpha = panel.current_panel_fg_alpha * hud_fade_alpha; \ } ENDS_WITH_CURLY_BRACE #define HUD_Panel_UpdatePosSize() {\ -- 2.39.2