diff --git a/.vs/Switch_Toolbox/v15/.suo b/.vs/Switch_Toolbox/v15/.suo index d3948c24..5cee598f 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 d20a5b94..db7483e0 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-shm b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-shm index 9bbf7769..0230c9f9 100644 Binary files a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-shm and b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-shm differ diff --git a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal index 90006e29..0a8fea49 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/README.md b/README.md index 7b0208e0..38c5f69f 100644 --- a/README.md +++ b/README.md @@ -65,9 +65,6 @@ To build make sure you have Visual Studio installed (I use 2017, older versions In the event that the tool cannot compile, check references. All the libraries are stored in Switch-Toolbox/Lib folder. -## This tool is in BETA and not final! Code also needs some major clean up! -## Credits - - Smash Forge Devs (SMG, Ploaj, jam1garner, smb123w64gb, etc) for some code ported over. Specifically animation stuff, GTX c# implementation, and some rendering. - Assimp devs for their massive asset library! - Wexos (helped figure out a few things, ie format list to assign each attribute) diff --git a/Switch_FileFormatsMain/Switch_FileFormatsMain.csproj b/Switch_FileFormatsMain/Switch_FileFormatsMain.csproj index 474feb34..b60fad53 100644 --- a/Switch_FileFormatsMain/Switch_FileFormatsMain.csproj +++ b/Switch_FileFormatsMain/Switch_FileFormatsMain.csproj @@ -52,11 +52,11 @@ False - ..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\BarsLibrary.dll + ..\Toolbox\Lib\BarsLibrary.dll False - ..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\BezelEngineArchive_Lib.dll + ..\Toolbox\Lib\BezelEngineArchive_Lib.dll False @@ -69,24 +69,24 @@ False - ..\Toolbox\bin\Release\Lib\CSCore.dll + ..\Toolbox\Lib\CSCore.dll False - ..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\EditorCoreCommon.dll + ..\Toolbox\Lib\EditorCoreCommon.dll False - ..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\KCLExt.dll + ..\Toolbox\Lib\KCLExt.dll False - ..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\LibHac.dll + ..\Toolbox\Lib\LibHac.dll False - ..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\NAudio.dll + ..\Toolbox\Lib\NAudio.dll False @@ -111,7 +111,7 @@ False - ..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\SARCExt.dll + ..\Toolbox\Lib\SARCExt.dll False @@ -119,19 +119,19 @@ False - ..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\SFGraphics.dll + ..\Toolbox\Lib\SFGraphics.dll False - ..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\SFGraphics.Utils.dll + ..\Toolbox\Lib\SFGraphics.Utils.dll False - ..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\Syroot.BinaryData.dll + ..\Toolbox\Lib\Syroot.BinaryData.dll False - ..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\Syroot.Maths.dll + ..\Toolbox\Lib\Syroot.Maths.dll False @@ -173,7 +173,7 @@ - ..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\VGAudio.dll + ..\Toolbox\Lib\VGAudio.dll False diff --git a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache index 7eba1a67..2fe75632 100644 Binary files a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Switch_FileFormatsMain/obj/Release/FirstPlugin.Plg.dll b/Switch_FileFormatsMain/obj/Release/FirstPlugin.Plg.dll index d9c19773..bd3f3b81 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 0d36182a..ee618862 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.csproj.CoreCompileInputs.cache b/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csproj.CoreCompileInputs.cache index 8d0cbc7c..d69104f3 100644 --- a/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csproj.CoreCompileInputs.cache +++ b/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -36ecccec7b96249a33f44b83b2e764664c3b19be +b0fa789a3d02cd4abf3a1440541170110c30bf41 diff --git a/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csproj.FileListAbsolute.txt b/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csproj.FileListAbsolute.txt index 0d33a61f..d035a32d 100644 --- a/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csproj.FileListAbsolute.txt +++ b/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csproj.FileListAbsolute.txt @@ -228,3 +228,95 @@ C:\Users\Nathan\Documents\GitHub\Switch_Toolbox\Switch-Toolbox\Switch_FileFormat C:\Users\Nathan\Documents\GitHub\Switch_Toolbox\Switch-Toolbox\Switch_FileFormatsMain\obj\Release\FirstPlugin.Plg.dll C:\Users\Nathan\Documents\GitHub\Switch_Toolbox\Switch-Toolbox\Switch_FileFormatsMain\obj\Release\FirstPlugin.Plg.pdb C:\Users\Nathan\Documents\GitHub\Switch_Toolbox\Switch-Toolbox\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.AnimParamEditor.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\Switch_FileFormatsMain.csprojAssemblyReference.cache +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\Interop.WMPLib.dll +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\AxInterop.WMPLib.dll +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\Switch_FileFormatsMain.csproj.ResolveComReference.cache +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.GUI.AAMP.EditBox.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.TextureViewer.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.AnimationLoader.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.AttributeEditor.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.BfresEditor.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.BfresHeaderEditor.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.BoneAnimEditor.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.BoneVisualAnimEditor.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.BoneVisListEditor.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.VisObjectAddDialog.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.VertexAttributeInputListEdit.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.SamplerInputListEdit.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.ColorPicker.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.ColorWheel.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.ShaderParamEditor.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.TexSrtPanel.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.booleanPanel.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.vector1SliderPanel.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.vector2SliderPanel.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.vector3SliderPanel.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.vector4SliderPanel.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.VolatileFlagEditor.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.CopyUVChannelDialog.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.FaceIndiceListViewer.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.KeyShapeList.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.SubMeshEditor.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.VertexBufferCreator.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.VertexBufferEncodeEditor.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.VertexBufferList.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.BoneIndexList.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.BoneInfoPanel.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.DebugInfoBox.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.BoneAnimEditor2.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.BfresShapeEditor.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.SubFileEditor.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.ShaderOptionsEditor.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.SamplerEditor2.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.RenderStateEditor.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.SamplerEditor.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.SamplerListEdit.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.RenderInfoEditor.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.RenderInfoDataEditor.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.AddSamplerKeyGroup.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.AddTextureKey.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.BfresTexturePatternEditor.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.FrameTextureThumbnail.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.TexPatternInfoEditor.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.TexPatternMaterialEditor.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.TurboMunntEditor.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.AnimParamEditor.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.AnimKeyViewer.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Turbo.CourseMunntEditor.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Turbo.MK8MapCameraEditor.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.EmitterEditor.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.BfresModelImportSettings.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.BntxSelector.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.CopyMaterialMenu.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.BFAVEditor.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.BfresBoneEditor.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.BfresLODMeshEditor.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.FMATEditor.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.ShaderOptionsEditBox.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.SceneAnimEditor.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.ShaderBinaryDisplay.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.ShaderEditor.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.TexturePatternAnimEditor.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.UserDataEditor.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.UserDataParser.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.VisibiltyAnimEditor.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.GUI.KeySelection.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.ByamlEditor.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.PreviewEditor.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.FSKLEditor.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.VertexAttributeDataList.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.PreviewFormatList.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Texture_Selector.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.TextureLoader.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.BinaryTextureImporterList.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.GTXTextureImporter.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Properties.Resources.resources +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\Switch_FileFormatsMain.csproj.GenerateResource.cache +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\Switch_FileFormatsMain.csproj.CoreCompileInputs.cache +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Plg.dll +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\FirstPlugin.Plg.pdb +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Toolbox\bin\Release\Lib\Plugins\FirstPlugin.Plg.dll.config +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Toolbox\bin\Release\Lib\Plugins\FirstPlugin.Plg.dll +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Toolbox\bin\Release\Lib\Plugins\FirstPlugin.Plg.pdb +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Switch_FileFormatsMain\obj\Release\Switch_FileFormatsMain.csproj.CopyComplete diff --git a/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache b/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache index 4aae09f3..47286960 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/Runtime.cs b/Switch_Toolbox_Library/Runtime.cs index 704797c2..b3913327 100644 --- a/Switch_Toolbox_Library/Runtime.cs +++ b/Switch_Toolbox_Library/Runtime.cs @@ -86,7 +86,7 @@ namespace Switch_Toolbox.Library public static bool RenderModelWireframe = false; public static ViewportShading viewportShading; public static bool IsDebugMode = true; //Enables experimental features and other things to debug. - public static bool DisableViewport = false; + public static bool EnableVersionCheck = true; public static bool EnablePBR = true; public static bool enableVSync = false; diff --git a/Switch_Toolbox_Library/Switch_Toolbox_Library.csproj b/Switch_Toolbox_Library/Switch_Toolbox_Library.csproj index 145e926d..576b160e 100644 --- a/Switch_Toolbox_Library/Switch_Toolbox_Library.csproj +++ b/Switch_Toolbox_Library/Switch_Toolbox_Library.csproj @@ -37,11 +37,11 @@ - ..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\AssimpNet.dll + ..\Toolbox\Lib\AssimpNet.dll False - ..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\Be.Windows.Forms.HexBox.dll + ..\Toolbox\Lib\Be.Windows.Forms.HexBox.dll False @@ -62,15 +62,15 @@ False - ..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\K4os.Compression.LZ4.dll + ..\Toolbox\Lib\K4os.Compression.LZ4.dll False - ..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\K4os.Compression.LZ4.Streams.dll + ..\Toolbox\Lib\K4os.Compression.LZ4.Streams.dll False - ..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\K4os.Hash.xxHash.dll + ..\Toolbox\Lib\K4os.Hash.xxHash.dll False @@ -89,26 +89,26 @@ False - ..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\Octokit.dll + ..\Toolbox\Lib\Octokit.dll False - ..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\OpenTK.dll + ..\Toolbox\Lib\OpenTK.dll False - ..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\OpenTK.GLControl.dll + ..\Toolbox\Lib\OpenTK.GLControl.dll False False - ..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\SARCExt.dll + ..\Toolbox\Lib\SARCExt.dll False - ..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\ScintillaNET.dll + ..\Toolbox\Lib\ScintillaNET.dll False @@ -126,11 +126,11 @@ ..\Toolbox\Lib\SFGraphics.Utils.dll - ..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\Syroot.BinaryData.dll + ..\Toolbox\Lib\Syroot.BinaryData.dll False - ..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\Syroot.Maths.dll + ..\Toolbox\Lib\Syroot.Maths.dll False @@ -174,7 +174,7 @@ False - ..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\ZstdNet.dll + ..\Toolbox\Lib\ZstdNet.dll False diff --git a/Toolbox/Config.cs b/Toolbox/Config.cs index e8141042..d7520d71 100644 --- a/Toolbox/Config.cs +++ b/Toolbox/Config.cs @@ -47,8 +47,8 @@ namespace Toolbox case "OpenStartupWindow": bool.TryParse(node.InnerText, out Runtime.OpenStartupWindow); break; - case "DisableViewport": - bool.TryParse(node.InnerText, out Runtime.DisableViewport); + case "EnableVersionCheck": + bool.TryParse(node.InnerText, out Runtime.EnableVersionCheck); break; case "RenderModels": bool.TryParse(node.InnerText, out Runtime.RenderModels); @@ -230,7 +230,7 @@ namespace Toolbox mainSettingsNode.AppendChild(createNode(doc, "UseDebugDomainExceptionHandler", Runtime.UseDebugDomainExceptionHandler.ToString())); mainSettingsNode.AppendChild(createNode(doc, "OpenStartupWindow", Runtime.OpenStartupWindow.ToString())); - mainSettingsNode.AppendChild(createNode(doc, "DisableViewport", Runtime.DisableViewport.ToString())); + mainSettingsNode.AppendChild(createNode(doc, "EnableVersionCheck", Runtime.EnableVersionCheck.ToString())); mainSettingsNode.AppendChild(createNode(doc, "FormTheme", Switch_Toolbox.Library.Forms.FormThemes.ActivePreset.ToString())); mainSettingsNode.AppendChild(createNode(doc, "MaximizeMdiWindow", Runtime.MaximizeMdiWindow.ToString())); } diff --git a/Toolbox/GUI/Settings.Designer.cs b/Toolbox/GUI/Settings.Designer.cs index f93e14dd..c4dc48d7 100644 --- a/Toolbox/GUI/Settings.Designer.cs +++ b/Toolbox/GUI/Settings.Designer.cs @@ -61,7 +61,6 @@ this.chkBoxStereoscopy = new Switch_Toolbox.Library.Forms.STCheckBox(); this.label2 = new Switch_Toolbox.Library.Forms.STLabel(); this.panel1 = new Switch_Toolbox.Library.Forms.STPanel(); - this.disableViewportCHKBX = new Switch_Toolbox.Library.Forms.STCheckBox(); this.GLSLVerLabel = new Switch_Toolbox.Library.Forms.STLabel(); this.openGLVerLabel = new Switch_Toolbox.Library.Forms.STLabel(); this.btnSave = new Switch_Toolbox.Library.Forms.STButton(); @@ -86,6 +85,7 @@ this.bgGradientTop = new System.Windows.Forms.PictureBox(); this.stLabel2 = new Switch_Toolbox.Library.Forms.STLabel(); this.preferredTexFormatCB = new System.Windows.Forms.ComboBox(); + this.enableVersionCheckCHK = new Switch_Toolbox.Library.Forms.STCheckBox(); this.contentContainer.SuspendLayout(); this.panel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.cameraMaxSpeedUD)).BeginInit(); @@ -581,7 +581,7 @@ // // panel1 // - this.panel1.Controls.Add(this.disableViewportCHKBX); + this.panel1.Controls.Add(this.enableVersionCheckCHK); this.panel1.Controls.Add(this.GLSLVerLabel); this.panel1.Controls.Add(this.openGLVerLabel); this.panel1.Location = new System.Drawing.Point(3, 4); @@ -589,17 +589,6 @@ this.panel1.Size = new System.Drawing.Size(215, 96); this.panel1.TabIndex = 5; // - // disableViewportCHKBX - // - this.disableViewportCHKBX.AutoSize = true; - this.disableViewportCHKBX.Location = new System.Drawing.Point(0, 67); - this.disableViewportCHKBX.Name = "disableViewportCHKBX"; - this.disableViewportCHKBX.Size = new System.Drawing.Size(105, 17); - this.disableViewportCHKBX.TabIndex = 16; - this.disableViewportCHKBX.Text = "Disable Viewport"; - this.disableViewportCHKBX.UseVisualStyleBackColor = true; - this.disableViewportCHKBX.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged_2); - // // GLSLVerLabel // this.GLSLVerLabel.AutoSize = true; @@ -885,6 +874,17 @@ this.preferredTexFormatCB.TabIndex = 0; this.preferredTexFormatCB.SelectedIndexChanged += new System.EventHandler(this.preferredTexFormatCB_SelectedIndexChanged); // + // enableVersionCheckCHK + // + this.enableVersionCheckCHK.AutoSize = true; + this.enableVersionCheckCHK.Location = new System.Drawing.Point(0, 67); + this.enableVersionCheckCHK.Name = "enableVersionCheckCHK"; + this.enableVersionCheckCHK.Size = new System.Drawing.Size(131, 17); + this.enableVersionCheckCHK.TabIndex = 16; + this.enableVersionCheckCHK.Text = "Enable Version Check"; + this.enableVersionCheckCHK.UseVisualStyleBackColor = true; + this.enableVersionCheckCHK.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged_2); + // // Settings // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -949,7 +949,6 @@ private Switch_Toolbox.Library.Forms.STLabel label7; private Switch_Toolbox.Library.Forms.NumericUpDownInt yazoCompressionLevelUD; private Switch_Toolbox.Library.Forms.STPanel panel3; - private Switch_Toolbox.Library.Forms.STCheckBox disableViewportCHKBX; private Switch_Toolbox.Library.Forms.STCheckBox chkBoxEnablePBR; private Switch_Toolbox.Library.Forms.STTabControl stTabControl1; private System.Windows.Forms.TabPage tabPage1; @@ -981,5 +980,6 @@ private Switch_Toolbox.Library.Forms.STButton redChannelBtn; private Switch_Toolbox.Library.Forms.STLabel stLabel9; private Switch_Toolbox.Library.Forms.NumericUpDownFloat cameraMaxSpeedUD; + private Switch_Toolbox.Library.Forms.STCheckBox enableVersionCheckCHK; } } \ No newline at end of file diff --git a/Toolbox/GUI/Settings.cs b/Toolbox/GUI/Settings.cs index 3f33cfe0..9712ecf1 100644 --- a/Toolbox/GUI/Settings.cs +++ b/Toolbox/GUI/Settings.cs @@ -62,7 +62,7 @@ namespace Toolbox camFarNumUD.Value = (decimal)Runtime.CameraFar; previewScaleUD.Value = (decimal)Runtime.previewScale; yazoCompressionLevelUD.Value = Runtime.Yaz0CompressionLevel; - disableViewportCHKBX.Checked = Runtime.DisableViewport; + enableVersionCheckCHK.Checked = Runtime.EnableVersionCheck; chkBoxEnablePBR.Checked = Runtime.EnablePBR; chkBoxMdiMaximized.Checked = Runtime.MaximizeMdiWindow; chkBoxDisplayBones.Checked = Runtime.renderBones; @@ -156,7 +156,7 @@ namespace Toolbox private void checkBox1_CheckedChanged_2(object sender, EventArgs e) { - Runtime.DisableViewport = disableViewportCHKBX.Checked; + Runtime.EnableVersionCheck = enableVersionCheckCHK.Checked; } private void chkBoxEnablePBR_CheckedChanged(object sender, EventArgs e) diff --git a/Toolbox/MainForm.cs b/Toolbox/MainForm.cs index c2072407..63c24561 100644 --- a/Toolbox/MainForm.cs +++ b/Toolbox/MainForm.cs @@ -28,6 +28,8 @@ namespace Toolbox public MainForm() { + FormThemes.ActivePreset = FormThemes.Preset.Dark; + Runtime.MainForm = this; LoadConfig(); @@ -112,7 +114,7 @@ namespace Toolbox bool UpdatePromptShown = false; private void Application_Idle(object sender, EventArgs e) { - if (UpdateProgram.CanUpdate && !Runtime.DisableUpdatePrompt) + if (UpdateProgram.CanUpdate && !Runtime.EnableVersionCheck) { if (!UpdatePromptShown) { diff --git a/Toolbox/Toolbox.csproj b/Toolbox/Toolbox.csproj index cbef3a1d..1ede3a2e 100644 --- a/Toolbox/Toolbox.csproj +++ b/Toolbox/Toolbox.csproj @@ -209,7 +209,7 @@ {96820047-2a39-4e5a-bfa4-e84fff5c66cf} Switch_Toolbox_Library - True + False False @@ -250,9 +250,6 @@ PreserveNewest - - PreserveNewest - PreserveNewest diff --git a/Toolbox/Version.txt b/Toolbox/Version.txt index 1f244507..cb4d9d75 100644 --- a/Toolbox/Version.txt +++ b/Toolbox/Version.txt @@ -1,3 +1,3 @@ -v0.8.89 -12/6/2018 4:34:02 PM +00:00 +v1.0 BETA +3/23/2019 1:40:02 PM +00:00 master \ No newline at end of file diff --git a/Updater/obj/Release/Updater.csproj.CoreCompileInputs.cache b/Updater/obj/Release/Updater.csproj.CoreCompileInputs.cache index dff7dfa7..9bfea569 100644 --- a/Updater/obj/Release/Updater.csproj.CoreCompileInputs.cache +++ b/Updater/obj/Release/Updater.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -c475e10de89197fe91034aab1960dc610921d0f8 +cb4f3a95a0463c6c9117e2680971a46ffa793fe3