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

Interface prettification

Browse Source
This commit is contained in:
SilentSpike 2015-07-18 13:12:34 +01:00
parent 359b81f2ef
commit c6e71fbc36
3 changed files with 26 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,6 @@ class GVAR(interface) {
y = safeZoneY; y = safeZoneY;
w = safeZoneWAbs; w = safeZoneWAbs;
h = safeZoneH; h = safeZoneH;
colorBackground[] = {0,0,0,0};
onMouseButtonDown = QUOTE([ARR_2('onMouseButtonDown',_this)] call FUNC(handleInterface)); onMouseButtonDown = QUOTE([ARR_2('onMouseButtonDown',_this)] call FUNC(handleInterface));
onMouseButtonUp = QUOTE([ARR_2('onMouseButtonUp',_this)] call FUNC(handleInterface)); onMouseButtonUp = QUOTE([ARR_2('onMouseButtonUp',_this)] call FUNC(handleInterface));
onMouseZChanged = QUOTE([ARR_2('onMouseZChanged',_this)] call FUNC(handleInterface)); onMouseZChanged = QUOTE([ARR_2('onMouseZChanged',_this)] call FUNC(handleInterface));
@ -31,21 +30,21 @@ class GVAR(interface) {
class controls { class controls {
class compass: RscControlsGroupNoScrollbars { class compass: RscControlsGroupNoScrollbars {
idc = IDC_COMP; idc = IDC_COMP;
x = safeZoneX; x = COMPASS_X;
y = safeZoneY; y = safeZoneY;
w = safeZoneW; w = COMPASS_W;
h = TOOL_H; h = TOOL_H;
class controls { class controls {
class compassBack: RscText { class compassBack: RscText {
x = COMPASS_X; x = 0;
y = 0; y = 0;
w = COMPASS_W; w = COMPASS_W;
h = TOOL_H; h = TOOL_H;
colorBackground[] = {0.1,0.1,0.1,1}; colorBackground[] = {COL_BACK};
}; };
class compass0_90: RscPicture { class compass0_90: RscPicture {
idc = IDC_COMP_0; idc = IDC_COMP_0;
x = COMPASS_X + COMPASS_W * 0.5; x = COMPASS_W * 0.5;
y = 0; y = 0;
w = COMPASS_W * 0.5; w = COMPASS_W * 0.5;
h = TOOL_H; h = TOOL_H;
@ -53,37 +52,30 @@ class GVAR(interface) {
}; };
class compass90_180: compass0_90 { class compass90_180: compass0_90 {
idc = IDC_COMP_90; idc = IDC_COMP_90;
x = COMPASS_X + COMPASS_W; x = COMPASS_W;
text = "A3\ui_f_curator\data\cfgIngameUI\compass\texture270_ca.paa"; text = "A3\ui_f_curator\data\cfgIngameUI\compass\texture270_ca.paa";
}; };
class compass180_270: compass0_90 { class compass180_270: compass0_90 {
idc = IDC_COMP_180; idc = IDC_COMP_180;
x = COMPASS_X + COMPASS_W * 1.5; x = COMPASS_W * 1.5;
text = "A3\ui_f_curator\data\cfgIngameUI\compass\texture0_ca.paa"; text = "A3\ui_f_curator\data\cfgIngameUI\compass\texture0_ca.paa";
}; };
class compass270_0: compass0_90 { class compass270_0: compass0_90 {
idc = IDC_COMP_270; idc = IDC_COMP_270;
x = COMPASS_X + COMPASS_W * 2; x = COMPASS_W * 2;
text = "A3\ui_f_curator\data\cfgIngameUI\compass\texture90_ca.paa"; text = "A3\ui_f_curator\data\cfgIngameUI\compass\texture90_ca.paa";
}; };
class compassCaret: RscFrame { class compassCaret: RscFrame {
x = COMPASS_X + COMPASS_W * 0.5; x = COMPASS_W * 0.5;
y = 0; y = 0;
w = 0; w = 0;
h = TOOL_H; h = TOOL_H;
colorText[] = {1,0,0,1}; colorText[] = {COL_FORE};
};
class compassLeftBlock: compassBack {
x = 0;
w = (safeZoneW - COMPASS_W) * 0.5;
};
class compassRightBlock: compassLeftBlock {
x = COMPASS_X + COMPASS_W;
}; };
class compassFrame: compassBack { class compassFrame: compassBack {
style = 64; style = 64;
shadow=2; shadow=2;
colorText[] = {1,1,1,1}; colorText[] = {COL_FORE};
}; };
}; };
}; };
@ -94,8 +86,8 @@ class GVAR(interface) {
w = TOOL_W * 2; w = TOOL_W * 2;
h = TOOL_H; h = TOOL_H;
shadow = 2; shadow = 2;
colorText[]={1,1,1,1}; colorText[]={COL_FORE};
colorBackground[] = {0.1,0.1,0.1,1}; colorBackground[] = {COL_BACK};
sizeEx = H_PART(1); sizeEx = H_PART(1);
}; };
class nameFrame: nameTool { class nameFrame: nameTool {
@ -158,8 +150,8 @@ class GVAR(interface) {
h = safeZoneH - TOOL_H * 5; h = safeZoneH - TOOL_H * 5;
sizeEx = H_PART(0.8); sizeEx = H_PART(0.8);
borderSize = 1; borderSize = 1;
colorBorder[] = {1,1,1,1}; colorBorder[] = {COL_FORE};
colorBackground[] = {0.1,0.1,0.1,0.8}; colorBackground[] = {COL_BACK};
colorSelect[] = { colorSelect[] = {
"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.3843])", "(profilenamespace getvariable ['GUI_BCG_RGB_R',0.3843])",
"(profilenamespace getvariable ['GUI_BCG_RGB_G',0.7019])", "(profilenamespace getvariable ['GUI_BCG_RGB_G',0.7019])",
@ -199,11 +191,11 @@ class GVAR(interface) {
y = 0; y = 0;
w = W_PART(24); w = W_PART(24);
h = H_PART(24); h = H_PART(24);
colorBackground[] = {0.1,0.1,0.1,1}; colorBackground[] = {COL_BACK};
}; };
class helpTitle: helpBack { class helpTitle: helpBack {
h = H_PART(1); h = H_PART(1);
colorText[]={1,1,1,1}; colorText[]={COL_FORE};
colorBackground[] = { colorBackground[] = {
"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.3843])", "(profilenamespace getvariable ['GUI_BCG_RGB_R',0.3843])",
"(profilenamespace getvariable ['GUI_BCG_RGB_G',0.7019])", "(profilenamespace getvariable ['GUI_BCG_RGB_G',0.7019])",
@ -213,27 +205,6 @@ class GVAR(interface) {
sizeEx = H_PART(1); sizeEx = H_PART(1);
text = CSTRING(HelpTitle); text = CSTRING(HelpTitle);
}; };
class helpColumnLeft: RscStructuredText {
idc = 5002;
x = 0;
y = H_PART(1);
w = W_PART(6);
h = H_PART(23);
size = H_PART(0.8);
colorBackground[] = {0,0,0,0};
};
class helpColumnCentreL: helpColumnLeft {
idc = 5003;
x = 0 + W_PART(6);
};
class helpColumnCentreR: helpColumnLeft {
idc = 5004;
x = 0 + W_PART(12);
};
class helpColumnRight: helpColumnLeft {
idc = 5005;
x = 0 + W_PART(18);
};
}; };
}; };
}; };

3
addons/spectator/functions/fnc_handleInterface.sqf
View File

@ -34,9 +34,6 @@ switch (toLower _mode) do {
if (isNil QGVAR(camPos)) then { GVAR(camPos) = getPos cameraOn; }; if (isNil QGVAR(camPos)) then { GVAR(camPos) = getPos cameraOn; };
if (isNil QGVAR(camUnit)) then { GVAR(camUnit) = objNull; }; if (isNil QGVAR(camUnit)) then { GVAR(camUnit) = objNull; };
if (isNil QGVAR(savedSpots)) then { GVAR(savedSpots) = []; };
if (isNil QGVAR(savedUnits)) then { GVAR(savedUnits) = []; };
// Initalize camera variables // Initalize camera variables
GVAR(camBank) = 0; GVAR(camBank) = 0;
GVAR(camBoom) = [false,false]; GVAR(camBoom) = [false,false];

14
addons/spectator/script_component.hpp
View File

@ -11,7 +11,7 @@
#include "\z\ace\addons\main\script_macros.hpp" #include "\z\ace\addons\main\script_macros.hpp"
// Interface grid // UI grid
#define SIZEX ((safezoneW / safezoneH) min 1.2) #define SIZEX ((safezoneW / safezoneH) min 1.2)
#define SIZEY (SIZEX / 1.2) #define SIZEY (SIZEX / 1.2)
#define W_PART(num) (num * (SIZEX / 40)) #define W_PART(num) (num * (SIZEX / 40))
@ -19,16 +19,16 @@
#define X_PART(num) (W_PART(num) + (safezoneX + (safezoneW - SIZEX)/2)) #define X_PART(num) (W_PART(num) + (safezoneX + (safezoneW - SIZEX)/2))
#define Y_PART(num) (H_PART(num) + (safezoneY + (safezoneH - SIZEY)/2)) #define Y_PART(num) (H_PART(num) + (safezoneY + (safezoneH - SIZEY)/2))
// Interface tools // UI tools
#define TOOL_H H_PART(1) #define TOOL_H H_PART(1)
#define TOOL_W W_PART(5) #define TOOL_W W_PART(5)
#define MARGIN TOOL_W * 0.05 #define MARGIN TOOL_W * 0.05
// Interface compass // UI compass
#define COMPASS_W (TOOL_W * 4) #define COMPASS_W (TOOL_W * 4)
#define COMPASS_X (safeZoneW * 0.5 - (COMPASS_W * 0.5)) #define COMPASS_X (safeZoneX + safeZoneW * 0.5 - COMPASS_W * 0.5)
// IDCs // UI IDCs
#define IDC_COMP 4490 #define IDC_COMP 4490
#define IDC_COMP_0 5000 #define IDC_COMP_0 5000
#define IDC_COMP_90 5090 #define IDC_COMP_90 5090
@ -48,3 +48,7 @@
#define IDC_UNIT 6002 #define IDC_UNIT 6002
#define IDC_UNIT_TREE 6187 #define IDC_UNIT_TREE 6187
// UI colours
#define COL_BACK 0.1,0.1,0.1,0.8
#define COL_FORE 1,1,1,1