Skip to content
Permalink
Browse files

Revert "[Assimp] Updated assimp to official 4.1.0 and updated referen…

…ces in projects (closes #458)"

This reverts commit abef0e8.
  • Loading branch information
xen2 committed Jun 8, 2019
1 parent fa4f92e commit 4f6f3fa1a29a7a5403612c5b42be456e9547ea3c
Showing with 1,193 additions and 8,341 deletions.
  1. 0 deps/assimp/{LICENSE.md → LICENSE}
  2. +3 −0 deps/assimp/bin/assimp_release-dll_Win32/assimp-vc120-mt.dll
  3. +3 −0 deps/assimp/bin/assimp_release-dll_x64/assimp-vc120-mt.dll
  4. +0 −3 deps/assimp/bin/x64/assimp-vc140-mt.dll
  5. +63 −0 deps/assimp/build.bat
  6. +10 −0 deps/assimp/checkout.bat
  7. +0 −362 deps/assimp/include/assimp/BaseImporter.h
  8. +294 −0 deps/assimp/include/assimp/BaseProcess.h
  9. +0 −125 deps/assimp/include/assimp/Bitmap.h
  10. +0 −338 deps/assimp/include/assimp/BlobIOSystem.h
  11. +0 −288 deps/assimp/include/assimp/ByteSwapper.h
  12. +0 −58 deps/assimp/include/assimp/CreateAnimMesh.h
  13. +0 −142 deps/assimp/include/assimp/DefaultIOStream.h
  14. +0 −94 deps/assimp/include/assimp/DefaultIOSystem.h
  15. +5 −3 deps/assimp/include/assimp/DefaultLogger.hpp
  16. +0 −49 deps/assimp/include/assimp/Defines.h
  17. +0 −125 deps/assimp/include/assimp/Exceptional.h
  18. +53 −40 deps/assimp/include/assimp/Exporter.hpp
  19. +22 −30 deps/assimp/include/assimp/GenericProperty.h
  20. +1 −3 deps/assimp/include/assimp/Hash.h
  21. +6 −9 deps/assimp/include/assimp/IOStream.hpp
  22. +0 −352 deps/assimp/include/assimp/IOStreamBuffer.h
  23. +19 −87 deps/assimp/include/assimp/IOSystem.hpp
  24. +227 −0 deps/assimp/include/assimp/Importer.h
  25. +17 −13 deps/assimp/include/assimp/Importer.hpp
  26. +0 −244 deps/assimp/include/assimp/LineSplitter.h
  27. +0 −131 deps/assimp/include/assimp/LogAux.h
  28. +5 −20 deps/assimp/include/assimp/LogStream.hpp
  29. +36 −74 deps/assimp/include/assimp/Logger.hpp
  30. +0 −49 deps/assimp/include/assimp/Macros.h
  31. +0 −77 deps/assimp/include/assimp/MathFunctions.h
  32. +0 −199 deps/assimp/include/assimp/MemoryIOWrapper.h
  33. +2 −6 deps/assimp/include/assimp/NullLogger.hpp
  34. +0 −260 deps/assimp/include/assimp/ParsingUtils.h
  35. +0 −99 deps/assimp/include/assimp/Profiler.h
  36. +1 −3 deps/assimp/include/assimp/ProgressHandler.hpp
  37. +0 −91 deps/assimp/include/assimp/RemoveComments.h
  38. +0 −142 deps/assimp/include/assimp/SGSpatialSort.h
  39. +0 −401 deps/assimp/include/assimp/SceneCombiner.h
  40. +0 −125 deps/assimp/include/assimp/SkeletonMeshBuilder.h
  41. +0 −110 deps/assimp/include/assimp/SmoothingGroups.h
  42. +0 −138 deps/assimp/include/assimp/SmoothingGroups.inl
  43. +0 −174 deps/assimp/include/assimp/SpatialSort.h
  44. +0 −200 deps/assimp/include/assimp/StandardShapes.h
  45. +0 −348 deps/assimp/include/assimp/StreamReader.h
  46. +0 −303 deps/assimp/include/assimp/StreamWriter.h
  47. +0 −233 deps/assimp/include/assimp/StringComparison.h
  48. +0 −143 deps/assimp/include/assimp/StringUtils.h
  49. +0 −131 deps/assimp/include/assimp/Subdivision.h
  50. +0 −166 deps/assimp/include/assimp/TinyFormatter.h
  51. +0 −324 deps/assimp/include/assimp/Vertex.h
  52. +0 −83 deps/assimp/include/assimp/XMLTools.h
  53. +1 −3 deps/assimp/include/assimp/ai_assert.h
  54. +4 −90 deps/assimp/include/assimp/anim.h
  55. +1 −3 deps/assimp/include/assimp/camera.h
  56. +5 −2 deps/assimp/include/assimp/cexport.h
  57. +1 −3 deps/assimp/include/assimp/cfileio.h
  58. +3 −4 deps/assimp/include/assimp/cimport.h
  59. +6 −5 deps/assimp/include/assimp/color4.h
  60. +3 −25 deps/assimp/include/assimp/color4.inl
  61. +19 −80 deps/assimp/include/assimp/config.h
  62. +19 −80 deps/assimp/include/assimp/config.h.in
  63. +53 −56 deps/assimp/include/assimp/defs.h
  64. +0 −373 deps/assimp/include/assimp/fast_atof.h
  65. +1 −3 deps/assimp/include/assimp/importerdesc.h
  66. +0 −144 deps/assimp/include/assimp/irrXMLWrapper.h
  67. +1 −3 deps/assimp/include/assimp/light.h
  68. +2 −4 deps/assimp/include/assimp/material.h
  69. +5 −19 deps/assimp/include/assimp/material.inl
  70. +8 −7 deps/assimp/include/assimp/matrix3x3.h
  71. +13 −33 deps/assimp/include/assimp/matrix3x3.inl
  72. +9 −11 deps/assimp/include/assimp/matrix4x4.h
  73. +20 −97 deps/assimp/include/assimp/matrix4x4.inl
  74. +23 −117 deps/assimp/include/assimp/mesh.h
  75. +18 −114 deps/assimp/include/assimp/metadata.h
  76. +0 −76 deps/assimp/include/assimp/pbrmaterial.h
  77. +0 −92 deps/assimp/include/assimp/port/AndroidJNI/AndroidJNIIOSystem.h
  78. +2 −32 deps/assimp/include/assimp/postprocess.h
  79. +0 −157 deps/assimp/include/assimp/qnan.h
  80. +1 −3 deps/assimp/include/assimp/quaternion.h
  81. +1 −3 deps/assimp/include/assimp/quaternion.inl
  82. +71 −58 deps/assimp/include/assimp/scene.h
  83. +1 −9 deps/assimp/include/assimp/texture.h
  84. +9 −21 deps/assimp/include/assimp/types.h
  85. +3 −4 deps/assimp/include/assimp/vector2.h
  86. +24 −42 deps/assimp/include/assimp/vector2.inl
  87. +13 −9 deps/assimp/include/assimp/vector3.h
  88. +45 −117 deps/assimp/include/assimp/vector3.inl
  89. +1 −10 deps/assimp/include/assimp/version.h
  90. +3 −0 deps/assimp/lib/assimp_release-dll_Win32/assimp-vc120-mt.lib
  91. +3 −0 deps/assimp/lib/assimp_release-dll_x64/assimp-vc120-mt.lib
  92. +0 −3 deps/assimp/lib/x64/assimp-vc140-mt.lib
  93. +2 −2 sources/engine/Xenko.Assets.Models/AssimpAssetImporter.cs
  94. +2 −2 sources/engine/Xenko.Assets.Models/ImportAssimpCommand.cs
  95. +1 −1 sources/engine/Xenko.Assets.Models/Xenko.Assets.Models.csproj
  96. +8 −8 sources/tools/Xenko.Assimp.Translation/Xenko.Assimp.Translation.vcxproj
  97. +21 −21 sources/tools/Xenko.Importer.Assimp/Xenko.Importer.Assimp.vcxproj
File renamed without changes.
Git LFS file not shown
Git LFS file not shown

This file was deleted.

@@ -0,0 +1,63 @@
@echo OFF
REM Build Assimp using Cmake
setlocal
set CMAKE_BIN=cmake.exe

set assimp_source=%~dp0..\..\externals\assimp
set x86_output=%assimp_source%\build\x86
set x64_output=%assimp_source%\build\x64
set output=%~dp0

REM generate x64 projects
rmdir /Q /S "%x64_output%"
mkdir "%x64_output%"
del "%assimp_source%\CMakeCache.txt"
pushd "%x64_output%"
"%CMAKE_BIN%" -Wno-dev -G "Visual Studio 12 Win64" --build "%assimp_source%"
popd

REM generate x86 projects
rmdir /Q /S "%x86_output%"
mkdir "%x86_output%"
del "%assimp_source%\CMakeCache.txt"
pushd "%x86_output%"
"%CMAKE_BIN%" -Wno-dev -G "Visual Studio 12" --build "%assimp_source%"
popd

REM build x64 projects
call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\vc\vcvarsall.bat" x64
cd "%output%"
msbuild "%x64_output%\code\assimp.vcxproj" /p:Platform="x64";Configuration="Release"

REM build x86 projects
call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\vc\vcvarsall.bat" x86
cd "%output%"
msbuild "%x86_output%\code\assimp.vcxproj" /p:Platform="x86";Configuration="Release"

REM copy include files (some additional include files are needed for post-processing)
rmdir /Q /S "%output%include"
mkdir "%output%include\assimp\Compiler"
copy /Y "%assimp_source%\include\assimp\*.*" "%output%include\assimp"
copy /Y "%assimp_source%\include\assimp\Compiler\*.*" "%output%include\assimp\Compiler"
copy /Y "%assimp_source%\code\Importer.h" "%output%include\assimp"
copy /Y "%assimp_source%\code\BaseProcess.h" "%output%include\assimp"
copy /Y "%assimp_source%\code\GenericProperty.h" "%output%include\assimp"
copy /Y "%assimp_source%\code\Hash.h" "%output%include\assimp"

REM copy dlls in deps
rmdir /Q /S "%output%bin"
mkdir "%output%bin\assimp_release-dll_Win32"
mkdir "%output%bin\assimp_release-dll_x64"
copy /Y "%x86_output%\code\Release\*.dll" "%output%bin\assimp_release-dll_Win32"
copy /Y "%x64_output%\code\Release\*.dll" "%output%bin\assimp_release-dll_x64"

REM copy libs in deps
rmdir /Q /S "%output%lib"
mkdir "%output%lib\assimp_release-dll_Win32"
mkdir "%output%lib\assimp_release-dll_x64"
copy /Y "%x86_output%\code\Release\*.lib" "%output%lib\assimp_release-dll_Win32"
copy /Y "%x64_output%\code\Release\*.lib" "%output%lib\assimp_release-dll_x64"

REM for information and redistribution, copy license & credits
copy /Y ..\..\externals\assimp\LICENSE "%output%"
cd %output%
@@ -0,0 +1,10 @@
@echo OFF
setlocal
set HOME=%USERPROFILE%
CALL ..\find_git.cmd
IF NOT ERRORLEVEL 0 (
ECHO "Could not find git.exe"
EXIT /B %ERRORLEVEL%
)
%GIT_CMD% clone https://github.com/assimp/assimp.git %~dp0..\..\externals\assimp
if NOT ERRORLEVEL 0 pause

0 comments on commit 4f6f3fa

Please sign in to comment.
You can’t perform that action at this time.