X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fhud.qh;h=a895af36038e33d51760fd0965cd803b596953f3;hb=51c4ab5336d3887b618c13e5f566cf19636af951;hp=b80698ccf4d4bf1537913c13dfc8315e2468cc0b;hpb=f6c3bdca476ec02614e987feca72f86925bf8e82;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/hud/hud.qh b/qcsrc/client/hud/hud.qh index b80698ccf..a895af360 100644 --- a/qcsrc/client/hud/hud.qh +++ b/qcsrc/client/hud/hud.qh @@ -1,5 +1,4 @@ -#ifndef CLIENT_HUD_H -#define CLIENT_HUD_H +#pragma once #include @@ -23,9 +22,16 @@ REGISTER_REGISTRY(hud_panels) #define HUD_PANEL(NAME) HUD_PANEL_##NAME // draw the background/borders -#define HUD_Panel_DrawBg(theAlpha) MACRO_BEGIN { \ - if(panel.current_panel_bg != "0" && panel.current_panel_bg != "") \ - draw_BorderPicture(panel_pos - '1 1 0' * panel_bg_border, panel.current_panel_bg, panel_size + '1 1 0' * 2 * panel_bg_border, panel_bg_color, panel_bg_alpha * theAlpha, '1 1 0' * (panel_bg_border/BORDER_MULTIPLIER));\ +#define HUD_Panel_DrawBg(theAlpha) MACRO_BEGIN { \ + if(panel.current_panel_bg != "0" && panel.current_panel_bg != "") \ + draw_BorderPicture( \ + HUD_Shift(panel_pos - '1 1 0' * panel_bg_border), \ + panel.current_panel_bg, \ + HUD_Scale(panel_size + '1 1 0' * 2 * panel_bg_border), \ + panel_bg_color, \ + panel_bg_alpha * theAlpha, \ + HUD_Scale('1 1 0' * (panel_bg_border/BORDER_MULTIPLIER)) \ + ); \ } MACRO_END int panel_order[hud_panels_MAX]; @@ -42,9 +48,19 @@ bool radar_panel_modified; float HUD_Radar_InputEvent(float bInputType, float nPrimary, float nSecondary); void HUD_Radar_Hide_Maximized(); +float HUD_GetRowCount(int item_count, vector size, float item_aspect); +vector HUD_Get_Num_Color (float x, float maxvalue); +void DrawNumIcon(vector myPos, vector mySize, float x, string icon, bool vertical, bool icon_right_align, vector color, float theAlpha); +void DrawNumIcon_expanding(vector myPos, vector mySize, float x, string icon, bool vertical, int icon_right_align, vector color, float theAlpha, float fadelerp); +void HUD_Panel_DrawHighlight(vector pos, vector mySize, vector color, float theAlpha, int drawflag); +vector HUD_GetTableSize_BestItemAR(int item_count, vector psize, float item_aspect); + void HUD_Reset (); void HUD_Main (); +int race_CheckName(string net_name); +string MakeRaceString(int cp, float mytime, float theirtime, float lapdelta, string theirname); + int vote_yescount; int vote_nocount; int vote_needed; @@ -72,7 +88,7 @@ int complain_weapon; float complain_weapon_type; float complain_weapon_time; -int ps_primary, ps_secondary; +PlayerScoreField ps_primary, ps_secondary; int ts_primary, ts_secondary; Weapon last_switchweapon; @@ -148,12 +164,21 @@ float current_player; float autocvar_hud_dynamic_follow; float autocvar_hud_dynamic_follow_scale; +vector autocvar_hud_dynamic_follow_scale_xyz; + +vector hud_dynamic_shake_realofs; +float hud_dynamic_shake_factor; +float hud_dynamic_shake_time; // shared across viewmodel effects and dynamic hud code vector cl_followmodel_ofs; float cl_followmodel_time; -vector hud_dynamic_ofs; +vector hud_scale; +vector hud_scale_current; +vector hud_shift; +vector hud_shift_current; +vector hud_scale_center; float stringwidth_colors(string s, vector theSize); float stringwidth_nocolors(string s, vector theSize); @@ -210,6 +235,7 @@ REGISTER_HUD_PANEL(MINIGAME_MENU, HUD_MinigameMenu, minigamemenu, PANEL_CO REGISTER_HUD_PANEL(MAPVOTE, MapVote_Draw, mapvote, PANEL_CONFIG_NO , PANEL_SHOW_MAPVOTE ) REGISTER_HUD_PANEL(ITEMSTIME, HUD_ItemsTime, itemstime, PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME) REGISTER_HUD_PANEL(QUICKMENU, HUD_QuickMenu, quickmenu, PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME) +REGISTER_HUD_PANEL(SCOREBOARD, Scoreboard_Draw, scoreboard, PANEL_CONFIG_NO , PANEL_SHOW_ALWAYS ) // always add new panels to the end of list // Because calling lots of functions in QC apparently cuts fps in half on many machines: @@ -249,12 +275,12 @@ REGISTER_HUD_PANEL(QUICKMENU, HUD_QuickMenu, quickmenu, PANEL_CO // Get value for panel_bg_color: if "" fetch default, else use panel_bg_color. Convert pants, shirt or teamcolor into a vector. #define HUD_Panel_GetColor() MACRO_BEGIN { \ - if ((teamplay) && panel_bg_color_team) { \ + if ((teamplay) && panel_bg_color_team > 0) { \ if (autocvar__hud_configure && myteam == NUM_SPECTATOR) \ panel_bg_color = '1 0 0' * panel_bg_color_team; \ else \ panel_bg_color = myteamcolors * panel_bg_color_team; \ - } else if (autocvar_hud_configure_teamcolorforced && autocvar__hud_configure && panel_bg_color_team) { \ + } else if (autocvar_hud_configure_teamcolorforced && autocvar__hud_configure && panel_bg_color_team > 0) { \ panel_bg_color = '1 0 0' * panel_bg_color_team; \ } else { \ if (panel_bg_color_str == "") { \ @@ -361,11 +387,11 @@ REGISTER_HUD_PANEL(QUICKMENU, HUD_QuickMenu, quickmenu, PANEL_CO panel_bg_padding_str = cvar_string(strcat("hud_panel_", panel.panel_name, "_bg_padding")); \ HUD_Panel_GetBg(); \ if (panel.current_panel_bg != "0") { \ - HUD_Panel_GetColorTeam(); \ - HUD_Panel_GetColor(); \ HUD_Panel_GetBgAlpha(); \ HUD_Panel_GetBorder(); \ } \ + HUD_Panel_GetColorTeam(); \ + HUD_Panel_GetColor(); \ HUD_Panel_GetFgAlpha(); \ HUD_Panel_GetPadding(); \ panel.current_panel_bg_alpha = panel_bg_alpha; \ @@ -393,14 +419,6 @@ REGISTER_HUD_PANEL(QUICKMENU, HUD_QuickMenu, quickmenu, PANEL_CO panel_bg_padding = panel.current_panel_bg_padding; \ panel_fg_alpha = panel.current_panel_fg_alpha * hud_fade_alpha; \ } \ - if(hud_dynamic_ofs.y) panel_pos.x += hud_dynamic_ofs.y * vid_conwidth; \ - if(hud_dynamic_ofs.z) panel_pos.y += hud_dynamic_ofs.z * vid_conheight; \ - if(hud_dynamic_ofs.x) { \ - panel_size.x += hud_dynamic_ofs.x * panel_size.x; \ - panel_size.y += hud_dynamic_ofs.x * panel_size.y; \ - panel_pos.x += hud_dynamic_ofs.x * (panel_pos.x - vid_conwidth * 0.5); \ - panel_pos.y += hud_dynamic_ofs.x * (panel_pos.y - vid_conheight * 0.5); \ - } \ } MACRO_END #define HUD_Panel_UpdatePosSize() MACRO_BEGIN { \ @@ -429,4 +447,3 @@ void HUD_Notify_Push(string icon, string attacker, string victim); var void HUD_ModIcons_GameType(vector pos, vector size); void HUD_ModIcons_SetFunc(); -#endif