// check if move will result in panel being moved into another panel. If so, return snapped vector, otherwise return the given vector
vector HUD_Panel_CheckMove(vector myPos, vector mySize)
{
- float myCenter_x, myCenter_y, targCenter_x, targCenter_y;
+ vector myCenter, targCenter;
vector myTarget = myPos;
int i;
for (i = 0; i < HUD_PANEL_NUM; ++i) {
panel_pos -= '1 1 0' * panel_bg_border;
panel_size += '2 2 0' * panel_bg_border;
- if(myPos_y + mySize_y < panel_pos_y)
+ if(myPos.y + mySize.y < panel_pos.y)
continue;
- if(myPos_y > panel_pos_y + panel_size_y)
+ if(myPos.y > panel_pos.y + panel_size.y)
continue;
- if(myPos_x + mySize_x < panel_pos_x)
+ if(myPos.x + mySize.x < panel_pos.x)
continue;
- if(myPos_x > panel_pos_x + panel_size_x)
+ if(myPos.x > panel_pos.x + panel_size.x)
continue;
// OK, there IS a collision.
- myCenter_x = myPos_x + 0.5 * mySize_x;
- myCenter_y = myPos_y + 0.5 * mySize_y;
+ myCenter_x = myPos.x + 0.5 * mySize.x;
+ myCenter_y = myPos.y + 0.5 * mySize.y;
- targCenter_x = panel_pos_x + 0.5 * panel_size_x;
- targCenter_y = panel_pos_y + 0.5 * panel_size_y;
+ targCenter_x = panel_pos.x + 0.5 * panel_size.x;
+ targCenter_y = panel_pos.y + 0.5 * panel_size.y;
- if(myCenter_x < targCenter_x && myCenter_y < targCenter_y) // top left (of the target panel)
+ if(myCenter.x < targCenter.x && myCenter.y < targCenter.y) // top left (of the target panel)
{
- if(myPos_x + mySize_x - panel_pos_x < myPos_y + mySize_y - panel_pos_y) // push it to the side
- myTarget_x = panel_pos_x - mySize_x;
+ if(myPos.x + mySize.x - panel_pos.x < myPos.y + mySize.y - panel_pos.y) // push it to the side
+ myTarget_x = panel_pos.x - mySize.x;
else // push it upwards
- myTarget_y = panel_pos_y - mySize_y;
+ myTarget_y = panel_pos.y - mySize.y;
}
- else if(myCenter_x > targCenter_x && myCenter_y < targCenter_y) // top right
+ else if(myCenter.x > targCenter.x && myCenter.y < targCenter.y) // top right
{
- if(panel_pos_x + panel_size_x - myPos_x < myPos_y + mySize_y - panel_pos_y) // push it to the side
- myTarget_x = panel_pos_x + panel_size_x;
+ if(panel_pos.x + panel_size.x - myPos.x < myPos.y + mySize.y - panel_pos.y) // push it to the side
+ myTarget_x = panel_pos.x + panel_size.x;
else // push it upwards
- myTarget_y = panel_pos_y - mySize_y;
+ myTarget_y = panel_pos.y - mySize.y;
}
- else if(myCenter_x < targCenter_x && myCenter_y > targCenter_y) // bottom left
+ else if(myCenter.x < targCenter.x && myCenter.y > targCenter.y) // bottom left
{
- if(myPos_x + mySize_x - panel_pos_x < panel_pos_y + panel_size_y - myPos_y) // push it to the side
- myTarget_x = panel_pos_x - mySize_x;
+ if(myPos.x + mySize.x - panel_pos.x < panel_pos.y + panel_size.y - myPos.y) // push it to the side
+ myTarget_x = panel_pos.x - mySize.x;
else // push it downwards
- myTarget_y = panel_pos_y + panel_size_y;
+ myTarget_y = panel_pos.y + panel_size.y;
}
- else if(myCenter_x > targCenter_x && myCenter_y > targCenter_y) // bottom right
+ else if(myCenter.x > targCenter.x && myCenter.y > targCenter.y) // bottom right
{
- if(panel_pos_x + panel_size_x - myPos_x < panel_pos_y + panel_size_y - myPos_y) // push it to the side
- myTarget_x = panel_pos_x + panel_size_x;
+ if(panel_pos.x + panel_size.x - myPos.x < panel_pos.y + panel_size.y - myPos.y) // push it to the side
+ myTarget_x = panel_pos.x + panel_size.x;
else // push it downwards
- myTarget_y = panel_pos_y + panel_size_y;
+ myTarget_y = panel_pos.y + panel_size.y;
}
//if(cvar("hud_configure_checkcollisions_debug"))
//drawfill(panel_pos, panel_size, '1 1 0', .3, DRAWFLAG_NORMAL);
if(autocvar_hud_configure_grid)
{
- pos_x = floor((pos_x/vid_conwidth)/hud_configure_gridSize_x + 0.5) * hud_configure_realGridSize_x;
- pos_y = floor((pos_y/vid_conheight)/hud_configure_gridSize_y + 0.5) * hud_configure_realGridSize_y;
+ pos_x = floor((pos.x/vid_conwidth)/hud_configure_gridSize.x + 0.5) * hud_configure_realGridSize.x;
+ pos_y = floor((pos.y/vid_conheight)/hud_configure_gridSize.y + 0.5) * hud_configure_realGridSize.y;
}
if(hud_configure_checkcollisions)
pos = HUD_Panel_CheckMove(pos, mySize);
- pos_x = bound(0, pos_x, vid_conwidth - mySize_x);
- pos_y = bound(0, pos_y, vid_conheight - mySize_y);
+ pos_x = bound(0, pos.x, vid_conwidth - mySize.x);
+ pos_y = bound(0, pos.y, vid_conheight - mySize.y);
string s;
- s = strcat(ftos(pos_x/vid_conwidth), " ", ftos(pos_y/vid_conheight));
+ s = strcat(ftos(pos.x/vid_conwidth), " ", ftos(pos.y/vid_conheight));
cvar_set(strcat("hud_panel_", highlightedPanel.panel_name, "_pos"), s);
}
vector targEndPos;
- float dist_x, dist_y;
+ vector dist;
float ratio;
- ratio = mySize_x/mySize_y;
+ ratio = mySize.x/mySize.y;
for (i = 0; i < HUD_PANEL_NUM; ++i) {
panel = hud_panel[i];
targEndPos = panel_pos + panel_size;
// resizeorigin is WITHIN target panel, just abort any collision testing against that particular panel to produce expected behaviour!
- if(resizeorigin_x > panel_pos_x && resizeorigin_x < targEndPos_x && resizeorigin_y > panel_pos_y && resizeorigin_y < targEndPos_y)
+ if(resizeorigin.x > panel_pos.x && resizeorigin.x < targEndPos.x && resizeorigin.y > panel_pos.y && resizeorigin.y < targEndPos.y)
continue;
if (resizeCorner == 1)
{
// check if this panel is on our way
- if (resizeorigin_x <= panel_pos_x)
+ if (resizeorigin.x <= panel_pos.x)
continue;
- if (resizeorigin_y <= panel_pos_y)
+ if (resizeorigin.y <= panel_pos.y)
continue;
- if (targEndPos_x <= resizeorigin_x - mySize_x)
+ if (targEndPos.x <= resizeorigin.x - mySize.x)
continue;
- if (targEndPos_y <= resizeorigin_y - mySize_y)
+ if (targEndPos.y <= resizeorigin.y - mySize.y)
continue;
// there is a collision:
//
// dist is the distance between resizeorigin and the "analogous" point of the panel
// in this case between resizeorigin (bottom-right point) and the bottom-right point of the panel
- dist_x = resizeorigin_x - targEndPos_x;
- dist_y = resizeorigin_y - targEndPos_y;
- if (dist_y <= 0 || dist_x / dist_y > ratio)
- mySize_x = min(mySize_x, dist_x);
+ dist_x = resizeorigin.x - targEndPos.x;
+ dist_y = resizeorigin.y - targEndPos.y;
+ if (dist.y <= 0 || dist.x / dist.y > ratio)
+ mySize_x = min(mySize.x, dist.x);
else
- mySize_y = min(mySize_y, dist_y);
+ mySize_y = min(mySize.y, dist.y);
}
else if (resizeCorner == 2)
{
- if (resizeorigin_x >= targEndPos_x)
+ if (resizeorigin.x >= targEndPos.x)
continue;
- if (resizeorigin_y <= panel_pos_y)
+ if (resizeorigin.y <= panel_pos.y)
continue;
- if (panel_pos_x >= resizeorigin_x + mySize_x)
+ if (panel_pos.x >= resizeorigin.x + mySize.x)
continue;
- if (targEndPos_y <= resizeorigin_y - mySize_y)
+ if (targEndPos.y <= resizeorigin.y - mySize.y)
continue;
- dist_x = panel_pos_x - resizeorigin_x;
- dist_y = resizeorigin_y - targEndPos_y;
- if (dist_y <= 0 || dist_x / dist_y > ratio)
- mySize_x = min(mySize_x, dist_x);
+ dist_x = panel_pos.x - resizeorigin.x;
+ dist_y = resizeorigin.y - targEndPos.y;
+ if (dist.y <= 0 || dist.x / dist.y > ratio)
+ mySize_x = min(mySize.x, dist.x);
else
- mySize_y = min(mySize_y, dist_y);
+ mySize_y = min(mySize.y, dist.y);
}
else if (resizeCorner == 3)
{
- if (resizeorigin_x <= panel_pos_x)
+ if (resizeorigin.x <= panel_pos.x)
continue;
- if (resizeorigin_y >= targEndPos_y)
+ if (resizeorigin.y >= targEndPos.y)
continue;
- if (targEndPos_x <= resizeorigin_x - mySize_x)
+ if (targEndPos.x <= resizeorigin.x - mySize.x)
continue;
- if (panel_pos_y >= resizeorigin_y + mySize_y)
+ if (panel_pos.y >= resizeorigin.y + mySize.y)
continue;
- dist_x = resizeorigin_x - targEndPos_x;
- dist_y = panel_pos_y - resizeorigin_y;
- if (dist_y <= 0 || dist_x / dist_y > ratio)
- mySize_x = min(mySize_x, dist_x);
+ dist_x = resizeorigin.x - targEndPos.x;
+ dist_y = panel_pos.y - resizeorigin.y;
+ if (dist.y <= 0 || dist.x / dist.y > ratio)
+ mySize_x = min(mySize.x, dist.x);
else
- mySize_y = min(mySize_y, dist_y);
+ mySize_y = min(mySize.y, dist.y);
}
else if (resizeCorner == 4)
{
- if (resizeorigin_x >= targEndPos_x)
+ if (resizeorigin.x >= targEndPos.x)
continue;
- if (resizeorigin_y >= targEndPos_y)
+ if (resizeorigin.y >= targEndPos.y)
continue;
- if (panel_pos_x >= resizeorigin_x + mySize_x)
+ if (panel_pos.x >= resizeorigin.x + mySize.x)
continue;
- if (panel_pos_y >= resizeorigin_y + mySize_y)
+ if (panel_pos.y >= resizeorigin.y + mySize.y)
continue;
- dist_x = panel_pos_x - resizeorigin_x;
- dist_y = panel_pos_y - resizeorigin_y;
- if (dist_y <= 0 || dist_x / dist_y > ratio)
- mySize_x = min(mySize_x, dist_x);
+ dist_x = panel_pos.x - resizeorigin.x;
+ dist_y = panel_pos.y - resizeorigin.y;
+ if (dist.y <= 0 || dist.x / dist.y > ratio)
+ mySize_x = min(mySize.x, dist.x);
else
- mySize_y = min(mySize_y, dist_y);
+ mySize_y = min(mySize.y, dist.y);
}
//if(cvar("hud_configure_checkcollisions_debug"))
//drawfill(panel_pos, panel_size, '1 1 0', .3, DRAWFLAG_NORMAL);
vector myPos;
// minimum panel size cap
- mySize_x = max(0.025 * vid_conwidth, mySize_x);
- mySize_y = max(0.025 * vid_conheight, mySize_y);
+ mySize_x = max(0.025 * vid_conwidth, mySize.x);
+ mySize_y = max(0.025 * vid_conheight, mySize.y);
if(highlightedPanel == HUD_PANEL(CHAT)) // some panels have their own restrictions, like the chat panel (which actually only moves the engine chat print around). Looks bad if it's too small.
{
- mySize_x = max(17 * autocvar_con_chatsize, mySize_x);
- mySize_y = max(2 * autocvar_con_chatsize + 2 * panel_bg_padding, mySize_y);
+ mySize_x = max(17 * autocvar_con_chatsize, mySize.x);
+ mySize_y = max(2 * autocvar_con_chatsize + 2 * panel_bg_padding, mySize.y);
}
// collision testing|
// we need to know pos at this stage, but it might still change later if we hit a screen edge/other panel (?)
if(resizeCorner == 1) {
- myPos_x = resizeorigin_x - mySize_x;
- myPos_y = resizeorigin_y - mySize_y;
+ myPos_x = resizeorigin.x - mySize.x;
+ myPos_y = resizeorigin.y - mySize.y;
} else if(resizeCorner == 2) {
- myPos_x = resizeorigin_x;
- myPos_y = resizeorigin_y - mySize_y;
+ myPos_x = resizeorigin.x;
+ myPos_y = resizeorigin.y - mySize.y;
} else if(resizeCorner == 3) {
- myPos_x = resizeorigin_x - mySize_x;
- myPos_y = resizeorigin_y;
+ myPos_x = resizeorigin.x - mySize.x;
+ myPos_y = resizeorigin.y;
} else { // resizeCorner == 4
- myPos_x = resizeorigin_x;
- myPos_y = resizeorigin_y;
+ myPos_x = resizeorigin.x;
+ myPos_y = resizeorigin.y;
}
// left/top screen edges
- if(myPos_x < 0)
- mySize_x = mySize_x + myPos_x;
- if(myPos_y < 0)
- mySize_y = mySize_y + myPos_y;
+ if(myPos.x < 0)
+ mySize_x = mySize.x + myPos.x;
+ if(myPos.y < 0)
+ mySize_y = mySize.y + myPos.y;
// bottom/right screen edges
- if(myPos_x + mySize_x > vid_conwidth)
- mySize_x = vid_conwidth - myPos_x;
- if(myPos_y + mySize_y > vid_conheight)
- mySize_y = vid_conheight - myPos_y;
+ if(myPos.x + mySize.x > vid_conwidth)
+ mySize_x = vid_conwidth - myPos.x;
+ if(myPos.y + mySize.y > vid_conheight)
+ mySize_y = vid_conheight - myPos.y;
//if(cvar("hud_configure_checkcollisions_debug"))
//drawfill(myPos, mySize, '1 1 1', .2, DRAWFLAG_NORMAL);
// before checkresize, otherwise panel can be snapped partially inside another panel or panel aspect ratio can be broken
if(autocvar_hud_configure_grid)
{
- mySize_x = floor((mySize_x/vid_conwidth)/hud_configure_gridSize_x + 0.5) * hud_configure_realGridSize_x;
- mySize_y = floor((mySize_y/vid_conheight)/hud_configure_gridSize_y + 0.5) * hud_configure_realGridSize_y;
+ mySize_x = floor((mySize.x/vid_conwidth)/hud_configure_gridSize.x + 0.5) * hud_configure_realGridSize.x;
+ mySize_y = floor((mySize.y/vid_conheight)/hud_configure_gridSize.y + 0.5) * hud_configure_realGridSize.y;
}
if(hud_configure_checkcollisions)
mySize = HUD_Panel_CheckResize(mySize, resizeorigin);
// minimum panel size cap, do this once more so we NEVER EVER EVER have a panel smaller than this, JUST IN CASE above code still makes the panel eg negative (impossible to resize back without changing cvars manually then)
- mySize_x = max(0.025 * vid_conwidth, mySize_x);
- mySize_y = max(0.025 * vid_conheight, mySize_y);
+ mySize_x = max(0.025 * vid_conwidth, mySize.x);
+ mySize_y = max(0.025 * vid_conheight, mySize.y);
// do another pos check, as size might have changed by now
if(resizeCorner == 1) {
- myPos_x = resizeorigin_x - mySize_x;
- myPos_y = resizeorigin_y - mySize_y;
+ myPos_x = resizeorigin.x - mySize.x;
+ myPos_y = resizeorigin.y - mySize.y;
} else if(resizeCorner == 2) {
- myPos_x = resizeorigin_x;
- myPos_y = resizeorigin_y - mySize_y;
+ myPos_x = resizeorigin.x;
+ myPos_y = resizeorigin.y - mySize.y;
} else if(resizeCorner == 3) {
- myPos_x = resizeorigin_x - mySize_x;
- myPos_y = resizeorigin_y;
+ myPos_x = resizeorigin.x - mySize.x;
+ myPos_y = resizeorigin.y;
} else { // resizeCorner == 4
- myPos_x = resizeorigin_x;
- myPos_y = resizeorigin_y;
+ myPos_x = resizeorigin.x;
+ myPos_y = resizeorigin.y;
}
//if(cvar("hud_configure_checkcollisions_debug"))
//drawfill(myPos, mySize, '0 1 0', .3, DRAWFLAG_NORMAL);
string s;
- s = strcat(ftos(mySize_x/vid_conwidth), " ", ftos(mySize_y/vid_conheight));
+ s = strcat(ftos(mySize.x/vid_conwidth), " ", ftos(mySize.y/vid_conheight));
cvar_set(strcat("hud_panel_", highlightedPanel.panel_name, "_size"), s);
- s = strcat(ftos(myPos_x/vid_conwidth), " ", ftos(myPos_y/vid_conheight));
+ s = strcat(ftos(myPos.x/vid_conwidth), " ", ftos(myPos.y/vid_conheight));
cvar_set(strcat("hud_panel_", highlightedPanel.panel_name, "_pos"), s);
}
if (nPrimary == K_UPARROW || nPrimary == K_DOWNARROW)
{
if (hudShiftState & S_SHIFT)
- step = hud_configure_realGridSize_y;
+ step = hud_configure_realGridSize.y;
else
- step = 2 * hud_configure_realGridSize_y;
+ step = 2 * hud_configure_realGridSize.y;
}
else
{
if (hudShiftState & S_SHIFT)
- step = hud_configure_realGridSize_x;
+ step = hud_configure_realGridSize.x;
else
- step = 2 * hud_configure_realGridSize_x;
+ step = 2 * hud_configure_realGridSize.x;
}
}
else
panel_click_resizeorigin = panel_pos;
if(resizeCorner == 1) {
panel_click_resizeorigin += mySize;
- mySize_y += step;
+ mySize.y += step;
} else if(resizeCorner == 2) {
- panel_click_resizeorigin_y += mySize_y;
- mySize_x += step;
+ panel_click_resizeorigin.y += mySize.y;
+ mySize.x += step;
} else if(resizeCorner == 3) {
- panel_click_resizeorigin_x += mySize_x;
- mySize_x += step;
+ panel_click_resizeorigin.x += mySize.x;
+ mySize.x += step;
} else { // resizeCorner == 4
- mySize_y += step;
+ mySize.y += step;
}
HUD_Panel_SetPosSize(mySize);
}
vector pos;
pos = panel_pos;
if(nPrimary == K_UPARROW)
- pos_y -= step;
+ pos.y -= step;
else if(nPrimary == K_DOWNARROW)
- pos_y += step;
+ pos.y += step;
else if(nPrimary == K_LEFTARROW)
- pos_x -= step;
+ pos.x -= step;
else // if(nPrimary == K_RIGHTARROW)
- pos_x += step;
+ pos.x += step;
HUD_Panel_SetPos(pos);
}
}
tab_backward = (hudShiftState & S_SHIFT);
- float k, level = 0, start_pos_x;
+ float k, level = 0, start_posX;
vector candidate_pos = '0 0 0';
const float LEVELS_NUM = 4;
float level_height = vid_conheight / LEVELS_NUM;
:find_tab_panel
- level = floor(tab_panel_pos_y / level_height) * level_height; //starting level
+ level = floor(tab_panel_pos.y / level_height) * level_height; //starting level
candidate_pos_x = (!tab_backward) ? vid_conwidth : 0;
- start_pos_x = tab_panel_pos_x;
+ start_posX = tab_panel_pos.x;
tab_panel = world;
k=0;
while(++k)
if (panel == tab_panels[i] || panel == starting_panel)
continue;
HUD_Panel_UpdatePosSize()
- if (panel_pos_y >= level && (panel_pos_y - level) < level_height)
- if ( ( !tab_backward && panel_pos_x >= start_pos_x && (panel_pos_x < candidate_pos_x || (panel_pos_x == candidate_pos_x && panel_pos_y <= candidate_pos_y)) )
- || ( tab_backward && panel_pos_x <= start_pos_x && (panel_pos_x > candidate_pos_x || (panel_pos_x == candidate_pos_x && panel_pos_y >= candidate_pos_y)) ) )
+ if (panel_pos.y >= level && (panel_pos.y - level) < level_height)
+ if ( ( !tab_backward && panel_pos.x >= start_posX && (panel_pos.x < candidate_pos.x || (panel_pos_x == candidate_pos.x && panel_pos.y <= candidate_pos.y)) )
+ || ( tab_backward && panel_pos.x <= start_posX && (panel_pos.x > candidate_pos.x || (panel_pos_x == candidate_pos.x && panel_pos.y >= candidate_pos.y)) ) )
{
tab_panel = panel;
tab_panel_pos = candidate_pos = panel_pos;
if (!tab_backward)
{
level = (level + level_height) % vid_conheight;
- start_pos_x = 0;
+ start_posX = 0;
candidate_pos_x = vid_conwidth;
}
else
{
level = (level - level_height) % vid_conheight;
- start_pos_x = vid_conwidth;
+ start_posX = vid_conwidth;
candidate_pos_x = 0;
}
}
// reduce size if it'd go beyond screen boundaries
vector tmp_size = panel_size_copied;
- if (panel_pos_x + panel_size_copied_x > vid_conwidth)
- tmp_size_x = vid_conwidth - panel_pos_x;
- if (panel_pos_y + panel_size_copied_y > vid_conheight)
- tmp_size_y = vid_conheight - panel_pos_y;
+ if (panel_pos.x + panel_size_copied.x > vid_conwidth)
+ tmp_size_x = vid_conwidth - panel_pos.x;
+ if (panel_pos.y + panel_size_copied.y > vid_conheight)
+ tmp_size_y = vid_conheight - panel_pos.y;
if (panel_size == tmp_size)
return true;
panel_size_backup = panel_size;
highlightedPanel_backup = highlightedPanel;
- s = strcat(ftos(tmp_size_x/vid_conwidth), " ", ftos(tmp_size_y/vid_conheight));
+ s = strcat(ftos(tmp_size.x/vid_conwidth), " ", ftos(tmp_size.y/vid_conheight));
cvar_set(strcat("hud_panel_", highlightedPanel.panel_name, "_size"), s);
}
else if(nPrimary == 'z' && hudShiftState & S_CTRL) // undo last action
//restore previous values
if (highlightedPanel_backup)
{
- s = strcat(ftos(panel_pos_backup_x/vid_conwidth), " ", ftos(panel_pos_backup_y/vid_conheight));
+ s = strcat(ftos(panel_pos_backup.x/vid_conwidth), " ", ftos(panel_pos_backup.y/vid_conheight));
cvar_set(strcat("hud_panel_", highlightedPanel_backup.panel_name, "_pos"), s);
- s = strcat(ftos(panel_size_backup_x/vid_conwidth), " ", ftos(panel_size_backup_y/vid_conheight));
+ s = strcat(ftos(panel_size_backup.x/vid_conwidth), " ", ftos(panel_size_backup.y/vid_conheight));
cvar_set(strcat("hud_panel_", highlightedPanel_backup.panel_name, "_size"), s);
highlightedPanel_backup = world;
}
border = max(8, panel_bg_border); // FORCED border so a small border size doesn't mean you can't resize
// move
- if(allow_move && mousepos_x > panel_pos_x && mousepos_y > panel_pos_y && mousepos_x < panel_pos_x + panel_size_x && mousepos_y < panel_pos_y + panel_size_y)
+ if(allow_move && mousepos.x > panel_pos.x && mousepos.y > panel_pos.y && mousepos.x < panel_pos.x + panel_size.x && mousepos.y < panel_pos.y + panel_size.y)
{
return 1;
}
// resize from topleft border
- else if(mousepos_x >= panel_pos_x - border && mousepos_y >= panel_pos_y - border && mousepos_x <= panel_pos_x + 0.5 * panel_size_x && mousepos_y <= panel_pos_y + 0.5 * panel_size_y)
+ else if(mousepos.x >= panel_pos.x - border && mousepos.y >= panel_pos.y - border && mousepos.x <= panel_pos.x + 0.5 * panel_size.x && mousepos.y <= panel_pos.y + 0.5 * panel_size.y)
{
return 2;
}
// resize from topright border
- else if(mousepos_x >= panel_pos_x + 0.5 * panel_size_x && mousepos_y >= panel_pos_y - border && mousepos_x <= panel_pos_x + panel_size_x + border && mousepos_y <= panel_pos_y + 0.5 * panel_size_y)
+ else if(mousepos.x >= panel_pos.x + 0.5 * panel_size.x && mousepos.y >= panel_pos.y - border && mousepos.x <= panel_pos.x + panel_size.x + border && mousepos.y <= panel_pos.y + 0.5 * panel_size.y)
{
return 3;
}
// resize from bottomleft border
- else if(mousepos_x >= panel_pos_x - border && mousepos_y >= panel_pos_y + 0.5 * panel_size_y && mousepos_x <= panel_pos_x + 0.5 * panel_size_x && mousepos_y <= panel_pos_y + panel_size_y + border)
+ else if(mousepos.x >= panel_pos.x - border && mousepos.y >= panel_pos.y + 0.5 * panel_size.y && mousepos.x <= panel_pos.x + 0.5 * panel_size.x && mousepos.y <= panel_pos.y + panel_size.y + border)
{
return 3;
}
// resize from bottomright border
- else if(mousepos_x >= panel_pos_x + 0.5 * panel_size_x && mousepos_y >= panel_pos_y + 0.5 * panel_size_y && mousepos_x <= panel_pos_x + panel_size_x + border && mousepos_y <= panel_pos_y + panel_size_y + border)
+ else if(mousepos.x >= panel_pos.x + 0.5 * panel_size.x && mousepos.y >= panel_pos.y + 0.5 * panel_size.y && mousepos.x <= panel_pos.x + panel_size.x + border && mousepos.y <= panel_pos.y + panel_size.y + border)
{
return 2;
}
border = max(8, panel_bg_border); // FORCED border so a small border size doesn't mean you can't resize
// move
- if(allow_move && mousepos_x > panel_pos_x && mousepos_y > panel_pos_y && mousepos_x < panel_pos_x + panel_size_x && mousepos_y < panel_pos_y + panel_size_y)
+ if(allow_move && mousepos.x > panel_pos.x && mousepos.y > panel_pos.y && mousepos.x < panel_pos.x + panel_size.x && mousepos.y < panel_pos.y + panel_size.y)
{
highlightedPanel = hud_panel[i];
HUD_Panel_FirstInDrawQ(i);
return;
}
// resize from topleft border
- else if(mousepos_x >= panel_pos_x - border && mousepos_y >= panel_pos_y - border && mousepos_x <= panel_pos_x + 0.5 * panel_size_x && mousepos_y <= panel_pos_y + 0.5 * panel_size_y)
+ else if(mousepos.x >= panel_pos.x - border && mousepos.y >= panel_pos.y - border && mousepos.x <= panel_pos.x + 0.5 * panel_size.x && mousepos.y <= panel_pos.y + 0.5 * panel_size.y)
{
highlightedPanel = hud_panel[i];
HUD_Panel_FirstInDrawQ(i);
return;
}
// resize from topright border
- else if(mousepos_x >= panel_pos_x + 0.5 * panel_size_x && mousepos_y >= panel_pos_y - border && mousepos_x <= panel_pos_x + panel_size_x + border && mousepos_y <= panel_pos_y + 0.5 * panel_size_y)
+ else if(mousepos.x >= panel_pos.x + 0.5 * panel_size.x && mousepos.y >= panel_pos.y - border && mousepos.x <= panel_pos.x + panel_size.x + border && mousepos.y <= panel_pos.y + 0.5 * panel_size.y)
{
highlightedPanel = hud_panel[i];
HUD_Panel_FirstInDrawQ(i);
highlightedAction = 2;
resizeCorner = 2;
- panel_click_distance_x = panel_size_x - mousepos_x + panel_pos_x;
- panel_click_distance_y = mousepos_y - panel_pos_y;
- panel_click_resizeorigin = panel_pos + eY * panel_size_y;
+ panel_click_distance_x = panel_size.x - mousepos.x + panel_pos.x;
+ panel_click_distance_y = mousepos.y - panel_pos.y;
+ panel_click_resizeorigin = panel_pos + eY * panel_size.y;
return;
}
// resize from bottomleft border
- else if(mousepos_x >= panel_pos_x - border && mousepos_y >= panel_pos_y + 0.5 * panel_size_y && mousepos_x <= panel_pos_x + 0.5 * panel_size_x && mousepos_y <= panel_pos_y + panel_size_y + border)
+ else if(mousepos.x >= panel_pos.x - border && mousepos.y >= panel_pos.y + 0.5 * panel_size.y && mousepos.x <= panel_pos.x + 0.5 * panel_size.x && mousepos.y <= panel_pos.y + panel_size.y + border)
{
highlightedPanel = hud_panel[i];
HUD_Panel_FirstInDrawQ(i);
highlightedAction = 2;
resizeCorner = 3;
- panel_click_distance_x = mousepos_x - panel_pos_x;
- panel_click_distance_y = panel_size_y - mousepos_y + panel_pos_y;
- panel_click_resizeorigin = panel_pos + eX * panel_size_x;
+ panel_click_distance_x = mousepos.x - panel_pos.x;
+ panel_click_distance_y = panel_size.y - mousepos.y + panel_pos.y;
+ panel_click_resizeorigin = panel_pos + eX * panel_size.x;
return;
}
// resize from bottomright border
- else if(mousepos_x >= panel_pos_x + 0.5 * panel_size_x && mousepos_y >= panel_pos_y + 0.5 * panel_size_y && mousepos_x <= panel_pos_x + panel_size_x + border && mousepos_y <= panel_pos_y + panel_size_y + border)
+ else if(mousepos.x >= panel_pos.x + 0.5 * panel_size.x && mousepos.y >= panel_pos.y + 0.5 * panel_size.y && mousepos.x <= panel_pos.x + panel_size.x + border && mousepos.y <= panel_pos.y + panel_size.y + border)
{
highlightedPanel = hud_panel[i];
HUD_Panel_FirstInDrawQ(i);
{
mousepos = mousepos + getmousepos() * autocvar_menu_mouse_speed;
- mousepos_x = bound(0, mousepos_x, vid_conwidth);
- mousepos_y = bound(0, mousepos_y, vid_conheight);
+ mousepos_x = bound(0, mousepos.x, vid_conwidth);
+ mousepos_y = bound(0, mousepos.y, vid_conheight);
}
if(mouseClicked)
{
vector mySize = '0 0 0';
if(resizeCorner == 1) {
- mySize_x = panel_click_resizeorigin_x - (mousepos_x - panel_click_distance_x);
- mySize_y = panel_click_resizeorigin_y - (mousepos_y - panel_click_distance_y);
+ mySize_x = panel_click_resizeorigin.x - (mousepos.x - panel_click_distance.x);
+ mySize_y = panel_click_resizeorigin.y - (mousepos.y - panel_click_distance.y);
} else if(resizeCorner == 2) {
- mySize_x = mousepos_x + panel_click_distance_x - panel_click_resizeorigin_x;
- mySize_y = panel_click_distance_y + panel_click_resizeorigin_y - mousepos_y;
+ mySize_x = mousepos.x + panel_click_distance.x - panel_click_resizeorigin.x;
+ mySize_y = panel_click_distance.y + panel_click_resizeorigin.y - mousepos.y;
} else if(resizeCorner == 3) {
- mySize_x = panel_click_resizeorigin_x + panel_click_distance_x - mousepos_x;
- mySize_y = mousepos_y + panel_click_distance_y - panel_click_resizeorigin_y;
+ mySize_x = panel_click_resizeorigin.x + panel_click_distance.x - mousepos.x;
+ mySize_y = mousepos.y + panel_click_distance.y - panel_click_resizeorigin.y;
} else { // resizeCorner == 4
- mySize_x = mousepos_x - (panel_click_resizeorigin_x - panel_click_distance_x);
- mySize_y = mousepos_y - (panel_click_resizeorigin_y - panel_click_distance_y);
+ mySize_x = mousepos.x - (panel_click_resizeorigin.x - panel_click_distance.x);
+ mySize_y = mousepos.y - (panel_click_resizeorigin.y - panel_click_distance.y);
}
HUD_Panel_SetPosSize(mySize);
}
{
hud_configure_gridSize_x = bound(0.005, cvar("hud_configure_grid_xsize"), 0.2);
hud_configure_gridSize_y = bound(0.005, cvar("hud_configure_grid_ysize"), 0.2);
- hud_configure_realGridSize_x = hud_configure_gridSize_x * vid_conwidth;
- hud_configure_realGridSize_y = hud_configure_gridSize_y * vid_conheight;
+ hud_configure_realGridSize_x = hud_configure_gridSize.x * vid_conwidth;
+ hud_configure_realGridSize_y = hud_configure_gridSize.y * vid_conheight;
vector s;
// x-axis
s = eX + eY * vid_conheight;
- for(i = 1; i < 1/hud_configure_gridSize_x; ++i)
- drawfill(eX * i * hud_configure_realGridSize_x, s, '0.5 0.5 0.5', autocvar_hud_configure_grid_alpha, DRAWFLAG_NORMAL);
+ for(i = 1; i < 1/hud_configure_gridSize.x; ++i)
+ drawfill(eX * i * hud_configure_realGridSize.x, s, '0.5 0.5 0.5', autocvar_hud_configure_grid_alpha, DRAWFLAG_NORMAL);
// y-axis
s = eY + eX * vid_conwidth;
- for(i = 1; i < 1/hud_configure_gridSize_y; ++i)
- drawfill(eY * i * hud_configure_realGridSize_y, s, '0.5 0.5 0.5', autocvar_hud_configure_grid_alpha, DRAWFLAG_NORMAL);
+ for(i = 1; i < 1/hud_configure_gridSize.y; ++i)
+ drawfill(eY * i * hud_configure_realGridSize.y, s, '0.5 0.5 0.5', autocvar_hud_configure_grid_alpha, DRAWFLAG_NORMAL);
}
}
void HUD_Panel_HlBorder(float myBorder, vector color, float theAlpha)
{
drawfill(panel_pos - '1 1 0' * myBorder, panel_size + '2 2 0' * myBorder, '0 0.5 1', .5 * theAlpha, DRAWFLAG_NORMAL);
- drawpic_tiled(panel_pos - '1 1 0' * myBorder, hlBorder, '8 1 0' * hlBorderSize, eX * (panel_size_x + 2 * myBorder) + eY * hlBorderSize, color, theAlpha, DRAWFLAG_NORMAL);
- drawpic_tiled(panel_pos - '1 1 0' * myBorder + eY * (panel_size_y + 2 * myBorder - hlBorderSize), hlBorder, '8 1 0' * hlBorderSize, eX * (panel_size_x + 2 * myBorder) + eY * hlBorderSize, color, theAlpha, DRAWFLAG_NORMAL);
- drawpic_tiled(panel_pos - '1 1 0' * myBorder + eY * hlBorderSize, hlBorder2, '1 8 0' * hlBorderSize, eY * (panel_size_y + 2 * myBorder - 2 * hlBorderSize) + eX * hlBorderSize, color, theAlpha, DRAWFLAG_NORMAL);
- drawpic_tiled(panel_pos - '1 1 0' * myBorder + eY * hlBorderSize + eX * (panel_size_x + 2 * myBorder - hlBorderSize), hlBorder2, '1 8 0' * hlBorderSize, eY * (panel_size_y + 2 * myBorder - 2 * hlBorderSize) + eX * hlBorderSize, color, theAlpha, DRAWFLAG_NORMAL);
+ drawpic_tiled(panel_pos - '1 1 0' * myBorder, hlBorder, '8 1 0' * hlBorderSize, eX * (panel_size.x + 2 * myBorder) + eY * hlBorderSize, color, theAlpha, DRAWFLAG_NORMAL);
+ drawpic_tiled(panel_pos - '1 1 0' * myBorder + eY * (panel_size.y + 2 * myBorder - hlBorderSize), hlBorder, '8 1 0' * hlBorderSize, eX * (panel_size.x + 2 * myBorder) + eY * hlBorderSize, color, theAlpha, DRAWFLAG_NORMAL);
+ drawpic_tiled(panel_pos - '1 1 0' * myBorder + eY * hlBorderSize, hlBorder2, '1 8 0' * hlBorderSize, eY * (panel_size.y + 2 * myBorder - 2 * hlBorderSize) + eX * hlBorderSize, color, theAlpha, DRAWFLAG_NORMAL);
+ drawpic_tiled(panel_pos - '1 1 0' * myBorder + eY * hlBorderSize + eX * (panel_size.x + 2 * myBorder - hlBorderSize), hlBorder2, '1 8 0' * hlBorderSize, eY * (panel_size.y + 2 * myBorder - 2 * hlBorderSize) + eX * hlBorderSize, color, theAlpha, DRAWFLAG_NORMAL);
}
void HUD_Configure_PostDraw()
projects / xonotic / xonotic-data.pk3dir.git / blobdiff