epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-enabled All Packages which seems to be fast enough now.

Browse Source
This commit is contained in:
Matthias Mailänder
2016-02-07 14:21:33 +01:00
parent 6aac8c5f70
commit 5e0a89fa30
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs
View File

@@ -343,9 +343,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
return item; return item;
}; };
// TODO: Re-enable "All Packages" once list generation is done in a background thread var sources = new[] { (IReadOnlyPackage)null }.Concat(Game.ModData.ModFiles.MountedPackages);
// var sources = new[] { (IPackage)null }.Concat(GlobalFileSystem.MountedFolders);
var sources = Game.ModData.ModFiles.MountedPackages;
dropdown.ShowDropDown("LABEL_DROPDOWN_TEMPLATE", 280, sources, setupItem); dropdown.ShowDropDown("LABEL_DROPDOWN_TEMPLATE", 280, sources, setupItem);
return true; return true;
} }
@@ -355,14 +353,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
assetList.RemoveChildren(); assetList.RemoveChildren();
availableShps.Clear(); availableShps.Clear();
// TODO: This is too slow to run in the main thread var files = assetSource != null ? assetSource.Contents : Game.ModData.ModFiles.MountedPackages.SelectMany(f => f.Contents).Distinct();
// var files = AssetSource != null ? AssetSource.AllFileNames() : foreach (var file in files.OrderBy(s => s))
// GlobalFileSystem.MountedFolders.SelectMany(f => f.AllFileNames());
if (assetSource == null)
return;
var files = assetSource.Contents.OrderBy(s => s);
foreach (var file in files)
{ {
if (allowedExtensions.Any(ext => file.EndsWith(ext, true, CultureInfo.InvariantCulture))) if (allowedExtensions.Any(ext => file.EndsWith(ext, true, CultureInfo.InvariantCulture)))
{ {