mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
Improved the wind speed calculation if AB is not enabled
This commit is contained in:
parent
3c25fd4008
commit
2040f4dcc3
@ -3,6 +3,7 @@
|
|||||||
ADDON = false;
|
ADDON = false;
|
||||||
|
|
||||||
PREP(buttonPressed);
|
PREP(buttonPressed);
|
||||||
|
PREP(calculateWindSpeed);
|
||||||
PREP(canShow);
|
PREP(canShow);
|
||||||
PREP(collectData);
|
PREP(collectData);
|
||||||
PREP(createKestrelDialog);
|
PREP(createKestrelDialog);
|
||||||
|
68
addons/kestrel4500/functions/fnc_calculateWindSpeed.sqf
Normal file
68
addons/kestrel4500/functions/fnc_calculateWindSpeed.sqf
Normal file
@ -0,0 +1,68 @@
|
|||||||
|
/*
|
||||||
|
* Author: Ruthberg
|
||||||
|
*
|
||||||
|
* Calculates the wind speed at a given world position
|
||||||
|
*
|
||||||
|
* Arguments:
|
||||||
|
* 0: _this - world position <posASL>
|
||||||
|
*
|
||||||
|
* Return Value:
|
||||||
|
* 0: wind speed - m/s <NUMBER>
|
||||||
|
*
|
||||||
|
* Public: No
|
||||||
|
*/
|
||||||
|
#include "script_component.hpp"
|
||||||
|
|
||||||
|
private ["_windSpeed", "_windDir", "_newWindSpeed", "_windSource"];
|
||||||
|
|
||||||
|
fnc_polar2vect = {
|
||||||
|
private ["_mag2D"];
|
||||||
|
_mag2D = (_this select 0) * cos((_this select 2));
|
||||||
|
[_mag2D * sin((_this select 1)), _mag2D * cos((_this select 1)), (_this select 0) * sin((_this select 2))];
|
||||||
|
};
|
||||||
|
|
||||||
|
_windSpeed = vectorMagnitude ACE_wind;
|
||||||
|
_windDir = (ACE_wind select 0) atan2 (ACE_wind select 1);
|
||||||
|
|
||||||
|
// Terrain effect on wind
|
||||||
|
if (_windSpeed > 0.05) then {
|
||||||
|
_newWindSpeed = 0;
|
||||||
|
{
|
||||||
|
_windSource = [100, _windDir + 180, _x] call fnc_polar2vect;
|
||||||
|
if (!(terrainIntersectASL [_this, _this vectorAdd _windSource])) exitWith {
|
||||||
|
_newWindSpeed = cos(_x * 9) * _windSpeed;
|
||||||
|
};
|
||||||
|
_windSource = [100, _windDir + 180 + _x, 0] call fnc_polar2vect;
|
||||||
|
if (!(terrainIntersectASL [_this, _this vectorAdd _windSource])) exitWith {
|
||||||
|
_newWindSpeed = cos(_x * 9) * _windSpeed;
|
||||||
|
};
|
||||||
|
_windSource = [100, _windDir + 180 - _x, 0] call fnc_polar2vect;
|
||||||
|
if (!(terrainIntersectASL [_this, _this vectorAdd _windSource])) exitWith {
|
||||||
|
_newWindSpeed = cos(_x * 9) * _windSpeed;
|
||||||
|
};
|
||||||
|
} forEach [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
|
||||||
|
_windSpeed = _newWindSpeed;
|
||||||
|
};
|
||||||
|
|
||||||
|
// Obstacle effect on wind
|
||||||
|
if (_windSpeed > 0.05) then {
|
||||||
|
_newWindSpeed = 0;
|
||||||
|
{
|
||||||
|
_windSource = [20, _windDir + 180, _x] call fnc_polar2vect;
|
||||||
|
if (!(lineIntersects [_this, _this vectorAdd _windSource])) exitWith {
|
||||||
|
_newWindSpeed = cos(_x * 2) * _windSpeed;
|
||||||
|
};
|
||||||
|
_windSource = [20, _windDir + 180 + _x, 0] call fnc_polar2vect;
|
||||||
|
if (!(lineIntersects [_this, _this vectorAdd _windSource])) exitWith {
|
||||||
|
_newWindSpeed = cos(_x * 2) * _windSpeed;
|
||||||
|
};
|
||||||
|
_windSource = [20, _windDir + 180 - _x, 0] call fnc_polar2vect;
|
||||||
|
if (!(lineIntersects [_this, _this vectorAdd _windSource])) exitWith {
|
||||||
|
_newWindSpeed = cos(_x * 2) * _windSpeed;
|
||||||
|
};
|
||||||
|
} forEach [0, 5, 10, 15, 20, 25, 30, 35, 40, 45];
|
||||||
|
_windSpeed = _newWindSpeed;
|
||||||
|
};
|
||||||
|
_windSpeed = 0 max _windSpeed;
|
||||||
|
|
||||||
|
_windSpeed
|
@ -48,6 +48,8 @@ if (GVAR(MinAvgMaxMode) == 1) then {
|
|||||||
if (missionNamespace getVariable [QEGVAR(advanced_ballistics,enabled), false]) then {
|
if (missionNamespace getVariable [QEGVAR(advanced_ballistics,enabled), false]) then {
|
||||||
_windSpeed = (eyePos ACE_player) call EFUNC(advanced_ballistics,calculateWindSpeed);
|
_windSpeed = (eyePos ACE_player) call EFUNC(advanced_ballistics,calculateWindSpeed);
|
||||||
_windSpeed = abs(cos(_playerDir - _windDir)) * _windSpeed;
|
_windSpeed = abs(cos(_playerDir - _windDir)) * _windSpeed;
|
||||||
|
} else {
|
||||||
|
_windSpeed = (eyePos ACE_player) call FUNC(calculateWindSpeed);
|
||||||
};
|
};
|
||||||
|
|
||||||
GVAR(MIN) set [1, (GVAR(MIN) select 1) min abs(_windSpeed)];
|
GVAR(MIN) set [1, (GVAR(MIN) select 1) min abs(_windSpeed)];
|
||||||
|
@ -45,6 +45,8 @@ _playerDir = getDir ACE_player;
|
|||||||
if (missionNamespace getVariable [QEGVAR(advanced_ballistics,enabled), false]) then {
|
if (missionNamespace getVariable [QEGVAR(advanced_ballistics,enabled), false]) then {
|
||||||
_windSpeed = (eyePos ACE_player) call EFUNC(advanced_ballistics,calculateWindSpeed);
|
_windSpeed = (eyePos ACE_player) call EFUNC(advanced_ballistics,calculateWindSpeed);
|
||||||
_windSpeed = abs(cos(_playerDir - _windDir)) * _windSpeed;
|
_windSpeed = abs(cos(_playerDir - _windDir)) * _windSpeed;
|
||||||
|
} else {
|
||||||
|
_windSpeed = (eyePos ACE_player) call FUNC(calculateWindSpeed);
|
||||||
};
|
};
|
||||||
|
|
||||||
if (_windSpeed > 0.3) then {
|
if (_windSpeed > 0.3) then {
|
||||||
|
Loading…
Reference in New Issue
Block a user