Merge pull request #1491 from CBATeam/makeSQFCandIncludes

Tools - Make SQFC, update /include
CBATeam · Sep 18, 2021 · efc5ddd · efc5ddd
2 parents 673e4b1 + 7a6e636
commit efc5ddd
Show file tree

Hide file tree

Showing 6 changed files with 269 additions and 92 deletions.
diff --git a/include/a3/ui_f/hpp/defineCommonColors.inc b/include/a3/ui_f/hpp/defineCommonColors.inc
@@ -98,6 +98,14 @@
 #define IGUI_ERROR_RGB			IGUI_ERROR_RGB_R,	IGUI_ERROR_RGB_G,	IGUI_ERROR_RGB_B
 #define IGUI_ERROR_COLOR		{IGUI_ERROR_RGB,IGUI_ERROR_RGB_A}
 
+//--- IGUI Tactical ping color
+#define IGUI_TACTPING_RGB_R		"(profilenamespace getvariable ['IGUI_TACTPING_RGB_R',1.0])"
+#define IGUI_TACTPING_RGB_G		"(profilenamespace getvariable ['IGUI_TACTPING_RGB_G',0.8])"
+#define IGUI_TACTPING_RGB_B		"(profilenamespace getvariable ['IGUI_TACTPING_RGB_B',0.2])"
+#define IGUI_TACTPING_RGB_A		"(profilenamespace getvariable ['IGUI_TACTPING_RGB_A',1.0])"
+#define IGUI_TACTPING_RGB		IGUI_TACTPING_RGB_R,	IGUI_TACTPING_RGB_G,	IGUI_TACTPING_RGB_B
+#define IGUI_TACTPING_COLOR		{IGUI_TACTPING_RGB,IGUI_TACTPING_RGB_A}
+
 //--- HUD Text color (obsolete defines; ToDo: Replace with IGUI_TEXT_COLOR and IGUI_BCG_COLOR)
 #define CA_UI_HUD			IGUI_TEXT_COLOR
 
@@ -213,7 +221,6 @@
 #define COLOR_TASK_ICON_CUSTOM_A		0.5
 #define COLOR_TASK_ICON_CUSTOM_RGBA		COLOR_TASK_ICON_CUSTOM_RGB,COLOR_TASK_ICON_CUSTOM_A
 
-
 #define COLOR_TASK_BACKGROUND_UNASSIGNED_RGB		1,1,1
 #define COLOR_TASK_BACKGROUND_UNASSIGNED_A		1
 #define COLOR_TASK_BACKGROUND_UNASSIGNED_RGBA		COLOR_TASK_BACKGROUND_UNASSIGNED_RGB,COLOR_TASK_BACKGROUND_UNASSIGNED_A

diff --git a/include/a3/ui_f/hpp/defineCommonGrids.inc b/include/a3/ui_f/hpp/defineCommonGrids.inc
@@ -232,6 +232,23 @@
 #define IGUI_GRID_MISSION_W		GUI_GRID_W
 #define IGUI_GRID_MISSION_H		GUI_GRID_H
 
+//--- IGUI Custom Info
+#define IGUI_GRID_CUSTOMINFO_WDef		(10 * GUI_GRID_W)
+#define IGUI_GRID_CUSTOMINFO_HDef		(10 * GUI_GRID_H)
+#define IGUI_GRID_CUSTOMINFOLEFT_XDef	(safezoneX + 0.5 * GUI_GRID_W)
+#define IGUI_GRID_CUSTOMINFOLEFT_YDef	(safezoneY + safezoneH - 21 * GUI_GRID_H)
+#define IGUI_GRID_CUSTOMINFORIGHT_XDef	((safezoneX + safezoneW) - (IGUI_GRID_CUSTOMINFO_WDef + 0.5 * GUI_GRID_W))
+#define IGUI_GRID_CUSTOMINFORIGHT_YDef	(safezoneY + safezoneH - 21 * GUI_GRID_H)
+
+#define IGUI_GRID_CUSTOMINFOLEFT_X		(profilenamespace getvariable ["IGUI_GRID_CUSTOMINFOLEFT_X",IGUI_GRID_CUSTOMINFOLEFT_XDef])
+#define IGUI_GRID_CUSTOMINFOLEFT_Y		(profilenamespace getvariable ["IGUI_GRID_CUSTOMINFOLEFT_Y",IGUI_GRID_CUSTOMINFOLEFT_YDef])
+#define IGUI_GRID_CUSTOMINFORIGHT_X		(profilenamespace getvariable ["IGUI_GRID_CUSTOMINFORIGHT_X",IGUI_GRID_CUSTOMINFORIGHT_XDef])
+#define IGUI_GRID_CUSTOMINFORIGHT_Y		(profilenamespace getvariable ["IGUI_GRID_CUSTOMINFORIGHT_Y",IGUI_GRID_CUSTOMINFORIGHT_YDef])
+#define IGUI_GRID_CUSTOMINFO_WAbs		(profilenamespace getvariable ["IGUI_GRID_CUSTOMINFORIGHT_W",IGUI_GRID_CUSTOMINFO_WDef])
+#define IGUI_GRID_CUSTOMINFO_HAbs		(profilenamespace getvariable ["IGUI_GRID_CUSTOMINFORIGHT_H",IGUI_GRID_CUSTOMINFO_HDef])
+#define IGUI_GRID_CUSTOMINFO_INNER_WAbs IGUI_GRID_CUSTOMINFO_WAbs - 0.25 * GUI_GRID_W
+#define IGUI_GRID_CUSTOMINFO_INNER_HAbs IGUI_GRID_CUSTOMINFO_HAbs - 1.25 * GUI_GRID_H
+
 
 ///////////////////////////////////////////////////////////////////////////
 /// Old
