]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/client/hud.qh
add gridsize to the hud configs so that the player won't have to find out which grids...
[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / hud.qh
index 5537b44ea62b2ced15f7e5031ce719f8e484eac7..5039d427cc0da2f8487428d88203a73e734aeb27 100644 (file)
@@ -1,3 +1,5 @@
+float log(float f);
+
 float panel_order[HUD_PANEL_NUM];
 string hud_panelorder_prev;
 
@@ -14,7 +16,6 @@ float hud_color_bg_team;
 float scoreboard_bottom;
 float weapon_hits[WEP_MAXCOUNT];
 float weapon_fired[WEP_MAXCOUNT];
-float weapon_number;
 
 float complain_weapon;
 string complain_weapon_name;
@@ -75,6 +76,8 @@ var float panel_accuracy_info_top;
 var float panel_accuracy_foreground_alpha;
 var float panel_accuracy_alreadyvoted_alpha;
 
+var string picpath;
+
 // Because calling lots of functions in QC apparently cuts fps in half on many machines:
 // ----------------------
 // MACRO HELL STARTS HERE
@@ -105,12 +108,18 @@ if(!autocvar__hud_configure && panel_bg_str == "0") {\
        } else {\
                panel_bg = panel_bg_str;\
        }\
+       panel_bg = strcat(hud_skin_path, "/", panel_bg);\
+       if(precache_pic(panel_bg) == "") {\
+               panel_bg = strcat("gfx/hud/default/", "border");\
+       }\
 }
 
 // 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()\
