From: Juhu <5894800-Juhu_@users.noreply.gitlab.com>
Date: Thu, 6 Jul 2023 19:04:38 +0000 (+0200)
Subject: Merge branch 'Juhu/strafehud-next' into Juhu/strafehud-next_cvarsave
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2ebfc9d4dda3a1c3474bcaf4ae198fec8bcbdae4;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Juhu/strafehud-next' into Juhu/strafehud-next_cvarsave
---

2ebfc9d4dda3a1c3474bcaf4ae198fec8bcbdae4
diff --cc qcsrc/client/hud/panel/strafehud.qh
index 894515fce,861a566b7..c35555f46
--- a/qcsrc/client/hud/panel/strafehud.qh
+++ b/qcsrc/client/hud/panel/strafehud.qh
@@@ -1,79 -1,81 +1,81 @@@
  #pragma once
  #include "../panel.qh"
  
 -int autocvar_hud_panel_strafehud = 3;
 -bool autocvar__hud_panel_strafehud_demo = false;
 -bool autocvar_hud_panel_strafehud_dynamichud    = true;
 -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;
 -vector autocvar_hud_panel_strafehud_bar_accel_color = '0 1 0';
 -float autocvar_hud_panel_strafehud_bar_accel_alpha = 0.5;
 -vector autocvar_hud_panel_strafehud_bar_overturn_color = '1 0 1';
 -float autocvar_hud_panel_strafehud_bar_overturn_alpha = 0.5;
 -int autocvar_hud_panel_strafehud_angle_style = 0;
 -int autocvar_hud_panel_strafehud_angle_dashes = 4;
 -float autocvar_hud_panel_strafehud_angle_alpha = 0.8;
 -float autocvar_hud_panel_strafehud_angle_height = 1;
 -float autocvar_hud_panel_strafehud_angle_width = 0.001;
 -vector autocvar_hud_panel_strafehud_angle_neutral_color = '1 1 0';
 -vector autocvar_hud_panel_strafehud_angle_accel_color = '0 1 1';
 -vector autocvar_hud_panel_strafehud_angle_overturn_color = '1 0 1';
 -int autocvar_hud_panel_strafehud_angle_arrow = 1;
 -float autocvar_hud_panel_strafehud_angle_arrow_size = 0.5;
 -bool autocvar_hud_panel_strafehud_bestangle = true;
 -vector autocvar_hud_panel_strafehud_bestangle_color = '1 1 1';
 -float autocvar_hud_panel_strafehud_bestangle_alpha = 0.5;
 -bool autocvar_hud_panel_strafehud_switch = true;
 -float autocvar_hud_panel_strafehud_switch_minspeed = -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.003;
 -bool autocvar_hud_panel_strafehud_direction = false;
 -vector autocvar_hud_panel_strafehud_direction_color = '0 0.5 1';
 -float autocvar_hud_panel_strafehud_direction_alpha = 1;
 -float autocvar_hud_panel_strafehud_direction_width = 0.25;
 -float autocvar_hud_panel_strafehud_direction_length = 0.02;
 -bool autocvar_hud_panel_strafehud_slickdetector = true;
 -float autocvar_hud_panel_strafehud_slickdetector_range = 200;
 -int autocvar_hud_panel_strafehud_slickdetector_granularity = 1;
 -vector autocvar_hud_panel_strafehud_slickdetector_color = '0 1 1';
 -float autocvar_hud_panel_strafehud_slickdetector_alpha = 0.5;
 -float autocvar_hud_panel_strafehud_slickdetector_height = 0.125;
 -bool autocvar_hud_panel_strafehud_startspeed = true;
 -float autocvar_hud_panel_strafehud_startspeed_fade = 4;
 -vector autocvar_hud_panel_strafehud_startspeed_color = '1 0.75 0';
 -float autocvar_hud_panel_strafehud_startspeed_size = 1.5;
 -bool autocvar_hud_panel_strafehud_jumpheight = false;
 -float autocvar_hud_panel_strafehud_jumpheight_fade = 4;
 -float autocvar_hud_panel_strafehud_jumpheight_min = 50;
 -vector autocvar_hud_panel_strafehud_jumpheight_color = '0 1 0.75';
 -float autocvar_hud_panel_strafehud_jumpheight_size = 1.5;
 -float autocvar_hud_panel_strafehud_timeout_ground = 0.1;
 -float autocvar_hud_panel_strafehud_timeout_turn = 0.1;
 -float autocvar_hud_panel_strafehud_antiflicker_angle = 0.01;
 -float autocvar_hud_panel_strafehud_fps_update = 0.5;
 -bool autocvar_hud_panel_strafehud_sonar = false;
 -string autocvar_hud_panel_strafehud_sonar_audio = "misc/talk";
 -float autocvar_hud_panel_strafehud_sonar_start = 0.5;
 -float autocvar_hud_panel_strafehud_sonar_interval_start = 0.333333;
 -float autocvar_hud_panel_strafehud_sonar_interval_range = -0.222222;
 -float autocvar_hud_panel_strafehud_sonar_interval_exponent = 1;
 -float autocvar_hud_panel_strafehud_sonar_volume_start = 0.333333;
 -float autocvar_hud_panel_strafehud_sonar_volume_range = 0.666666;
 -float autocvar_hud_panel_strafehud_sonar_volume_exponent = 1;
 -float autocvar_hud_panel_strafehud_sonar_pitch_start = 0.9;
 -float autocvar_hud_panel_strafehud_sonar_pitch_range = 0.1;
 -float autocvar_hud_panel_strafehud_sonar_pitch_exponent = 1;
 -bool autocvar_hud_panel_strafehud_vangle = false;
 -vector autocvar_hud_panel_strafehud_vangle_color = '0.75 0.75 0.75';
 -float autocvar_hud_panel_strafehud_vangle_size = 1;
 -bool autocvar_hud_panel_strafehud_strafeefficiency = false;
 -float autocvar_hud_panel_strafehud_strafeefficiency_size = 1;
 -int autocvar_hud_panel_strafehud_projection = 0;
 +AUTOCVAR_SAVE(hud_panel_strafehud, int, 3, "enable this panel, 1 = show if not observing, 2 = show always, 3 = show only in race/cts if not observing");
 +AUTOCVAR_SAVE(_hud_panel_strafehud_demo, bool, false, "strafehud changes angle during configure");
 +AUTOCVAR_SAVE(hud_panel_strafehud_dynamichud, bool, true, "apply the dynamic hud effects to this panel");
 +AUTOCVAR_SAVE(hud_panel_strafehud_mode, int, 0, "strafehud mode which controls whether the strafehud is centered at \"0\" = view angle, \"1\" = velocity angle");
 +AUTOCVAR_SAVE(hud_panel_strafehud_range, float, 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)");
 +AUTOCVAR_SAVE(hud_panel_strafehud_style, int, 2, "\"0\" = no styling, \"1\" = progress bar style for the strafe bar, \"2\" = gradient for the strafe bar");
 +AUTOCVAR_SAVE(hud_panel_strafehud_unit_show, bool, true, "show units");
 +AUTOCVAR_SAVE(hud_panel_strafehud_uncapped, bool, false, "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)");
 +AUTOCVAR_SAVE(hud_panel_strafehud_bar_preaccel, bool, true, "set to \"1\" to extend the acceleration zone by the strafe meter zone before full acceleration can be achieved");
 +AUTOCVAR_SAVE(hud_panel_strafehud_bar_neutral_color, vector, '1 1 1', "color of the strafe meter neutral zone");
 +AUTOCVAR_SAVE(hud_panel_strafehud_bar_neutral_alpha, float, 0.1, "opacity of the strafe meter neutral zone");
 +AUTOCVAR_SAVE(hud_panel_strafehud_bar_accel_color, vector, '0 1 0', "color of the strafe meter acceleration zone");
 +AUTOCVAR_SAVE(hud_panel_strafehud_bar_accel_alpha, float, 0.5, "opacity of the strafe meter acceleration zone");
 +AUTOCVAR_SAVE(hud_panel_strafehud_bar_overturn_color, vector, '1 0 1', "color of the strafe meter overturn zone");
 +AUTOCVAR_SAVE(hud_panel_strafehud_bar_overturn_alpha, float, 0.5, "opacity of the strafe meter overturn zone");
 +AUTOCVAR_SAVE(hud_panel_strafehud_angle_style, int, 0, "set the angle indicator style: 0 = none, 1 = solid line, 2 = dashed line");
 +AUTOCVAR_SAVE(hud_panel_strafehud_angle_dashes, int, 4, "determines the amount of dashes if the angle indicator uses a dashed line");
 +AUTOCVAR_SAVE(hud_panel_strafehud_angle_alpha, float, 0.8, "opacity of the indicator showing the player's current angle");
 +AUTOCVAR_SAVE(hud_panel_strafehud_angle_height, float, 1, "height of the indicator showing the player's current angle (relative to the panel height)");
 +AUTOCVAR_SAVE(hud_panel_strafehud_angle_width, float, 0.001, "width of the indicator showing the player's current angle (relative to the panel width)");
 +AUTOCVAR_SAVE(hud_panel_strafehud_angle_neutral_color, vector, '1 1 0', "color of the indicator showing the player's current angle if it is within the neutral zone");
 +AUTOCVAR_SAVE(hud_panel_strafehud_angle_accel_color, vector, '0 1 1', "color of the indicator showing the player's current angle if it is within the acceleration zone");
 +AUTOCVAR_SAVE(hud_panel_strafehud_angle_overturn_color, vector, '1 0 1', "color of the indicator showing the player's current angle if it is within the overturn zone");
 +AUTOCVAR_SAVE(hud_panel_strafehud_angle_arrow, int, 1, "set the angle indicator's arrow style: 0 = none, 1 = top, 2 = bottom, 3 = both");
 +AUTOCVAR_SAVE(hud_panel_strafehud_angle_arrow_size, float, 0.5, "size of the arrow (relative to the panel height)");
 +AUTOCVAR_SAVE(hud_panel_strafehud_bestangle, bool, true, "set to \"1\" to enable a ghost angle indicator showing the best angle to gain maximum acceleration");
 +AUTOCVAR_SAVE(hud_panel_strafehud_bestangle_color, vector, '1 1 1', "color of the indicator showing the best angle to gain maximum acceleration");
 +AUTOCVAR_SAVE(hud_panel_strafehud_bestangle_alpha, float, 0.5, "opacity of the indicator showing the best angle to gain maximum acceleration");
 +AUTOCVAR_SAVE(hud_panel_strafehud_switch, bool, true, "set to \"1\" to enable the switch indicator showing the angle to move to when switching sides");
 +AUTOCVAR_SAVE(hud_panel_strafehud_switch_minspeed, float, -1, "minimum speed in qu/s at which switch indicator(s) which are used to aid changing strafe direction will be shown (set to -1 for dynamic minspeed)");
 +AUTOCVAR_SAVE(hud_panel_strafehud_switch_color, vector, '1 1 0', "color of the switch indicator");
 +AUTOCVAR_SAVE(hud_panel_strafehud_switch_alpha, float, 1, "opacity of the switch indicator");
 +AUTOCVAR_SAVE(hud_panel_strafehud_switch_width, float, 0.003, "width of the strafe angle indicator(s) (relative to the strafe bar width)");
 +AUTOCVAR_SAVE(hud_panel_strafehud_direction, bool, false, "set to \"1\" to enable the direction caps to see in which direction you are currently strafing");
 +AUTOCVAR_SAVE(hud_panel_strafehud_direction_color, vector, '0 0.5 1', "color of the direction caps which indicate the direction the player is currently strafing towards");
 +AUTOCVAR_SAVE(hud_panel_strafehud_direction_alpha, float, 1, "opacity of the direction caps which indicate the direction the player is currently strafing towards");
 +AUTOCVAR_SAVE(hud_panel_strafehud_direction_width, float, 0.25, "stroke width of the direction caps which indicate the direction the player is currently strafing towards (relative to the panel height)");
 +AUTOCVAR_SAVE(hud_panel_strafehud_direction_length, float, 0.02, "length of the horizontal component of the direction caps which indicate the direction the player is currently strafing towards (relative to the panel width)");
 +AUTOCVAR_SAVE(hud_panel_strafehud_slickdetector, bool, true, "set to \"1\" to enable the slick detector which notifies you if there is slick near you");
 +AUTOCVAR_SAVE(hud_panel_strafehud_slickdetector_range, float, 200, "range of the slick detector in qu");
 +AUTOCVAR_SAVE(hud_panel_strafehud_slickdetector_granularity, int, 1, "value from 0 to 4 which defines how exact the search for slick should be, higher values may yield better results but require more computation");
 +AUTOCVAR_SAVE(hud_panel_strafehud_slickdetector_color, vector, '0 1 1', "color of the slick detector indicator");
 +AUTOCVAR_SAVE(hud_panel_strafehud_slickdetector_alpha, float, 0.5, "opacity of the slick detector indicator");
 +AUTOCVAR_SAVE(hud_panel_strafehud_slickdetector_height, float, 0.125, "height of the slick detector indicator (relative to the panel height)");
 +AUTOCVAR_SAVE(hud_panel_strafehud_startspeed, bool, true, "set to \"1\" to enable the start speed indicator which shows you the speed you had while passing the start trigger of a race map");
 +AUTOCVAR_SAVE(hud_panel_strafehud_startspeed_fade, float, 4, "fade time (in seconds) of the start speed text");
 +AUTOCVAR_SAVE(hud_panel_strafehud_startspeed_color, vector, '1 0.75 0', "color of the start speed text");
 +AUTOCVAR_SAVE(hud_panel_strafehud_startspeed_size, float, 1.5, "size of the start speed text (relative to the panel height)");
 +AUTOCVAR_SAVE(hud_panel_strafehud_jumpheight, bool, false, "set to \"1\" to enable the jump height indicator which tells you how high you jumped");
 +AUTOCVAR_SAVE(hud_panel_strafehud_jumpheight_fade, float, 4, "fade time (in seconds) of the jump height text");
 +AUTOCVAR_SAVE(hud_panel_strafehud_jumpheight_min, float, 50, "minimum jump height to display in the selected unit");
 +AUTOCVAR_SAVE(hud_panel_strafehud_jumpheight_color, vector, '0 1 0.75', "color of the jump height text");
 +AUTOCVAR_SAVE(hud_panel_strafehud_jumpheight_size, float, 1.5, "size of the jump height text (relative to the panel height)");
 +AUTOCVAR_SAVE(hud_panel_strafehud_timeout_ground, float, 0.1, "time (in seconds) after take off before changing to air strafe physics when not jumping (visually more consistent hud while on slick downwards ramps)");
 +AUTOCVAR_SAVE(hud_panel_strafehud_timeout_turn, float, 0.1, "time (in seconds) after releasing the strafe keys before changing mode (visually more consistent hud while switching between left/right strafe turning)");
 +AUTOCVAR_SAVE(hud_panel_strafehud_antiflicker_angle, float, 0.01, "how many degrees from 0° to 180° the hud ignores if it could cause visual disturbances otherwise (and to counter rounding errors)");
 +AUTOCVAR_SAVE(hud_panel_strafehud_fps_update, float, 0.5, "update interval (in seconds) of the frametime to calculate the optimal angle, smaller values may cause flickering");
 +AUTOCVAR_SAVE(hud_panel_strafehud_sonar, bool, false, "set to \"1\" to enable the strafe sonar");
 +AUTOCVAR_SAVE(hud_panel_strafehud_sonar_audio, string, "misc/talk", "audio to play for sonar");
 +AUTOCVAR_SAVE(hud_panel_strafehud_sonar_start, float, 0.5, "how optimal from 0 to 1 your strafing angle has to be for the strafe sonar to activate");
 +AUTOCVAR_SAVE(hud_panel_strafehud_sonar_interval_start, float, 0.333333, "strafe sonar sound interval in seconds");
 +AUTOCVAR_SAVE(hud_panel_strafehud_sonar_interval_range, float, -0.222222, "dynamic sound interval range in seconds of the strafe sonar as you approach the optimal angle");
 +AUTOCVAR_SAVE(hud_panel_strafehud_sonar_interval_exponent, float, 1, "exponent of the dynamic sound interval range of the strafe sonar");
 +AUTOCVAR_SAVE(hud_panel_strafehud_sonar_volume_start, float, 0.333333, "sound volume of the strafe sonar");
 +AUTOCVAR_SAVE(hud_panel_strafehud_sonar_volume_range, float, 0.666666, "dynamic volume range of the strafe sonar as you approach the optimal angle");
 +AUTOCVAR_SAVE(hud_panel_strafehud_sonar_volume_exponent, float, 1, "exponent of the dynamic volume range of the strafe sonar");
 +AUTOCVAR_SAVE(hud_panel_strafehud_sonar_pitch_start, float, 0.9, "playback speed of the strafe sonar");
 +AUTOCVAR_SAVE(hud_panel_strafehud_sonar_pitch_range, float, 0.1, "dynamic playback speed range of the strafe sonar as you approach the optimal angle");
 +AUTOCVAR_SAVE(hud_panel_strafehud_sonar_pitch_exponent, float, 1, "exponent of the dynamic playback speed range of the strafe sonar");
 +AUTOCVAR_SAVE(hud_panel_strafehud_vangle, bool, false, "set to \"1\" to enable the vertical angle indicator");
 +AUTOCVAR_SAVE(hud_panel_strafehud_vangle_color, vector, '0.75 0.75 0.75', "color of the vertical angle text");
 +AUTOCVAR_SAVE(hud_panel_strafehud_vangle_size, float, 1, "size of the vertical angle text (relative to the panel height)");
 +AUTOCVAR_SAVE(hud_panel_strafehud_projection, int, 0, "strafehud projection mode, \"0\" = linear, \"1\" = perspective, \"2\" = panoramic");
++AUTOCVAR_SAVE(hud_panel_strafehud_strafeefficiency, bool, false, "set to \"1\" to enable the strafe efficiency indicator");
++AUTOCVAR_SAVE(hud_panel_strafehud_strafeefficiency_size, float, 1, "size of the strafe efficiency text (relative to the panel height)");
  
  void HUD_Panel_DrawStrafeHUD(float, float, float, vector, float, int, int, bool, float);
  vector StrafeHUD_mixColors(vector, vector, float);