From: Samual Date: Thu, 20 Oct 2011 04:41:00 +0000 (-0400) Subject: Separate minfontsize between subsequent fading and fading in/out effects for centerprints X-Git-Tag: xonotic-v0.6.0~35^2~78^2~7^2~18 X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=38b2665f47c9283c3158a14754d95ffae91a0a3a;p=xonotic%2Fxonotic-data.pk3dir.git Separate minfontsize between subsequent fading and fading in/out effects for centerprints --- diff --git a/_hud_descriptions.cfg b/_hud_descriptions.cfg index 4059c431b..71156398e 100644 --- a/_hud_descriptions.cfg +++ b/_hud_descriptions.cfg @@ -286,4 +286,5 @@ seta hud_panel_centerprint_fade_subsequent_passone "" "division factor for the f seta hud_panel_centerprint_fade_subsequent_passone_minalpha "" "minimum factor that the first pass can fade to" seta hud_panel_centerprint_fade_subsequent_passtwo "" "division factor for the second pass for alpha fading, it applies another fade on top of the first pass to make it more transitioned" seta hud_panel_centerprint_fade_subsequent_passtwo_minalpha "" "minimum factor that the second pass can fade to" -seta hud_panel_centerprint_fade_minfontsize "" "minimum factor for the font size from the fading effects" +seta hud_panel_centerprint_fade_subsequent_minfontsize "" "minimum factor for the font size from the subsequent fading effects" +seta hud_panel_centerprint_fade_minfontsize "" "minimum factor for the font size from the fading in/out effects" diff --git a/hud_luminos.cfg b/hud_luminos.cfg index 4c164bf5e..dc8be691d 100644 --- a/hud_luminos.cfg +++ b/hud_luminos.cfg @@ -274,6 +274,7 @@ seta hud_panel_centerprint_fade_subsequent_passone "3" seta hud_panel_centerprint_fade_subsequent_passone_minalpha "0.5" seta hud_panel_centerprint_fade_subsequent_passtwo "10" seta hud_panel_centerprint_fade_subsequent_passtwo_minalpha "0.5" -seta hud_panel_centerprint_fade_minfontsize "0.6" +seta hud_panel_centerprint_fade_subsequent_minfontsize "0.75" +seta hud_panel_centerprint_fade_minfontsize "0.25" menu_sync diff --git a/hud_luminos_minimal.cfg b/hud_luminos_minimal.cfg index a3587831e..8af6192c7 100644 --- a/hud_luminos_minimal.cfg +++ b/hud_luminos_minimal.cfg @@ -274,6 +274,7 @@ seta hud_panel_centerprint_fade_subsequent_passone "3" seta hud_panel_centerprint_fade_subsequent_passone_minalpha "0.5" seta hud_panel_centerprint_fade_subsequent_passtwo "10" seta hud_panel_centerprint_fade_subsequent_passtwo_minalpha "0.5" -seta hud_panel_centerprint_fade_minfontsize "0.6" +seta hud_panel_centerprint_fade_subsequent_minfontsize "0.75" +seta hud_panel_centerprint_fade_minfontsize "0.25" menu_sync diff --git a/hud_luminos_minimal_xhair.cfg b/hud_luminos_minimal_xhair.cfg index 1e7cc0ade..6107013e4 100644 --- a/hud_luminos_minimal_xhair.cfg +++ b/hud_luminos_minimal_xhair.cfg @@ -274,6 +274,7 @@ seta hud_panel_centerprint_fade_subsequent_passone "3" seta hud_panel_centerprint_fade_subsequent_passone_minalpha "0.5" seta hud_panel_centerprint_fade_subsequent_passtwo "10" seta hud_panel_centerprint_fade_subsequent_passtwo_minalpha "0.5" -seta hud_panel_centerprint_fade_minfontsize "0.6" +seta hud_panel_centerprint_fade_subsequent_minfontsize "0.75" +seta hud_panel_centerprint_fade_minfontsize "0.25" menu_sync diff --git a/hud_luminos_old.cfg b/hud_luminos_old.cfg index 4f7630f78..762aee808 100644 --- a/hud_luminos_old.cfg +++ b/hud_luminos_old.cfg @@ -274,6 +274,7 @@ seta hud_panel_centerprint_fade_subsequent_passone "3" seta hud_panel_centerprint_fade_subsequent_passone_minalpha "0.5" seta hud_panel_centerprint_fade_subsequent_passtwo "10" seta hud_panel_centerprint_fade_subsequent_passtwo_minalpha "0.5" -seta hud_panel_centerprint_fade_minfontsize "0.6" +seta hud_panel_centerprint_fade_subsequent_minfontsize "0.75" +seta hud_panel_centerprint_fade_minfontsize "0.25" menu_sync diff --git a/hud_nexuiz.cfg b/hud_nexuiz.cfg index a47801711..93b7e0a82 100644 --- a/hud_nexuiz.cfg +++ b/hud_nexuiz.cfg @@ -274,6 +274,7 @@ seta hud_panel_centerprint_fade_subsequent_passone "3" seta hud_panel_centerprint_fade_subsequent_passone_minalpha "0.5" seta hud_panel_centerprint_fade_subsequent_passtwo "10" seta hud_panel_centerprint_fade_subsequent_passtwo_minalpha "0.5" -seta hud_panel_centerprint_fade_minfontsize "0.6" +seta hud_panel_centerprint_fade_subsequent_minfontsize "0.75" +seta hud_panel_centerprint_fade_minfontsize "0.25" menu_sync diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh index b0a11ad18..7b3e3c9ca 100644 --- a/qcsrc/client/autocvars.qh +++ b/qcsrc/client/autocvars.qh @@ -219,6 +219,7 @@ float autocvar_hud_panel_centerprint_fade_subsequent_passone; float autocvar_hud_panel_centerprint_fade_subsequent_passone_minalpha; float autocvar_hud_panel_centerprint_fade_subsequent_passtwo; float autocvar_hud_panel_centerprint_fade_subsequent_passtwo_minalpha; +float autocvar_hud_panel_centerprint_fade_subsequent_minfontsize; float autocvar_hud_panel_centerprint_fade_minfontsize; float autocvar_hud_panel_centerprint_flip; float autocvar_hud_panel_centerprint_fontscale; diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 0ceb4735c..7166a33c5 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -4679,6 +4679,9 @@ void HUD_CenterPrint (void) else if (centerprint_expire_time[j] > time) a = (centerprint_expire_time[j] - time) / max(0.0001, autocvar_hud_panel_centerprint_fade_out); + // set the size from fading in/out before subsequent fading + sz = autocvar_hud_panel_centerprint_fade_minfontsize + a * (1 - autocvar_hud_panel_centerprint_fade_minfontsize); + // also fade it based on positioning if(autocvar_hud_panel_centerprint_fade_subsequent) { @@ -4686,8 +4689,8 @@ void HUD_CenterPrint (void) a = a * bound(autocvar_hud_panel_centerprint_fade_subsequent_passtwo_minalpha, (1 - (i / max(1, autocvar_hud_panel_centerprint_fade_subsequent_passtwo))), 1); // pass two: after that, gradually lower alpha even more for each message } - // finally set the size based on the new alpha - sz = autocvar_hud_panel_centerprint_fade_minfontsize + a * (1 - autocvar_hud_panel_centerprint_fade_minfontsize); + // finally set the size based on the new alpha from subsequent fading + sz = autocvar_hud_panel_centerprint_fade_subsequent_minfontsize + a * (1 - autocvar_hud_panel_centerprint_fade_subsequent_minfontsize); drawfontscale = sz * '1 1 0'; if (centerprint_countdown_num[j]) diff --git a/qcsrc/client/hud_config.qc b/qcsrc/client/hud_config.qc index 2ac08e7d0..a47df3ca4 100644 --- a/qcsrc/client/hud_config.qc +++ b/qcsrc/client/hud_config.qc @@ -169,6 +169,7 @@ void HUD_Panel_ExportCfg(string cfgname) HUD_Write_PanelCvar_q("_fade_subsequent_passone_minalpha"); HUD_Write_PanelCvar_q("_fade_subsequent_passtwo"); HUD_Write_PanelCvar_q("_fade_subsequent_passtwo_minalpha"); + HUD_Write_PanelCvar_q("_fade_subsequent_minfontsize"); HUD_Write_PanelCvar_q("_fade_minfontsize"); break; }