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

Replaced spawn and sleep commands with PFHs

Browse Source
This commit is contained in:
ulteq 2015-04-06 14:20:31 +02:00
parent c1aad2a0f5
commit 31b6c97cbe
2 changed files with 79 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
addons/advanced_ballistics/functions/fnc_displayProtractor.sqf
View File

@ -15,36 +15,37 @@ if (weaponLowered ACE_player) exitWith { true };
if (vehicle ACE_player != ACE_player) exitWith { true }; if (vehicle ACE_player != ACE_player) exitWith { true };
if (currentWeapon ACE_player != primaryWeapon ACE_player) exitWith { true }; if (currentWeapon ACE_player != primaryWeapon ACE_player) exitWith { true };
[] spawn { 2 cutText ["", "PLAIN"];
2 cutText ["", "PLAIN"]; GVAR(WindInfo) = false;
GVAR(WindInfo) = false; 0 cutText ["", "PLAIN"];
0 cutText ["", "PLAIN"]; GVAR(Protractor) = true;
GVAR(Protractor) = true;
while {GVAR(Protractor) && !(weaponLowered ACE_player) && currentWeapon ACE_player == primaryWeapon ACE_player} do {
_refPosition = [SafeZoneX + 0.001, SafeZoneY + 0.001, 0.2, 0.2 * 4/3];
_inclinationAngle = asin((ACE_player weaponDirection currentWeapon ACE_player) select 2);
_inclinationAngle = -58 max _inclinationAngle min 58;
1 cutRsc ["RscProtractor", "PLAIN", 1, false];
__ctrl1 ctrlSetScale 0.75;
__ctrl1 ctrlCommit 0;
__ctrl1 ctrlSetText QUOTE(PATHTOF(UI\protractor.paa));
__ctrl1 ctrlSetTextColor [1, 1, 1, 1];
__ctrl2 ctrlSetScale 0.75;
__ctrl2 ctrlSetPosition [(_refPosition select 0), (_refPosition select 1) - 0.0012 * _inclinationAngle, (_refPosition select 2), (_refPosition select 3)];
__ctrl2 ctrlCommit 0;
__ctrl2 ctrlSetText QUOTE(PATHTOF(UI\protractor_marker.paa));
__ctrl2 ctrlSetTextColor [1, 1, 1, 1];
sleep 0.1;
};
GVAR(Protractor) = false; [{
1 cutText ["", "PLAIN"]; // abort condition
}; if (!(GVAR(Protractor) && !(weaponLowered ACE_player) && currentWeapon ACE_player == primaryWeapon ACE_player)) exitWith {
GVAR(Protractor) = false;
1 cutText ["", "PLAIN"];
[_this select 1] call CBA_fnc_removePerFrameHandler;
};
_refPosition = [SafeZoneX + 0.001, SafeZoneY + 0.001, 0.2, 0.2 * 4/3];
_inclinationAngle = asin((ACE_player weaponDirection currentWeapon ACE_player) select 2);
_inclinationAngle = -58 max _inclinationAngle min 58;
1 cutRsc ["RscProtractor", "PLAIN", 1, false];
__ctrl1 ctrlSetScale 0.75;
__ctrl1 ctrlCommit 0;
__ctrl1 ctrlSetText QUOTE(PATHTOF(UI\protractor.paa));
__ctrl1 ctrlSetTextColor [1, 1, 1, 1];
__ctrl2 ctrlSetScale 0.75;
__ctrl2 ctrlSetPosition [(_refPosition select 0), (_refPosition select 1) - 0.0012 * _inclinationAngle, (_refPosition select 2), (_refPosition select 3)];
__ctrl2 ctrlCommit 0;
__ctrl2 ctrlSetText QUOTE(PATHTOF(UI\protractor_marker.paa));
__ctrl2 ctrlSetTextColor [1, 1, 1, 1];
}, 0.1, _this select 0] call CBA_fnc_addPerFrameHandler;
true true

95
addons/advanced_ballistics/functions/fnc_displayWindInfo.sqf
View File

