Extensions - Rust

addons/artillerytables/XEH_postInit.sqf

@@ -30,6 +30,30 @@
     };
 }] call CBA_fnc_addEventHandler;
 
+addMissionEventHandler ["ExtensionCallback", {
+    params ["_name", "_function", "_data"];
+    if (_name isEqualTo "ace:artillery") then {
+        if (_function isEqualTo "calculate_table") then {
+            (parseSimpleArray _data) params ["_line", "_data"];
+            GVAR(tableData) set [_line, _data];
+            GVAR(tableSizeReceived) = GVAR(tableSizeReceived) + 1;
+            if (GVAR(tableSizeReceived) == GVAR(tableSizeActual)) then {
+                private _dialog = uiNamespace getVariable [QGVAR(rangeTableDialog), displayNull];
+                private _ctrlRangeTable = _dialog displayCtrl IDC_TABLE;
+                if (isNull _dialog) exitWith {true};
+                for "_i" from 0 to GVAR(tableSizeActual) do {
+                    _ctrlRangeTable lnbAdd GVAR(tableData) select _i;
+                };
+            };
+            private _dialog = uiNamespace getVariable [QGVAR(rangeTableDialog), displayNull];
+            private _ctrlRangeTable = _dialog displayCtrl IDC_TABLE;
+            if (isNull _dialog) exitWith {TRACE_1("dialog closed",_this);};
+            _ctrlRangeTable lnbAddRow ["", "", "", "", "", "", "", "", "", "", ""];
+            TRACE_1("table filled",_ctrlRangeTable);
+        };
+    };
+}]
+
 #ifdef DEBUG_MODE_FULL
 #include "dev\showShotInfo.sqf"
 #include "dev\checkConfigs.sqf"

addons/artillerytables/functions/fnc_rangeTableUpdate.sqf

@@ -34,31 +34,12 @@ _ctrlElevationLow ctrlSetTextColor ([[1,1,1,1],[0.25,0.25,0.25,1]] select GVAR(l
 
 lnbClear _ctrlRangeTable;
 // Call extension with current data and start workers
-TRACE_5("callExtension:start",_muzzleVelocity,_airFriction,_elevMin,_elevMax,GVAR(lastElevationMode));
-private _ret = "ace_artillerytables" callExtension ["start", [_muzzleVelocity,_airFriction,_elevMin,_elevMax,GVAR(lastElevationMode)]];
-TRACE_1("",_ret);
-
-// Non-blocking read data out of extension as it becomes availiable
-[{
-    private _dialog = uiNamespace getVariable [QGVAR(rangeTableDialog), displayNull];
-    private _ctrlRangeTable = _dialog displayCtrl IDC_TABLE;
-    if (isNull _dialog) exitWith {true};
-
-    private _status = 1; // 1 = data on line, 2 - data not ready, 3 - done
-    while {_status == 1} do {
-        private _ret = ("ace_artillerytables" callExtension ["getline", []]);
-        // TRACE_1("callExtension:getline",_ret);
-        _status = _ret select 1;
-        if (_status == 1) then { _ctrlRangeTable lnbAddRow parseSimpleArray (_ret select 0) };
-    };
-
-    (_status == 3) // exit loop when all data read
-}, {
-    // put dummy line at end because scrolling is problematic and can't see last line
-    private _dialog = uiNamespace getVariable [QGVAR(rangeTableDialog), displayNull];
-    private _ctrlRangeTable = _dialog displayCtrl IDC_TABLE;
-    if (isNull _dialog) exitWith {TRACE_1("dialog closed",_this);};
-
-    _ctrlRangeTable lnbAddRow ["", "", "", "", "", "", "", "", "", "", ""];
-    TRACE_1("table filled",_ctrlRangeTable);
-}, []] call CBA_fnc_waitUntilAndExecute;
+TRACE_5("callExtension:artillery:calculate_table",_muzzleVelocity,_airFriction,_elevMin,_elevMax,GVAR(lastElevationMode));
+(
+    "ace" callExtension ["artillery:calculate_table", [_muzzleVelocity,_airFriction,_elevMin,_elevMax,GVAR(lastElevationMode)]];
+) params ["_data", "_code"];
+TRACE_1("",_code)
+
+GVAR(tableData) = createHashMap;
+GVAR(tableSizeActual) = (parseSimpleArray _data) select 1;
+GVAR(tableSizeReceived) = 0;

addons/fcs/functions/fnc_calculateSolution.sqf

@@ -65,7 +65,7 @@ private _turretConfig = [configOf _vehicle, _turret] call EFUNC(common,getTurret
             false
         } count (_vehicle weaponsTurret _turret);
 
-        private _offset = "ace_fcs" callExtension format ["%1,%2,%3,%4", _initSpeed, _airFriction, _angleTarget, _distance];
+        private _offset = "ace" callExtension ["fcs", [_initSpeed, _airFriction, _angleTarget, _distance]];
         _offset = parseNumber _offset;
 
         _FCSInitSpeed pushBack _initSpeed;

addons/fcs/functions/fnc_firedEH.sqf

@@ -41,7 +41,7 @@ if (_zeroDistance > 0) then {
     private _weaponCombo = [_weapon, _magazine, _ammo, _zeroDistance];
     if (_weaponCombo isNotEqualTo (_gunner getVariable [QGVAR(lastWeaponCombo), []])) then {
         private _airFriction = getNumber (configFile >> "CfgAmmo" >> _ammo >> "airFriction");
-        private _antiOffset = "ace_fcs" callExtension format ["%1,%2,%3,%4", _initSpeed, _airFriction, 0, _zeroDistance];
+        private _antiOffset = "ace" callExtension ["fcs", [_initSpeed, _airFriction, 0, _zeroDistance]];
         _antiOffset = parseNumber _antiOffset;
 
         _gunner setVariable [QGVAR(lastWeaponCombo), _weaponCombo];

extension/Cargo.toml

@@ -14,6 +14,9 @@ uuid = { version = "1.1.2", features = ["v4"] }
 rand = "0.8.5"
 rand_chacha = "0.3.1"
 
+# Artillery
+rayon = "1.5.3"
+
 # Clipboard
 clipboard = { version = "0.5", optional = true }