mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
Merge pull request #3192 from acemod/getTargetDistance_to_LIS
Rewrite ace_common_fnc_getTargetDistance to use LineIntersectsSurfaces.
This commit is contained in:
commit
324edbde6d
@ -1,11 +1,11 @@
|
|||||||
/*
|
/*
|
||||||
* Author: commy2
|
* Author: VKing
|
||||||
* Get the distance to the next object the player is looking at. Used for laser distance measurements.
|
* Get the distance to the next object the player is looking at. Used for laser distance measurements.
|
||||||
*
|
*
|
||||||
* Arguments:
|
* Arguments:
|
||||||
* 0: Messurement Accuracy <NUMBER>
|
* 0: Measurement Accuracy (default: 1) <NUMBER>
|
||||||
* 1: Maximal messure distance <NUMBER>
|
* 1: Maximum measure distance (default: 5000) <NUMBER>
|
||||||
* 2: Minimal messure distance (default: nil) <NUMBER>
|
* 2: Minimum measure distance (default: 0) <NUMBER>
|
||||||
*
|
*
|
||||||
* Return Value:
|
* Return Value:
|
||||||
* Distance in meters <NUMBER>
|
* Distance in meters <NUMBER>
|
||||||
@ -14,33 +14,23 @@
|
|||||||
*/
|
*/
|
||||||
#include "script_component.hpp"
|
#include "script_component.hpp"
|
||||||
|
|
||||||
params ["_interval", "_maxDistance", "_minDistance"];
|
params [["_accuracy",1], ["_maxDistance",5000], ["_minDistance",0]];
|
||||||
|
|
||||||
private _position = ATLToASL positionCameraToWorld [0, 0, 0];
|
private _camPosition = AGLToASL positionCameraToWorld [0, 0, 0];
|
||||||
_position set [2, (_position select 2) - (getTerrainHeightASL _position min 0)];
|
private _aimLinePos = AGLToASL positionCameraToWorld [0, 0, _maxDistance];
|
||||||
|
|
||||||
private _laser = + _position;
|
private _LIS = lineIntersectsSurfaces [_camPosition, _aimLinePos];
|
||||||
private _line = [_position, _laser];
|
|
||||||
|
|
||||||
private _distance = _maxDistance;
|
private _distance = 0;
|
||||||
private _iteration = _distance;
|
if (count _LIS > 0) then {
|
||||||
|
_distance = _camPosition vectorDistance ((_LIS select 0) select 0);
|
||||||
while {
|
} else {
|
||||||
_iteration > _interval / 2
|
_distance = _maxDistance;
|
||||||
} do {
|
|
||||||
_iteration = _iteration / 2;
|
|
||||||
|
|
||||||
_laser = ATLToASL positionCameraToWorld [0, 0, _distance];
|
|
||||||
_laser set [2, (_laser select 2) - (getTerrainHeightASL _laser min 0)];
|
|
||||||
_line set [1, _laser];
|
|
||||||
|
|
||||||
_distance = _distance + (([1, -1] select (lineIntersects (_line + [vehicle ACE_player]) || {terrainIntersectASL _line})) * _iteration);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
_distance = _interval * round (_distance / _interval);
|
_distance = _distance max _minDistance;
|
||||||
|
|
||||||
_distance = _distance min _maxDistance;
|
_accuracy = _accuracy max 1;
|
||||||
|
_distance = (round (_distance/_accuracy)) * _accuracy;
|
||||||
if (!isNil "_minDistance") then {_distance = _distance max _minDistance};
|
|
||||||
|
|
||||||
_distance
|
_distance
|
||||||
|
Loading…
Reference in New Issue
Block a user