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

readded seperate debug draw define

Browse Source
This commit is contained in:
lambdatiger 2024-01-09 23:17:08 -06:00
parent fc7d68e129
commit d25d6a61b3
9 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/frag/XEH_postInit.sqf
View File

@ -16,7 +16,7 @@
["ace_firedNonPlayerVehicle", LINKFUNC(fired)] call CBA_fnc_addEventHandler;*/ ["ace_firedNonPlayerVehicle", LINKFUNC(fired)] call CBA_fnc_addEventHandler;*/
// Debug info // Debug info
#ifdef DEBUG_MODE_FULL #ifdef DEBUG_MODE_DRAW
if (hasInterface && GVAR(debugOptions)) then { if (hasInterface && GVAR(debugOptions)) then {
private _h = [LINKFUNC(dev_drawTrace), 0] call CBA_fnc_addPerFrameHandler; private _h = [LINKFUNC(dev_drawTrace), 0] call CBA_fnc_addPerFrameHandler;
missionNamespace setVariable [QGVAR(dev_drawPFEH), _h]; missionNamespace setVariable [QGVAR(dev_drawPFEH), _h];

2
addons/frag/functions/fnc_doFrag.sqf
View File

@ -19,6 +19,7 @@
* *
* Public: No * Public: No
*/ */
TRACE_1("",_this);
params ["_args", ["_isSubMunit", false, [false]]]; params ["_args", ["_isSubMunit", false, [false]]];
_args params [ _args params [
["_proj", objNull, [objNull]], ["_proj", objNull, [objNull]],
@ -27,7 +28,6 @@ _args params [
["_ammo", "", [""]], ["_ammo", "", [""]],
["_shotParents", [objNull, objNull], [[]]] ["_shotParents", [objNull, objNull], [[]]]
]; ];
TRACE_3("",_proj,_posASL,_vel);
private _shotParentVic = _shotParents#0; private _shotParentVic = _shotParents#0;
if (_shotParentVic getVariable [QGVAR(nextFragTime), -1] > CBA_missionTime) exitWith { if (_shotParentVic getVariable [QGVAR(nextFragTime), -1] > CBA_missionTime) exitWith {

2
addons/frag/functions/fnc_doFragRandom.sqf
View File

@ -59,6 +59,8 @@ _fragSpawner setShotParents _shotParents;
#ifdef DEBUG_MODE_FULL #ifdef DEBUG_MODE_FULL
systemChat ("fragging, id: " + getObjectID _proj); systemChat ("fragging, id: " + getObjectID _proj);
#endif
#ifdef DEBUG_MODE_DRAW
_fragSpawner addEventHandler [ _fragSpawner addEventHandler [
"SubmunitionCreated", "SubmunitionCreated",
{ {

5
addons/frag/functions/fnc_doFragTargeted.sqf
View File

@ -156,7 +156,7 @@ private _fragCount = 0; // limit of # of fragments to _maxFrags
_fragObj setVectorDir _vecDir; _fragObj setVectorDir _vecDir;
_fragObj setVelocity (_vecDir vectorMultiply _locFragVel); _fragObj setVelocity (_vecDir vectorMultiply _locFragVel);
_fragObj setShotParents _shotPrnt; _fragObj setShotParents _shotPrnt;
#ifdef DEBUG_MODE_FULL #ifdef DEBUG_MODE_DRAW
[_fragObj, "purple", true] call FUNC(dev_trackObj); [_fragObj, "purple", true] call FUNC(dev_trackObj);
[_targetPos, "orange"] call FUNC(dev_sphereDraw); [_targetPos, "orange"] call FUNC(dev_sphereDraw);
#endif #endif
@ -169,7 +169,6 @@ private _fragCount = 0; // limit of # of fragments to _maxFrags
} forEach _objects; } forEach _objects;
#ifdef DEBUG_MODE_FULL #ifdef DEBUG_MODE_FULL
systemChat ("fragCount cnt: " + str _fragCount); systemChat ("fragCount cnt: " + str _fragCount);
TRACE_1("fragCount",_fragCount);
#endif #endif
TRACE_1("fragCount",_fragCount);
_fragCount _fragCount

4
addons/frag/functions/fnc_doSpall.sqf
View File

@ -50,7 +50,7 @@ for "_i" from 1 to 20 do
if (!lineIntersects [_spallPos, _nPos]) then {break}; if (!lineIntersects [_spallPos, _nPos]) then {break};
_spallPos = +_nPos; _spallPos = +_nPos;
}; };
#ifdef DEBUG_MODE_FULL #ifdef DEBUG_MODE_DRAW
[_spallPos, "orange"] call FUNC(dev_sphereDraw); [_spallPos, "orange"] call FUNC(dev_sphereDraw);
[_lPosASL, "orange"] call FUNC(dev_sphereDraw); [_lPosASL, "orange"] call FUNC(dev_sphereDraw);
#endif #endif
@ -85,7 +85,7 @@ _fragSpawner setVectorDirandUp [vectorDir _projectile, vectorUp _projectile];
_fragSpawner setVelocity (_lVelUnit vectorMultiply _velScalar); _fragSpawner setVelocity (_lVelUnit vectorMultiply _velScalar);
#ifdef DEBUG_MODE_FULL #ifdef DEBUG_MODE_DRAW
_fragSpawner addEventHandler [ _fragSpawner addEventHandler [
"SubmunitionCreated", "SubmunitionCreated",
{ {

4
addons/frag/functions/fnc_doSpallMomentum.sqf
View File

@ -87,7 +87,7 @@ for "_i" from 1 to 20 do
_spallPos = _nPos; _spallPos = _nPos;
}; };
#ifdef DEBUG_MODE_FULL #ifdef DEBUG_MODE_DRAW
if GVAR(dbgSphere) then { if GVAR(dbgSphere) then {
[_spallPos, "green"] call FUNC(dev_sphereDraw); [_spallPos, "green"] call FUNC(dev_sphereDraw);
[_lPosASL vectorAdd _lVelUnit, "orange"] call FUNC(dev_sphereDraw); [_lPosASL vectorAdd _lVelUnit, "orange"] call FUNC(dev_sphereDraw);
@ -126,6 +126,8 @@ if (_material isEqualTo "ground") then {
systemChat "ground spall"; // really shouldn't happen systemChat "ground spall"; // really shouldn't happen
}; };
systemChat ("bSpd: " + str speed _spallSpawner + ", frag: " + _fragSpawnType + ", dm: " + str _deltaMomentum); systemChat ("bSpd: " + str speed _spallSpawner + ", frag: " + _fragSpawnType + ", dm: " + str _deltaMomentum);
#endif
#ifdef DEBUG_MODE_DRAW
_spallSpawner addEventHandler [ _spallSpawner addEventHandler [
"SubmunitionCreated", "SubmunitionCreated",
{ {

2
addons/frag/functions/fnc_initRound.sqf
View File

@ -37,7 +37,7 @@ if (_doFrag) then {
if (isServer) then { if (isServer) then {
[ [
FUNC(doFrag), FUNC(doFrag),
_this + [_ammo, _shotParents] [_this + [_ammo, _shotParents]]
] call CBA_fnc_execNextFrame; ] call CBA_fnc_execNextFrame;
} else { } else {
[ [

2
addons/frag/functions/fnc_submunition.sqf
View File

@ -35,6 +35,6 @@ if (_doSubmunit) then {
_submunitionProjectile addEventHandler ["SubmunitionCreated", {_this call FUNC(submunition)}]; _submunitionProjectile addEventHandler ["SubmunitionCreated", {_this call FUNC(submunition)}];
}; };
#ifdef DEBUG_MODE_FULL #ifdef DEBUG_MODE_DRAW
[_submunitionProjectile] call FUNC(dev_addRound); [_submunitionProjectile] call FUNC(dev_addRound);
#endif #endif

1
addons/frag/script_component.hpp
View File

@ -4,6 +4,7 @@
// #define LOG_FRAG_INFO // #define LOG_FRAG_INFO
#define DEBUG_MODE_FULL #define DEBUG_MODE_FULL
// #define DEBUG_MODE_DRAW
// #define DISABLE_COMPILE_CACHE // #define DISABLE_COMPILE_CACHE
// #define ENABLE_PERFORMANCE_COUNTERS // #define ENABLE_PERFORMANCE_COUNTERS