bump

4sval · Sep 1, 2022 · 2533166 · 2533166
1 parent 0f120f2
commit 2533166
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 30 deletions.
diff --git a/CUE4Parse b/CUE4Parse
diff --git a/FModel/App.xaml.cs b/FModel/App.xaml.cs
@@ -89,9 +89,13 @@ protected override void OnStartup(StartupEventArgs e)
  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
@@ -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
@@ -2,6 +2,7 @@
 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.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
@@ -1,13 +1,13 @@
 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;
 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 void Draw(SKCanvas c, SKColor sliderColor, int width, int height, ref flo
  var sliderWidth = (sliderRight - height * 2) * (floatValue / _maxValue);
  c.DrawRect(new SKRect(height * 2, y, Math.Min(height * 2 + sliderWidth, sliderRight), y + 5), _statPaint);
  }
-}
+}
diff --git a/FModel/FModel.csproj b/FModel/FModel.csproj
@@ -127,7 +127,6 @@
 
  <ItemGroup>
  <ProjectReference Include="..\CUE4Parse\CUE4Parse-Conversion\CUE4Parse-Conversion.csproj" />
- <ProjectReference Include="..\CUE4Parse\CUE4Parse-Fortnite\CUE4Parse-Fortnite.csproj" />
  <ProjectReference Include="..\CUE4Parse\CUE4Parse\CUE4Parse.csproj" />
  </ItemGroup>
 

diff --git 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
@@ -444,24 +444,8 @@ private void PushLod(CMeshSection[] sections, CMeshVertex[] verts, FRawStaticInd
  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)
  {