X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fhud.qc;h=9da25ebe9145e27f7cf400afd30e4b1f74343fc5;hp=36de6b3f1622599438eda71ed03222b80ba4e2dd;hb=991de5e6922cd3c283de56c3249624f0f1bfe767;hpb=f134a25da56d9f4c3452cbd47a7ee97d795fc759 diff --git a/qcsrc/client/hud/hud.qc b/qcsrc/client/hud/hud.qc index 36de6b3f16..9da25ebe91 100644 --- a/qcsrc/client/hud/hud.qc +++ b/qcsrc/client/hud/hud.qc @@ -1,5 +1,8 @@ #include "hud.qh" +#include +#include +#include #include "panel/scoreboard.qh" #include "hud_config.qh" #include "../mapvoting.qh" @@ -7,13 +10,16 @@ #include #include #include +#include #include #include #include +#include #include #include #include -#include // TODO: remove +#include +#include /* @@ -69,14 +75,14 @@ vector HUD_Get_Num_Color (float hp, float maxvalue) float HUD_GetRowCount(int item_count, vector size, float item_aspect) { - TC(int, item_count); + 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); + TC(int, item_count); float columns, rows; float ratio, best_ratio = 0; float best_columns = 1, best_rows = 1; @@ -109,10 +115,7 @@ vector HUD_GetTableSize_BestItemAR(int item_count, vector psize, float item_aspe rows = ceil(item_count/columns); } - if(vertical) - return eX * best_rows + eY * best_columns; - else - return eX * best_columns + eY * best_rows; + return (vertical) ? vec2(best_rows, best_columns) : vec2(best_columns, best_rows); } /* @@ -177,7 +180,7 @@ void HUD_Panel_LoadCvars() //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); + TC(bool, vertical); TC(int, drawflag); if(!length_ratio || !theAlpha) return; if(length_ratio > 1) @@ -284,7 +287,7 @@ 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); + TC(int, drawflag); if(!theAlpha) return; @@ -305,7 +308,7 @@ void HUD_Panel_DrawHighlight(vector pos, vector mySize, vector color, float theA void DrawNumIcon_expanding(vector myPos, vector mySize, float theTime, string icon, bool vertical, int icon_right_align, vector color, float theAlpha, float fadelerp) { - TC(bool, vertical); TC(int, icon_right_align); + TC(bool, vertical); TC(int, icon_right_align); vector newPos = '0 0 0', newSize = '0 0 0'; vector picpos, numpos; @@ -385,7 +388,7 @@ void DrawNumIcon_expanding(vector myPos, vector mySize, float theTime, string ic void DrawNumIcon(vector myPos, vector mySize, float theTime, string icon, bool vertical, int icon_right_align, vector color, float theAlpha) { - TC(bool, vertical); TC(int, icon_right_align); + TC(bool, vertical); TC(int, icon_right_align); DrawNumIcon_expanding(myPos, mySize, theTime, icon, vertical, icon_right_align, color, theAlpha, 0); } @@ -395,8 +398,6 @@ Main HUD system ================== */ -void CSQC_BUMBLE_GUN_HUD(); - void HUD_Vehicle() { if(autocvar__hud_configure) return; @@ -424,7 +425,11 @@ void HUD_Panel_Draw(entity panent) } bool draw_allowed = false; - if (active_minigame && HUD_MinigameMenu_IsOpened()) + if (scoreboard_fade_alpha && panel.panel_showflags & PANEL_SHOW_WITH_SB) + { + draw_allowed = true; + } + else if (active_minigame && HUD_MinigameMenu_IsOpened()) { if (panel.panel_showflags & PANEL_SHOW_MINIGAME) draw_allowed = true; @@ -440,7 +445,12 @@ void HUD_Panel_Draw(entity panent) if (draw_allowed) { if (panel.panel_showflags & PANEL_SHOW_WITH_SB) - panel_fade_alpha = 1; + { + if (scoreboard_fade_alpha && intermission == 2 && !(panel.panel_showflags & PANEL_SHOW_MAPVOTE)) + panel_fade_alpha = scoreboard_fade_alpha; + else + panel_fade_alpha = 1; + } else { panel_fade_alpha = 1 - scoreboard_fade_alpha; @@ -485,13 +495,12 @@ bool Hud_Shake_Update() return true; } -entity CSQCModel_server2csqc(int i); -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'; + hud_scale_current = '1 1 0'; + hud_shift_current = '0 0 0'; + if (autocvar_hud_dynamic_follow) { entity view = CSQCModel_server2csqc(player_localentnum - 1); @@ -508,12 +517,12 @@ void Hud_Dynamic_Frame() 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_shift_current.x = ofs.y * vid_conwidth; + hud_shift_current.y = ofs.z * vid_conheight; + hud_shift_current.z = ofs.x; - hud_scale.x = (1 + hud_shift.z); - hud_scale.y = hud_scale.x; + hud_scale_current.x = (1 + hud_shift_current.z); + hud_scale_current.y = hud_scale_current.x; } if(autocvar_hud_dynamic_shake > 0) @@ -550,16 +559,33 @@ void Hud_Dynamic_Frame() if(hud_dynamic_shake_factor > 0) { - hud_shift.x += hud_dynamic_shake_realofs.x; - hud_shift.y += hud_dynamic_shake_realofs.y; + hud_shift_current.x += hud_dynamic_shake_realofs.x; + hud_shift_current.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; + HUD_Scale_Disable(); +} + +bool HUD_WouldShowCursor() +{ + if(autocvar__hud_configure) + return true; + if(mv_active) + return true; + //entity local_player = ((csqcplayer) ? csqcplayer : CSQCModel_server2csqc(player_localentnum - 1)); // TODO: doesn't use regular cursor handling + //if(local_player.viewloc && (local_player.viewloc.spawnflags & VIEWLOC_FREEAIM)) + //return true; + if(HUD_Radar_Clickable()) + return true; + if(HUD_MinigameMenu_IsOpened()) + return true; + if(QuickMenu_IsOpened()) + return true; + return false; } void HUD_Main() @@ -579,12 +605,8 @@ void HUD_Main() // Drawing stuff if (hud_skin_prev != autocvar_hud_skin) { - if (hud_skin_path) - strunzone(hud_skin_path); - hud_skin_path = strzone(strcat("gfx/hud/", autocvar_hud_skin)); - if (hud_skin_prev) - strunzone(hud_skin_prev); - hud_skin_prev = strzone(autocvar_hud_skin); + strcpy(hud_skin_path, strcat("gfx/hud/", autocvar_hud_skin)); + strcpy(hud_skin_prev, autocvar_hud_skin); } // draw the dock @@ -659,9 +681,7 @@ void HUD_Main() LOG_TRACE("Automatically fixed wrong/missing panel numbers in _hud_panelorder"); cvar_set("_hud_panelorder", s); - if(hud_panelorder_prev) - strunzone(hud_panelorder_prev); - hud_panelorder_prev = strzone(s); + strcpy(hud_panelorder_prev, s); //now properly set panel_order tokenize_console(s); @@ -683,10 +703,20 @@ void HUD_Main() HUD_Panel_Draw(HUD_PANEL(RADAR)); if(autocvar__con_chat_maximized) HUD_Panel_Draw(HUD_PANEL(CHAT)); - if(hud_panel_quickmenu) + if (QuickMenu_IsOpened()) HUD_Panel_Draw(HUD_PANEL(QUICKMENU)); HUD_Panel_Draw(HUD_PANEL(SCOREBOARD)); + int cursor_active_prev = cursor_active; + cursor_active = HUD_WouldShowCursor(); + if (cursor_active_prev != cursor_active && autocvar_hud_cursormode) + { + setcursormode(cursor_active); + // cursor inactive this frame, will be set to 1 the next frame + if (cursor_active) + cursor_active = -1; + } + if (intermission == 2) HUD_Reset();