diff --git a/.vs/Switch_Toolbox/v15/.suo b/.vs/Switch_Toolbox/v15/.suo index bbdc99b1..3bff7e22 100644 Binary files a/.vs/Switch_Toolbox/v15/.suo and b/.vs/Switch_Toolbox/v15/.suo differ diff --git a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide index a653a40c..1a18e34f 100644 Binary files a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide and b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide differ diff --git a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal index 29bcfc93..af1a90e9 100644 Binary files a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal and b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal differ diff --git a/Switch_FileFormatsMain/FileFormats/Archives/SARC.cs b/Switch_FileFormatsMain/FileFormats/Archives/SARC.cs index fec6e7d1..12ed3e6e 100644 --- a/Switch_FileFormatsMain/FileFormats/Archives/SARC.cs +++ b/Switch_FileFormatsMain/FileFormats/Archives/SARC.cs @@ -53,7 +53,7 @@ namespace FirstPlugin sarcData.endianness = GetByteOrder(stream); SarcHash = Utils.GenerateUniqueHashID(); - FillTreeNodes(this, SzsFiles.Files, SarcHash); + FillTreeNodes(this, SzsFiles.Files, sarcData.HashOnly); Text = FileName; @@ -427,7 +427,7 @@ namespace FirstPlugin } } } - void FillTreeNodes(TreeNode root, Dictionary files, string SarcHash) + void FillTreeNodes(TreeNode root, Dictionary files, bool HashOnly) { var rootText = root.Text; var rootTextLength = rootText.Length; @@ -436,6 +436,9 @@ namespace FirstPlugin { string nodeString = node.Key; + if (HashOnly) + nodeString = SARCExt.SARC.TryGetNameFromHashTable(nodeString); + var roots = nodeString.Split(new char[] { '/' }, StringSplitOptions.RemoveEmptyEntries); @@ -459,7 +462,7 @@ namespace FirstPlugin var folder = new FolderEntry(parentName, 0, 0); if (rootIndex == roots.Length - 1) { - var file = SetupFileEntry(node.Value, parentName, node.Key, SarcHash); + var file = SetupFileEntry(node.Value, parentName, node.Key); file.Name = nodeName; parentNode.Nodes.Add(file); parentNode = file; @@ -502,7 +505,7 @@ namespace FirstPlugin return finalList; } - public SarcEntry SetupFileEntry(byte[] data, string name, string fullName, string SarchHash) + public SarcEntry SetupFileEntry(byte[] data, string name, string fullName) { SarcEntry sarcEntry = new SarcEntry(); sarcEntry.FullName = fullName; @@ -510,7 +513,6 @@ namespace FirstPlugin sarcEntry.Text = name; sarcEntry.sarc = this; sarcEntry.Data = data; - sarcEntry.sarcHash = SarcHash; Console.WriteLine(name); diff --git a/Switch_FileFormatsMain/obj/Release/FirstPlugin.Plg.dll b/Switch_FileFormatsMain/obj/Release/FirstPlugin.Plg.dll index 7ed58981..e99fbb04 100644 Binary files a/Switch_FileFormatsMain/obj/Release/FirstPlugin.Plg.dll and b/Switch_FileFormatsMain/obj/Release/FirstPlugin.Plg.dll differ diff --git a/Switch_FileFormatsMain/obj/Release/FirstPlugin.Plg.pdb b/Switch_FileFormatsMain/obj/Release/FirstPlugin.Plg.pdb index 9fc9634d..0e612956 100644 Binary files a/Switch_FileFormatsMain/obj/Release/FirstPlugin.Plg.pdb and b/Switch_FileFormatsMain/obj/Release/FirstPlugin.Plg.pdb differ diff --git a/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache b/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache index a3e80651..8d1c2fc5 100644 Binary files a/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache and b/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache differ diff --git a/Switch_Toolbox_Library/Switch_Toolbox.Library.dll b/Switch_Toolbox_Library/Switch_Toolbox.Library.dll new file mode 100644 index 00000000..12a88d2e Binary files /dev/null and b/Switch_Toolbox_Library/Switch_Toolbox.Library.dll differ diff --git a/Switch_Toolbox_Library/Switch_Toolbox.Library.dll.config b/Switch_Toolbox_Library/Switch_Toolbox.Library.dll.config new file mode 100644 index 00000000..8de8cd30 --- /dev/null +++ b/Switch_Toolbox_Library/Switch_Toolbox.Library.dll.config @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Switch_Toolbox_Library/Switch_Toolbox.Library.pdb b/Switch_Toolbox_Library/Switch_Toolbox.Library.pdb new file mode 100644 index 00000000..85f9e17d Binary files /dev/null and b/Switch_Toolbox_Library/Switch_Toolbox.Library.pdb differ diff --git a/Switch_Toolbox_Library/Switch_Toolbox_Library.csproj b/Switch_Toolbox_Library/Switch_Toolbox_Library.csproj index dc48fdbe..1b3160db 100644 --- a/Switch_Toolbox_Library/Switch_Toolbox_Library.csproj +++ b/Switch_Toolbox_Library/Switch_Toolbox_Library.csproj @@ -38,6 +38,7 @@ ..\packages\AssimpNet.4.1.0\lib\net40\AssimpNet.dll + False ..\Toolbox\Lib\Be.Windows.Forms.HexBox.dll @@ -78,6 +79,7 @@ ..\Toolbox\Lib\LZ4.Frame.dll + False @@ -97,6 +99,7 @@ False ..\Toolbox\OpenGl_EditorFramework.dll + False ..\Toolbox\Lib\OpenTK.dll @@ -145,7 +148,7 @@ ..\Switch_FileFormatsMain\System.Buffers.dll - True + False @@ -153,11 +156,12 @@ ..\Switch_FileFormatsMain\System.Memory.dll + False ..\Switch_FileFormatsMain\System.Runtime.CompilerServices.Unsafe.dll - True + False diff --git a/Switch_Toolbox_Library/runtimes/linux-x64/native/libassimp.so b/Switch_Toolbox_Library/runtimes/linux-x64/native/libassimp.so new file mode 100644 index 00000000..dfaecb8a Binary files /dev/null and b/Switch_Toolbox_Library/runtimes/linux-x64/native/libassimp.so differ diff --git a/Switch_Toolbox_Library/runtimes/osx-x64/native/libassimp.dylib b/Switch_Toolbox_Library/runtimes/osx-x64/native/libassimp.dylib new file mode 100644 index 00000000..603bd33f Binary files /dev/null and b/Switch_Toolbox_Library/runtimes/osx-x64/native/libassimp.dylib differ diff --git a/Switch_Toolbox_Library/runtimes/win-x64/native/assimp.dll b/Switch_Toolbox_Library/runtimes/win-x64/native/assimp.dll new file mode 100644 index 00000000..fd87b2d1 Binary files /dev/null and b/Switch_Toolbox_Library/runtimes/win-x64/native/assimp.dll differ diff --git a/Switch_Toolbox_Library/runtimes/win-x86/native/assimp.dll b/Switch_Toolbox_Library/runtimes/win-x86/native/assimp.dll new file mode 100644 index 00000000..1f8b10dd Binary files /dev/null and b/Switch_Toolbox_Library/runtimes/win-x86/native/assimp.dll differ diff --git a/Toolbox/Lib/SARCExt.dll b/Toolbox/Lib/SARCExt.dll index 1d2399c9..b6508bee 100644 Binary files a/Toolbox/Lib/SARCExt.dll and b/Toolbox/Lib/SARCExt.dll differ diff --git a/Toolbox/Lib/SARCExt.pdb b/Toolbox/Lib/SARCExt.pdb index 62e63e1a..69f4efd0 100644 Binary files a/Toolbox/Lib/SARCExt.pdb and b/Toolbox/Lib/SARCExt.pdb differ diff --git a/Toolbox/Toolbox.csproj b/Toolbox/Toolbox.csproj index 9f560129..f18bb935 100644 --- a/Toolbox/Toolbox.csproj +++ b/Toolbox/Toolbox.csproj @@ -205,6 +205,7 @@ {96820047-2a39-4e5a-bfa4-e84fff5c66cf} Switch_Toolbox_Library + False {d82a2c08-2a65-43af-bda6-a36cc27aa003}