case 5:
mySize_x = max(mySize_y * 2, mySize_x); // at least 2 * height
break;
+ case 8:
+ mySize_y = (1/4) * mySize_x; // 1/4 * width
+ break;
case 9:
mySize_y = (1/4) * mySize_x; // 1/4 * width
break;
float HUD_Panel_GetMarigin(float id)
{
- return bound(1, MARIGIN_MULTIPLIER * cvar_or(strcat("hud_", HUD_Panel_GetName(id), "_marigin"), 30), 200);
+ return bound(1, MARIGIN_MULTIPLIER * cvar_or(strcat("hud_", HUD_Panel_GetName(id), "_border"), 30), 200);
}
vector HUD_Panel_GetColor(float id)
vector HUD_Panel_GetProgressBarColor(string item)
{
- return stov(cvar_string(strcat("hud_progreshud_", item, "_color")));
+ return stov(cvar_string(strcat("hud_progressbar_", item, "_color")));
}
float resizeCorner; // 1 = topleft, 2 = topright, 3 = bottomleft, 4 = bottomright
if(mouseClicked)
{
- float i, marigin;
+ float i, border;
vector panelPos;
vector panelSize;
- for(i = 0; i <= panel_cnt; i++)
+ for(i = 0; i <= panel_cnt; ++i)
{
panelPos = HUD_Panel_GetPos(i);
panelSize = HUD_Panel_GetSize(i);
- marigin = HUD_Panel_GetMarigin(i);
+ border = HUD_Panel_GetMarigin(i);
if(prevMouseClicked == 0) {
// move
if(mousepos_x >= panelPos_x && mousepos_y >= panelPos_y && mousepos_x <= panelPos_x + panelSize_x && mousepos_y <= panelPos_y + panelSize_y)
highlightedAction = 1;
}
// resize from topleft border
- else if(mousepos_x >= panelPos_x - eX * marigin && mousepos_y >= panelPos_y - eX * marigin && mousepos_x <= panelPos_x + 0.5 * panelSize_x && mousepos_y <= panelPos_y + 0.5 * panelSize_y)
+ else if(mousepos_x >= panelPos_x - border && mousepos_y >= panelPos_y - border && mousepos_x <= panelPos_x + 0.5 * panelSize_x && mousepos_y <= panelPos_y + 0.5 * panelSize_y)
{
highlightedPanel = i;
highlightedAction = 2;
resizeCorner = 1;
}
// resize from topright border
- else if(mousepos_x >= panelPos_x + 0.5 * panelSize_x && mousepos_y >= panelPos_y - eX * marigin && mousepos_x <= panelPos_x + panelSize_x + eX * marigin && mousepos_y <= panelPos_y + 0.5 * panelSize_y)
+ else if(mousepos_x >= panelPos_x + 0.5 * panelSize_x && mousepos_y >= panelPos_y - border && mousepos_x <= panelPos_x + panelSize_x + border && mousepos_y <= panelPos_y + 0.5 * panelSize_y)
{
highlightedPanel = i;
highlightedAction = 2;
resizeCorner = 2;
}
// resize from bottomleft border
- else if(mousepos_x >= panelPos_x - eX * marigin && mousepos_y >= panelPos_y + 0.5 * panelSize_y && mousepos_x <= panelPos_x + 0.5 * panelSize_x && mousepos_y <= panelPos_y + panelSize_y + eY * marigin)
+ else if(mousepos_x >= panelPos_x - border && mousepos_y >= panelPos_y + 0.5 * panelSize_y && mousepos_x <= panelPos_x + 0.5 * panelSize_x && mousepos_y <= panelPos_y + panelSize_y + border)
{
highlightedPanel = i;
highlightedAction = 2;
resizeCorner = 3;
}
// resize from bottomright border
- else if(mousepos_x >= panelPos_x + 0.5 * panelSize_x && mousepos_y >= panelPos_y + 0.5 * panelSize_y && mousepos_x <= panelPos_x + panelSize_x + eX * marigin && mousepos_y <= panelPos_y + panelSize_y + eY * marigin)
+ else if(mousepos_x >= panelPos_x + 0.5 * panelSize_x && mousepos_y >= panelPos_y + 0.5 * panelSize_y && mousepos_x <= panelPos_x + panelSize_x + border && mousepos_y <= panelPos_y + panelSize_y + border)
{
highlightedPanel = i;
highlightedAction = 2;
void HUD_WeaponIcons()
{
- float alpha, height, marigin, accuracybar_height, stat_weapons; // "constants"
+ float alpha, height, border, accuracybar_height, stat_weapons; // "constants"
vector pos, mySize, mysize, mypos, color, accuracy_color;
float i, id, fade, weapon_stats, weapon_hit, weapon_damage, weapon_cnt; // variables
- marigin = HUD_Panel_GetMarigin(0);
+ border = HUD_Panel_GetMarigin(0);
pos = HUD_Panel_GetPos(0);
mySize = HUD_Panel_GetSize(0);
color = HUD_Panel_GetColor(0);
}
if(HUD_Panel_GetBgActive(0) && weapon_cnt)
- draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER));
+ draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg, '1 1 0' * (border/MARIGIN_MULTIPLIER));
// hits
weapon_stats = getstati(STAT_DAMAGE_HITS);
{
float i;
float stat_items;
- float marigin;
+ float border;
vector pos, mySize, mysize, mypos, color;
- marigin = HUD_Panel_GetMarigin(1);
+ border = HUD_Panel_GetMarigin(1);
pos = HUD_Panel_GetPos(1);
mySize = HUD_Panel_GetSize(1);
color = HUD_Panel_GetColor(1);
if(HUD_Panel_GetBgActive(1))
- draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER));
+ draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg, '1 1 0' * (border/MARIGIN_MULTIPLIER));
// ammo
stat_items = getstati(STAT_ITEMS);
if(cvar("hud_ammo_onlycurrent")) {
if (stat_items & GetAmmoItemCode(i)) {
- drawpic(pos - '1 1 0' * marigin, "gfx/hud/sb_ammobg", mysize + '1 1 0' * marigin, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+ drawpic(pos - '1 1 0' * border, "gfx/hud/sb_ammobg", mysize + '1 1 0' * border, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
drawpic(pos + eX * mysize_x * 1.7, GetAmmoPicture(i), '24 24 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
if(a < 10)
HUD_DrawXNum(pos + '5 5 0', a, 3, 0, 24, '0.7 0 0', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
// TODO!
void HUD_Powerups() {
float stat_items, dt;
- float marigin;
+ float border;
vector pos, mySize, color;
- marigin = HUD_Panel_GetMarigin(2);
+ border = HUD_Panel_GetMarigin(2);
pos = HUD_Panel_GetPos(2);
mySize = HUD_Panel_GetSize(2);
color = HUD_Panel_GetColor(2);
if(HUD_Panel_GetBgActive(2))
- draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER));
+ draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg, '1 1 0' * (border/MARIGIN_MULTIPLIER));
stat_items = getstati(STAT_ITEMS);
/*
//
void HUD_HealthArmor(void)
{
- float marigin;
+ float border;
vector pos, mySize, color;
- marigin = HUD_Panel_GetMarigin(3);
+ border = HUD_Panel_GetMarigin(3);
pos = HUD_Panel_GetPos(3);
mySize = HUD_Panel_GetSize(3);
color = HUD_Panel_GetColor(3);
if(HUD_Panel_GetBgActive(3))
- draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER));
+ draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg, '1 1 0' * (border/MARIGIN_MULTIPLIER));
float armor, health, x;
armor = getstati(STAT_ARMOR);
if (x > 0)
{
- drawpic(pos, "gfx/hud/statuhud", eX * 0.5 * mySize_x * min(1, x/200) + eY * mySize_y, HUD_Panel_GetProgressBarColor("armor"), cvar("hud_progreshud_alpha"), DRAWFLAG_NORMAL);
+ drawpic(pos, "gfx/hud/statusbar", eX * 0.5 * mySize_x * min(1, x/200) + eY * mySize_y, HUD_Panel_GetProgressBarColor("armor"), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL);
if (x > 45)
drawpic(pos, "gfx/hud/sb_armor", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
else
// health
x = health;
- drawpic(pos + eX * mySize_x - eX * 0.5 * mySize_x * min(1, x/200), "gfx/hud/statuhud", eX * 0.5 * mySize_x * min(1, x/200) + eY * mySize_y, HUD_Panel_GetProgressBarColor("health"), cvar("hud_progreshud_alpha"), DRAWFLAG_NORMAL);
+ drawpic(pos + eX * mySize_x - eX * 0.5 * mySize_x * min(1, x/200), "gfx/hud/statusbar", eX * 0.5 * mySize_x * min(1, x/200) + eY * mySize_y, HUD_Panel_GetProgressBarColor("health"), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL);
drawpic(pos + eX * mySize_x - eX * mySize_y, "gfx/hud/sb_health", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
HUD_DrawXNum_Colored(pos + eX * mySize_x - eX * 2.5 * mySize_y + eY * 0.25 * mySize_y, x, 3, 0.5 * mySize_y, hud_alpha_fg);
}
if (x > 0)
{
- drawpic(pos + eY * mySize_y - eY * mySize_y * min(1, x/200), "gfx/hud/statuhud", eX * 0.5 * mySize_x + eY * mySize_y * min(1, x/200), HUD_Panel_GetProgressBarColor("armor"), cvar("hud_progreshud_alpha"), DRAWFLAG_NORMAL);
+ drawpic(pos + eY * mySize_y - eY * mySize_y * min(1, x/200), "gfx/hud/statusbar", eX * 0.5 * mySize_x + eY * mySize_y * min(1, x/200), HUD_Panel_GetProgressBarColor("armor"), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL);
if (x > 45)
drawpic(pos + eX * 0.4 * mySize_y, "gfx/hud/sb_armor", '0.7 0.7 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
else
x = health;
numbers = strlen(ftos(x));
- drawpic(pos + eX * 0.5 * mySize_x + eY * mySize_y - eY * mySize_y * min(1, x/200), "gfx/hud/statuhud", eX * 0.5 * mySize_x + eY * mySize_y * min(1, x/200), HUD_Panel_GetProgressBarColor("health"), cvar("hud_progreshud_alpha"), DRAWFLAG_NORMAL);
+ drawpic(pos + eX * 0.5 * mySize_x + eY * mySize_y - eY * mySize_y * min(1, x/200), "gfx/hud/statusbar", eX * 0.5 * mySize_x + eY * mySize_y * min(1, x/200), HUD_Panel_GetProgressBarColor("health"), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL);
drawpic(pos + eX * mySize_x - eX * 1.1 * mySize_y, "gfx/hud/sb_health", '0.7 0.7 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
HUD_DrawXNum_Colored(pos + eX * mySize_x - eX * numbers * 0.5 * mySize_y + eY * 0.55 * mySize_y, x, numbers, 0.5 * mySize_y, hud_alpha_fg);
}
if (x > 0)
{
- drawpic(pos, "gfx/hud/statuhud", eX * mySize_x * min(1, x/200) + eY * 0.5 * mySize_y, HUD_Panel_GetProgressBarColor("armor"), cvar("hud_progreshud_alpha"), DRAWFLAG_NORMAL);
+ drawpic(pos, "gfx/hud/statusbar", eX * mySize_x * min(1, x/200) + eY * 0.5 * mySize_y, HUD_Panel_GetProgressBarColor("armor"), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL);
if (x > 45)
drawpic(pos, "gfx/hud/sb_armor", '0.5 0.5 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
else
x = health;
numbers = strlen(ftos(x));
- drawpic(pos + eY * 0.5 * mySize_y, "gfx/hud/statuhud", eX * mySize_x * min(1, x/200) + eY * 0.5 * mySize_y, HUD_Panel_GetProgressBarColor("health"), cvar("hud_progreshud_alpha"), DRAWFLAG_NORMAL);
+ drawpic(pos + eY * 0.5 * mySize_y, "gfx/hud/statusbar", eX * mySize_x * min(1, x/200) + eY * 0.5 * mySize_y, HUD_Panel_GetProgressBarColor("health"), cvar("hud_progressbar_alpha"), DRAWFLAG_NORMAL);
drawpic(pos + eY * 0.5 * mySize_y, "gfx/hud/sb_health", '0.5 0.5 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
HUD_DrawXNum_Colored(pos + eX * 0.5 * mySize_y + eY * 0.5 * mySize_y, x, numbers, 0.5 * mySize_y, hud_alpha_fg);
}
//
void HUD_Score()
{
- float marigin;
+ float border;
vector pos, mySize, color;
- marigin = HUD_Panel_GetMarigin(7);
+ border = HUD_Panel_GetMarigin(7);
pos = HUD_Panel_GetPos(7);
mySize = HUD_Panel_GetSize(7);
color = HUD_Panel_GetColor(7);
if(HUD_Panel_GetBgActive(7))
- draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER));
+ draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg, '1 1 0' * (border/MARIGIN_MULTIPLIER));
float score, distribution, leader;
vector score_pos, secondary_score_pos, distribution_color;
// Race timer (#8)
//
void HUD_RaceTimer (void) {
- float marigin;
+ float border;
vector pos, mySize, color;
- marigin = HUD_Panel_GetMarigin(8);
+ border = HUD_Panel_GetMarigin(8);
pos = HUD_Panel_GetPos(8);
mySize = HUD_Panel_GetSize(8);
color = HUD_Panel_GetColor(8);
if(HUD_Panel_GetBgActive(8))
- draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER));
+ draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg, '1 1 0' * (border/MARIGIN_MULTIPLIER));
drawfont = hud_bigfont;
float a, t;
string s, forcetime;
- if(race_checkpointtime)
+ if(cvar("_hud_configure"))
+ {
+ s = "0:13:37";
+ drawstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, FALSE, '0.75 0.75 0' * mySize_y), s, '0.75 0.75 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+ s = "^1Intermediate 1 (+15.42)";
+ drawcolorcodedstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.25 * mySize_y) + eY * 0.75 * mySize_y, s, '1 1 0' * 0.25 * mySize_y, hud_alpha_fg, DRAWFLAG_NORMAL);
+ }
+ else if(race_checkpointtime)
{
a = bound(0, 2 - (time - race_checkpointtime), 1);
s = "";
// Notification area (#4)
void HUD_Notify (void)
{
- float marigin;
+ float border;
vector pos, mySize, color;
- marigin = HUD_Panel_GetMarigin(4);
+ border = HUD_Panel_GetMarigin(4);
pos = HUD_Panel_GetPos(4);
mySize = HUD_Panel_GetSize(4);
color = HUD_Panel_GetColor(4);
if(HUD_Panel_GetBgActive(4))
- draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER));
+ draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg, '1 1 0' * (border/MARIGIN_MULTIPLIER));
string s;
entity tm;
void HUD_VoteWindow(void)
{
- float marigin;
+ float border;
vector pos, mySize, color;
- marigin = HUD_Panel_GetMarigin(9);
+ border = HUD_Panel_GetMarigin(9);
pos = HUD_Panel_GetPos(9);
mySize = HUD_Panel_GetSize(9);
color = HUD_Panel_GetColor(9);
}
if(HUD_Panel_GetBgActive(9))
- draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg * vote_alpha, '1 1 0' * (marigin/MARIGIN_MULTIPLIER));
+ draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg * vote_alpha, '1 1 0' * (border/MARIGIN_MULTIPLIER));
if(vote_alpha) {
a = vote_alpha * bound(cvar_or("hud_vote_alreadyvoted_alpha", 0.75), 1 - vote_highlighted, 1);
//
void HUD_Timer()
{
- float marigin;
+ float border;
vector pos, mySize, color;
- marigin = HUD_Panel_GetMarigin(5);
+ border = HUD_Panel_GetMarigin(5);
pos = HUD_Panel_GetPos(5);
mySize = HUD_Panel_GetSize(5);
color = HUD_Panel_GetColor(5);
if(HUD_Panel_GetBgActive(5))
- draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER));
+ draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg, '1 1 0' * (border/MARIGIN_MULTIPLIER));
float timelimit, elapsedTime, minutes, seconds, timeleft, minutesLeft, secondsLeft;
void HUD_Radar(void)
{
- float marigin;
+ float border;
vector pos, mySize, color;
- marigin = HUD_Panel_GetMarigin(6);
+ border = HUD_Panel_GetMarigin(6);
pos = HUD_Panel_GetPos(6);
mySize = HUD_Panel_GetSize(6);
color = HUD_Panel_GetColor(6);
if(HUD_Panel_GetBgActive(6))
- draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER));
+ draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg, '1 1 0' * (border/MARIGIN_MULTIPLIER));
local float color1, color2; // color already declared as a global in hud.qc
local vector rgb;
void HUD_DrawPressedKeys(void)
{
- float marigin;
+ float border;
vector pos, mySize, color;
- marigin = HUD_Panel_GetMarigin(10);
+ border = HUD_Panel_GetMarigin(10);
pos = HUD_Panel_GetPos(10);
mySize = HUD_Panel_GetSize(10);
color = HUD_Panel_GetColor(10);
if(HUD_Panel_GetBgActive(10))
- draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER));
+ draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg, '1 1 0' * (border/MARIGIN_MULTIPLIER));
float pressedkeys;
}
if (acceleration > 0)
- drawpic(pos, "gfx/hud/statuhud", acceleration * scale * '40 0 0' + sz * eY, rgb, alpha * hud_alpha_fg, DRAWFLAG_NORMAL);
+ drawpic(pos, "gfx/hud/statusbar", acceleration * scale * '40 0 0' + sz * eY, rgb, alpha * hud_alpha_fg, DRAWFLAG_NORMAL);
else if (acceleration < 0)
- drawpic(pos + acceleration * scale * '40 0 0', "gfx/hud/statuhud", -acceleration * scale * '40 0 0' + sz * eY, rgb, alpha * hud_alpha_fg, DRAWFLAG_NORMAL);
+ drawpic(pos + acceleration * scale * '40 0 0', "gfx/hud/statusbar", -acceleration * scale * '40 0 0' + sz * eY, rgb, alpha * hud_alpha_fg, DRAWFLAG_NORMAL);
}
void HUD_Reset (void)
HUD_Notify();
if(HUD_Panel_CheckActive(5))
HUD_Timer();
+ // TODO hud'ify
if(HUD_Panel_CheckActive(6))
if(ons_showmap || cvar_string("cl_teamradar") != "0" && (cvar("cl_teamradar") == 2 || teamplay))
HUD_Radar();
HUD_RaceTimer();
if(HUD_Panel_CheckActive(9))
HUD_VoteWindow();
+ // TODO hud'ify
if(HUD_Panel_CheckActive(10))
if(spectatee_status > 0 || cvar("cl_showpressedkeys") >= 2 || cvar("_hud_configure"))
HUD_DrawPressedKeys();
projects / xonotic / xonotic-data.pk3dir.git / blobdiff