-if(teamplay && panel_bg_color_team) {\
+if((teamplay) && panel_bg_color_team) {\
        panel_bg_color = colormapPaletteColor(mod(stof(getplayerkey(player_localentnum - 1, "colors")), 16), 1) * panel_bg_color_team;\
+} else if (autocvar_hud_configure_teamcolorforced && autocvar__hud_configure && panel_bg_color_team) {\
+       panel_bg_color = '1 0 0' * panel_bg_color_team;\
 } else {\
        if(panel_bg_color_str == "") {\
                panel_bg_color = autocvar_hud_bg_color;\
@@ -196,25 +205,62 @@ HUD_Panel_GetBorder()\
 HUD_Panel_GetScaledVectors()\
 HUD_Panel_GetPadding()
 
+// return smoothly faded pos of given panel when a dialog is active
+var vector menu_enable_panelpos;
+#define HUD_Panel_GetMenuPos() \
+if(panel_size_x > panel_size_y)\
+       menu_enable_panelpos = eX * 0.5 * vid_conwidth - eX * 0.5 * panel_size_x + eY * 0.82 * vid_conheight;\
+else\
+       menu_enable_panelpos = eY * 0.5 * vid_conheight - eY * 0.5 * panel_size_y + eX * 0.7 * vid_conwidth;\
+panel_pos = (1 - autocvar__menu_alpha) * panel_pos + (autocvar__menu_alpha) * menu_enable_panelpos;
+
+// return smoothly faded size of given panel when a dialog is active
+var vector menu_enable_maxsize;
+var vector menu_enable_size;
+#define HUD_Panel_GetMenuSize()\
+menu_enable_maxsize_x = 0.3 * vid_conwidth;\
+menu_enable_maxsize_y = 0.18 * vid_conheight;\
+if(panel_size_x > panel_size_y)\
+{\
+       if(panel_size_y > menu_enable_maxsize_y)\
+       {\
+               menu_enable_size_y = menu_enable_maxsize_y;\
+               menu_enable_size_x = panel_size_x * (menu_enable_maxsize_y/panel_size_y);\
+               panel_size = (1 - autocvar__menu_alpha) * panel_size + (autocvar__menu_alpha) * menu_enable_size;\
+       }\
+}\
+else\
+{\
+       if(panel_size_x > menu_enable_maxsize_x)\
+       {\
+               menu_enable_size_x = menu_enable_maxsize_x;\
+               menu_enable_size_y = panel_size_y * (menu_enable_maxsize_x/panel_size_x);\
+               panel_size = (1 - autocvar__menu_alpha) * panel_size + (autocvar__menu_alpha) * menu_enable_size;\
+       }\
+}
+
 // Update all common cvars of given panel name
 #define HUD_Panel_UpdateCvars(name) \
-panel_enabled = autocvar_hud_##name; \
-panel_pos = autocvar_hud_##name##_pos; \
-panel_size = autocvar_hud_##name##_size; \
-panel_bg_str = autocvar_hud_##name##_bg; \
-panel_bg_color_str = autocvar_hud_##name##_bg_color; \
-panel_bg_color_team_str = autocvar_hud_##name##_bg_color_team; \
-panel_bg_alpha_str = autocvar_hud_##name##_bg_alpha; \
-panel_bg_border_str = autocvar_hud_##name##_bg_border; \
-panel_bg_padding_str = autocvar_hud_##name##_bg_padding; \
-HUD_Panel_StringVars()
+panel_enabled = autocvar_hud_panel_##name; \
+panel_pos = autocvar_hud_panel_##name##_pos; \
+panel_size = autocvar_hud_panel_##name##_size; \
+panel_bg_str = autocvar_hud_panel_##name##_bg; \
+panel_bg_color_str = autocvar_hud_panel_##name##_bg_color; \
+panel_bg_color_team_str = autocvar_hud_panel_##name##_bg_color_team; \
+panel_bg_alpha_str = autocvar_hud_panel_##name##_bg_alpha; \
+panel_bg_border_str = autocvar_hud_panel_##name##_bg_border; \
+panel_bg_padding_str = autocvar_hud_panel_##name##_bg_padding; \
+HUD_Panel_StringVars()\
+if(disable_menu_alphacheck == 2 && active_panel == highlightedPanel) {\
+       HUD_Panel_GetMenuSize()\
+       HUD_Panel_GetMenuPos()\
+}
 
 // Update all common cvars of given panel id
 #define HUD_Panel_UpdateCvarsForId(id) \
-active_panel = id; \
 switch(id) { \
-       case HUD_PANEL_WEAPONICONS: HUD_Panel_UpdateCvars(weaponicons) break; \
-       case HUD_PANEL_INVENTORY: HUD_Panel_UpdateCvars(inventory) break; \
+       case HUD_PANEL_WEAPONS: HUD_Panel_UpdateCvars(weapons) break; \
+       case HUD_PANEL_AMMO: HUD_Panel_UpdateCvars(ammo) break; \
        case HUD_PANEL_POWERUPS: HUD_Panel_UpdateCvars(powerups) break; \
        case HUD_PANEL_HEALTHARMOR: HUD_Panel_UpdateCvars(healtharmor) break; \
        case HUD_PANEL_NOTIFY: HUD_Panel_UpdateCvars(notify) break; \
@@ -227,30 +273,36 @@ switch(id) { \
        case HUD_PANEL_PRESSEDKEYS: HUD_Panel_UpdateCvars(pressedkeys) break; \
        case HUD_PANEL_CHAT: HUD_Panel_UpdateCvars(chat) break; \
        case HUD_PANEL_ENGINEINFO: HUD_Panel_UpdateCvars(engineinfo) break; \
+       case HUD_PANEL_INFOMESSAGES: HUD_Panel_UpdateCvars(infomessages) break; \
 }
 
 #define HUD_Panel_UpdatePosSize(name) \
-panel_pos = autocvar_hud_##name##_pos; \
-panel_size = autocvar_hud_##name##_size; \
+panel_pos = autocvar_hud_panel_##name##_pos; \
+panel_size = autocvar_hud_panel_##name##_size; \
 HUD_Panel_GetScaledVectors()\
-panel_bg_border_str = autocvar_hud_##name##_bg_border; \
+if(disable_menu_alphacheck == 2 && active_panel == highlightedPanel) {\
+       HUD_Panel_GetMenuSize()\
+       HUD_Panel_GetMenuPos()\
+}\
+panel_bg_border_str = autocvar_hud_panel_##name##_bg_border; \
 HUD_Panel_GetBorder()
 
 // Update pos and size of given panel id
 #define HUD_Panel_UpdatePosSizeForId(id) \
 switch(id) { \
-       case HUD_PANEL_WEAPONICONS: HUD_Panel_UpdatePosSize(weaponicons) break; \
-       case HUD_PANEL_INVENTORY: HUD_Panel_UpdatePosSize(inventory) break; \
-       case HUD_PANEL_POWERUPS: HUD_Panel_UpdatePosSize(powerups) break; \
-       case HUD_PANEL_HEALTHARMOR: HUD_Panel_UpdatePosSize(healtharmor) break; \
-       case HUD_PANEL_NOTIFY: HUD_Panel_UpdatePosSize(notify) break; \
-       case HUD_PANEL_TIMER: HUD_Panel_UpdatePosSize(timer) break; \
-       case HUD_PANEL_RADAR: HUD_Panel_UpdatePosSize(radar) break; \
-       case HUD_PANEL_SCORE: HUD_Panel_UpdatePosSize(score) break; \
-       case HUD_PANEL_RACETIMER: HUD_Panel_UpdatePosSize(racetimer) break; \
-       case HUD_PANEL_VOTE: HUD_Panel_UpdatePosSize(vote) break; \
-       case HUD_PANEL_MODICONS: HUD_Panel_UpdatePosSize(modicons) break; \
-       case HUD_PANEL_PRESSEDKEYS: HUD_Panel_UpdatePosSize(pressedkeys) break; \
-       case HUD_PANEL_CHAT: HUD_Panel_UpdatePosSize(chat) break; \
-       case HUD_PANEL_ENGINEINFO: HUD_Panel_UpdatePosSize(engineinfo) break; \
+       case HUD_PANEL_WEAPONS: HUD_Panel_UpdatePosSize(weapons) break;\
+       case HUD_PANEL_AMMO: HUD_Panel_UpdatePosSize(ammo) break;\
+       case HUD_PANEL_POWERUPS: HUD_Panel_UpdatePosSize(powerups) break;\
+       case HUD_PANEL_HEALTHARMOR: HUD_Panel_UpdatePosSize(healtharmor) break;\
+       case HUD_PANEL_NOTIFY: HUD_Panel_UpdatePosSize(notify) break;\
+       case HUD_PANEL_TIMER: HUD_Panel_UpdatePosSize(timer) break;\
+       case HUD_PANEL_RADAR: HUD_Panel_UpdatePosSize(radar) break;\
+       case HUD_PANEL_SCORE: HUD_Panel_UpdatePosSize(score) break;\
+       case HUD_PANEL_RACETIMER: HUD_Panel_UpdatePosSize(racetimer) break;\
+       case HUD_PANEL_VOTE: HUD_Panel_UpdatePosSize(vote) break;\
+       case HUD_PANEL_MODICONS: HUD_Panel_UpdatePosSize(modicons) break;\
+       case HUD_PANEL_PRESSEDKEYS: HUD_Panel_UpdatePosSize(pressedkeys) break;\
+       case HUD_PANEL_CHAT: HUD_Panel_UpdatePosSize(chat) break;\
+       case HUD_PANEL_ENGINEINFO: HUD_Panel_UpdatePosSize(engineinfo) break;\
+       case HUD_PANEL_INFOMESSAGES: HUD_Panel_UpdatePosSize(infomessages)\
 }