UAVs - Add Pilot Camera/Sane Solo Use Capability#8454
Open
LorenLuke wants to merge 1 commit intoacemod:masterfrom
Open
UAVs - Add Pilot Camera/Sane Solo Use Capability#8454LorenLuke wants to merge 1 commit intoacemod:masterfrom
LorenLuke wants to merge 1 commit intoacemod:masterfrom
Conversation
Contributor
Author
|
Requesting Review. |
Contributor
|
Testing looks good but I'm really worried about breaking things with this. |
johnb432
requested changes
Jul 22, 2024
| class ADDON { | ||
| name = COMPONENT_NAME; | ||
| requiredVersion = REQUIRED_VERSION; | ||
| requiredAddons[] = {"ace_interaction"}; |
Contributor
There was a problem hiding this comment.
Why ace_interaction? Why not ace_common?
Comment on lines
+12
to
+17
| if (isNull _vehicle) exitWith { | ||
| [_pfID] call CBA_fnc_removePerFrameHandler; | ||
| }; | ||
| if (!alive _vehicle) exitWith { | ||
| [_pfID] call CBA_fnc_removePerFrameHandler; | ||
| }; |
Contributor
There was a problem hiding this comment.
objNull is already dead, no need to check twice.
Suggested change
| if (isNull _vehicle) exitWith { | |
| [_pfID] call CBA_fnc_removePerFrameHandler; | |
| }; | |
| if (!alive _vehicle) exitWith { | |
| [_pfID] call CBA_fnc_removePerFrameHandler; | |
| }; | |
| if (!alive _vehicle) exitWith { | |
| [_pfhID] call CBA_fnc_removePerFrameHandler; | |
| }; |
Comment on lines
+18
to
+25
| if ("GUNNER" in (UAVControl _vehicle)) exitWith { | ||
| _vehicle lockCameraTo [objNull, [0]]; | ||
| }; | ||
| if ((getPilotCameraTarget _vehicle) select 0) then { | ||
| _vehicle lockCameraTo [getPilotCameraTarget _vehicle select 1, [0]]; | ||
| } else { | ||
| _vehicle lockCameraTo [objNull, [0]]; | ||
| }; |
Contributor
There was a problem hiding this comment.
Suggested change
| if ("GUNNER" in (UAVControl _vehicle)) exitWith { | |
| _vehicle lockCameraTo [objNull, [0]]; | |
| }; | |
| if ((getPilotCameraTarget _vehicle) select 0) then { | |
| _vehicle lockCameraTo [getPilotCameraTarget _vehicle select 1, [0]]; | |
| } else { | |
| _vehicle lockCameraTo [objNull, [0]]; | |
| }; | |
| private _target = getPilotCameraTarget _vehicle; | |
| if ("GUNNER" in (UAVControl _vehicle) || {!(_target select 0)}) exitWith { | |
| _vehicle lockCameraTo [objNull, [0]]; | |
| }; | |
| _vehicle lockCameraTo [_target select 1, [0]]; |
Comment on lines
+9
to
+10
| params ["_args", "_pfID"]; | ||
| _args params ["_vehicle"]; |
Contributor
There was a problem hiding this comment.
Suggested change
| params ["_args", "_pfID"]; | |
| _args params ["_vehicle"]; | |
| params ["_vehicle", "_pfhID"]; |
| _vehicle lockCameraTo [objNull, [0]]; | ||
| }; | ||
|
|
||
| }, 0.1, [_vehicle]] call CBA_fnc_addPerFrameHandler; |
Contributor
There was a problem hiding this comment.
Suggested change
| }, 0.1, [_vehicle]] call CBA_fnc_addPerFrameHandler; | |
| }, 0.1, _vehicle] call CBA_fnc_addPerFrameHandler; |
| if (!unitIsUAV _vehicle) exitWith {}; | ||
| if (!hasPilotCamera _vehicle) exitWith {}; | ||
|
|
||
| GVAR(pfehID) = [{ |
Contributor
There was a problem hiding this comment.
Suggested change
| GVAR(pfehID) = [{ | |
| [{ |
| _vehicle lockCameraTo [objNull, [0]]; | ||
| }; | ||
|
|
||
| }, 0.1, [_vehicle]] call CBA_fnc_addPerFrameHandler; |
Contributor
There was a problem hiding this comment.
Is there a reason as to why you are adding a PFH to every single drone in a mission? Imo you need to find a way of adding it to player-controlled drones only.
| @@ -0,0 +1,28 @@ | |||
| #include "script_component.hpp" | |||
|
|
|||
| ["Air", "init", { | |||
Contributor
There was a problem hiding this comment.
This whole bit needs comments.
Mike-MF
requested changes
Jul 23, 2024
Comment on lines
+5
to
+6
| initAngleX=0; minAngleX=0; maxAngleX=0; | ||
| initAngleY=0; minAngleY=0; maxAngleY=0; |
Member
There was a problem hiding this comment.
Suggested change
| initAngleX=0; minAngleX=0; maxAngleX=0; | |
| initAngleY=0; minAngleY=0; maxAngleY=0; | |
| initAngleX = 0; | |
| minAngleX = 0; | |
| maxAngleX = 0; | |
| initAngleY = 0; | |
| minAngleY = 0; | |
| maxAngleY = 0; |
Comment on lines
+36
to
+37
| showUAVViewInOptics= false; | ||
| showSlingLoadManagerInOptics= false; |
Member
There was a problem hiding this comment.
Suggested change
| showUAVViewInOptics= false; | |
| showSlingLoadManagerInOptics= false; | |
| showUAVViewInOptics = false; | |
| showSlingLoadManagerInOptics = false; |
Comment on lines
+39
to
+42
| x = "6.0 * (0.01875 * SafezoneH)"; | ||
| y = "1.75 * (0.025 * SafezoneH)"; | ||
| w = "41.3 * (0.01875 * SafezoneH)"; | ||
| h = "1 * (0.025 * SafezoneH)"; |
Member
There was a problem hiding this comment.
Suggested change
| x = "6.0 * (0.01875 * SafezoneH)"; | |
| y = "1.75 * (0.025 * SafezoneH)"; | |
| w = "41.3 * (0.01875 * SafezoneH)"; | |
| h = "1 * (0.025 * SafezoneH)"; | |
| x = "6.0 * (0.01875 * SafezoneH)"; | |
| y = "1.75 * (0.025 * SafezoneH)"; | |
| w = "41.3 * (0.01875 * SafezoneH)"; | |
| h = "1 * (0.025 * SafezoneH)"; |
| visionMode[] = {"Normal","NVG","Ti"}; | ||
| thermalMode[] = {0,1}; | ||
| gunnerOpticsModel = "\A3\Drones_F\Weapons_F_Gamma\Reticle\UAV_Optics_Gunner_wide_F.p3d"; | ||
| //gunnerOpticsModel = "\A3\Weapons_F\Reticle\Optics_Gunship_wide_F.p3d"; |
Member
There was a problem hiding this comment.
Suggested change
| //gunnerOpticsModel = "\A3\Weapons_F\Reticle\Optics_Gunship_wide_F.p3d"; |
If it's commented out, It doesn't need to be here.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Ultra-lightweight reimagining of #7485.
When merged this pull request will:
Known Issues: