Some fixes for compiling

This commit is contained in:
KillzXGaming 2019-03-23 13:44:27 -04:00
parent 9aba8ac605
commit 15c88c6284
21 changed files with 146 additions and 58 deletions

Binary file not shown.

View file

@ -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. 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. - 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! - Assimp devs for their massive asset library!
- Wexos (helped figure out a few things, ie format list to assign each attribute) - Wexos (helped figure out a few things, ie format list to assign each attribute)

View file

@ -52,11 +52,11 @@
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="BarsLibrary"> <Reference Include="BarsLibrary">
<HintPath>..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\BarsLibrary.dll</HintPath> <HintPath>..\Toolbox\Lib\BarsLibrary.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="BezelEngineArchive_Lib"> <Reference Include="BezelEngineArchive_Lib">
<HintPath>..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\BezelEngineArchive_Lib.dll</HintPath> <HintPath>..\Toolbox\Lib\BezelEngineArchive_Lib.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="BfshaLibrary, Version=1.2.3.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="BfshaLibrary, Version=1.2.3.0, Culture=neutral, processorArchitecture=MSIL">
@ -69,24 +69,24 @@
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="CSCore"> <Reference Include="CSCore">
<HintPath>..\Toolbox\bin\Release\Lib\CSCore.dll</HintPath> <HintPath>..\Toolbox\Lib\CSCore.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="EditorCoreCommon"> <Reference Include="EditorCoreCommon">
<HintPath>..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\EditorCoreCommon.dll</HintPath> <HintPath>..\Toolbox\Lib\EditorCoreCommon.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="KCLExt"> <Reference Include="KCLExt">
<HintPath>..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\KCLExt.dll</HintPath> <HintPath>..\Toolbox\Lib\KCLExt.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="LibHac"> <Reference Include="LibHac">
<HintPath>..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\LibHac.dll</HintPath> <HintPath>..\Toolbox\Lib\LibHac.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="Microsoft.VisualBasic" /> <Reference Include="Microsoft.VisualBasic" />
<Reference Include="NAudio"> <Reference Include="NAudio">
<HintPath>..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\NAudio.dll</HintPath> <HintPath>..\Toolbox\Lib\NAudio.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@ -111,7 +111,7 @@
<EmbedInteropTypes>False</EmbedInteropTypes> <EmbedInteropTypes>False</EmbedInteropTypes>
</Reference> </Reference>
<Reference Include="SARCExt"> <Reference Include="SARCExt">
<HintPath>..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\SARCExt.dll</HintPath> <HintPath>..\Toolbox\Lib\SARCExt.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="SELib"> <Reference Include="SELib">
@ -119,19 +119,19 @@
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="SFGraphics"> <Reference Include="SFGraphics">
<HintPath>..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\SFGraphics.dll</HintPath> <HintPath>..\Toolbox\Lib\SFGraphics.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="SFGraphics.Utils"> <Reference Include="SFGraphics.Utils">
<HintPath>..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\SFGraphics.Utils.dll</HintPath> <HintPath>..\Toolbox\Lib\SFGraphics.Utils.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="Syroot.BinaryData"> <Reference Include="Syroot.BinaryData">
<HintPath>..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\Syroot.BinaryData.dll</HintPath> <HintPath>..\Toolbox\Lib\Syroot.BinaryData.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="Syroot.Maths"> <Reference Include="Syroot.Maths">
<HintPath>..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\Syroot.Maths.dll</HintPath> <HintPath>..\Toolbox\Lib\Syroot.Maths.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="Syroot.NintenTools.Bfres"> <Reference Include="Syroot.NintenTools.Bfres">
@ -173,7 +173,7 @@
<Reference Include="System.Net.Http" /> <Reference Include="System.Net.Http" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="VGAudio"> <Reference Include="VGAudio">
<HintPath>..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\VGAudio.dll</HintPath> <HintPath>..\Toolbox\Lib\VGAudio.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
</ItemGroup> </ItemGroup>

