mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
Missile Guidance - Cleanup merge (#10246)
This commit is contained in:
parent
0983c9b3bb
commit
42d2322ac0
@ -2,6 +2,7 @@
|
||||
/*
|
||||
* Author: jaynus / nou
|
||||
* Change a projectile's direction, maintaing speed
|
||||
* No longer used in guidancePFH, kept for backwards compatibility
|
||||
*
|
||||
* Arguments:
|
||||
* 0: Projectile <OBJECT>
|
||||
|
@ -25,7 +25,7 @@ if (_checkVisibilityTest) exitWith {
|
||||
_visibility > 0.001
|
||||
};
|
||||
if ((isNil "_seeker") || {isNil "_target"}) exitWith {
|
||||
ERROR_2("nil %1->%2",_seeker,_target);
|
||||
ERROR_2("nil [%1]->[%2]",_seeker,_target);
|
||||
false
|
||||
};
|
||||
|
||||
|
@ -25,7 +25,7 @@ private _attackProfileFunction = getText (configFile >> QGVAR(AttackProfiles) >>
|
||||
private _attackProfilePos = _this call (missionNamespace getVariable _attackProfileFunction);
|
||||
|
||||
if ((isNil "_attackProfilePos") || {_attackProfilePos isEqualTo [0,0,0]}) exitWith {
|
||||
ERROR_1("attack profile %1 returned bad pos",_attackProfilePos);
|
||||
ERROR_2("attack profile [%1] returned bad pos %2",_attackProfileName,_attackProfilePos);
|
||||
[0,0,0]
|
||||
};
|
||||
|
||||
|
@ -33,29 +33,8 @@ if (!alive _projectile || isNull _projectile || isNull _shooter) exitWith {
|
||||
};
|
||||
|
||||
if (_showTrail) then {
|
||||
drop [
|
||||
"\a3\data_f\kouleSvetlo", "", "Billboard",
|
||||
100,
|
||||
0.03,
|
||||
_projectile modelToWorld [0, 0, 0],
|
||||
[0, 0, 0],
|
||||
0,
|
||||
1.25,
|
||||
1,
|
||||
0.05,
|
||||
[0.5],
|
||||
[TRAIL_COLOUR(1)],
|
||||
[0],
|
||||
0,
|
||||
0,
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
0,
|
||||
false,
|
||||
-1,
|
||||
[TRAIL_COLOUR(10000)]
|
||||
];
|
||||
drop ["\a3\data_f\kouleSvetlo", "", "Billboard", 100, 0.03, _projectile modelToWorld [0, 0, 0],
|
||||
[0, 0, 0], 0, 1.25, 1, 0.05, [0.5], [TRAIL_COLOUR(1)], [0], 0, 0, "", "", "", 0, false, -1, [TRAIL_COLOUR(10000)]];
|
||||
};
|
||||
|
||||
private _timestep = diag_deltaTime * accTime;
|
||||
@ -199,8 +178,6 @@ if ((_pitchRate != 0 || {_yawRate != 0})) then {
|
||||
|
||||
_projectile setVectorDirAndUp [_dir, _up];
|
||||
|
||||
//[_projectile, _pitch, _yaw, 0] call FUNC(changeMissileDirection);
|
||||
|
||||
_guidanceParameters set [0, _yaw];
|
||||
_guidanceParameters set [2, _pitch];
|
||||
|
||||
|
@ -5,7 +5,7 @@
|
||||
// #define DRAW_GUIDANCE_INFO
|
||||
// #define ENABLE_PROJECTILE_CAMERA
|
||||
// #define DEBUG_MODE_FULL
|
||||
#define DISABLE_COMPILE_CACHE
|
||||
// #define DISABLE_COMPILE_CACHE
|
||||
// #define ENABLE_PERFORMANCE_COUNTERS
|
||||
|
||||
#ifdef DEBUG_ENABLED_MISSILEGUIDANCE
|
||||
|
Loading…
Reference in New Issue
Block a user