Tagging - Use custom ace object type (#11170)

Author: PabstMirror

addons/tagging/CfgVehicles.hpp

@@ -1,4 +1,8 @@
 class CfgVehicles {
+    class UserTexture1m_F;
+    class GVAR(texture1m): UserTexture1m_F {
+        scope = 1;
+    };
     class ACE_Module;
     class ACE_ModuleTagging: ACE_Module {
         author = ECSTRING(common,ACETeam);

addons/tagging/functions/fnc_addCustomTag.sqf

@@ -10,7 +10,7 @@
  * 3: Textures Paths <ARRAY>
  * 4: Icon Path <STRING> (default: "")
  * 5: Material Paths <ARRAY> (default: [])
- * 6: Tag Model <STRING> (default: "UserTexture1m_F")
+ * 6: Tag Model <STRING> (default: "ace_tagging_texture1m")
  * 7: Condition for the spraytag <CODE> (default: {true})
  *
  * Return Value:
@@ -29,7 +29,7 @@ params [
     ["_textures", [], [[]]],
     ["_icon", "", [""]],
     ["_materials", [], [[]]],
-    ["_tagModel", "UserTexture1m_F", [""]],
+    ["_tagModel", QGVAR(texture1m), [""]],
     ["_condition", {true}, [{}]]
 ];
 

addons/tagging/functions/fnc_createTag.sqf

@@ -10,7 +10,7 @@
  * 3: Object it should be tied to <OBJECT>
  * 4: Unit that created the tag <OBJECT>
  * 5: Material of the tag <STRING> (default: "")
- * 6: Model of the tag <STRING> (default: "UserTexture1m_F")
+ * 6: Model of the tag <STRING> (default: "ace_tagging_texture1m")
  * 7: Vehicle Tag <BOOL> (default: false)
  *
  * Return Value:
@@ -22,7 +22,7 @@
  * Public: No
  */
 
-params ["_tagPosASL", "_vectorDirAndUp", "_texture", "_object", "_unit", ["_material","",[""]], ["_tagModel", "UserTexture1m_F", [""]], ["_isVehicleTag", false, [false]]];
+params ["_tagPosASL", "_vectorDirAndUp", "_texture", "_object", "_unit", ["_material","",[""]], ["_tagModel", QGVAR(texture1m), [""]], ["_isVehicleTag", false, [false]]];
 TRACE_5("createTag:",_tagPosASL,_vectorDirAndUp,_texture,_object,_unit);
 
 if (_texture == "") exitWith {

addons/tagging/functions/fnc_parseConfigTag.sqf

@@ -60,7 +60,7 @@ private _icon = getText (_cfg >> "icon");
 
 private _tagModel = getText (_cfg >> "tagModel");
 if (_tagModel == "") then {
-    _tagModel = "UserTexture1m_F";
+    _tagModel = QGVAR(texture1m);
 };
 
 private _condition = getText (_cfg >> "condition");

addons/tagging/functions/fnc_tag.sqf

@@ -7,7 +7,7 @@
  * 0: Unit <OBJECT>
  * 1: The color of the tag (valid colors are black, red, green and blue or full path to custom texture) <STRING>
  * 2: Material of the tag <STRING> (default: "")
- * 3: Tag Model <STRING> (default: "UserTexture1m_F")
+ * 3: Tag Model <STRING> (default: "ace_tagging_texture1m")
  *
  * Return Value:
  * Success <BOOL>
@@ -22,7 +22,7 @@ params [
     ["_unit", objNull, [objNull]],
     ["_texture", "", [""]],
     ["_material", "", [""]],
-    ["_tagModel", "UserTexture1m_F", [""]]
+    ["_tagModel", QGVAR(texture1m), [""]]
 ];
 
 if (isNull _unit || {_texture == ""}) exitWith {

docs/wiki/framework/tagging-framework.md

@@ -29,7 +29,7 @@ class ACE_Tags {
         textures[] = {"path\to\texture1.paa", "path\to\texture2.paa"};  // List of texture variations (one is randomly selected when tagging)
         materials[] = {"path\to\material.rvmat"}; // Optional: List of material variations (one is randomly selected). Keep empty if you don't need a custom material.
         icon = "path\to\icon.paa";  // Icon being displayed in the interaction menu
-        tagModel = "UserTexture1m_F"; // Optional: The 3D Model that will be spawned with the texture on it, can either be CfgVehicles classname or P3D file path.
+        tagModel = "ace_tagging_texture1m"; // Optional: The 3D Model that will be spawned with the texture on it, can either be CfgVehicles classname or P3D file path.
         condition = "true"; // Optional: Condition for the Spraytag Action. Needs to return bool.
     };
 };
@@ -50,7 +50,7 @@ class ACE_Tags {
 | 3  | Textures | Array | Required |
 | 4  | Icon | String | Optional (default: `""` - Default white point) |
 | 5  | Material Paths | Array | Optional (default: `[]` - No custom material) |
-| 6  | Tag Model | String | Optional (default: `"UserTexture1m_F"` - 1x1m texture surface) |
+| 6  | Tag Model | String | Optional (default: `"ace_tagging_texture1m"` - 1x1m texture surface) |
 | 7  | Condition | Code | Optional (default: `{true}` - always accessible) |
 | **R** | Successfully Added Tag | Boolean | Return value |
 
@@ -82,7 +82,7 @@ class ACE_Tags {
         textures[] = {"@path\to\texture1.paa", "@path\to\texture2.paa"};  // List of texture variations (one is randomly selected when tagging)
         materials[] = {"@path\to\material.rvmat"}; // Optional: List of material variations (one is randomly selected). Keep empty if you don't need a custom material.
         icon = "@path\to\icon.paa";  // Icon being displayed in the interaction menu
-        tagModel = "UserTexture1m_F"; // Optional: The 3D Model that will be spawned with the texture on it, can either be CfgVehicles classname or P3D file path.
+        tagModel = "ace_tagging_texture1m"; // Optional: The 3D Model that will be spawned with the texture on it, can either be CfgVehicles classname or P3D file path.
         condition = "true"; // Optional: Condition for the Spraytag Action. Needs to return bool.
     };
 };