View file

@ -1 +1 @@
36ecccec7b96249a33f44b83b2e764664c3b19be b0fa789a3d02cd4abf3a1440541170110c30bf41

View file

@ -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.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.Plg.pdb
C:\Users\Nathan\Documents\GitHub\Switch_Toolbox\Switch-Toolbox\Switch_FileFormatsMain\obj\Release\FirstPlugin.Forms.AnimParamEditor.resources 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

View file

@ -86,7 +86,7 @@ namespace Switch_Toolbox.Library
public static bool RenderModelWireframe = false; public static bool RenderModelWireframe = false;
public static ViewportShading viewportShading; public static ViewportShading viewportShading;
public static bool IsDebugMode = true; //Enables experimental features and other things to debug. 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 EnablePBR = true;
public static bool enableVSync = false; public static bool enableVSync = false;

View file

@ -37,11 +37,11 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="AssimpNet, Version=4.1.0.0, Culture=neutral, PublicKeyToken=0d51b391f59f42a6, processorArchitecture=MSIL"> <Reference Include="AssimpNet, Version=4.1.0.0, Culture=neutral, PublicKeyToken=0d51b391f59f42a6, processorArchitecture=MSIL">
<HintPath>..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\AssimpNet.dll</HintPath> <HintPath>..\Toolbox\Lib\AssimpNet.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="Be.Windows.Forms.HexBox"> <Reference Include="Be.Windows.Forms.HexBox">
<HintPath>..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\Be.Windows.Forms.HexBox.dll</HintPath> <HintPath>..\Toolbox\Lib\Be.Windows.Forms.HexBox.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="CSCore, Version=1.2.1.2, Culture=neutral, PublicKeyToken=5a08f2b6f4415dea, processorArchitecture=MSIL"> <Reference Include="CSCore, Version=1.2.1.2, Culture=neutral, PublicKeyToken=5a08f2b6f4415dea, processorArchitecture=MSIL">
@ -62,15 +62,15 @@
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="K4os.Compression.LZ4, Version=1.1.0.0, Culture=neutral, PublicKeyToken=27d14aecb5186925, processorArchitecture=MSIL"> <Reference Include="K4os.Compression.LZ4, Version=1.1.0.0, Culture=neutral, PublicKeyToken=27d14aecb5186925, processorArchitecture=MSIL">
<HintPath>..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\K4os.Compression.LZ4.dll</HintPath> <HintPath>..\Toolbox\Lib\K4os.Compression.LZ4.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="K4os.Compression.LZ4.Streams, Version=1.1.0.0, Culture=neutral, PublicKeyToken=27d14aecb5186925, processorArchitecture=MSIL"> <Reference Include="K4os.Compression.LZ4.Streams, Version=1.1.0.0, Culture=neutral, PublicKeyToken=27d14aecb5186925, processorArchitecture=MSIL">
<HintPath>..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\K4os.Compression.LZ4.Streams.dll</HintPath> <HintPath>..\Toolbox\Lib\K4os.Compression.LZ4.Streams.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="K4os.Hash.xxHash, Version=1.0.5.0, Culture=neutral, PublicKeyToken=32cd54395057cec3, processorArchitecture=MSIL"> <Reference Include="K4os.Hash.xxHash, Version=1.0.5.0, Culture=neutral, PublicKeyToken=32cd54395057cec3, processorArchitecture=MSIL">
<HintPath>..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\K4os.Hash.xxHash.dll</HintPath> <HintPath>..\Toolbox\Lib\K4os.Hash.xxHash.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="LZ4, Version=1.0.15.93, Culture=neutral, PublicKeyToken=62e1b5ec1eec9bdd, processorArchitecture=MSIL"> <Reference Include="LZ4, Version=1.0.15.93, Culture=neutral, PublicKeyToken=62e1b5ec1eec9bdd, processorArchitecture=MSIL">
@ -89,26 +89,26 @@
</Reference> </Reference>
<Reference Include="Octokit, Version=0.31.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Octokit, Version=0.31.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\Octokit.dll</HintPath> <HintPath>..\Toolbox\Lib\Octokit.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="OpenTK"> <Reference Include="OpenTK">
<HintPath>..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\OpenTK.dll</HintPath> <HintPath>..\Toolbox\Lib\OpenTK.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="OpenTK.GLControl"> <Reference Include="OpenTK.GLControl">
<HintPath>..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\OpenTK.GLControl.dll</HintPath> <HintPath>..\Toolbox\Lib\OpenTK.GLControl.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="PresentationCore" /> <Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" /> <Reference Include="PresentationFramework" />
<Reference Include="SARCExt, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="SARCExt, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\SARCExt.dll</HintPath> <HintPath>..\Toolbox\Lib\SARCExt.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="ScintillaNET"> <Reference Include="ScintillaNET">
<HintPath>..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\ScintillaNET.dll</HintPath> <HintPath>..\Toolbox\Lib\ScintillaNET.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="ScintillaNET FindReplaceDialog"> <Reference Include="ScintillaNET FindReplaceDialog">
@ -126,11 +126,11 @@
<HintPath>..\Toolbox\Lib\SFGraphics.Utils.dll</HintPath> <HintPath>..\Toolbox\Lib\SFGraphics.Utils.dll</HintPath>
</Reference> </Reference>
<Reference Include="Syroot.BinaryData"> <Reference Include="Syroot.BinaryData">
<HintPath>..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\Syroot.BinaryData.dll</HintPath> <HintPath>..\Toolbox\Lib\Syroot.BinaryData.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="Syroot.Maths"> <Reference Include="Syroot.Maths">
<HintPath>..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\Syroot.Maths.dll</HintPath> <HintPath>..\Toolbox\Lib\Syroot.Maths.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
@ -174,7 +174,7 @@
<Reference Include="WindowsFormsIntegration" /> <Reference Include="WindowsFormsIntegration" />
<Reference Include="ZstdNet, Version=1.3.3.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="ZstdNet, Version=1.3.3.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\Switch-Toolbox-38ceb8d7163902ecb569774ab4db327a194d6f99 - Copy\Toolbox\Lib\ZstdNet.dll</HintPath> <HintPath>..\Toolbox\Lib\ZstdNet.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
</ItemGroup> </ItemGroup>

