From 2533166f5da18d0db5c1004e9afdb7dc6435d287 Mon Sep 17 00:00:00 2001 From: 4sval Date: Thu, 1 Sep 2022 21:00:41 +0200 Subject: [PATCH] bump --- CUE4Parse | 2 +- FModel/App.xaml.cs | 4 ++++ FModel/Creator/Bases/FN/BaseCommunity.cs | 2 +- FModel/Creator/Bases/FN/BaseIcon.cs | 2 +- FModel/Creator/Bases/FN/BaseIconStats.cs | 4 ++-- FModel/FModel.csproj | 1 - FModel/FModel.sln | 6 ------ FModel/ViewModels/ModelViewerViewModel.cs | 20 ++------------------ 8 files changed, 11 insertions(+), 30 deletions(-) diff --git a/CUE4Parse b/CUE4Parse index 67a3af8b..19dfffa9 160000 --- a/CUE4Parse +++ b/CUE4Parse @@ -1 +1 @@ -Subproject commit 67a3af8b005e20b14846e77db759382084b989df +Subproject commit 19dfffa9e55d0951e7da75789e65c8c4e6e62a3e diff --git a/FModel/App.xaml.cs b/FModel/App.xaml.cs index b09146f7..f889e0f4 100644 --- a/FModel/App.xaml.cs +++ b/FModel/App.xaml.cs @@ -89,9 +89,13 @@ public partial class App Directory.CreateDirectory(Path.Combine(UserSettings.Default.OutputDirectory, "Logs")); Directory.CreateDirectory(Path.Combine(UserSettings.Default.OutputDirectory, ".data")); +#if DEBUG + Log.Logger = new LoggerConfiguration().WriteTo.Console(theme: AnsiConsoleTheme.Literate).CreateLogger(); +#else Log.Logger = new LoggerConfiguration().WriteTo.Console(theme: AnsiConsoleTheme.Literate).WriteTo.File( Path.Combine(UserSettings.Default.OutputDirectory, "Logs", $"FModel-Log-{DateTime.Now:yyyy-MM-dd}.txt"), outputTemplate: "{Timestamp:yyyy-MM-dd HH:mm:ss} [FModel] [{Level:u3}] {Message:lj}{NewLine}{Exception}").CreateLogger(); +#endif Log.Information("Version {Version}", Constants.APP_VERSION); Log.Information("{OS}", GetOperatingSystemProductName()); diff --git a/FModel/Creator/Bases/FN/BaseCommunity.cs b/FModel/Creator/Bases/FN/BaseCommunity.cs index 1e0a7294..0967d38a 100644 --- a/FModel/Creator/Bases/FN/BaseCommunity.cs +++ b/FModel/Creator/Bases/FN/BaseCommunity.cs @@ -1,8 +1,8 @@ +using CUE4Parse.FN.Enums; using CUE4Parse.UE4.Assets.Exports; using CUE4Parse.UE4.Objects.GameplayTags; using CUE4Parse.UE4.Objects.UObject; using CUE4Parse.UE4.Versions; -using CUE4Parse_Fortnite.Enums; using FModel.Extensions; using FModel.Framework; using FModel.Services; diff --git a/FModel/Creator/Bases/FN/BaseIcon.cs b/FModel/Creator/Bases/FN/BaseIcon.cs index 048e6a0e..15f792e6 100644 --- a/FModel/Creator/Bases/FN/BaseIcon.cs +++ b/FModel/Creator/Bases/FN/BaseIcon.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Windows; +using CUE4Parse.FN.Enums; using CUE4Parse.UE4.Assets.Exports; using CUE4Parse.UE4.Assets.Exports.Engine; using CUE4Parse.UE4.Assets.Exports.Material; @@ -12,7 +13,6 @@ using CUE4Parse.UE4.Objects.Core.Math; using CUE4Parse.UE4.Objects.GameplayTags; using CUE4Parse.UE4.Objects.UObject; using CUE4Parse_Conversion.Textures; -using CUE4Parse_Fortnite.Enums; using FModel.Settings; using SkiaSharp; diff --git a/FModel/Creator/Bases/FN/BaseIconStats.cs b/FModel/Creator/Bases/FN/BaseIconStats.cs index a23e02fc..3a8e374f 100644 --- a/FModel/Creator/Bases/FN/BaseIconStats.cs +++ b/FModel/Creator/Bases/FN/BaseIconStats.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using CUE4Parse.FN.Enums; using CUE4Parse.UE4.Assets.Exports; using CUE4Parse.UE4.Assets.Exports.Engine; using CUE4Parse.UE4.Assets.Objects; @@ -7,7 +8,6 @@ using CUE4Parse.UE4.Objects.Core.i18N; using CUE4Parse.UE4.Objects.Engine.Curves; using CUE4Parse.UE4.Objects.GameplayTags; using CUE4Parse.UE4.Objects.UObject; -using CUE4Parse_Fortnite.Enums; using FModel.Extensions; using FModel.Framework; using SkiaSharp; @@ -288,4 +288,4 @@ public class IconStat var sliderWidth = (sliderRight - height * 2) * (floatValue / _maxValue); c.DrawRect(new SKRect(height * 2, y, Math.Min(height * 2 + sliderWidth, sliderRight), y + 5), _statPaint); } -} \ No newline at end of file +} diff --git a/FModel/FModel.csproj b/FModel/FModel.csproj index f052d827..bda144c4 100644 --- a/FModel/FModel.csproj +++ b/FModel/FModel.csproj @@ -127,7 +127,6 @@ - diff --git a/FModel/FModel.sln b/FModel/FModel.sln index 7de93e7b..238d1b59 100644 --- a/FModel/FModel.sln +++ b/FModel/FModel.sln @@ -7,8 +7,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FModel", "FModel.csproj", " EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CUE4Parse", "..\CUE4Parse\CUE4Parse\CUE4Parse.csproj", "{C4620341-BBB7-4384-AC7D-5082D3E0386E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CUE4Parse-Fortnite", "..\CUE4Parse\CUE4Parse-Fortnite\CUE4Parse-Fortnite.csproj", "{7765FB4C-B54D-427B-ABB6-1073687E56BD}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CUE4Parse-Conversion", "..\CUE4Parse\CUE4Parse-Conversion\CUE4Parse-Conversion.csproj", "{D0E1E8F7-F56D-469A-8E24-C2439B9FFD83}" EndProject Global @@ -25,10 +23,6 @@ Global {C4620341-BBB7-4384-AC7D-5082D3E0386E}.Debug|Any CPU.Build.0 = Debug|Any CPU {C4620341-BBB7-4384-AC7D-5082D3E0386E}.Release|Any CPU.ActiveCfg = Release|Any CPU {C4620341-BBB7-4384-AC7D-5082D3E0386E}.Release|Any CPU.Build.0 = Release|Any CPU - {7765FB4C-B54D-427B-ABB6-1073687E56BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7765FB4C-B54D-427B-ABB6-1073687E56BD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7765FB4C-B54D-427B-ABB6-1073687E56BD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7765FB4C-B54D-427B-ABB6-1073687E56BD}.Release|Any CPU.Build.0 = Release|Any CPU {D0E1E8F7-F56D-469A-8E24-C2439B9FFD83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D0E1E8F7-F56D-469A-8E24-C2439B9FFD83}.Debug|Any CPU.Build.0 = Debug|Any CPU {D0E1E8F7-F56D-469A-8E24-C2439B9FFD83}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/FModel/ViewModels/ModelViewerViewModel.cs b/FModel/ViewModels/ModelViewerViewModel.cs index 6aada8bf..34018f77 100644 --- a/FModel/ViewModels/ModelViewerViewModel.cs +++ b/FModel/ViewModels/ModelViewerViewModel.cs @@ -444,24 +444,8 @@ public class ModelViewerViewModel : ViewModel if (parameters.Specular is UTexture2D specular) { var mip = specular.GetFirstMip(); - byte[] data; - SKColorType colorType; - switch (UserSettings.Default.OverridedPlatform) - { - case ETexturePlatform.Playstation: - PlaystationDecoder.DecodeTexturePlaystation(mip, specular.Format, specular.isNormalMap, - out data, out colorType); - break; - case ETexturePlatform.NintendoSwitch: - NintendoSwitchDecoder.DecodeTextureNSW(mip, specular.Format, specular.isNormalMap, - out data, out colorType); - break; - default: - TextureDecoder.DecodeTexture(mip, specular.Format, specular.isNormalMap, - out data, out colorType); - break; - } - + var platform = UserSettings.Default.OverridedPlatform; + TextureDecoder.DecodeTexture(mip, specular.Format, specular.isNormalMap, platform, out var data, out var colorType); switch (_game) {