#include "hud.qh"
+#include "panel/scoreboard.qh"
#include "hud_config.qh"
#include "../mapvoting.qh"
-#include "../scoreboard.qh"
#include "../teamradar.qh"
+#include <common/minigames/cl_minigames.qh>
#include <common/t_items.qh>
#include <common/deathtypes/all.qh>
-#include <common/items/all.qc>
+#include <common/items/_mod.qh>
#include <common/mapinfo.qh>
+#include <common/vehicles/all.qh>
#include <common/mutators/mutator/waypoints/all.qh>
#include <common/stats.qh>
#include <lib/csqcmodel/cl_player.qh>
-// TODO: remove
-#include <server/mutators/mutator/gamemode_ctf.qc>
+#include <server/mutators/mutator/gamemode_ctf.qh> // TODO: remove
/*
==================
*/
-vector HUD_Get_Num_Color (float x, float maxvalue)
+vector HUD_Get_Num_Color (float hp, float maxvalue)
{
float blinkingamt;
vector color;
- if(x >= maxvalue) {
+ if(hp >= maxvalue) {
color.x = sin(2*M_PI*time);
color.y = 1;
color.z = sin(2*M_PI*time);
}
- else if(x > maxvalue * 0.75) {
- color.x = 0.4 - (x-150)*0.02 * 0.4; //red value between 0.4 -> 0
- color.y = 0.9 + (x-150)*0.02 * 0.1; // green value between 0.9 -> 1
+ else if(hp > maxvalue * 0.75) {
+ color.x = 0.4 - (hp-150)*0.02 * 0.4; //red value between 0.4 -> 0
+ color.y = 0.9 + (hp-150)*0.02 * 0.1; // green value between 0.9 -> 1
color.z = 0;
}
- else if(x > maxvalue * 0.5) {
- color.x = 1 - (x-100)*0.02 * 0.6; //red value between 1 -> 0.4
- color.y = 1 - (x-100)*0.02 * 0.1; // green value between 1 -> 0.9
- color.z = 1 - (x-100)*0.02; // blue value between 1 -> 0
+ else if(hp > maxvalue * 0.5) {
+ color.x = 1 - (hp-100)*0.02 * 0.6; //red value between 1 -> 0.4
+ color.y = 1 - (hp-100)*0.02 * 0.1; // green value between 1 -> 0.9
+ color.z = 1 - (hp-100)*0.02; // blue value between 1 -> 0
}
- else if(x > maxvalue * 0.25) {
+ else if(hp > maxvalue * 0.25) {
color.x = 1;
color.y = 1;
- color.z = 0.2 + (x-50)*0.02 * 0.8; // blue value between 0.2 -> 1
+ color.z = 0.2 + (hp-50)*0.02 * 0.8; // blue value between 0.2 -> 1
}
- else if(x > maxvalue * 0.1) {
+ else if(hp > maxvalue * 0.1) {
color.x = 1;
- color.y = (x-20)*90/27/100; // green value between 0 -> 1
- color.z = (x-20)*90/27/100 * 0.2; // blue value between 0 -> 0.2
+ color.y = (hp-20)*90/27/100; // green value between 0 -> 1
+ color.z = (hp-20)*90/27/100 * 0.2; // blue value between 0 -> 0.2
}
else {
color.x = 1;
color.z = 0;
}
- blinkingamt = (1 - x/maxvalue/0.25);
+ blinkingamt = (1 - hp/maxvalue/0.25);
if(blinkingamt > 0)
{
color.x = color.x - color.x * blinkingamt * sin(2*M_PI*time);
float HUD_GetRowCount(int item_count, vector size, float item_aspect)
{
+ 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);
float columns, rows;
float ratio, best_ratio = 0;
float best_columns = 1, best_rows = 1;
return eX * best_columns + eY * best_rows;
}
-// return the string of the onscreen race timer
-string MakeRaceString(int cp, float mytime, float theirtime, float lapdelta, string theirname)
-{
- string col;
- string timestr;
- string cpname;
- string lapstr;
- lapstr = "";
+/*
+==================
+HUD panels
+==================
+*/
- if(theirtime == 0) // goal hit
+void HUD_Panel_LoadCvars()
+{
+ // NOTE: in hud_configure mode cvars must be reloaded every frame
+ if (panel.update_time <= time)
{
- if(mytime > 0)
+ panel_pos = stov(cvar_string(strcat("hud_panel_", panel.panel_name, "_pos")));
+ panel_size = stov(cvar_string(strcat("hud_panel_", panel.panel_name, "_size")));
+ HUD_Panel_ScalePosSize();
+ panel_bg_str = cvar_string(strcat("hud_panel_", panel.panel_name, "_bg"));
+ panel_bg_color_str = cvar_string(strcat("hud_panel_", panel.panel_name, "_bg_color"));
+ panel_bg_color_team_str = cvar_string(strcat("hud_panel_", panel.panel_name, "_bg_color_team"));
+ panel_bg_alpha_str = cvar_string(strcat("hud_panel_", panel.panel_name, "_bg_alpha"));
+ panel_bg_border_str = cvar_string(strcat("hud_panel_", panel.panel_name, "_bg_border"));
+ panel_bg_padding_str = cvar_string(strcat("hud_panel_", panel.panel_name, "_bg_padding"));
+ HUD_Panel_GetBg();
+ if (panel.current_panel_bg != "0")
{
- timestr = strcat("+", ftos_decimals(+mytime, TIME_DECIMALS));
- col = "^1";
- }
- else if(mytime == 0)
- {
- timestr = "+0.0";
- col = "^3";
+ 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;
+ panel.current_panel_fg_alpha = panel_fg_alpha;
+ if (hud_configure_menu_open == 2 && panel == highlightedPanel)
+ HUD_Panel_UpdatePosSize_ForMenu();
else
{
- timestr = strcat("-", ftos_decimals(-mytime, TIME_DECIMALS));
- col = "^2";
+ panel_bg_alpha *= hud_fade_alpha * panel_fade_alpha;
+ panel_fg_alpha *= hud_fade_alpha * panel_fade_alpha;
}
-
- if(lapdelta > 0)
- {
- lapstr = sprintf(_(" (-%dL)"), lapdelta);
- col = "^2";
- }
- else if(lapdelta < 0)
- {
- lapstr = sprintf(_(" (+%dL)"), -lapdelta);
- col = "^1";
- }
- }
- else if(theirtime > 0) // anticipation
- {
- if(mytime >= theirtime)
- timestr = strcat("+", ftos_decimals(mytime - theirtime, TIME_DECIMALS));
- else
- timestr = TIME_ENCODED_TOSTRING(TIME_ENCODE(theirtime));
- col = "^3";
- }
- else
- {
- col = "^7";
- timestr = "";
+ panel.current_panel_pos = panel_pos;
+ panel.current_panel_size = panel_size;
+ panel.current_panel_bg_border = panel_bg_border;
+ panel.current_panel_bg_color = panel_bg_color;
+ panel.current_panel_bg_color_team = panel_bg_color_team;
+ panel.current_panel_bg_padding = panel_bg_padding;
+ panel.update_time = (autocvar__hud_configure) ? time : time + autocvar_hud_panel_update_interval;
+ return;
}
- if(cp == 254)
- cpname = _("Start line");
- else if(cp == 255)
- cpname = _("Finish line");
- else if(cp)
- cpname = sprintf(_("Intermediate %d"), cp);
- else
- cpname = _("Finish line");
-
- if(theirtime < 0)
- return strcat(col, cpname);
- else if(theirname == "")
- return strcat(col, sprintf("%s (%s)", cpname, timestr));
- else
- return strcat(col, sprintf("%s (%s %s)", cpname, timestr, strcat(theirname, col, lapstr)));
-}
-
-// Check if the given name already exist in race rankings? In that case, where? (otherwise return 0)
-int race_CheckName(string net_name)
-{
- int i;
- for (i=RANKINGS_CNT-1;i>=0;--i)
- if(grecordholder[i] == net_name)
- return i+1;
- return 0;
+ panel_pos = panel.current_panel_pos;
+ panel_size = panel.current_panel_size;
+ panel_bg_alpha = panel.current_panel_bg_alpha * hud_fade_alpha * panel_fade_alpha;
+ panel_bg_border = panel.current_panel_bg_border;
+ panel_bg_color = panel.current_panel_bg_color;
+ panel_bg_color_team = panel.current_panel_bg_color_team;
+ panel_bg_padding = panel.current_panel_bg_padding;
+ panel_fg_alpha = panel.current_panel_fg_alpha * hud_fade_alpha * panel_fade_alpha;
}
-/*
-==================
-HUD panels
-==================
-*/
-
//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);
if(!length_ratio || !theAlpha)
return;
if(length_ratio > 1)
else if(length_ratio < 0)
return;
+ theOrigin = HUD_Shift(theOrigin);
+ theSize = HUD_Scale(theSize);
+
vector square;
vector width, height;
if(vertical) {
void HUD_Panel_DrawHighlight(vector pos, vector mySize, vector color, float theAlpha, int drawflag)
{
+ TC(int, drawflag);
if(!theAlpha)
return;
+ pos = HUD_Shift(pos);
+ mySize = HUD_Scale(mySize);
+
string pic;
pic = strcat(hud_skin_path, "/num_leading");
if(precache_pic(pic) == "") {
drawsubpic(pos + eX * mySize.x - eX * min(mySize.x * 0.5, mySize.y), eX * min(mySize.x * 0.5, mySize.y) + eY * mySize.y, pic, '0.75 0 0', '0.25 1 0', color, theAlpha, drawflag);
}
-void DrawNumIcon_expanding(vector myPos, vector mySize, float x, string icon, bool vertical, bool icon_right_align, vector color, float theAlpha, float fadelerp)
+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);
vector newPos = '0 0 0', newSize = '0 0 0';
vector picpos, numpos;
// reduce only y to draw numbers with different number of digits with the same y size
numpos.y += newSize.y * ((1 - 0.7) / 2);
newSize.y *= 0.7;
- drawstring_aspect(numpos, ftos(x), newSize, color, panel_fg_alpha * theAlpha, DRAWFLAG_NORMAL);
+ drawstring_aspect(numpos, ftos(theTime), newSize, color, panel_fg_alpha * theAlpha, DRAWFLAG_NORMAL);
return;
}
// NOTE: newSize_x is always equal to 3 * mySize_y so we can use
// '2 1 0' * newSize_y instead of eX * (2/3) * newSize_x + eY * newSize_y
- drawstring_aspect_expanding(numpos, ftos(x), '2 1 0' * newSize.y, color, panel_fg_alpha * theAlpha, DRAWFLAG_NORMAL, fadelerp);
+ drawstring_aspect_expanding(numpos, ftos(theTime), '2 1 0' * newSize.y, color, panel_fg_alpha * theAlpha, DRAWFLAG_NORMAL, fadelerp);
drawpic_aspect_skin_expanding(picpos, icon, '1 1 0' * newSize.y, '1 1 1', panel_fg_alpha * theAlpha, DRAWFLAG_NORMAL, fadelerp);
}
-void DrawNumIcon(vector myPos, vector mySize, float x, string icon, bool vertical, bool icon_right_align, vector color, float theAlpha)
+void DrawNumIcon(vector myPos, vector mySize, float theTime, string icon, bool vertical, int icon_right_align, vector color, float theAlpha)
{
- DrawNumIcon_expanding(myPos, mySize, x, icon, vertical, icon_right_align, color, theAlpha, 0);
+ TC(bool, vertical); TC(int, icon_right_align);
+ DrawNumIcon_expanding(myPos, mySize, theTime, icon, vertical, icon_right_align, color, theAlpha, 0);
}
-#include "all.inc"
-
/*
==================
Main HUD system
==================
*/
+void CSQC_BUMBLE_GUN_HUD();
+
void HUD_Vehicle()
{
if(autocvar__hud_configure) return;
}
}
-bool HUD_Panel_CheckFlags(int showflags)
-{
- if ( HUD_Minigame_Showpanels() )
- return showflags & PANEL_SHOW_MINIGAME;
- if(intermission == 2)
- return showflags & PANEL_SHOW_MAPVOTE;
- return showflags & PANEL_SHOW_MAINGAME;
-}
-
void HUD_Panel_Draw(entity panent)
{
panel = panent;
- if(autocvar__hud_configure)
+ if (autocvar__hud_configure)
+ {
+ if (!(panel.panel_configflags & PANEL_CONFIG_MAIN))
+ return;
+ panel_fade_alpha = 1;
+ Hud_Panel_GetPanelEnabled();
+ panel.panel_draw();
+ return;
+ }
+
+ bool draw_allowed = false;
+ if (active_minigame && HUD_MinigameMenu_IsOpened())
+ {
+ if (panel.panel_showflags & PANEL_SHOW_MINIGAME)
+ draw_allowed = true;
+ }
+ else if(intermission == 2)
{
- if(panel.panel_configflags & PANEL_CONFIG_MAIN)
- panel.panel_draw();
+ if(panel.panel_showflags & PANEL_SHOW_MAPVOTE)
+ draw_allowed = true;
}
- else if(HUD_Panel_CheckFlags(panel.panel_showflags))
+ else if (panel.panel_showflags & PANEL_SHOW_MAINGAME)
+ draw_allowed = true;
+
+ if (draw_allowed)
+ {
+ if (panel.panel_showflags & PANEL_SHOW_WITH_SB)
+ panel_fade_alpha = 1;
+ else
+ {
+ panel_fade_alpha = 1 - scoreboard_fade_alpha;
+ if(!panel_fade_alpha)
+ return;
+ }
panel.panel_draw();
+ }
}
void HUD_Reset()
{
// reset gametype specific icons
- if(gametype == MAPINFO_TYPE_CTF)
- HUD_Mod_CTF_Reset();
+ if(gametype.m_modicons_reset)
+ gametype.m_modicons_reset();
}
-float autocvar_hud_dynamic_shake;
-float autocvar_hud_dynamic_shake_damage_max;
-float autocvar_hud_dynamic_shake_damage_min;
-float autocvar_hud_dynamic_shake_scale;
+float autocvar_hud_dynamic_shake = 1;
+float autocvar_hud_dynamic_shake_damage_max = 130;
+float autocvar_hud_dynamic_shake_damage_min = 10;
+float autocvar_hud_dynamic_shake_scale = 0.2;
float hud_dynamic_shake_x[10] = {0, 1, -0.7, 0.5, -0.3, 0.2, -0.1, 0.1, 0.0, 0};
float hud_dynamic_shake_y[10] = {0, 0.4, 0.8, -0.2, -0.6, 0.0, 0.3, 0.1, -0.1, 0};
bool Hud_Shake_Update()
return false;
float f = elapsed_time - i;
- hud_dynamic_shake_ofs.x = ((1 - f) * hud_dynamic_shake_x[i] + f * hud_dynamic_shake_x[i+1]) * vid_conwidth * 0.27;
- hud_dynamic_shake_ofs.y = ((1 - f) * hud_dynamic_shake_y[i] + f * hud_dynamic_shake_y[i+1]) * vid_conheight * 0.27;
- hud_dynamic_shake_ofs.z = 0;
- hud_dynamic_shake_ofs *= hud_dynamic_shake_factor * autocvar_hud_dynamic_shake_scale;
+ hud_dynamic_shake_realofs.x = (1 - f) * hud_dynamic_shake_x[i] + f * hud_dynamic_shake_x[i+1];
+ hud_dynamic_shake_realofs.y = (1 - f) * hud_dynamic_shake_y[i] + f * hud_dynamic_shake_y[i+1];
+ hud_dynamic_shake_realofs.z = 0;
+ hud_dynamic_shake_realofs *= hud_dynamic_shake_factor * autocvar_hud_dynamic_shake_scale;
+ hud_dynamic_shake_realofs.x = bound(-0.1, hud_dynamic_shake_realofs.x, 0.1) * vid_conwidth;
+ hud_dynamic_shake_realofs.y = bound(-0.1, hud_dynamic_shake_realofs.y, 0.1) * vid_conheight;
return true;
}
+entity CSQCModel_server2csqc(int i);
void calc_followmodel_ofs(entity view);
void Hud_Dynamic_Frame()
{
- hud_dynamic_ofs = '0 0 0';
+ vector ofs = '0 0 0';
+ hud_scale = '1 1 0';
+ hud_shift = '0 0 0';
if (autocvar_hud_dynamic_follow)
{
entity view = CSQCModel_server2csqc(player_localentnum - 1);
calc_followmodel_ofs(view);
- hud_dynamic_ofs -= cl_followmodel_ofs * autocvar_hud_dynamic_follow_scale;
+ ofs = -cl_followmodel_ofs * autocvar_hud_dynamic_follow_scale;
+ ofs.x *= autocvar_hud_dynamic_follow_scale_xyz.z;
+ ofs.y *= autocvar_hud_dynamic_follow_scale_xyz.x;
+ ofs.z *= autocvar_hud_dynamic_follow_scale_xyz.y;
+
+ if (fabs(ofs.x) < 0.001) ofs.x = 0;
+ if (fabs(ofs.y) < 0.001) ofs.y = 0;
+ if (fabs(ofs.z) < 0.001) ofs.z = 0;
+ ofs.x = bound(-0.1, ofs.x, 0.1);
+ 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_scale.x = (1 + hud_shift.z);
+ hud_scale.y = hud_scale.x;
}
- if (fabs(hud_dynamic_ofs.x) < 0.001) hud_dynamic_ofs.x = 0;
- if (fabs(hud_dynamic_ofs.y) < 0.001) hud_dynamic_ofs.y = 0;
- if (fabs(hud_dynamic_ofs.z) < 0.001) hud_dynamic_ofs.z = 0;
-
- float health = STAT(HEALTH);
- if(autocvar_hud_dynamic_shake > 0 && !autocvar__hud_configure && health > 0)
+ if(autocvar_hud_dynamic_shake > 0)
{
+ static float old_health = 0;
+ float health = max(-1, STAT(HEALTH));
if(hud_dynamic_shake_factor == -1) // don't allow the effect for this frame
+ {
hud_dynamic_shake_factor = 0;
+ old_health = health;
+ }
else
{
float new_hud_dynamic_shake_factor = 0;
- if(prev_health - health >= autocvar_hud_dynamic_shake_damage_min && autocvar_hud_dynamic_shake_damage_max > autocvar_hud_dynamic_shake_damage_min)
+ if (old_health - health >= autocvar_hud_dynamic_shake_damage_min
+ && autocvar_hud_dynamic_shake_damage_max > autocvar_hud_dynamic_shake_damage_min
+ && old_health > 0 && !intermission)
{
float m = max(autocvar_hud_dynamic_shake_damage_min, 1);
- new_hud_dynamic_shake_factor = (prev_health - health - m) / (autocvar_hud_dynamic_shake_damage_max - m);
+ new_hud_dynamic_shake_factor = (old_health - health - m) / (autocvar_hud_dynamic_shake_damage_max - m);
if(new_hud_dynamic_shake_factor >= 1)
new_hud_dynamic_shake_factor = 1;
if(new_hud_dynamic_shake_factor >= hud_dynamic_shake_factor)
hud_dynamic_shake_time = time;
}
}
+ old_health = health;
if(hud_dynamic_shake_factor)
if(!Hud_Shake_Update())
hud_dynamic_shake_factor = 0;
}
+
+ if(hud_dynamic_shake_factor > 0)
+ {
+ hud_shift.x += hud_dynamic_shake_realofs.x;
+ hud_shift.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;
}
void HUD_Main()
{
int i;
- // global hud theAlpha fade
- if(menu_enabled == 1)
+ if(hud_configure_menu_open == 1)
hud_fade_alpha = 1;
else
- hud_fade_alpha = (1 - autocvar__menu_alpha);
-
- if(scoreboard_fade_alpha)
- hud_fade_alpha = (1 - scoreboard_fade_alpha);
+ hud_fade_alpha = 1 - autocvar__menu_alpha;
HUD_Configure_Frame();
- // panels that we want to be active together with the scoreboard
- // they must fade only when the menu does
- if(scoreboard_fade_alpha == 1)
- {
- HUD_Panel_Draw(HUD_PANEL(CENTERPRINT));
- return;
- }
-
- if(!autocvar__hud_configure && !hud_fade_alpha)
- {
- hud_fade_alpha = 1;
- HUD_Panel_Draw(HUD_PANEL(VOTE));
- hud_fade_alpha = 0;
- return;
- }
-
Hud_Dynamic_Frame();
+ if(scoreboard_fade_alpha == 1)
+ if(autocvar__menu_alpha == 1)
+ return;
+
// Drawing stuff
if (hud_skin_prev != autocvar_hud_skin)
{
{
string hud_dock_color = autocvar_hud_dock_color;
if(hud_dock_color == "shirt") {
- f = stof(getplayerkeyvalue(current_player, "colors"));
+ f = entcs_GetClientColors(current_player);
color = colormapPaletteColor(floor(f / 16), 0);
}
else if(hud_dock_color == "pants") {
- f = stof(getplayerkeyvalue(current_player, "colors"));
+ f = entcs_GetClientColors(current_player);
color = colormapPaletteColor(f % 16, 1);
}
else
}
}
if (warning)
- LOG_TRACE("Automatically fixed wrong/missing panel numbers in _hud_panelorder\n");
+ LOG_TRACE("Automatically fixed wrong/missing panel numbers in _hud_panelorder");
cvar_set("_hud_panelorder", s);
if(hud_panelorder_prev)
HUD_Panel_Draw(HUD_PANEL(CHAT));
if(hud_panel_quickmenu)
HUD_Panel_Draw(HUD_PANEL(QUICKMENU));
+ HUD_Panel_Draw(HUD_PANEL(SCOREBOARD));
- if (scoreboard_active || intermission == 2)
+ if (intermission == 2)
HUD_Reset();
HUD_Configure_PostDraw();
projects / xonotic / xonotic-data.pk3dir.git / blobdiff