Reinstall assimp to fix errors

BrawlboxHelper/BrawlboxHelper.csproj

@@ -81,5 +81,8 @@
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

BrawlboxHelper/app.config

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

Switch_Toolbox_Library/IO/FileIO.cs

@@ -111,6 +111,32 @@ namespace Switch_Toolbox.Library.IO
             }
         }
 
+        //Mario Tennis Aces Custom compression
+        public class MTA_CUSTOM
+        {
+            private static uint Swap(uint X)
+            {
+                return ((X >> 24) & 0xff | (X >> 8) & 0xff00 |
+                         (X << 8) & 0xff0000 | (X << 24) & 0xff000000);
+            }
+
+            public byte[] Decompress(byte[] data, uint decompressedLength)
+            {
+                uint dest = 0;
+                uint source = 0;
+
+                uint pos = 8;
+                byte[] Output = new byte[decompressedLength];
+
+                if (pos > decompressedLength)
+                {
+                    uint flag;
+                }
+
+                return Output;
+            }
+        }
+
         public class LZSS
         {
             //From https://github.com/IcySon55/Kuriimu/blob/f670c2719affc1eaef8b4c40e40985881247acc7/src/Kontract/Compression/LZSS.cs

Switch_Toolbox_Library/Switch_Toolbox_Library.csproj

@@ -1149,9 +1149,4 @@
     <None Include="Resources\materialSphereTransparent.tif" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-  </Target>
 </Project>

Switch_Toolbox_Library/packages.config

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AssimpNet" version="4.1.0" targetFramework="net462" />
   <package id="CsvHelper" version="8.0.0-beta01" targetFramework="net462" />
   <package id="DirectXTexNet" version="1.0.0-rc2" targetFramework="net462" />
   <package id="IonKiwi.lz4.net" version="1.0.11" targetFramework="net462" />

Toolbox/Toolbox.csproj

@@ -283,10 +283,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Assimp32.dll">
+    <Content Include="assimp.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assimp64.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Gl_EditorFramework.dll">

Updater/obj/Release/Updater.csproj.FileListAbsolute.txt

@@ -32,15 +32,15 @@ C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\bin\Release\Updater.exe
 C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\bin\Release\Updater.pdb
 C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\bin\Release\Octokit.dll
 C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Toolbox\bin\Release\Updater.exe.config
+C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Toolbox\bin\Release\Updater.exe.manifest
+C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Toolbox\bin\Release\Updater.application
 C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Toolbox\bin\Release\Updater.exe
 C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Toolbox\bin\Release\Updater.pdb
 C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\obj\Release\Updater.csprojAssemblyReference.cache
 C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\obj\Release\Updater.csproj.CoreCompileInputs.cache
-C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\obj\Release\Updater.csproj.CopyComplete
-C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\obj\Release\Updater.exe
-C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\obj\Release\Updater.pdb
-C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Toolbox\bin\Release\Updater.exe.manifest
-C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Toolbox\bin\Release\Updater.application
 C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\obj\Release\Updater.TrustInfo.xml
 C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\obj\Release\Updater.exe.manifest
 C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\obj\Release\Updater.application
+C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\obj\Release\Updater.csproj.CopyComplete
+C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\obj\Release\Updater.exe
+C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\obj\Release\Updater.pdb

appveyor.yml

@@ -30,7 +30,7 @@ after_build:
   - 7z a "Switch-Toolbox-Latest.zip" "%APPVEYOR_BUILD_FOLDER%\Toolbox\bin\Release\Updater.pdb"
   - 7z a "Switch-Toolbox-Latest.zip" "%APPVEYOR_BUILD_FOLDER%\Toolbox\bin\Release\Updater.exe.config"
   - 7z a "Switch-Toolbox-Latest.zip" "%APPVEYOR_BUILD_FOLDER%\Toolbox\bin\Release\Shader"
-  - 7z a "Switch-Toolbox-Latest.zip" "%APPVEYOR_BUILD_FOLDER%\Toolbox\bin\Release\Assimp32.dll"
+  - 7z a "Switch-Toolbox-Latest.zip" "%APPVEYOR_BUILD_FOLDER%\Toolbox\bin\Release\assimp.dll"
   - 7z a "Switch-Toolbox-Latest.zip" "%APPVEYOR_BUILD_FOLDER%\Toolbox\bin\Release\libzstd.dll"
   - 7z a "Switch-Toolbox-Latest.zip" "%APPVEYOR_BUILD_FOLDER%\Toolbox\bin\Release\LZ4.dll"
   - 7z a "Switch-Toolbox-Latest.zip" "%APPVEYOR_BUILD_FOLDER%\Toolbox\bin\Release\Gl_EditorFramework.dll"

packages/AssimpNet.4.1.0/ChangeLog.txt

@@ -1,209 +0,0 @@
-----------------------------------------------------------------------
-CHANGELOG
-----------------------------------------------------------------------
-
-4.1.0 (10-28-2018)
-
-  - Updated to target .Net Standard 1.3 (additional .Net 3.5 and .Net 4 targets)
-  - Removed old IL patcher to use new MemoryInterop.ILPatcher build time dependency (allows us to build cross-platform)
-  - Rewrote Sample application to be a .Net Core app that uses the Veldrid low-level graphics library for rendering
-  - Added x64 linux native binary, x64 macOS native binary
-		- Tested on Ubuntu 18.04 and MacOS 10.13 (High Sierra)
-  - Several fixes and updates to target latest Assimp release
-  - Ported over "UnmanagedLibrary" abstract code and refactored AssimpLibrary
-  - Added "ThrowOnLoadFailure" to configure getting back a "false" if native library fails to load or throw an exception (the default). Mono should no longer
-    throw a "NotImplemented" exception because of trying to get the error code from windows.
-  - !!Breaking Change!! Native DLLs are deployed differently and resolved at runtime differently
-		- Removed "DefaultLibraryPathXXBit" properties from AssimpLibrary, they are meaningless now (and probably not used)
-		- Introduced "UnmanagedLibraryResolver" that lets you set the following to completely configure native DLL loading:
-				1. Multiple probing paths
-				2. Multiple fallback library names (e.g. versioned binaries)
-				3. Override name if the default native library name is not good enough for your tastes.
-		- Search order of the native DLL is as follows:
-				1. Search user-specified probing paths
-				2. Search {AppBaseDirectory}/runtimes/{RID}/native/
-				3. Search {AppBaseDirectory}/
-				4. Search nuget cache based on assembly name/informational version ({UserProfile}/.nuget/packages/AssimpNet/{PackageVersion}/runtimes/{RID}/native/)
-				5. If all above failed, return the given name of the DLL (or override name) and let the OS try and find it (different OS' may have different strategies).
-		- The resolver is only used in AssimpLibrary.LoadLibrary(). The other two overloads still take in a user-supplied path/to/your/DLL.
-		- Native DLLs are now deployed in the "runtimes" folder of the nuget package. This means they are now picked up as dependencies by netcore (*.deps.json)
-		  and automatically get copied during the "dotnet publish" command. During development, the system will try and locate the native DLLs in the nuget cache
-		  (.net framework 3.5/4.0 targets still use the MSBuild targets file to copy the runtime folder to the output folder). The folder structure looks like this:
-				- runtimes/win-x64/native/assimp.dll
-				- runtimes/win-x86/native/assimp.dll
-				- runtimes/osx-x64/native/libassimp.dylib
-				- runtimes/linux-x64/native/libassimp.so
-		- All native binaries are named "assimp" or "libassimp" depending on platform, since we're putting them in "well known" architecture folders, no need to have unique names
-  - [Source Only] Added a Unity script that will make it easier for users to load the native DLLs when running in Editor/Standalone Unity 3D
-    - Build outputs a folder called "UnityPlugin" which you can drag and drop into the Unity Editor. A package will be available in the Asset Store as well.
-
-
-Targets Assimp 4.1.0
-
-
-
-======================================================================
-
-
-
-
-3.3.2 (12-26-2016)
-
-  - Fixed up nuget package build targets.
-  - Added donated mac library implementation (haven't personally tested)
-  - Removed null/empty string checks for import format hint for reading streams - if you don't supply
-    a hint, Assimp will automatically try to detect what format it is
-  - Added logging when an invalid export format ID is encountered -- be sure to use "collada" and not "dae".
-  - Added additional null/empty checks if adding a material property with an invalid fully qualified name.
-
-Targets Assimp 3.1.1
-
-
-
-======================================================================
-
-
-
-
-3.3 (07-3-2014)
-
-  - Upgraded to Assimp 3.1.1 - now with FBX support!
-  - Added matrix property configuration type
-  - Added root node transformation property configuration for use with "PreTransformVertices" post process step
-  - Added collada "ignore up direction" property configuration
-  - Added various FBX importer property configurations
-  - Added global property configuration to disable bone visualization when a model only has animations and no geometry
-  - Added support for Metadata objects on nodes
-  - Fixed issue with marshaling mesh names, AiMesh and AiAnimMesh are now blittable. All unmanaged structs are blittable
-    and .NET runtime marshaling is avoided due to issues with marshaling fixed buffers in non-blittable structures.
-
-Happy Fourth Of July!
-
-Targets Assimp 3.1.1
-
-
-
-======================================================================
-
-
-
-
-3.2 (03-14-2013)
-
-  - Added IOSystem/IOStream support, allowing for custom IO handling. An IOSystem can be registered to an AssimpImporter,
-    which is used during ImportFile and ConvertFile APIs. It currently is not supported for ImportFileFromStream APIs.
-  - Fixed marshalling of String material property values
-  - Fixed aiGetTexture function signature to take in an array of 2 UV wrapmodes
-
-Targets Assimp 3.0.1270
-
-
-
-======================================================================
-
-
-
-
-3.1 (01-01-2013)
-
-  - Added AnyCPU support, replaced AssimpMethods with AssimpLibrary that dynamically loads/unloads the unmanaged Assimp DLL
-    optionally, a custom file path can be specified to load the Assimp DLL. By default, the 32 or 64 bit Assimp DLL is loaded from the
-    same directory that the AssimpNet DLL is located in, depending on the bitness of the process.
-  
-  - Added missing properties for PreState/PostState in NodeAnimationChannel
-  
-
-Targets Assimp 3.0.1270
-
-
-
-======================================================================
-
-
-
-
-3.0 (11-11-2012)
-
-  - Upgraded to Assimp3.0
-  
-  - Added Convert API to AssimpImporter to utilize new Export functionality
-  
-  - Several fixes to Matrix-Quaternion structures
-  
-
-Targets Assimp 3.0.1270
-
-
-
-======================================================================
-
-
-
- 
-2.1.2.1 Refresh (7-27-2012)
-
-	- Added root transformations to the importer - can specify Scale, XRotation, YRotation, and ZRotation. Can use these properties to bake the
-	  transformation by specifying the "PreTransformVertices" post process flag.
-
-	- Added missing OffsetMatrix property to Bone
-
-
-Targets Assimp 2.0.854
-
-
-
-======================================================================
-
-
-
-
-2.1.2 (4-4-2012)
-
-	- Added RemoveConfigs() method to AssimpImporter
-	
-	- Fixed an occassional crash when mashalling string material properties
-
-
-Targets Assimp 2.0.854
-
-
-
-======================================================================
-
-
-
- 
-2.1 (1-28-2012)
-
-	- Added Matrix3x3, Matrix4x4 methods.
-	
-	- Fixed several bugs in Quaternion.
-
-	- Added unit tests for Matrix3x3, Matrix4x4, Quaternion.
-
-	- Added "ImportFileFromStream" AssimpMethod and equivalent methods to the AssimpImporter: 
-
-	   This is the implementation for "aiImportFileFromMemory".
-
-
-	- Added a "ReadStreamFully" method to MemoryHelper.
-
-	- Added "Importer Settings" config classes.
-
-	- Added a sample a port of Assimp's simple textured OpenGL sample using OpenTK.
-
-
-Targets Assimp 2.0.854
-
-
-
-======================================================================
-
-
-
-2.0 (1-22-2012)
-
-	- Initial release, core API is finished.
-
-
-Targets Assimp 2.0.854

packages/AssimpNet.4.1.0/License.txt

@@ -1,70 +0,0 @@
-
-Copyright (c) 2012-2018 AssimpNet - Nicholas Woodfield
- 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
- 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-====================================================================================
-
-Open Asset Import Library (Assimp)
-
-
-Copyright (c) 2006-2018, Assimp Development Team
-All rights reserved.
-
-Redistribution and use of this software in source and binary forms, 
-with or without modification, are permitted provided that the 
-following conditions are met:
-
-* Redistributions of source code must retain the above
-  copyright notice, this list of conditions and the
-  following disclaimer.
-
-* Redistributions in binary form must reproduce the above
-  copyright notice, this list of conditions and the
-  following disclaimer in the documentation and/or other
-  materials provided with the distribution.
-
-* Neither the name of the ASSIMP team, nor the names of its
-  contributors may be used to endorse or promote products
-  derived from this software without specific prior
-  written permission of the ASSIMP Development Team.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-
-AN EXCEPTION applies to all files in the ./test/models-nonbsd subfolder.
-These are 3d models for testing purposes, from various free sources
-on the internet. They are - unless otherwise stated - copyright of
-their respective creators, which may impose additional requirements
-on the use of their work. For any of these models, see 
-<model-name>.source.txt for more legal information. Contact us if you
-are a copyright holder and believe that we credited you inproperly or 
-if you don't want your files to appear in the repository.
-

packages/AssimpNet.4.1.0/build/AssimpNet.targets

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <!-- Copy/clean native dependencies only for projects that don't output a *.deps.json file (netframework projects). Netcore projects will
-       copy out the native dependencies during publish, and during development debugging/running, the binaries will be loaded from the nuget cache.
-       Optionally, the property $(ForceCopyNativeAssimp) can be set to true to always run these targets. -->
-  
-  <Target Name="CopyNativeAssimp" AfterTargets="AfterBuild" Condition="'$(ForceCopyNativeAssimp)' == 'true' OR !Exists('$(TargetDir)$(AssemblyName).deps.json')">
-    <ItemGroup>
-        <NativeAssimpLibs Include="$(MSBuildThisFileDirectory)..\runtimes\**\*.*"/>
-    </ItemGroup>  
-    <Message Text="Copying native Assimp libraries..." Importance="high" />
-    <Message Text="$(TargetDir)$(AssemblyName).deps.json" Importance="high" />
-    <Copy SourceFiles="@(NativeAssimpLibs)" DestinationFolder="$(OutputPath)\runtimes\%(RecursiveDir)" />
-  </Target>
- 
-  <Target Name="CleanNativeAssimp" BeforeTargets="BeforeClean" Condition="'$(ForceCopyNativeAssimp)' == 'true' OR !Exists('$(TargetDir)$(AssemblyName).deps.json')">
-    <Message Text="Cleaning native Assimp libraries..." Importance="high" />
-    <ItemGroup>
-	      <NativeAssimpLibsToDelete Include="$(TargetDir)runtimes\**\*assimp*.*;" />
-    </ItemGroup>
-    <Delete Files="@(NativeAssimpLibsToDelete)" />
-  </Target>
-</Project>