@@ -360,9 +377,23 @@
 // #define IGUI_GRID_SQUADRADAR_YDef	(safezoneY + safezoneH - 10.9 * GUI_GRID_H)
 // #define IGUI_GRID_SQUADRADAR_X		(profilenamespace getvariable ['IGUI_GRID_SQUADRADAR_X',IGUI_GRID_SQUADRADAR_XDef])
 // #define IGUI_GRID_SQUADRADAR_Y		(profilenamespace getvariable ['IGUI_GRID_SQUADRADAR_Y',IGUI_GRID_SQUADRADAR_YDef])
-// #define IGUI_GRID_SQUADRADAR_WAbs	(19 * GUI_GRID_W)
+// #define IGUI_GRID_SQUADRADAR_WAbs	(6 * GUI_GRID_W)
 // #define IGUI_GRID_SQUADRADAR_HAbs	(6 * GUI_GRID_H)
 
+// #define IGUI_GRID_SQUADRADAR_LIST1_XDef	(IGUI_GRID_SQUADRADAR_XDef + IGUI_GRID_SQUADRADAR_WAbs)
+// #define IGUI_GRID_SQUADRADAR_LIST1_YDef	(IGUI_GRID_SQUADRADAR_YDef)
+// #define IGUI_GRID_SQUADRADAR_LIST1_X		(profilenamespace getvariable ['IGUI_GRID_SQUADRADAR_LIST1_X',IGUI_GRID_SQUADRADAR_LIST1_XDef])
+// #define IGUI_GRID_SQUADRADAR_LIST1_Y		(profilenamespace getvariable ['IGUI_GRID_SQUADRADAR_LIST1_Y',IGUI_GRID_SQUADRADAR_LIST1_YDef])
+// #define IGUI_GRID_SQUADRADAR_LIST1_WAbs	(6 * GUI_GRID_W)
+// #define IGUI_GRID_SQUADRADAR_LIST1_HAbs	(6 * GUI_GRID_H)
+
+// #define IGUI_GRID_SQUADRADAR_LIST2_XDef	(IGUI_GRID_SQUADRADAR_LIST1_XDef + IGUI_GRID_SQUADRADAR_LIST1_WAbs)
+// #define IGUI_GRID_SQUADRADAR_LIST2_YDef	(IGUI_GRID_SQUADRADAR_LIST1_YDef)
+// #define IGUI_GRID_SQUADRADAR_LIST2_X		(profilenamespace getvariable ['IGUI_GRID_SQUADRADAR_LIST2_X',IGUI_GRID_SQUADRADAR_LIST2_XDef])
+// #define IGUI_GRID_SQUADRADAR_LIST2_Y		(profilenamespace getvariable ['IGUI_GRID_SQUADRADAR_LIST2_Y',IGUI_GRID_SQUADRADAR_LIST2_YDef])
+// #define IGUI_GRID_SQUADRADAR_LIST2_WAbs	(6 * GUI_GRID_W)
+// #define IGUI_GRID_SQUADRADAR_LIST2_HAbs	(6 * GUI_GRID_H)
+
 //--- IGUI Action / Command Menu
 #define IGUI_GRID_OLD_MENU_WAbs		(4.5 * IGUI_GRID_OLD_W)
 #define IGUI_GRID_OLD_MENU_HAbs		(10 * (IGUI_TEXT_SIZE_MEDIUM * 1.3))

diff --git a/include/a3/ui_f/hpp/defineDIKCodes.inc b/include/a3/ui_f/hpp/defineDIKCodes.inc
@@ -186,4 +186,5 @@
 #define INPUT_ALT_OFFSET	2048
 
 
-#endif
+#endif /* DIK_ESCAPE */
+