stuff

4sval · Oct 9, 2022 · d047b56 · d047b56
1 parent a664f34
commit d047b56
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/CUE4Parse b/CUE4Parse
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.GameTypes.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.GameTypes.FN.Enums;
 using FModel.Settings;
 using SkiaSharp;
 

diff --git a/FModel/MainWindow.xaml.cs b/FModel/MainWindow.xaml.cs
@@ -77,9 +77,9 @@ private async void OnLoaded(object sender, RoutedEventArgs e)
  _discordHandler.Initialize(_applicationView.CUE4Parse.Game);
 
 #if DEBUG
- await _threadWorkerView.Begin(_ =>
- _applicationView.CUE4Parse.Extract(
- "/Game/Weapons/FORT_Melee/Pickaxe_Slurp_Monster/Meshes/Slurp_Monster_Axe.uasset"));
+ await _threadWorkerView.Begin(cancellationToken =>
+ _applicationView.CUE4Parse.Extract(cancellationToken,
+ "FortniteGame/Content/Characters/Player/Male/Medium/Bodies/M_MED_Despair/Meshes/M_MED_Despair.uasset"));
 #endif
  }
 

diff --git a/FModel/ViewModels/CUE4ParseViewModel.cs b/FModel/ViewModels/CUE4ParseViewModel.cs
@@ -536,7 +536,7 @@ public void Extract(CancellationToken cancellationToken, string fullPath, bool a
  case "uasset":
  case "umap":
  {
- var exports = Provider.LoadObjectExports(fullPath);
+ var exports = Provider.LoadObjectExports(fullPath); // cancellationToken
  TabControl.SelectedTab.SetDocumentText(JsonConvert.SerializeObject(exports, Formatting.Indented), bulkSave);
  if (bulkSave) break;
 
@@ -709,7 +709,7 @@ public void ExtractAndScroll(CancellationToken cancellationToken, string fullPat
  TabControl.AddTab(fullPath.SubstringAfterLast('/'), fullPath.SubstringBeforeLast('/'));
  TabControl.SelectedTab.ScrollTrigger = objectName;
 
- var exports = Provider.LoadObjectExports(fullPath);
+ var exports = Provider.LoadObjectExports(fullPath); // cancellationToken
  TabControl.SelectedTab.Highlighter = AvalonExtensions.HighlighterSelector(""); // json
  TabControl.SelectedTab.SetDocumentText(JsonConvert.SerializeObject(exports, Formatting.Indented), false);
 

diff --git a/FModel/ViewModels/ThreadWorkerViewModel.cs b/FModel/ViewModels/ThreadWorkerViewModel.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using FModel.Framework;