diff options
author | Jani Heikkinen <jani.heikkinen@qt.io> | 2021-02-05 12:30:54 +0200 |
---|---|---|
committer | Mike Krus <mike.krus@kdab.com> | 2021-03-16 12:29:21 +0000 |
commit | 842542e01062714eae32bea7e89a5c630c6e14b4 (patch) | |
tree | fe78d641ee03fbe886388f728a139f22983c046d /src | |
parent | 4d60c670ab2155332bfca799e1f5205273c0bc8e (diff) |
Update qtquick3d-assimp
Use same version than qtquick3d is using
Pick-to: 6.1
Change-Id: Idff7881dd1ce4608915c6f3e653cf9d16f731374
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/3rdparty/assimp/assimp.cmake | 532 | ||||
-rw-r--r-- | src/3rdparty/assimp/assimp.pri | 252 | ||||
-rw-r--r-- | src/3rdparty/assimp/config.h | 112 | ||||
-rw-r--r-- | src/3rdparty/assimp/qt_attribution.json | 153 | ||||
-rw-r--r-- | src/3rdparty/assimp/revision.h | 23 | ||||
m--------- | src/3rdparty/assimp/src | 0 |
6 files changed, 414 insertions, 658 deletions
diff --git a/src/3rdparty/assimp/assimp.cmake b/src/3rdparty/assimp/assimp.cmake index 3ab995ca5..59d27fc1c 100644 --- a/src/3rdparty/assimp/assimp.cmake +++ b/src/3rdparty/assimp/assimp.cmake @@ -16,420 +16,192 @@ function(qt3d_extend_target_for_assimp target) qt_internal_extend_target(${target} CONDITION NOT QT_FEATURE_qt3d_system_assimp OR (CMAKE_CROSSCOMPILING AND host_build) SOURCES - ${assimpDir}/src/code/3DS/3DSExporter.h - ${assimpDir}/src/code/3DS/3DSHelper.h - ${assimpDir}/src/code/3DS/3DSLoader.h - ${assimpDir}/src/code/3MF/3MFXmlTags.h - ${assimpDir}/src/code/3MF/D3MFExporter.h - ${assimpDir}/src/code/3MF/D3MFImporter.h - ${assimpDir}/src/code/3MF/D3MFOpcPackage.h - ${assimpDir}/src/code/AC/ACLoader.h - ${assimpDir}/src/code/ASE/ASELoader.h - ${assimpDir}/src/code/ASE/ASEParser.h - ${assimpDir}/src/code/Assbin/AssbinExporter.h - ${assimpDir}/src/code/Assbin/AssbinLoader.h - ${assimpDir}/src/code/Assjson/cencode.h - ${assimpDir}/src/code/Assjson/mesh_splitter.h - ${assimpDir}/src/code/Assxml/AssxmlExporter.h - ${assimpDir}/src/code/B3D/B3DImporter.h - ${assimpDir}/src/code/BVH/BVHLoader.h - ${assimpDir}/src/code/Blender/BlenderBMesh.h - ${assimpDir}/src/code/Blender/BlenderCustomData.h - ${assimpDir}/src/code/Blender/BlenderDNA.h - ${assimpDir}/src/code/Blender/BlenderIntermediate.h - ${assimpDir}/src/code/Blender/BlenderLoader.h - ${assimpDir}/src/code/Blender/BlenderModifier.h - ${assimpDir}/src/code/Blender/BlenderScene.h - ${assimpDir}/src/code/Blender/BlenderSceneGen.h - ${assimpDir}/src/code/Blender/BlenderTessellator.h - ${assimpDir}/src/code/C4D/C4DImporter.h - ${assimpDir}/src/code/CApi/CInterfaceIOWrapper.h - ${assimpDir}/src/code/COB/COBLoader.h - ${assimpDir}/src/code/COB/COBScene.h - ${assimpDir}/src/code/CSM/CSMLoader.h - ${assimpDir}/src/code/Collada/ColladaExporter.h - ${assimpDir}/src/code/Collada/ColladaHelper.h - ${assimpDir}/src/code/Collada/ColladaLoader.h - ${assimpDir}/src/code/Collada/ColladaParser.h - ${assimpDir}/src/code/Common/BaseProcess.h + ${assimpDir}/config.h + ${assimpDir}/revision.h + ${assimpDir}/src/code/CApi/CInterfaceIOWrapper.cpp ${assimpDir}/src/code/CApi/CInterfaceIOWrapper.h + ${assimpDir}/src/code/AssetLib/Collada/ColladaHelper.cpp ${assimpDir}/src/code/AssetLib/Collada/ColladaHelper.h + ${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/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/DefaultIOStream.cpp + ${assimpDir}/src/code/Common/DefaultIOSystem.cpp + ${assimpDir}/src/code/Common/DefaultLogger.cpp ${assimpDir}/src/code/Common/DefaultProgressHandler.h + ${assimpDir}/src/code/Common/Exceptional.cpp ${assimpDir}/src/code/Common/FileLogStream.h - ${assimpDir}/src/code/Common/FileSystemFilter.h ${assimpDir}/src/code/Common/IFF.h - ${assimpDir}/src/code/Common/Importer.h + ${assimpDir}/src/code/Common/Importer.cpp ${assimpDir}/src/code/Common/Importer.h + ${assimpDir}/src/code/Common/ImporterRegistry.cpp ${assimpDir}/src/code/Common/PolyTools.h - ${assimpDir}/src/code/Common/ScenePreprocessor.h + ${assimpDir}/src/code/Common/PostStepRegistry.cpp + ${assimpDir}/src/code/Common/RemoveComments.cpp + ${assimpDir}/src/code/Common/SGSpatialSort.cpp + ${assimpDir}/src/code/Common/SceneCombiner.cpp + ${assimpDir}/src/code/Common/ScenePreprocessor.cpp ${assimpDir}/src/code/Common/ScenePreprocessor.h ${assimpDir}/src/code/Common/ScenePrivate.h - ${assimpDir}/src/code/Common/SplitByBoneCountProcess.h + ${assimpDir}/src/code/Common/SkeletonMeshBuilder.cpp + ${assimpDir}/src/code/Common/SpatialSort.cpp + ${assimpDir}/src/code/Common/StandardShapes.cpp ${assimpDir}/src/code/Common/StdOStreamLogStream.h - ${assimpDir}/src/code/Common/TargetAnimation.h - ${assimpDir}/src/code/Common/VertexTriangleAdjacency.h - ${assimpDir}/src/code/Common/Win32DebugLogStream.h - ${assimpDir}/src/code/Common/assbin_chunks.h - ${assimpDir}/src/code/Common/simd.h - ${assimpDir}/src/code/DXF/DXFHelper.h - ${assimpDir}/src/code/DXF/DXFLoader.h - ${assimpDir}/src/code/FBX/FBXCommon.h - ${assimpDir}/src/code/FBX/FBXCompileConfig.h - ${assimpDir}/src/code/FBX/FBXConverter.h - ${assimpDir}/src/code/FBX/FBXDocument.h - ${assimpDir}/src/code/FBX/FBXDocumentUtil.h - ${assimpDir}/src/code/FBX/FBXExportNode.h - ${assimpDir}/src/code/FBX/FBXExportProperty.h - ${assimpDir}/src/code/FBX/FBXExporter.h - ${assimpDir}/src/code/FBX/FBXImportSettings.h - ${assimpDir}/src/code/FBX/FBXImporter.h - ${assimpDir}/src/code/FBX/FBXMeshGeometry.h - ${assimpDir}/src/code/FBX/FBXParser.h - ${assimpDir}/src/code/FBX/FBXProperties.h - ${assimpDir}/src/code/FBX/FBXTokenizer.h - ${assimpDir}/src/code/FBX/FBXUtil.h - ${assimpDir}/src/code/HMP/HMPFileData.h - ${assimpDir}/src/code/HMP/HMPLoader.h - ${assimpDir}/src/code/HMP/HalfLifeFileData.h - ${assimpDir}/src/code/Importer/IFC/IFCLoader.h - ${assimpDir}/src/code/Importer/IFC/IFCReaderGen_2x3.h - ${assimpDir}/src/code/Importer/IFC/IFCReaderGen_4.h - ${assimpDir}/src/code/Importer/IFC/IFCUtil.h - ${assimpDir}/src/code/Importer/STEPParser/STEPFileEncoding.h - ${assimpDir}/src/code/Importer/STEPParser/STEPFileReader.h - ${assimpDir}/src/code/Importer/StepFile/StepFileImporter.h - ${assimpDir}/src/code/Importer/StepFile/StepReaderGen.h - ${assimpDir}/src/code/Irr/IRRLoader.h - ${assimpDir}/src/code/Irr/IRRMeshLoader.h - ${assimpDir}/src/code/Irr/IRRShared.h - ${assimpDir}/src/code/LWO/LWOAnimation.h - ${assimpDir}/src/code/LWO/LWOFileData.h - ${assimpDir}/src/code/LWO/LWOLoader.h - ${assimpDir}/src/code/LWS/LWSLoader.h - ${assimpDir}/src/code/MD2/MD2FileData.h - ${assimpDir}/src/code/MD2/MD2Loader.h - ${assimpDir}/src/code/MD2/MD2NormalTable.h - ${assimpDir}/src/code/MD3/MD3FileData.h - ${assimpDir}/src/code/MD3/MD3Loader.h - ${assimpDir}/src/code/MD4/MD4FileData.h - ${assimpDir}/src/code/MD5/MD5Loader.h - ${assimpDir}/src/code/MD5/MD5Parser.h - ${assimpDir}/src/code/MDC/MDCFileData.h - ${assimpDir}/src/code/MDC/MDCLoader.h - ${assimpDir}/src/code/MDC/MDCNormalTable.h - ${assimpDir}/src/code/MDL/MDLDefaultColorMap.h - ${assimpDir}/src/code/MDL/MDLFileData.h - ${assimpDir}/src/code/MDL/MDLLoader.h - ${assimpDir}/src/code/MMD/MMDCpp14.h - ${assimpDir}/src/code/MMD/MMDImporter.h - ${assimpDir}/src/code/MMD/MMDPmdParser.h - ${assimpDir}/src/code/MMD/MMDPmxParser.h - ${assimpDir}/src/code/MMD/MMDVmdParser.h - ${assimpDir}/src/code/MS3D/MS3DLoader.h - ${assimpDir}/src/code/Material/MaterialSystem.h - ${assimpDir}/src/code/NDO/NDOLoader.h - ${assimpDir}/src/code/NFF/NFFLoader.h - ${assimpDir}/src/code/OFF/OFFLoader.h - ${assimpDir}/src/code/Obj/ObjExporter.h - ${assimpDir}/src/code/Obj/ObjFileData.h - ${assimpDir}/src/code/Obj/ObjFileImporter.h - ${assimpDir}/src/code/Obj/ObjFileMtlImporter.h - ${assimpDir}/src/code/Obj/ObjFileParser.h - ${assimpDir}/src/code/Obj/ObjTools.h - ${assimpDir}/src/code/Ogre/OgreBinarySerializer.h - ${assimpDir}/src/code/Ogre/OgreImporter.h - ${assimpDir}/src/code/Ogre/OgreParsingUtils.h - ${assimpDir}/src/code/Ogre/OgreStructs.h - ${assimpDir}/src/code/Ogre/OgreXmlSerializer.h - ${assimpDir}/src/code/OpenGEX/OpenGEXExporter.h - ${assimpDir}/src/code/OpenGEX/OpenGEXImporter.h - ${assimpDir}/src/code/OpenGEX/OpenGEXStructs.h - ${assimpDir}/src/code/Ply/PlyExporter.h - ${assimpDir}/src/code/Ply/PlyLoader.h - ${assimpDir}/src/code/Ply/PlyParser.h - ${assimpDir}/src/code/PostProcessing/CalcTangentsProcess.h - ${assimpDir}/src/code/PostProcessing/ComputeUVMappingProcess.h - ${assimpDir}/src/code/PostProcessing/ConvertToLHProcess.h - ${assimpDir}/src/code/PostProcessing/DeboneProcess.h - ${assimpDir}/src/code/PostProcessing/DropFaceNormalsProcess.h - ${assimpDir}/src/code/PostProcessing/EmbedTexturesProcess.h - ${assimpDir}/src/code/PostProcessing/FindDegenerates.h - ${assimpDir}/src/code/PostProcessing/FindInstancesProcess.h - ${assimpDir}/src/code/PostProcessing/FindInvalidDataProcess.h - ${assimpDir}/src/code/PostProcessing/FixNormalsStep.h - ${assimpDir}/src/code/PostProcessing/GenBoundingBoxesProcess.h - ${assimpDir}/src/code/PostProcessing/GenFaceNormalsProcess.h - ${assimpDir}/src/code/PostProcessing/GenVertexNormalsProcess.h - ${assimpDir}/src/code/PostProcessing/ImproveCacheLocality.h - ${assimpDir}/src/code/PostProcessing/JoinVerticesProcess.h - ${assimpDir}/src/code/PostProcessing/LimitBoneWeightsProcess.h - ${assimpDir}/src/code/PostProcessing/MakeVerboseFormat.h - ${assimpDir}/src/code/PostProcessing/OptimizeGraph.h - ${assimpDir}/src/code/PostProcessing/OptimizeMeshes.h - ${assimpDir}/src/code/PostProcessing/PretransformVertices.h - ${assimpDir}/src/code/PostProcessing/ProcessHelper.h - ${assimpDir}/src/code/PostProcessing/RemoveRedundantMaterials.h - ${assimpDir}/src/code/PostProcessing/RemoveVCProcess.h - ${assimpDir}/src/code/PostProcessing/ScaleProcess.h - ${assimpDir}/src/code/PostProcessing/SortByPTypeProcess.h - ${assimpDir}/src/code/PostProcessing/SplitLargeMeshes.h - ${assimpDir}/src/code/PostProcessing/TextureTransform.h - ${assimpDir}/src/code/PostProcessing/TriangulateProcess.h - ${assimpDir}/src/code/PostProcessing/ValidateDataStructure.h - ${assimpDir}/src/code/Q3BSP/Q3BSPFileData.h - ${assimpDir}/src/code/Q3BSP/Q3BSPFileImporter.h - ${assimpDir}/src/code/Q3BSP/Q3BSPFileParser.h - ${assimpDir}/src/code/Q3D/Q3DLoader.h - ${assimpDir}/src/code/Raw/RawLoader.h - ${assimpDir}/src/code/SIB/SIBImporter.h - ${assimpDir}/src/code/SMD/SMDLoader.h - ${assimpDir}/src/code/STL/STLExporter.h - ${assimpDir}/src/code/STL/STLLoader.h - ${assimpDir}/src/code/Step/STEPFile.h - ${assimpDir}/src/code/Step/StepExporter.h - ${assimpDir}/src/code/Terragen/TerragenLoader.h - ${assimpDir}/src/code/Unreal/UnrealLoader.h - ${assimpDir}/src/code/X/XFileExporter.h - ${assimpDir}/src/code/X/XFileHelper.h - ${assimpDir}/src/code/X/XFileImporter.h - ${assimpDir}/src/code/X/XFileParser.h - ${assimpDir}/src/code/XGL/XGLLoader.h - ${assimpDir}/src/code/glTF/glTFAsset.h - ${assimpDir}/src/code/glTF/glTFAssetWriter.h - ${assimpDir}/src/code/glTF/glTFCommon.h - ${assimpDir}/src/code/glTF/glTFExporter.h - ${assimpDir}/src/code/glTF/glTFImporter.h - ${assimpDir}/src/code/glTF2/glTF2Asset.h - ${assimpDir}/src/code/glTF2/glTF2AssetWriter.h - ${assimpDir}/src/code/glTF2/glTF2Exporter.h - ${assimpDir}/src/code/glTF2/glTF2Importer.h - ${assimpDir}/src/code/res/resource.h - ${assimpDir}/src/contrib/Open3DGC/o3dgcAdjacencyInfo.h - ${assimpDir}/src/contrib/Open3DGC/o3dgcArithmeticCodec.h - ${assimpDir}/src/contrib/Open3DGC/o3dgcBinaryStream.h - ${assimpDir}/src/contrib/Open3DGC/o3dgcCommon.h - ${assimpDir}/src/contrib/Open3DGC/o3dgcDVEncodeParams.h - ${assimpDir}/src/contrib/Open3DGC/o3dgcDynamicVector.h - ${assimpDir}/src/contrib/Open3DGC/o3dgcDynamicVectorDecoder.h - ${assimpDir}/src/contrib/Open3DGC/o3dgcDynamicVectorEncoder.h - ${assimpDir}/src/contrib/Open3DGC/o3dgcFIFO.h - ${assimpDir}/src/contrib/Open3DGC/o3dgcIndexedFaceSet.h - ${assimpDir}/src/contrib/Open3DGC/o3dgcSC3DMCDecoder.h - ${assimpDir}/src/contrib/Open3DGC/o3dgcSC3DMCEncodeParams.h - ${assimpDir}/src/contrib/Open3DGC/o3dgcSC3DMCEncoder.h - ${assimpDir}/src/contrib/Open3DGC/o3dgcTimer.h - ${assimpDir}/src/contrib/Open3DGC/o3dgcTriangleFans.h - ${assimpDir}/src/contrib/Open3DGC/o3dgcTriangleListDecoder.h - ${assimpDir}/src/contrib/Open3DGC/o3dgcTriangleListEncoder.h - ${assimpDir}/src/contrib/Open3DGC/o3dgcVector.h - ${assimpDir}/src/contrib/clipper/clipper.hpp - ${assimpDir}/src/contrib/irrXML/CXMLReaderImpl.h - ${assimpDir}/src/contrib/irrXML/heapsort.h - ${assimpDir}/src/contrib/irrXML/irrArray.h - ${assimpDir}/src/contrib/irrXML/irrString.h - ${assimpDir}/src/contrib/irrXML/irrTypes.h - ${assimpDir}/src/contrib/irrXML/irrXML.h - ${assimpDir}/src/contrib/openddlparser/include/openddlparser/DDLNode.h - ${assimpDir}/src/contrib/openddlparser/include/openddlparser/OpenDDLCommon.h - ${assimpDir}/src/contrib/openddlparser/include/openddlparser/OpenDDLExport.h - ${assimpDir}/src/contrib/openddlparser/include/openddlparser/OpenDDLParser.h - ${assimpDir}/src/contrib/openddlparser/include/openddlparser/OpenDDLParserUtils.h - ${assimpDir}/src/contrib/openddlparser/include/openddlparser/OpenDDLStream.h - ${assimpDir}/src/contrib/openddlparser/include/openddlparser/Value.h - ${assimpDir}/src/contrib/poly2tri/poly2tri/common/shapes.h + ${assimpDir}/src/code/Common/Subdivision.cpp + ${assimpDir}/src/code/Common/TargetAnimation.cpp ${assimpDir}/src/code/Common/TargetAnimation.h + ${assimpDir}/src/code/Common/Version.cpp + ${assimpDir}/src/code/Common/VertexTriangleAdjacency.cpp ${assimpDir}/src/code/Common/VertexTriangleAdjacency.h + ${assimpDir}/src/code/Common/ZipArchiveIOSystem.cpp + ${assimpDir}/src/code/Common/material.cpp + ${assimpDir}/src/code/Common/scene.cpp + ${assimpDir}/src/code/Common/simd.cpp ${assimpDir}/src/code/Common/simd.h + ${assimpDir}/src/code/AssetLib/FBX/FBXAnimation.cpp + ${assimpDir}/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp + ${assimpDir}/src/code/AssetLib/FBX/FBXCommon.h + ${assimpDir}/src/code/AssetLib/FBX/FBXCompileConfig.h + ${assimpDir}/src/code/AssetLib/FBX/FBXConverter.cpp ${assimpDir}/src/code/AssetLib/FBX/FBXConverter.h + ${assimpDir}/src/code/AssetLib/FBX/FBXDeformer.cpp + ${assimpDir}/src/code/AssetLib/FBX/FBXDocument.cpp ${assimpDir}/src/code/AssetLib/FBX/FBXDocument.h + ${assimpDir}/src/code/AssetLib/FBX/FBXDocumentUtil.cpp + ${assimpDir}/src/code/AssetLib/FBX/FBXImportSettings.h + ${assimpDir}/src/code/AssetLib/FBX/FBXImporter.cpp ${assimpDir}/src/code/AssetLib/FBX/FBXImporter.h + ${assimpDir}/src/code/AssetLib/FBX/FBXMaterial.cpp + ${assimpDir}/src/code/AssetLib/FBX/FBXMeshGeometry.cpp ${assimpDir}/src/code/AssetLib/FBX/FBXMeshGeometry.h + ${assimpDir}/src/code/AssetLib/FBX/FBXModel.cpp + ${assimpDir}/src/code/AssetLib/FBX/FBXNodeAttribute.cpp + ${assimpDir}/src/code/AssetLib/FBX/FBXParser.cpp ${assimpDir}/src/code/AssetLib/FBX/FBXParser.h + ${assimpDir}/src/code/AssetLib/FBX/FBXProperties.cpp ${assimpDir}/src/code/AssetLib/FBX/FBXProperties.h + ${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/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 + ${assimpDir}/src/code/AssetLib/Obj/ObjFileParser.cpp ${assimpDir}/src/code/AssetLib/Obj/ObjFileParser.h + ${assimpDir}/src/code/AssetLib/Obj/ObjTools.h + ${assimpDir}/src/code/PostProcessing/ArmaturePopulate.cpp ${assimpDir}/src/code/PostProcessing/ArmaturePopulate.h + ${assimpDir}/src/code/PostProcessing/CalcTangentsProcess.cpp ${assimpDir}/src/code/PostProcessing/CalcTangentsProcess.h + ${assimpDir}/src/code/PostProcessing/ComputeUVMappingProcess.cpp ${assimpDir}/src/code/PostProcessing/ComputeUVMappingProcess.h + ${assimpDir}/src/code/PostProcessing/ConvertToLHProcess.cpp ${assimpDir}/src/code/PostProcessing/ConvertToLHProcess.h + ${assimpDir}/src/code/PostProcessing/DeboneProcess.cpp ${assimpDir}/src/code/PostProcessing/DeboneProcess.h + ${assimpDir}/src/code/PostProcessing/DropFaceNormalsProcess.cpp ${assimpDir}/src/code/PostProcessing/DropFaceNormalsProcess.h + ${assimpDir}/src/code/PostProcessing/EmbedTexturesProcess.cpp ${assimpDir}/src/code/PostProcessing/EmbedTexturesProcess.h + ${assimpDir}/src/code/PostProcessing/FindDegenerates.cpp ${assimpDir}/src/code/PostProcessing/FindDegenerates.h + ${assimpDir}/src/code/PostProcessing/FindInstancesProcess.cpp ${assimpDir}/src/code/PostProcessing/FindInstancesProcess.h + ${assimpDir}/src/code/PostProcessing/FindInvalidDataProcess.cpp ${assimpDir}/src/code/PostProcessing/FindInvalidDataProcess.h + ${assimpDir}/src/code/PostProcessing/FixNormalsStep.cpp ${assimpDir}/src/code/PostProcessing/FixNormalsStep.h + ${assimpDir}/src/code/PostProcessing/GenBoundingBoxesProcess.cpp ${assimpDir}/src/code/PostProcessing/GenBoundingBoxesProcess.h + ${assimpDir}/src/code/PostProcessing/GenFaceNormalsProcess.cpp ${assimpDir}/src/code/PostProcessing/GenFaceNormalsProcess.h + ${assimpDir}/src/code/PostProcessing/GenVertexNormalsProcess.cpp ${assimpDir}/src/code/PostProcessing/GenVertexNormalsProcess.h + ${assimpDir}/src/code/PostProcessing/ImproveCacheLocality.cpp ${assimpDir}/src/code/PostProcessing/ImproveCacheLocality.h + ${assimpDir}/src/code/PostProcessing/JoinVerticesProcess.cpp ${assimpDir}/src/code/PostProcessing/JoinVerticesProcess.h + ${assimpDir}/src/code/PostProcessing/MakeVerboseFormat.cpp ${assimpDir}/src/code/PostProcessing/MakeVerboseFormat.h + ${assimpDir}/src/code/PostProcessing/OptimizeGraph.cpp ${assimpDir}/src/code/PostProcessing/OptimizeGraph.h + ${assimpDir}/src/code/PostProcessing/OptimizeMeshes.cpp ${assimpDir}/src/code/PostProcessing/OptimizeMeshes.h + ${assimpDir}/src/code/PostProcessing/PretransformVertices.cpp ${assimpDir}/src/code/PostProcessing/PretransformVertices.h + ${assimpDir}/src/code/PostProcessing/ProcessHelper.cpp ${assimpDir}/src/code/PostProcessing/ProcessHelper.h + ${assimpDir}/src/code/PostProcessing/RemoveRedundantMaterials.cpp ${assimpDir}/src/code/PostProcessing/RemoveRedundantMaterials.h + ${assimpDir}/src/code/PostProcessing/RemoveVCProcess.cpp ${assimpDir}/src/code/PostProcessing/RemoveVCProcess.h + ${assimpDir}/src/code/PostProcessing/ScaleProcess.cpp ${assimpDir}/src/code/PostProcessing/ScaleProcess.h + ${assimpDir}/src/code/PostProcessing/SortByPTypeProcess.cpp ${assimpDir}/src/code/PostProcessing/SortByPTypeProcess.h + ${assimpDir}/src/code/PostProcessing/SplitByBoneCountProcess.cpp ${assimpDir}/src/code/PostProcessing/SplitByBoneCountProcess.h + ${assimpDir}/src/code/PostProcessing/SplitLargeMeshes.cpp ${assimpDir}/src/code/PostProcessing/SplitLargeMeshes.h + ${assimpDir}/src/code/PostProcessing/TextureTransform.cpp ${assimpDir}/src/code/PostProcessing/TextureTransform.h + ${assimpDir}/src/code/PostProcessing/TriangulateProcess.cpp ${assimpDir}/src/code/PostProcessing/TriangulateProcess.h + ${assimpDir}/src/code/PostProcessing/ValidateDataStructure.cpp ${assimpDir}/src/code/PostProcessing/ValidateDataStructure.h + ${assimpDir}/src/code/AssetLib/STL/STLLoader.cpp ${assimpDir}/src/code/AssetLib/STL/STLLoader.h + ${assimpDir}/src/code/AssetLib/glTF/glTFAsset.h ${assimpDir}/src/code/AssetLib/glTF/glTFAsset.inl + ${assimpDir}/src/code/AssetLib/glTF/glTFAssetWriter.h ${assimpDir}/src/code/AssetLib/glTF/glTFAssetWriter.inl + ${assimpDir}/src/code/AssetLib/glTF/glTFCommon.cpp ${assimpDir}/src/code/AssetLib/glTF/glTFCommon.h + ${assimpDir}/src/code/AssetLib/glTF/glTFImporter.cpp ${assimpDir}/src/code/AssetLib/glTF/glTFImporter.h + ${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.cpp ${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 - ${assimpDir}/src/contrib/poly2tri/poly2tri/poly2tri.h - ${assimpDir}/src/contrib/poly2tri/poly2tri/sweep/advancing_front.h - ${assimpDir}/src/contrib/poly2tri/poly2tri/sweep/cdt.h - ${assimpDir}/src/contrib/poly2tri/poly2tri/sweep/sweep.h - ${assimpDir}/src/contrib/poly2tri/poly2tri/sweep/sweep_context.h - ${assimpDir}/src/contrib/rapidjson/include/rapidjson/allocators.h - ${assimpDir}/src/contrib/rapidjson/include/rapidjson/document.h - ${assimpDir}/src/contrib/rapidjson/include/rapidjson/encodedstream.h - ${assimpDir}/src/contrib/rapidjson/include/rapidjson/encodings.h - ${assimpDir}/src/contrib/rapidjson/include/rapidjson/error/en.h - ${assimpDir}/src/contrib/rapidjson/include/rapidjson/error/error.h - ${assimpDir}/src/contrib/rapidjson/include/rapidjson/filereadstream.h - ${assimpDir}/src/contrib/rapidjson/include/rapidjson/filewritestream.h - ${assimpDir}/src/contrib/rapidjson/include/rapidjson/fwd.h - ${assimpDir}/src/contrib/rapidjson/include/rapidjson/internal/biginteger.h - ${assimpDir}/src/contrib/rapidjson/include/rapidjson/internal/diyfp.h - ${assimpDir}/src/contrib/rapidjson/include/rapidjson/internal/dtoa.h - ${assimpDir}/src/contrib/rapidjson/include/rapidjson/internal/ieee754.h - ${assimpDir}/src/contrib/rapidjson/include/rapidjson/internal/itoa.h - ${assimpDir}/src/contrib/rapidjson/include/rapidjson/internal/meta.h - ${assimpDir}/src/contrib/rapidjson/include/rapidjson/internal/pow10.h - ${assimpDir}/src/contrib/rapidjson/include/rapidjson/internal/regex.h - ${assimpDir}/src/contrib/rapidjson/include/rapidjson/internal/stack.h - ${assimpDir}/src/contrib/rapidjson/include/rapidjson/internal/strfunc.h - ${assimpDir}/src/contrib/rapidjson/include/rapidjson/internal/strtod.h - ${assimpDir}/src/contrib/rapidjson/include/rapidjson/internal/swap.h - ${assimpDir}/src/contrib/rapidjson/include/rapidjson/istreamwrapper.h - ${assimpDir}/src/contrib/rapidjson/include/rapidjson/memorybuffer.h - ${assimpDir}/src/contrib/rapidjson/include/rapidjson/memorystream.h - ${assimpDir}/src/contrib/rapidjson/include/rapidjson/msinttypes/inttypes.h - ${assimpDir}/src/contrib/rapidjson/include/rapidjson/msinttypes/stdint.h - ${assimpDir}/src/contrib/rapidjson/include/rapidjson/ostreamwrapper.h - ${assimpDir}/src/contrib/rapidjson/include/rapidjson/pointer.h - ${assimpDir}/src/contrib/rapidjson/include/rapidjson/prettywriter.h - ${assimpDir}/src/contrib/rapidjson/include/rapidjson/rapidjson.h - ${assimpDir}/src/contrib/rapidjson/include/rapidjson/reader.h - ${assimpDir}/src/contrib/rapidjson/include/rapidjson/schema.h - ${assimpDir}/src/contrib/rapidjson/include/rapidjson/stream.h - ${assimpDir}/src/contrib/rapidjson/include/rapidjson/stringbuffer.h - ${assimpDir}/src/contrib/rapidjson/include/rapidjson/writer.h + ${assimpDir}/src/contrib/poly2tri/poly2tri/sweep/advancing_front.cc ${assimpDir}/src/contrib/poly2tri/poly2tri/sweep/advancing_front.h + ${assimpDir}/src/contrib/poly2tri/poly2tri/sweep/cdt.cc ${assimpDir}/src/contrib/poly2tri/poly2tri/sweep/cdt.h + ${assimpDir}/src/contrib/poly2tri/poly2tri/sweep/sweep.cc ${assimpDir}/src/contrib/poly2tri/poly2tri/sweep/sweep.h + ${assimpDir}/src/contrib/poly2tri/poly2tri/sweep/sweep_context.cc ${assimpDir}/src/contrib/poly2tri/poly2tri/sweep/sweep_context.h ${assimpDir}/src/contrib/unzip/crypt.h - ${assimpDir}/src/contrib/unzip/ioapi.h - ${assimpDir}/src/contrib/unzip/unzip.h - ${assimpDir}/src/contrib/utf8cpp/source/utf8.h - ${assimpDir}/src/contrib/utf8cpp/source/utf8/checked.h - ${assimpDir}/src/contrib/utf8cpp/source/utf8/core.h - ${assimpDir}/src/contrib/utf8cpp/source/utf8/unchecked.h + ${assimpDir}/src/contrib/unzip/ioapi.c ${assimpDir}/src/contrib/unzip/ioapi.h + ${assimpDir}/src/contrib/unzip/unzip.c + ${assimpDir}/src/include/assimp/BaseImporter.h + ${assimpDir}/src/include/assimp/Bitmap.h + ${assimpDir}/src/include/assimp/BlobIOSystem.h + ${assimpDir}/src/include/assimp/ByteSwapper.h ${assimpDir}/src/include/assimp/Compiler/poppack1.h ${assimpDir}/src/include/assimp/Compiler/pstdint.h ${assimpDir}/src/include/assimp/Compiler/pushpack1.h + ${assimpDir}/src/include/assimp/CreateAnimMesh.h ${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 + ${assimpDir}/src/include/assimp/Hash.h ${assimpDir}/src/include/assimp/IOStream.hpp + ${assimpDir}/src/include/assimp/IOStreamBuffer.h ${assimpDir}/src/include/assimp/IOSystem.hpp ${assimpDir}/src/include/assimp/Importer.hpp + ${assimpDir}/src/include/assimp/LineSplitter.h + ${assimpDir}/src/include/assimp/LogAux.h ${assimpDir}/src/include/assimp/LogStream.hpp ${assimpDir}/src/include/assimp/Logger.hpp + ${assimpDir}/src/include/assimp/MathFunctions.h + ${assimpDir}/src/include/assimp/MemoryIOWrapper.h ${assimpDir}/src/include/assimp/NullLogger.hpp + ${assimpDir}/src/include/assimp/ParsingUtils.h + ${assimpDir}/src/include/assimp/Profiler.h ${assimpDir}/src/include/assimp/ProgressHandler.hpp + ${assimpDir}/src/include/assimp/RemoveComments.h + ${assimpDir}/src/include/assimp/SGSpatialSort.h ${assimpDir}/src/include/assimp/SceneCombiner.h + ${assimpDir}/src/include/assimp/SkeletonMeshBuilder.h + ${assimpDir}/src/include/assimp/SmoothingGroups.h ${assimpDir}/src/include/assimp/SmoothingGroups.inl + ${assimpDir}/src/include/assimp/SpatialSort.h + ${assimpDir}/src/include/assimp/StandardShapes.h + ${assimpDir}/src/include/assimp/StreamReader.h + ${assimpDir}/src/include/assimp/StreamWriter.h + ${assimpDir}/src/include/assimp/StringComparison.h + ${assimpDir}/src/include/assimp/StringUtils.h + ${assimpDir}/src/include/assimp/Subdivision.h + ${assimpDir}/src/include/assimp/TinyFormatter.h + ${assimpDir}/src/include/assimp/Vertex.h + ${assimpDir}/src/include/assimp/XMLTools.h + ${assimpDir}/src/include/assimp/ZipArchiveIOSystem.h ${assimpDir}/src/include/assimp/ai_assert.h ${assimpDir}/src/include/assimp/anim.h ${assimpDir}/src/include/assimp/camera.h ${assimpDir}/src/include/assimp/cexport.h ${assimpDir}/src/include/assimp/cfileio.h ${assimpDir}/src/include/assimp/cimport.h - ${assimpDir}/src/include/assimp/color4.h - ${assimpDir}/src/include/assimp/config.h + ${assimpDir}/src/include/assimp/color4.h ${assimpDir}/src/include/assimp/color4.inl ${assimpDir}/src/include/assimp/defs.h + ${assimpDir}/src/include/assimp/fast_atof.h ${assimpDir}/src/include/assimp/importerdesc.h ${assimpDir}/src/include/assimp/light.h - ${assimpDir}/src/include/assimp/material.h - ${assimpDir}/src/include/assimp/matrix3x3.h - ${assimpDir}/src/include/assimp/matrix4x4.h + ${assimpDir}/src/include/assimp/material.h ${assimpDir}/src/include/assimp/material.inl + ${assimpDir}/src/include/assimp/matrix3x3.h ${assimpDir}/src/include/assimp/matrix3x3.inl + ${assimpDir}/src/include/assimp/matrix4x4.h ${assimpDir}/src/include/assimp/matrix4x4.inl ${assimpDir}/src/include/assimp/mesh.h ${assimpDir}/src/include/assimp/metadata.h - ${assimpDir}/src/include/assimp/port/AndroidJNI/AndroidJNIIOSystem.h + ${assimpDir}/src/include/assimp/pbrmaterial.h ${assimpDir}/src/include/assimp/postprocess.h - ${assimpDir}/src/include/assimp/quaternion.h + ${assimpDir}/src/include/assimp/qnan.h + ${assimpDir}/src/include/assimp/quaternion.h ${assimpDir}/src/include/assimp/quaternion.inl ${assimpDir}/src/include/assimp/scene.h ${assimpDir}/src/include/assimp/texture.h ${assimpDir}/src/include/assimp/types.h - ${assimpDir}/src/include/assimp/vector2.h - ${assimpDir}/src/include/assimp/vector3.h + ${assimpDir}/src/include/assimp/vector2.h ${assimpDir}/src/include/assimp/vector2.inl + ${assimpDir}/src/include/assimp/vector3.h ${assimpDir}/src/include/assimp/vector3.inl ${assimpDir}/src/include/assimp/version.h - ${assimpDir}/src/code/Common/Assimp.cpp - ${assimpDir}/src/code/Common/DefaultLogger.cpp - ${assimpDir}/src/code/Common/BaseImporter.cpp - ${assimpDir}/src/code/Common/BaseProcess.cpp - ${assimpDir}/src/code/Common/PostStepRegistry.cpp - ${assimpDir}/src/code/Common/ImporterRegistry.cpp - ${assimpDir}/src/code/Common/DefaultIOStream.cpp - ${assimpDir}/src/code/Common/DefaultIOSystem.cpp - ${assimpDir}/src/code/CApi/CInterfaceIOWrapper.cpp - ${assimpDir}/src/code/Common/Importer.cpp - ${assimpDir}/src/code/Common/SGSpatialSort.cpp - ${assimpDir}/src/code/Common/VertexTriangleAdjacency.cpp - ${assimpDir}/src/code/Common/SpatialSort.cpp - ${assimpDir}/src/code/Common/SceneCombiner.cpp - ${assimpDir}/src/code/Common/ScenePreprocessor.cpp - ${assimpDir}/src/code/Common/SkeletonMeshBuilder.cpp - ${assimpDir}/src/code/Common/SplitByBoneCountProcess.cpp - ${assimpDir}/src/code/Common/StandardShapes.cpp - ${assimpDir}/src/code/Common/TargetAnimation.cpp - ${assimpDir}/src/code/Common/RemoveComments.cpp - ${assimpDir}/src/code/Common/Subdivision.cpp - ${assimpDir}/src/code/Common/scene.cpp - ${assimpDir}/src/code/Common/Bitmap.cpp - ${assimpDir}/src/code/Common/Version.cpp - ${assimpDir}/src/code/Common/CreateAnimMesh.cpp - ${assimpDir}/src/code/Common/simd.cpp - ${assimpDir}/src/code/Common/ZipArchiveIOSystem.cpp - ${assimpDir}/src/code/Collada/ColladaLoader.cpp - ${assimpDir}/src/code/Collada/ColladaParser.cpp - ${assimpDir}/src/code/Material/MaterialSystem.cpp - ${assimpDir}/src/code/Obj/ObjFileImporter.cpp - ${assimpDir}/src/code/Obj/ObjFileMtlImporter.cpp - ${assimpDir}/src/code/Obj/ObjFileParser.cpp - ${assimpDir}/src/code/Blender/BlenderLoader.cpp - ${assimpDir}/src/code/Blender/BlenderDNA.cpp - ${assimpDir}/src/code/Blender/BlenderScene.cpp - ${assimpDir}/src/code/Blender/BlenderModifier.cpp - ${assimpDir}/src/code/Blender/BlenderBMesh.cpp - ${assimpDir}/src/code/Blender/BlenderTessellator.cpp - ${assimpDir}/src/code/Blender/BlenderCustomData.cpp - ${assimpDir}/src/code/FBX/FBXImporter.cpp - ${assimpDir}/src/code/FBX/FBXParser.cpp - ${assimpDir}/src/code/FBX/FBXTokenizer.cpp - ${assimpDir}/src/code/FBX/FBXConverter.cpp - ${assimpDir}/src/code/FBX/FBXUtil.cpp - ${assimpDir}/src/code/FBX/FBXDocument.cpp - ${assimpDir}/src/code/FBX/FBXProperties.cpp - ${assimpDir}/src/code/FBX/FBXMeshGeometry.cpp - ${assimpDir}/src/code/FBX/FBXMaterial.cpp - ${assimpDir}/src/code/FBX/FBXModel.cpp - ${assimpDir}/src/code/FBX/FBXAnimation.cpp - ${assimpDir}/src/code/FBX/FBXNodeAttribute.cpp - ${assimpDir}/src/code/FBX/FBXDeformer.cpp - ${assimpDir}/src/code/FBX/FBXBinaryTokenizer.cpp - ${assimpDir}/src/code/FBX/FBXDocumentUtil.cpp - ${assimpDir}/src/code/PostProcessing/CalcTangentsProcess.cpp - ${assimpDir}/src/code/PostProcessing/ComputeUVMappingProcess.cpp - ${assimpDir}/src/code/PostProcessing/ConvertToLHProcess.cpp - ${assimpDir}/src/code/PostProcessing/EmbedTexturesProcess.cpp - ${assimpDir}/src/code/PostProcessing/FindDegenerates.cpp - ${assimpDir}/src/code/PostProcessing/FindInstancesProcess.cpp - ${assimpDir}/src/code/PostProcessing/FindInvalidDataProcess.cpp - ${assimpDir}/src/code/PostProcessing/FixNormalsStep.cpp - ${assimpDir}/src/code/PostProcessing/DropFaceNormalsProcess.cpp - ${assimpDir}/src/code/PostProcessing/GenBoundingBoxesProcess.cpp - ${assimpDir}/src/code/PostProcessing/GenFaceNormalsProcess.cpp - ${assimpDir}/src/code/PostProcessing/GenVertexNormalsProcess.cpp - ${assimpDir}/src/code/PostProcessing/PretransformVertices.cpp - ${assimpDir}/src/code/PostProcessing/ImproveCacheLocality.cpp - ${assimpDir}/src/code/PostProcessing/JoinVerticesProcess.cpp - ${assimpDir}/src/code/PostProcessing/LimitBoneWeightsProcess.cpp - ${assimpDir}/src/code/PostProcessing/RemoveRedundantMaterials.cpp - ${assimpDir}/src/code/PostProcessing/RemoveVCProcess.cpp - ${assimpDir}/src/code/PostProcessing/SortByPTypeProcess.cpp - ${assimpDir}/src/code/PostProcessing/SplitLargeMeshes.cpp - ${assimpDir}/src/code/PostProcessing/TextureTransform.cpp - ${assimpDir}/src/code/PostProcessing/TriangulateProcess.cpp - ${assimpDir}/src/code/PostProcessing/ValidateDataStructure.cpp - ${assimpDir}/src/code/PostProcessing/OptimizeGraph.cpp - ${assimpDir}/src/code/PostProcessing/OptimizeMeshes.cpp - ${assimpDir}/src/code/PostProcessing/DeboneProcess.cpp - ${assimpDir}/src/code/PostProcessing/ProcessHelper.cpp - ${assimpDir}/src/code/PostProcessing/MakeVerboseFormat.cpp - ${assimpDir}/src/code/PostProcessing/ScaleProcess.cpp - ${assimpDir}/src/code/glTF/glTFImporter.cpp - ${assimpDir}/src/code/glTF/glTFCommon.cpp - ${assimpDir}/src/code/glTF2/glTF2Importer.cpp - ${assimpDir}/src/contrib/Open3DGC/o3dgcArithmeticCodec.cpp - ${assimpDir}/src/contrib/Open3DGC/o3dgcDynamicVectorDecoder.cpp - ${assimpDir}/src/contrib/Open3DGC/o3dgcDynamicVectorEncoder.cpp - ${assimpDir}/src/contrib/Open3DGC/o3dgcTools.cpp - ${assimpDir}/src/contrib/Open3DGC/o3dgcTriangleFans.cpp - ${assimpDir}/src/contrib/clipper/clipper.cpp - ${assimpDir}/src/contrib/irrXML/irrXML.cpp - ${assimpDir}/src/contrib/openddlparser/code/DDLNode.cpp - ${assimpDir}/src/contrib/openddlparser/code/OpenDDLCommon.cpp - ${assimpDir}/src/contrib/openddlparser/code/OpenDDLExport.cpp - ${assimpDir}/src/contrib/openddlparser/code/OpenDDLParser.cpp - ${assimpDir}/src/contrib/openddlparser/code/OpenDDLStream.cpp - ${assimpDir}/src/contrib/openddlparser/code/Value.cpp - ${assimpDir}/src/contrib/poly2tri/poly2tri/common/shapes.cc - ${assimpDir}/src/contrib/poly2tri/poly2tri/sweep/advancing_front.cc - ${assimpDir}/src/contrib/poly2tri/poly2tri/sweep/cdt.cc - ${assimpDir}/src/contrib/poly2tri/poly2tri/sweep/sweep.cc - ${assimpDir}/src/contrib/poly2tri/poly2tri/sweep/sweep_context.cc - ${assimpDir}/src/contrib/unzip/ioapi.c - ${assimpDir}/src/contrib/unzip/unzip.c - ${assimpDir}/src/contrib/zip/src/zip.c + ${assimpDir}/unzip/unzip.h DEFINES ASSIMP_BUILD_BOOST_WORKAROUND ASSIMP_BUILD_NO_3DS_IMPORTER @@ -440,6 +212,7 @@ function(qt3d_extend_target_for_assimp target) 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 @@ -451,8 +224,10 @@ function(qt3d_extend_target_for_assimp target) 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 @@ -473,14 +248,15 @@ function(qt3d_extend_target_for_assimp target) ASSIMP_BUILD_NO_SIB_IMPORTER ASSIMP_BUILD_NO_SMD_IMPORTER ASSIMP_BUILD_NO_STEP_IMPORTER - ASSIMP_BUILD_NO_STL_IMPORTER ASSIMP_BUILD_NO_TERRAGEN_IMPORTER ASSIMP_BUILD_NO_X3D_IMPORTER ASSIMP_BUILD_NO_XGL_IMPORTER ASSIMP_BUILD_NO_X_IMPORTER - OPENDDL_STATIC_LIBARY + ASSIMP_BUILD_NO_BLEND_IMPORTER NOUNCRYPT - QT_NO_EMIT + RAPIDJSON_HAS_STDSTRING=1 + RAPIDJSON_NOMEMBERITERATORCLASS + ASSIMP_BUILD_NO_LIMITBONEWEIGHTS_PROCESS INCLUDE_DIRECTORIES ${assimpDir} ${assimpDir}/.. @@ -500,6 +276,8 @@ function(qt3d_extend_target_for_assimp target) ${assimpDir}/src/contrib/irrXML ${assimpDir}/src/contrib/openddlparser/include ${assimpDir}/src/contrib/poly2tri + ${assimpDir}/src/contrib/pugixml/src + ${assimpDir}/src/contrib/pugixml/contrib ${assimpDir}/src/contrib/rapidjson/include ${assimpDir}/src/contrib/utf8cpp/source ${assimpDir}/src/include diff --git a/src/3rdparty/assimp/assimp.pri b/src/3rdparty/assimp/assimp.pri index 2ad74b9d6..255781d52 100644 --- a/src/3rdparty/assimp/assimp.pri +++ b/src/3rdparty/assimp/assimp.pri @@ -12,55 +12,60 @@ else: \ QT_PRIVATE += zlib-private DEFINES += \ - ASSIMP_BUILD_NO_X_IMPORTER \ - ASSIMP_BUILD_NO_AMF_IMPORTER \ + ASSIMP_BUILD_BOOST_WORKAROUND \ ASSIMP_BUILD_NO_3DS_IMPORTER \ - ASSIMP_BUILD_NO_MD3_IMPORTER \ - ASSIMP_BUILD_NO_MDL_IMPORTER \ - ASSIMP_BUILD_NO_MD2_IMPORTER \ - ASSIMP_BUILD_NO_PLY_IMPORTER \ - ASSIMP_BUILD_NO_ASE_IMPORTER \ - ASSIMP_BUILD_NO_HMP_IMPORTER \ - ASSIMP_BUILD_NO_SMD_IMPORTER \ - ASSIMP_BUILD_NO_MDC_IMPORTER \ - ASSIMP_BUILD_NO_MD5_IMPORTER \ - ASSIMP_BUILD_NO_STL_IMPORTER \ - ASSIMP_BUILD_NO_LWO_IMPORTER \ - ASSIMP_BUILD_NO_DXF_IMPORTER \ - ASSIMP_BUILD_NO_NFF_IMPORTER \ - ASSIMP_BUILD_NO_RAW_IMPORTER \ - ASSIMP_BUILD_NO_SIB_IMPORTER \ - ASSIMP_BUILD_NO_OFF_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_Q3D_IMPORTER \ - ASSIMP_BUILD_NO_B3D_IMPORTER \ - ASSIMP_BUILD_NO_TERRAGEN_IMPORTER \ - ASSIMP_BUILD_NO_CSM_IMPORTER \ - ASSIMP_BUILD_NO_3D_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_MS3D_IMPORTER \ - ASSIMP_BUILD_NO_COB_IMPORTER \ + ASSIMP_BUILD_NO_OWN_ZLIB \ + ASSIMP_BUILD_NO_PLY_IMPORTER \ ASSIMP_BUILD_NO_Q3BSP_IMPORTER \ - ASSIMP_BUILD_NO_NDO_IMPORTER \ - ASSIMP_BUILD_NO_IFC_IMPORTER \ - ASSIMP_BUILD_NO_XGL_IMPORTER \ - ASSIMP_BUILD_NO_ASSBIN_IMPORTER \ - ASSIMP_BUILD_NO_C4D_IMPORTER \ - ASSIMP_BUILD_NO_3MF_IMPORTER \ - ASSIMP_BUILD_NO_X3D_IMPORTER \ - ASSIMP_BUILD_NO_MMD_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_OWN_ZLIB \ - ASSIMP_BUILD_NO_COMPRESSED_IFC \ - ASSIMP_BUILD_NO_EXPORT \ - ASSIMP_BUILD_BOOST_WORKAROUND \ - OPENDDL_STATIC_LIBARY \ - NOUNCRYPT + 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 @@ -112,14 +117,14 @@ INCLUDEPATH += \ $$PWD/src \ $$PWD/src/code \ $$PWD/src/code/Common \ - $$PWD/src/code/Collada \ + $$PWD/src/code/AssetLib/Collada \ $$PWD/src/code/Material \ - $$PWD/src/code/Obj \ - $$PWD/src/code/Blender \ - $$PWD/src/code/FBX \ + $$PWD/src/code/AssetLib/Obj \ + $$PWD/src/code/AssetLib/FBX \ $$PWD/src/code/PostProcessing \ - $$PWD/src/code/glTF \ - $$PWD/src/code/glTF2 \ + $$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 @@ -204,10 +209,8 @@ HEADERS += \ $$PWD/src/include/assimp/XMLTools.h \ $$PWD/src/include/assimp/IOStreamBuffer.h \ $$PWD/src/include/assimp/CreateAnimMesh.h \ - $$PWD/src/include/assimp/irrXMLWrapper.h \ $$PWD/src/include/assimp/BlobIOSystem.h \ $$PWD/src/include/assimp/MathFunctions.h \ - $$PWD/src/include/assimp/Macros.h \ $$PWD/src/include/assimp/Exceptional.h \ $$PWD/src/include/assimp/ByteSwapper.h \ $$PWD/src/include/assimp/DefaultLogger.hpp \ @@ -215,6 +218,7 @@ HEADERS += \ $$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 \ @@ -225,39 +229,29 @@ HEADERS += \ $$PWD/src/code/Common/IFF.h \ $$PWD/src/code/Common/VertexTriangleAdjacency.h \ $$PWD/src/code/Common/ScenePreprocessor.h \ - $$PWD/src/code/Common/SplitByBoneCountProcess.h \ $$PWD/src/code/Common/TargetAnimation.h \ $$PWD/src/code/Common/simd.h \ - $$PWD/src/code/Collada/ColladaHelper.h \ - $$PWD/src/code/Collada/ColladaLoader.h \ - $$PWD/src/code/Collada/ColladaParser.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/Obj/ObjFileData.h \ - $$PWD/src/code/Obj/ObjFileImporter.h \ - $$PWD/src/code/Obj/ObjFileMtlImporter.h \ - $$PWD/src/code/Obj/ObjFileParser.h \ - $$PWD/src/code/Obj/ObjTools.h \ - $$PWD/src/code/Blender/BlenderLoader.h \ - $$PWD/src/code/Blender/BlenderDNA.h \ - $$PWD/src/code/Blender/BlenderDNA.inl \ - $$PWD/src/code/Blender/BlenderScene.h \ - $$PWD/src/code/Blender/BlenderSceneGen.h \ - $$PWD/src/code/Blender/BlenderIntermediate.h \ - $$PWD/src/code/Blender/BlenderModifier.h \ - $$PWD/src/code/Blender/BlenderBMesh.h \ - $$PWD/src/code/Blender/BlenderTessellator.h \ - $$PWD/src/code/Blender/BlenderCustomData.h \ - $$PWD/src/code/FBX/FBXCompileConfig.h \ - $$PWD/src/code/FBX/FBXImporter.h \ - $$PWD/src/code/FBX/FBXParser.h \ - $$PWD/src/code/FBX/FBXTokenizer.h \ - $$PWD/src/code/FBX/FBXImportSettings.h \ - $$PWD/src/code/FBX/FBXConverter.h \ - $$PWD/src/code/FBX/FBXUtil.h \ - $$PWD/src/code/FBX/FBXDocument.h \ - $$PWD/src/code/FBX/FBXProperties.h \ - $$PWD/src/code/FBX/FBXMeshGeometry.h \ - $$PWD/src/code/FBX/FBXCommon.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 \ @@ -273,11 +267,11 @@ HEADERS += \ $$PWD/src/code/PostProcessing/PretransformVertices.h \ $$PWD/src/code/PostProcessing/ImproveCacheLocality.h \ $$PWD/src/code/PostProcessing/JoinVerticesProcess.h \ - $$PWD/src/code/PostProcessing/LimitBoneWeightsProcess.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 \ @@ -288,20 +282,22 @@ HEADERS += \ $$PWD/src/code/Common/PolyTools.h \ $$PWD/src/code/PostProcessing/MakeVerboseFormat.h \ $$PWD/src/code/PostProcessing/ScaleProcess.h \ - $$PWD/src/code/glTF/glTFAsset.h \ - $$PWD/src/code/glTF/glTFAsset.inl \ - $$PWD/src/code/glTF/glTFAssetWriter.inl \ - $$PWD/src/code/glTF/glTFAssetWriter.h \ - $$PWD/src/code/glTF/glTFImporter.h \ - $$PWD/src/code/glTF/glTFCommon.h \ - $$PWD/src/code/glTF2/glTF2AssetWriter.h \ - $$PWD/src/code/glTF2/glTF2Asset.h \ - $$PWD/src/code/glTF2/glTF2Asset.inl \ - $$PWD/src/code/glTF2/glTF2AssetWriter.inl \ - $$PWD/src/code/glTF2/glTF2Importer.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 \ @@ -309,6 +305,7 @@ SOURCES += \ $$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 \ @@ -317,7 +314,6 @@ SOURCES += \ $$PWD/src/code/Common/SceneCombiner.cpp \ $$PWD/src/code/Common/ScenePreprocessor.cpp \ $$PWD/src/code/Common/SkeletonMeshBuilder.cpp \ - $$PWD/src/code/Common/SplitByBoneCountProcess.cpp \ $$PWD/src/code/Common/StandardShapes.cpp \ $$PWD/src/code/Common/TargetAnimation.cpp \ $$PWD/src/code/Common/RemoveComments.cpp \ @@ -327,35 +323,31 @@ SOURCES += \ $$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/Collada/ColladaLoader.cpp \ - $$PWD/src/code/Collada/ColladaParser.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/Obj/ObjFileImporter.cpp \ - $$PWD/src/code/Obj/ObjFileMtlImporter.cpp \ - $$PWD/src/code/Obj/ObjFileParser.cpp \ - $$PWD/src/code/Blender/BlenderLoader.cpp \ - $$PWD/src/code/Blender/BlenderDNA.cpp \ - $$PWD/src/code/Blender/BlenderScene.cpp \ - $$PWD/src/code/Blender/BlenderModifier.cpp \ - $$PWD/src/code/Blender/BlenderBMesh.cpp \ - $$PWD/src/code/Blender/BlenderTessellator.cpp \ - $$PWD/src/code/Blender/BlenderCustomData.cpp \ - $$PWD/src/code/FBX/FBXImporter.cpp \ - $$PWD/src/code/FBX/FBXParser.cpp \ - $$PWD/src/code/FBX/FBXTokenizer.cpp \ - $$PWD/src/code/FBX/FBXConverter.cpp \ - $$PWD/src/code/FBX/FBXUtil.cpp \ - $$PWD/src/code/FBX/FBXDocument.cpp \ - $$PWD/src/code/FBX/FBXProperties.cpp \ - $$PWD/src/code/FBX/FBXMeshGeometry.cpp \ - $$PWD/src/code/FBX/FBXMaterial.cpp \ - $$PWD/src/code/FBX/FBXModel.cpp \ - $$PWD/src/code/FBX/FBXAnimation.cpp \ - $$PWD/src/code/FBX/FBXNodeAttribute.cpp \ - $$PWD/src/code/FBX/FBXDeformer.cpp \ - $$PWD/src/code/FBX/FBXBinaryTokenizer.cpp \ - $$PWD/src/code/FBX/FBXDocumentUtil.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 \ @@ -371,11 +363,11 @@ SOURCES += \ $$PWD/src/code/PostProcessing/PretransformVertices.cpp \ $$PWD/src/code/PostProcessing/ImproveCacheLocality.cpp \ $$PWD/src/code/PostProcessing/JoinVerticesProcess.cpp \ - $$PWD/src/code/PostProcessing/LimitBoneWeightsProcess.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 \ @@ -385,23 +377,21 @@ SOURCES += \ $$PWD/src/code/PostProcessing/ProcessHelper.cpp \ $$PWD/src/code/PostProcessing/MakeVerboseFormat.cpp \ $$PWD/src/code/PostProcessing/ScaleProcess.cpp \ - $$PWD/src/code/glTF/glTFImporter.cpp \ - $$PWD/src/code/glTF/glTFCommon.cpp \ - $$PWD/src/code/glTF2/glTF2Importer.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 -# IrrXML (needed for DAE/Collada support) +# pugixml (needed for DAE/Collada support) HEADERS += \ - $$PWD/src/contrib/irrXML/CXMLReaderImpl.h \ - $$PWD/src/contrib/irrXML/heapsort.h \ - $$PWD/src/contrib/irrXML/irrArray.h \ - $$PWD/src/contrib/irrXML/irrString.h \ - $$PWD/src/contrib/irrXML/irrTypes.h \ - $$PWD/src/contrib/irrXML/irrXML.h + $$PWD/src/contrib/pugixml/src/pugixml.hpp \ + $$PWD/src/contrib/pugixml/contrib/foreach.hpp -SOURCES += $$PWD/src/contrib/irrXML/irrXML.cpp +SOURCES += $$PWD/src/contrib/pugixml/src/pugixml.cpp -VPATH += $$PWD/src/contrib/irrXML -INCLUDEPATH += $$PWD/src/contrib/irrXML +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 diff --git a/src/3rdparty/assimp/config.h b/src/3rdparty/assimp/config.h index 088a5d053..b9a4281e7 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-2018, assimp team +Copyright (c) 2006-2020, assimp team All rights reserved. @@ -60,6 +60,17 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_CONFIG_H_INC #define AI_CONFIG_H_INC +// ignore build warinings of 3rd party submodule +#if defined(__clang__) +#pragma clang diagnostic ignored "-Winconsistent-missing-override" +#pragma clang diagnostic ignored "-Wdeprecated-copy" +#elif defined(__GNUC__) +#pragma GCC diagnostic ignored "-Wsuggest-override" +#if defined(__cplusplus) +#pragma GCC diagnostic ignored "-Wreorder" +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#endif +#endif // ########################################################################### // LIBRARY SETTINGS @@ -616,6 +627,15 @@ enum aiComponent "IMPORT_FBX_READ_ANIMATIONS" // --------------------------------------------------------------------------- +/** @brief Set whether the fbx importer will read weights. + * + * The default value is true (1) + * Property type: bool + */ +#define AI_CONFIG_IMPORT_FBX_READ_WEIGHTS \ + "IMPORT_FBX_READ_WEIGHTS" + +// --------------------------------------------------------------------------- /** @brief Set whether the fbx importer will act in strict mode in which only * FBX 2013 is supported and any other sub formats are rejected. FBX 2013 * is the primary target for the importer, so this format is best @@ -651,10 +671,10 @@ enum aiComponent // --------------------------------------------------------------------------- /** @brief Set whether the fbx importer will use the legacy embedded texture naming. -* -* The default value is false (0) -* Property type: bool -*/ + * + * The default value is false (0) + * Property type: bool + */ #define AI_CONFIG_IMPORT_FBX_EMBEDDED_TEXTURES_LEGACY_NAMING \ "AI_CONFIG_IMPORT_FBX_EMBEDDED_TEXTURES_LEGACY_NAMING" @@ -696,6 +716,73 @@ enum aiComponent #define AI_CONFIG_IMPORT_UNREAL_KEYFRAME "IMPORT_UNREAL_KEYFRAME" // --------------------------------------------------------------------------- +/** @brief Set whether the MDL (HL1) importer will read animations. + * + * The default value is true (1) + * Property type: bool + */ +#define AI_CONFIG_IMPORT_MDL_HL1_READ_ANIMATIONS "IMPORT_MDL_HL1_READ_ANIMATIONS" + +// --------------------------------------------------------------------------- +/** @brief Set whether the MDL (HL1) importer will read animation events. + * \note This property requires AI_CONFIG_IMPORT_MDL_HL1_READ_ANIMATIONS to be set to true. + * + * The default value is true (1) + * Property type: bool + */ +#define AI_CONFIG_IMPORT_MDL_HL1_READ_ANIMATION_EVENTS "IMPORT_MDL_HL1_READ_ANIMATION_EVENTS" + +// --------------------------------------------------------------------------- +/** @brief Set whether the MDL (HL1) importer will read blend controllers. + * \note This property requires AI_CONFIG_IMPORT_MDL_HL1_READ_ANIMATIONS to be set to true. + * + * The default value is true (1) + * Property type: bool + */ +#define AI_CONFIG_IMPORT_MDL_HL1_READ_BLEND_CONTROLLERS "IMPORT_MDL_HL1_READ_BLEND_CONTROLLERS" + +// --------------------------------------------------------------------------- +/** @brief Set whether the MDL (HL1) importer will read sequence transition graph. + * \note This property requires AI_CONFIG_IMPORT_MDL_HL1_READ_ANIMATIONS to be set to true. + * + * The default value is true (1) + * Property type: bool + */ +#define AI_CONFIG_IMPORT_MDL_HL1_READ_SEQUENCE_TRANSITIONS "IMPORT_MDL_HL1_READ_SEQUENCE_TRANSITIONS" + +// --------------------------------------------------------------------------- +/** @brief Set whether the MDL (HL1) importer will read attachments info. + * + * The default value is true (1) + * Property type: bool + */ +#define AI_CONFIG_IMPORT_MDL_HL1_READ_ATTACHMENTS "IMPORT_MDL_HL1_READ_ATTACHMENTS" + +// --------------------------------------------------------------------------- +/** @brief Set whether the MDL (HL1) importer will read bone controllers info. + * + * The default value is true (1) + * Property type: bool + */ +#define AI_CONFIG_IMPORT_MDL_HL1_READ_BONE_CONTROLLERS "IMPORT_MDL_HL1_READ_BONE_CONTROLLERS" + +// --------------------------------------------------------------------------- +/** @brief Set whether the MDL (HL1) importer will read hitboxes info. + * + * The default value is true (1) + * Property type: bool + */ +#define AI_CONFIG_IMPORT_MDL_HL1_READ_HITBOXES "IMPORT_MDL_HL1_READ_HITBOXES" + +// --------------------------------------------------------------------------- +/** @brief Set whether the MDL (HL1) importer will read miscellaneous global model info. + * + * The default value is true (1) + * Property type: bool + */ +#define AI_CONFIG_IMPORT_MDL_HL1_READ_MISC_GLOBAL_INFO "IMPORT_MDL_HL1_READ_MISC_GLOBAL_INFO" + +// --------------------------------------------------------------------------- /** Smd load multiple animations * * Property type: bool. Default value: true. @@ -963,10 +1050,10 @@ enum aiComponent #define AI_CONFIG_IMPORT_COLLADA_IGNORE_UP_DIRECTION "IMPORT_COLLADA_IGNORE_UP_DIRECTION" // --------------------------------------------------------------------------- -/** @brief Specifies whether the Collada loader should use Collada names as node names. +/** @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 name. The default is to use the id tag (resp. sid tag, if no id tag is present) + * If this property is set to true, the Collada names will be used as the node and + * mesh names. The default is to use the id tag (resp. sid tag, if no id tag is present) * instead. * Property type: Bool. Default value: false. */ @@ -981,8 +1068,12 @@ 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. */ #define AI_CONFIG_EXPORT_POINT_CLOUDS "EXPORT_POINT_CLOUDS" @@ -1001,6 +1092,7 @@ enum aiComponent # define AI_CONFIG_APP_SCALE_KEY 1.0 #endif // AI_CONFIG_APP_SCALE_KEY + // ---------- All the Build/Compile-time defines ------------ /** @brief Specifies if double precision is supported inside assimp diff --git a/src/3rdparty/assimp/qt_attribution.json b/src/3rdparty/assimp/qt_attribution.json index db7f2367e..b5dfc1667 100644 --- a/src/3rdparty/assimp/qt_attribution.json +++ b/src/3rdparty/assimp/qt_attribution.json @@ -1,139 +1,14 @@ -[ - { - "Id": "assimp", - "Name": "Assimp - Open Asset Import Library", - "QDocModule": "qt3d", - "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 in Qt 3D.", - - "Homepage": "http://www.assimp.org/", - "Version": "5.0.1", - "License": "BSD 3-Clause \"New\" or \"Revised\" License", - "LicenseId": "BSD-3-Clause", - "LicenseFile": "LICENSE", - "Copyright": "Copyright (c) 2006-2018, assimp team" - }, - { - "Id": "assimp-clipper", - "Name": "Assimp - Clipper", - "QDocModule": "qt3d", - "Description": "", - "QtUsage": "Used in Qt 3D.", - "Files": "contrib/clipper", - - "Homepage": "http://www.angusj.com/delphi/clipper.php", - "Version": "4.8.8", - "License": "Boost Software License 1.0", - "LicenseId": "BSL-1.0", - "LicenseFile": "contrib/clipper/License.txt", - "Copyright": "Copyright Angus Johnson 2010-2012" - }, - { - "Id": "assimp-irrXML", - "Name": "Assimp - irrXML", - "QDocModule": "qt3d", - "Description": "Simple and fast open source xml parser for C++", - "QtUsage": "Used in Qt 3D.", - "Files": "contrib/irrXML", - - "Homepage": "https://www.ambiera.com/irrxml/", - "License": "zlib License", - "LicenseId": "Zlib", - "LicenseFile": "contrib/clipper/License.txt", - "Copyright": "Copyright (C) 2002-2005 Nikolaus Gebhardt" - }, - { - "Id": "assimp-Open3DGC", - "Name": "Assimp - Open3DGC", - "QDocModule": "qt3d", - "Description": "Open 3D Graphics Compression", - "QtUsage": "Used in Qt 3D.", - "Files": "contrib/Open3DGC", - - "License": "MIT License and BSD 2-Clause \"Simplified\" License", - "LicenseId": "MIT AND BSD-2-Clause", - "LicenseFile": "LICENSE_Open3DGC.txt", - "Copyright": "Copyright (c) 2013 Khaled Mammou - Advanced Micro Devices, Inc\nCopyright (c) 2004 Amir Said (said@ieee.org) & William A. Pearlman (pearlw@ecse.rpi.edu)" - }, - { - "Id": "assimp-openddlparser", - "Name": "Assimp - The OpenDDL-Parser", - "QDocModule": "qt3d", - "Description": "The OpenDDL-Parser is a small and easy to use library for OpenDDL-file-format-parsing.", - "QtUsage": "Used in Qt 3D.", - "Files": "contrib/openddlparser", - - "License": "MIT License", - "LicenseId": "MIT", - "LicenseFile": "contrib/openddlparser/LICENSE", - "Copyright": "Copyright (c) 2014-2015 Kim Kulling" - }, - { - "Id": "assimp-poly2tri", - "Name": "Assimp - Poly2Tri Polygon Triangulation Library", - "QDocModule": "qt3d", - "Description": "Poly2Tri is a sweepline constrained Delaunay Polygon Triangulation Library.", - "QtUsage": "Used in Qt 3D.", - "Files": "contrib/poly2tri", - - "Homepage": "https://github.com/greenm01/poly2tri", - "LicenseId": "BSD-3-Clause", - "License": "BSD 3-clause \"New\" or \"Revised\" License", - "LicenseFile": "contrib/poly2tri/LICENSE", - "Copyright": "Poly2Tri Copyright (c) 2009-2010, Poly2Tri Contributors" - }, - { - "Id": "assimp-rapidjson", - "Name": "Assimp - RapidJSON", - "QDocModule": "qt3d", - "Description": "RapidJSON is a JSON parser and generator for C++. Note that the bin/jsonchecker/ directory mentioned in the license is not included.", - "QtUsage": "Used in Qt 3D.", - "Files": "contrib/openddlparser", - - "License": "MIT License and BSD 3-Clause \"New\" or \"Revised\" License", - "LicenseId": "MIT AND BSD-3-Clause", - "LicenseFile": "contrib/rapidjson/license.txt", - "Copyright": "Copyright (c) 2006-2013 Alexander Chemeris\nCopyright (C) 2015 THL A29 Limited\nCopyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip" - }, - { - "Id": "assimp-unzip", - "Name": "Assimp - Unzip", - "QDocModule": "qt3d", - "Description": "IO for uncompress .zip files using zlib", - "QtUsage": "Used in Qt 3D.", - "Files": "contrib/unzip", - - "Homepage": "http://www.winimage.com/zLibDll/", - "Version": "1.01e", - "License": "zlib License", - "LicenseId": "Zlib", - "LicenseFile": "LICENSE_unzip.txt", - "Copyright": "Copyright 1998-2004 Gilles Vollant" - }, - { - "Id": "assimp-utf8cpp", - "Name": "Assimp - Utf8Cpp", - "QDocModule": "qt3d", - "Description": "UTF-8 with C++ in a Portable Way", - "QtUsage": "Used in Qt 3D.", - "Files": "contrib/utf8cpp", - - "Homepage": "https://sourceforge.net/projects/utfcpp/", - "License": "Boost Software License 1.0", - "LicenseId": "BSL-1.0", - "LicenseFile": "LICENSE_utf8cpp.txt", - "Copyright": "Copyright 2006 Nemanja Trifunovic" - }, - { - "Id": "assimp-zip", - "Name": "Assimp - Zip", - "QDocModule": "qt3d", - "Description": "A portable (OSX/Linux/Windows), simple zip library written in C", - "QtUsage": "Used in Qt 3D.", - "Files": "contrib/zip", - - "License": "Public Domain", - "LicenseFile": "LICENSE_zip.txt", - "Copyright": "" - } -] +{ + "Id": "assimp", + "Name": "Open Asset Import Library", + "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", + "License": "BSD 3-clause \"New\" or \"Revised\" Licensee", + "LicenseId": "BSD-3-Clause", + "LicenseFile": "LICENSE", + "Copyright": "Copyright (c) 2006-2018, assimp team" +} diff --git a/src/3rdparty/assimp/revision.h b/src/3rdparty/assimp/revision.h index 137aa186b..ab3f04742 100644 --- a/src/3rdparty/assimp/revision.h +++ b/src/3rdparty/assimp/revision.h @@ -1,7 +1,28 @@ #ifndef ASSIMP_REVISION_H_INC #define ASSIMP_REVISION_H_INC -#define GitVersion 0x8f0c6b0 +#define GitVersion 0xb3e1ee3c #define GitBranch "HEAD" +#define VER_MAJOR 5 +#define VER_MINOR 0 +#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 +#if (GitVersion == 0) +#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 b3e1ee3c)" +#endif + +#ifdef NDEBUG +#define VER_ORIGINAL_FILENAME_STR "assimp.dll" +#else +#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 d71020db155e9b2d4dba5562c980c016cde77f4 +Subproject 1620a72e5820d7c680f6f5da10a3481ceb4e53c |