+float panel_order[HUD_PANEL_NUM];
+string hud_panelorder_prev;
+
vector mousepos;
vector panel_click_distance; // mouse cursor distance from the top left corner of the panel (saved only upon a click)
vector panel_click_resizeorigin; // coordinates for opposite point when resizing
float resizeCorner; // 1 = topleft, 2 = topright, 3 = bottomleft, 4 = bottomright
-float highlightedPanel;
-float highlightedPanel_prev;
+var float highlightedPanel = -1;
+var float highlightedPanel_prev = -1;
float highlightedAction; // 0 = nothing, 1 = move, 2 = resize
const float BORDER_MULTIPLIER = 0.25;
string hud_skin_path;
+var vector progressbar_color;
+
var float active_panel; // this panel has recently referred the UpdateCvars macro
var string panel_name;
-var float panel_enabled;
-var vector panel_pos;
-var vector panel_size;
-var string panel_bg;
+var float panel_enabled;
+var vector panel_pos;
+var vector panel_size;
+var string panel_bg;
var string panel_bg_str; // "_str" vars contain the raw value of the cvar, non-"_str" contains what hud.qc code should use
-var string panel_bg_color;
-var float panel_bg_color_team;
-var string panel_bg_color_team_str;
-var float panel_bg_alpha;
-var string panel_bg_alpha_str;
-var float panel_bg_border;
-var string panel_bg_border_str;
-var float panel_bg_padding;
-var string panel_bg_padding_str;
-var float panel_accuracy_yellow;
-var float panel_accuracy_onlycurrent;
-var float panel_accuracy_flip;
-var float panel_accuracy_iconalign;
-var float panel_accuracy_baralign;
-var float panel_accuracy_info_top;
-var float panel_accuracy_foreground_alpha;
-var float panel_accuracy_alreadyvoted_alpha;
+var vector panel_bg_color;
+var string panel_bg_color_str;
+var float panel_bg_color_team;
+var string panel_bg_color_team_str;
+var float panel_fg_alpha;
+var float panel_bg_alpha;
+var string panel_bg_alpha_str;
+var float panel_bg_border;
+var string panel_bg_border_str;
+var float panel_bg_padding;
+var string panel_bg_padding_str;
+var float panel_accuracy_yellow;
+var float panel_accuracy_onlycurrent;
+var float panel_accuracy_flip;
+var float panel_accuracy_iconalign;
+var float panel_accuracy_baralign;
+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:
// ----------------------
// ----------------------
// Little help for the poor people who have to make sense of this: Start from the bottom
-// we probably want to get rid of GetName in the most places in hud.qc, TODO!
-// Get name of specified panel id
-#define HUD_Panel_GetName(id) \
-switch(id) { \
- case HUD_PANEL_WEAPONICONS: panel_name = HUD_PANELNAME_WEAPONICONS; break; \
- case HUD_PANEL_INVENTORY: panel_name = HUD_PANELNAME_INVENTORY; break; \
- case HUD_PANEL_POWERUPS: panel_name = HUD_PANELNAME_POWERUPS; break; \
- case HUD_PANEL_HEALTHARMOR: panel_name = HUD_PANELNAME_HEALTHARMOR; break; \
- case HUD_PANEL_NOTIFY: panel_name = HUD_PANELNAME_NOTIFY; break; \
- case HUD_PANEL_TIMER: panel_name = HUD_PANELNAME_TIMER; break; \
- case HUD_PANEL_RADAR: panel_name = HUD_PANELNAME_RADAR; break; \
- case HUD_PANEL_SCORE: panel_name = HUD_PANELNAME_SCORE; break; \
- case HUD_PANEL_RACETIMER: panel_name = HUD_PANELNAME_RACETIMER; break; \
- case HUD_PANEL_VOTE: panel_name = HUD_PANELNAME_VOTE; break; \
- case HUD_PANEL_MODICONS: panel_name = HUD_PANELNAME_MODICONS; break; \
- case HUD_PANEL_PRESSEDKEYS: panel_name = HUD_PANELNAME_PRESSEDKEYS; break; \
- case HUD_PANEL_CHAT: panel_name = HUD_PANELNAME_CHAT; break; \
- case HUD_PANEL_ENGINEINFO: panel_name = HUD_PANELNAME_ENGINEINFO; break; \
+// TODO: shirt, pants, team colors
+#define HUD_Panel_GetProgressBarColor(item) \
+switch(item) {\
+ case "strength": progressbar_color = autocvar_hud_progressbar_strength_color; break;\
+ case "shield": progressbar_color = autocvar_hud_progressbar_shield_color; break;\
+ case "health": progressbar_color = autocvar_hud_progressbar_health_color; break;\
+ case "armor": progressbar_color = autocvar_hud_progressbar_armor_color; break;\
+ case "fuel": progressbar_color = autocvar_hud_progressbar_fuel_color; break;\
+ case "nexball": progressbar_color = autocvar_hud_progressbar_nexball_color; break;\
}
// Get value for panel_bg: if "" fetch default, else use panel_bg_str
// comment on last line of macro: // we probably want to see a background in config mode at all times...
#define HUD_Panel_GetBg()\
if(!autocvar__hud_configure && panel_bg_str == "0") {\
- panel_bg = 0;\
+ panel_bg = "0";\
} else {\
if(panel_bg_str == "") {\
panel_bg = autocvar_hud_bg;\
- } if(panel_bg_str == "0" && autocvar__hud_configure) {\
- panel_bg = "border"; \
+ } else if(panel_bg_str == "0" && autocvar__hud_configure) {\
+ panel_bg = "border";\
+ } 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) {\
+ panel_bg_color = colormapPaletteColor(mod(stof(getplayerkey(player_localentnum - 1, "colors")), 16), 1) * panel_bg_color_team;\
+} else {\
+ if(panel_bg_color_str == "") {\
+ panel_bg_color = autocvar_hud_bg_color;\
+ } else {\
+ if(panel_bg_color_str == "shirt") {\
+ panel_bg_color = colormapPaletteColor(floor(stof(getplayerkey(player_localentnum - 1, "colors")) / 16), 0);\
+ } else if(panel_bg_color_str == "pants") {\
+ panel_bg_color = colormapPaletteColor(mod(stof(getplayerkey(player_localentnum - 1, "colors")), 16), 1);\
+ } else {\
+ panel_bg_color = stov(panel_bg_color_str);\
+ }\
}\
}
// comment on line 3 of macro: // do not set a minalpha cap when showing the config dialog for this panel
#define HUD_Panel_GetBgAlpha()\
if(panel_bg_alpha_str == "") {\
- panel_bg_alpha_str = autocvar_hud_bg_alpha;\
+ panel_bg_alpha_str = ftos(autocvar_hud_bg_alpha);\
}\
panel_bg_alpha = stof(panel_bg_alpha_str);\
if(autocvar__hud_configure && disable_menu_alphacheck == 2 && highlightedPanel == active_panel) {\
panel_bg_alpha = max(autocvar_hud_configure_bg_minalpha, panel_bg_alpha);\
} if(autocvar__hud_configure && !panel_enabled) {\
panel_bg_alpha = 0.25;\
-} if(!(disable_menu_alphacheck == 2 && highlightedPanel == id)) {\
+} if(!(disable_menu_alphacheck == 2 && highlightedPanel == active_panel)) {\
panel_bg_alpha *= menu_fade_alpha;\
}
+// Get value for panel_fg_alpha. Also do various minalpha checks
+// comment on line 2 of macro: // ALWAYS show disabled panels at 0.25 alpha when in config mode
+// comment on line 4 of macro: // don't fade this panel when showing the panel-specific menu dialog
+#define HUD_Panel_GetFgAlpha()\
+panel_fg_alpha = autocvar_hud_fg_alpha;\
+if(autocvar__hud_configure && !panel_enabled)\
+ panel_fg_alpha = 0.25;\
+if(!(disable_menu_alphacheck == 2 && highlightedPanel == active_panel))\
+ panel_fg_alpha *= menu_fade_alpha;
+
+// Get border. See comments above, it's similar.
#define HUD_Panel_GetBorder()\
if(panel_bg_border_str == "") {\
panel_bg_border = autocvar_hud_bg_border;\
panel_bg_border = stof(panel_bg_border_str);\
}
+// Scale the pos and size vectors to absolute coordinates
+#define HUD_Panel_GetScaledVectors()\
+panel_pos_x *= vid_conwidth;\
+panel_pos_y *= vid_conheight;\
+panel_size_x *= vid_conwidth;\
+panel_size_y *= vid_conheight;
+
+// Get padding. See comments above, it's similar.
+// last line is a port of the old function, basically always make sure the panel contents are at least 5 pixels tall/wide, to disallow extreme padding values
#define HUD_Panel_GetPadding()\
-if(panel_bg_border_padding == "") {\
+if(panel_bg_padding_str == "") {\
panel_bg_padding = autocvar_hud_bg_padding;\
} else {\
panel_bg_padding = stof(panel_bg_padding_str);\
}\
-panel_bg_padding = min(min(mySize_x, mySize_y)/2 - 5, panel_bg_padding);
+panel_bg_padding = min(min(panel_size_x, panel_size_y)/2 - 5, panel_bg_padding);
// Point to the macros above (stupid max macro length)
#define HUD_Panel_StringVars()\
HUD_Panel_GetBg()\
-HUD_Panel_GetColorTeam\
+HUD_Panel_GetColorTeam()\
+HUD_Panel_GetColor()\
HUD_Panel_GetBgAlpha()\
+HUD_Panel_GetFgAlpha()\
HUD_Panel_GetBorder()\
+HUD_Panel_GetScaledVectors()\
HUD_Panel_GetPadding()
// Update all common cvars of given panel name
panel_pos = autocvar_hud_##name##_pos; \
panel_size = autocvar_hud_##name##_size; \
panel_bg_str = autocvar_hud_##name##_bg; \
-panel_bg_color = autocvar_hud_##name##_bg_color; \
+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; \
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; \
}
-/* These cvars have to be placed separately wherever they are needed.
-panel_accuracy_yellow = autocvar_hud_##name##_accuracy_yellow; \
-panel_onlycurrent = autocvar_hud_##name##_onlycurrent; \
-panel_flip = autocvar_hud_##name##_flip; \
-panel_iconalign = autocvar_hud_##name##_iconalign; \
-panel_baralign = autocvar_hud_##name##_baralign; \
-panel_info_top = autocvar_hud_##name##_info_top; \
-panel_alreadyvoted_alpha = autocvar_hud_##name##_alreadyvoted_alpha;
-*/
+#define HUD_Panel_UpdatePosSize(name) \
+panel_pos = autocvar_hud_##name##_pos; \
+panel_size = autocvar_hud_##name##_size; \
+HUD_Panel_GetScaledVectors()\
+panel_bg_border_str = autocvar_hud_##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_INFOMESSAGES: HUD_Panel_UpdatePosSize(infomessages)\
+}
projects / xonotic / xonotic-data.pk3dir.git / blobdiff