Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Merlin Marek
assimp-lean
Commits
9b62f814
Commit
9b62f814
authored
Nov 09, 2017
by
Philip Trettner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated assimp to v4.0.1
parent
d5171c7e
Changes
531
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
531 changed files
with
73636 additions
and
12104 deletions
+73636
-12104
CMakeLists.txt
CMakeLists.txt
+14
-6
code/3DSConverter.cpp
code/3DSConverter.cpp
+23
-21
code/3DSExporter.cpp
code/3DSExporter.cpp
+19
-10
code/3DSExporter.h
code/3DSExporter.h
+6
-4
code/3DSHelper.h
code/3DSHelper.h
+40
-38
code/3DSLoader.cpp
code/3DSLoader.cpp
+66
-55
code/3DSLoader.h
code/3DSLoader.h
+5
-4
code/ACLoader.cpp
code/ACLoader.cpp
+19
-17
code/ACLoader.h
code/ACLoader.h
+3
-2
code/AMFImporter.cpp
code/AMFImporter.cpp
+704
-0
code/AMFImporter.hpp
code/AMFImporter.hpp
+563
-0
code/AMFImporter_Geometry.cpp
code/AMFImporter_Geometry.cpp
+356
-0
code/AMFImporter_Macro.hpp
code/AMFImporter_Macro.hpp
+165
-0
code/AMFImporter_Material.cpp
code/AMFImporter_Material.cpp
+310
-0
code/AMFImporter_Node.hpp
code/AMFImporter_Node.hpp
+400
-0
code/AMFImporter_Postprocess.cpp
code/AMFImporter_Postprocess.cpp
+974
-0
code/ASELoader.cpp
code/ASELoader.cpp
+22
-20
code/ASELoader.h
code/ASELoader.h
+8
-6
code/ASEParser.cpp
code/ASEParser.cpp
+49
-46
code/ASEParser.h
code/ASEParser.h
+20
-20
code/AssbinExporter.cpp
code/AssbinExporter.cpp
+54
-13
code/AssbinExporter.h
code/AssbinExporter.h
+2
-1
code/AssbinLoader.cpp
code/AssbinLoader.cpp
+58
-16
code/AssbinLoader.h
code/AssbinLoader.h
+3
-3
code/Assimp.cpp
code/Assimp.cpp
+83
-43
code/AssimpCExport.cpp
code/AssimpCExport.cpp
+33
-6
code/AssxmlExporter.cpp
code/AssxmlExporter.cpp
+54
-47
code/AssxmlExporter.h
code/AssxmlExporter.h
+2
-1
code/B3DImporter.cpp
code/B3DImporter.cpp
+47
-45
code/B3DImporter.h
code/B3DImporter.h
+5
-5
code/BVHLoader.cpp
code/BVHLoader.cpp
+24
-21
code/BVHLoader.h
code/BVHLoader.h
+2
-1
code/BaseImporter.cpp
code/BaseImporter.cpp
+112
-123
code/BaseImporter.h
code/BaseImporter.h
+40
-18
code/BaseProcess.cpp
code/BaseProcess.cpp
+4
-3
code/BaseProcess.h
code/BaseProcess.h
+2
-3
code/Bitmap.cpp
code/Bitmap.cpp
+9
-3
code/Bitmap.h
code/Bitmap.h
+61
-82
code/BlenderBMesh.cpp
code/BlenderBMesh.cpp
+1
-1
code/BlenderDNA.cpp
code/BlenderDNA.cpp
+26
-23
code/BlenderDNA.h
code/BlenderDNA.h
+57
-62
code/BlenderDNA.inl
code/BlenderDNA.inl
+76
-58
code/BlenderIntermediate.h
code/BlenderIntermediate.h
+7
-10
code/BlenderLoader.cpp
code/BlenderLoader.cpp
+200
-46
code/BlenderLoader.h
code/BlenderLoader.h
+14
-5
code/BlenderModifier.cpp
code/BlenderModifier.cpp
+13
-17
code/BlenderModifier.h
code/BlenderModifier.h
+5
-3
code/BlenderScene.cpp
code/BlenderScene.cpp
+101
-8
code/BlenderScene.h
code/BlenderScene.h
+192
-59
code/BlenderSceneGen.h
code/BlenderSceneGen.h
+2
-3
code/BlenderTessellator.cpp
code/BlenderTessellator.cpp
+30
-32
code/BlenderTessellator.h
code/BlenderTessellator.h
+2
-1
code/BlobIOSystem.h
code/BlobIOSystem.h
+9
-9
code/ByteSwapper.h
code/ByteSwapper.h
+4
-3
code/C4DImporter.cpp
code/C4DImporter.cpp
+16
-10
code/C4DImporter.h
code/C4DImporter.h
+7
-7
code/CInterfaceIOWrapper.cpp
code/CInterfaceIOWrapper.cpp
+135
-0
code/CInterfaceIOWrapper.h
code/CInterfaceIOWrapper.h
+23
-85
code/CMakeLists.txt
code/CMakeLists.txt
+266
-95
code/COBLoader.cpp
code/COBLoader.cpp
+44
-45
code/COBLoader.h
code/COBLoader.h
+2
-1
code/COBScene.h
code/COBScene.h
+9
-7
code/CSMLoader.cpp
code/CSMLoader.cpp
+14
-13
code/CSMLoader.h
code/CSMLoader.h
+2
-1
code/CalcTangentsProcess.cpp
code/CalcTangentsProcess.cpp
+4
-3
code/CalcTangentsProcess.h
code/CalcTangentsProcess.h
+2
-1
code/ColladaExporter.cpp
code/ColladaExporter.cpp
+352
-70
code/ColladaExporter.h
code/ColladaExporter.h
+23
-13
code/ColladaHelper.h
code/ColladaHelper.h
+98
-23
code/ColladaLoader.cpp
code/ColladaLoader.cpp
+415
-130
code/ColladaLoader.h
code/ColladaLoader.h
+8
-3
code/ColladaParser.cpp
code/ColladaParser.cpp
+345
-111
code/ColladaParser.h
code/ColladaParser.h
+111
-97
code/ComputeUVMappingProcess.cpp
code/ComputeUVMappingProcess.cpp
+40
-39
code/ComputeUVMappingProcess.h
code/ComputeUVMappingProcess.h
+6
-6
code/ConvertToLHProcess.cpp
code/ConvertToLHProcess.cpp
+5
-4
code/ConvertToLHProcess.h
code/ConvertToLHProcess.h
+3
-2
code/CreateAnimMesh.cpp
code/CreateAnimMesh.cpp
+92
-0
code/CreateAnimMesh.h
code/CreateAnimMesh.h
+57
-0
code/D3MFImporter.cpp
code/D3MFImporter.cpp
+375
-0
code/D3MFImporter.h
code/D3MFImporter.h
+66
-0
code/D3MFOpcPackage.cpp
code/D3MFOpcPackage.cpp
+582
-0
code/D3MFOpcPackage.h
code/D3MFOpcPackage.h
+76
-0
code/DXFHelper.h
code/DXFHelper.h
+6
-3
code/DXFLoader.cpp
code/DXFLoader.cpp
+27
-25
code/DXFLoader.h
code/DXFLoader.h
+3
-1
code/DeboneProcess.cpp
code/DeboneProcess.cpp
+10
-9
code/DeboneProcess.h
code/DeboneProcess.h
+4
-3
code/DefaultIOStream.cpp
code/DefaultIOStream.cpp
+18
-13
code/DefaultIOSystem.cpp
code/DefaultIOSystem.cpp
+6
-6
code/DefaultLogger.cpp
code/DefaultLogger.cpp
+34
-28
code/DefaultProgressHandler.h
code/DefaultProgressHandler.h
+4
-2
code/Exceptional.h
code/Exceptional.h
+3
-3
code/Exporter.cpp
code/Exporter.cpp
+83
-107
code/FBXAnimation.cpp
code/FBXAnimation.cpp
+7
-9
code/FBXBinaryTokenizer.cpp
code/FBXBinaryTokenizer.cpp
+83
-24
code/FBXCompileConfig.h
code/FBXCompileConfig.h
+4
-1
code/FBXConverter.cpp
code/FBXConverter.cpp
+2555
-2278
code/FBXConverter.h
code/FBXConverter.h
+8
-8
code/FBXDeformer.cpp
code/FBXDeformer.cpp
+6
-10
code/FBXDocument.cpp
code/FBXDocument.cpp
+44
-33
code/FBXDocument.h
code/FBXDocument.h
+131
-347
code/FBXDocumentUtil.cpp
code/FBXDocumentUtil.cpp
+7
-6
code/FBXDocumentUtil.h
code/FBXDocumentUtil.h
+2
-2
code/FBXImportSettings.h
code/FBXImportSettings.h
+11
-1
code/FBXImporter.cpp
code/FBXImporter.cpp
+13
-14
code/FBXImporter.h
code/FBXImporter.h
+8
-16
code/FBXMaterial.cpp
code/FBXMaterial.cpp
+91
-6
code/FBXMeshGeometry.cpp
code/FBXMeshGeometry.cpp
+172
-74
code/FBXMeshGeometry.h
code/FBXMeshGeometry.h
+181
-0
code/FBXModel.cpp
code/FBXModel.cpp
+6
-7
code/FBXNodeAttribute.cpp
code/FBXNodeAttribute.cpp
+4
-4
code/FBXParser.cpp
code/FBXParser.cpp
+30
-15
code/FBXParser.h
code/FBXParser.h
+25
-21
code/FBXProperties.cpp
code/FBXProperties.cpp
+7
-7
code/FBXProperties.h
code/FBXProperties.h
+13
-19
code/FBXTokenizer.cpp
code/FBXTokenizer.cpp
+2
-1
code/FBXTokenizer.h
code/FBXTokenizer.h
+3
-8
code/FBXUtil.cpp
code/FBXUtil.cpp
+3
-1
code/FBXUtil.h
code/FBXUtil.h
+4
-4
code/FIReader.cpp
code/FIReader.cpp
+1818
-0
code/FIReader.hpp
code/FIReader.hpp
+172
-0
code/FileLogStream.h
code/FileLogStream.h
+44
-3
code/FileSystemFilter.h
code/FileSystemFilter.h
+1
-1
code/FindDegenerates.cpp
code/FindDegenerates.cpp
+2
-1
code/FindDegenerates.h
code/FindDegenerates.h
+3
-2
code/FindInstancesProcess.cpp
code/FindInstancesProcess.cpp
+8
-7
code/FindInstancesProcess.h
code/FindInstancesProcess.h
+2
-1
code/FindInvalidDataProcess.cpp
code/FindInvalidDataProcess.cpp
+8
-7
code/FindInvalidDataProcess.h
code/FindInvalidDataProcess.h
+5
-4
code/FixNormalsStep.cpp
code/FixNormalsStep.cpp
+10
-8
code/FixNormalsStep.h
code/FixNormalsStep.h
+2
-1
code/GenFaceNormalsProcess.cpp
code/GenFaceNormalsProcess.cpp
+5
-4
code/GenFaceNormalsProcess.h
code/GenFaceNormalsProcess.h
+3
-2
code/GenVertexNormalsProcess.cpp
code/GenVertexNormalsProcess.cpp
+15
-15
code/GenVertexNormalsProcess.h
code/GenVertexNormalsProcess.h
+5
-5
code/GenericProperty.h
code/GenericProperty.h
+4
-3
code/HMPFileData.h
code/HMPFileData.h
+2
-1
code/HMPLoader.cpp
code/HMPLoader.cpp
+16
-11
code/HMPLoader.h
code/HMPLoader.h
+2
-6
code/HalfLifeFileData.h
code/HalfLifeFileData.h
+4
-5
code/Hash.h
code/Hash.h
+2
-1
code/IFCBoolean.cpp
code/IFCBoolean.cpp
+23
-23
code/IFCCurve.cpp
code/IFCCurve.cpp
+15
-14
code/IFCGeometry.cpp
code/IFCGeometry.cpp
+27
-28
code/IFCLoader.cpp
code/IFCLoader.cpp
+89
-72
code/IFCLoader.h
code/IFCLoader.h
+4
-3
code/IFCMaterial.cpp
code/IFCMaterial.cpp
+26
-27
code/IFCOpenings.cpp
code/IFCOpenings.cpp
+56
-48
code/IFCProfile.cpp
code/IFCProfile.cpp
+8
-7
code/IFCReaderGen1.cpp
code/IFCReaderGen1.cpp
+3168
-0
code/IFCReaderGen2.cpp
code/IFCReaderGen2.cpp
+1917
-0
code/IFCUtil.cpp
code/IFCUtil.cpp
+10
-9
code/IFCUtil.h
code/IFCUtil.h
+8
-8
code/IOStreamBuffer.h
code/IOStreamBuffer.h
+350
-0
code/IRRLoader.cpp
code/IRRLoader.cpp
+66
-65
code/IRRLoader.h
code/IRRLoader.h
+22
-20
code/IRRMeshLoader.cpp
code/IRRMeshLoader.cpp
+46
-34
code/IRRMeshLoader.h
code/IRRMeshLoader.h
+6
-1
code/IRRShared.cpp
code/IRRShared.cpp
+4
-3
code/Importer.cpp
code/Importer.cpp
+110
-26
code/Importer.h
code/Importer.h
+29
-19
code/ImporterRegistry.cpp
code/ImporterRegistry.cpp
+53
-5
code/ImproveCacheLocality.cpp
code/ImproveCacheLocality.cpp
+9
-7
code/ImproveCacheLocality.h
code/ImproveCacheLocality.h
+3
-2
code/JoinVerticesProcess.cpp
code/JoinVerticesProcess.cpp
+22
-21
code/JoinVerticesProcess.h
code/JoinVerticesProcess.h
+4
-3
code/LWOAnimation.cpp
code/LWOAnimation.cpp
+14
-7
code/LWOAnimation.h
code/LWOAnimation.h
+5
-5
code/LWOBLoader.cpp
code/LWOBLoader.cpp
+5
-4
code/LWOFileData.h
code/LWOFileData.h
+3
-2
code/LWOLoader.cpp
code/LWOLoader.cpp
+22
-21
code/LWOLoader.h
code/LWOLoader.h
+7
-4
code/LWOMaterial.cpp
code/LWOMaterial.cpp
+45
-47
code/LWSLoader.cpp
code/LWSLoader.cpp
+12
-11
code/LWSLoader.h
code/LWSLoader.h
+3
-2
code/LimitBoneWeightsProcess.cpp
code/LimitBoneWeightsProcess.cpp
+9
-7
code/LimitBoneWeightsProcess.h
code/LimitBoneWeightsProcess.h
+3
-2
code/LineSplitter.h
code/LineSplitter.h
+11
-2
code/LogAux.h
code/LogAux.h
+3
-2
code/MD2FileData.h
code/MD2FileData.h
+5
-6
code/MD2Loader.cpp
code/MD2Loader.cpp
+33
-10
code/MD2Loader.h
code/MD2Loader.h
+5
-5
code/MD2NormalTable.h
code/MD2NormalTable.h
+2
-1
code/MD3FileData.h
code/MD3FileData.h
+34
-37
code/MD3Loader.cpp
code/MD3Loader.cpp
+32
-20
code/MD3Loader.h
code/MD3Loader.h
+3
-2
code/MD5Loader.cpp
code/MD5Loader.cpp
+20
-20
code/MD5Loader.h
code/MD5Loader.h
+4
-2
code/MD5Parser.cpp
code/MD5Parser.cpp
+43
-33
code/MD5Parser.h
code/MD5Parser.h
+5
-4
code/MDCFileData.h
code/MDCFileData.h
+8
-7
code/MDCLoader.cpp
code/MDCLoader.cpp
+10
-8
code/MDCLoader.h
code/MDCLoader.h
+5
-3
code/MDLDefaultColorMap.h
code/MDLDefaultColorMap.h
+2
-1
code/MDLFileData.h
code/MDLFileData.h
+53
-77
code/MDLLoader.cpp
code/MDLLoader.cpp
+30
-19
code/MDLLoader.h
code/MDLLoader.h
+2
-1
code/MDLMaterialLoader.cpp
code/MDLMaterialLoader.cpp
+18
-14
code/MMDCpp14.h
code/MMDCpp14.h
+82
-0
code/MMDImporter.cpp
code/MMDImporter.cpp
+370
-0
code/MMDImporter.h
code/MMDImporter.h
+96
-0
code/MMDPmdParser.h
code/MMDPmdParser.h
+670
-0
code/MMDPmxParser.cpp
code/MMDPmxParser.cpp
+640
-0
code/MMDPmxParser.h
code/MMDPmxParser.h
+900
-0
code/MMDVmdParser.h
code/MMDVmdParser.h
+407
-0
code/MS3DLoader.cpp
code/MS3DLoader.cpp
+9
-7
code/MS3DLoader.h
code/MS3DLoader.h
+2
-1
code/MakeVerboseFormat.cpp
code/MakeVerboseFormat.cpp
+13
-8
code/MakeVerboseFormat.h
code/MakeVerboseFormat.h
+2
-1
code/MaterialSystem.cpp
code/MaterialSystem.cpp
+59
-40
code/MaterialSystem.h
code/MaterialSystem.h
+2
-1
code/MathFunctions.h
code/MathFunctions.h
+77
-0
code/MemoryIOWrapper.h
code/MemoryIOWrapper.h
+7
-5
code/NDOLoader.cpp
code/NDOLoader.cpp
+18
-15
code/NDOLoader.h
code/NDOLoader.h
+1
-1
code/NFFLoader.cpp
code/NFFLoader.cpp
+31
-32
code/NFFLoader.h
code/NFFLoader.h
+4
-3
code/OFFLoader.cpp
code/OFFLoader.cpp
+12
-11
code/OFFLoader.h
code/OFFLoader.h
+3
-2
code/ObjExporter.cpp
code/ObjExporter.cpp
+97
-43
code/ObjExporter.h
code/ObjExporter.h
+54
-35
code/ObjFileData.h
code/ObjFileData.h
+53
-71
code/ObjFileImporter.cpp
code/ObjFileImporter.cpp
+113
-72
code/ObjFileImporter.h
code/ObjFileImporter.h
+9
-14
code/ObjFileMtlImporter.cpp
code/ObjFileMtlImporter.cpp
+61
-38
code/ObjFileMtlImporter.h
code/ObjFileMtlImporter.h
+5
-3
code/ObjFileParser.cpp
code/ObjFileParser.cpp
+311
-236
code/ObjFileParser.h
code/ObjFileParser.h
+26
-10
code/ObjTools.h
code/ObjTools.h
+79
-15
code/OgreBinarySerializer.cpp
code/OgreBinarySerializer.cpp
+9
-10
code/OgreBinarySerializer.h
code/OgreBinarySerializer.h
+3
-2
code/OgreImporter.cpp
code/OgreImporter.cpp
+10
-10
code/OgreImporter.h
code/OgreImporter.h
+3
-2
code/OgreMaterial.cpp
code/OgreMaterial.cpp
+11
-10
code/OgreParsingUtils.h
code/OgreParsingUtils.h
+6
-5
code/OgreStructs.cpp
code/OgreStructs.cpp
+72
-66
code/OgreStructs.h
code/OgreStructs.h
+9
-5
code/OgreXmlSerializer.cpp
code/OgreXmlSerializer.cpp
+14
-15
code/OgreXmlSerializer.h
code/OgreXmlSerializer.h
+3
-2
code/OpenGEXExporter.cpp
code/OpenGEXExporter.cpp
+10
-2
code/OpenGEXExporter.h
code/OpenGEXExporter.h
+13
-11
code/OpenGEXImporter.cpp
code/OpenGEXImporter.cpp
+479
-174
code/OpenGEXImporter.h
code/OpenGEXImporter.h
+24
-7
code/OpenGEXStructs.h
code/OpenGEXStructs.h
+2
-4
code/OptimizeGraph.cpp
code/OptimizeGraph.cpp
+7
-6
code/OptimizeGraph.h
code/OptimizeGraph.h
+3
-2
code/OptimizeMeshes.cpp
code/OptimizeMeshes.cpp
+7
-9
code/OptimizeMeshes.h
code/OptimizeMeshes.h
+3
-2
code/ParsingUtils.h
code/ParsingUtils.h
+4
-2
code/PlyExporter.cpp
code/PlyExporter.cpp
+58
-39
code/PlyExporter.h
code/PlyExporter.h
+15
-16
code/PlyLoader.cpp
code/PlyLoader.cpp
+878
-913
code/PlyLoader.h
code/PlyLoader.h
+19
-51
code/PlyParser.cpp
code/PlyParser.cpp
+912
-720
code/PlyParser.h
code/PlyParser.h
+41
-57
code/PolyTools.h
code/PolyTools.h
+4
-3
code/PostStepRegistry.cpp
code/PostStepRegistry.cpp
+2
-1
code/PretransformVertices.cpp
code/PretransformVertices.cpp
+14
-13
code/PretransformVertices.h
code/PretransformVertices.h
+3
-2
code/ProcessHelper.cpp
code/ProcessHelper.cpp
+27
-20
code/ProcessHelper.h
code/ProcessHelper.h
+12
-11
code/Profiler.h
code/Profiler.h
+16
-16
code/Q3BSPFileData.h
code/Q3BSPFileData.h
+2
-1
code/Q3BSPFileImporter.cpp
code/Q3BSPFileImporter.cpp
+19
-26
code/Q3BSPFileImporter.h
code/Q3BSPFileImporter.h
+11
-13
code/Q3BSPFileParser.cpp
code/Q3BSPFileParser.cpp
+5
-6
code/Q3BSPFileParser.h
code/Q3BSPFileParser.h
+2
-1
code/Q3BSPZipArchive.cpp
code/Q3BSPZipArchive.cpp
+11
-11
code/Q3BSPZipArchive.h
code/Q3BSPZipArchive.h
+46
-79
code/Q3DLoader.cpp
code/Q3DLoader.cpp
+6
-4
code/Q3DLoader.h
code/Q3DLoader.h
+3
-2
code/RawLoader.cpp
code/RawLoader.cpp
+20
-22
code/RawLoader.h
code/RawLoader.h
+3
-2
code/RemoveComments.cpp
code/RemoveComments.cpp
+2
-1
code/RemoveComments.h
code/RemoveComments.h
+4
-3
code/RemoveRedundantMaterials.cpp
code/RemoveRedundantMaterials.cpp
+19
-14
code/RemoveRedundantMaterials.h
code/RemoveRedundantMaterials.h
+3
-2
code/RemoveVCProcess.cpp
code/RemoveVCProcess.cpp
+7
-8
code/RemoveVCProcess.h
code/RemoveVCProcess.h
+3
-2
code/SGSpatialSort.cpp
code/SGSpatialSort.cpp
+5
-6
code/SGSpatialSort.h
code/SGSpatialSort.h
+4
-3
code/SIBImporter.cpp
code/SIBImporter.cpp
+946
-0
code/SIBImporter.h
code/SIBImporter.h
+116
-0
code/SMDLoader.cpp
code/SMDLoader.cpp
+32
-30
code/SMDLoader.h
code/SMDLoader.h
+10
-9
code/STEPFile.h
code/STEPFile.h
+41
-50
code/STEPFileEncoding.cpp
code/STEPFileEncoding.cpp
+28
-34
code/STEPFileEncoding.h
code/STEPFileEncoding.h
+2
-1
code/STEPFileReader.cpp
code/STEPFileReader.cpp
+21
-20
code/STEPFileReader.h
code/STEPFileReader.h
+3
-2
code/STLExporter.cpp
code/STLExporter.cpp
+12
-10
code/STLExporter.h
code/STLExporter.h
+2
-1
code/STLLoader.cpp
code/STLLoader.cpp
+38
-36
code/STLLoader.h
code/STLLoader.h
+3
-2
code/SceneCombiner.cpp
code/SceneCombiner.cpp
+44
-32
code/ScenePreprocessor.cpp
code/ScenePreprocessor.cpp
+11
-10
code/ScenePreprocessor.h
code/ScenePreprocessor.h
+3
-2
code/ScenePrivate.h
code/ScenePrivate.h
+5
-4
code/SkeletonMeshBuilder.cpp
code/SkeletonMeshBuilder.cpp
+57
-54
code/SkeletonMeshBuilder.h
code/SkeletonMeshBuilder.h
+3
-2
code/SmoothingGroups.h
code/SmoothingGroups.h
+3
-2
code/SmoothingGroups.inl
code/SmoothingGroups.inl
+1
-1
code/SortByPTypeProcess.cpp
code/SortByPTypeProcess.cpp
+3
-2
code/SortByPTypeProcess.h
code/SortByPTypeProcess.h
+3
-2
code/SpatialSort.cpp
code/SpatialSort.cpp
+22
-24
code/SpatialSort.h
code/SpatialSort.h
+8
-7
code/SplitByBoneCountProcess.cpp
code/SplitByBoneCountProcess.cpp
+58
-56
code/SplitByBoneCountProcess.h
code/SplitByBoneCountProcess.h
+5
-4
code/SplitLargeMeshes.cpp
code/SplitLargeMeshes.cpp
+5
-6
code/SplitLargeMeshes.h
code/SplitLargeMeshes.h
+5
-3
code/StandardShapes.cpp
code/StandardShapes.cpp
+81
-80
code/StandardShapes.h
code/StandardShapes.h
+7
-6
code/StdOStreamLogStream.h
code/StdOStreamLogStream.h
+60
-12
code/StepExporter.cpp
code/StepExporter.cpp
+20
-14
code/StepExporter.h
code/StepExporter.h
+5
-4
code/StreamReader.h
code/StreamReader.h
+32
-43
code/StreamWriter.h
code/StreamWriter.h
+11
-10
code/StringComparison.h
code/StringComparison.h
+3
-3
code/StringUtils.h
code/StringUtils.h
+110
-0
code/Subdivision.cpp
code/Subdivision.cpp
+14
-17
code/Subdivision.h
code/Subdivision.h
+2
-1
code/TargetAnimation.cpp
code/TargetAnimation.cpp
+9
-8
code/TargetAnimation.h
code/TargetAnimation.h
+3
-2
code/TerragenLoader.cpp
code/TerragenLoader.cpp
+9
-7
code/TerragenLoader.h
code/TerragenLoader.h
+2
-1
code/TextureTransform.cpp
code/TextureTransform.cpp
+14
-13
code/TextureTransform.h
code/TextureTransform.h
+3
-2
code/TinyFormatter.h
code/TinyFormatter.h
+4
-2
code/TriangulateProcess.cpp
code/TriangulateProcess.cpp
+17
-18
code/TriangulateProcess.h
code/TriangulateProcess.h
+2
-1
code/UnrealLoader.cpp
code/UnrealLoader.cpp
+13
-15
code/UnrealLoader.h
code/UnrealLoader.h
+2
-1
code/ValidateDataStructure.cpp
code/ValidateDataStructure.cpp
+9
-7
code/ValidateDataStructure.h
code/ValidateDataStructure.h
+4
-3
code/Version.cpp
code/Version.cpp
+64
-26
code/Vertex.h
code/Vertex.h
+39
-38
code/VertexTriangleAdjacency.cpp
code/VertexTriangleAdjacency.cpp
+3
-2
code/VertexTriangleAdjacency.h
code/VertexTriangleAdjacency.h
+4
-3
code/Win32DebugLogStream.h
code/Win32DebugLogStream.h
+60
-16
code/X3DExporter.cpp
code/X3DExporter.cpp
+731
-0
code/X3DExporter.hpp
code/X3DExporter.hpp
+235
-0
code/X3DImporter.cpp
code/X3DImporter.cpp
+1728
-0
code/X3DImporter.hpp
code/X3DImporter.hpp
+833
-0
code/X3DImporter_Geometry2D.cpp
code/X3DImporter_Geometry2D.cpp
+521
-0
code/X3DImporter_Geometry3D.cpp
code/X3DImporter_Geometry3D.cpp
+998
-0
code/X3DImporter_Group.cpp
code/X3DImporter_Group.cpp
+317
-0
code/X3DImporter_Light.cpp
code/X3DImporter_Light.cpp
+289
-0
code/X3DImporter_Macro.hpp
code/X3DImporter_Macro.hpp
+194
-0
code/X3DImporter_Metadata.cpp
code/X3DImporter_Metadata.cpp
+276
-0
code/X3DImporter_Networking.cpp
code/X3DImporter_Networking.cpp
+133
-0
code/X3DImporter_Node.hpp
code/X3DImporter_Node.hpp
+779
-0
code/X3DImporter_Postprocess.cpp
code/X3DImporter_Postprocess.cpp
+819
-0
code/X3DImporter_Rendering.cpp
code/X3DImporter_Rendering.cpp
+1070
-0
code/X3DImporter_Shape.cpp
code/X3DImporter_Shape.cpp
+249
-0
code/X3DImporter_Texturing.cpp
code/X3DImporter_Texturing.cpp
+196
-0
code/X3DVocabulary.cpp
code/X3DVocabulary.cpp
+1675
-0
code/XFileExporter.cpp
code/XFileExporter.cpp
+15
-15
code/XFileExporter.h
code/XFileExporter.h
+6
-5
code/XFileHelper.h
code/XFileHelper.h
+9
-8
code/XFileImporter.cpp
code/XFileImporter.cpp
+20
-18
code/XFileImporter.h
code/XFileImporter.h
+3
-2
code/XFileParser.cpp
code/XFileParser.cpp
+25
-27
code/XFileParser.h
code/XFileParser.h
+4
-3
code/XGLLoader.cpp
code/XGLLoader.cpp
+56
-54
code/XGLLoader.h
code/XGLLoader.h
+12
-14
code/XMLTools.h
code/XMLTools.h
+2
-1
code/fast_atof.h
code/fast_atof.h
+21
-39
code/glTFAsset.h
code/glTFAsset.h
+1194
-0
code/glTFAsset.inl
code/glTFAsset.inl
+1636
-0
code/glTFAssetWriter.h
code/glTFAssetWriter.h
+95
-0
code/glTFAssetWriter.inl
code/glTFAssetWriter.inl
+685
-0
code/glTFExporter.cpp
code/glTFExporter.cpp
+1007
-0
code/glTFExporter.h
code/glTFExporter.h
+118
-0
code/glTFImporter.cpp
code/glTFImporter.cpp
+688
-0
code/glTFImporter.h
code/glTFImporter.h
+91
-0
code/irrXMLWrapper.h
code/irrXMLWrapper.h
+7
-6
code/qnan.h
code/qnan.h
+50
-8
code/res/assimp.rc
code/res/assimp.rc
+80
-80
code/scene.cpp
code/scene.cpp
+139
-0
contrib/CMakeLists.txt
contrib/CMakeLists.txt
+4
-0
contrib/Open3DGC/o3dgcAdjacencyInfo.h
contrib/Open3DGC/o3dgcAdjacencyInfo.h
+155
-0
contrib/Open3DGC/o3dgcArithmeticCodec.cpp
contrib/Open3DGC/o3dgcArithmeticCodec.cpp
+863
-0
contrib/Open3DGC/o3dgcArithmeticCodec.h
contrib/Open3DGC/o3dgcArithmeticCodec.h
+339
-0
contrib/Open3DGC/o3dgcBinaryStream.h
contrib/Open3DGC/o3dgcBinaryStream.h
+430
-0
contrib/Open3DGC/o3dgcCommon.h
contrib/Open3DGC/o3dgcCommon.h
+412
-0
contrib/Open3DGC/o3dgcDVEncodeParams.h
contrib/Open3DGC/o3dgcDVEncodeParams.h
+62
-0
contrib/Open3DGC/o3dgcDynamicVector.h
contrib/Open3DGC/o3dgcDynamicVector.h
+84
-0
contrib/Open3DGC/o3dgcDynamicVectorDecoder.cpp
contrib/Open3DGC/o3dgcDynamicVectorDecoder.cpp
+278
-0
contrib/Open3DGC/o3dgcDynamicVectorDecoder.h
contrib/Open3DGC/o3dgcDynamicVectorDecoder.h
+76
-0
contrib/Open3DGC/o3dgcDynamicVectorEncoder.cpp
contrib/Open3DGC/o3dgcDynamicVectorEncoder.cpp
+295
-0
contrib/Open3DGC/o3dgcDynamicVectorEncoder.h
contrib/Open3DGC/o3dgcDynamicVectorEncoder.h
+79
-0
contrib/Open3DGC/o3dgcFIFO.h
contrib/Open3DGC/o3dgcFIFO.h
+97
-0
contrib/Open3DGC/o3dgcIndexedFaceSet.h
contrib/Open3DGC/o3dgcIndexedFaceSet.h
+263
-0
contrib/Open3DGC/o3dgcIndexedFaceSet.inl
contrib/Open3DGC/o3dgcIndexedFaceSet.inl
+47
-0
contrib/Open3DGC/o3dgcSC3DMCDecoder.h
contrib/Open3DGC/o3dgcSC3DMCDecoder.h
+111
-0
contrib/Open3DGC/o3dgcSC3DMCDecoder.inl
contrib/Open3DGC/o3dgcSC3DMCDecoder.inl
+850
-0
contrib/Open3DGC/o3dgcSC3DMCEncodeParams.h
contrib/Open3DGC/o3dgcSC3DMCEncodeParams.h
+140
-0
contrib/Open3DGC/o3dgcSC3DMCEncoder.h
contrib/Open3DGC/o3dgcSC3DMCEncoder.h
+116
-0
contrib/Open3DGC/o3dgcSC3DMCEncoder.inl
contrib/Open3DGC/o3dgcSC3DMCEncoder.inl
+927
-0
contrib/Open3DGC/o3dgcTimer.h
contrib/Open3DGC/o3dgcTimer.h
+134
-0
contrib/Open3DGC/o3dgcTools.cpp
contrib/Open3DGC/o3dgcTools.cpp
+22
-0
contrib/Open3DGC/o3dgcTriangleFans.cpp
contrib/Open3DGC/o3dgcTriangleFans.cpp
+475
-0
contrib/Open3DGC/o3dgcTriangleFans.h
contrib/Open3DGC/o3dgcTriangleFans.h
+291
-0
contrib/Open3DGC/o3dgcTriangleListDecoder.h
contrib/Open3DGC/o3dgcTriangleListDecoder.h
+133
-0
contrib/Open3DGC/o3dgcTriangleListDecoder.inl
contrib/Open3DGC/o3dgcTriangleListDecoder.inl
+364
-0
contrib/Open3DGC/o3dgcTriangleListEncoder.h
contrib/Open3DGC/o3dgcTriangleListEncoder.h
+101
-0
contrib/Open3DGC/o3dgcTriangleListEncoder.inl
contrib/Open3DGC/o3dgcTriangleListEncoder.inl
+719
-0
contrib/Open3DGC/o3dgcVector.h
contrib/Open3DGC/o3dgcVector.h
+184
-0
contrib/Open3DGC/o3dgcVector.inl
contrib/Open3DGC/o3dgcVector.inl
+317
-0
contrib/clipper/clipper.cpp
contrib/clipper/clipper.cpp
+1
-1
contrib/clipper/clipper.hpp
contrib/clipper/clipper.hpp
+1
-1
contrib/irrXML/CMakeLists.txt
contrib/irrXML/CMakeLists.txt
+13
-0
contrib/openddlparser/CMakeLists.txt
contrib/openddlparser/CMakeLists.txt
+114
-8
contrib/openddlparser/CREDITS
contrib/openddlparser/CREDITS
+19
-0
contrib/openddlparser/LICENSE
contrib/openddlparser/LICENSE
+22
-0
contrib/openddlparser/README.md
contrib/openddlparser/README.md
+41
-16
contrib/openddlparser/code/DDLNode.cpp
contrib/openddlparser/code/DDLNode.cpp
+15
-7
contrib/openddlparser/code/OpenDDLCommon.cpp
contrib/openddlparser/code/OpenDDLCommon.cpp
+76
-32
contrib/openddlparser/code/OpenDDLExport.cpp
contrib/openddlparser/code/OpenDDLExport.cpp
+13
-39
contrib/openddlparser/code/OpenDDLParser.cpp
contrib/openddlparser/code/OpenDDLParser.cpp
+238
-154
contrib/openddlparser/code/OpenDDLStream.cpp
contrib/openddlparser/code/OpenDDLStream.cpp
+96
-0
contrib/openddlparser/code/Value.cpp
contrib/openddlparser/code/Value.cpp
+104
-61
contrib/openddlparser/include/openddlparser/DDLNode.h
contrib/openddlparser/include/openddlparser/DDLNode.h
+21
-12
contrib/openddlparser/include/openddlparser/OpenDDLCommon.h
contrib/openddlparser/include/openddlparser/OpenDDLCommon.h
+37
-47
contrib/openddlparser/include/openddlparser/OpenDDLExport.h
contrib/openddlparser/include/openddlparser/OpenDDLExport.h
+7
-15
contrib/openddlparser/include/openddlparser/OpenDDLParser.h
contrib/openddlparser/include/openddlparser/OpenDDLParser.h
+20
-13
contrib/openddlparser/include/openddlparser/OpenDDLParserUtils.h
.../openddlparser/include/openddlparser/OpenDDLParserUtils.h
+62
-32
contrib/openddlparser/include/openddlparser/OpenDDLStream.h
contrib/openddlparser/include/openddlparser/OpenDDLStream.h
+89
-0
contrib/openddlparser/include/openddlparser/Value.h
contrib/openddlparser/include/openddlparser/Value.h
+116
-16
contrib/poly2tri/poly2tri/common/shapes.cc
contrib/poly2tri/poly2tri/common/shapes.cc
+23
-31
contrib/poly2tri/poly2tri/common/shapes.h
contrib/poly2tri/poly2tri/common/shapes.h
+29
-31
contrib/poly2tri/poly2tri/common/utils.h
contrib/poly2tri/poly2tri/common/utils.h
+27
-5
contrib/poly2tri/poly2tri/poly2tri.h
contrib/poly2tri/poly2tri/poly2tri.h
+2
-3
contrib/poly2tri/poly2tri/sweep/advancing_front.cc
contrib/poly2tri/poly2tri/sweep/advancing_front.cc
+3
-4
contrib/poly2tri/poly2tri/sweep/advancing_front.h
contrib/poly2tri/poly2tri/sweep/advancing_front.h
+3
-3
contrib/poly2tri/poly2tri/sweep/cdt.cc
contrib/poly2tri/poly2tri/sweep/cdt.cc
+71
-72
contrib/poly2tri/poly2tri/sweep/cdt.h
contrib/poly2tri/poly2tri/sweep/cdt.h
+17
-17
contrib/poly2tri/poly2tri/sweep/sweep.cc
contrib/poly2tri/poly2tri/sweep/sweep.cc
+799
-750
contrib/poly2tri/poly2tri/sweep/sweep.h
contrib/poly2tri/poly2tri/sweep/sweep.h
+28
-21
contrib/poly2tri/poly2tri/sweep/sweep_context.cc
contrib/poly2tri/poly2tri/sweep/sweep_context.cc
+31
-22
contrib/poly2tri/poly2tri/sweep/sweep_context.h
contrib/poly2tri/poly2tri/sweep/sweep_context.h
+16
-16
contrib/rapidjson/include/rapidjson/allocators.h
contrib/rapidjson/include/rapidjson/allocators.h
+261
-0
contrib/rapidjson/include/rapidjson/document.h
contrib/rapidjson/include/rapidjson/document.h
+2014
-0
contrib/rapidjson/include/rapidjson/encodedstream.h
contrib/rapidjson/include/rapidjson/encodedstream.h
+261
-0
contrib/rapidjson/include/rapidjson/encodings.h
contrib/rapidjson/include/rapidjson/encodings.h
+625
-0
contrib/rapidjson/include/rapidjson/error/en.h
contrib/rapidjson/include/rapidjson/error/en.h
+65
-0
contrib/rapidjson/include/rapidjson/error/error.h
contrib/rapidjson/include/rapidjson/error/error.h
+146
-0
contrib/rapidjson/include/rapidjson/filereadstream.h
contrib/rapidjson/include/rapidjson/filereadstream.h
+88
-0
contrib/rapidjson/include/rapidjson/filewritestream.h
contrib/rapidjson/include/rapidjson/filewritestream.h
+91
-0
contrib/rapidjson/include/rapidjson/internal/biginteger.h
contrib/rapidjson/include/rapidjson/internal/biginteger.h
+280
-0
contrib/rapidjson/include/rapidjson/internal/diyfp.h
contrib/rapidjson/include/rapidjson/internal/diyfp.h
+247
-0
contrib/rapidjson/include/rapidjson/internal/dtoa.h
contrib/rapidjson/include/rapidjson/internal/dtoa.h
+217
-0
contrib/rapidjson/include/rapidjson/internal/ieee754.h
contrib/rapidjson/include/rapidjson/internal/ieee754.h
+77
-0
contrib/rapidjson/include/rapidjson/internal/itoa.h
contrib/rapidjson/include/rapidjson/internal/itoa.h
+304
-0
contrib/rapidjson/include/rapidjson/internal/meta.h
contrib/rapidjson/include/rapidjson/internal/meta.h
+181
-0
contrib/rapidjson/include/rapidjson/internal/pow10.h
contrib/rapidjson/include/rapidjson/internal/pow10.h
+55
-0
contrib/rapidjson/include/rapidjson/internal/stack.h
contrib/rapidjson/include/rapidjson/internal/stack.h
+179
-0
contrib/rapidjson/include/rapidjson/internal/strfunc.h
contrib/rapidjson/include/rapidjson/internal/strfunc.h
+39
-0
contrib/rapidjson/include/rapidjson/internal/strtod.h
contrib/rapidjson/include/rapidjson/internal/strtod.h
+270
-0
contrib/rapidjson/include/rapidjson/internal/swap.h
contrib/rapidjson/include/rapidjson/internal/swap.h
+37
-0
contrib/rapidjson/include/rapidjson/memorybuffer.h
contrib/rapidjson/include/rapidjson/memorybuffer.h
+70
-0
contrib/rapidjson/include/rapidjson/memorystream.h
contrib/rapidjson/include/rapidjson/memorystream.h
+61
-0
contrib/rapidjson/include/rapidjson/msinttypes/inttypes.h
contrib/rapidjson/include/rapidjson/msinttypes/inttypes.h
+316
-0
contrib/rapidjson/include/rapidjson/msinttypes/stdint.h
contrib/rapidjson/include/rapidjson/msinttypes/stdint.h
+300
-0
contrib/rapidjson/include/rapidjson/pointer.h
contrib/rapidjson/include/rapidjson/pointer.h
+1313
-0
contrib/rapidjson/include/rapidjson/prettywriter.h
contrib/rapidjson/include/rapidjson/prettywriter.h
+207
-0
contrib/rapidjson/include/rapidjson/rapidjson.h
contrib/rapidjson/include/rapidjson/rapidjson.h
+654
-0
contrib/rapidjson/include/rapidjson/reader.h
contrib/rapidjson/include/rapidjson/reader.h
+1452
-0
contrib/rapidjson/include/rapidjson/stringbuffer.h
contrib/rapidjson/include/rapidjson/stringbuffer.h
+93
-0
contrib/rapidjson/include/rapidjson/writer.h
contrib/rapidjson/include/rapidjson/writer.h
+395
-0
contrib/rapidjson/license.txt
contrib/rapidjson/license.txt
+57
-0
contrib/rapidjson/readme.md
contrib/rapidjson/readme.md
+129
-0
contrib/unzip/unzip.c
contrib/unzip/unzip.c
+1
-1
contrib/utf8cpp/doc/ReleaseNotes
contrib/utf8cpp/doc/ReleaseNotes
+12
-0
contrib/utf8cpp/doc/utf8cpp.html
contrib/utf8cpp/doc/utf8cpp.html
+1789
-0
contrib/utf8cpp/source/utf8.h
contrib/utf8cpp/source/utf8.h
+34
-0
contrib/utf8cpp/source/utf8/checked.h
contrib/utf8cpp/source/utf8/checked.h
+327
-0
contrib/utf8cpp/source/utf8/core.h
contrib/utf8cpp/source/utf8/core.h
+329
-0
contrib/utf8cpp/source/utf8/unchecked.h
contrib/utf8cpp/source/utf8/unchecked.h
+228
-0
contrib/zlib/CMakeLists.txt
contrib/zlib/CMakeLists.txt
+19
-6
contrib/zlib/gzwrite.c
contrib/zlib/gzwrite.c
+1
-1
contrib/zlib/zconf.h.included
contrib/zlib/zconf.h.included
+1
-1
include/assimp/Compiler/pstdint.h
include/assimp/Compiler/pstdint.h
+221
-38
include/assimp/Compiler/pushpack1.h
include/assimp/Compiler/pushpack1.h
+1
-4
include/assimp/DefaultIOStream.h
include/assimp/DefaultIOStream.h
+141
-0
include/assimp/DefaultIOSystem.h
include/assimp/DefaultIOSystem.h
+99
-0
include/assimp/DefaultLogger.hpp
include/assimp/DefaultLogger.hpp
+2
-1
include/assimp/Defines.h
include/assimp/Defines.h
+49
-0
include/assimp/Exporter.hpp
include/assimp/Exporter.hpp
+31
-52
include/assimp/IOStream.hpp
include/assimp/IOStream.hpp
+3
-1
include/assimp/IOSystem.hpp
include/assimp/IOSystem.hpp
+5
-2
include/assimp/Importer.hpp
include/assimp/Importer.hpp
+24
-25
include/assimp/LogStream.hpp
include/assimp/LogStream.hpp
+19
-5
include/assimp/Logger.hpp
include/assimp/Logger.hpp
+5
-2
include/assimp/NullLogger.hpp
include/assimp/NullLogger.hpp
+5
-2
include/assimp/ProgressHandler.hpp
include/assimp/ProgressHandler.hpp
+8
-4
include/assimp/SceneCombiner.h
include/assimp/SceneCombiner.h
+399
-0
include/assimp/ai_assert.h
include/assimp/ai_assert.h
+46
-7
include/assimp/anim.h
include/assimp/anim.h
+151
-63
include/assimp/camera.h
include/assimp/camera.h
+3
-1
include/assimp/cexport.h
include/assimp/cexport.h
+11
-3
include/assimp/cfileio.h
include/assimp/cfileio.h
+11
-9
include/assimp/cimport.h
include/assimp/cimport.h
+8
-5
include/assimp/color4.h
include/assimp/color4.h
+8
-8
include/assimp/color4.inl
include/assimp/color4.inl
+25
-3
include/assimp/config.h
include/assimp/config.h
+69
-31
include/assimp/config.h.in
include/assimp/config.h.in
+946
-0
include/assimp/defs.h
include/assimp/defs.h
+27
-24
include/assimp/importerdesc.h
include/assimp/importerdesc.h
+6
-4
include/assimp/light.h
include/assimp/light.h
+24
-6
include/assimp/material.h
include/assimp/material.h
+64
-42
include/assimp/material.inl
include/assimp/material.inl
+47
-8
include/assimp/matrix3x3.h
include/assimp/matrix3x3.h
+16
-19
include/assimp/matrix3x3.inl
include/assimp/matrix3x3.inl
+39
-15
include/assimp/matrix4x4.h
include/assimp/matrix4x4.h
+47
-17
include/assimp/matrix4x4.inl
include/assimp/matrix4x4.inl
+203
-57
include/assimp/mesh.h
include/assimp/mesh.h
+47
-13
include/assimp/metadata.h
include/assimp/metadata.h
+138
-72
include/assimp/port/AndroidJNI/AndroidJNIIOSystem.h
include/assimp/port/AndroidJNI/AndroidJNIIOSystem.h
+13
-13
include/assimp/postprocess.h
include/assimp/postprocess.h
+3
-1
include/assimp/quaternion.h
include/assimp/quaternion.h
+7
-4
include/assimp/quaternion.inl
include/assimp/quaternion.inl
+4
-2
include/assimp/scene.h
include/assimp/scene.h
+53
-103
include/assimp/texture.h
include/assimp/texture.h
+28
-8
include/assimp/types.h
include/assimp/types.h
+27
-24
include/assimp/vector2.h
include/assimp/vector2.h
+6
-3
include/assimp/vector2.inl
include/assimp/vector2.inl
+5
-2
include/assimp/vector3.h
include/assimp/vector3.h
+10
-13
include/assimp/vector3.inl
include/assimp/vector3.inl
+35
-3
include/assimp/version.h
include/assimp/version.h
+7
-4
No files found.
CMakeLists.txt
View file @
9b62f814
cmake_minimum_required
(
VERSION 3.1
)
project
(
Assimp
)
CONFIGURE_FILE
(
"include/assimp/config.h.in"
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/include/assimp/config.h"
)
file
(
GLOB_RECURSE SOURCE_FILES
"*.c"
"*.cpp"
"*.cc"
)
file
(
GLOB_RECURSE HEADER_FILES
"*.hh"
"*.h"
"*.hpp"
"*.inl"
)
add_subdirectory
(
contrib/zlib
)
add_subdirectory
(
contrib/irrXML
)
if
(
MSVC
)
set
(
ASSIMP_LINK_TYPE STATIC
)
...
...
@@ -14,15 +20,17 @@ endif()
add_library
(
assimp
${
ASSIMP_LINK_TYPE
}
${
SOURCE_FILES
}
${
HEADER_FILES
}
)
if
(
MSVC
)
target_include_directories
(
assimp PUBLIC
code/BoostWorkaround
)
endif
()
target_include_directories
(
assimp PUBLIC
code/BoostWorkaround
)
target_include_directories
(
assimp PUBLIC
include/
contrib/openddlparser/include
contrib/rapidjson/include
)
target_include_directories
(
assimp PRIVATE
.
# for <contrib/zlib/zlib.h>
)
if
(
NOT MSVC
)
...
...
@@ -43,4 +51,4 @@ target_compile_definitions(assimp PRIVATE
OPENDDLPARSER_BUILD
)
target_link_libraries
(
assimp PRIVATE zlibstatic
)
target_link_libraries
(
assimp PRIVATE zlibstatic
IrrXML
)
code/3DSConverter.cpp
View file @
9b62f814
...
...
@@ -3,7 +3,8 @@
Open Asset Import Library (assimp)
---------------------------------------------------------------------------
Copyright (c) 2006-2015, assimp team
Copyright (c) 2006-2017, assimp team
All rights reserved.
...
...
@@ -47,10 +48,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// internal headers
#include "3DSLoader.h"
#include "TargetAnimation.h"
#include
"../include/
assimp/scene.h
"
#include
"../include/
assimp/DefaultLogger.hpp
"
#include
<
assimp/scene.h
>
#include
<
assimp/DefaultLogger.hpp
>
#include "StringComparison.h"
#include <
boost/scoped_array.hpp
>
#include <
memory
>
#include <cctype>
using
namespace
Assimp
;
...
...
@@ -70,8 +71,9 @@ void Discreet3DSImporter::ReplaceDefaultMaterial()
for
(
unsigned
int
i
=
0
;
i
<
mScene
->
mMaterials
.
size
();
++
i
)
{
std
::
string
s
=
mScene
->
mMaterials
[
i
].
mName
;
for
(
std
::
string
::
iterator
it
=
s
.
begin
();
it
!=
s
.
end
();
++
it
)
*
it
=
::
tolower
(
*
it
);
for
(
std
::
string
::
iterator
it
=
s
.
begin
();
it
!=
s
.
end
();
++
it
)
{
*
it
=
static_cast
<
char
>
(
::
tolower
(
*
it
)
);
}
if
(
std
::
string
::
npos
==
s
.
find
(
"default"
))
continue
;
...
...
@@ -196,7 +198,7 @@ void CopyTexture(aiMaterial& mat, D3DS::Texture& texture, aiTextureType type)
// Setup the texture blend factor
if
(
is_not_qnan
(
texture
.
mTextureBlend
))
mat
.
AddProperty
<
float
>
(
&
texture
.
mTextureBlend
,
1
,
AI_MATKEY_TEXBLEND
(
type
,
0
));
mat
.
AddProperty
<
ai_real
>
(
&
texture
.
mTextureBlend
,
1
,
AI_MATKEY_TEXBLEND
(
type
,
0
));
// Setup the texture mapping mode
mat
.
AddProperty
<
int
>
((
int
*
)
&
texture
.
mMapMode
,
1
,
AI_MATKEY_MAPPINGMODE_U
(
type
,
0
));
...
...
@@ -206,14 +208,14 @@ void CopyTexture(aiMaterial& mat, D3DS::Texture& texture, aiTextureType type)
// FIXME: this is not really correct ...
if
(
texture
.
mMapMode
==
aiTextureMapMode_Mirror
)
{
texture
.
mScaleU
*=
2.
f
;
texture
.
mScaleV
*=
2.
f
;
texture
.
mOffsetU
/=
2.
f
;
texture
.
mOffsetV
/=
2.
f
;
texture
.
mScaleU
*=
2.
0
;
texture
.
mScaleV
*=
2.
0
;
texture
.
mOffsetU
/=
2.
0
;
texture
.
mOffsetV
/=
2.
0
;
}
// Setup texture UV transformations
mat
.
AddProperty
<
float
>
(
&
texture
.
mOffsetU
,
5
,
AI_MATKEY_UVTRANSFORM
(
type
,
0
));
mat
.
AddProperty
<
ai_real
>
(
&
texture
.
mOffsetU
,
5
,
AI_MATKEY_UVTRANSFORM
(
type
,
0
));
}
// ------------------------------------------------------------------------------------------------
...
...
@@ -264,10 +266,10 @@ void Discreet3DSImporter::ConvertMaterial(D3DS::Material& oldMat,
}
// Opacity
mat
.
AddProperty
<
float
>
(
&
oldMat
.
mTransparency
,
1
,
AI_MATKEY_OPACITY
);
mat
.
AddProperty
<
ai_real
>
(
&
oldMat
.
mTransparency
,
1
,
AI_MATKEY_OPACITY
);
// Bump height scaling
mat
.
AddProperty
<
float
>
(
&
oldMat
.
mBumpHeight
,
1
,
AI_MATKEY_BUMPSCALING
);
mat
.
AddProperty
<
ai_real
>
(
&
oldMat
.
mBumpHeight
,
1
,
AI_MATKEY_BUMPSCALING
);
// Two sided rendering?
if
(
oldMat
.
mTwoSided
)
...
...
@@ -358,7 +360,7 @@ void Discreet3DSImporter::ConvertMeshes(aiScene* pcOut)
// we need to split all meshes by their materials
for
(
std
::
vector
<
D3DS
::
Mesh
>::
iterator
i
=
mScene
->
mMeshes
.
begin
();
i
!=
mScene
->
mMeshes
.
end
();
++
i
)
{
boo
st
::
scoped_array
<
std
::
vector
<
unsigned
int
>
>
aiSplit
(
new
std
::
vector
<
unsigned
int
>
[
mScene
->
mMaterials
.
size
()]);
st
d
::
unique_ptr
<
std
::
vector
<
unsigned
int
>
[]
>
aiSplit
(
new
std
::
vector
<
unsigned
int
>
[
mScene
->
mMaterials
.
size
()]);
name
.
length
=
ASSIMP_itoa10
(
name
.
data
,
num
++
);
...
...
@@ -663,14 +665,14 @@ void Discreet3DSImporter::AddNodeToGraph(aiScene* pcSOut,aiNode* pcOut,
nda
->
mRotationKeys
=
new
aiQuatKey
[
nda
->
mNumRotationKeys
];
// Rotations are quaternion offsets
aiQuaternion
abs
;
aiQuaternion
abs
1
;
for
(
unsigned
int
n
=
0
;
n
<
nda
->
mNumRotationKeys
;
++
n
)
{
const
aiQuatKey
&
q
=
pcIn
->
aRotationKeys
[
n
];
abs
=
(
n
?
abs
*
q
.
mValue
:
q
.
mValue
);
abs
1
=
(
n
?
abs
1
*
q
.
mValue
:
q
.
mValue
);
nda
->
mRotationKeys
[
n
].
mTime
=
q
.
mTime
;
nda
->
mRotationKeys
[
n
].
mValue
=
abs
.
Normalize
();
nda
->
mRotationKeys
[
n
].
mValue
=
abs
1
.
Normalize
();
}
}
...
...
@@ -689,7 +691,7 @@ void Discreet3DSImporter::AddNodeToGraph(aiScene* pcSOut,aiNode* pcOut,
pcOut
->
mChildren
=
new
aiNode
*
[
pcIn
->
mChildren
.
size
()];
// Recursively process all children
const
unsigned
int
size
=
pcIn
->
mChildren
.
size
();
const
unsigned
int
size
=
static_cast
<
unsigned
int
>
(
pcIn
->
mChildren
.
size
()
)
;
for
(
unsigned
int
i
=
0
;
i
<
size
;
++
i
)
{
pcOut
->
mChildren
[
i
]
=
new
aiNode
();
...
...
@@ -741,7 +743,7 @@ void Discreet3DSImporter::GenerateNodeGraph(aiScene* pcOut)
DefaultLogger
::
get
()
->
warn
(
"No hierarchy information has been found in the file. "
);
pcOut
->
mRootNode
->
mNumChildren
=
pcOut
->
mNumMeshes
+
mScene
->
mCameras
.
size
()
+
mScene
->
mLights
.
size
();
static_cast
<
unsigned
int
>
(
mScene
->
mCameras
.
size
()
+
mScene
->
mLights
.
size
()
)
;
pcOut
->
mRootNode
->
mChildren
=
new
aiNode
*
[
pcOut
->
mRootNode
->
mNumChildren
];
pcOut
->
mRootNode
->
mName
.
Set
(
"<3DSDummyRoot>"
);
...
...
@@ -757,7 +759,7 @@ void Discreet3DSImporter::GenerateNodeGraph(aiScene* pcOut)
pcNode
->
mNumMeshes
=
1
;
// Build a name for the node
pcNode
->
mName
.
length
=
s
printf
(
pcNode
->
mName
.
data
,
"3DSMesh_%u"
,
i
);
pcNode
->
mName
.
length
=
ai_sn
printf
(
pcNode
->
mName
.
data
,
MAXLEN
,
"3DSMesh_%u"
,
i
);
}
// Build dummy nodes for all cameras
...
...
code/3DSExporter.cpp
View file @
9b62f814
...
...
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
Copyright (c) 2006-2015, assimp team
Copyright (c) 2006-2017, assimp team
All rights reserved.
Redistribution and use of this software in source and binary forms,
...
...
@@ -44,16 +45,18 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "3DSExporter.h"
#include "3DSLoader.h"
#include "SceneCombiner.h"
#include "3DSHelper.h"
#include <assimp/SceneCombiner.h>
#include "SplitLargeMeshes.h"
#include "StringComparison.h"
#include
"../include/
assimp/IOSystem.hpp
"
#include
"../include/
assimp/DefaultLogger.hpp
"
#include
"../include/
assimp/Exporter.hpp
"
#include
<
assimp/IOSystem.hpp
>
#include
<
assimp/DefaultLogger.hpp
>
#include
<
assimp/Exporter.hpp
>
#include <memory>
using
namespace
Assimp
;
namespace
Assimp
{
using
namespace
D3DS
;
namespace
{
...
...
@@ -85,7 +88,7 @@ namespace {
const
std
::
size_t
chunk_size
=
head_pos
-
chunk_start_pos
;
writer
.
SetCurrentPos
(
chunk_start_pos
+
SIZE_OFFSET
);
writer
.
PutU4
(
chunk_size
);
writer
.
PutU4
(
static_cast
<
uint32_t
>
(
chunk_size
)
)
;
writer
.
SetCurrentPos
(
head_pos
);
}
...
...
@@ -150,7 +153,7 @@ namespace {
// Worker function for exporting a scene to 3DS. Prototyped and registered in Exporter.cpp
void
ExportScene3DS
(
const
char
*
pFile
,
IOSystem
*
pIOSystem
,
const
aiScene
*
pScene
,
const
ExportProperties
*
pProperties
)
{
boo
st
::
shared_ptr
<
IOStream
>
outfile
(
pIOSystem
->
Open
(
pFile
,
"wb"
));
st
d
::
shared_ptr
<
IOStream
>
outfile
(
pIOSystem
->
Open
(
pFile
,
"wb"
));
if
(
!
outfile
)
{
throw
DeadlyExportError
(
"Could not open output .3ds file: "
+
std
::
string
(
pFile
));
}
...
...
@@ -164,7 +167,7 @@ void ExportScene3DS(const char* pFile, IOSystem* pIOSystem, const aiScene* pScen
// in |Exporter::ExportFormatEntry|.
aiScene
*
scenecopy_tmp
;
SceneCombiner
::
CopyScene
(
&
scenecopy_tmp
,
pScene
);
std
::
auto
_ptr
<
aiScene
>
scenecopy
(
scenecopy_tmp
);
std
::
unique
_ptr
<
aiScene
>
scenecopy
(
scenecopy_tmp
);
SplitLargeMeshesProcess_Triangle
tri_splitter
;
tri_splitter
.
SetLimit
(
0xffff
);
...
...
@@ -181,7 +184,7 @@ void ExportScene3DS(const char* pFile, IOSystem* pIOSystem, const aiScene* pScen
}
// end of namespace Assimp
// ------------------------------------------------------------------------------------------------
Discreet3DSExporter
::
Discreet3DSExporter
(
boo
st
::
shared_ptr
<
IOStream
>
outfile
,
const
aiScene
*
scene
)
Discreet3DSExporter
::
Discreet3DSExporter
(
st
d
::
shared_ptr
<
IOStream
>
outfile
,
const
aiScene
*
scene
)
:
scene
(
scene
)
,
writer
(
outfile
)
{
...
...
@@ -365,7 +368,7 @@ void Discreet3DSExporter::WriteTexture(const aiMaterial& mat, aiTextureType type
aiTextureMapMode
map_mode
[
2
]
=
{
aiTextureMapMode_Wrap
,
aiTextureMapMode_Wrap
};
float
blend
=
1.0
f
;
ai_real
blend
=
1.0
;
if
(
mat
.
GetTexture
(
type
,
0
,
&
path
,
NULL
,
NULL
,
&
blend
,
NULL
,
map_mode
)
!=
AI_SUCCESS
||
!
path
.
length
)
{
return
;
}
...
...
@@ -560,6 +563,12 @@ void Discreet3DSExporter::WritePercentChunk(float f) {
writer
.
PutF4
(
f
);
}
// ------------------------------------------------------------------------------------------------
void
Discreet3DSExporter
::
WritePercentChunk
(
double
f
)
{
ChunkWriter
chunk
(
writer
,
Discreet3DS
::
CHUNK_PERCENTD
);
writer
.
PutF8
(
f
);
}
#endif // ASSIMP_BUILD_NO_3DS_EXPORTER
#endif // ASSIMP_BUILD_NO_EXPORT
code/3DSExporter.h
View file @
9b62f814
...
...
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
Copyright (c) 2006-2015, assimp team
Copyright (c) 2006-2017, assimp team
All rights reserved.
Redistribution and use of this software in source and binary forms,
...
...
@@ -45,10 +46,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define AI_3DSEXPORTER_H_INC
#include <map>
#include <
boost/shared_ptr.hpp
>
#include <
memory
>
#include "StreamWriter.h"
#include
"./../include/
assimp/material.h
"
#include
<
assimp/material.h
>
struct
aiScene
;
struct
aiNode
;
...
...
@@ -64,7 +65,7 @@ namespace Assimp
class
Discreet3DSExporter
{
public:
Discreet3DSExporter
(
boo
st
::
shared_ptr
<
IOStream
>
outfile
,
const
aiScene
*
pScene
);
Discreet3DSExporter
(
st
d
::
shared_ptr
<
IOStream
>
outfile
,
const
aiScene
*
pScene
);
private:
...
...
@@ -80,6 +81,7 @@ private:
void
WriteString
(
const
aiString
&
s
);
void
WriteColor
(
const
aiColor3D
&
color
);
void
WritePercentChunk
(
float
f
);
void
WritePercentChunk
(
double
f
);
private:
...
...
code/3DSHelper.h
View file @
9b62f814
...
...
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
Copyright (c) 2006-2015, assimp team
Copyright (c) 2006-2017, assimp team
All rights reserved.
Redistribution and use of this software in source and binary forms,
...
...
@@ -46,11 +47,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "SpatialSort.h"
#include "SmoothingGroups.h"
#include "StringUtils.h"
#include "qnan.h"
#include
"./../include/
assimp/material.h
"
#include
"./../include/
assimp/camera.h
"
#include
"./../include/
assimp/light.h
"
#include
"./../include/
assimp/anim.h
"
#include
<
assimp/material.h
>
#include
<
assimp/camera.h
>
#include
<
assimp/light.h
>
#include
<
assimp/anim.h
>
#include <stdio.h> //sprintf
namespace
Assimp
{
...
...
@@ -128,6 +130,7 @@ public:
CHUNK_PERCENTW
=
0x0030
,
// int2 percentage
CHUNK_PERCENTF
=
0x0031
,
// float4 percentage
CHUNK_PERCENTD
=
0x0032
,
// float8 percentage
// ********************************************************************
// Prj master chunk
...
...
@@ -326,11 +329,11 @@ struct Texture
{
//! Default constructor
Texture
()
:
mOffsetU
(
0.0
f
)
,
mOffsetV
(
0.0
f
)
,
mScaleU
(
1.0
f
)
,
mScaleV
(
1.0
f
)
,
mRotation
(
0.0
f
)
:
mOffsetU
(
0.0
)
,
mOffsetV
(
0.0
)
,
mScaleU
(
1.0
)
,
mScaleV
(
1.0
)
,
mRotation
(
0.0
)
,
mMapMode
(
aiTextureMapMode_Wrap
)
,
bPrivate
()
,
iUVSrc
(
0
)
...
...
@@ -339,17 +342,17 @@ struct Texture
}
//! Specifies the blend factor for the texture
float
mTextureBlend
;
ai_real
mTextureBlend
;
//! Specifies the filename of the texture
std
::
string
mMapName
;
//! Specifies texture coordinate offsets/scaling/rotations
float
mOffsetU
;
float
mOffsetV
;
float
mScaleU
;
float
mScaleV
;
float
mRotation
;
ai_real
mOffsetU
;
ai_real
mOffsetV
;
ai_real
mScaleU
;
ai_real
mScaleV
;
ai_real
mRotation
;
//! Specifies the mapping mode to be used for the texture
aiTextureMapMode
mMapMode
;
...
...
@@ -367,19 +370,18 @@ struct Material
{
//! Default constructor. Builds a default name for the material
Material
()
:
mDiffuse
(
0.6
f
,
0.6
f
,
0.6
f
),
// FIX ... we won't want object to be black
mSpecularExponent
(
0.0
f
),
mShininessStrength
(
1.0
f
),
mShading
(
Discreet3DS
::
Gouraud
),
mTransparency
(
1.0
f
),
mBumpHeight
(
1.0
f
),
mTwoSided
(
false
)
:
mDiffuse
(
ai_real
(
0.6
),
ai_real
(
0.6
),
ai_real
(
0.6
)
)
// FIX ... we won't want object to be black
,
mSpecularExponent
(
ai_real
(
0.0
)
)
,
mShininessStrength
(
ai_real
(
1.0
)
)
,
mShading
(
Discreet3DS
::
Gouraud
)
,
mTransparency
(
ai_real
(
1.0
)
)
,
mBumpHeight
(
ai_real
(
1.0
)
)
,
mTwoSided
(
false
)
{
static
int
iCnt
=
0
;
char
szTemp
[
128
];
s
printf
(
szTemp
,
"UNNAMED_%i"
,
iCnt
++
);
ai_sn
printf
(
szTemp
,
128
,
"UNNAMED_%i"
,
iCnt
++
);
mName
=
szTemp
;
}
...
...
@@ -388,9 +390,9 @@ struct Material
//! Diffuse color of the material
aiColor3D
mDiffuse
;
//! Specular exponent
float
mSpecularExponent
;
ai_real
mSpecularExponent
;
//! Shininess strength, in percent
float
mShininessStrength
;
ai_real
mShininessStrength
;