diff --git a/CUE4Parse b/CUE4Parse index b337a88a..c6a6e8b5 160000 --- a/CUE4Parse +++ b/CUE4Parse @@ -1 +1 @@ -Subproject commit b337a88a7ec41d6542337687ec01f79fe03cb825 +Subproject commit c6a6e8b519a30f9a3fbf8c61e0f2cead10826ae1 diff --git a/FModel/ViewModels/CUE4ParseViewModel.cs b/FModel/ViewModels/CUE4ParseViewModel.cs index b0663ed8..712be0ee 100644 --- a/FModel/ViewModels/CUE4ParseViewModel.cs +++ b/FModel/ViewModels/CUE4ParseViewModel.cs @@ -118,6 +118,13 @@ public CUE4ParseViewModel(string gameDirectory) SearchOption.AllDirectories, true, versions); break; } + case FGame.FortniteGame: + Provider = new DefaultFileProvider(new DirectoryInfo(gameDirectory), new List + { + new(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "\\FortniteGame\\Saved\\PersistentDownloadDir\\InstalledBundles"), + }, + SearchOption.AllDirectories, true, versions); + break; case FGame.Unknown when UserSettings.Default.ManualGames.TryGetValue(gameDirectory, out var settings): { versions = new VersionContainer(settings.OverridedGame, UserSettings.Default.OverridedPlatform, @@ -769,7 +776,14 @@ private void SaveAndPlaySound(string fullPath, string ext, byte[] data) private void SaveExport(UObject export) { - var toSave = new Exporter(export, UserSettings.Default.TextureExportFormat, UserSettings.Default.LodExportFormat, UserSettings.Default.MeshExportFormat, UserSettings.Default.OverridedPlatform); + var exportOptions = new ExporterOptions() + { + TextureFormat = UserSettings.Default.TextureExportFormat, + LodFormat = UserSettings.Default.LodExportFormat, + MeshFormat = UserSettings.Default.MeshExportFormat, + Platform = UserSettings.Default.OverridedPlatform + }; + var toSave = new Exporter(export, exportOptions); var toSaveDirectory = new DirectoryInfo(UserSettings.Default.ModelDirectory); if (toSave.TryWriteToDir(toSaveDirectory, out var savedFileName)) { diff --git a/FModel/ViewModels/ModelViewerViewModel.cs b/FModel/ViewModels/ModelViewerViewModel.cs index 9686b789..016186a6 100644 --- a/FModel/ViewModels/ModelViewerViewModel.cs +++ b/FModel/ViewModels/ModelViewerViewModel.cs @@ -184,9 +184,16 @@ public async Task SaveLoadedModels() await _threadWorkerView.Begin(_ => { + var exportOptions = new CUE4Parse_Conversion.ExporterOptions() + { + TextureFormat = UserSettings.Default.TextureExportFormat, + LodFormat = UserSettings.Default.LodExportFormat, + MeshFormat = UserSettings.Default.MeshExportFormat, + Platform = UserSettings.Default.OverridedPlatform + }; foreach (var model in _loadedModels) { - var toSave = new CUE4Parse_Conversion.Exporter(model.Export, UserSettings.Default.TextureExportFormat, UserSettings.Default.LodExportFormat, UserSettings.Default.MeshExportFormat, UserSettings.Default.OverridedPlatform); + var toSave = new CUE4Parse_Conversion.Exporter(model.Export, exportOptions); if (toSave.TryWriteToDir(new DirectoryInfo(folderBrowser.SelectedPath), out var savedFileName)) { Log.Information("Successfully saved {FileName}", savedFileName);