Skip to content
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

Jump to bottom

optimize magwell preloading #1144

Merged
merged 3 commits into from
May 11, 2019
Merged

optimize magwell preloading #1144

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
259e2f7
optimize magwell preloading
commy2 May 10, 2019
06d65c5
recognize inherited items
commy2 May 10, 2019
1ab7071
fix some test weirdness
commy2 May 11, 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
74 changes: 51 additions & 23 deletions addons/ui/fnc_preload3DEN.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,23 @@ private _cfgMagazines = configFile >> "CfgMagazines";
private _magazines = [];
private _magazinesLists = [];

// cache magwells
private _magwells = call CBA_fnc_createNamespace;

{
private _magazines = [];

{
if (isArray _x) then {
_magazines append getArray _x;
};
} forEach configProperties [_x];

_magwells setVariable [configName _x, _magazines];
} forEach ("true" configClasses (configFile >> "CfgMagazineWells"));

private _cache = [];

{
private _item = toLower configName _x;
(_item call BIS_fnc_itemType) params ["_itemCategory", "_itemType"];
Expand Down Expand Up @@ -114,31 +131,41 @@ private _magazinesLists = [];
};

private _compatibleMagazines = getArray (_muzzleConfig >> "magazines");
{

private _magWell = getArray (_muzzleConfig >> "magazineWell");
if (isNil {_magwells getVariable str _magWell}) then {
private _magazines = [];

{
_compatibleMagazines append getArray _x;
} forEach configProperties [configFile >> "CfgMagazineWells" >> _x, "isArray _x"];
} foreach getArray (_muzzleConfig >> "magazineWell");

{
private _item = toLower _x;

if (_magazinesLists pushBackUnique [_item, _listItem] != -1) then {
private _magazineConfig = _cfgMagazines >> _item;

if (getNumber (_magazineConfig >> "scope") == 2) then {
_listItem pushBack [
getText (_magazineConfig >> "displayName"),
_item,
getText (_magazineConfig >> "picture"),
2,
_item in _magazines
];

_magazines pushBack _item;
_magazines append (_magwells getVariable [_x, []]);
} forEach _magWell;

_magwells setVariable [str _magWell, _magazines];
};

_compatibleMagazines append (_magwells getVariable str _magWell);

if (_cache pushBackUnique [_compatibleMagazines, _listItem] != -1) then {
{
private _item = toLower _x;

if (_magazinesLists pushBackUnique [_item, _listItem] != -1) then {
private _magazineConfig = _cfgMagazines >> _item;

if (getNumber (_magazineConfig >> "scope") == 2) then {
_listItem pushBack [
getText (_magazineConfig >> "displayName"),
_item,
getText (_magazineConfig >> "picture"),
2,
_item in _magazines
];

_magazines pushBack _item;
};
};
};
} forEach _compatibleMagazines;
} forEach _compatibleMagazines;
};
} forEach getArray (_weaponConfig >> "muzzles");
};
};
Expand Down Expand Up @@ -187,5 +214,6 @@ private _listHeadgear = _list select 10;
} forEach ("true" configClasses (configFile >> "CfgGlasses"));

_itemTypes call CBA_fnc_deleteNamespace;
_magwells call CBA_fnc_deleteNamespace;

true
70 changes: 49 additions & 21 deletions addons/ui/fnc_preloadCurator.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,23 @@ private _cfgMagazines = configFile >> "CfgMagazines";
private _magazines = [];
private _magazinesLists = [];

// cache magwells
private _magwells = call CBA_fnc_createNamespace;

{
private _magazines = [];

{
if (isArray _x) then {
_magazines append getArray _x;
};
} forEach configProperties [_x];

_magwells setVariable [configName _x, _magazines];
} forEach ("true" configClasses (configFile >> "CfgMagazineWells"));

private _cache = [];

{
private _patchConfig = _cfgPatches >> _x;
_addon = toLower _x;
Expand Down Expand Up @@ -131,34 +148,44 @@ private _magazinesLists = [];
};

private _compatibleMagazines = getArray (_muzzleConfig >> "magazines");
{

private _magWell = getArray (_muzzleConfig >> "magazineWell");
if (isNil {_magwells getVariable str _magWell}) then {
private _magazines = [];

{
_compatibleMagazines append getArray _x;
} forEach configProperties [configFile >> "CfgMagazineWells" >> _x, "isArray _x"];
} foreach getArray (_muzzleConfig >> "magazineWell");
_magazines append (_magwells getVariable [_x, []]);
} forEach _magWell;

{
private _item = toLower _x;
_magwells setVariable [str _magWell, _magazines];
};

if (_magazinesLists pushBackUnique [_item, _listItem] != -1) then {
private _magazineConfig = _cfgMagazines >> _item;
_compatibleMagazines append (_magwells getVariable str _magWell);

if (getNumber (_magazineConfig >> "scope") == 2) then {
private _displayName = getText (_magazineConfig >> "displayName");
if (_cache pushBackUnique [_compatibleMagazines, _listItem] != -1) then {
{
private _item = toLower _x;

_listItem pushBack [
_displayName,
_displayName,
_item,
getText (_magazineConfig >> "picture"),
2,
_item in _magazines
];
if (_magazinesLists pushBackUnique [_item, _listItem] != -1) then {
private _magazineConfig = _cfgMagazines >> _item;

_magazines pushBack _item;
if (getNumber (_magazineConfig >> "scope") == 2) then {
private _displayName = getText (_magazineConfig >> "displayName");

_listItem pushBack [
_displayName,
_displayName,
_item,
getText (_magazineConfig >> "picture"),
2,
_item in _magazines
];

_magazines pushBack _item;
};
};
};
} forEach _compatibleMagazines;
} forEach _compatibleMagazines;
};
} forEach getArray (_weaponConfig >> "muzzles");
};
};
Expand Down Expand Up @@ -199,5 +226,6 @@ private _magazinesLists = [];
} forEach call (uiNamespace getVariable QEGVAR(common,addons));

_itemTypes call CBA_fnc_deleteNamespace;
_magwells call CBA_fnc_deleteNamespace;

true
5 changes: 3 additions & 2 deletions addons/ui/test_preload.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ if (!canSuspend) exitWith {
isNil {
with uiNamespace do {
// 3DEN
TEST_DEFINED(QFUNC(preload3DEN),"");

AmmoBox_list = nil;
["onLoad", [controlNull]] call compile preprocessFile "\a3\3den\UI\Attributes\AmmoBox.sqf";
};
Expand All @@ -19,6 +17,9 @@ waitUntil {!isNil {uiNamespace getVariable "AmmoBox_list"}};

isNil {
with uiNamespace do {
// 3DEN
TEST_DEFINED(QFUNC(preload3DEN),"");

private _vanilla = AmmoBox_list;

AmmoBox_list = nil;
Expand Down