From e1b9529d6fab89c672636cdb86e3a780fa2ae99f Mon Sep 17 00:00:00 2001 From: Asval Date: Fri, 14 Feb 2025 17:31:29 +0100 Subject: [PATCH] pagination qa --- CUE4Parse | 2 +- FModel/MainWindow.xaml.cs | 2 +- FModel/ViewModels/CUE4ParseViewModel.cs | 11 ++++++----- FModel/Views/Snooper/Options.cs | 1 + 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CUE4Parse b/CUE4Parse index 7001bda7..2aed4da1 160000 --- a/CUE4Parse +++ b/CUE4Parse @@ -1 +1 @@ -Subproject commit 7001bda784112a00e15968e3d49d5a237907afd0 +Subproject commit 2aed4da1ee440cd421222526bdc501031f685be6 diff --git a/FModel/MainWindow.xaml.cs b/FModel/MainWindow.xaml.cs index badfeffd..6e469d96 100644 --- a/FModel/MainWindow.xaml.cs +++ b/FModel/MainWindow.xaml.cs @@ -85,7 +85,7 @@ public partial class MainWindow #if DEBUG // await _threadWorkerView.Begin(cancellationToken => // _applicationView.CUE4Parse.Extract(cancellationToken, - // _applicationView.CUE4Parse.Provider["FortniteGame/Plugins/GameFeatures/Juno/JunoGame/Content/Environments/Landscape/GrassType/M_Juno_LS_Grass.uasset"])); + // _applicationView.CUE4Parse.Provider["Marvel/Content/Marvel/Characters/1050/1050300/Meshes/SK_1050_1050300_Lobby.uasset"])); // await _threadWorkerView.Begin(cancellationToken => // _applicationView.CUE4Parse.Extract(cancellationToken, // "RED/Content/Chara/ABA/Costume01/Animation/Charaselect/body/stand_body01.uasset")); diff --git a/FModel/ViewModels/CUE4ParseViewModel.cs b/FModel/ViewModels/CUE4ParseViewModel.cs index 4a820a62..2d668df1 100644 --- a/FModel/ViewModels/CUE4ParseViewModel.cs +++ b/FModel/ViewModels/CUE4ParseViewModel.cs @@ -133,17 +133,18 @@ public class CUE4ParseViewModel : ViewModel customVersions: new FCustomVersionContainer(currentDir.Versioning.CustomVersions), optionOverrides: currentDir.Versioning.Options, mapStructTypesOverrides: currentDir.Versioning.MapStructTypes); + var pathComparer = StringComparer.OrdinalIgnoreCase; switch (gameDirectory) { case Constants._FN_LIVE_TRIGGER: { - Provider = new StreamedFileProvider("FortniteLive", versionContainer); + Provider = new StreamedFileProvider("FortniteLive", versionContainer, pathComparer); break; } case Constants._VAL_LIVE_TRIGGER: { - Provider = new StreamedFileProvider("ValorantLive", versionContainer); + Provider = new StreamedFileProvider("ValorantLive", versionContainer, pathComparer); break; } default: @@ -155,12 +156,12 @@ public class CUE4ParseViewModel : ViewModel [ new(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "\\StateOfDecay2\\Saved\\Paks"), new(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "\\StateOfDecay2\\Saved\\DisabledPaks") - ], SearchOption.AllDirectories, versionContainer), + ], SearchOption.AllDirectories, versionContainer, pathComparer), "eFootball" => new DefaultFileProvider(new DirectoryInfo(gameDirectory), [ new(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData) + "\\KONAMI\\eFootball\\ST\\Download") - ], SearchOption.AllDirectories, versionContainer), - _ => new DefaultFileProvider(gameDirectory, SearchOption.AllDirectories, versionContainer) + ], SearchOption.AllDirectories, versionContainer, pathComparer), + _ => new DefaultFileProvider(gameDirectory, SearchOption.AllDirectories, versionContainer, pathComparer) }; break; diff --git a/FModel/Views/Snooper/Options.cs b/FModel/Views/Snooper/Options.cs index b081de94..d4201392 100644 --- a/FModel/Views/Snooper/Options.cs +++ b/FModel/Views/Snooper/Options.cs @@ -190,6 +190,7 @@ public class Options { var guid = o.LightingGuid; if (Textures.TryGetValue(guid, out texture)) return texture != null; + if (o.Format == EPixelFormat.PF_BC6H) return false; // BC6H is not supported by Decode thus randomly crashes the app SKBitmap bitmap = o switch {