View file

@ -47,8 +47,8 @@ namespace Toolbox
case "OpenStartupWindow": case "OpenStartupWindow":
bool.TryParse(node.InnerText, out Runtime.OpenStartupWindow); bool.TryParse(node.InnerText, out Runtime.OpenStartupWindow);
break; break;
case "DisableViewport": case "EnableVersionCheck":
bool.TryParse(node.InnerText, out Runtime.DisableViewport); bool.TryParse(node.InnerText, out Runtime.EnableVersionCheck);
break; break;
case "RenderModels": case "RenderModels":
bool.TryParse(node.InnerText, out Runtime.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, "UseDebugDomainExceptionHandler", Runtime.UseDebugDomainExceptionHandler.ToString()));
mainSettingsNode.AppendChild(createNode(doc, "OpenStartupWindow", Runtime.OpenStartupWindow.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, "FormTheme", Switch_Toolbox.Library.Forms.FormThemes.ActivePreset.ToString()));
mainSettingsNode.AppendChild(createNode(doc, "MaximizeMdiWindow", Runtime.MaximizeMdiWindow.ToString())); mainSettingsNode.AppendChild(createNode(doc, "MaximizeMdiWindow", Runtime.MaximizeMdiWindow.ToString()));
} }

View file

@ -61,7 +61,6 @@
this.chkBoxStereoscopy = new Switch_Toolbox.Library.Forms.STCheckBox(); this.chkBoxStereoscopy = new Switch_Toolbox.Library.Forms.STCheckBox();
this.label2 = new Switch_Toolbox.Library.Forms.STLabel(); this.label2 = new Switch_Toolbox.Library.Forms.STLabel();
this.panel1 = new Switch_Toolbox.Library.Forms.STPanel(); 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.GLSLVerLabel = new Switch_Toolbox.Library.Forms.STLabel();
this.openGLVerLabel = new Switch_Toolbox.Library.Forms.STLabel(); this.openGLVerLabel = new Switch_Toolbox.Library.Forms.STLabel();
this.btnSave = new Switch_Toolbox.Library.Forms.STButton(); this.btnSave = new Switch_Toolbox.Library.Forms.STButton();
@ -86,6 +85,7 @@
this.bgGradientTop = new System.Windows.Forms.PictureBox(); this.bgGradientTop = new System.Windows.Forms.PictureBox();
this.stLabel2 = new Switch_Toolbox.Library.Forms.STLabel(); this.stLabel2 = new Switch_Toolbox.Library.Forms.STLabel();
this.preferredTexFormatCB = new System.Windows.Forms.ComboBox(); this.preferredTexFormatCB = new System.Windows.Forms.ComboBox();
this.enableVersionCheckCHK = new Switch_Toolbox.Library.Forms.STCheckBox();
this.contentContainer.SuspendLayout(); this.contentContainer.SuspendLayout();
this.panel2.SuspendLayout(); this.panel2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.cameraMaxSpeedUD)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.cameraMaxSpeedUD)).BeginInit();
@ -581,7 +581,7 @@
// //
// panel1 // panel1
// //
this.panel1.Controls.Add(this.disableViewportCHKBX); this.panel1.Controls.Add(this.enableVersionCheckCHK);
this.panel1.Controls.Add(this.GLSLVerLabel); this.panel1.Controls.Add(this.GLSLVerLabel);
this.panel1.Controls.Add(this.openGLVerLabel); this.panel1.Controls.Add(this.openGLVerLabel);
this.panel1.Location = new System.Drawing.Point(3, 4); this.panel1.Location = new System.Drawing.Point(3, 4);
@ -589,17 +589,6 @@
this.panel1.Size = new System.Drawing.Size(215, 96); this.panel1.Size = new System.Drawing.Size(215, 96);
this.panel1.TabIndex = 5; 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 // GLSLVerLabel
// //
this.GLSLVerLabel.AutoSize = true; this.GLSLVerLabel.AutoSize = true;
@ -885,6 +874,17 @@
this.preferredTexFormatCB.TabIndex = 0; this.preferredTexFormatCB.TabIndex = 0;
this.preferredTexFormatCB.SelectedIndexChanged += new System.EventHandler(this.preferredTexFormatCB_SelectedIndexChanged); 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 // Settings
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -949,7 +949,6 @@
private Switch_Toolbox.Library.Forms.STLabel label7; private Switch_Toolbox.Library.Forms.STLabel label7;
private Switch_Toolbox.Library.Forms.NumericUpDownInt yazoCompressionLevelUD; private Switch_Toolbox.Library.Forms.NumericUpDownInt yazoCompressionLevelUD;
private Switch_Toolbox.Library.Forms.STPanel panel3; 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.STCheckBox chkBoxEnablePBR;
private Switch_Toolbox.Library.Forms.STTabControl stTabControl1; private Switch_Toolbox.Library.Forms.STTabControl stTabControl1;
private System.Windows.Forms.TabPage tabPage1; private System.Windows.Forms.TabPage tabPage1;
@ -981,5 +980,6 @@
private Switch_Toolbox.Library.Forms.STButton redChannelBtn; private Switch_Toolbox.Library.Forms.STButton redChannelBtn;
private Switch_Toolbox.Library.Forms.STLabel stLabel9; private Switch_Toolbox.Library.Forms.STLabel stLabel9;
private Switch_Toolbox.Library.Forms.NumericUpDownFloat cameraMaxSpeedUD; private Switch_Toolbox.Library.Forms.NumericUpDownFloat cameraMaxSpeedUD;
private Switch_Toolbox.Library.Forms.STCheckBox enableVersionCheckCHK;
} }
} }

