diff options
Diffstat (limited to 'src/3rdparty/assimp')
| -rw-r--r-- | src/3rdparty/assimp/assimp.cmake | 32 | ||||
| -rw-r--r-- | src/3rdparty/assimp/assimp.pri | 435 | ||||
| -rw-r--r-- | src/3rdparty/assimp/assimp_dependency.pri | 6 | ||||
| -rw-r--r-- | src/3rdparty/assimp/config.h | 138 | ||||
| -rw-r--r-- | src/3rdparty/assimp/qt_attribution.json | 6 | ||||
| -rw-r--r-- | src/3rdparty/assimp/revision.h | 16 | ||||
| m--------- | src/3rdparty/assimp/src | 0 |
7 files changed, 150 insertions, 483 deletions
diff --git a/src/3rdparty/assimp/assimp.cmake b/src/3rdparty/assimp/assimp.cmake index 592246a6f..30c77d55e 100644 --- a/src/3rdparty/assimp/assimp.cmake +++ b/src/3rdparty/assimp/assimp.cmake @@ -22,11 +22,13 @@ function(qt3d_extend_target_for_assimp target) ${assimpDir}/src/code/AssetLib/Collada/ColladaLoader.cpp ${assimpDir}/src/code/AssetLib/Collada/ColladaLoader.h ${assimpDir}/src/code/AssetLib/Collada/ColladaParser.cpp ${assimpDir}/src/code/AssetLib/Collada/ColladaParser.h ${assimpDir}/src/code/Common/Assimp.cpp - ${assimpDir}/src/code/Common/AssertHandler.cpp ${assimpDir}/src/code/Common/AssertHandler.h + ${assimpDir}/src/code/Common/AssertHandler.cpp ${assimpDir}/src/include/assimp/AssertHandler.h + ${assimpDir}/src/code/Common/Base64.cpp ${assimpDir}/src/include/assimp/Base64.hpp ${assimpDir}/src/code/Common/BaseImporter.cpp ${assimpDir}/src/code/Common/BaseProcess.cpp ${assimpDir}/src/code/Common/BaseProcess.h ${assimpDir}/src/code/Common/Bitmap.cpp ${assimpDir}/src/code/Common/CreateAnimMesh.cpp + ${assimpDir}/src/code/Common/Compression.cpp ${assimpDir}/src/code/Common/Compression.h ${assimpDir}/src/code/Common/DefaultIOStream.cpp ${assimpDir}/src/code/Common/DefaultIOSystem.cpp ${assimpDir}/src/code/Common/DefaultLogger.cpp @@ -36,6 +38,7 @@ function(qt3d_extend_target_for_assimp target) ${assimpDir}/src/code/Common/IFF.h ${assimpDir}/src/code/Common/Importer.cpp ${assimpDir}/src/code/Common/Importer.h ${assimpDir}/src/code/Common/ImporterRegistry.cpp + ${assimpDir}/src/code/Common/IOSystem.cpp ${assimpDir}/src/code/Common/PolyTools.h ${assimpDir}/src/code/Common/PostStepRegistry.cpp ${assimpDir}/src/code/Common/RemoveComments.cpp @@ -74,6 +77,7 @@ function(qt3d_extend_target_for_assimp target) ${assimpDir}/src/code/AssetLib/FBX/FBXTokenizer.cpp ${assimpDir}/src/code/AssetLib/FBX/FBXTokenizer.h ${assimpDir}/src/code/AssetLib/FBX/FBXUtil.cpp ${assimpDir}/src/code/AssetLib/FBX/FBXUtil.h ${assimpDir}/src/code/Material/MaterialSystem.cpp ${assimpDir}/src/code/Material/MaterialSystem.h + ${assimpDir}/src/code/Geometry/GeometryUtils.cpp ${assimpDir}/src/code/Geometry/GeometryUtils.h ${assimpDir}/src/code/AssetLib/Obj/ObjFileData.h ${assimpDir}/src/code/AssetLib/Obj/ObjFileImporter.cpp ${assimpDir}/src/code/AssetLib/Obj/ObjFileImporter.h ${assimpDir}/src/code/AssetLib/Obj/ObjFileMtlImporter.cpp ${assimpDir}/src/code/AssetLib/Obj/ObjFileMtlImporter.h @@ -117,7 +121,6 @@ function(qt3d_extend_target_for_assimp target) ${assimpDir}/src/code/AssetLib/glTF2/glTF2Asset.h ${assimpDir}/src/code/AssetLib/glTF2/glTF2Asset.inl ${assimpDir}/src/code/AssetLib/glTF2/glTF2AssetWriter.h ${assimpDir}/src/code/AssetLib/glTF2/glTF2AssetWriter.inl ${assimpDir}/src/code/AssetLib/glTF2/glTF2Importer.cpp ${assimpDir}/src/code/AssetLib/glTF2/glTF2Importer.h - ${assimpDir}/src/contrib/pugixml/contrib/foreach.hpp ${assimpDir}/src/contrib/pugixml/src/pugixml.hpp ${assimpDir}/src/contrib/poly2tri/poly2tri/common/shapes.cc ${assimpDir}/src/contrib/poly2tri/poly2tri/common/shapes.h ${assimpDir}/src/contrib/poly2tri/poly2tri/common/utils.h @@ -139,7 +142,6 @@ function(qt3d_extend_target_for_assimp target) ${assimpDir}/src/include/assimp/DefaultIOStream.h ${assimpDir}/src/include/assimp/DefaultIOSystem.h ${assimpDir}/src/include/assimp/DefaultLogger.hpp - ${assimpDir}/src/include/assimp/Defines.h ${assimpDir}/src/include/assimp/Exceptional.h ${assimpDir}/src/include/assimp/Exporter.hpp ${assimpDir}/src/include/assimp/GenericProperty.h @@ -221,6 +223,7 @@ function(qt3d_extend_target_for_assimp target) ASSIMP_BUILD_NO_EXPORT ASSIMP_BUILD_NO_HMP_IMPORTER ASSIMP_BUILD_NO_IFC_IMPORTER + ASSIMP_BUILD_NO_IQM_IMPORTER ASSIMP_BUILD_NO_IRRMESH_IMPORTER ASSIMP_BUILD_NO_IRR_IMPORTER ASSIMP_BUILD_NO_LIMITBONEWEIGHTS_PROCESS @@ -282,6 +285,7 @@ function(qt3d_extend_target_for_assimp target) ${assimpDir}/src/include ${assimpDir}/src/include/assimp/Compiler ${assimpDir}/unzip + NO_UNITY_BUILD ) qt_internal_extend_target(${target} CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND (CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_qt3d_system_assimp) AND (host_build OR NOT QT_FEATURE_qt3d_system_assimp) @@ -304,6 +308,11 @@ function(qt3d_extend_target_for_assimp target) Qt::ZlibPrivate ) + qt_internal_extend_target(${target} CONDITION (EMSCRIPTEN OR ANDROID) AND NOT QT_FEATURE_qt3d_system_assimp + DEFINES + USE_FILE32API + ) + # special case begin qt_internal_extend_target(${target} CONDITION ICC AND NOT QT_FEATURE_qt3d_system_assimp AND (NOT CMAKE_CROSSCOMPILING OR NOT host_build) COMPILE_OPTIONS @@ -342,4 +351,21 @@ function(qt3d_extend_target_for_assimp target) COMPILE_OPTIONS /bigobj ) + + qt_internal_extend_target(${target} CONDITION GCC AND (NOT QT_FEATURE_qt3d_system_assimp) AND (host_build OR NOT QT_FEATURE_qt3d_system_assimp) + SOURCES + ../../../3rdparty/assimp/src/code/Common/ZipArchiveIOSystem.cpp + COMPILE_OPTIONS + "-Wno-cast-function-type" + ) + + # Silence warnings in 3rdparty code + if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + set_source_files_properties(${assimpDir}/src/code/AssetLib/Collada/ColladaParser.cpp PROPERTIES COMPILE_FLAGS "-Wno-strict-aliasing") + set_source_files_properties(${assimpDir}/src/code/Common/ZipArchiveIOSystem.cpp PROPERTIES COMPILE_FLAGS "-Wno-cast-function-type") + endif() + if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") + set_source_files_properties(${assimpDir}/src/code/Common/Assimp.cpp PROPERTIES COMPILE_FLAGS "-Wno-ordered-compare-function-pointers") + endif() + endfunction() diff --git a/src/3rdparty/assimp/assimp.pri b/src/3rdparty/assimp/assimp.pri deleted file mode 100644 index 255781d52..000000000 --- a/src/3rdparty/assimp/assimp.pri +++ /dev/null @@ -1,435 +0,0 @@ -# AssImp expects this to be defined on debug builds -CONFIG(debug, debug|release) : DEFINES+=_DEBUG -CONFIG += exceptions rtti - -CONFIG -= precompile_header - -win32:DEFINES+=_CRT_SECURE_NO_WARNINGS - -qtConfig(system-zlib):!if(cross_compile:host_build): \ - QMAKE_USE_PRIVATE += zlib -else: \ - QT_PRIVATE += zlib-private - -DEFINES += \ - ASSIMP_BUILD_BOOST_WORKAROUND \ - ASSIMP_BUILD_NO_3DS_IMPORTER \ - ASSIMP_BUILD_NO_3D_IMPORTER \ - ASSIMP_BUILD_NO_3MF_IMPORTER \ - ASSIMP_BUILD_NO_AC_IMPORTER \ - ASSIMP_BUILD_NO_AMF_IMPORTER \ - ASSIMP_BUILD_NO_ASE_IMPORTER \ - ASSIMP_BUILD_NO_ASSBIN_IMPORTER \ - ASSIMP_BUILD_NO_B3D_IMPORTER \ - ASSIMP_BUILD_NO_BLEND_IMPORTER \ - ASSIMP_BUILD_NO_BVH_IMPORTER \ - ASSIMP_BUILD_NO_C4D_IMPORTER \ - ASSIMP_BUILD_NO_COB_IMPORTER \ - ASSIMP_BUILD_NO_COMPRESSED_IFC \ - ASSIMP_BUILD_NO_CSM_IMPORTER \ - ASSIMP_BUILD_NO_DXF_IMPORTER \ - ASSIMP_BUILD_NO_EXPORT \ - ASSIMP_BUILD_NO_HMP_IMPORTER \ - ASSIMP_BUILD_NO_IFC_IMPORTER \ - ASSIMP_BUILD_NO_IRRMESH_IMPORTER \ - ASSIMP_BUILD_NO_IRR_IMPORTER \ - ASSIMP_BUILD_NO_LIMITBONEWEIGHTS_PROCESS \ - ASSIMP_BUILD_NO_LWO_IMPORTER \ - ASSIMP_BUILD_NO_LWS_IMPORTER \ - ASSIMP_BUILD_NO_M3D_IMPORTER \ - ASSIMP_BUILD_NO_MD2_IMPORTER \ - ASSIMP_BUILD_NO_MD3_IMPORTER \ - ASSIMP_BUILD_NO_MD5_IMPORTER \ - ASSIMP_BUILD_NO_MDC_IMPORTER \ - ASSIMP_BUILD_NO_MDL_IMPORTER \ - ASSIMP_BUILD_NO_MMD_IMPORTER \ - ASSIMP_BUILD_NO_MS3D_IMPORTER \ - ASSIMP_BUILD_NO_NDO_IMPORTER \ - ASSIMP_BUILD_NO_NFF_IMPORTER \ - ASSIMP_BUILD_NO_OFF_IMPORTER \ - ASSIMP_BUILD_NO_OGRE_IMPORTER \ - ASSIMP_BUILD_NO_OPENGEX_IMPORTER \ - ASSIMP_BUILD_NO_OWN_ZLIB \ - ASSIMP_BUILD_NO_PLY_IMPORTER \ - ASSIMP_BUILD_NO_Q3BSP_IMPORTER \ - ASSIMP_BUILD_NO_Q3D_IMPORTER \ - ASSIMP_BUILD_NO_RAW_IMPORTER \ - ASSIMP_BUILD_NO_SIB_IMPORTER \ - ASSIMP_BUILD_NO_SMD_IMPORTER \ - ASSIMP_BUILD_NO_STEP_IMPORTER \ - ASSIMP_BUILD_NO_TERRAGEN_IMPORTER \ - ASSIMP_BUILD_NO_X3D_IMPORTER \ - ASSIMP_BUILD_NO_XGL_IMPORTER \ - ASSIMP_BUILD_NO_X_IMPORTER \ - ASSIMP_BUILD_NO_BLEND_IMPORTER \ - NOUNCRYPT \ - RAPIDJSON_HAS_STDSTRING=1 \ - RAPIDJSON_NOMEMBERITERATORCLASS \ - ASSIMP_BUILD_NO_LIMITBONEWEIGHTS_PROCESS - -win32: DEFINES += WindowsStore - -intel_icc: { - # warning #310: old-style parameter list (anachronism) - QMAKE_CFLAGS_WARN_ON += -wd310 - - # warning #68: integer conversion resulted in a change of sign - QMAKE_CFLAGS_WARN_ON += -wd68 - - # warning #858: type qualifier on return type is meaningless - QMAKE_CFLAGS_WARN_ON += -wd858 - - QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON -} else:gcc|clang: { - # Stop compiler complaining about ignored qualifiers on return types - QMAKE_CFLAGS_WARN_ON += -Wno-ignored-qualifiers -Wno-unused-parameter -Wno-unused-variable -Wno-deprecated-declarations -Wno-unused-function - QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -Wno-reorder -} else:msvc { - # Disabled Warnings: - # 4100: 'identifier' : unreferenced formal parameter - # 4189: 'identifier' : local variable is initialized but not referenced - # 4267: coversion from 'size_t' to 'int', possible loss of data - # 4996: Function call with parameters that may be unsafe - # 4828: The file contains a character starting at offset 0x167b that - # is illegal in the current source character set (codepage 65001) - QMAKE_CFLAGS_WARN_ON += -wd"4100" -wd"4189" -wd"4267" -wd"4996" -wd"4828" - QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -} - -clang: { - QMAKE_CFLAGS_WARN_ON += -Wno-unused-private-field - QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -} - -# Prevents "catastrophic error: Too many segments for object format" for builds using Windows ICC -msvc: QMAKE_CXXFLAGS += /bigobj - -CONFIG += warn_on - -VPATH += \ - $$PWD/src \ - $$PWD/src/code \ - $$PWD/src/code/res - -INCLUDEPATH += \ - $$PWD \ - $$PWD/.. \ - $$PWD/src \ - $$PWD/src/code \ - $$PWD/src/code/Common \ - $$PWD/src/code/AssetLib/Collada \ - $$PWD/src/code/Material \ - $$PWD/src/code/AssetLib/Obj \ - $$PWD/src/code/AssetLib/FBX \ - $$PWD/src/code/PostProcessing \ - $$PWD/src/code/AssetLib/STL \ - $$PWD/src/code/AssetLib/glTF \ - $$PWD/src/code/AssetLib/glTF2 \ - $$PWD/src/code/CApi \ - $$PWD/src/include \ - $$PWD/src/include/assimp/Compiler - -HEADERS += \ - $$PWD/config.h \ - $$PWD/revision.h - -HEADERS += \ - $$PWD/src/include/assimp/Compiler/pushpack1.h \ - $$PWD/src/include/assimp/Compiler/poppack1.h \ - $$PWD/src/include/assimp/Compiler/pstdint.h \ - $$PWD/src/include/assimp/anim.h \ - $$PWD/src/include/assimp/ai_assert.h \ - $$PWD/src/include/assimp/camera.h \ - $$PWD/src/include/assimp/color4.h \ - $$PWD/src/include/assimp/color4.inl \ - $$PWD/src/include/assimp/defs.h \ - $$PWD/src/include/assimp/Defines.h \ - $$PWD/src/include/assimp/cfileio.h \ - $$PWD/src/include/assimp/light.h \ - $$PWD/src/include/assimp/material.h \ - $$PWD/src/include/assimp/material.inl \ - $$PWD/src/include/assimp/matrix3x3.h \ - $$PWD/src/include/assimp/matrix3x3.inl \ - $$PWD/src/include/assimp/matrix4x4.h \ - $$PWD/src/include/assimp/matrix4x4.inl \ - $$PWD/src/include/assimp/mesh.h \ - $$PWD/src/include/assimp/pbrmaterial.h \ - $$PWD/src/include/assimp/postprocess.h \ - $$PWD/src/include/assimp/quaternion.h \ - $$PWD/src/include/assimp/quaternion.inl \ - $$PWD/src/include/assimp/scene.h \ - $$PWD/src/include/assimp/metadata.h \ - $$PWD/src/include/assimp/texture.h \ - $$PWD/src/include/assimp/types.h \ - $$PWD/src/include/assimp/vector2.h \ - $$PWD/src/include/assimp/vector2.inl \ - $$PWD/src/include/assimp/vector3.h \ - $$PWD/src/include/assimp/vector3.inl \ - $$PWD/src/include/assimp/version.h \ - $$PWD/src/include/assimp/cimport.h \ - $$PWD/src/include/assimp/importerdesc.h \ - $$PWD/src/include/assimp/Importer.hpp \ - $$PWD/src/include/assimp/DefaultLogger.hpp \ - $$PWD/src/include/assimp/ProgressHandler.hpp \ - $$PWD/src/include/assimp/IOStream.hpp \ - $$PWD/src/include/assimp/IOSystem.hpp \ - $$PWD/src/include/assimp/Logger.hpp \ - $$PWD/src/include/assimp/LogStream.hpp \ - $$PWD/src/include/assimp/NullLogger.hpp \ - $$PWD/src/include/assimp/cexport.h \ - $$PWD/src/include/assimp/Exporter.hpp \ - $$PWD/src/include/assimp/DefaultIOStream.h \ - $$PWD/src/include/assimp/DefaultIOSystem.h \ - $$PWD/src/include/assimp/SceneCombiner.h \ - $$PWD/src/include/assimp/fast_atof.h \ - $$PWD/src/include/assimp/qnan.h \ - $$PWD/src/include/assimp/BaseImporter.h \ - $$PWD/src/include/assimp/Hash.h \ - $$PWD/src/include/assimp/MemoryIOWrapper.h \ - $$PWD/src/include/assimp/ParsingUtils.h \ - $$PWD/src/include/assimp/StreamReader.h \ - $$PWD/src/include/assimp/StreamWriter.h \ - $$PWD/src/include/assimp/StringComparison.h \ - $$PWD/src/include/assimp/StringUtils.h \ - $$PWD/src/include/assimp/SGSpatialSort.h \ - $$PWD/src/include/assimp/GenericProperty.h \ - $$PWD/src/include/assimp/SpatialSort.h \ - $$PWD/src/include/assimp/SkeletonMeshBuilder.h \ - $$PWD/src/include/assimp/SmoothingGroups.h \ - $$PWD/src/include/assimp/SmoothingGroups.inl \ - $$PWD/src/include/assimp/StandardShapes.h \ - $$PWD/src/include/assimp/RemoveComments.h \ - $$PWD/src/include/assimp/Subdivision.h \ - $$PWD/src/include/assimp/Vertex.h \ - $$PWD/src/include/assimp/LineSplitter.h \ - $$PWD/src/include/assimp/TinyFormatter.h \ - $$PWD/src/include/assimp/Profiler.h \ - $$PWD/src/include/assimp/LogAux.h \ - $$PWD/src/include/assimp/Bitmap.h \ - $$PWD/src/include/assimp/XMLTools.h \ - $$PWD/src/include/assimp/IOStreamBuffer.h \ - $$PWD/src/include/assimp/CreateAnimMesh.h \ - $$PWD/src/include/assimp/BlobIOSystem.h \ - $$PWD/src/include/assimp/MathFunctions.h \ - $$PWD/src/include/assimp/Exceptional.h \ - $$PWD/src/include/assimp/ByteSwapper.h \ - $$PWD/src/include/assimp/DefaultLogger.hpp \ - $$PWD/src/include/assimp/LogStream.hpp \ - $$PWD/src/include/assimp/Logger.hpp \ - $$PWD/src/include/assimp/NullLogger.hpp \ - $$PWD/src/include/assimp/ZipArchiveIOSystem.h \ - $$PWD/src/code/Common/AssertHandler.h \ - $$PWD/src/code/Common/FileLogStream.h \ - $$PWD/src/code/Common/StdOStreamLogStream.h \ - $$PWD/src/code/Common/BaseProcess.h \ - $$PWD/src/code/Common/Importer.h \ - $$PWD/src/code/Common/ScenePrivate.h \ - $$PWD/src/code/Common/DefaultProgressHandler.h \ - $$PWD/src/code/CApi/CInterfaceIOWrapper.h \ - $$PWD/src/code/Common/IFF.h \ - $$PWD/src/code/Common/VertexTriangleAdjacency.h \ - $$PWD/src/code/Common/ScenePreprocessor.h \ - $$PWD/src/code/Common/TargetAnimation.h \ - $$PWD/src/code/Common/simd.h \ - $$PWD/src/code/AssetLib/Collada/ColladaHelper.h \ - $$PWD/src/code/AssetLib/Collada/ColladaLoader.h \ - $$PWD/src/code/AssetLib/Collada/ColladaParser.h \ - $$PWD/src/code/Material/MaterialSystem.h \ - $$PWD/src/code/AssetLib/Obj/ObjFileData.h \ - $$PWD/src/code/AssetLib/Obj/ObjFileImporter.h \ - $$PWD/src/code/AssetLib/Obj/ObjFileMtlImporter.h \ - $$PWD/src/code/AssetLib/Obj/ObjFileParser.h \ - $$PWD/src/code/AssetLib/Obj/ObjTools.h \ - $$PWD/src/code/AssetLib/FBX/FBXCompileConfig.h \ - $$PWD/src/code/AssetLib/FBX/FBXImporter.h \ - $$PWD/src/code/AssetLib/FBX/FBXParser.h \ - $$PWD/src/code/AssetLib/FBX/FBXTokenizer.h \ - $$PWD/src/code/AssetLib/FBX/FBXImportSettings.h \ - $$PWD/src/code/AssetLib/FBX/FBXConverter.h \ - $$PWD/src/code/AssetLib/FBX/FBXUtil.h \ - $$PWD/src/code/AssetLib/FBX/FBXDocument.h \ - $$PWD/src/code/AssetLib/FBX/FBXProperties.h \ - $$PWD/src/code/AssetLib/FBX/FBXMeshGeometry.h \ - $$PWD/src/code/AssetLib/FBX/FBXCommon.h \ - $$PWD/src/code/PostProcessing/ArmaturePopulate.h \ - $$PWD/src/code/PostProcessing/CalcTangentsProcess.h \ - $$PWD/src/code/PostProcessing/ComputeUVMappingProcess.h \ - $$PWD/src/code/PostProcessing/ConvertToLHProcess.h \ - $$PWD/src/code/PostProcessing/EmbedTexturesProcess.h \ - $$PWD/src/code/PostProcessing/FindDegenerates.h \ - $$PWD/src/code/PostProcessing/FindInstancesProcess.h \ - $$PWD/src/code/PostProcessing/FindInvalidDataProcess.h \ - $$PWD/src/code/PostProcessing/FixNormalsStep.h \ - $$PWD/src/code/PostProcessing/DropFaceNormalsProcess.h \ - $$PWD/src/code/PostProcessing/GenBoundingBoxesProcess.h \ - $$PWD/src/code/PostProcessing/GenFaceNormalsProcess.h \ - $$PWD/src/code/PostProcessing/GenVertexNormalsProcess.h \ - $$PWD/src/code/PostProcessing/PretransformVertices.h \ - $$PWD/src/code/PostProcessing/ImproveCacheLocality.h \ - $$PWD/src/code/PostProcessing/JoinVerticesProcess.h \ - $$PWD/src/code/PostProcessing/RemoveRedundantMaterials.h \ - $$PWD/src/code/PostProcessing/RemoveVCProcess.h \ - $$PWD/src/code/PostProcessing/SortByPTypeProcess.h \ - $$PWD/src/code/PostProcessing/SplitLargeMeshes.h \ - $$PWD/src/code/PostProcessing/SplitByBoneCountProcess.h \ - $$PWD/src/code/PostProcessing/TextureTransform.h \ - $$PWD/src/code/PostProcessing/TriangulateProcess.h \ - $$PWD/src/code/PostProcessing/ValidateDataStructure.h \ - $$PWD/src/code/PostProcessing/OptimizeGraph.h \ - $$PWD/src/code/PostProcessing/OptimizeMeshes.h \ - $$PWD/src/code/PostProcessing/DeboneProcess.h \ - $$PWD/src/code/PostProcessing/ProcessHelper.h \ - $$PWD/src/code/Common/PolyTools.h \ - $$PWD/src/code/PostProcessing/MakeVerboseFormat.h \ - $$PWD/src/code/PostProcessing/ScaleProcess.h \ - $$PWD/src/code/AssetLib/glTF/glTFAsset.h \ - $$PWD/src/code/AssetLib/glTF/glTFAsset.inl \ - $$PWD/src/code/AssetLib/glTF/glTFAssetWriter.inl \ - $$PWD/src/code/AssetLib/glTF/glTFAssetWriter.h \ - $$PWD/src/code/AssetLib/glTF/glTFImporter.h \ - $$PWD/src/code/AssetLib/glTF/glTFCommon.h \ - $$PWD/src/code/AssetLib/glTF2/glTF2AssetWriter.h \ - $$PWD/src/code/AssetLib/glTF2/glTF2Asset.h \ - $$PWD/src/code/AssetLib/glTF2/glTF2Asset.inl \ - $$PWD/src/code/AssetLib/glTF2/glTF2AssetWriter.inl \ - $$PWD/src/code/AssetLib/glTF2/glTF2Importer.h \ - $$PWD/src/code/AssetLib/STL/STLLoader.h - -SOURCES += \ - $$PWD/src/code/Common/Assimp.cpp \ - $$PWD/src/code/Common/AssertHandler.cpp \ - $$PWD/src/code/Common/DefaultLogger.cpp \ - $$PWD/src/code/Common/BaseImporter.cpp \ - $$PWD/src/code/Common/BaseProcess.cpp \ - $$PWD/src/code/Common/PostStepRegistry.cpp \ - $$PWD/src/code/Common/ImporterRegistry.cpp \ - $$PWD/src/code/Common/DefaultIOStream.cpp \ - $$PWD/src/code/Common/DefaultIOSystem.cpp \ - $$PWD/src/code/Common/Exceptional.cpp \ - $$PWD/src/code/CApi/CInterfaceIOWrapper.cpp \ - $$PWD/src/code/Common/Importer.cpp \ - $$PWD/src/code/Common/SGSpatialSort.cpp \ - $$PWD/src/code/Common/VertexTriangleAdjacency.cpp \ - $$PWD/src/code/Common/SpatialSort.cpp \ - $$PWD/src/code/Common/SceneCombiner.cpp \ - $$PWD/src/code/Common/ScenePreprocessor.cpp \ - $$PWD/src/code/Common/SkeletonMeshBuilder.cpp \ - $$PWD/src/code/Common/StandardShapes.cpp \ - $$PWD/src/code/Common/TargetAnimation.cpp \ - $$PWD/src/code/Common/RemoveComments.cpp \ - $$PWD/src/code/Common/Subdivision.cpp \ - $$PWD/src/code/Common/scene.cpp \ - $$PWD/src/code/Common/Bitmap.cpp \ - $$PWD/src/code/Common/Version.cpp \ - $$PWD/src/code/Common/CreateAnimMesh.cpp \ - $$PWD/src/code/Common/simd.cpp \ - $$PWD/src/code/Common/material.cpp \ - $$PWD/src/code/Common/ZipArchiveIOSystem.cpp \ - $$PWD/src/code/AssetLib/Collada/ColladaHelper.cpp \ - $$PWD/src/code/AssetLib/Collada/ColladaLoader.cpp \ - $$PWD/src/code/AssetLib/Collada/ColladaParser.cpp \ - $$PWD/src/code/Material/MaterialSystem.cpp \ - $$PWD/src/code/AssetLib/Obj/ObjFileImporter.cpp \ - $$PWD/src/code/AssetLib/Obj/ObjFileMtlImporter.cpp \ - $$PWD/src/code/AssetLib/Obj/ObjFileParser.cpp \ - $$PWD/src/code/AssetLib/FBX/FBXImporter.cpp \ - $$PWD/src/code/AssetLib/FBX/FBXParser.cpp \ - $$PWD/src/code/AssetLib/FBX/FBXTokenizer.cpp \ - $$PWD/src/code/AssetLib/FBX/FBXConverter.cpp \ - $$PWD/src/code/AssetLib/FBX/FBXUtil.cpp \ - $$PWD/src/code/AssetLib/FBX/FBXDocument.cpp \ - $$PWD/src/code/AssetLib/FBX/FBXProperties.cpp \ - $$PWD/src/code/AssetLib/FBX/FBXMeshGeometry.cpp \ - $$PWD/src/code/AssetLib/FBX/FBXMaterial.cpp \ - $$PWD/src/code/AssetLib/FBX/FBXModel.cpp \ - $$PWD/src/code/AssetLib/FBX/FBXAnimation.cpp \ - $$PWD/src/code/AssetLib/FBX/FBXNodeAttribute.cpp \ - $$PWD/src/code/AssetLib/FBX/FBXDeformer.cpp \ - $$PWD/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp \ - $$PWD/src/code/AssetLib/FBX/FBXDocumentUtil.cpp \ - $$PWD/src/code/PostProcessing/ArmaturePopulate.cpp \ - $$PWD/src/code/PostProcessing/CalcTangentsProcess.cpp \ - $$PWD/src/code/PostProcessing/ComputeUVMappingProcess.cpp \ - $$PWD/src/code/PostProcessing/ConvertToLHProcess.cpp \ - $$PWD/src/code/PostProcessing/EmbedTexturesProcess.cpp \ - $$PWD/src/code/PostProcessing/FindDegenerates.cpp \ - $$PWD/src/code/PostProcessing/FindInstancesProcess.cpp \ - $$PWD/src/code/PostProcessing/FindInvalidDataProcess.cpp \ - $$PWD/src/code/PostProcessing/FixNormalsStep.cpp \ - $$PWD/src/code/PostProcessing/DropFaceNormalsProcess.cpp \ - $$PWD/src/code/PostProcessing/GenBoundingBoxesProcess.cpp \ - $$PWD/src/code/PostProcessing/GenFaceNormalsProcess.cpp \ - $$PWD/src/code/PostProcessing/GenVertexNormalsProcess.cpp \ - $$PWD/src/code/PostProcessing/PretransformVertices.cpp \ - $$PWD/src/code/PostProcessing/ImproveCacheLocality.cpp \ - $$PWD/src/code/PostProcessing/JoinVerticesProcess.cpp \ - $$PWD/src/code/PostProcessing/RemoveRedundantMaterials.cpp \ - $$PWD/src/code/PostProcessing/RemoveVCProcess.cpp \ - $$PWD/src/code/PostProcessing/SortByPTypeProcess.cpp \ - $$PWD/src/code/PostProcessing/SplitLargeMeshes.cpp \ - $$PWD/src/code/PostProcessing/SplitByBoneCountProcess.cpp \ - $$PWD/src/code/PostProcessing/TextureTransform.cpp \ - $$PWD/src/code/PostProcessing/TriangulateProcess.cpp \ - $$PWD/src/code/PostProcessing/ValidateDataStructure.cpp \ - $$PWD/src/code/PostProcessing/OptimizeGraph.cpp \ - $$PWD/src/code/PostProcessing/OptimizeMeshes.cpp \ - $$PWD/src/code/PostProcessing/DeboneProcess.cpp \ - $$PWD/src/code/PostProcessing/ProcessHelper.cpp \ - $$PWD/src/code/PostProcessing/MakeVerboseFormat.cpp \ - $$PWD/src/code/PostProcessing/ScaleProcess.cpp \ - $$PWD/src/code/AssetLib/glTF/glTFImporter.cpp \ - $$PWD/src/code/AssetLib/glTF/glTFCommon.cpp \ - $$PWD/src/code/AssetLib/glTF2/glTF2Importer.cpp \ - $$PWD/src/code/AssetLib/STL/STLLoader.cpp - -# pugixml (needed for DAE/Collada support) -HEADERS += \ - $$PWD/src/contrib/pugixml/src/pugixml.hpp \ - $$PWD/src/contrib/pugixml/contrib/foreach.hpp - -SOURCES += $$PWD/src/contrib/pugixml/src/pugixml.cpp - -VPATH += $$PWD/src/contrib/pugixml/src -INCLUDEPATH += $$PWD/src/contrib/pugixml/src \ - $PWD/src/contrib/pugixml/contrib - -msvc: DEFINES += _SCL_SECURE_NO_WARNINGS _CRT_SECURE_NO_WARNINGS - -# rapidjson (needed for GLTF/GLTF2) -VPATH += $$PWD/src/contrib/rapidjson/include -INCLUDEPATH += $$PWD/src/contrib/rapidjson/include - -# utf8cpp -VPATH += $$PWD/src/contrib/utf8cpp/source -INCLUDEPATH += $$PWD/src/contrib/utf8cpp/source - -# poly2tri (blender tessellator) -VPATH += $$PWD/src/contrib/poly2tri -INCLUDEPATH += $$PWD/src/contrib/poly2tri - -HEADERS += \ - $$PWD/src/contrib/poly2tri/poly2tri/common/shapes.h \ - $$PWD/src/contrib/poly2tri/poly2tri/common/utils.h \ - $$PWD/src/contrib/poly2tri/poly2tri/sweep/advancing_front.h \ - $$PWD/src/contrib/poly2tri/poly2tri/sweep/cdt.h \ - $$PWD/src/contrib/poly2tri/poly2tri/sweep/sweep.h \ - $$PWD/src/contrib/poly2tri/poly2tri/sweep/sweep_context.h - -SOURCES += \ - $$PWD/src/contrib/poly2tri/poly2tri/common/shapes.cc \ - $$PWD/src/contrib/poly2tri/poly2tri/sweep/advancing_front.cc \ - $$PWD/src/contrib/poly2tri/poly2tri/sweep/cdt.cc \ - $$PWD/src/contrib/poly2tri/poly2tri/sweep/sweep.cc \ - $$PWD/src/contrib/poly2tri/poly2tri/sweep/sweep_context.cc - -# unzip (collada loader) -VPATH += $$PWD/unzip $$PWD/contrib/unzip -INCLUDEPATH += $$PWD/unzip $$PWD/contrib/unzip - -HEADERS += \ - $$PWD/src/contrib/unzip/crypt.h \ - $$PWD/src/contrib/unzip/ioapi.h \ - $$PWD/unzip/unzip.h -SOURCES += \ - $$PWD/src/contrib/unzip/ioapi.c \ - $$PWD/src/contrib/unzip/unzip.c diff --git a/src/3rdparty/assimp/assimp_dependency.pri b/src/3rdparty/assimp/assimp_dependency.pri deleted file mode 100644 index de404c184..000000000 --- a/src/3rdparty/assimp/assimp_dependency.pri +++ /dev/null @@ -1,6 +0,0 @@ -QT_FOR_CONFIG += 3dcore-private -qtConfig(qt3d-system-assimp):!if(cross_compile:host_build) { - QMAKE_USE_PRIVATE += assimp -} else { - include(assimp.pri) -} diff --git a/src/3rdparty/assimp/config.h b/src/3rdparty/assimp/config.h index b9a4281e7..ad82a75d2 100644 --- a/src/3rdparty/assimp/config.h +++ b/src/3rdparty/assimp/config.h @@ -3,7 +3,7 @@ Open Asset Import Library (assimp) --------------------------------------------------------------------------- -Copyright (c) 2006-2020, assimp team +Copyright (c) 2006-2024, assimp team All rights reserved. @@ -102,28 +102,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_CONFIG_IMPORT_NO_SKELETON_MESHES \ "IMPORT_NO_SKELETON_MESHES" - - -# if 0 // not implemented yet -// --------------------------------------------------------------------------- -/** @brief Set Assimp's multithreading policy. - * - * This setting is ignored if Assimp was built without boost.thread - * support (ASSIMP_BUILD_NO_THREADING, which is implied by ASSIMP_BUILD_BOOST_WORKAROUND). - * Possible values are: -1 to let Assimp decide what to do, 0 to disable - * multithreading entirely and any number larger than 0 to force a specific - * number of threads. Assimp is always free to ignore this settings, which is - * merely a hint. Usually, the default value (-1) will be fine. However, if - * Assimp is used concurrently from multiple user threads, it might be useful - * to limit each Importer instance to a specific number of cores. - * - * For more information, see the @link threading Threading page@endlink. - * Property type: int, default value: -1. - */ -#define AI_CONFIG_GLOB_MULTITHREADING \ - "GLOB_MULTITHREADING" -#endif - // ########################################################################### // POST PROCESSING SETTINGS // Various stuff to fine-tune the behavior of a specific post processing step. @@ -266,6 +244,20 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. "PP_PTV_ROOT_TRANSFORMATION" // --------------------------------------------------------------------------- +/** @brief Set epsilon to check the identity of the matrix 4x4. + * + * This is used by aiMatrix4x4t<TReal>::IsIdentity(const TReal epsilon). + * @note The default value is 10e-3f for backward compatibility of legacy code. + * Property type: Float. + */ +#define AI_CONFIG_CHECK_IDENTITY_MATRIX_EPSILON \ + "CHECK_IDENTITY_MATRIX_EPSILON" +// default value for AI_CONFIG_CHECK_IDENTITY_MATRIX_EPSILON +#if (!defined AI_CONFIG_CHECK_IDENTITY_MATRIX_EPSILON_DEFAULT) +# define AI_CONFIG_CHECK_IDENTITY_MATRIX_EPSILON_DEFAULT 10e-3f +#endif + +// --------------------------------------------------------------------------- /** @brief Configures the #aiProcess_FindDegenerates step to * remove degenerated primitives from the import - immediately. * @@ -281,7 +273,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // --------------------------------------------------------------------------- /** * @brief Configures the #aiProcess_FindDegenerates to check the area of a - * trinagle to be greates than e-6. If this is not the case the triangle will + * triangle to be greater than e-6. If this is not the case the triangle will * be removed if #AI_CONFIG_PP_FD_REMOVE is set to true. */ #define AI_CONFIG_PP_FD_CHECKAREA \ @@ -558,6 +550,15 @@ enum aiComponent // Various stuff to fine-tune the behaviour of specific importer plugins. // ########################################################################### +// --------------------------------------------------------------------------- +/** @brief Importers which parse JSON may use this to obtain a pointer to a + * rapidjson::IRemoteSchemaDocumentProvider. + * + * The default value is nullptr + * Property type: void* + */ +#define AI_CONFIG_IMPORT_SCHEMA_DOCUMENT_PROVIDER \ + "IMPORT_SCHEMA_DOCUMENT_PROVIDER" // --------------------------------------------------------------------------- /** @brief Set whether the fbx importer will merge all geometry layers present @@ -680,7 +681,7 @@ enum aiComponent // --------------------------------------------------------------------------- /** @brief Set wether the importer shall not remove empty bones. - * + * * Empty bone are often used to define connections for other models. */ #define AI_CONFIG_IMPORT_REMOVE_EMPTY_BONES \ @@ -694,6 +695,15 @@ enum aiComponent "AI_CONFIG_FBX_CONVERT_TO_M" // --------------------------------------------------------------------------- +/** @brief Will enable the skeleton struct to store bone data. + * + * This will decouple the bone coupling to the mesh. This feature is + * experimental. + */ +#define AI_CONFIG_FBX_USE_SKELETON_BONE_CONTAINER \ + "AI_CONFIG_FBX_USE_SKELETON_BONE_CONTAINER" + +// --------------------------------------------------------------------------- /** @brief Set the vertex animation keyframe to be imported * * ASSIMP does not support vertex keyframes (only bone animation is supported). @@ -866,6 +876,15 @@ enum aiComponent "IMPORT_MD3_SKIN_NAME" // --------------------------------------------------------------------------- +/** @brief Specify if to try load Quake 3 shader files. This also controls + * original surface name handling: when disabled it will be used unchanged. + * + * Property type: bool. Default value: true. + */ +#define AI_CONFIG_IMPORT_MD3_LOAD_SHADERS \ + "IMPORT_MD3_LOAD_SHADERS" + +// --------------------------------------------------------------------------- /** @brief Specify the Quake 3 shader file to be used for a particular * MD3 file. This can also be a search path. * @@ -1050,6 +1069,15 @@ enum aiComponent #define AI_CONFIG_IMPORT_COLLADA_IGNORE_UP_DIRECTION "IMPORT_COLLADA_IGNORE_UP_DIRECTION" // --------------------------------------------------------------------------- +/** @brief Specifies whether the Collada loader will ignore the provided unit size. + * + * If this property is set to true, the unit size provided in the file header will + * be ignored and the file will be loaded without scaling the assets. + * Property type: Bool. Default value: false. + */ +#define AI_CONFIG_IMPORT_COLLADA_IGNORE_UNIT_SIZE "IMPORT_COLLADA_IGNORE_UNIT_SIZE" + +// --------------------------------------------------------------------------- /** @brief Specifies whether the Collada loader should use Collada names. * * If this property is set to true, the Collada names will be used as the node and @@ -1069,16 +1097,70 @@ enum aiComponent #define AI_CONFIG_EXPORT_XFILE_64BIT "EXPORT_XFILE_64BIT" /** @brief Specifies whether the assimp export shall be able to export point clouds - * + * * When this flag is not defined the render data has to contain valid faces. * Point clouds are only a collection of vertices which have nor spatial organization * by a face and the validation process will remove them. Enabling this feature will * switch off the flag and enable the functionality to export pure point clouds. + * + * Property type: Bool. Default value: false. */ #define AI_CONFIG_EXPORT_POINT_CLOUDS "EXPORT_POINT_CLOUDS" +/** @brief Specifies whether to use the deprecated KHR_materials_pbrSpecularGlossiness extension + * + * When this flag is undefined any material with specularity will use the new KHR_materials_specular + * extension. Enabling this flag will revert to the deprecated extension. Note that exporting + * KHR_materials_pbrSpecularGlossiness with extensions other than KHR_materials_unlit is unsupported, + * including the basic pbrMetallicRoughness spec. + * + * Property type: Bool. Default value: false. + */ +#define AI_CONFIG_USE_GLTF_PBR_SPECULAR_GLOSSINESS "USE_GLTF_PBR_SPECULAR_GLOSSINESS" + +/** @brief Specifies whether to apply a limit on the number of four bones per vertex in skinning + * + * When this flag is not defined, all bone weights and indices are limited to a + * maximum of four bones for each vertex (attributes JOINT_0 and WEIGHT_0 only). + * By enabling this flag, the number of bones per vertex is unlimited. + * In both cases, indices and bone weights are sorted by weight in descending order. + * In the case of the limit of up to four bones, a maximum of the four largest values are exported. + * Weights are not normalized. + * Property type: Bool. Default value: false. + */ +#define AI_CONFIG_EXPORT_GLTF_UNLIMITED_SKINNING_BONES_PER_VERTEX \ + "USE_UNLIMITED_BONES_PER VERTEX" + +/** @brief Specifies whether to write the value referenced to opacity in TransparencyFactor of each material. + * + * When this flag is not defined, the TransparencyFactor value of each meterial is 1.0. + * By enabling this flag, the value is 1.0 - opacity; + + * Property type: Bool. Default value: false. + */ +#define AI_CONFIG_EXPORT_FBX_TRANSPARENCY_FACTOR_REFER_TO_OPACITY \ + "EXPORT_FBX_TRANSPARENCY_FACTOR_REFER_TO_OPACITY" + +/** + * @brief Specifies the blob name, assimp uses for exporting. + * + * Some formats require auxiliary files to be written, that need to be linked back into + * the original file. For example, OBJ files export materials to a separate MTL file and + * use the `mtllib` keyword to reference this file. + * + * When exporting blobs using #ExportToBlob, assimp does not know the name of the blob + * file and thus outputs `mtllib $blobfile.mtl`, which might not be desired, since the + * MTL file might be called differently. + * + * This property can be used to give the exporter a hint on how to use the magic + * `$blobfile` keyword. If the exporter detects the keyword and is provided with a name + * for the blob, it instead uses this name. + */ +#define AI_CONFIG_EXPORT_BLOB_NAME "EXPORT_BLOB_NAME" + /** - * @brief Specifies a gobal key factor for scale, float value + * + * @brief Specifies a global key factor for scale, float value */ #define AI_CONFIG_GLOBAL_SCALE_FACTOR_KEY "GLOBAL_SCALE_FACTOR" @@ -1100,6 +1182,6 @@ enum aiComponent * Property type: Bool. Default value: undefined. */ -/* #undef ASSIMP_DOUBLE_PRECISION */ + #endif // !! AI_CONFIG_H_INC diff --git a/src/3rdparty/assimp/qt_attribution.json b/src/3rdparty/assimp/qt_attribution.json index b5dfc1667..c5f378fc8 100644 --- a/src/3rdparty/assimp/qt_attribution.json +++ b/src/3rdparty/assimp/qt_attribution.json @@ -4,11 +4,11 @@ "QDocModule": "qtquick3d", "Description": "assimp (Open Asset Import Library) is a portable open source library to import various well-known 3D model formats in a uniform manner.", "QtUsage": "Used for importing assets for use with Qt Quick 3D", - "Homepage": "http://www.assimp.org/", - "Version": "5.0.1", + "Version": "5.4.1", + "DownloadLocation": "https://github.com/assimp/assimp/releases/tag/v5.4.1", "License": "BSD 3-clause \"New\" or \"Revised\" Licensee", "LicenseId": "BSD-3-Clause", "LicenseFile": "LICENSE", "Copyright": "Copyright (c) 2006-2018, assimp team" -} +}
\ No newline at end of file diff --git a/src/3rdparty/assimp/revision.h b/src/3rdparty/assimp/revision.h index 3b9653281..cf7d50fce 100644 --- a/src/3rdparty/assimp/revision.h +++ b/src/3rdparty/assimp/revision.h @@ -1,28 +1,28 @@ #ifndef ASSIMP_REVISION_H_INC #define ASSIMP_REVISION_H_INC -#define GitVersion 0x5a38cd0a +#define GitVersion 0x10df90ec #define GitBranch "HEAD" #define VER_MAJOR 5 -#define VER_MINOR 0 +#define VER_MINOR 4 #define VER_PATCH 1 #define VER_BUILD 0 #define STR_HELP(x) #x #define STR(x) STR_HELP(x) -#define VER_FILEVERSION VER_MAJOR,VER_MINOR,VER_PATCH,VER_BUILD +#define VER_FILEVERSION VER_MAJOR, VER_MINOR, VER_PATCH, VER_BUILD #if (GitVersion == 0) -#define VER_FILEVERSION_STR STR(VER_MAJOR) "." STR(VER_MINOR) "." STR(VER_PATCH) "." STR(VER_BUILD) +#define VER_FILEVERSION_STR STR(VER_MAJOR) "." STR(VER_MINOR) "." STR(VER_PATCH) "." STR(VER_BUILD) #else -#define VER_FILEVERSION_STR STR(VER_MAJOR) "." STR(VER_MINOR) "." STR(VER_PATCH) "." STR(VER_BUILD) " (Commit 5a38cd0a)" +#define VER_FILEVERSION_STR STR(VER_MAJOR) "." STR(VER_MINOR) "." STR(VER_PATCH) "." STR(VER_BUILD) " (Commit 10df90ec)" #endif -#ifdef NDEBUG -#define VER_ORIGINAL_FILENAME_STR "assimp.dll" +#ifdef NDEBUG +#define VER_ORIGINAL_FILENAME_STR "assimp.dll" #else -#define VER_ORIGINAL_FILENAME_STR "assimp.dll" +#define VER_ORIGINAL_FILENAME_STR "assimp.dll" #endif // NDEBUG #endif // ASSIMP_REVISION_H_INC diff --git a/src/3rdparty/assimp/src b/src/3rdparty/assimp/src -Subproject 5a38cd0a03015ceabbd5bc6efb0730dde1ef74e +Subproject b4e1eedbf7db8ddd793ed45f8e81eccb6b40599 |