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

misc updates

Browse Source
This commit is contained in:
Brandon Danyluk 2021-12-11 22:16:08 -07:00
parent 7d009d26ca
commit 7460bb335e
3 changed files with 25 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
addons/spike/functions/fnc_camera_init.sqf
View File

@ -15,7 +15,7 @@
*
* Public: No
*/
params ["_projectile", "_cameraArray", "_shooter", "_preTrack"];
params ["_projectile", "_cameraArray", "_shooter"];
_cameraArray params ["_enabled", "_fovLevels", "_initialFOV", "_thermalTypes", "_initialThermalType", "_switchOnFire", "_lerpFOV", "_fovChangeTime", "", "_gimbalData", "_reticleData", "_designating"];
_gimbalData params ["_hasGimbal", "_maxGimbalX", "_maxGimbalY", "_gimbalSpeedX", "_gimbalSpeedY", "_initGimbalAngleX", "_initGimbalAngleY", "_gimbalZoomSpeedModifiers"];
@ -48,86 +48,38 @@ _shooter setVariable [QGVAR(missileCamera), _activeCameraNamespace];
_activeCameraNamespace setVariable [QGVAR(shooter), _shooter];
[_activeCameraNamespace, _initialThermalType] call FUNC(camera_setViewMode);
if (_preTrack) then {
private _pos = _projectile;
private _pos = getPosASL _projectile;
private _lookDirection = if !(_shooter isKindOf "CAManBase" || {_shooter isKindOf "StaticWeapon"}) then {
private _finalLookDirection = if (_shooter isKindOf "Plane") then {
_pos = _shooter modelToWorldVisual getPilotCameraPosition _shooter;
private _trackingTarget = getPilotCameraTarget _shooter;
_trackingTarget params ["_isTracking", "_trackingPos"];
// Because ARMA doesnt update the camera rotation if you are locked on immediatly, we have to calculate the look direction manually or else the SACLOS target will be wrong, especially if shooter is moving
if (_isTracking) then {
vectorNormalized (_trackingPos vectorDiff _pos);
} else {
_shooter vectorModelToWorldVisual getPilotCameraDirection _shooter;
};
} else {
private _gBody = -deg(_shooter animationPhase _animationSourceBody);
private _gGun = deg(_shooter animationPhase _animationSourceGun);
_shooter vectorModelToWorldVisual ([1, _gBody, _gGun] call CBA_fnc_polar2vect);
};
_finalLookDirection
} else {
_pos = ASLtoAGL eyePos _shooter;
_shooter weaponDirection currentWeapon _shooter
};
private _camera = "camera" camCreate _pos;
private _logic = "Logic" createVehicleLocal _pos;
private _camera = "camera" camCreate _pos;
private _logic = "Logic" createVehicleLocal _pos;
private _initPosX = (tan _initGimbalAngleX) * GIMBAL_LOGIC_OFFSET;
private _initPosY = (tan _initGimbalAngleY) * GIMBAL_LOGIC_OFFSET;
_activeCameraNamespace setVariable [QGVAR(projectileSize), 0];
private _projectileBounds = (1 boundingBoxReal _projectile);
private _projectileSize = (_projectileBounds#1) vectorDiff (_projectileBounds#0);
_activeCameraNamespace setVariable [QGVAR(projectileSize), _projectileSize#1];
private _logicPosition = (AGLtoASL _pos) vectorAdd (_lookDirection vectorMultiply GIMBAL_LOGIC_OFFSET);
_logic setPosASL _logicPosition;
_logic setVectorDir _lookDirection;
private _logicPosition = [_initPosX, GIMBAL_LOGIC_OFFSET, _initPosY] vectorAdd [0, _projectileSize#1, 0];
_camera camSetTarget _logic;
_camera setPos _pos;
_camera camSetFOV _initialFOV;
_logic setPosASL (_projectile modelToWorldVisualWorld _logicPosition);
_camera camCommit 0;
showCinemaBorder false;
camUseNVG false;
_camera camSetTarget _logic;
_camera setPos (_projectile modelToWorldVisual ((_projectile worldToModelVisual (ASLtoATL getPosASL _projectile)) vectorAdd [0, _projectileSize#1, 0]));
_camera camSetFOV _initialFOV;
_activeCameraNamespace setVariable [QGVAR(camera), _camera];
_activeCameraNamespace setVariable [QGVAR(logic), _logic];
_activeCameraNamespace setVariable [QGVAR(missile), objNull];
_activeCameraNamespace setVariable [QGVAR(logicPos), _shooter worldToModelVisual _logicPosition];
} else {
private _pos = getPosASL _projectile;
_camera camCommit 0;
showCinemaBorder false;
camUseNVG false;
private _camera = "camera" camCreate _pos;
private _logic = "Logic" createVehicleLocal _pos;
_activeCameraNamespace setVariable [QGVAR(lastMissileOrientation), vectorNormalized velocity _projectile];
_activeCameraNamespace setVariable [QGVAR(camera), _camera];
_activeCameraNamespace setVariable [QGVAR(logic), _logic];
_activeCameraNamespace setVariable [QGVAR(missile), _projectile];
_activeCameraNamespace setVariable [QGVAR(logicPos), _projectile vectorModelToWorldVisual _logicPosition];
private _initPosX = (tan _initGimbalAngleX) * GIMBAL_LOGIC_OFFSET;
private _initPosY = (tan _initGimbalAngleY) * GIMBAL_LOGIC_OFFSET;
private _projectileBounds = (1 boundingBoxReal _projectile);
private _projectileSize = (_projectileBounds#1) vectorDiff (_projectileBounds#0);
_activeCameraNamespace setVariable [QGVAR(projectileSize), _projectileSize#1];
private _logicPosition = [_initPosX, GIMBAL_LOGIC_OFFSET, _initPosY] vectorAdd [0, _projectileSize#1, 0];
_logic setPosASL (_projectile modelToWorldVisualWorld _logicPosition);
_camera camSetTarget _logic;
_camera setPos (_projectile modelToWorldVisual ((_projectile worldToModelVisual (ASLtoATL getPosASL _projectile)) vectorAdd [0, _projectileSize#1, 0]));
_camera camSetFOV _initialFOV;
_camera camCommit 0;
showCinemaBorder false;
camUseNVG false;
_activeCameraNamespace setVariable [QGVAR(lastMissileOrientation), vectorNormalized velocity _projectile];
_activeCameraNamespace setVariable [QGVAR(camera), _camera];
_activeCameraNamespace setVariable [QGVAR(logic), _logic];
_activeCameraNamespace setVariable [QGVAR(missile), _projectile];
_activeCameraNamespace setVariable [QGVAR(logicPos), _projectile vectorModelToWorldVisual _logicPosition];
if (_switchOnFire) then {
[_activeCameraNamespace] call FUNC(camera_switchTo);
};
if (_switchOnFire) then {
[_activeCameraNamespace] call FUNC(camera_switchTo);
};
_activeCameraNamespace

34
addons/spike/functions/fnc_camera_preTrack.sqf
View File

@ -1,34 +0,0 @@
#include "script_component.hpp"
/*
* Author: Brandon (TCVM)
* Updates camera with inputs
*
* Arguments:
* 0: Guidance Arg Array <ARRAY>
* 1: PFID <NUMBER>
*
* Return Value:
* None
*
* Example:
* [[], 0] call ace_missileguidance_fnc_guidancePFH;
*
* Public: No
*/
params ["_tracking"];
if (_tracking) then {
if (cameraView isEqualTo "GUNNER") then {
private _extractedInfo = [[ACE_PLAYER, currentWeapon ACE_PLAYER, nil, "", "M_Titan_AP", "Titan_AP", ACE_PLAYER], false] call FUNC(extractInfo);
[ASLtoAGL eyePos player, _extractedInfo select 12, player, true] call FUNC(camera_init);
[player getVariable QGVAR(missileCamera)] call FUNC(camera_switchTo);
GVAR(preTrackCameraPFID) = [{
params ["_args"];
_args params ["_extractedInfo"];
private _seekerPos = [ACE_PLAYER, ACE_PLAYER, _extractedInfo] call FUNC(seekerType_EO);
[_extractedInfo, ACE_PLAYER, _seekerPos] call FUNC(camera_update);
}, 0, [_extractedInfo]] call CBA_fnc_addPerFrameHandler;
};
} else {
[player getVariable QGVAR(missileCamera)] call FUNC(camera_destroy);
[GVAR(preTrackCameraPFID)] call CBA_fnc_removePerFrameHandler;
};

2
addons/spike/functions/fnc_onFired.sqf
View File

@ -67,7 +67,7 @@ if (!(_cameraConfig isEqualTo configNull) && { (getNumber (_cameraConfig >> "ena
_cameraArray set [12, (getNumber (_cameraConfig >> "canStopDesignating")) == 1];
};
private _camera = [_projectile, _cameraArray, _shooter, false] call FUNC(camera_init);
private _camera = [_projectile, _cameraArray, _shooter] call FUNC(camera_init);
GVAR(projectileHashMap) set [hashValue _projectile, _camera];
[{
params ["_args", "_pfID"];