View file

@ -62,7 +62,7 @@ namespace Toolbox
camFarNumUD.Value = (decimal)Runtime.CameraFar; camFarNumUD.Value = (decimal)Runtime.CameraFar;
previewScaleUD.Value = (decimal)Runtime.previewScale; previewScaleUD.Value = (decimal)Runtime.previewScale;
yazoCompressionLevelUD.Value = Runtime.Yaz0CompressionLevel; yazoCompressionLevelUD.Value = Runtime.Yaz0CompressionLevel;
disableViewportCHKBX.Checked = Runtime.DisableViewport; enableVersionCheckCHK.Checked = Runtime.EnableVersionCheck;
chkBoxEnablePBR.Checked = Runtime.EnablePBR; chkBoxEnablePBR.Checked = Runtime.EnablePBR;
chkBoxMdiMaximized.Checked = Runtime.MaximizeMdiWindow; chkBoxMdiMaximized.Checked = Runtime.MaximizeMdiWindow;
chkBoxDisplayBones.Checked = Runtime.renderBones; chkBoxDisplayBones.Checked = Runtime.renderBones;
@ -156,7 +156,7 @@ namespace Toolbox
private void checkBox1_CheckedChanged_2(object sender, EventArgs e) 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) private void chkBoxEnablePBR_CheckedChanged(object sender, EventArgs e)

