Reinstall assimp

Switch_Toolbox_Library/Forms/Editors/Assimp Settings.cs

@@ -33,7 +33,7 @@ namespace Switch_Toolbox.Library.Forms
             SkinLimitMax = (uint)numericUpDown1.Value;
 
             var Flags = PostProcessSteps.None;
-            Flags |= PostProcessSteps.GlobalScale;
+         //   Flags |= PostProcessSteps.GlobalScale;
 
             if (generateNormalsChk.Checked)
                 Flags |= PostProcessSteps.GenerateNormals;

Switch_Toolbox_Library/Switch_Toolbox_Library.csproj

@@ -39,8 +39,8 @@
     <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AssimpNet">
-      <HintPath>..\Toolbox\Lib\AssimpNet.dll</HintPath>
+    <Reference Include="AssimpNet, Version=3.3.2.0, Culture=neutral, PublicKeyToken=3edc10cb77b1bca2, processorArchitecture=MSIL">
+      <HintPath>..\packages\AssimpNet.3.3.2\lib\net45\AssimpNet.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Be.Windows.Forms.HexBox">
@@ -1205,4 +1205,11 @@
     <None Include="Resources\MetaInfo.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\AssimpNet.3.3.2\build\AssimpNet.targets" Condition="Exists('..\packages\AssimpNet.3.3.2\build\AssimpNet.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>
+    <Error Condition="!Exists('..\packages\AssimpNet.3.3.2\build\AssimpNet.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\AssimpNet.3.3.2\build\AssimpNet.targets'))" />
+  </Target>
 </Project>

Switch_Toolbox_Library/packages.config

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="AssimpNet" version="3.3.2" 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

@@ -48,6 +48,9 @@
     <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="AssimpNet, Version=3.3.2.0, Culture=neutral, PublicKeyToken=3edc10cb77b1bca2, processorArchitecture=MSIL">
+      <HintPath>..\packages\AssimpNet.3.3.2\lib\net45\AssimpNet.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.VisualBasic" />
     <Reference Include="Octokit, Version=0.31.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -165,6 +168,7 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
+    <None Include="packages.config" />
     <None Include="Properties\app.manifest" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -319,15 +323,6 @@
     <Content Include="Lib\aamp_hashed_names.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Lib\Assimp32.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Lib\Assimp64.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Lib\AssimpNet.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Lib\BarsLibrary.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -534,4 +529,11 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\AssimpNet.3.3.2\build\AssimpNet.targets" Condition="Exists('..\packages\AssimpNet.3.3.2\build\AssimpNet.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>
+    <Error Condition="!Exists('..\packages\AssimpNet.3.3.2\build\AssimpNet.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\AssimpNet.3.3.2\build\AssimpNet.targets'))" />
+  </Target>
 </Project>

Toolbox/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="AssimpNet" version="3.3.2" targetFramework="net462" />
+</packages>

appveyor.yml

@@ -32,6 +32,9 @@ after_build:
   - 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\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\Assimp32.dll"
+  - 7z a "Switch-Toolbox-Latest.zip" "%APPVEYOR_BUILD_FOLDER%\Toolbox\bin\Release\Assimp64.dll"
+  - 7z a "Switch-Toolbox-Latest.zip" "%APPVEYOR_BUILD_FOLDER%\Toolbox\bin\Release\AssimpNet.dll"
   - 7z a "Switch-Toolbox-Latest.zip" "%APPVEYOR_BUILD_FOLDER%\Toolbox\bin\Release\Gl_EditorFramework.dll"
   - 7z a "Switch-Toolbox-Latest.zip" "%APPVEYOR_BUILD_FOLDER%\Toolbox\bin\Release\Switch_Toolbox.Library.dll"
   - 7z a "Switch-Toolbox-Latest.zip" "%APPVEYOR_BUILD_FOLDER%\Toolbox\bin\Release\System.Buffers.dll"

packages/AssimpNet.3.3.2/AssimpLicense.txt

@@ -0,0 +1,70 @@
+
+Copyright (c) 2012-2017 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-2014, 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.3.3.2/ChangeLog.txt

@@ -0,0 +1,164 @@
+----------------------------------------------------------------------
+CHANGELOG
+----------------------------------------------------------------------
+
+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.3.3.2/build/AssimpNet.targets

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="CopyNativeAssimp" AfterTargets="BeforeBuild">
+     <ItemGroup>
+        <NativeAssimpLibs Include="$(MSBuildThisFileDirectory)\native\win-x86\Assimp32.dll;
+                                   $(MSBuildThisFileDirectory)\native\win-x64\Assimp64.dll;"/>
+    </ItemGroup>
+    <Message Text="Copying native Assimp libraries..." Importance="high" />
+    <Copy SourceFiles="@(NativeAssimpLibs)" DestinationFolder="$(OutputPath)" />
+  </Target>
+  <Target Name="CleanAssimp" AfterTargets="Clean">
+    <Message Text="Cleaning native Assimp libraries..." Importance="high" />
+    <Delete Files="$(TargetDir)Assimp32.dll; $(TargetDir)Assimp64.dll" />
+  </Target>
+</Project>