Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for building with HEMTT v1.0+ #1565

Merged
merged 25 commits into from
Aug 29, 2023
Merged

Add support for building with HEMTT v1.0+ #1565

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
e06658f
Hemmit Config Compat
PabstMirror Jan 15, 2023
57b87c4
fix
PabstMirror Jan 15, 2023
3d6a89c
Create fn_isdebugconsoleallowed.sqf
PabstMirror Jan 20, 2023
4213ffe
test
PabstMirror Jan 20, 2023
b972868
asc:exclude - use forward slashes
PabstMirror Jan 20, 2023
f10a937
undo assert changes
PabstMirror Jan 20, 2023
aab30f0
Merge branch 'master' into hemmit10test
jonpas May 16, 2023
12f0672
Adapt to HEMTT v1
jonpas May 16, 2023
d72d8ac
Set version in CfgMods.hpp and build in script_version.hpp in HEMTT hook
jonpas May 16, 2023
3bc46af
Add missing includes, Fix script_version build set, Update HEMTT config
jonpas May 16, 2023
e964c35
Reenable ASC
jonpas May 16, 2023
57622af
Fix LOG macros
jonpas May 16, 2023
d2a10fb
JR - Remove private/protected/public/Read defines
jonpas May 16, 2023
6736af6
Adapt flexiMenu to HEMTT v1
jonpas May 16, 2023
051812b
Set build to date in HEMTT hook
jonpas May 20, 2023
1cc0a4c
Merge branch 'master' into hemmit10test
jonpas Jun 26, 2023
88bce47
Fix multi-line config quote issues
jonpas Jun 26, 2023
5dff99b
Keep old hemtt.toml for backward compatibility
PabstMirror Jun 26, 2023
571e197
fix semi-colon usage after #include
PabstMirror Jul 27, 2023
0cb477b
Merge branch 'master' into hemmit10test
PabstMirror Jul 27, 2023
afbf9d8
hemtt 1.8 RC2 math update
PabstMirror Jul 30, 2023
aa21617
Merge branch 'master' into hemmit10test
PabstMirror Aug 17, 2023
7b3bb3f
Update test_position.sqf
PabstMirror Aug 17, 2023
3e2852b
Create settings.json
PabstMirror Aug 17, 2023
f52a33a
update includes for 2.12
PabstMirror Aug 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
release/*
releases/*
keys/*
.hemtt
hemtt
hemtt.exe
tools/hemtt*.tar.gz*
Expand Down
6 changes: 3 additions & 3 deletions addons/diagnostic/CfgDisplay3DEN.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ class Display3DEN {
class MenuStrip: ctrlMenuStrip {
class Items {
class DebugConsole {
shortcuts[] = {INPUT_CTRL_OFFSET + DIK_D};
shortcuts[] = {QUOTE(INPUT_CTRL_OFFSET + DIK_D)};
};
class FunctionsViewer {
shortcuts[] = {INPUT_ALT_OFFSET + DIK_F};
shortcuts[] = {QUOTE(INPUT_ALT_OFFSET + DIK_F)};
};
class ConfigViewer {
shortcuts[] = {INPUT_ALT_OFFSET + DIK_G};
shortcuts[] = {QUOTE(INPUT_ALT_OFFSET + DIK_G)};
};
};
};
Expand Down
2 changes: 1 addition & 1 deletion addons/diagnostic/CfgFunctions.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class CfgFunctions {
class A3 {
class Debug {
class isDebugConsoleAllowed {
file = PATHTOF(fnc_isDebugConsoleAllowed.sqf);
file = QPATHTOF(fnc_isDebugConsoleAllowed.sqf);
};
};
};
Expand Down
30 changes: 15 additions & 15 deletions addons/diagnostic/gui.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ class RscTitles {
onLoad = QUOTE(uiNamespace setVariable [ARR_2('GVAR(Error)',_this select 0)]);
idc = -1;
font = "RobotoCondensedBold";
sizeEx = 0.55 * GUI_GRID_CENTER_H;
x = 0 * GUI_GRID_CENTER_W + GUI_GRID_CENTER_X;
y = 5 * GUI_GRID_CENTER_H + GUI_GRID_CENTER_Y;
w = 40 * GUI_GRID_CENTER_W;
h = 10 * GUI_GRID_CENTER_H;
sizeEx = QUOTE(0.55 * GUI_GRID_CENTER_H);
x = QUOTE( 0 * GUI_GRID_CENTER_W + GUI_GRID_CENTER_X);
y = QUOTE( 5 * GUI_GRID_CENTER_H + GUI_GRID_CENTER_Y);
w = QUOTE(40 * GUI_GRID_CENTER_W);
h = QUOTE(10 * GUI_GRID_CENTER_H);
colorBackground[] = {1,0.2,0,0.8};
};
};
Expand All @@ -29,22 +29,22 @@ class GVAR(watchInput): RscEdit {
autocomplete = "scripting";
shadow = 0;
font = "EtelkaMonospacePro";
x = 0.5 * GUI_GRID_W;
y = 11 * GUI_GRID_H;
w = 21 * GUI_GRID_W;
h = 1 * GUI_GRID_H;
sizeEx = 0.7 * GUI_GRID_H;
x = QUOTE(0.5 * GUI_GRID_W);
y = QUOTE(11 * GUI_GRID_H);
w = QUOTE(21 * GUI_GRID_W);
h = QUOTE(1 * GUI_GRID_H);
sizeEx = QUOTE(0.7 * GUI_GRID_H);
};

class GVAR(watchOutput): RscEdit {
lineSpacing = 1;
style = ST_NO_RECT;
shadow = 0;
font = "EtelkaMonospacePro";
x = 0.5 * GUI_GRID_W;
y = 12 * GUI_GRID_H;
w = 21 * GUI_GRID_W;
h = 1 * GUI_GRID_H;
x = QUOTE(0.5 * GUI_GRID_W);
y = QUOTE(12 * GUI_GRID_H);
w = QUOTE(21 * GUI_GRID_W);
h = QUOTE(1 * GUI_GRID_H);
colorBackground[] = {0,0,0,0.75};
sizeEx = 0.7 * GUI_GRID_H;
sizeEx = QUOTE(0.7 * GUI_GRID_H);
};
14 changes: 7 additions & 7 deletions addons/jr/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#include "script_component.hpp"

#define private 0 // hidden
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was the only one used in one place, I removed those defines, should be fine?

#define protected 1 // hidden but usable
#define public 2 // visible
#define private 0
#define protected 1
#define public 2

#define ReadAndWrite 0 //! any modifications enabled
#define ReadAndCreate 1 //! only adding new class members is allowed
#define ReadOnly 2 //! no modifications enabled
#define ReadOnlyVerified 3 //! no modifications enabled, CRC test applied
#define ReadAndWrite 0
#define ReadAndCreate 1
#define ReadOnly 2
#define ReadOnlyVerified 3

class CfgPatches {
class ADDON {
Expand Down
134 changes: 67 additions & 67 deletions addons/keybinding/gui.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ class RscStructuredText;
class GVAR(key): RscControlsGroupNoScrollbars {
idc = -1;
enableDisplay = 0;
x = POS_W(0);
y = POS_H(0);
w = POS_W(37);
h = POS_H(1);
x = QUOTE(POS_W(0));
y = QUOTE(POS_H(0));
w = QUOTE(POS_W(37));
h = QUOTE(POS_H(1));

class controls {
class EditButton: RscButton {
Expand All @@ -28,10 +28,10 @@ class GVAR(key): RscControlsGroupNoScrollbars {
tooltipColorBox[] = {1,1,1,1};
tooltipColorShade[] = {0,0,0,0.7};
tooltipColorText[] = {1,1,1,1};
x = POS_W(0);
y = POS_H(0);
w = POS_W(17);
h = POS_H(1);
x = QUOTE(POS_W(0));
y = QUOTE(POS_H(0));
w = QUOTE(POS_W(17));
h = QUOTE(POS_H(1));
};

class AssignedKey: RscStructuredText {
Expand All @@ -40,46 +40,46 @@ class GVAR(key): RscControlsGroupNoScrollbars {
tooltipColorBox[] = {1,1,1,1};
tooltipColorShade[] = {0,0,0,0.7};
tooltipColorText[] = {1,1,1,1};
x = POS_W(17);
y = POS_H(0);
w = POS_W(20);
h = POS_H(1);
x = QUOTE(POS_W(17));
y = QUOTE(POS_H(0));
w = QUOTE(POS_W(20));
h = QUOTE(POS_H(1));
};
};
};

class GVAR(subCat): RscControlsGroupNoScrollbars {
x = POS_W(1);
y = POS_H(0);
w = POS_W(37);
h = POS_H(1);
x = QUOTE(POS_W(1));
y = QUOTE(POS_H(0));
w = QUOTE(POS_W(37));
h = QUOTE(POS_H(1));

class controls {
class Background: RscText {
colorBackground[] = {0.15,0.15,0.15,0.4};
x = POS_W(0);
y = POS_H(0);
w = POS_W(36);
h = POS_H(1);
x = QUOTE(POS_W(0));
y = QUOTE(POS_H(0));
w = QUOTE(POS_W(36));
h = QUOTE(POS_H(1));
};

class Name: RscText {
idc = IDC_SUBCATEGORY_NAME;
style = ST_LEFT;
SizeEx = POS_H(1);
x = POS_W(0);
y = POS_H(0);
w = POS_W(15.5);
h = POS_H(1);
SizeEx = QUOTE(POS_H(1));
x = QUOTE(POS_W(0));
y = QUOTE(POS_H(0));
w = QUOTE(POS_W(15.5));
h = QUOTE(POS_H(1));
};

class Bar: RscText {
colorBackground[] = {1,1,1,1};
style = ST_LEFT;
x = POS_W(0);
y = POS_H(1) - 2 * pixelH;
w = POS_W(36);
h = pixelH;
x = QUOTE(POS_W(0));
y = QUOTE(POS_H(1) - 2 * pixelH);
w = QUOTE(POS_W(36));
h = QUOTE(pixelH);
};
};
};
Expand All @@ -90,77 +90,77 @@ class RscDisplayConfigure {
onButtonClick = QUOTE(_this call (uiNamespace getVariable 'FUNC(gui_configure)'));
idc = IDC_BTN_CONFIGURE_ADDONS;
text = CSTRING(configureAddons);
x = POS_X(20.15);
y = POS_Y(23);
w = POS_W(12.5);
h = POS_H(1);
x = QUOTE(POS_X(20.15));
y = QUOTE(POS_Y(23));
w = QUOTE(POS_W(12.5));
h = QUOTE(POS_H(1));
};

class CBA_ButtonKeyboardFake: RscButtonMenu {
idc = IDC_BTN_KEYBOARD_FAKE;
text = "$STR_A3_RscDisplayConfigure_ButtonKeyboard";
x = POS_X(1);
y = POS_Y(2.1);
w = POS_W(8);
h = POS_H(1);
x = QUOTE(POS_X(1));
y = QUOTE(POS_Y(2.1));
w = QUOTE(POS_W(8));
h = QUOTE(POS_H(1));
};

class CBA_AddonsGroup: RscControlsGroupNoScrollbars {
idc = IDC_ADDONS_GROUP;
enableDisplay = 0;
x = POS_X(1);
y = POS_Y(3.1);
w = POS_W(38);
h = POS_H(19.6);
x = QUOTE(POS_X(1));
y = QUOTE(POS_Y(3.1));
w = QUOTE(POS_W(38));
h = QUOTE(POS_H(19.6));

class controls {
class Background: RscText {
colorBackground[] = {0, 0, 0, 0.4};
x = POS_W(0.5);
y = POS_H(3.5);
w = POS_W(37);
h = POS_H(15.8);
x = QUOTE(POS_W(0.5));
y = QUOTE(POS_H(3.5));
w = QUOTE(POS_W(37));
h = QUOTE(POS_H(15.8));
};
class AddonText: RscText {
style = ST_RIGHT;
text = ECSTRING(main,AddonText);
x = POS_W(0.5);
y = POS_H(1);
w = POS_W(4);
h = POS_H(1);
sizeEx = POS_H(1);
x = QUOTE(POS_W(0.5));
y = QUOTE(POS_H(1));
w = QUOTE(POS_W(4));
h = QUOTE(POS_H(1));
sizeEx = QUOTE(POS_H(1));
};
class AddonsList: RscCombo {
idc = IDC_ADDON_LIST;
x = POS_W(4.5);
y = POS_H(1);
w = POS_W(21);
h = POS_H(1);
wholeHeight = POS_H(12);
x = QUOTE(POS_W(4.5));
y = QUOTE(POS_H(1));
w = QUOTE(POS_W(21));
h = QUOTE(POS_H(1));
wholeHeight = QUOTE(POS_H(12));
};
class KeyList: RscControlsGroup {
idc = IDC_KEY_LIST;
x = POS_W(0.5);
y = POS_H(3.5);
w = POS_W(37);
h = POS_H(15.8);
x = QUOTE(POS_W(0.5));
y = QUOTE(POS_H(3.5));
w = QUOTE(POS_W(37));
h = QUOTE(POS_H(15.8));
};
class TextAction: RscText {
onLoad = "(_this select 0) ctrlSetText toUpper ctrlText (_this select 0)";
text = "$STR_A3_RscDisplayConfigure_TextAction";
x = POS_W(0.5);
y = POS_H(2.5);
w = POS_W(17);
h = POS_H(1);
x = QUOTE(POS_W(0.5));
y = QUOTE(POS_H(2.5));
w = QUOTE(POS_W(17));
h = QUOTE(POS_H(1));
colorBackground[] = {0, 0, 0, 1};
};
class TextAssignedKeys: RscText {
onLoad = "(_this select 0) ctrlSetText toUpper ctrlText (_this select 0)";
text = "$STR_A3_RscDisplayConfigure_TextAssignedKeys";
x = POS_W(17.5);
y = POS_H(2.5);
w = POS_W(20);
h = POS_H(1);
x = QUOTE(POS_W(17.5));
y = QUOTE(POS_H(2.5));
w = QUOTE(POS_W(20));
h = QUOTE(POS_H(1));
colorBackground[] = {0, 0, 0, 1};
};
};
Expand Down
34 changes: 17 additions & 17 deletions addons/optics/RscInGameUI.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,26 +39,26 @@ class RscInGameUI {
class ScopeBlack: RscPicture {
idc = IDC_BLACK_SCOPE;
text = QPATHTOF(reticles\scopeblack_ca.paa);
x = POS_X(2);
y = POS_Y(2);
w = POS_W(2);
h = POS_H(2);
x = QUOTE(POS_X(2));
y = QUOTE(POS_Y(2));
w = QUOTE(POS_W(2));
h = QUOTE(POS_H(2));
};

// These are just black side panels to cover the areas that the optics p3d doesn't cover.
// It will ONLY effect tripple head users, as (safeZoneX == safeZoneXAbs) for everyone else.
class TrippleHeadLeft: RscText {
idc = IDC_BLACK_LEFT;
x = safezoneXAbs;
y = safezoneY;
w = THIRD_SCREEN_WIDTH;
h = safezoneH;
x = QUOTE(safezoneXAbs);
y = QUOTE(safezoneY);
w = QUOTE(THIRD_SCREEN_WIDTH);
h = QUOTE(safezoneH);
colorBackground[] = {0,0,0,1};
};

class TrippleHeadRight: TrippleHeadLeft {
idc = IDC_BLACK_RIGHT;
x = safezoneXAbs + safezoneWAbs - THIRD_SCREEN_WIDTH;
x = QUOTE(safezoneXAbs + safezoneWAbs - THIRD_SCREEN_WIDTH);
};

class Magnification: CA_Zeroing {
Expand All @@ -79,18 +79,18 @@ class RscInGameUI {
class RedDot: RscPicture {
idc = IDC_RED_DOT;
text = "\a3\weapons_f\acc\data\collimdot_red_ca.paa"; // alt: green
x = POS_X(0.025);
y = POS_Y(0.025);
w = POS_W(0.025);
h = POS_H(0.025);
x = QUOTE(POS_X(0.025));
y = QUOTE(POS_Y(0.025));
w = QUOTE(POS_W(0.025));
h = QUOTE(POS_H(0.025));
};

class ReticleSafeZone: RscControlsGroupNoScrollbars {
idc = IDC_RETICLE_SAFEZONE;
x = RETICLE_SAFEZONE_DEFAULT_LEFT;
y = RETICLE_SAFEZONE_DEFAULT_TOP;
w = RETICLE_SAFEZONE_DEFAULT_WIDTH;
h = RETICLE_SAFEZONE_DEFAULT_HEIGHT;
x = QUOTE(RETICLE_SAFEZONE_DEFAULT_LEFT);
y = QUOTE(RETICLE_SAFEZONE_DEFAULT_TOP);
w = QUOTE(RETICLE_SAFEZONE_DEFAULT_WIDTH);
h = QUOTE(RETICLE_SAFEZONE_DEFAULT_HEIGHT);

class controls {
class Reticle: Reticle {};
Expand Down
2 changes: 1 addition & 1 deletion addons/settings/Display3DEN.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class Display3DEN {
text = CSTRING(3den_shortcut);
action = QUOTE(findDisplay 313 call FUNC(openSettingsMenu));
data = QUOTE(ADDON);
shortcuts[] = {INPUT_CTRL_OFFSET + INPUT_ALT_OFFSET + DIK_S};
shortcuts[] = {QUOTE(INPUT_CTRL_OFFSET + INPUT_ALT_OFFSET + DIK_S)};
};
};
};
Expand Down
Loading