Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tweak spectator interface layout

Browse Source 
- Swap the FOV and vision mode tools into a more logical order.
- Shorten the unit list to prevent overlay with main UI
- Fix name tool on dead units
This commit is contained in:
SilentSpike 2015-08-05 21:11:25 +01:00
parent 42b5abae11
commit c808021c7c
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addons/spectator/UI/interface.hpp
View File

@ -121,11 +121,11 @@ class GVAR(interface) {
idc = -1; idc = -1;
style = 64; style = 64;
}; };
class fovTool: viewTool { class visionTool: viewTool {
idc = IDC_TOOL_FOV; idc = IDC_TOOL_VISION;
x = TOOL_W * 3 + MARGIN * 2; x = TOOL_W * 3 + MARGIN * 2;
}; };
class fovFrame: fovTool { class visionFrame: visionTool {
idc = -1; idc = -1;
style = 64; style = 64;
}; };
@ -137,11 +137,11 @@ class GVAR(interface) {
idc = -1; idc = -1;
style = 64; style = 64;
}; };
class visionTool: viewTool { class fovTool: viewTool {
idc = IDC_TOOL_VISION; idc = IDC_TOOL_FOV;
x = safeZoneW - TOOL_W * 2 - MARGIN; x = safeZoneW - TOOL_W * 2 - MARGIN;
}; };
class visionFrame: visionTool { class fovFrame: fovTool {
idc = -1; idc = -1;
style = 64; style = 64;
}; };
@ -160,7 +160,7 @@ class GVAR(interface) {
x = safeZoneX; x = safeZoneX;
y = safeZoneY + TOOL_H * 2; y = safeZoneY + TOOL_H * 2;
w = TOOL_W * 2; w = TOOL_W * 2;
h = safeZoneH - TOOL_H * 4; h = safeZoneH - TOOL_H * 6;
sizeEx = H_PART(0.8); sizeEx = H_PART(0.8);
borderSize = 1; borderSize = 1;
colorBorder[] = {COL_FORE}; colorBorder[] = {COL_FORE};

12
addons/spectator/functions/fnc_handleToolbar.sqf
View File

@ -1,6 +1,6 @@
/* /*
* Author: Karel Moricky, SilentSpike * Author: Karel Moricky, SilentSpike
* Handles the spectator UI toolbar values and applies them to the camera * Handles the spectator UI toolbar values
* *
* Arguments: * Arguments:
* 0: Parameters <ANY> * 0: Parameters <ANY>
@ -31,15 +31,15 @@ if (GVAR(camMode) == 0) then {
_fov = format ["%1x", floor(GVAR(camZoom) * 100) * 0.01]; _fov = format ["%1x", floor(GVAR(camZoom) * 100) * 0.01];
_speed = format ["%1 m/s", floor(GVAR(camSpeed) * 100) * 0.01]; _speed = format ["%1 m/s", floor(GVAR(camSpeed) * 100) * 0.01];
} else { } else {
_vision = format ["%1 m", floor(getPosASL GVAR(camUnit) select 2)]; _vision = [side group GVAR(camUnit)] call BIS_fnc_sideName;
_fov = [side group GVAR(camUnit)] call BIS_fnc_sideName; _fov = format ["%1 m", floor(getPosASL GVAR(camUnit) select 2)];
_speed = format ["%1 km/h", floor(speed GVAR(camUnit)) max 0]; _speed = format ["%1 km/h", floor(speed GVAR(camUnit)) max 0];
}; };
if (isNull GVAR(camUnit)) then { if (alive GVAR(camUnit)) then {
_name = localize "STR_Special_None";
} else {
_name = GETVAR(GVAR(camUnit),GVAR(uName),""); _name = GETVAR(GVAR(camUnit),GVAR(uName),"");
} else {
_name = localize "STR_Special_None";
}; };
_mode = [localize LSTRING(ViewFree),localize LSTRING(ViewInternal),localize LSTRING(ViewExternal)] select GVAR(camMode); _mode = [localize LSTRING(ViewFree),localize LSTRING(ViewInternal),localize LSTRING(ViewExternal)] select GVAR(camMode);