diff --git a/CUE4Parse b/CUE4Parse index 1692f1e6..2ed1bd1d 160000 --- a/CUE4Parse +++ b/CUE4Parse @@ -1 +1 @@ -Subproject commit 1692f1e6c3bdc7a0af4e926cfbcdfc52e5ad424e +Subproject commit 2ed1bd1daafc57f5fc09991964fc55dabd21548e diff --git a/FModel/MainWindow.xaml b/FModel/MainWindow.xaml index b574a4f2..e46eac51 100644 --- a/FModel/MainWindow.xaml +++ b/FModel/MainWindow.xaml @@ -349,7 +349,7 @@ - + @@ -517,7 +517,7 @@ - + diff --git a/FModel/MainWindow.xaml.cs b/FModel/MainWindow.xaml.cs index 7714cd4e..6dcede02 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, - // "fortnitegame/Content/Characters/Player/Female/Large/Bodies/F_LRG_BunnyBR/Meshes/F_LRG_BunnyBR.uasset")); + // "FortniteGame/Content/Athena/Apollo/Maps/UI/Apollo_Terrain_Minimap.uasset")); // await _threadWorkerView.Begin(cancellationToken => // _applicationView.CUE4Parse.Extract(cancellationToken, // "FortniteGame/Content/Environments/Helios/Props/GlacierHotel/GlacierHotel_Globe_A/Meshes/SM_GlacierHotel_Globe_A.uasset")); diff --git a/FModel/ViewModels/TabControlViewModel.cs b/FModel/ViewModels/TabControlViewModel.cs index 63aed8a9..0a86f055 100644 --- a/FModel/ViewModels/TabControlViewModel.cs +++ b/FModel/ViewModels/TabControlViewModel.cs @@ -69,7 +69,7 @@ public class TabImage : ViewModel return; } _bmp = bitmap; - using var data = _bmp.Encode(NoAlpha ? SKEncodedImageFormat.Jpeg : SKEncodedImageFormat.Png, 100); + using var data = _bmp.Encode(NoAlpha ? ETextureFormat.Jpeg : UserSettings.Default.TextureExportFormat, 100); using var stream = new MemoryStream(ImageBuffer = data.ToArray(), false); var image = new BitmapImage(); image.BeginInit(); @@ -301,7 +301,15 @@ public class TabItem : ViewModel private void SaveImage(TabImage image, bool updateUi) { if (image == null) return; - var fileName = $"{image.ExportName}.png"; + + var ext = UserSettings.Default.TextureExportFormat switch + { + ETextureFormat.Png => ".png", + ETextureFormat.Tga => ".tga", + _ => ".png" + }; + + var fileName = image.ExportName + ext; var path = Path.Combine(UserSettings.Default.TextureDirectory, UserSettings.Default.KeepDirectoryStructure ? Directory : "", fileName!).Replace('\\', '/'); diff --git a/FModel/Views/Resources/Resources.xaml b/FModel/Views/Resources/Resources.xaml index f63e0f62..aa279955 100644 --- a/FModel/Views/Resources/Resources.xaml +++ b/FModel/Views/Resources/Resources.xaml @@ -872,7 +872,7 @@ - + diff --git a/FModel/Views/SearchView.xaml b/FModel/Views/SearchView.xaml index c038c114..340b2584 100644 --- a/FModel/Views/SearchView.xaml +++ b/FModel/Views/SearchView.xaml @@ -185,7 +185,7 @@ - +