Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

ATragMX - Fixed UI (C1 vs. Distance interpolation) (#5720)

Browse Source 
* The C1 coefficient needs to be updated automatically whenever the target range changes
This commit is contained in:
ulteq 2017-11-03 22:01:02 +01:00 committed by GitHub
parent 1b3052584e
commit 0bae4511e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/atragmx/functions/fnc_change_target_slot.sqf
View File

@ -15,10 +15,9 @@
*/ */
#include "script_component.hpp" #include "script_component.hpp"
private _target = 0 max _this min 3; GVAR(currentTarget) = 0 max _this min 3;
[] call FUNC(parse_input); GVAR(targetRangeDirtyFlag) = true;
GVAR(currentTarget) = _target;
call FUNC(update_target_selection); call FUNC(update_target_selection);
call FUNC(calculate_target_solution); call FUNC(calculate_target_solution);

2
addons/atragmx/functions/fnc_init.sqf
View File

@ -84,6 +84,8 @@ GVAR(truingDropMuzzleVelocity) = 0;
GVAR(targetSolutionInput) = nil; GVAR(targetSolutionInput) = nil;
GVAR(targetRangeDirtyFlag) = false;
GVAR(showMainPage) = true; GVAR(showMainPage) = true;
GVAR(showAddNewGun) = false; GVAR(showAddNewGun) = false;
GVAR(showAtmoEnvData) = false; GVAR(showAtmoEnvData) = false;

6
addons/atragmx/functions/fnc_parse_input.sqf
View File

@ -99,6 +99,7 @@ if (GVAR(currentUnit) == 1) then {
} else { } else {
_targetRange = 25 max _targetRange min 3700; _targetRange = 25 max _targetRange min 3700;
}; };
GVAR(targetRangeDirtyFlag) = GVAR(targetRangeDirtyFlag) || {_targetRange != GVAR(targetRange) select GVAR(currentTarget)};
GVAR(latitude) set [GVAR(currentTarget), -90 max Round(parseNumber(ctrlText 140000)) min 90]; GVAR(latitude) set [GVAR(currentTarget), -90 max Round(parseNumber(ctrlText 140000)) min 90];
GVAR(directionOfFire) set [GVAR(currentTarget), 0 max abs(Round(parseNumber(ctrlText 140010))) min 359]; GVAR(directionOfFire) set [GVAR(currentTarget), 0 max abs(Round(parseNumber(ctrlText 140010))) min 359];
GVAR(windSpeed1) set [GVAR(currentTarget), _windSpeed1]; GVAR(windSpeed1) set [GVAR(currentTarget), _windSpeed1];
@ -173,6 +174,11 @@ if (_muzzleVelocity != GVAR(workingMemory) select 1) then {
GVAR(workingMemory) set [1, _muzzleVelocity]; GVAR(workingMemory) set [1, _muzzleVelocity];
GVAR(workingMemory) set [2, _zeroRange]; GVAR(workingMemory) set [2, _zeroRange];
if (GVAR(targetRangeDirtyFlag) && missionNamespace getVariable [QEGVAR(advanced_ballistics,enabled), false]) then {
[false, false] call FUNC(recalculate_c1_ballistic_coefficient);
GVAR(targetRangeDirtyFlag) = false;
};
[] call FUNC(update_gun); [] call FUNC(update_gun);
[] call FUNC(update_gun_ammo_data); [] call FUNC(update_gun_ammo_data);
[] call FUNC(update_atmosphere); [] call FUNC(update_atmosphere);

2
addons/atragmx/functions/fnc_sord.sqf
View File

@ -21,6 +21,8 @@ if (!GVAR(initialised)) exitWith {};
params ["_slopeDistance", "_azimuth", "_inclination"]; params ["_slopeDistance", "_azimuth", "_inclination"];
GVAR(targetRangeDirtyFlag) = (round(_slopeDistance) != (GVAR(targetRange) select GVAR(currentTarget)));
GVAR(inclinationAngle) set [GVAR(currentTarget), round(_inclination)]; GVAR(inclinationAngle) set [GVAR(currentTarget), round(_inclination)];
GVAR(directionOfFire) set [GVAR(currentTarget), round(_azimuth)]; GVAR(directionOfFire) set [GVAR(currentTarget), round(_azimuth)];
GVAR(targetRange) set [GVAR(currentTarget), round(_slopeDistance)]; GVAR(targetRange) set [GVAR(currentTarget), round(_slopeDistance)];