Started trying to get WPF set up.

MeltyPlayer · Nov 22, 2023 · e116365 · e116365
1 parent d6661ca
commit e116365
Show file tree

Hide file tree

Showing 35 changed files with 94 additions and 33 deletions.
diff --git a/...lAssetTool Tests/RootFileGathererTests.cs → ...Tool Tests/RootFileBundleGathererTests.cs b/...lAssetTool Tests/RootFileGathererTests.cs → ...Tool Tests/RootFileBundleGathererTests.cs
@@ -6,7 +6,7 @@
 using uni.games;
 
 namespace uni {
-  public class RootFileGathererTests {
+  public class RootFileBundleGathererTests {
     [TearDown]
     public void Setup() {
       FinFileSystem.FileSystem = new FileSystem();
@@ -58,7 +58,7 @@ public void TestEmpty() {
         FinFileSystem.FileSystem = mockFileSystem;
       }
 
-      var root = new RootFileGatherer().GatherAllFiles();
+      var root = new RootFileBundleGatherer().GatherAllFiles();
       Assert.AreEqual(0, root.Subdirs.Count);
       Assert.AreEqual(0, root.FileBundles.Count);
     }

diff --git a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/UniversalAssetTool.csproj b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/UniversalAssetTool.csproj
@@ -7,6 +7,7 @@
     <LangVersion>preview</LangVersion>
     <Nullable>enable</Nullable>
     <UseWindowsForms>true</UseWindowsForms>
+    <UseWPF>true</UseWPF>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
@@ -123,6 +124,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Folder Include="src\ui\wpf\" />
+    <Folder Include="src\ui\wpf\common\" />
+    <Folder Include="src\ui\wpf\panels\" />
   </ItemGroup>
 </Project>
diff --git a/...Tool/src/ui/winforms/GlobalAudioLoader.cs → ...salAssetTool/src/api/GlobalAudioLoader.cs b/...Tool/src/ui/winforms/GlobalAudioLoader.cs → ...salAssetTool/src/api/GlobalAudioLoader.cs
@@ -5,7 +5,7 @@
 using fin.audio.io.importers;
 using fin.audio.io.importers.ogg;
 
-namespace uni.ui.winforms {
+namespace uni.api {
   public class GlobalAudioReader : IAudioImporter<IAudioFileBundle> {
     public IAudioBuffer<short> ImportAudio(IAudioManager<short> audioManager,
                                            IAudioFileBundle audioFileBundle)

diff --git a/...Tool/src/ui/winforms/GlobalModelLoader.cs → ...salAssetTool/src/api/GlobalModelLoader.cs b/...Tool/src/ui/winforms/GlobalModelLoader.cs → ...salAssetTool/src/api/GlobalModelLoader.cs
@@ -26,7 +26,7 @@
 
 using xmod.api;
 
-namespace uni.ui.winforms {
+namespace uni.api {
   public class GlobalModelImporter : IModelImporter<IModelFileBundle> {
     public IModel ImportModel(IModelFileBundle modelFileBundle)
       => modelFileBundle switch {

diff --git a/...Tool/src/ui/winforms/GlobalSceneLoader.cs → ...salAssetTool/src/api/GlobalSceneLoader.cs b/...Tool/src/ui/winforms/GlobalSceneLoader.cs → ...salAssetTool/src/api/GlobalSceneLoader.cs
@@ -7,7 +7,7 @@
 
 using sm64.api;
 
-namespace uni.ui.winforms {
+namespace uni.api {
   public class GlobalSceneImporter : ISceneImporter<ISceneFileBundle> {
     public IScene ImportScene(ISceneFileBundle sceneFileBundle,
                               out ILighting? lighting)

diff --git a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/cli/Cli.cs b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/cli/Cli.cs
@@ -8,6 +8,7 @@
 
 using OpenTK.Graphics;
 
+using uni.ui;
 using uni.ui.winforms;
 
 namespace uni.cli {

diff --git a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/games/ExporterUtil.cs b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/games/ExporterUtil.cs
@@ -1,4 +1,6 @@
-using Assimp;
+using System.IO;
+
+using Assimp;
 
 using fin.model.io.exporters.assimp;
 using fin.io;

diff --git a/...alAssetTool/src/games/RootFileGatherer.cs → ...tTool/src/games/RootFileBundleGatherer.cs b/...alAssetTool/src/games/RootFileGatherer.cs → ...tTool/src/games/RootFileBundleGatherer.cs
@@ -31,7 +31,7 @@
 using uni.util.io;
 
 namespace uni.games {
-  public class RootFileGatherer {
+  public class RootFileBundleGatherer {
     public IFileBundleDirectory GatherAllFiles() {
       IAnnotatedFileBundleGathererAccumulator accumulator =
           Config.Instance.ExtractorSettings.UseMultithreadingToExtractRoms

diff --git a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/games/battalion_wars_1/ResDump.cs b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/games/battalion_wars_1/ResDump.cs
@@ -1,4 +1,5 @@
-using System.IO.Compression;
+using System.IO;
+using System.IO.Compression;
 
 using fin.io;
 using fin.log;

diff --git a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/games/chibi_robo/QpBinArchive.cs b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/games/chibi_robo/QpBinArchive.cs
@@ -1,7 +1,5 @@
-using System.IO.Enumeration;
-using System.Text;
+using System.IO;
 
-using fin.data.queues;
 using fin.io;
 using fin.util.asserts;
 

diff --git a/...lAssetTool/UniversalAssetTool/src/games/luigis_mansion/LuigisMansionFileBundleGatherer.cs b/...lAssetTool/UniversalAssetTool/src/games/luigis_mansion/LuigisMansionFileBundleGatherer.cs
@@ -17,7 +17,7 @@ public IEnumerable<IAnnotatedMdlBundle> GatherFileBundles() {
                                            // For some reason, some MDL files are compressed as RARC.
                                            ".mdl"),
               out var fileHierarchy)) {
-        return;
+        yield break;
       }
     }
   }

diff --git a/...versalAssetTool/UniversalAssetTool/src/games/midnight_club_2/MidnightClub2MassExporter.cs b/...versalAssetTool/UniversalAssetTool/src/games/midnight_club_2/MidnightClub2MassExporter.cs
@@ -1,4 +1,4 @@
-using uni.ui.winforms;
+using uni.api;
 
 namespace uni.games.midnight_club_2 {
   public class MidnightClub2MassExporter : IMassExporter {

diff --git a/...AssetTool/UniversalAssetTool/src/games/ocarina_of_time/OcarinaOfTimeFileBundleGatherer.cs b/...AssetTool/UniversalAssetTool/src/games/ocarina_of_time/OcarinaOfTimeFileBundleGatherer.cs
@@ -1,4 +1,6 @@
-using fin.io;
+using System.IO;
+
+using fin.io;
 using fin.io.bundles;
 
 using uni.platforms;

diff --git a/...AssetTool/src/games/paper_mario_directors_cut/PaperMarioDirectorsCutFileBundleGatherer.cs b/...AssetTool/src/games/paper_mario_directors_cut/PaperMarioDirectorsCutFileBundleGatherer.cs
@@ -1,4 +1,6 @@
-using fin.io;
+using System.IO;
+
+using fin.io;
 using fin.io.bundles;
 
 using pmdc.api;

diff --git a/...niversalAssetTool/UniversalAssetTool/src/games/super_mario_64/SuperMario64FileGatherer.cs b/...niversalAssetTool/UniversalAssetTool/src/games/super_mario_64/SuperMario64FileGatherer.cs
@@ -1,4 +1,6 @@
-using fin.io;
+using System.IO;
+
+using fin.io;
 using fin.io.bundles;
 
 using sm64.api;

diff --git a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/platforms/desktop/EaUtils.cs b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/platforms/desktop/EaUtils.cs
@@ -1,4 +1,6 @@
-using fin.io;
+using System.IO;
+
+using fin.io;
 using fin.util.asserts;
 
 namespace uni.platforms.desktop {

diff --git a/...Utility/UniversalAssetTool/UniversalAssetTool/src/platforms/desktop/RegistryExtensions.cs b/...Utility/UniversalAssetTool/UniversalAssetTool/src/platforms/desktop/RegistryExtensions.cs
@@ -1,4 +1,6 @@
-using fin.util.enumerables;
+using System.IO;
+
+using fin.util.enumerables;
 
 using Microsoft.Win32;
 

diff --git a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/platforms/gcn/tools/CisoStream.cs b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/platforms/gcn/tools/CisoStream.cs
@@ -1,4 +1,6 @@
-using fin.util.asserts;
+using System.IO;
+
+using fin.util.asserts;
 
 using schema.binary;
 

diff --git a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/platforms/gcn/tools/GcmReader.cs b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/platforms/gcn/tools/GcmReader.cs
@@ -1,4 +1,6 @@
-using fin.data.stacks;
+using System.IO;
+
+using fin.data.stacks;
 using fin.io;
 using fin.io.archive;
 using fin.schema;

diff --git a/...lUtility/UniversalAssetTool/UniversalAssetTool/src/platforms/gcn/tools/RarcDump - Copy.cs b/...lUtility/UniversalAssetTool/UniversalAssetTool/src/platforms/gcn/tools/RarcDump - Copy.cs
@@ -1,4 +1,6 @@
-using fin.io;
+using System.IO;
+
+using fin.io;
 using fin.log;
 using fin.schema;
 using fin.util.asserts;

diff --git a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/platforms/gcn/tools/RarcDump.cs b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/platforms/gcn/tools/RarcDump.cs
@@ -1,4 +1,6 @@
-using fin.io;
+using System.IO;
+
+using fin.io;
 using fin.log;
 using fin.util.asserts;
 

diff --git a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/platforms/gcn/tools/RelDump.cs b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/platforms/gcn/tools/RelDump.cs
@@ -1,4 +1,5 @@
 using System.Globalization;
+using System.IO;
 using System.Text.RegularExpressions;
 
 using fin.io;

diff --git a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/platforms/gcn/tools/Yay0Dec.cs b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/platforms/gcn/tools/Yay0Dec.cs
@@ -1,4 +1,6 @@
-using fin.io;
+using System.IO;
+
+using fin.io;
 using fin.log;
 using fin.util.asserts;
 

diff --git a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/platforms/gcn/tools/Yaz0Dec.cs b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/platforms/gcn/tools/Yaz0Dec.cs
@@ -1,4 +1,6 @@
-using fin.io;
+using System.IO;
+
+using fin.io;
 using fin.log;
 using fin.util.asserts;
 

diff --git a/...delUtility/UniversalAssetTool/UniversalAssetTool/src/platforms/threeDs/tools/ZarReader.cs b/...delUtility/UniversalAssetTool/UniversalAssetTool/src/platforms/threeDs/tools/ZarReader.cs
@@ -1,4 +1,6 @@
-using fin.io;
+using System.IO;
+
+using fin.io;
 using fin.io.archive;
 using fin.util.strings;
 

diff --git a/...tility/UniversalAssetTool/UniversalAssetTool/src/platforms/threeDs/tools/cia/CiaReader.cs b/...tility/UniversalAssetTool/UniversalAssetTool/src/platforms/threeDs/tools/cia/CiaReader.cs
@@ -1,4 +1,6 @@
-using fin.io.archive;
+using System.IO;
+
+using fin.io.archive;
 
 using schema.binary;
 

diff --git a/...tility/UniversalAssetTool/UniversalAssetTool/src/platforms/threeDs/tools/gar/GarReader.cs b/...tility/UniversalAssetTool/UniversalAssetTool/src/platforms/threeDs/tools/gar/GarReader.cs
@@ -1,4 +1,6 @@
-using fin.io;
+using System.IO;
+
+using fin.io;
 using fin.io.archive;
 using fin.util.strings;
 

diff --git a/...iversalAssetTool/UniversalAssetTool/src/platforms/threeDs/tools/gar/schema/Gar5Subfile.cs b/...iversalAssetTool/UniversalAssetTool/src/platforms/threeDs/tools/gar/schema/Gar5Subfile.cs
@@ -1,4 +1,6 @@
-using schema.binary;
+using System.IO;
+
+using schema.binary;
 
 namespace uni.platforms.threeDs.tools.gar.schema {
   public class Gar5Subfile : IGarSubfile {

diff --git a/...alAssetTool/src/ui/winforms/DebugFlags.cs → ...l/UniversalAssetTool/src/ui/DebugFlags.cs b/...alAssetTool/src/ui/winforms/DebugFlags.cs → ...l/UniversalAssetTool/src/ui/DebugFlags.cs
@@ -1,4 +1,4 @@
-namespace uni.ui.winforms {
+namespace uni.ui {
   public static class DebugFlags {
     public const float GLOBAL_SCALE = .001f;
     public const float NEAR_PLANE = .01f;

diff --git a/...setTool/src/ui/winforms/DesignModeUtil.cs → ...iversalAssetTool/src/ui/DesignModeUtil.cs b/...setTool/src/ui/winforms/DesignModeUtil.cs → ...iversalAssetTool/src/ui/DesignModeUtil.cs
@@ -1,4 +1,4 @@
-namespace uni.ui.winforms {
+namespace uni.ui {
   public static class DesignModeUtil {
     public static bool InDesignMode { get; set; } = true;
   }

diff --git a/...elUtility/UniversalAssetTool/UniversalAssetTool/src/ui/winforms/UniversalAssetToolForm.cs b/...elUtility/UniversalAssetTool/UniversalAssetTool/src/ui/winforms/UniversalAssetToolForm.cs
@@ -25,8 +25,8 @@
 using fin.model.impl;
 using fin.ui;
 using fin.ui.rendering.gl.model;
-using MathNet.Numerics.Distributions;
 
+using uni.api;
 using uni.ui.winforms.common.fileTreeView;
 
 namespace uni.ui.winforms;
@@ -71,7 +71,7 @@ public UniversalAssetToolForm() {
 
   private void UniversalAssetToolForm_Load(object sender, EventArgs e) {
     this.fileBundleTreeView_.Populate(
-        new RootFileGatherer().GatherAllFiles());
+        new RootFileBundleGatherer().GatherAllFiles());
 
 
     this.fpsCallback_ =

diff --git a/.../UniversalAssetTool/UniversalAssetTool/src/ui/winforms/common/audio/AudioPlayerGlPanel.cs b/.../UniversalAssetTool/UniversalAssetTool/src/ui/winforms/common/audio/AudioPlayerGlPanel.cs
@@ -7,6 +7,7 @@
 
 using OpenTK.Graphics.OpenGL;
 
+using uni.api;
 using uni.ui.winforms.gl;
 
 namespace uni.ui.winforms.common.audio {

diff --git a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/ui/winforms/top/ModelToolStrip.cs b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/ui/winforms/top/ModelToolStrip.cs
@@ -5,6 +5,7 @@
 
 using MathNet.Numerics;
 
+using uni.api;
 using uni.config;
 using uni.games;
 using uni.ui.winforms.common.fileTreeView;

diff --git a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/ui/wpf/UniversalAssetToolForm.xaml b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/ui/wpf/UniversalAssetToolForm.xaml
@@ -0,0 +1,12 @@
+<Window x:Class="uni.ui.wpf.UniversalAssetToolForm"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:uni.ui.wpf"
+        mc:Ignorable="d"
+        Title="UniversalAssetToolForm" Height="450" Width="800">
+    <Grid>
+
+    </Grid>
+</Window>
diff --git a/...elUtility/UniversalAssetTool/UniversalAssetTool/src/ui/wpf/UniversalAssetToolForm.xaml.cs b/...elUtility/UniversalAssetTool/UniversalAssetTool/src/ui/wpf/UniversalAssetToolForm.xaml.cs
@@ -0,0 +1,12 @@
+using System.Windows;
+
+namespace uni.ui.wpf {
+  /// <summary>
+  /// Interaction logic for UniversalAssetToolForm.xaml
+  /// </summary>
+  public partial class UniversalAssetToolForm : Window {
+    public UniversalAssetToolForm() {
+      InitializeComponent();
+    }
+  }
+}