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

Further remove standalone { on code

Browse Source
This commit is contained in:
esteldunedain
2015-04-07 18:09:32 -03:00
parent 24750781aa
commit 2d211e839f
3 changed files with 48 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
addons/atragmx/functions/fnc_calculate_solution.sqf
View File

@ -19,7 +19,7 @@ _bc = _this select 14;
_dragModel = _this select 15; _dragModel = _this select 15;
_atmosphereModel = _this select 16; _atmosphereModel = _this select 16;
_storeRangeCardData = _this select 17; _storeRangeCardData = _this select 17;
private ["_bulletPos", "_bulletVelocity", "_bulletSpeed", "_bulletAccel", "_gravity", "_deltaT"]; private ["_bulletPos", "_bulletVelocity", "_bulletSpeed", "_bulletAccel", "_gravity", "_deltaT"];
_bulletPos = [0, 0, 0]; _bulletPos = [0, 0, 0];
_bulletVelocity = [0, 0, 0]; _bulletVelocity = [0, 0, 0];
@ -64,13 +64,12 @@ _bulletVelocity set [0, 0];
_bulletVelocity set [1, Cos(_scopeBaseAngle) * _muzzleVelocity]; _bulletVelocity set [1, Cos(_scopeBaseAngle) * _muzzleVelocity];
_bulletVelocity set [2, Sin(_scopeBaseAngle) * _muzzleVelocity]; _bulletVelocity set [2, Sin(_scopeBaseAngle) * _muzzleVelocity];
while {_TOF < 15 && (_bulletPos select 1) < _targetRange} do while {_TOF < 15 && (_bulletPos select 1) < _targetRange} do {
{
_bulletSpeed = vectorMagnitude _bulletVelocity; _bulletSpeed = vectorMagnitude _bulletVelocity;
_trueVelocity = _bulletVelocity vectorDiff _wind; _trueVelocity = _bulletVelocity vectorDiff _wind;
_trueSpeed = vectorMagnitude _trueVelocity; _trueSpeed = vectorMagnitude _trueVelocity;
if (EGVAR(advanced_ballistics,AdvancedBallistics)) then { if (EGVAR(advanced_ballistics,AdvancedBallistics)) then {
if (EGVAR(advanced_ballistics,AdvancedAirDragEnabled)) then { if (EGVAR(advanced_ballistics,AdvancedAirDragEnabled)) then {
private ["_drag"]; private ["_drag"];
@ -80,14 +79,14 @@ while {_TOF < 15 && (_bulletPos select 1) < _targetRange} do
} else { } else {
_bulletAccel = _trueVelocity vectorMultiply (_trueSpeed * _airFriction); _bulletAccel = _trueVelocity vectorMultiply (_trueSpeed * _airFriction);
}; };
_bulletAccel = _bulletAccel vectorAdd _gravity; _bulletAccel = _bulletAccel vectorAdd _gravity;
_bulletVelocity = _bulletVelocity vectorAdd (_bulletAccel vectorMultiply _deltaT); _bulletVelocity = _bulletVelocity vectorAdd (_bulletAccel vectorMultiply _deltaT);
_bulletPos = _bulletPos vectorAdd (_bulletVelocity vectorMultiply _deltaT); _bulletPos = _bulletPos vectorAdd (_bulletVelocity vectorMultiply _deltaT);
_TOF = _TOF + _deltaT; _TOF = _TOF + _deltaT;
if (_storeRangeCardData) then { if (_storeRangeCardData) then {
_range = GVAR(ATragMX_rangeCardStartRange) + _n * GVAR(ATragMX_rangeCardIncrement); _range = GVAR(ATragMX_rangeCardStartRange) + _n * GVAR(ATragMX_rangeCardIncrement);
if ((_bulletPos select 1) * _rangeFactor >= _range && _range <= GVAR(ATragMX_rangeCardEndRange)) then { if ((_bulletPos select 1) * _rangeFactor >= _range && _range <= GVAR(ATragMX_rangeCardEndRange)) then {
@ -100,7 +99,7 @@ while {_TOF < 15 && (_bulletPos select 1) < _targetRange} do
}; };
_kineticEnergy = 0.5 * (_bulletMass / 1000 * (_bulletSpeed ^ 2)); _kineticEnergy = 0.5 * (_bulletMass / 1000 * (_bulletSpeed ^ 2));
_kineticEnergy = _kineticEnergy * 0.737562149; _kineticEnergy = _kineticEnergy * 0.737562149;
GVAR(ATragMX_rangeCardData) set [_n, [_range, _elevation * 60, _windage * 60, _lead, _TOF, _bulletSpeed, _kineticEnergy]]; GVAR(ATragMX_rangeCardData) set [_n, [_range, _elevation * 60, _windage * 60, _lead, _TOF, _bulletSpeed, _kineticEnergy]];
_n = _n + 1; _n = _n + 1;
}; };

81
addons/atragmx/functions/fnc_calculate_target_range_assist.sqf
View File

@ -4,102 +4,79 @@ private ["_targetSize", "_imageSize", "_angle", "_estRange"];
_angle = parseNumber(ctrlText 7012); _angle = parseNumber(ctrlText 7012);
_targetSize = parseNumber(ctrlText 7010); _targetSize = parseNumber(ctrlText 7010);
if (GVAR(ATragMX_rangeAssistUseTargetHeight)) then if (GVAR(ATragMX_rangeAssistUseTargetHeight)) then {
{
_targetSize = _targetSize * cos(_angle); _targetSize = _targetSize * cos(_angle);
}; };
switch (GVAR(ATragMX_rangeAssistTargetSizeUnit)) do switch (GVAR(ATragMX_rangeAssistTargetSizeUnit)) do {
{ case 0: {
case 0:
{
_targetSize = _targetSize * 0.0254; _targetSize = _targetSize * 0.0254;
}; };
case 1: case 1: {
{
_targetSize = _targetSize * 0.3048; _targetSize = _targetSize * 0.3048;
}; };
case 2: case 2: {
{
_targetSize = _targetSize * 0.01; _targetSize = _targetSize * 0.01;
}; };
}; };
_imageSize = parseNumber(ctrlText 7011); _imageSize = parseNumber(ctrlText 7011);
switch (GVAR(ATragMX_rangeAssistImageSizeUnit)) do switch (GVAR(ATragMX_rangeAssistImageSizeUnit)) do {
{ case 0: {
case 0:
{
_imageSize = _imageSize / 6400 * 360; _imageSize = _imageSize / 6400 * 360;
}; };
case 1: case 1: {
{
_imageSize = _imageSize / 60; _imageSize = _imageSize / 60;
}; };
case 2: case 2: {
{
_imageSize = _imageSize / 60 / 1.047; _imageSize = _imageSize / 60 / 1.047;
}; };
}; };
_estRange = parseNumber(ctrlText 7013); _estRange = parseNumber(ctrlText 7013);
if (GVAR(ATragMX_currentUnit) != 2) then if (GVAR(ATragMX_currentUnit) != 2) then {
{
_estRange = _estRange / 1.0936133; _estRange = _estRange / 1.0936133;
}; };
switch (_this) do switch (_this) do {
{ case 0: {
case 0:
{
_targetSize = tan(_imageSize) * _estRange; _targetSize = tan(_imageSize) * _estRange;
if (GVAR(ATragMX_rangeAssistUseTargetHeight)) then if (GVAR(ATragMX_rangeAssistUseTargetHeight)) then {
{
_targetSize = _targetSize / cos(_angle); _targetSize = _targetSize / cos(_angle);
}; };
switch (GVAR(ATragMX_rangeAssistTargetSizeUnit)) do switch (GVAR(ATragMX_rangeAssistTargetSizeUnit)) do {
{ case 0: {
case 0:
{
_targetSize = _targetSize / 0.0254; _targetSize = _targetSize / 0.0254;
}; };
case 1: case 1: {
{
_targetSize = _targetSize / 0.3048; _targetSize = _targetSize / 0.3048;
}; };
case 2: case 2: {
{
_targetSize = _targetSize / 0.01; _targetSize = _targetSize / 0.01;
}; };
}; };
ctrlSetText [7010, Str(Round(_targetSize * 100) / 100)]; ctrlSetText [7010, Str(Round(_targetSize * 100) / 100)];
}; };
case 1: case 1: {
{
_imageSize = atan(_targetSize / _estRange); _imageSize = atan(_targetSize / _estRange);
switch (GVAR(ATragMX_rangeAssistImageSizeUnit)) do switch (GVAR(ATragMX_rangeAssistImageSizeUnit)) do {
{ case 0: {
case 0:
{
_imageSize = _imageSize * 6400 / 360; _imageSize = _imageSize * 6400 / 360;
}; };
case 1: case 1: {
{
_imageSize = _imageSize * 60; _imageSize = _imageSize * 60;
}; };
case 2: case 2: {
{
_imageSize = _imageSize * 60 * 1.047; _imageSize = _imageSize * 60 * 1.047;
}; };
}; };
ctrlSetText [7011, Str(Round(_imageSize * 100) / 100)]; ctrlSetText [7011, Str(Round(_imageSize * 100) / 100)];
}; };
case 2: case 2: {
{
_estRange = _targetSize / tan(_imageSize); _estRange = _targetSize / tan(_imageSize);
ctrlSetText [7013, Str(Round(_estRange))]; ctrlSetText [7013, Str(Round(_estRange))];
}; };
}; };

22
addons/atragmx/functions/fnc_target_speed_assist_timer.sqf
View File

@ -2,29 +2,27 @@
#define _dsp (uiNamespace getVariable "ATragMX_Display") #define _dsp (uiNamespace getVariable "ATragMX_Display")
if !(ctrlVisible 9000) then if !(ctrlVisible 9000) then {
{
private ["_startTime"]; private ["_startTime"];
false execVM QUOTE(PATHTOF(functions\fnc_show_target_speed_assist.sqf)); false execVM QUOTE(PATHTOF(functions\fnc_show_target_speed_assist.sqf));
true execVM QUOTE(PATHTOF(functions\fnc_show_target_speed_assist_timer.sqf)); true execVM QUOTE(PATHTOF(functions\fnc_show_target_speed_assist_timer.sqf));
ctrlSetFocus (_dsp displayCtrl 9002); ctrlSetFocus (_dsp displayCtrl 9002);
_startTime = time; _startTime = time;
while {GVAR(ATragMX_speedAssistTimer)} do while {GVAR(ATragMX_speedAssistTimer)} do {
{
sleep 0.1; sleep 0.1;
ctrlSetText [9001, Str(Round((time - _startTime) * 10) / 10)]; ctrlSetText [9001, Str(Round((time - _startTime) * 10) / 10)];
}; };
GVAR(ATragMX_speedAssistTimer) = true; GVAR(ATragMX_speedAssistTimer) = true;
ctrlSetText [8006, Str(Round((time - _startTime) * 10) / 10)]; ctrlSetText [8006, Str(Round((time - _startTime) * 10) / 10)];
[] call FUNC(calculate_target_speed_assist); [] call FUNC(calculate_target_speed_assist);
false execVM QUOTE(PATHTOF(functions\fnc_show_target_speed_assist_timer.sqf)); false execVM QUOTE(PATHTOF(functions\fnc_show_target_speed_assist_timer.sqf));
true execVM QUOTE(PATHTOF(functions\fnc_show_target_speed_assist.sqf)); true execVM QUOTE(PATHTOF(functions\fnc_show_target_speed_assist.sqf));
}; };