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

Fix SALH

Browse Source 
With Pro-nav the irratic behaviour of the laser caused the missile to over correct, so we average the position and use that running average for the target
This commit is contained in:
Brandon Danyluk 2021-04-12 01:09:12 -06:00
parent 4124a317f2
commit 22d3ee838f
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/laser/script_component.hpp
View File

@ -2,9 +2,9 @@
#define COMPONENT_BEAUTIFIED Laser
#include "\z\ace\addons\main\script_mod.hpp"
// #define DRAW_LASER_INFO
#define DRAW_LASER_INFO
// #define DEBUG_MODE_FULL
// #define DISABLE_COMPILE_CACHE
#define DISABLE_COMPILE_CACHE
// #define ENABLE_PERFORMANCE_COUNTERS
#ifdef DEBUG_ENABLED_LASER

27
addons/missileguidance/functions/fnc_seekerType_SALH.sqf
View File

@ -16,17 +16,38 @@
*
* Public: No
*/
#define MAX_AVERAGES 15
params ["", "_args"];
_args params ["_firedEH", "_launchParams", "", "_seekerParams"];
_firedEH params ["","","","","","","_projectile"];
_launchParams params ["","","","","","_laserParams"];
_seekerParams params ["_seekerAngle", "", "_seekerMaxRange"];
_seekerParams params ["_seekerAngle", "", "_seekerMaxRange", "", ["_lastPositions", []], ["_lastPositionIndex", 0]];
_laserParams params ["_code", "_wavelengthMin", "_wavelengthMax"];
private _laserResult = [(getPosASL _projectile), (velocity _projectile), _seekerAngle, _seekerMaxRange, [_wavelengthMin, _wavelengthMax], _code, _projectile] call EFUNC(laser,seekerFindLaserSpot);
private _foundTargetPos = _laserResult select 0;
TRACE_1("Search", _laserResult);
_foundTargetPos;
// average out any error from laser jump
private _positionSum = [0, 0, 0];
{
_positionSum = _positionSum vectorAdd _x;
} forEach _lastPositions;
if (_foundTargetPos isNotEqualTo [0, 0, 0]) then {
_lastPositions set [_lastPositionIndex % MAX_AVERAGES, _foundTargetPos];
_seekerParams set [4, _lastPositions];
_seekerParams set [5, _lastPositionIndex + 1];
};
_positionSum = _positionSum vectorAdd _foundTargetPos;
if (MAX_AVERAGES == count _lastPositions) then {
_positionSum = _positionSum vectorMultiply (1 / (1 + count _lastPositions));
} else {
_positionSum = _positionSum vectorMultiply (1 / count _lastPositions);
};
TRACE_3("laser target found",_foundTargetPos,_positionSum,count _lastPositions);
_positionSum