From e1163656d0cfc44c670530574459ccef0282e810 Mon Sep 17 00:00:00 2001 From: MeltyPlayer Date: Wed, 22 Nov 2023 08:01:52 -0600 Subject: [PATCH] Started trying to get WPF set up. --- ...thererTests.cs => RootFileBundleGathererTests.cs} | 4 ++-- .../UniversalAssetTool/UniversalAssetTool.csproj | 4 +++- .../src/{ui/winforms => api}/GlobalAudioLoader.cs | 2 +- .../src/{ui/winforms => api}/GlobalModelLoader.cs | 2 +- .../src/{ui/winforms => api}/GlobalSceneLoader.cs | 2 +- .../UniversalAssetTool/src/cli/Cli.cs | 1 + .../UniversalAssetTool/src/games/ExporterUtil.cs | 4 +++- ...RootFileGatherer.cs => RootFileBundleGatherer.cs} | 2 +- .../src/games/battalion_wars_1/ResDump.cs | 3 ++- .../src/games/chibi_robo/QpBinArchive.cs | 4 +--- .../LuigisMansionFileBundleGatherer.cs | 2 +- .../midnight_club_2/MidnightClub2MassExporter.cs | 2 +- .../OcarinaOfTimeFileBundleGatherer.cs | 4 +++- .../PaperMarioDirectorsCutFileBundleGatherer.cs | 4 +++- .../games/super_mario_64/SuperMario64FileGatherer.cs | 4 +++- .../src/platforms/desktop/EaUtils.cs | 4 +++- .../src/platforms/desktop/RegistryExtensions.cs | 4 +++- .../src/platforms/gcn/tools/CisoStream.cs | 4 +++- .../src/platforms/gcn/tools/GcmReader.cs | 4 +++- .../src/platforms/gcn/tools/RarcDump - Copy.cs | 4 +++- .../src/platforms/gcn/tools/RarcDump.cs | 4 +++- .../src/platforms/gcn/tools/RelDump.cs | 1 + .../src/platforms/gcn/tools/Yay0Dec.cs | 4 +++- .../src/platforms/gcn/tools/Yaz0Dec.cs | 4 +++- .../src/platforms/threeDs/tools/ZarReader.cs | 4 +++- .../src/platforms/threeDs/tools/cia/CiaReader.cs | 4 +++- .../src/platforms/threeDs/tools/gar/GarReader.cs | 4 +++- .../threeDs/tools/gar/schema/Gar5Subfile.cs | 4 +++- .../src/ui/{winforms => }/DebugFlags.cs | 2 +- .../src/ui/{winforms => }/DesignModeUtil.cs | 2 +- .../src/ui/winforms/UniversalAssetToolForm.cs | 4 ++-- .../ui/winforms/common/audio/AudioPlayerGlPanel.cs | 1 + .../src/ui/winforms/top/ModelToolStrip.cs | 1 + .../src/ui/wpf/UniversalAssetToolForm.xaml | 12 ++++++++++++ .../src/ui/wpf/UniversalAssetToolForm.xaml.cs | 12 ++++++++++++ 35 files changed, 94 insertions(+), 33 deletions(-) rename FinModelUtility/UniversalAssetTool/UniversalAssetTool Tests/{RootFileGathererTests.cs => RootFileBundleGathererTests.cs} (93%) rename FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/{ui/winforms => api}/GlobalAudioLoader.cs (96%) rename FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/{ui/winforms => api}/GlobalModelLoader.cs (98%) rename FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/{ui/winforms => api}/GlobalSceneLoader.cs (97%) rename FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/games/{RootFileGatherer.cs => RootFileBundleGatherer.cs} (98%) rename FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/ui/{winforms => }/DebugFlags.cs (89%) rename FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/ui/{winforms => }/DesignModeUtil.cs (76%) create mode 100644 FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/ui/wpf/UniversalAssetToolForm.xaml create mode 100644 FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/ui/wpf/UniversalAssetToolForm.xaml.cs diff --git a/FinModelUtility/UniversalAssetTool/UniversalAssetTool Tests/RootFileGathererTests.cs b/FinModelUtility/UniversalAssetTool/UniversalAssetTool Tests/RootFileBundleGathererTests.cs similarity index 93% rename from FinModelUtility/UniversalAssetTool/UniversalAssetTool Tests/RootFileGathererTests.cs rename to FinModelUtility/UniversalAssetTool/UniversalAssetTool Tests/RootFileBundleGathererTests.cs index bdbb13d76..9e99e55f6 100644 --- a/FinModelUtility/UniversalAssetTool/UniversalAssetTool Tests/RootFileGathererTests.cs +++ b/FinModelUtility/UniversalAssetTool/UniversalAssetTool 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 index b45d366cf..d499f6f5e 100644 --- a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/UniversalAssetTool.csproj +++ b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/UniversalAssetTool.csproj @@ -7,6 +7,7 @@ preview enable true + true enable @@ -123,6 +124,7 @@ - + + diff --git a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/ui/winforms/GlobalAudioLoader.cs b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/api/GlobalAudioLoader.cs similarity index 96% rename from FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/ui/winforms/GlobalAudioLoader.cs rename to FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/api/GlobalAudioLoader.cs index 90d47402c..31c303720 100644 --- a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/ui/winforms/GlobalAudioLoader.cs +++ b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/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 { public IAudioBuffer ImportAudio(IAudioManager audioManager, IAudioFileBundle audioFileBundle) diff --git a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/ui/winforms/GlobalModelLoader.cs b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/api/GlobalModelLoader.cs similarity index 98% rename from FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/ui/winforms/GlobalModelLoader.cs rename to FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/api/GlobalModelLoader.cs index 6a84c40ee..6184102df 100644 --- a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/ui/winforms/GlobalModelLoader.cs +++ b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/api/GlobalModelLoader.cs @@ -26,7 +26,7 @@ using xmod.api; -namespace uni.ui.winforms { +namespace uni.api { public class GlobalModelImporter : IModelImporter { public IModel ImportModel(IModelFileBundle modelFileBundle) => modelFileBundle switch { diff --git a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/ui/winforms/GlobalSceneLoader.cs b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/api/GlobalSceneLoader.cs similarity index 97% rename from FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/ui/winforms/GlobalSceneLoader.cs rename to FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/api/GlobalSceneLoader.cs index 17947c586..001992b08 100644 --- a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/ui/winforms/GlobalSceneLoader.cs +++ b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/api/GlobalSceneLoader.cs @@ -7,7 +7,7 @@ using sm64.api; -namespace uni.ui.winforms { +namespace uni.api { public class GlobalSceneImporter : ISceneImporter { 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 index 439889681..b593b5abb 100644 --- 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 index c737acb3e..7df0dfe39 100644 --- 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/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/games/RootFileGatherer.cs b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/games/RootFileBundleGatherer.cs similarity index 98% rename from FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/games/RootFileGatherer.cs rename to FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/games/RootFileBundleGatherer.cs index 67ada9059..247d4d484 100644 --- a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/games/RootFileGatherer.cs +++ b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/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 index 4d132e53e..a80cba905 100644 --- 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 index f8ed6db24..2d1bf5204 100644 --- 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/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/games/luigis_mansion/LuigisMansionFileBundleGatherer.cs b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/games/luigis_mansion/LuigisMansionFileBundleGatherer.cs index 1f0ddecdb..a05ebe9cb 100644 --- a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/games/luigis_mansion/LuigisMansionFileBundleGatherer.cs +++ b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/games/luigis_mansion/LuigisMansionFileBundleGatherer.cs @@ -17,7 +17,7 @@ public IEnumerable GatherFileBundles() { // For some reason, some MDL files are compressed as RARC. ".mdl"), out var fileHierarchy)) { - return; + yield break; } } } diff --git a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/games/midnight_club_2/MidnightClub2MassExporter.cs b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/games/midnight_club_2/MidnightClub2MassExporter.cs index 7d1c07d22..3e778ca08 100644 --- a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/games/midnight_club_2/MidnightClub2MassExporter.cs +++ b/FinModelUtility/UniversalAssetTool/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/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/games/ocarina_of_time/OcarinaOfTimeFileBundleGatherer.cs b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/games/ocarina_of_time/OcarinaOfTimeFileBundleGatherer.cs index dd444913b..238648916 100644 --- a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/games/ocarina_of_time/OcarinaOfTimeFileBundleGatherer.cs +++ b/FinModelUtility/UniversalAssetTool/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/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/games/paper_mario_directors_cut/PaperMarioDirectorsCutFileBundleGatherer.cs b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/games/paper_mario_directors_cut/PaperMarioDirectorsCutFileBundleGatherer.cs index 0d7b49494..99e060085 100644 --- a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/games/paper_mario_directors_cut/PaperMarioDirectorsCutFileBundleGatherer.cs +++ b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/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/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/games/super_mario_64/SuperMario64FileGatherer.cs b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/games/super_mario_64/SuperMario64FileGatherer.cs index bf64c4413..1cc020e11 100644 --- a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/games/super_mario_64/SuperMario64FileGatherer.cs +++ b/FinModelUtility/UniversalAssetTool/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 index e661e0593..c01394c85 100644 --- 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/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/platforms/desktop/RegistryExtensions.cs b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/platforms/desktop/RegistryExtensions.cs index 3e30c0e6c..76a85e401 100644 --- a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/platforms/desktop/RegistryExtensions.cs +++ b/FinModelUtility/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 index dbca064bf..75edc6a55 100644 --- 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 index fccc75801..30fea64ad 100644 --- 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/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/platforms/gcn/tools/RarcDump - Copy.cs b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/platforms/gcn/tools/RarcDump - Copy.cs index 3973fabfd..eb679795c 100644 --- a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/platforms/gcn/tools/RarcDump - Copy.cs +++ b/FinModelUtility/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 index bfa82084d..3a747a140 100644 --- 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 index 1da55ed7f..a3b5d61f1 100644 --- 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 index 29ea32372..18c16cc3b 100644 --- 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 index 837936c77..531497647 100644 --- 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/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/platforms/threeDs/tools/ZarReader.cs b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/platforms/threeDs/tools/ZarReader.cs index cf4144b75..3b9a619f3 100644 --- a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/platforms/threeDs/tools/ZarReader.cs +++ b/FinModelUtility/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/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/platforms/threeDs/tools/cia/CiaReader.cs b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/platforms/threeDs/tools/cia/CiaReader.cs index 76abfa914..7f42eef8b 100644 --- a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/platforms/threeDs/tools/cia/CiaReader.cs +++ b/FinModelUtility/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/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/platforms/threeDs/tools/gar/GarReader.cs b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/platforms/threeDs/tools/gar/GarReader.cs index 7f54682f3..dea097c02 100644 --- a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/platforms/threeDs/tools/gar/GarReader.cs +++ b/FinModelUtility/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/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/platforms/threeDs/tools/gar/schema/Gar5Subfile.cs b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/platforms/threeDs/tools/gar/schema/Gar5Subfile.cs index a86097ec2..83ceaf0b5 100644 --- a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/platforms/threeDs/tools/gar/schema/Gar5Subfile.cs +++ b/FinModelUtility/UniversalAssetTool/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/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/ui/winforms/DebugFlags.cs b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/ui/DebugFlags.cs similarity index 89% rename from FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/ui/winforms/DebugFlags.cs rename to FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/ui/DebugFlags.cs index 98e950ea9..109c1a4c2 100644 --- a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/ui/winforms/DebugFlags.cs +++ b/FinModelUtility/UniversalAssetTool/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/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/ui/winforms/DesignModeUtil.cs b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/ui/DesignModeUtil.cs similarity index 76% rename from FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/ui/winforms/DesignModeUtil.cs rename to FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/ui/DesignModeUtil.cs index 221d5604e..5e8e0a0c3 100644 --- a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/ui/winforms/DesignModeUtil.cs +++ b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/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/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/ui/winforms/UniversalAssetToolForm.cs b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/ui/winforms/UniversalAssetToolForm.cs index 6f2dd9326..f3cf9cb8e 100644 --- a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/ui/winforms/UniversalAssetToolForm.cs +++ b/FinModelUtility/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/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/ui/winforms/common/audio/AudioPlayerGlPanel.cs b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/ui/winforms/common/audio/AudioPlayerGlPanel.cs index b3a68479d..b2ad1da7f 100644 --- a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/ui/winforms/common/audio/AudioPlayerGlPanel.cs +++ b/FinModelUtility/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 index 2e1d1557e..cfc54fe44 100644 --- 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 new file mode 100644 index 000000000..d79bf48cc --- /dev/null +++ b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/ui/wpf/UniversalAssetToolForm.xaml @@ -0,0 +1,12 @@ + + + + + diff --git a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/ui/wpf/UniversalAssetToolForm.xaml.cs b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/ui/wpf/UniversalAssetToolForm.xaml.cs new file mode 100644 index 000000000..1671e5ac4 --- /dev/null +++ b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/src/ui/wpf/UniversalAssetToolForm.xaml.cs @@ -0,0 +1,12 @@ +using System.Windows; + +namespace uni.ui.wpf { + /// + /// Interaction logic for UniversalAssetToolForm.xaml + /// + public partial class UniversalAssetToolForm : Window { + public UniversalAssetToolForm() { + InitializeComponent(); + } + } +}