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

Using control groups

Browse Source
This commit is contained in:
SilentSpike 2015-07-16 19:47:55 +01:00
parent 723a0f96f6
commit a7a87c40f0
3 changed files with 121 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,16 +14,6 @@ class GVAR(overlay) {
onKeyDown = QUOTE([ARR_2('onKeyDown',_this)] call FUNC(handleInterface)); onKeyDown = QUOTE([ARR_2('onKeyDown',_this)] call FUNC(handleInterface));
onKeyUp = QUOTE([ARR_2('onKeyUp',_this)] call FUNC(handleInterface)); onKeyUp = QUOTE([ARR_2('onKeyUp',_this)] call FUNC(handleInterface));
class controlsBackground { class controlsBackground {
class crosshair: RscPicture {
idc = 52;
x = 0.5 - W_PART(2);
y = 0.5 - H_PART(2);
w = W_PART(4);
h = H_PART(4);
text = "\A3\ui_f\data\IGUI\Cfg\Cursors\select_target_ca.paa";
fixedWidth = 0;
shadow = 0;
};
class mouseHandler: RscControlsGroup { class mouseHandler: RscControlsGroup {
x = safeZoneXAbs; x = safeZoneXAbs;
y = safeZoneY; y = safeZoneY;
@ -37,56 +27,63 @@ class GVAR(overlay) {
}; };
}; };
class controls { class controls {
class compassBack: RscText { class compass: RscControlsGroup {
idc = -1; idc = IDC_TOOL;
x = COMPASS_X; x = safeZoneX;
y = safeZoneY; y = safeZoneY;
w = safeZoneW;
h = H_PART(1);
class controls {
class compassBack: RscText {
x = COMPASS_X;
y = 0;
w = COMPASS_W; w = COMPASS_W;
h = TOOL_H; h = TOOL_H;
colorBackground[] = {0.1,0.1,0.1,1}; colorBackground[] = {0.1,0.1,0.1,1};
}; };
class compass0_90: RscPicture { class compass0_90: RscPicture {
idc = 90; idc = IDC_COMP_0;
x = 0.5; x = COMPASS_X + COMPASS_W * 0.5;
y = safeZoneY; y = 0;
w = COMPASS_W * 0.5; w = COMPASS_W * 0.5;
h = TOOL_H; h = TOOL_H;
text = "A3\ui_f_curator\data\cfgIngameUI\compass\texture180_ca.paa"; text = "A3\ui_f_curator\data\cfgIngameUI\compass\texture180_ca.paa";
}; };
class compass90_180: compass0_90 { class compass90_180: compass0_90 {
idc = 180; idc = IDC_COMP_90;
x = 0.5 + COMPASS_W * 0.5; x = COMPASS_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 = 270; idc = IDC_COMP_180;
x = 0.5 + COMPASS_W; x = COMPASS_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 = 360; idc = IDC_COMP_270;
x = 0.5 + COMPASS_W * 1.5; x = COMPASS_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 compassPin: compassBack { class compassPin: compassBack {
x = 0.5 - COMPASS_W / 360; x = COMPASS_X + COMPASS_W * 0.5 - COMPASS_W / 360;
w = COMPASS_W / 180; w = COMPASS_W / 180;
colorBackground[]={1,0,0,1}; colorBackground[]={1,0,0,1};
}; };
class compassLeftBlock: compassPin { class compassLeftBlock: compassPin {
x = safeZoneXAbs; x = 0;
w = COMPASS_X - safeZoneXAbs; w = (safeZoneW - COMPASS_W) * 0.5;
colorBackground[] = {0.1,0.1,0.1,1}; colorBackground[] = {0.1,0.1,0.1,1};
}; };
class compassRightBlock: compassLeftBlock { class compassRightBlock: compassLeftBlock {
x = 0.5 + COMPASS_W * 0.5; x = COMPASS_X + COMPASS_W;
w = safeZoneWAbs * 0.5 - COMPASS_W * 0.5;
}; };
class compassFrame: compassBack { class compassFrame: compassBack {
style = 64; style = 64;
shadow=2; shadow=2;
colorText[]={1,1,1,1}; colorText[]={1,1,1,1};
}; };
};
};
class nameTool: RscText { class nameTool: RscText {
idc = IDC_NAME; idc = IDC_NAME;
x = safeZoneX; x = safeZoneX;
@ -96,7 +93,7 @@ class GVAR(overlay) {
shadow = 2; shadow = 2;
colorText[]={1,1,1,1}; colorText[]={1,1,1,1};
colorBackground[] = {0.1,0.1,0.1,1}; colorBackground[] = {0.1,0.1,0.1,1};
sizeEx = TOOL_H; sizeEx = H_PART(1);
}; };
class nameFrame: nameTool { class nameFrame: nameTool {
idc = -1; idc = -1;
@ -129,7 +126,7 @@ class GVAR(overlay) {
}; };
class fovTool: viewTool { class fovTool: viewTool {
idc = IDC_FOV; idc = IDC_FOV;
x = safezoneX + safezoneW - TOOL_W * 2 - MARGIN; x = safeZoneX + safeZoneW - TOOL_W * 2 - MARGIN;
}; };
class fovFrame: fovTool { class fovFrame: fovTool {
idc = -1; idc = -1;
@ -159,7 +156,7 @@ class GVAR(overlay) {
1 1
}; };
multiselectEnabled = 0; multiselectEnabled = 0;
maxHistoryDelay = 1; maxHistoryDelay = 0;
onTreeDblClick = QUOTE([ARR_2('onTreeDblClick',_this)] call FUNC(handleInterface)); onTreeDblClick = QUOTE([ARR_2('onTreeDblClick',_this)] call FUNC(handleInterface));
}; };
class spectatorMap: RscMapControl { class spectatorMap: RscMapControl {
@ -169,16 +166,21 @@ class GVAR(overlay) {
w = safeZoneW; w = safeZoneW;
h = safeZoneH; h = safeZoneH;
}; };
class helpBackground: RscText { class helpBox: RscControlsGroup {
idc = 5000; idc = IDC_HELP;
x = 0.5 - W_PART(12); x = 0.5 - W_PART(12);
y = 0.5 - H_PART(12); y = 0.5 - H_PART(12);
w = W_PART(24); w = W_PART(24);
h = H_PART(24); h = H_PART(24);
class controls {
class helpBack: RscText {
x = 0;
y = 0;
w = W_PART(24);
h = H_PART(24);
colorBackground[] = {0.1,0.1,0.1,1}; colorBackground[] = {0.1,0.1,0.1,1};
}; };
class helpTitle: helpBackground { class helpTitle: helpBack {
idc = 5001;
h = H_PART(1); h = H_PART(1);
colorText[]={1,1,1,1}; colorText[]={1,1,1,1};
colorBackground[] = { colorBackground[] = {
@ -187,30 +189,31 @@ class GVAR(overlay) {
"(profilenamespace getvariable ['GUI_BCG_RGB_B',0.8862])", "(profilenamespace getvariable ['GUI_BCG_RGB_B',0.8862])",
1 1
}; };
sizeEx = H_PART(1); sizeEx = H_PART(1.2);
text = CSTRING(HelpTitle); text = CSTRING(HelpTitle);
}; };
class helpColumnLeft: RscStructuredText { class helpColumnLeft: RscStructuredText {
idc = 5002; idc = 5002;
x = 0.5 - W_PART(12); x = 0;
y = 0.5 - H_PART(11); y = H_PART(1);
w = W_PART(6); w = W_PART(6);
h = H_PART(23); h = H_PART(23);
text = ""; size = H_PART(0.8);
size = H_PART(1);
colorBackground[] = {0,0,0,0}; colorBackground[] = {0,0,0,0};
}; };
class helpColumnCentreL: helpColumnLeft { class helpColumnCentreL: helpColumnLeft {
idc = 5003; idc = 5003;
x = 0.5 - W_PART(6); x = 0 + W_PART(6);
}; };
class helpColumnCentreR: helpColumnLeft { class helpColumnCentreR: helpColumnLeft {
idc = 5004; idc = 5004;
x = 0.5; x = 0 + W_PART(12);
}; };
class helpColumnRight: helpColumnLeft { class helpColumnRight: helpColumnLeft {
idc = 5005; idc = 5005;
x = 0.5 + W_PART(6); x = 0 + W_PART(18);
};
};
}; };
}; };
}; };

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

@ -286,7 +286,7 @@ switch (toLower _mode) do {
// Only update camera mode when in free cam // Only update camera mode when in free cam
if (GVAR(camMode) == 0) then { if (GVAR(camMode) == 0) then {
_newMode = = 1; _newMode = 1;
} else { } else {
// When unit is reselected, toggle camera mode // When unit is reselected, toggle camera mode
if (_newUnit == GVAR(camUnit)) then { if (_newUnit == GVAR(camUnit)) then {

28
addons/spectator/script_component.hpp
View File

@ -26,14 +26,24 @@
// Interface compass // Interface compass
#define COMPASS_W (TOOL_W * 4) #define COMPASS_W (TOOL_W * 4)
#define COMPASS_X (0.5 - (COMPASS_W * 0.5)) #define COMPASS_X (safeZoneW * 0.5 - (COMPASS_W * 0.5))
// IDCs // IDCs
#define IDC_CLOCK 3002 #define IDC_TOOL 3670
#define IDC_FOCUS 3003 #define IDC_COMP 4490
#define IDC_FOV 3004 #define IDC_TREE 6187
#define IDC_NAME 3000 #define IDC_MAP 6791
#define IDC_MAP 60187 #define IDC_HELP 7631
#define IDC_TREE 60791
#define IDC_SPEED 3005 #define IDC_TOOL_CLOCK 3002
#define IDC_VIEW 3001 #define IDC_TOOL_FOCUS 3003
#define IDC_TOOL_FOV 3004
#define IDC_TOOL_NAME 3000
#define IDC_TOOL_SPEED 3005
#define IDC_TOOL_VIEW 3001
#define IDC_COMP_0 5000
#define IDC_COMP_90 5090
#define IDC_COMP_180 5180
#define IDC_COMP_270 5270