Skip to content

3.3.3 performance fixes #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Spoffy wants to merge 2 commits into
base: 3.3.3-develop
Choose a base branch
from
Open

3.3.3 performance fixes #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90bfbfa
Switches to efficient SideIsEnemy
Spoffy Nov 22, 2019
8daed0d
Significantly optimises fn_ClstKnwnEnmy.sqf
Spoffy Nov 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Vcom/Functions/VCM_Functions/fn_ClstEmy.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ private _unitSide = (side _this);
private _a1 = [];
{
private _targetSide = side _x;
if ([_unitSide, _targetSide] call BIS_fnc_sideIsEnemy && {!(vehicle _X isKindOf "Air")}) then {_a1 pushback _x;};
if ([_unitSide, _targetSide] call VCM_fnc_SideIsEnemy && {!(vehicle _X isKindOf "Air")}) then {_a1 pushback _x;};
} forEach allUnits;

private _rtrn = [_a1,_this,true,"1"] call VCM_fnc_ClstObj;
Expand Down
21 changes: 4 additions & 17 deletions Vcom/Functions/VCM_Functions/fn_ClstKnwnEnmy.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,10 @@
nil
*/

private _NearTargets = (leader _this) neartargets 2000;
private _leader = leader _this;

private _unitSide = side _this;
private _a1 = [];
{
private _NearTargets = _leader nearEntities ["Man", 1000] select {[side _leader, side _x] call VCM_fnc_SideIsEnemy} apply {[_x distance2D player, _x]};

if ([_unitSide, (_x # 2)] call BIS_fnc_sideIsEnemy && {!((_x # 1) isKindOf "Air")}) then
{
_a1 pushback [(_x # 5),(_x # 4)];
};
} foreach _NearTargets;
_NearTargets sort true;


if (count _a1 > 0) then
{
_a1 sort true;
};


_a1
_NearTargets;
2 changes: 1 addition & 1 deletion Vcom/Functions/VCM_Functions/fn_EnemyArray.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ private _targetSide = "";
private _array1 = [];
{
_targetSide = side _x;
if ([_unitSide, _targetSide] call BIS_fnc_sideIsEnemy) then {_array1 pushback _x;};
if ([_unitSide, _targetSide] call VCM_fnc_SideIsEnemy) then {_array1 pushback _x;};

} forEach allUnits;
_array1
2 changes: 1 addition & 1 deletion Vcom/Functions/VCM_Functions/fn_FriendlyArray.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ private _UnitSide = side (group _this);
private _Array1 = [];
{
private _TargetSide = side _x;
if (!([_UnitSide, _TargetSide] call BIS_fnc_sideIsEnemy) && {!(_x in (units (group _this)))} && {alive _x}) then {_Array1 pushback _x;};
if (!([_UnitSide, _TargetSide] call VCM_fnc_SideIsEnemy) && {!(_x in (units (group _this)))} && {alive _x}) then {_Array1 pushback _x;};
} forEach allUnits;
_Array1
2 changes: 1 addition & 1 deletion Vcom/Functions/VCM_Functions/fn_FrmChnge.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ _unit = _this;
_group = group _unit;

//Vehicular groups in "SAFE" behaviour will move in convoys
if (!isNull objectParent _unit && {behaviour _unit isEqualTo "SAFE"}) exitWith
if (!isNull objectParent _unit && {behaviour _unit == "SAFE"}) exitWith

@shukari shukari Dec 2, 2019

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

isEqualTo is faster because it is case sensitive... and behaviour only outputs "SAFE"

{
_group setFormation "FILE";
//Set the units variable so they dont try changing formations too frequently.
Expand Down
2 changes: 1 addition & 1 deletion Vcom/Functions/VCM_Functions/fn_IRCHECK.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ while {alive player && {Vcm_ActivateAI}} do
if !(_lineInter isEqualTo []) then
{
private _finalPos = (_lineInter select 0 select 0);
private _enemies = allUnits select {[_side,(side _x)] call BIS_fnc_sideIsEnemy && (currentVisionMode _x isEqualTo 1)};
private _enemies = allUnits select {[_side,(side _x)] call VCM_fnc_SideIsEnemy && (currentVisionMode _x isEqualTo 1)};
private _dirPlayer = getdir Player;
if !(_enemies isEqualTo []) then
{
Expand Down
2 changes: 1 addition & 1 deletion Vcom/Functions/VCM_Functions/fn_MineMonitor.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ private _RemoveLst = [];
{
{
_TargetSide = side _x;
if ([_Side, _TargetSide] call BIS_fnc_sideIsEnemy) then {_EL pushback _x;};
if ([_Side, _TargetSide] call VCM_fnc_SideIsEnemy) then {_EL pushback _x;};
} forEach _Nearbylist;

if (count _EL > 0) then
Expand Down
2 changes: 1 addition & 1 deletion Vcom/Functions/VCM_Functions/fn_RangeEngage.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ if (count _NearestEnemy > 0) then

private _ShootArray = [];
{
if (_x # 0 < 15) then
if (_Group knowsAbout (_x # 1) > 1.5) then
{
_ShootArray pushback (_x # 1);
};
Expand Down
2 changes: 1 addition & 1 deletion Vcom/Functions/VCM_Functions/fn_SniperEngage.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ if (count _NearestEnemys > 0) then

private _ShootArray = [];
{
if (_x # 0 < 15) then
if (_Group knowsAbout _x >= 1.5) then
{
_ShootArray pushback (_x # 1);
};
Expand Down
17 changes: 17 additions & 0 deletions Vcom/Functions/VCM_Functions/fn_sideIsEnemy.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/**
A version of BI's sideIsEnemy, without the massive performance overhead.
**/

params ["_center", "_side"];

private _sides = [east, west, independent, civilian, sideUnknown, sideEnemy, sideFriendly, sideLogic, sideEmpty, sideAmbientLife];
private _friendshipConst = 0.6;

private _index = _sides find _side;

if (_index isEqualTo 6) exitWith {false};
if (_index isEqualTo 5) exitWith {true};

if (_index < 0 || _index >= 4) exitWith {false};

_center getFriend _side < _friendshipConst;
2 changes: 2 additions & 0 deletions Vcom/cfgFunctions.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,8 @@ class VCOM
//[] call VCM_fnc_UpdateDrivers;
class UpdateDrivers {};

//[side1, side2] call VCM_fnc_SideIsEnemy
class SideIsEnemy {};
};

};