From 67fad40e9f19f59c748bcc0a87cf398dc9c448ec Mon Sep 17 00:00:00 2001 From: Juhu <5894800-Juhu_@users.noreply.gitlab.com> Date: Mon, 22 Mar 2021 15:03:39 +0100 Subject: [PATCH] strafehud: rework the switch indicator cvars and remove the indicator on the current strafing side --- _hud_common.cfg | 8 +++----- qcsrc/client/hud/panel/strafehud.qc | 10 +++------- qcsrc/client/hud/panel/strafehud.qh | 6 ++---- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/_hud_common.cfg b/_hud_common.cfg index 42fcb1be5..e243f01cd 100644 --- a/_hud_common.cfg +++ b/_hud_common.cfg @@ -156,11 +156,9 @@ seta hud_panel_strafehud_angle_overturn_color "1 0 1" "color of the indicator sh seta hud_panel_strafehud_angle_arrow "1" "set the angle indicators arrow style: 0 = none, 1 = top, 2 = bottom, 3 = both" seta hud_panel_strafehud_angle_arrow_height "0.5" "height of the arrow (relative to the panel height)" seta hud_panel_strafehud_angle_arrow_width "0.03" "width of the arrow (relative to the panel width)" -seta hud_panel_strafehud_switch_minspeed "-1" "minimum speed in qu/s at which switch indicators which are used to aid changing strafe direction will be shown (uses physics maxspeed + antiflicker speed if negative)" -seta hud_panel_strafehud_switch_active_color "0 1 0" "color of the switch indicator on the current side" -seta hud_panel_strafehud_switch_active_alpha "1" "opacity of the switch indicator on the current side" -seta hud_panel_strafehud_switch_inactive_color "1 1 0" "color of the switch indicator on the opposite side" -seta hud_panel_strafehud_switch_inactive_alpha "1" "opacity of the switch indicator on the opposite side" +seta hud_panel_strafehud_switch_minspeed "-1" "minimum speed in qu/s at which switch indicators which are used to aid changing strafe direction will be shown (set to -1 for dynamic minspeed)" +seta hud_panel_strafehud_switch_color "1 1 0" "color of the switch indicator" +seta hud_panel_strafehud_switch_alpha "1" "opacity of the switch indicator" seta hud_panel_strafehud_switch_width "0.0075" "width of the strafe angle indicators (relative to the strafe bar width)" seta hud_panel_strafehud_direction_color "0 0.5 1" "color of the direction caps which indicate the direction the player is currently strafing towards" seta hud_panel_strafehud_direction_alpha "1" "opacity of the direction caps which indicate the direction the player is currently strafing towards" diff --git a/qcsrc/client/hud/panel/strafehud.qc b/qcsrc/client/hud/panel/strafehud.qc index 1538a9541..61383a4e8 100644 --- a/qcsrc/client/hud/panel/strafehud.qc +++ b/qcsrc/client/hud/panel/strafehud.qc @@ -580,15 +580,11 @@ void HUD_StrafeHUD() if(speed >= minspeed) // only draw indicators if minspeed is reached { - // draw best angles for acceleration + // draw the switch indicator(s) float offset = !odd_angles ? bestangle_offset : odd_bestangle_offset; float switch_offset = !odd_angles ? switch_bestangle_offset : switch_odd_bestangle_offset; - // both indicators are inactive if no direction can be determined - vector switch_color = direction != 0 ? autocvar_hud_panel_strafehud_switch_active_color : autocvar_hud_panel_strafehud_switch_inactive_color; - float switch_alpha = direction != 0 ? autocvar_hud_panel_strafehud_switch_active_alpha : autocvar_hud_panel_strafehud_switch_inactive_alpha; - // draw the switch indicators - HUD_Panel_DrawStrafeHUD(switch_offset, bestangle_width, autocvar_hud_panel_strafehud_switch_inactive_color, autocvar_hud_panel_strafehud_switch_inactive_alpha * panel_fg_alpha, 0, 0); - HUD_Panel_DrawStrafeHUD(offset, bestangle_width, switch_color, switch_alpha * panel_fg_alpha, 0, 0); + HUD_Panel_DrawStrafeHUD(switch_offset, bestangle_width, autocvar_hud_panel_strafehud_switch_color, autocvar_hud_panel_strafehud_switch_alpha * panel_fg_alpha, 0, 0); + if(direction == 0) HUD_Panel_DrawStrafeHUD(offset, bestangle_width, autocvar_hud_panel_strafehud_switch_color, autocvar_hud_panel_strafehud_switch_alpha * panel_fg_alpha, 0, 0); } } diff --git a/qcsrc/client/hud/panel/strafehud.qh b/qcsrc/client/hud/panel/strafehud.qh index 31005dc63..3fa1b4b6d 100644 --- a/qcsrc/client/hud/panel/strafehud.qh +++ b/qcsrc/client/hud/panel/strafehud.qh @@ -27,10 +27,8 @@ int autocvar_hud_panel_strafehud_angle_arrow = 1; float autocvar_hud_panel_strafehud_angle_arrow_height = 0.5; float autocvar_hud_panel_strafehud_angle_arrow_width = 0.03; float autocvar_hud_panel_strafehud_switch_minspeed = -1; -vector autocvar_hud_panel_strafehud_switch_active_color = '0 1 0'; -float autocvar_hud_panel_strafehud_switch_active_alpha = 1; -vector autocvar_hud_panel_strafehud_switch_inactive_color = '1 1 0'; -float autocvar_hud_panel_strafehud_switch_inactive_alpha = 1; +vector autocvar_hud_panel_strafehud_switch_color = '1 1 0'; +float autocvar_hud_panel_strafehud_switch_alpha = 1; float autocvar_hud_panel_strafehud_switch_width = 0.0075; vector autocvar_hud_panel_strafehud_direction_color = '0 0.5 1'; float autocvar_hud_panel_strafehud_direction_alpha = 1; -- 2.39.2