Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Common - Add support for commander turrets to cba_common_fnc_turretDir #1507

Merged
merged 1 commit into from
Dec 18, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions addons/common/fnc_turretDir.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ private _gunBeg = _vehicle selectionPosition getText (_turretConfig >> "gunBeg")
private _gunEnd = _vehicle selectionPosition getText (_turretConfig >> "gunEnd");

if (_gunEnd isEqualTo _gunBeg) then {
if ((getNumber (_turretConfig >> "primaryObserver")) == 1) exitWith {
_gunBeg = _gunEnd vectorAdd (_vehicle vectorWorldToModel eyeDirection _vehicle);
};
private _vehicleConfig = configOf _vehicle;
if (((getNumber (_vehicleConfig >> "isUAV")) == 1) && {_turret isEqualto [0]}) then {
_gunBeg = _vehicle selectionPosition getText (_vehicleConfig >> "uavCameraGunnerDir");
Expand All @@ -43,8 +46,8 @@ if (_gunEnd isEqualTo _gunBeg) then {
};

if !(_relativeToModel) then {
_gunBeg = AGLToASL (_vehicle modelToWorld _gunBeg);
_gunEnd = AGLToASL (_vehicle modelToWorld _gunEnd);
_gunBeg = _vehicle modelToWorldWorld _gunBeg;
_gunEnd = _vehicle modelToWorldWorld _gunEnd;
};

private _turretDir = _gunEnd vectorFromTo _gunBeg;
Expand Down