@ -13,52 +13,53 @@ if (GVAR(WindInfo)) exitWith {
if (underwater ACE_player) exitWith { true }; if (underwater ACE_player) exitWith { true };
if (vehicle ACE_player != ACE_player) exitWith { true }; if (vehicle ACE_player != ACE_player) exitWith { true };
[] spawn { 2 cutText ["", "PLAIN"];
2 cutText ["", "PLAIN"]; GVAR(Protractor) = false;
GVAR(Protractor) = false; 1 cutText ["", "PLAIN"];
1 cutText ["", "PLAIN"]; GVAR(WindInfo) = true;
GVAR(WindInfo) = true;
[{
while {GVAR(WindInfo) && !(underwater ACE_player) && vehicle ACE_player == ACE_player} do { // abort condition
_windIndex = 12; if (!(GVAR(WindInfo) && !(underwater ACE_player) && vehicle ACE_player == ACE_player)) exitWith {
_windColor = [1, 1, 1, 1]; GVAR(WindInfo) = false;
0 cutText ["", "PLAIN"];
_windSpeed = (eyePos ACE_player) call FUNC(calculateWindSpeed); [_this select 1] call CBA_fnc_removePerFrameHandler;
};
if (_windSpeed > 0.2) then {
_playerDir = getDir ACE_player; _windIndex = 12;
_windDir = (wind select 0) atan2 (wind select 1); _windColor = [1, 1, 1, 1];
_windIndex = round(((_playerDir - _windDir + 360) % 360) / 30);
_windIndex = _windIndex % 12; _windSpeed = (eyePos ACE_player) call FUNC(calculateWindSpeed);
};
if (_windSpeed > 0.2) then {
// Color Codes from https://en.wikipedia.org/wiki/Beaufort_scale#Modern_scale _playerDir = getDir ACE_player;
if (_windSpeed > 0.3) then { _windColor = [0.796, 1, 1, 1]; }; _windDir = (wind select 0) atan2 (wind select 1);
if (_windSpeed > 1.5) then { _windColor = [0.596, 0.996, 0.796, 1]; }; _windIndex = round(((_playerDir - _windDir + 360) % 360) / 30);
if (_windSpeed > 3.3) then { _windColor = [0.596, 0.996, 0.596, 1]; }; _windIndex = _windIndex % 12;
if (_windSpeed > 5.4) then { _windColor = [0.6, 0.996, 0.4, 1]; }; };
if (_windSpeed > 7.9) then { _windColor = [0.6, 0.996, 0.047, 1]; };
if (_windSpeed > 10.7) then { _windColor = [0.8, 0.996, 0.059, 1]; }; // Color Codes from https://en.wikipedia.org/wiki/Beaufort_scale#Modern_scale
if (_windSpeed > 13.8) then { _windColor = [1, 0.996, 0.067, 1]; }; if (_windSpeed > 0.3) then { _windColor = [0.796, 1, 1, 1]; };
if (_windSpeed > 17.1) then { _windColor = [1, 0.796, 0.051, 1]; }; if (_windSpeed > 1.5) then { _windColor = [0.596, 0.996, 0.796, 1]; };
if (_windSpeed > 20.7) then { _windColor = [1, 0.596, 0.039, 1]; }; if (_windSpeed > 3.3) then { _windColor = [0.596, 0.996, 0.596, 1]; };
if (_windSpeed > 24.4) then { _windColor = [1, 0.404, 0.031, 1]; }; if (_windSpeed > 5.4) then { _windColor = [0.6, 0.996, 0.4, 1]; };
if (_windSpeed > 28.4) then { _windColor = [1, 0.22, 0.027, 1]; }; if (_windSpeed > 7.9) then { _windColor = [0.6, 0.996, 0.047, 1]; };
if (_windSpeed > 32.6) then { _windColor = [1, 0.078, 0.027, 1]; }; if (_windSpeed > 10.7) then { _windColor = [0.8, 0.996, 0.059, 1]; };
if (_windSpeed > 13.8) then { _windColor = [1, 0.996, 0.067, 1]; };
0 cutRsc ["RscWindIntuitive", "PLAIN", 1, false]; if (_windSpeed > 17.1) then { _windColor = [1, 0.796, 0.051, 1]; };
if (_windSpeed > 20.7) then { _windColor = [1, 0.596, 0.039, 1]; };
__ctrl ctrlSetScale 0.75; if (_windSpeed > 24.4) then { _windColor = [1, 0.404, 0.031, 1]; };
__ctrl ctrlCommit 0; if (_windSpeed > 28.4) then { _windColor = [1, 0.22, 0.027, 1]; };
if (_windSpeed > 32.6) then { _windColor = [1, 0.078, 0.027, 1]; };
__ctrl ctrlSetText format[QUOTE(PATHTOF(UI\wind%1.paa)), _windIndex];
__ctrl ctrlSetTextColor _windColor; 0 cutRsc ["RscWindIntuitive", "PLAIN", 1, false];
sleep 0.5; __ctrl ctrlSetScale 0.75;
}; __ctrl ctrlCommit 0;
GVAR(WindInfo) = false; __ctrl ctrlSetText format[QUOTE(PATHTOF(UI\wind%1.paa)), _windIndex];
0 cutText ["", "PLAIN"]; __ctrl ctrlSetTextColor _windColor;
};
}, 0.5, _this select 0] call CBA_fnc_addPerFrameHandler;
true true