From 538cd95882d07bfaa83c0829f0d32cafddd8289d Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 17 May 2018 19:09:33 -0400 Subject: [PATCH 1/3] Allow dogtags display to be repositioned --- addons/dogtags/CfgUIGrids.hpp | 20 ++++++++++++ addons/dogtags/{Dogtag.hpp => RscTitles.hpp} | 32 +++++++------------ addons/dogtags/config.cpp | 3 +- addons/dogtags/stringtable.xml | 3 ++ addons/dogtags/ui/igui_preview.paa | Bin 0 -> 37823 bytes 5 files changed, 37 insertions(+), 21 deletions(-) create mode 100644 addons/dogtags/CfgUIGrids.hpp rename addons/dogtags/{Dogtag.hpp => RscTitles.hpp} (59%) create mode 100644 addons/dogtags/ui/igui_preview.paa diff --git a/addons/dogtags/CfgUIGrids.hpp b/addons/dogtags/CfgUIGrids.hpp new file mode 100644 index 00000000000..ec403ab9bfa --- /dev/null +++ b/addons/dogtags/CfgUIGrids.hpp @@ -0,0 +1,20 @@ +class CfgUIGrids { + class IGUI { + class Presets { + class Arma3 { + class Variables { + grid_ACE_dogtags[] = {{"(safeZoneX + safeZoneW) - (12.9 * ((safeZoneW / safeZoneH) min 1.2) / 40)", "safeZoneY + 0.175 * safeZoneH", "8 * (((safeZoneW / safeZoneH) min 1.2) / 40)", "8 * ((((safeZoneW / safeZoneH) min 1.2) / 1.2) / 25)"}, "(((safeZoneW / safeZoneH) min 1.2) / 40)", "((((safeZoneW / safeZoneH) min 1.2) / 1.2) / 25)"}; + }; + }; + }; + class Variables { + class grid_ACE_dogtags { + displayName = COMPONENT_NAME; + description = CSTRING(IGUI_Description); + preview = QPATHTOF(ui\igui_preview.paa); + saveToProfile[] = {0, 1}; + canResize = 0; + }; + }; + }; +}; diff --git a/addons/dogtags/Dogtag.hpp b/addons/dogtags/RscTitles.hpp similarity index 59% rename from addons/dogtags/Dogtag.hpp rename to addons/dogtags/RscTitles.hpp index d783ec15b05..abd01f7eabe 100644 --- a/addons/dogtags/Dogtag.hpp +++ b/addons/dogtags/RscTitles.hpp @@ -6,23 +6,19 @@ class RscTitles { idd = -1; onLoad = QUOTE(uiNamespace setVariable [ARR_2(QQGVAR(tag),_this select 0)]); onUnload = QUOTE(uiNamespace setVariable [ARR_2(QQGVAR(tag),nil)]); - movingEnable = false; - duration = 5; fadeIn = 0.2; fadeOut = 0.2; - + duration = 5; + movingEnable = 0; class controls { class background: RscPicture { idc = 1000; - text = QUOTE(PATHTOF(data\dogtagSingle.paa)); - sizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)"; + x = "profileNamespace getVariable ['IGUI_grid_ACE_dogtags_X', (safeZoneX + safeZoneW) - (12.9 * ((safeZoneW / safeZoneH) min 1.2) / 40)]"; + y = "profileNamespace getVariable ['IGUI_grid_ACE_dogtags_Y', safeZoneY + 0.175 * safeZoneH]"; + w = "8 * (((safeZoneW / safeZoneH) min 1.2) / 40)"; + h = "8 * ((((safeZoneW / safeZoneH) min 1.2) / 1.2) / 25)"; + text = QPATHTOF(data\dogtagSingle.paa); colorText[] = {1, 1, 1, 1}; - colorBackground[] = {0, 0, 0, 0}; - x = ((safezoneX + safezoneW) - (10 * (((safezoneW / safezoneH) min 1.2) / 40)) - 2.9 * (((safezoneW / safezoneH) min 1.2) / 40)); - y = safeZoneY + 0.175 * safezoneH; - w = (8 * (((safezoneW / safezoneH) min 1.2) / 40)); - h = (8 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)); - font = "EtelkaMonospacePro"; }; class nickname: RscStructuredText { idc = 1001; @@ -30,10 +26,10 @@ class RscTitles { sizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)"; colorText[] = {1, 1, 1, 1}; colorBackground[] = {0, 0, 0, 0}; - x = ((safezoneX + safezoneW) - (8.4 * (((safezoneW / safezoneH) min 1.2) / 40)) - 2.9 * (((safezoneW / safezoneH) min 1.2) / 40)); - y = safeZoneY + 0.24 * safezoneH; - w = (5.9 * (((safezoneW / safezoneH) min 1.2) / 40)); - h = (3 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)); + x = "(1.6 * ((safeZoneW / safeZoneH) min 1.2) / 40) + (profileNamespace getVariable ['IGUI_grid_ACE_dogtags_X', (safeZoneX + safeZoneW) - (12.9 * ((safeZoneW / safeZoneH) min 1.2) / 40)])"; + y = "(0.065 * safeZoneH) + (profileNamespace getVariable ['IGUI_grid_ACE_dogtags_Y', safeZoneY + 0.175 * safeZoneH])"; + w = "5.9 * (((safeZoneW / safeZoneH) min 1.2) / 40)"; + h = "3 * ((((safeZoneW / safeZoneH) min 1.2) / 1.2) / 25)"; font = "RobotoCondensed"; class Attributes { font = "RobotoCondensed"; @@ -48,13 +44,9 @@ class RscTitles { }; }; class GVAR(doubleTag): GVAR(singleTag) { - idd = -1; - onLoad = QUOTE(uiNamespace setVariable [ARR_2(QQGVAR(tag),_this select 0)]); - onUnload = QUOTE(uiNamespace setVariable [ARR_2(QQGVAR(tag),nil)]); - class controls: controls { class background: background { - text = QUOTE(PATHTOF(data\dogtagDouble.paa)); + text = QPATHTOF(data\dogtagDouble.paa); }; class nickname: nickname { class Attributes: Attributes { diff --git a/addons/dogtags/config.cpp b/addons/dogtags/config.cpp index 183b59e67e4..dad0107953b 100644 --- a/addons/dogtags/config.cpp +++ b/addons/dogtags/config.cpp @@ -17,4 +17,5 @@ class CfgPatches { #include "CfgEventHandlers.hpp" #include "CfgWeapons.hpp" #include "CfgVehicles.hpp" -#include "Dogtag.hpp" +#include "RscTitles.hpp" +#include "CfgUIGrids.hpp" diff --git a/addons/dogtags/stringtable.xml b/addons/dogtags/stringtable.xml index 3b712bc9ebc..3c7e759c7c1 100644 --- a/addons/dogtags/stringtable.xml +++ b/addons/dogtags/stringtable.xml @@ -79,5 +79,8 @@ 已經有人把他的兵籍牌拿走了... 已经有人把他的兵籍牌拿走了... + + Onscreen display for checking dogtags + diff --git a/addons/dogtags/ui/igui_preview.paa b/addons/dogtags/ui/igui_preview.paa new file mode 100644 index 0000000000000000000000000000000000000000..8658bc2caab9e43d7cada1fd983f5d081a143b65 GIT binary patch literal 37823 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 Date: Fri, 18 May 2018 03:00:09 -0400 Subject: [PATCH 2/3] Update IGUI preview image --- addons/dogtags/ui/igui_preview.paa | Bin 37823 -> 37429 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/addons/dogtags/ui/igui_preview.paa b/addons/dogtags/ui/igui_preview.paa index 8658bc2caab9e43d7cada1fd983f5d081a143b65..2ea65eb1291b4b9607fc329e3256d9dfef3d9016 100644 GIT binary patch delta 9225 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 From 5702976f2868a8b854ce9bd6971771b159e64cf7 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 19 May 2018 01:27:48 -0400 Subject: [PATCH 3/3] Use common grid macros --- addons/dogtags/CfgUIGrids.hpp | 13 +++++++++++-- addons/dogtags/RscTitles.hpp | 18 +++++++++--------- addons/dogtags/script_component.hpp | 2 ++ 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/addons/dogtags/CfgUIGrids.hpp b/addons/dogtags/CfgUIGrids.hpp index ec403ab9bfa..f9216ac2ea7 100644 --- a/addons/dogtags/CfgUIGrids.hpp +++ b/addons/dogtags/CfgUIGrids.hpp @@ -3,12 +3,21 @@ class CfgUIGrids { class Presets { class Arma3 { class Variables { - grid_ACE_dogtags[] = {{"(safeZoneX + safeZoneW) - (12.9 * ((safeZoneW / safeZoneH) min 1.2) / 40)", "safeZoneY + 0.175 * safeZoneH", "8 * (((safeZoneW / safeZoneH) min 1.2) / 40)", "8 * ((((safeZoneW / safeZoneH) min 1.2) / 1.2) / 25)"}, "(((safeZoneW / safeZoneH) min 1.2) / 40)", "((((safeZoneW / safeZoneH) min 1.2) / 1.2) / 25)"}; + GVAR(grid)[] = { + { + (safeZoneX + safeZoneW) - 12.9 * GUI_GRID_W, + safeZoneY + 0.175 * safeZoneH, + 8 * GUI_GRID_W, + 8 * GUI_GRID_H + }, + GUI_GRID_W, + GUI_GRID_H + }; }; }; }; class Variables { - class grid_ACE_dogtags { + class GVAR(grid) { displayName = COMPONENT_NAME; description = CSTRING(IGUI_Description); preview = QPATHTOF(ui\igui_preview.paa); diff --git a/addons/dogtags/RscTitles.hpp b/addons/dogtags/RscTitles.hpp index abd01f7eabe..97549c856ef 100644 --- a/addons/dogtags/RscTitles.hpp +++ b/addons/dogtags/RscTitles.hpp @@ -13,23 +13,23 @@ class RscTitles { class controls { class background: RscPicture { idc = 1000; - x = "profileNamespace getVariable ['IGUI_grid_ACE_dogtags_X', (safeZoneX + safeZoneW) - (12.9 * ((safeZoneW / safeZoneH) min 1.2) / 40)]"; - y = "profileNamespace getVariable ['IGUI_grid_ACE_dogtags_Y', safeZoneY + 0.175 * safeZoneH]"; - w = "8 * (((safeZoneW / safeZoneH) min 1.2) / 40)"; - h = "8 * ((((safeZoneW / safeZoneH) min 1.2) / 1.2) / 25)"; + x = profileNamespace getVariable ['TRIPLES(IGUI,GVAR(grid),X)', (safeZoneX + safeZoneW) - 12.9 * GUI_GRID_W]; + y = profileNamespace getVariable ['TRIPLES(IGUI,GVAR(grid),Y)', safeZoneY + 0.175 * safeZoneH]; + w = 8 * GUI_GRID_W; + h = 8 * GUI_GRID_H; text = QPATHTOF(data\dogtagSingle.paa); colorText[] = {1, 1, 1, 1}; }; class nickname: RscStructuredText { idc = 1001; text = ""; - sizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)"; + sizeEx = GUI_GRID_H; colorText[] = {1, 1, 1, 1}; colorBackground[] = {0, 0, 0, 0}; - x = "(1.6 * ((safeZoneW / safeZoneH) min 1.2) / 40) + (profileNamespace getVariable ['IGUI_grid_ACE_dogtags_X', (safeZoneX + safeZoneW) - (12.9 * ((safeZoneW / safeZoneH) min 1.2) / 40)])"; - y = "(0.065 * safeZoneH) + (profileNamespace getVariable ['IGUI_grid_ACE_dogtags_Y', safeZoneY + 0.175 * safeZoneH])"; - w = "5.9 * (((safeZoneW / safeZoneH) min 1.2) / 40)"; - h = "3 * ((((safeZoneW / safeZoneH) min 1.2) / 1.2) / 25)"; + x = 1.6 * GUI_GRID_W + (profileNamespace getVariable ['TRIPLES(IGUI,GVAR(grid),X)', (safeZoneX + safeZoneW) - 12.9 * GUI_GRID_W]); + y = 0.065 * safeZoneH + (profileNamespace getVariable ['TRIPLES(IGUI,GVAR(grid),Y)', safeZoneY + 0.175 * safeZoneH]); + w = 5.9 * GUI_GRID_W; + h = 3 * GUI_GRID_H; font = "RobotoCondensed"; class Attributes { font = "RobotoCondensed"; diff --git a/addons/dogtags/script_component.hpp b/addons/dogtags/script_component.hpp index 0060f9579fb..67e70b9dd26 100644 --- a/addons/dogtags/script_component.hpp +++ b/addons/dogtags/script_component.hpp @@ -16,6 +16,8 @@ #include "\z\ace\addons\main\script_macros.hpp" +#include "\a3\ui_f\hpp\defineCommonGrids.inc" + #define DOGTAG_SHOW_DELAY 1 #define RUSTLING_SOUNDS [\