From: Juhu <5894800-Juhu_@users.noreply.gitlab.com> Date: Sat, 31 Aug 2024 21:55:10 +0000 (+0200) Subject: strafehud: remove hud_panel_strafehud_uncapped, this cvar was a bad idea X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ae04214d566c07cbe473a078c157ac56666de67f;p=xonotic%2Fxonotic-data.pk3dir.git strafehud: remove hud_panel_strafehud_uncapped, this cvar was a bad idea --- diff --git a/_hud_common.cfg b/_hud_common.cfg index 953984a77..f5415dd82 100644 --- a/_hud_common.cfg +++ b/_hud_common.cfg @@ -159,7 +159,6 @@ seta hud_panel_strafehud_mode "0" "strafehud mode which controls whether the str seta hud_panel_strafehud_range "90" "the angle range up to 360 degrees displayed on the strafehud, \"-1\" = current fov, \"0\" = dynamic (chooses the minimum range required to still see the whole area needed for accelerating)" seta hud_panel_strafehud_style "2" "\"0\" = no styling, \"1\" = progress bar style for the strafe bar, \"2\" = gradient for the strafe bar" seta hud_panel_strafehud_unit_show "1" "show units" -seta hud_panel_strafehud_uncapped "0" "set to \"1\" to remove some safety restrictions, useful to set thinner indicator lines down to 1px or for trying out higher values for some performance degrading operations (warning: elements may turn invisible if too thin, other configurations may crash your game or look horribly ugly)" seta hud_panel_strafehud_bar_preaccel "1" "set to \"1\" to extend the acceleration zone by the strafe meter zone before full acceleration can be achieved" seta hud_panel_strafehud_bar_neutral_color "1 1 1" "color of the strafe meter neutral zone" seta hud_panel_strafehud_bar_neutral_alpha "0.1" "opacity of the strafe meter neutral zone" diff --git a/qcsrc/client/hud/panel/strafehud.qc b/qcsrc/client/hud/panel/strafehud.qc index 9a0bf86fc..6c717e82f 100644 --- a/qcsrc/client/hud/panel/strafehud.qc +++ b/qcsrc/client/hud/panel/strafehud.qc @@ -206,7 +206,7 @@ void HUD_StrafeHUD() mode = STRAFEHUD_MODE_VIEW_CENTERED; // there's only one size cvar for the arrows, they will always have a 45° angle to ensure proper rendering without antialiasing - float arrow_size = max(panel_size.y * min(autocvar_hud_panel_strafehud_angle_arrow_size, 10), 0); + float arrow_size = max(panel_size.y * min(autocvar_hud_panel_strafehud_angle_arrow_size, 10), 1); if(onground) { @@ -253,9 +253,6 @@ void HUD_StrafeHUD() else movespeed = min(movespeed, maxspeed); - if(!autocvar_hud_panel_strafehud_uncapped) - arrow_size = max(arrow_size, 1); - // determine frametime if((csqcplayer_status == CSQCPLAYERSTATUS_PREDICTED) && (input_timelength > 0)) { @@ -580,25 +577,10 @@ void HUD_StrafeHUD() hidden_width = (360 - hudangle) / hudangle * panel_size.x; // current angle - currentangle_size.x = autocvar_hud_panel_strafehud_angle_width; - currentangle_size.y = autocvar_hud_panel_strafehud_angle_height; + currentangle_size.x = max(panel_size.x * min(autocvar_hud_panel_strafehud_angle_width, 10), 1); + currentangle_size.y = max(panel_size.y * min(autocvar_hud_panel_strafehud_angle_height, 10), 1); currentangle_size.z = 0; - if(!autocvar_hud_panel_strafehud_uncapped) - { - currentangle_size.x = min(currentangle_size.x, 10); - currentangle_size.y = min(currentangle_size.y, 10); - } - currentangle_size.x *= panel_size.x; - currentangle_size.y *= panel_size.y; - if(!autocvar_hud_panel_strafehud_uncapped) - { - currentangle_size.x = max(currentangle_size.x, 1); - currentangle_size.y = max(currentangle_size.y, 1); - } - else - { - currentangle_size.y = max(currentangle_size.y, 0); - } + if(mode == STRAFEHUD_MODE_VIEW_CENTERED) currentangle_offset = angle / hudangle * panel_size.x; else @@ -607,9 +589,7 @@ void HUD_StrafeHUD() // best strafe acceleration angle bestangle_offset = bestangle / hudangle * panel_size.x + panel_size.x / 2; switch_bestangle_offset = -bestangle / hudangle * panel_size.x + panel_size.x / 2; - bestangle_width = panel_size.x * autocvar_hud_panel_strafehud_switch_width; - if(!autocvar_hud_panel_strafehud_uncapped) - bestangle_width = max(bestangle_width, 1); + bestangle_width = max(panel_size.x * autocvar_hud_panel_strafehud_switch_width, 1); if((angle > -wishangle && direction == STRAFEHUD_DIRECTION_LEFT) || (angle < -wishangle && direction == STRAFEHUD_DIRECTION_RIGHT)) { @@ -619,11 +599,7 @@ void HUD_StrafeHUD() } // direction indicator direction_size_vertical.x = autocvar_hud_panel_strafehud_direction_width; - if(!autocvar_hud_panel_strafehud_uncapped) - direction_size_vertical.x = min(direction_size_vertical.x, 1); - direction_size_vertical.x *= panel_size.y; - if(!autocvar_hud_panel_strafehud_uncapped) - direction_size_vertical.x = max(direction_size_vertical.x, 1); + direction_size_vertical.x = max(panel_size.y * min(direction_size_vertical.x, 1), 1); direction_size_vertical.y = panel_size.y + direction_size_vertical.x * 2; direction_size_vertical.z = 0; direction_size_horizontal.x = panel_size.x * min(autocvar_hud_panel_strafehud_direction_length, .5); @@ -806,9 +782,7 @@ void HUD_StrafeHUD() } // slick detector - slickdetector_height = max(autocvar_hud_panel_strafehud_slickdetector_height, 0); - if(!autocvar_hud_panel_strafehud_uncapped) - slickdetector_height = min(slickdetector_height, 1); + slickdetector_height = bound(0, autocvar_hud_panel_strafehud_slickdetector_height, 1); slickdetector_height *= panel_size.y; if(autocvar_hud_panel_strafehud_slickdetector && autocvar_hud_panel_strafehud_slickdetector_range > 0 && @@ -816,11 +790,9 @@ void HUD_StrafeHUD() slickdetector_height > 0 && panel_size.x > 0) { - float slicksteps = max(autocvar_hud_panel_strafehud_slickdetector_granularity, 0); + float slicksteps = bound(0, autocvar_hud_panel_strafehud_slickdetector_granularity, 4); bool slickdetected = false; - if(!autocvar_hud_panel_strafehud_uncapped) - slicksteps = min(slicksteps, 4); slicksteps = 90 / 2 ** slicksteps; slickdetected = real_onslick; // don't need to traceline if already touching slick diff --git a/qcsrc/client/hud/panel/strafehud.qh b/qcsrc/client/hud/panel/strafehud.qh index 861a566b7..efc724502 100644 --- a/qcsrc/client/hud/panel/strafehud.qh +++ b/qcsrc/client/hud/panel/strafehud.qh @@ -8,7 +8,6 @@ int autocvar_hud_panel_strafehud_mode = 0; float autocvar_hud_panel_strafehud_range = 90; int autocvar_hud_panel_strafehud_style = 2; bool autocvar_hud_panel_strafehud_unit_show = true; -bool autocvar_hud_panel_strafehud_uncapped = false; bool autocvar_hud_panel_strafehud_bar_preaccel = true; vector autocvar_hud_panel_strafehud_bar_neutral_color = '1 1 1'; float autocvar_hud_panel_strafehud_bar_neutral_alpha = 0.1;