View file

@ -28,6 +28,8 @@ namespace Toolbox
public MainForm() public MainForm()
{ {
FormThemes.ActivePreset = FormThemes.Preset.Dark;
Runtime.MainForm = this; Runtime.MainForm = this;
LoadConfig(); LoadConfig();
@ -112,7 +114,7 @@ namespace Toolbox
bool UpdatePromptShown = false; bool UpdatePromptShown = false;
private void Application_Idle(object sender, EventArgs e) private void Application_Idle(object sender, EventArgs e)
{ {
if (UpdateProgram.CanUpdate && !Runtime.DisableUpdatePrompt) if (UpdateProgram.CanUpdate && !Runtime.EnableVersionCheck)
{ {
if (!UpdatePromptShown) if (!UpdatePromptShown)
{ {

View file

@ -209,7 +209,7 @@
<ProjectReference Include="..\Switch_Toolbox_Library\Switch_Toolbox_Library.csproj"> <ProjectReference Include="..\Switch_Toolbox_Library\Switch_Toolbox_Library.csproj">
<Project>{96820047-2a39-4e5a-bfa4-e84fff5c66cf}</Project> <Project>{96820047-2a39-4e5a-bfa4-e84fff5c66cf}</Project>
<Name>Switch_Toolbox_Library</Name> <Name>Switch_Toolbox_Library</Name>
<Private>True</Private> <Private>False</Private>
<EmbedInteropTypes>False</EmbedInteropTypes> <EmbedInteropTypes>False</EmbedInteropTypes>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
@ -250,9 +250,6 @@
<Content Include="Lib\ByamlExt.dll"> <Content Include="Lib\ByamlExt.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Lib\Costura.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Lib\CSCore.dll"> <Content Include="Lib\CSCore.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>

View file

@ -1,3 +1,3 @@
v0.8.89 v1.0 BETA
12/6/2018 4:34:02 PM +00:00 3/23/2019 1:40:02 PM +00:00
master master

View file

@ -1 +1 @@
c475e10de89197fe91034aab1960dc610921d0f8 cb4f3a95a0463c6c9117e2680971a46ffa793fe3