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

changed files names and small optimizations

Browse Source
This commit is contained in:
lambdatiger 2024-01-10 17:41:13 -06:00
parent ebf1a707c1
commit 2a1f609e3c
4 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
addons/frag/functions/fnc_doSpallMomentum.sqf → addons/frag/functions/fnc_doSpall.sqf
View File

@ -31,16 +31,17 @@ params [
["_vUp", [0,0,1]]
];
if (CBA_missionTime - GVAR(lastSpallTime) < ACE_FRAG_SPALL_HOLDOFF) exitWith {
TRACE_2("timeExit",CBA_missionTime,GVAR(lastSpallTime));
if (CBA_missionTime - GVAR(lastSpallTime) < ACE_FRAG_SPALL_HOLDOFF ||
_lPosASL isEqualTo [0,0,0] ||
{isNull _hitObj || {_hitObj isKindOf "man"}}) exitWith {
TRACE_4("time/invldHit",CBA_missionTime,GVAR(lastSpallTime),_hitObj,_lPosASL);
};
if (isNull _hitObj || {_hitObj isKindOf "man"}) exitWith {
TRACE_1("invalidHit",_hitObj);
};
if (_lPosASL isEqualTo [0,0,0]) exitWith {
TRACE_1("Problem with hitPart data - bad pos",_lPosASL);
private _material = [_surfaceType] call FUNC(getMaterialInfo);
if (_material isEqualTo "ground") then {
#ifdef DEBUG_MODE_FULL
systemChat "ground spall"; // really shouldn't happen
#endif
};
private _vel = if (alive _projectile) then {
@ -49,7 +50,6 @@ private _vel = if (alive _projectile) then {
[0, 0, 0]
};
// Find spall speed / fragment
private _dV = vectorMagnitude _lVel - vectorMagnitude _vel;
private _caliber = getNumber (configFile >> "cfgAmmo" >> _ammo >> "caliber"); // !*! optimize this later?
@ -61,7 +61,6 @@ if (_deltaMomentum < 2) exitWith {
TRACE_1("lowImpulse",_ammo);
};
private _material = [_surfaceType] call FUNC(getMaterialInfo);
//** start calculating where the spalling should come !*! could be better **//
private _lVelUnit = vectorNormalized _lVel;
@ -120,11 +119,8 @@ private _spallSpawner = createVehicleLocal [
_spallSpawner setVectorDirandUp [_lVelUnit, _vUp];
_spallSpawner setVelocity (_lVelUnit vectorMultiply (_dV/2));
_spallSpawner setShotParents _shotParents;
profilerLog "spalled";
#ifdef DEBUG_MODE_FULL
if (_material isEqualTo "ground") then {
systemChat "ground spall"; // really shouldn't happen
};
systemChat ("bSpd: " + str speed _spallSpawner + ", frag: " + _fragSpawnType + ", dm: " + str _deltaMomentum);
#endif
#ifdef DEBUG_MODE_DRAW

6
addons/frag/functions/fnc_getMaterialInfo.sqf
View File

@ -29,14 +29,12 @@ if (isClass (configFile >> "CfgSurfaces" >> _surfType)) then {
_material = getText (configFile >> "CfgSurfaces" >> _surfType >> "soundEnviron");
} else { // Messy way when a surface isn't added to cfgSurfaces
private _surfFileText = tolower preprocessFile _surfType;
_surfFileText = _surfFileText regexReplace ["[^A-Za-z0-9]", ""];
_surfFileText = _surfFileText regexReplace ["[^a-z0-9]", ""];
private _idx = 12 + (_surfFileText find "soundenviron");
if (_surfFileText select [_idx, 5] isEqualTo "empty") then {
_idx = 8 + (_surfFileText find "soundhit");
_material = _surfFileText select [_idx, 10];
} else {
_material = _surfFileText select [_idx, 10];
};
_material = _surfFileText select [_idx, 10];
};
TRACE_1("materialSubString",_material);

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

@ -37,12 +37,12 @@ if (_doFrag) then {
if (isServer) then {
[
FUNC(doFrag),
[_this + [_ammo, _shotParents]]
_this + [_ammo, _shotParents]
] call CBA_fnc_execNextFrame;
} else {
[
QGVAR(frag_eh),
[_this + [_ammo, _shotParents]]
_this + [_ammo, _shotParents]
] call CBA_fnc_serverEvent;
};
}
@ -57,13 +57,13 @@ if (GVAR(spallEnabled) && {_shouldSpall}) then
_projectile addEventHandler [
"HitPart",
{
params ["_proj", "_hitObj", "",
"_posASL", "_vel", "_sNorm", "",
"", "_surfType"
];
params ["_proj", "_hitObj", "",
"_posASL", "_vel", "_sNorm", "",
"", "_surfType"
];
private _shotPrnt = getShotParents _proj;
private _ammo = typeOf _proj;
private _vUp = vectorUp _proj;
private _vUp = vectorUp _proj;
if (isServer) then {
[
LINKFUNC(doSpall),

2
addons/frag/script_component.hpp
View File

@ -3,7 +3,7 @@
#include "\z\ace\addons\main\script_mod.hpp"
// #define LOG_FRAG_INFO
#define DEBUG_MODE_FULL
// #define DEBUG_MODE_FULL
// #define DEBUG_MODE_DRAW
// #define DISABLE_COMPILE_CACHE
// #define ENABLE_PERFORMANCE_COUNTERS