X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fhud.qh;h=2a53444669b7829c9818ca342ae8bf6484f0fafa;hb=f52ddede69621c7c9d31983591902f47fd40d7d0;hp=d46b11db571a7044d2acfec43562a8da05cbdb3f;hpb=b0423598270855d5f0a3206d46f0ebf43182b411;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/hud/hud.qh b/qcsrc/client/hud/hud.qh index d46b11db5..2a5344466 100644 --- a/qcsrc/client/hud/hud.qh +++ b/qcsrc/client/hud/hud.qh @@ -22,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]; @@ -155,6 +162,24 @@ float chat_sizey; 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_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); void HUD_Panel_DrawProgressBar(vector theOrigin, vector theSize, string pic, float length_ratio, bool vertical, float baralign, vector theColor, float theAlpha, int drawflag);