X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fhud.qc;h=f48d789c3ce55fd990684007217db724cc8d349f;hp=b0f2b9ea65d37bdb8c54e5a5e0ee05f8b53224e9;hb=a3a484a54551f0208b6cf1e92bb7e5a3ee1a72f3;hpb=2d3ab02a8b9056a7361db1537cd49cab5fe18307 diff --git a/qcsrc/client/hud/hud.qc b/qcsrc/client/hud/hud.qc index b0f2b9ea65..f48d789c3c 100644 --- a/qcsrc/client/hud/hud.qc +++ b/qcsrc/client/hud/hud.qc @@ -1,18 +1,18 @@ #include "hud.qh" +#include "panel/scoreboard.qh" #include "hud_config.qh" #include "../mapvoting.qh" -#include "../scoreboard.qh" #include "../teamradar.qh" #include #include #include #include +#include #include #include #include -// TODO: remove -#include +#include // TODO: remove /* @@ -68,12 +68,14 @@ vector HUD_Get_Num_Color (float x, float maxvalue) float HUD_GetRowCount(int item_count, vector size, float item_aspect) { + TC(int, item_count); float aspect = size_y / size_x; return bound(1, floor((sqrt(4 * item_aspect * aspect * item_count + aspect * aspect) + aspect + 0.5) / 2), item_count); } vector HUD_GetTableSize_BestItemAR(int item_count, vector psize, float item_aspect) { + TC(int, item_count); float columns, rows; float ratio, best_ratio = 0; float best_columns = 1, best_rows = 1; @@ -112,85 +114,6 @@ vector HUD_GetTableSize_BestItemAR(int item_count, vector psize, float item_aspe return eX * best_columns + eY * best_rows; } -// return the string of the onscreen race timer -string MakeRaceString(int cp, float mytime, float theirtime, float lapdelta, string theirname) -{ - string col; - string timestr; - string cpname; - string lapstr; - lapstr = ""; - - if(theirtime == 0) // goal hit - { - if(mytime > 0) - { - timestr = strcat("+", ftos_decimals(+mytime, TIME_DECIMALS)); - col = "^1"; - } - else if(mytime == 0) - { - timestr = "+0.0"; - col = "^3"; - } - else - { - timestr = strcat("-", ftos_decimals(-mytime, TIME_DECIMALS)); - col = "^2"; - } - - if(lapdelta > 0) - { - lapstr = sprintf(_(" (-%dL)"), lapdelta); - col = "^2"; - } - else if(lapdelta < 0) - { - lapstr = sprintf(_(" (+%dL)"), -lapdelta); - col = "^1"; - } - } - else if(theirtime > 0) // anticipation - { - if(mytime >= theirtime) - timestr = strcat("+", ftos_decimals(mytime - theirtime, TIME_DECIMALS)); - else - timestr = TIME_ENCODED_TOSTRING(TIME_ENCODE(theirtime)); - col = "^3"; - } - else - { - col = "^7"; - timestr = ""; - } - - if(cp == 254) - cpname = _("Start line"); - else if(cp == 255) - cpname = _("Finish line"); - else if(cp) - cpname = sprintf(_("Intermediate %d"), cp); - else - cpname = _("Finish line"); - - if(theirtime < 0) - return strcat(col, cpname); - else if(theirname == "") - return strcat(col, sprintf("%s (%s)", cpname, timestr)); - else - return strcat(col, sprintf("%s (%s %s)", cpname, timestr, strcat(theirname, col, lapstr))); -} - -// Check if the given name already exist in race rankings? In that case, where? (otherwise return 0) -int race_CheckName(string net_name) -{ - int i; - for (i=RANKINGS_CNT-1;i>=0;--i) - if(grecordholder[i] == net_name) - return i+1; - return 0; -} - /* ================== HUD panels @@ -200,6 +123,7 @@ HUD panels //basically the same code of draw_ButtonPicture and draw_VertButtonPicture for the menu void HUD_Panel_DrawProgressBar(vector theOrigin, vector theSize, string pic, float length_ratio, bool vertical, float baralign, vector theColor, float theAlpha, int drawflag) { + TC(bool, vertical); TC(int, drawflag); if(!length_ratio || !theAlpha) return; if(length_ratio > 1) @@ -212,6 +136,9 @@ void HUD_Panel_DrawProgressBar(vector theOrigin, vector theSize, string pic, flo else if(length_ratio < 0) return; + theOrigin = HUD_Shift(theOrigin); + theSize = HUD_Scale(theSize); + vector square; vector width, height; if(vertical) { @@ -303,9 +230,13 @@ void HUD_Panel_DrawProgressBar(vector theOrigin, vector theSize, string pic, flo void HUD_Panel_DrawHighlight(vector pos, vector mySize, vector color, float theAlpha, int drawflag) { + TC(int, drawflag); if(!theAlpha) return; + pos = HUD_Shift(pos); + mySize = HUD_Scale(mySize); + string pic; pic = strcat(hud_skin_path, "/num_leading"); if(precache_pic(pic) == "") { @@ -318,8 +249,9 @@ void HUD_Panel_DrawHighlight(vector pos, vector mySize, vector color, float theA drawsubpic(pos + eX * mySize.x - eX * min(mySize.x * 0.5, mySize.y), eX * min(mySize.x * 0.5, mySize.y) + eY * mySize.y, pic, '0.75 0 0', '0.25 1 0', color, theAlpha, drawflag); } -void DrawNumIcon_expanding(vector myPos, vector mySize, float x, string icon, bool vertical, bool icon_right_align, vector color, float theAlpha, float fadelerp) +void DrawNumIcon_expanding(vector myPos, vector mySize, float x, string icon, bool vertical, int icon_right_align, vector color, float theAlpha, float fadelerp) { + TC(bool, vertical); TC(int, icon_right_align); vector newPos = '0 0 0', newSize = '0 0 0'; vector picpos, numpos; @@ -397,8 +329,9 @@ void DrawNumIcon_expanding(vector myPos, vector mySize, float x, string icon, bo drawpic_aspect_skin_expanding(picpos, icon, '1 1 0' * newSize.y, '1 1 1', panel_fg_alpha * theAlpha, DRAWFLAG_NORMAL, fadelerp); } -void DrawNumIcon(vector myPos, vector mySize, float x, string icon, bool vertical, bool icon_right_align, vector color, float theAlpha) +void DrawNumIcon(vector myPos, vector mySize, float x, string icon, bool vertical, int icon_right_align, vector color, float theAlpha) { + TC(bool, vertical); TC(int, icon_right_align); DrawNumIcon_expanding(myPos, mySize, x, icon, vertical, icon_right_align, color, theAlpha, 0); } @@ -410,6 +343,8 @@ Main HUD system ================== */ +void CSQC_BUMBLE_GUN_HUD(); + void HUD_Vehicle() { if(autocvar__hud_configure) return; @@ -423,63 +358,172 @@ void HUD_Vehicle() } } -bool HUD_Panel_CheckFlags(int showflags) -{ - if ( HUD_Minigame_Showpanels() ) - return showflags & PANEL_SHOW_MINIGAME; - if(intermission == 2) - return showflags & PANEL_SHOW_MAPVOTE; - return showflags & PANEL_SHOW_MAINGAME; -} - void HUD_Panel_Draw(entity panent) { panel = panent; - if(autocvar__hud_configure) + if (autocvar__hud_configure) + { + if (!(panel.panel_configflags & PANEL_CONFIG_MAIN)) + return; + panel_fade_alpha = 1; + Hud_Panel_GetPanelEnabled(); + panel.panel_draw(); + return; + } + + bool draw_allowed = false; + if (HUD_Minigame_Showpanels()) + { + if (panel.panel_showflags & PANEL_SHOW_MINIGAME) + draw_allowed = true; + } + else if(intermission == 2) { - if(panel.panel_configflags & PANEL_CONFIG_MAIN) - panel.panel_draw(); + if(panel.panel_showflags & PANEL_SHOW_MAPVOTE) + draw_allowed = true; } - else if(HUD_Panel_CheckFlags(panel.panel_showflags)) + else if (panel.panel_showflags & PANEL_SHOW_MAINGAME) + draw_allowed = true; + + if (draw_allowed) + { + if (panel.panel_showflags & PANEL_SHOW_WITH_SB) + panel_fade_alpha = 1; + else + { + panel_fade_alpha = 1 - scoreboard_fade_alpha; + if(!panel_fade_alpha) + return; + } panel.panel_draw(); + } } void HUD_Reset() { // reset gametype specific icons - if(gametype == MAPINFO_TYPE_CTF) - HUD_Mod_CTF_Reset(); + if(gametype.m_modicons_reset) + gametype.m_modicons_reset(); +} + +float autocvar_hud_dynamic_shake = 1; +float autocvar_hud_dynamic_shake_damage_max = 130; +float autocvar_hud_dynamic_shake_damage_min = 10; +float autocvar_hud_dynamic_shake_scale = 0.2; +float hud_dynamic_shake_x[10] = {0, 1, -0.7, 0.5, -0.3, 0.2, -0.1, 0.1, 0.0, 0}; +float hud_dynamic_shake_y[10] = {0, 0.4, 0.8, -0.2, -0.6, 0.0, 0.3, 0.1, -0.1, 0}; +bool Hud_Shake_Update() +{ + if(time - hud_dynamic_shake_time < 0) + return false; + + float anim_speed = 17 + 9 * hud_dynamic_shake_factor; + float elapsed_time = (time - hud_dynamic_shake_time) * anim_speed; + int i = floor(elapsed_time); + if(i >= 9) + return false; + + float f = elapsed_time - i; + hud_dynamic_shake_realofs.x = (1 - f) * hud_dynamic_shake_x[i] + f * hud_dynamic_shake_x[i+1]; + hud_dynamic_shake_realofs.y = (1 - f) * hud_dynamic_shake_y[i] + f * hud_dynamic_shake_y[i+1]; + hud_dynamic_shake_realofs.z = 0; + hud_dynamic_shake_realofs *= hud_dynamic_shake_factor * autocvar_hud_dynamic_shake_scale; + hud_dynamic_shake_realofs.x = bound(-0.1, hud_dynamic_shake_realofs.x, 0.1) * vid_conwidth; + hud_dynamic_shake_realofs.y = bound(-0.1, hud_dynamic_shake_realofs.y, 0.1) * vid_conheight; + return true; +} + +void calc_followmodel_ofs(entity view); +void Hud_Dynamic_Frame() +{ + vector ofs = '0 0 0'; + hud_scale = '1 1 0'; + hud_shift = '0 0 0'; + if (autocvar_hud_dynamic_follow) + { + entity view = CSQCModel_server2csqc(player_localentnum - 1); + calc_followmodel_ofs(view); + ofs = -cl_followmodel_ofs * autocvar_hud_dynamic_follow_scale; + ofs.x *= autocvar_hud_dynamic_follow_scale_xyz.z; + ofs.y *= autocvar_hud_dynamic_follow_scale_xyz.x; + ofs.z *= autocvar_hud_dynamic_follow_scale_xyz.y; + + if (fabs(ofs.x) < 0.001) ofs.x = 0; + if (fabs(ofs.y) < 0.001) ofs.y = 0; + if (fabs(ofs.z) < 0.001) ofs.z = 0; + ofs.x = bound(-0.1, ofs.x, 0.1); + ofs.y = bound(-0.1, ofs.y, 0.1); + ofs.z = bound(-0.1, ofs.z, 0.1); + + hud_shift.x = ofs.y * vid_conwidth; + hud_shift.y = ofs.z * vid_conheight; + hud_shift.z = ofs.x; + + hud_scale.x = (1 + hud_shift.z); + hud_scale.y = hud_scale.x; + } + + if(autocvar_hud_dynamic_shake > 0) + { + static float old_health = 0; + float health = max(-1, STAT(HEALTH)); + if(hud_dynamic_shake_factor == -1) // don't allow the effect for this frame + { + hud_dynamic_shake_factor = 0; + old_health = health; + } + else + { + float new_hud_dynamic_shake_factor = 0; + if (old_health - health >= autocvar_hud_dynamic_shake_damage_min + && autocvar_hud_dynamic_shake_damage_max > autocvar_hud_dynamic_shake_damage_min + && old_health > 0 && !intermission) + { + float m = max(autocvar_hud_dynamic_shake_damage_min, 1); + new_hud_dynamic_shake_factor = (old_health - health - m) / (autocvar_hud_dynamic_shake_damage_max - m); + if(new_hud_dynamic_shake_factor >= 1) + new_hud_dynamic_shake_factor = 1; + if(new_hud_dynamic_shake_factor >= hud_dynamic_shake_factor) + { + hud_dynamic_shake_factor = new_hud_dynamic_shake_factor; + hud_dynamic_shake_time = time; + } + } + old_health = health; + if(hud_dynamic_shake_factor) + if(!Hud_Shake_Update()) + hud_dynamic_shake_factor = 0; + } + + if(hud_dynamic_shake_factor > 0) + { + hud_shift.x += hud_dynamic_shake_realofs.x; + hud_shift.y += hud_dynamic_shake_realofs.y; + } + } + + hud_scale_center.x = 0.5 * vid_conwidth; + hud_scale_center.y = 0.5 * vid_conheight; + + hud_scale_current = hud_scale; + hud_shift_current = hud_shift; } void HUD_Main() { int i; - // global hud theAlpha fade - if(menu_enabled == 1) + if(hud_configure_menu_open == 1) hud_fade_alpha = 1; else - hud_fade_alpha = (1 - autocvar__menu_alpha); - - if(scoreboard_fade_alpha) - hud_fade_alpha = (1 - scoreboard_fade_alpha); + hud_fade_alpha = 1 - autocvar__menu_alpha; HUD_Configure_Frame(); - // panels that we want to be active together with the scoreboard - // they must fade only when the menu does - if(scoreboard_fade_alpha == 1) - { - HUD_Panel_Draw(HUD_PANEL(CENTERPRINT)); - return; - } + Hud_Dynamic_Frame(); - if(!autocvar__hud_configure && !hud_fade_alpha) - { - hud_fade_alpha = 1; - HUD_Panel_Draw(HUD_PANEL(VOTE)); - hud_fade_alpha = 0; - return; - } + if(scoreboard_fade_alpha == 1) + if(autocvar__menu_alpha == 1) + return; // Drawing stuff if (hud_skin_prev != autocvar_hud_skin) @@ -561,7 +605,7 @@ void HUD_Main() } } if (warning) - LOG_TRACE("Automatically fixed wrong/missing panel numbers in _hud_panelorder\n"); + LOG_TRACE("Automatically fixed wrong/missing panel numbers in _hud_panelorder"); cvar_set("_hud_panelorder", s); if(hud_panelorder_prev) @@ -590,8 +634,9 @@ void HUD_Main() HUD_Panel_Draw(HUD_PANEL(CHAT)); if(hud_panel_quickmenu) HUD_Panel_Draw(HUD_PANEL(QUICKMENU)); + HUD_Panel_Draw(HUD_PANEL(SCOREBOARD)); - if (scoreboard_active || intermission == 2) + if (intermission == 2) HUD_Reset(); HUD_Configure_PostDraw();