Merge branch 'master' into pkoller-patch-1

CMakeLists.txt

@@ -1,7 +1,7 @@
 # Open Asset Import Library (assimp)
 # ----------------------------------------------------------------------
 # Copyright (c) 2006-2019, assimp team
-
+#
 # All rights reserved.
 #
 # Redistribution and use of this software in source and binary forms,
@@ -203,6 +203,7 @@ CONFIGURE_FILE(
 
 INCLUDE_DIRECTORIES( BEFORE
   ./
+  code/
   include
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}/include

code/3DS/3DSConverter.cpp

@@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 // internal headers
 #include "3DSLoader.h"
-#include "TargetAnimation.h"
+#include "Common/TargetAnimation.h"
 #include <assimp/scene.h>
 #include <assimp/DefaultLogger.hpp>
 #include <assimp/StringComparison.h>

code/3DS/3DSExporter.cpp

@@ -43,15 +43,17 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef ASSIMP_BUILD_NO_EXPORT
 #ifndef ASSIMP_BUILD_NO_3DS_EXPORTER
 
-#include "3DSExporter.h"
+#include "3DS/3DSExporter.h"
-#include "3DSLoader.h"
+#include "3DS/3DSLoader.h"
-#include "3DSHelper.h"
+#include "3DS/3DSHelper.h"
+#include "PostProcessing/SplitLargeMeshes.h"
+
 #include <assimp/SceneCombiner.h>
-#include "SplitLargeMeshes.h"
 #include <assimp/StringComparison.h>
 #include <assimp/IOSystem.hpp>
 #include <assimp/DefaultLogger.hpp>
 #include <assimp/Exporter.hpp>
+
 #include <memory>
 
 using namespace Assimp;

code/AC/ACLoader.cpp

@@ -53,7 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/ParsingUtils.h>
 #include <assimp/fast_atof.h>
 #include <assimp/Subdivision.h>
-#include "Importer.h"
+#include "Common/Importer.h"
 #include <assimp/BaseImporter.h>
 #include <assimp/Importer.hpp>
 #include <assimp/light.h>

code/ASE/ASELoader.cpp

@@ -53,7 +53,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "ASELoader.h"
 #include <assimp/StringComparison.h>
 #include <assimp/SkeletonMeshBuilder.h>
-#include "TargetAnimation.h"
+#include "Common/TargetAnimation.h"
+
 #include <assimp/Importer.hpp>
 #include <assimp/IOSystem.hpp>
 #include <assimp/DefaultLogger.hpp>
@@ -88,23 +89,25 @@ ASEImporter::ASEImporter()
 , mBuffer()
 , pcScene()
 , configRecomputeNormals()
-, noSkeletonMesh()
+, noSkeletonMesh() {
-{}
+    // empty
+}
 
 // ------------------------------------------------------------------------------------------------
 // Destructor, private as well
-ASEImporter::~ASEImporter()
+ASEImporter::~ASEImporter() {
-{}
+    // empty
+}
 
 // ------------------------------------------------------------------------------------------------
 // Returns whether the class can handle the format of the given file.
-bool ASEImporter::CanRead( const std::string& pFile, IOSystem* pIOHandler, bool cs) const
+bool ASEImporter::CanRead( const std::string& pFile, IOSystem* pIOHandler, bool cs) const {
-{
     // check file extension
     const std::string extension = GetExtension(pFile);
 
-    if( extension == "ase" || extension == "ask")
+    if (extension == "ase" || extension == "ask") {
         return true;
+    }
 
     if ((!extension.length() || cs) && pIOHandler) {
         const char* tokens[] = {"*3dsmax_asciiexport"};
@@ -115,15 +118,13 @@ bool ASEImporter::CanRead( const std::string& pFile, IOSystem* pIOHandler, bool
 
 // ------------------------------------------------------------------------------------------------
 // Loader meta information
-const aiImporterDesc* ASEImporter::GetInfo () const
+const aiImporterDesc* ASEImporter::GetInfo () const {
-{
     return &desc;
 }
 
 // ------------------------------------------------------------------------------------------------
 // Setup configuration options
-void ASEImporter::SetupProperties(const Importer* pImp)
+void ASEImporter::SetupProperties(const Importer* pImp) {
-{
     configRecomputeNormals = (pImp->GetPropertyInteger(
         AI_CONFIG_IMPORT_ASE_RECONSTRUCT_NORMALS,1) ? true : false);
 
@@ -133,12 +134,11 @@ void ASEImporter::SetupProperties(const Importer* pImp)
 // ------------------------------------------------------------------------------------------------
 // Imports the given file into the given scene structure.
 void ASEImporter::InternReadFile( const std::string& pFile,
-    aiScene* pScene, IOSystem* pIOHandler)
+    aiScene* pScene, IOSystem* pIOHandler) {
-{
     std::unique_ptr<IOStream> file( pIOHandler->Open( pFile, "rb"));
 
     // Check whether we can read from the file
-    if( file.get() == NULL) {
+    if( file.get() == nullptr) {
         throw DeadlyImportError( "Failed to open ASE file " + pFile + ".");
     }
 

code/ASE/ASELoader.h

@@ -4,7 +4,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2019, assimp team
 
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,

code/ASE/ASEParser.cpp

@@ -49,15 +49,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef ASSIMP_BUILD_NO_3DS_IMPORTER
 
 // internal headers
-#include "TextureTransform.h"
+#include "PostProcessing/TextureTransform.h"
 #include "ASELoader.h"
+
 #include <assimp/fast_atof.h>
 #include <assimp/DefaultLogger.hpp>
 
 using namespace Assimp;
 using namespace Assimp::ASE;
 
-
 // ------------------------------------------------------------------------------------------------
 // Begin an ASE parsing function
 

code/ASE/ASEParser.h

@@ -57,7 +57,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/qnan.h>
 
 // ASE is quite similar to 3ds. We can reuse some structures
-#include "3DSLoader.h"
+#include "3DS/3DSLoader.h"
 
 namespace Assimp    {
 namespace ASE   {

code/Assbin/AssbinExporter.cpp

@@ -46,12 +46,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef ASSIMP_BUILD_NO_EXPORT
 #ifndef ASSIMP_BUILD_NO_ASSBIN_EXPORTER
 
-#include "assbin_chunks.h"
+#include "Common/assbin_chunks.h"
+#include "PostProcessing/ProcessHelper.h"
+
 #include <assimp/version.h>
 #include <assimp/IOStream.hpp>
 #include <assimp/IOSystem.hpp>
 #include <assimp/Exporter.hpp>
-#include "ProcessHelper.h"
 #include <assimp/Exceptional.h>
 
 #ifdef ASSIMP_BUILD_NO_OWN_ZLIB

code/Assbin/AssbinLoader.cpp

@@ -50,8 +50,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef ASSIMP_BUILD_NO_ASSBIN_IMPORTER
 
 // internal headers
-#include "AssbinLoader.h"
+#include "Assbin/AssbinLoader.h"
-#include "assbin_chunks.h"
+#include "Common/assbin_chunks.h"
 #include <assimp/MemoryIOWrapper.h>
 #include <assimp/mesh.h>
 #include <assimp/anim.h>

code/Assxml/AssxmlExporter.cpp

@@ -46,13 +46,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef ASSIMP_BUILD_NO_EXPORT
 #ifndef ASSIMP_BUILD_NO_ASSXML_EXPORTER
 
-#include <stdarg.h>
+#include "PostProcessing/ProcessHelper.h"
+
 #include <assimp/version.h>
-#include "ProcessHelper.h"
 #include <assimp/IOStream.hpp>
 #include <assimp/IOSystem.hpp>
 #include <assimp/Exporter.hpp>
 
+#include <stdarg.h>
+
 #ifdef ASSIMP_BUILD_NO_OWN_ZLIB
 #   include <zlib.h>
 #else

code/B3D/B3DImporter.cpp

@@ -49,17 +49,19 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef ASSIMP_BUILD_NO_B3D_IMPORTER
 
 // internal headers
-#include "B3DImporter.h"
+#include "B3D/B3DImporter.h"
-#include "TextureTransform.h"
+#include "PostProcessing/TextureTransform.h"
-#include "ConvertToLHProcess.h"
+#include "PostProcessing/ConvertToLHProcess.h"
+
 #include <assimp/StringUtils.h>
-#include <memory>
 #include <assimp/IOSystem.hpp>
 #include <assimp/anim.h>
 #include <assimp/scene.h>
 #include <assimp/DefaultLogger.hpp>
 #include <assimp/importerdesc.h>
 
+#include <memory>
+
 using namespace Assimp;
 using namespace std;
 

code/CApi/AssimpCExport.cpp

@@ -49,7 +49,7 @@ Assimp C export interface. See Exporter.cpp for some notes.
 
 #include "CInterfaceIOWrapper.h"
 #include <assimp/SceneCombiner.h>
-#include "ScenePrivate.h"
+#include "Common/ScenePrivate.h"
 #include <assimp/Exporter.hpp>
 
 using namespace Assimp;

code/CMakeLists.txt

@@ -2,8 +2,7 @@
 # ----------------------------------------------------------------------
 #
 # Copyright (c) 2006-2019, assimp team
-
+#
-
 # All rights reserved.
 #
 # Redistribution and use of this software in source and binary forms,
@@ -142,7 +141,7 @@ SET( PUBLIC_HEADERS
 )
 
 SET( Core_SRCS
-  Assimp.cpp
+  Common/Assimp.cpp
 )
 
 IF(MSVC)
@@ -154,52 +153,57 @@ SET( Logging_SRCS
   ${HEADER_PATH}/LogStream.hpp
   ${HEADER_PATH}/Logger.hpp
   ${HEADER_PATH}/NullLogger.hpp
-  Win32DebugLogStream.h
+  Common/Win32DebugLogStream.h
-  DefaultLogger.cpp
+  Common/DefaultLogger.cpp
-  FileLogStream.h
+  Common/FileLogStream.h
-  StdOStreamLogStream.h
+  Common/StdOStreamLogStream.h
 )
 SOURCE_GROUP(Logging FILES ${Logging_SRCS})
 
 SET( Common_SRCS
-  BaseImporter.cpp
+  Common/BaseImporter.cpp
-  BaseProcess.cpp
+  Common/BaseProcess.cpp
-  BaseProcess.h
+  Common/BaseProcess.h
-  Importer.h
+  Common/Importer.h
-  ScenePrivate.h
+  Common/ScenePrivate.h
-  PostStepRegistry.cpp
+  Common/PostStepRegistry.cpp
-  ImporterRegistry.cpp
+  Common/ImporterRegistry.cpp
-  DefaultProgressHandler.h
+  Common/DefaultProgressHandler.h
-  DefaultIOStream.cpp
+  Common/DefaultIOStream.cpp
-  DefaultIOSystem.cpp
+  Common/DefaultIOSystem.cpp
-  CInterfaceIOWrapper.cpp
+  Common/PolyTools.h
-  CInterfaceIOWrapper.h
+  Common/Importer.cpp
-  Importer.cpp
+  Common/IFF.h
-  IFF.h
+  Common/SGSpatialSort.cpp
-  SGSpatialSort.cpp
+  Common/VertexTriangleAdjacency.cpp
-  VertexTriangleAdjacency.cpp
+  Common/VertexTriangleAdjacency.h
-  VertexTriangleAdjacency.h
+  Common/SpatialSort.cpp
-  SpatialSort.cpp
+  Common/SceneCombiner.cpp
-  SceneCombiner.cpp
+  Common/ScenePreprocessor.cpp
-  ScenePreprocessor.cpp
+  Common/ScenePreprocessor.h
-  ScenePreprocessor.h
+  Common/SkeletonMeshBuilder.cpp
-  SkeletonMeshBuilder.cpp
+  Common/SplitByBoneCountProcess.cpp
-  SplitByBoneCountProcess.cpp
+  Common/SplitByBoneCountProcess.h
-  SplitByBoneCountProcess.h
+  Common/StandardShapes.cpp
-  StandardShapes.cpp
+  Common/TargetAnimation.cpp
-  TargetAnimation.cpp
+  Common/TargetAnimation.h
-  TargetAnimation.h
+  Common/RemoveComments.cpp
-  RemoveComments.cpp
+  Common/Subdivision.cpp
-  Subdivision.cpp
+  Common/scene.cpp
-  scene.cpp
+  Common/Bitmap.cpp
-  Bitmap.cpp
+  Common/Version.cpp
-  Version.cpp
+  Common/CreateAnimMesh.cpp
-  CreateAnimMesh.cpp
+  Common/simd.h
-  simd.h
+  Common/simd.cpp
-  simd.cpp
 )
 SOURCE_GROUP(Common FILES ${Common_SRCS})
 
+SET( CApi_SRCS
+  CApi/CInterfaceIOWrapper.cpp
+  CApi/CInterfaceIOWrapper.h
+)
+SOURCE_GROUP(CApi FILES ${CApi_SRCS})
+
 SET( STEPParser_SRCS
   Importer/STEPParser/STEPFileReader.h
   Importer/STEPParser/STEPFileReader.cpp
@@ -210,8 +214,8 @@ SOURCE_GROUP(STEPParser FILES ${STEPParser_SRCS})
 
 IF ( ASSIMP_BUILD_NONFREE_C4D_IMPORTER )
   SET( C4D_SRCS
-    C4DImporter.cpp
+    C4D/C4DImporter.cpp
-    C4DImporter.h
+    C4D/C4DImporter.h
   )
   SOURCE_GROUP( C4D FILES ${C4D_SRCS})
 ENDIF ( ASSIMP_BUILD_NONFREE_C4D_IMPORTER )
@@ -283,261 +287,261 @@ SET(ASSIMP_EXPORTERS_ENABLED "") # list of enabled exporters
 SET(ASSIMP_EXPORTERS_DISABLED "") # disabled exporters list (used to print)
 
 ADD_ASSIMP_IMPORTER( AMF
-  AMFImporter.hpp
+  AMF/AMFImporter.hpp
-  AMFImporter_Macro.hpp
+  AMF/AMFImporter_Macro.hpp
-  AMFImporter_Node.hpp
+  AMF/AMFImporter_Node.hpp
-  AMFImporter.cpp
+  AMF/AMFImporter.cpp
-  AMFImporter_Geometry.cpp
+  AMF/AMFImporter_Geometry.cpp
-  AMFImporter_Material.cpp
+  AMF/AMFImporter_Material.cpp
-  AMFImporter_Postprocess.cpp
+  AMF/AMFImporter_Postprocess.cpp
 )
 
 ADD_ASSIMP_IMPORTER( 3DS
-  3DSConverter.cpp
+  3DS/3DSConverter.cpp
-  3DSHelper.h
+  3DS/3DSHelper.h
-  3DSLoader.cpp
+  3DS/3DSLoader.cpp
-  3DSLoader.h
+  3DS/3DSLoader.h
 )
 
 ADD_ASSIMP_EXPORTER( 3DS
-  3DSExporter.h
+  3DS/3DSExporter.h
-  3DSExporter.cpp
+  3DS/3DSExporter.cpp
 )
 
 ADD_ASSIMP_IMPORTER( AC
-  ACLoader.cpp
+  AC/ACLoader.cpp
-  ACLoader.h
+  AC/ACLoader.h
 )
 
 ADD_ASSIMP_IMPORTER( ASE
-  ASELoader.cpp
+  ASE/ASELoader.cpp
-  ASELoader.h
+  ASE/ASELoader.h
-  ASEParser.cpp
+  ASE/ASEParser.cpp
-  ASEParser.h
+  ASE/ASEParser.h
 )
 
 ADD_ASSIMP_IMPORTER( ASSBIN
-  AssbinLoader.h
+  Assbin/AssbinLoader.h
-  AssbinLoader.cpp
+  Assbin/AssbinLoader.cpp
 )
 
 ADD_ASSIMP_EXPORTER( ASSBIN
-  AssbinExporter.h
+  Assbin/AssbinExporter.h
-  AssbinExporter.cpp
+  Assbin/AssbinExporter.cpp
 )
 
 ADD_ASSIMP_IMPORTER( ASSXML
-  AssxmlExporter.h
+  Assxml/AssxmlExporter.h
-  AssxmlExporter.cpp
+  Assxml/AssxmlExporter.cpp
 )
 
 ADD_ASSIMP_IMPORTER( B3D
-  B3DImporter.cpp
+  B3D/B3DImporter.cpp
-  B3DImporter.h
+  B3D/B3DImporter.h
 )
 
 ADD_ASSIMP_IMPORTER( BVH
-  BVHLoader.cpp
+  BVH/BVHLoader.cpp
-  BVHLoader.h
+  BVH/BVHLoader.h
 )
 
 ADD_ASSIMP_IMPORTER( COLLADA
-  ColladaHelper.h
+  Collada/ColladaHelper.h
-  ColladaLoader.cpp
+  Collada/ColladaLoader.cpp
-  ColladaLoader.h
+  Collada/ColladaLoader.h
-  ColladaParser.cpp
+  Collada/ColladaParser.cpp
-  ColladaParser.h
+  Collada/ColladaParser.h
 )
 
 ADD_ASSIMP_EXPORTER( COLLADA
-  ColladaExporter.h
+  Collada/ColladaExporter.h
-  ColladaExporter.cpp
+  Collada/ColladaExporter.cpp
 )
 
 ADD_ASSIMP_IMPORTER( DXF
-  DXFLoader.cpp
+  DXF/DXFLoader.cpp
-  DXFLoader.h
+  DXF/DXFLoader.h
-  DXFHelper.h
+  DXF/DXFHelper.h
 )
 
 ADD_ASSIMP_IMPORTER( CSM
-  CSMLoader.cpp
+  CSM/CSMLoader.cpp
-  CSMLoader.h
+  CSM/CSMLoader.h
 )
 
 ADD_ASSIMP_IMPORTER( HMP
-  HMPFileData.h
+  HMP/HMPFileData.h
-  HMPLoader.cpp
+  HMP/HMPLoader.cpp
-  HMPLoader.h
+  HMP/HMPLoader.h
-  HalfLifeFileData.h
+  HMP/HalfLifeFileData.h
 )
 
 ADD_ASSIMP_IMPORTER( IRRMESH
-  IRRMeshLoader.cpp
+  Irr/IRRMeshLoader.cpp
-  IRRMeshLoader.h
+  Irr/IRRMeshLoader.h
-  IRRShared.cpp
+  Irr/IRRShared.cpp
-  IRRShared.h
+  Irr/IRRShared.h
 )
 
 ADD_ASSIMP_IMPORTER( IRR
-  IRRLoader.cpp
+  Irr/IRRLoader.cpp
-  IRRLoader.h
+  Irr/IRRLoader.h
-  IRRShared.cpp
+  Irr/IRRShared.cpp
-  IRRShared.h
+  Irr/IRRShared.h
 )
 
 ADD_ASSIMP_IMPORTER( LWO
-  LWOAnimation.cpp
+  LWO/LWOAnimation.cpp
-  LWOAnimation.h
+  LWO/LWOAnimation.h
-  LWOBLoader.cpp
+  LWO/LWOBLoader.cpp
-  LWOFileData.h
+  LWO/LWOFileData.h
-  LWOLoader.cpp
+  LWO/LWOLoader.cpp
-  LWOLoader.h
+  LWO/LWOLoader.h
-  LWOMaterial.cpp
+  LWO/LWOMaterial.cpp
 )
 
 ADD_ASSIMP_IMPORTER( LWS
-  LWSLoader.cpp
+  LWS/LWSLoader.cpp
-  LWSLoader.h
+  LWS/LWSLoader.h
 )
 
 ADD_ASSIMP_IMPORTER( MD2
-  MD2FileData.h
+  MD2/MD2FileData.h
-  MD2Loader.cpp
+  MD2/MD2Loader.cpp
-  MD2Loader.h
+  MD2/MD2Loader.h
-  MD2NormalTable.h
+  MD2/MD2NormalTable.h
 )
 
 ADD_ASSIMP_IMPORTER( MD3
-  MD3FileData.h
+  MD3/MD3FileData.h
-  MD3Loader.cpp
+  MD3/MD3Loader.cpp
-  MD3Loader.h
+  MD3/MD3Loader.h
 )
 
 ADD_ASSIMP_IMPORTER( MD5
-  MD5Loader.cpp
+  MD5/MD5Loader.cpp
-  MD5Loader.h
+  MD5/MD5Loader.h
-  MD5Parser.cpp
+  MD5/MD5Parser.cpp
-  MD5Parser.h
+  MD5/MD5Parser.h
 )
 
 ADD_ASSIMP_IMPORTER( MDC
-  MDCFileData.h
+  MDC/MDCFileData.h
-  MDCLoader.cpp
+  MDC/MDCLoader.cpp
-  MDCLoader.h
+  MDC/MDCLoader.h
-  MDCNormalTable.h
+  MDC/MDCNormalTable.h
 )
 
 ADD_ASSIMP_IMPORTER( MDL
-  MDLDefaultColorMap.h
+  MDL/MDLDefaultColorMap.h
-  MDLFileData.h
+  MDL/MDLFileData.h
-  MDLLoader.cpp
+  MDL/MDLLoader.cpp
-  MDLLoader.h
+  MDL/MDLLoader.h
-  MDLMaterialLoader.cpp
+  MDL/MDLMaterialLoader.cpp
 )
 
 SET( MaterialSystem_SRCS
-  MaterialSystem.cpp
+  Material/MaterialSystem.cpp
-  MaterialSystem.h
+  Material/MaterialSystem.h
 )
 SOURCE_GROUP( MaterialSystem FILES ${MaterialSystem_SRCS})
 
 ADD_ASSIMP_IMPORTER( NFF
-  NFFLoader.cpp
+  NFF/NFFLoader.cpp
-  NFFLoader.h
+  NFF/NFFLoader.h
 )
 
 ADD_ASSIMP_IMPORTER( NDO
-  NDOLoader.cpp
+  NDO/NDOLoader.cpp
-  NDOLoader.h
+  NDO/NDOLoader.h
 )
 
 ADD_ASSIMP_IMPORTER( OFF
-  OFFLoader.cpp
+  OFF/OFFLoader.cpp
-  OFFLoader.h
+  OFF/OFFLoader.h
 )
 
 ADD_ASSIMP_IMPORTER( OBJ
-  ObjFileData.h
+  Obj/ObjFileData.h
-  ObjFileImporter.cpp
+  Obj/ObjFileImporter.cpp
-  ObjFileImporter.h
+  Obj/ObjFileImporter.h
-  ObjFileMtlImporter.cpp
+  Obj/ObjFileMtlImporter.cpp
-  ObjFileMtlImporter.h
+  Obj/ObjFileMtlImporter.h
-  ObjFileParser.cpp
+  Obj/ObjFileParser.cpp
-  ObjFileParser.h
+  Obj/ObjFileParser.h
-  ObjTools.h
+  Obj/ObjTools.h
 )
 
 ADD_ASSIMP_EXPORTER( OBJ
-  ObjExporter.h
+  Obj/ObjExporter.h
-  ObjExporter.cpp
+  Obj/ObjExporter.cpp
 )
 
 ADD_ASSIMP_IMPORTER( OGRE
-  OgreImporter.h
+  Ogre/OgreImporter.h
-  OgreStructs.h
+  Ogre/OgreStructs.h
-  OgreParsingUtils.h
+  Ogre/OgreParsingUtils.h
-  OgreBinarySerializer.h
+  Ogre/OgreBinarySerializer.h
-  OgreXmlSerializer.h
+  Ogre/OgreXmlSerializer.h
-  OgreImporter.cpp
+  Ogre/OgreImporter.cpp
-  OgreStructs.cpp
+  Ogre/OgreStructs.cpp
-  OgreBinarySerializer.cpp
+  Ogre/OgreBinarySerializer.cpp
-  OgreXmlSerializer.cpp
+  Ogre/OgreXmlSerializer.cpp
-  OgreMaterial.cpp
+  Ogre/OgreMaterial.cpp
 )
 
 ADD_ASSIMP_IMPORTER( OPENGEX
-  OpenGEXImporter.cpp
+  OpenGEX/OpenGEXImporter.cpp
-  OpenGEXImporter.h
+  OpenGEX/OpenGEXImporter.h
-  OpenGEXStructs.h
+  OpenGEX/OpenGEXStructs.h
 )
 
 ADD_ASSIMP_EXPORTER( OPENGEX
-  OpenGEXExporter.cpp
+  OpenGEX/OpenGEXExporter.cpp
-  OpenGEXExporter.h
+  OpenGEX/OpenGEXExporter.h
 )
 
 ADD_ASSIMP_IMPORTER( PLY
-  PlyLoader.cpp
+  Ply/PlyLoader.cpp
-  PlyLoader.h
+  Ply/PlyLoader.h
-  PlyParser.cpp
+  Ply/PlyParser.cpp
-  PlyParser.h
+  Ply/PlyParser.h
 )
 
 ADD_ASSIMP_EXPORTER( PLY
-  PlyExporter.cpp
+  Ply/PlyExporter.cpp
-  PlyExporter.h
+  Ply/PlyExporter.h
 )
 
 ADD_ASSIMP_IMPORTER( MS3D
-  MS3DLoader.cpp
+  MS3D/MS3DLoader.cpp
-  MS3DLoader.h
+  MS3D/MS3DLoader.h
 )
 
 ADD_ASSIMP_IMPORTER( COB
-  COBLoader.cpp
+  COB/COBLoader.cpp
-  COBLoader.h
+  COB/COBLoader.h
-  COBScene.h
+  COB/COBScene.h
 )
 
 ADD_ASSIMP_IMPORTER( BLEND
-  BlenderLoader.cpp
+  Blender/BlenderLoader.cpp
-  BlenderLoader.h
+  Blender/BlenderLoader.h
-  BlenderDNA.cpp
+  Blender/BlenderDNA.cpp
-  BlenderDNA.h
+  Blender/BlenderDNA.h
-  BlenderDNA.inl
+  Blender/BlenderDNA.inl
-  BlenderScene.cpp
+  Blender/BlenderScene.cpp
-  BlenderScene.h
+  Blender/BlenderScene.h
-  BlenderSceneGen.h
+  Blender/BlenderSceneGen.h
-  BlenderIntermediate.h
+  Blender/BlenderIntermediate.h
-  BlenderModifier.h
+  Blender/BlenderModifier.h
-  BlenderModifier.cpp
+  Blender/BlenderModifier.cpp
-  BlenderBMesh.h
+  Blender/BlenderBMesh.h
-  BlenderBMesh.cpp
+  Blender/BlenderBMesh.cpp
-  BlenderTessellator.h
+  Blender/BlenderTessellator.h
-  BlenderTessellator.cpp
+  Blender/BlenderTessellator.cpp
-  BlenderCustomData.h
+  Blender/BlenderCustomData.h
-  BlenderCustomData.cpp
+  Blender/BlenderCustomData.cpp
 )
 
 ADD_ASSIMP_IMPORTER( IFC
@@ -565,106 +569,105 @@ if (ASSIMP_BUILD_IFC_IMPORTER)
 endif (ASSIMP_BUILD_IFC_IMPORTER)
 
 ADD_ASSIMP_IMPORTER( XGL
-  XGLLoader.cpp
+  XGL/XGLLoader.cpp
-  XGLLoader.h
+  XGL/XGLLoader.h
 )
 
 ADD_ASSIMP_IMPORTER( FBX
-  FBXImporter.cpp
+  FBX/FBXImporter.cpp
-  FBXCompileConfig.h
+  FBX/FBXCompileConfig.h
-  FBXImporter.h
+  FBX/FBXImporter.h
-  FBXParser.cpp
+  FBX/FBXParser.cpp
-  FBXParser.h
+  FBX/FBXParser.h
-  FBXTokenizer.cpp
+  FBX/FBXTokenizer.cpp
-  FBXTokenizer.h
+  FBX/FBXTokenizer.h
-  FBXImportSettings.h
+  FBX/FBXImportSettings.h
-  FBXConverter.h
+  FBX/FBXConverter.h
-  FBXConverter.cpp
+  FBX/FBXConverter.cpp
-  FBXUtil.h
+  FBX/FBXUtil.h
-  FBXUtil.cpp
+  FBX/FBXUtil.cpp
-  FBXDocument.h
+  FBX/FBXDocument.h
-  FBXDocument.cpp
+  FBX/FBXDocument.cpp
-  FBXProperties.h
+  FBX/FBXProperties.h
-  FBXProperties.cpp
+  FBX/FBXProperties.cpp
-  FBXMeshGeometry.h
+  FBX/FBXMeshGeometry.h
-  FBXMeshGeometry.cpp
+  FBX/FBXMeshGeometry.cpp
-  FBXMaterial.cpp
+  FBX/FBXMaterial.cpp
-  FBXModel.cpp
+  FBX/FBXModel.cpp
-  FBXAnimation.cpp
+  FBX/FBXAnimation.cpp
-  FBXNodeAttribute.cpp
+  FBX/FBXNodeAttribute.cpp
-  FBXDeformer.cpp
+  FBX/FBXDeformer.cpp
-  FBXBinaryTokenizer.cpp
+  FBX/FBXBinaryTokenizer.cpp
-  FBXDocumentUtil.cpp
+  FBX/FBXDocumentUtil.cpp
-  FBXCommon.h
+  FBX/FBXCommon.h
 )
 
 ADD_ASSIMP_EXPORTER( FBX
-  FBXExporter.h
+  FBX/FBXExporter.h
-  FBXExporter.cpp
+  FBX/FBXExporter.cpp
-  FBXExportNode.h
+  FBX/FBXExportNode.h
-  FBXExportNode.cpp
+  FBX/FBXExportNode.cpp
-  FBXExportProperty.h
+  FBX/FBXExportProperty.h
-  FBXExportProperty.cpp
+  FBX/FBXExportProperty.cpp
 )
 
 SET( PostProcessing_SRCS
-  CalcTangentsProcess.cpp
+  PostProcessing/CalcTangentsProcess.cpp
-  CalcTangentsProcess.h
+  PostProcessing/CalcTangentsProcess.h
-  ComputeUVMappingProcess.cpp
+  PostProcessing/ComputeUVMappingProcess.cpp
-  ComputeUVMappingProcess.h
+  PostProcessing/ComputeUVMappingProcess.h
-  ConvertToLHProcess.cpp
+  PostProcessing/ConvertToLHProcess.cpp
-  ConvertToLHProcess.h
+  PostProcessing/ConvertToLHProcess.h
-  EmbedTexturesProcess.cpp
+  PostProcessing/EmbedTexturesProcess.cpp
-  EmbedTexturesProcess.h
+  PostProcessing/EmbedTexturesProcess.h
-  FindDegenerates.cpp
+  PostProcessing/FindDegenerates.cpp
-  FindDegenerates.h
+  PostProcessing/FindDegenerates.h
-  FindInstancesProcess.cpp
+  PostProcessing/FindInstancesProcess.cpp
-  FindInstancesProcess.h
+  PostProcessing/FindInstancesProcess.h
-  FindInvalidDataProcess.cpp
+  PostProcessing/FindInvalidDataProcess.cpp
-  FindInvalidDataProcess.h
+  PostProcessing/FindInvalidDataProcess.h
-  FixNormalsStep.cpp
+  PostProcessing/FixNormalsStep.cpp
-  FixNormalsStep.h
+  PostProcessing/FixNormalsStep.h
-  DropFaceNormalsProcess.cpp
+  PostProcessing/DropFaceNormalsProcess.cpp
-  DropFaceNormalsProcess.h
+  PostProcessing/DropFaceNormalsProcess.h
-  GenFaceNormalsProcess.cpp
+  PostProcessing/GenFaceNormalsProcess.cpp
-  GenFaceNormalsProcess.h
+  PostProcessing/GenFaceNormalsProcess.h
-  GenVertexNormalsProcess.cpp
+  PostProcessing/GenVertexNormalsProcess.cpp
-  GenVertexNormalsProcess.h
+  PostProcessing/GenVertexNormalsProcess.h
-  PretransformVertices.cpp
+  PostProcessing/PretransformVertices.cpp
-  PretransformVertices.h
+  PostProcessing/PretransformVertices.h
-  ImproveCacheLocality.cpp
+  PostProcessing/ImproveCacheLocality.cpp
-  ImproveCacheLocality.h
+  PostProcessing/ImproveCacheLocality.h
-  JoinVerticesProcess.cpp
+  PostProcessing/JoinVerticesProcess.cpp
-  JoinVerticesProcess.h
+  PostProcessing/JoinVerticesProcess.h
-  LimitBoneWeightsProcess.cpp
+  PostProcessing/LimitBoneWeightsProcess.cpp
-  LimitBoneWeightsProcess.h
+  PostProcessing/LimitBoneWeightsProcess.h
-  RemoveRedundantMaterials.cpp
+  PostProcessing/RemoveRedundantMaterials.cpp
-  RemoveRedundantMaterials.h
+  PostProcessing/RemoveRedundantMaterials.h
-  RemoveVCProcess.cpp
+  PostProcessing/RemoveVCProcess.cpp
-  RemoveVCProcess.h
+  PostProcessing/RemoveVCProcess.h
-  SortByPTypeProcess.cpp
+  PostProcessing/SortByPTypeProcess.cpp
-  SortByPTypeProcess.h
+  PostProcessing/SortByPTypeProcess.h
-  SplitLargeMeshes.cpp
+  PostProcessing/SplitLargeMeshes.cpp
-  SplitLargeMeshes.h
+  PostProcessing/SplitLargeMeshes.h
-  TextureTransform.cpp
+  PostProcessing/TextureTransform.cpp
-  TextureTransform.h
+  PostProcessing/TextureTransform.h
-  TriangulateProcess.cpp
+  PostProcessing/TriangulateProcess.cpp
-  TriangulateProcess.h
+  PostProcessing/TriangulateProcess.h
-  ValidateDataStructure.cpp
+  PostProcessing/ValidateDataStructure.cpp
-  ValidateDataStructure.h
+  PostProcessing/ValidateDataStructure.h
-  OptimizeGraph.cpp
+  PostProcessing/OptimizeGraph.cpp
-  OptimizeGraph.h
+  PostProcessing/OptimizeGraph.h
-  OptimizeMeshes.cpp
+  PostProcessing/OptimizeMeshes.cpp
-  OptimizeMeshes.h
+  PostProcessing/OptimizeMeshes.h
-  DeboneProcess.cpp
+  PostProcessing/DeboneProcess.cpp
-  DeboneProcess.h
+  PostProcessing/DeboneProcess.h
-  ProcessHelper.h
+  PostProcessing/ProcessHelper.h
-  ProcessHelper.cpp
+  PostProcessing/ProcessHelper.cpp
-  PolyTools.h
+  PostProcessing/MakeVerboseFormat.cpp
-  MakeVerboseFormat.cpp
+  PostProcessing/MakeVerboseFormat.h
-  MakeVerboseFormat.h
+  PostProcessing/ScaleProcess.cpp
-  ScaleProcess.cpp
+  PostProcessing/ScaleProcess.h
-  ScaleProcess.h
 )
 SOURCE_GROUP( PostProcessing FILES ${PostProcessing_SRCS})
 
@@ -672,136 +675,136 @@ SET( IrrXML_SRCS ${HEADER_PATH}/irrXMLWrapper.h )
 SOURCE_GROUP( IrrXML FILES ${IrrXML_SRCS})
 
 ADD_ASSIMP_IMPORTER( Q3D
-  Q3DLoader.cpp
+  Q3D/Q3DLoader.cpp
-  Q3DLoader.h
+  Q3D/Q3DLoader.h
 )
 
 ADD_ASSIMP_IMPORTER( Q3BSP
-  Q3BSPFileData.h
+  Q3BSP/Q3BSPFileData.h
-  Q3BSPFileParser.h
+  Q3BSP/Q3BSPFileParser.h
-  Q3BSPFileParser.cpp
+  Q3BSP/Q3BSPFileParser.cpp
-  Q3BSPFileImporter.h
+  Q3BSP/Q3BSPFileImporter.h
-  Q3BSPFileImporter.cpp
+  Q3BSP/Q3BSPFileImporter.cpp
-  Q3BSPZipArchive.h
+  Q3BSP/Q3BSPZipArchive.h
-  Q3BSPZipArchive.cpp
+  Q3BSP/Q3BSPZipArchive.cpp
 )
 
 ADD_ASSIMP_IMPORTER( RAW
-  RawLoader.cpp
+  Raw/RawLoader.cpp
-  RawLoader.h
+  Raw/RawLoader.h
 )
 
 ADD_ASSIMP_IMPORTER( SIB
-  SIBImporter.cpp
+  SIB/SIBImporter.cpp
-  SIBImporter.h
+  SIB/SIBImporter.h
 )
 
 ADD_ASSIMP_IMPORTER( SMD
-  SMDLoader.cpp
+  SMD/SMDLoader.cpp
-  SMDLoader.h
+  SMD/SMDLoader.h
 )
 
 ADD_ASSIMP_IMPORTER( STL
-  STLLoader.cpp
+  STL/STLLoader.cpp
-  STLLoader.h
+  STL/STLLoader.h
 )
 
 ADD_ASSIMP_EXPORTER( STL
-  STLExporter.h
+  STL/STLExporter.h
-  STLExporter.cpp
+  STL/STLExporter.cpp
 )
 
 ADD_ASSIMP_IMPORTER( TERRAGEN
-  TerragenLoader.cpp
+  Terragen/TerragenLoader.cpp
-  TerragenLoader.h
+  Terragen/TerragenLoader.h
 )
 
 ADD_ASSIMP_IMPORTER( 3D
-  UnrealLoader.cpp
+  Unreal/UnrealLoader.cpp
-  UnrealLoader.h
+  Unreal/UnrealLoader.h
 )
 
 ADD_ASSIMP_IMPORTER( X
-  XFileHelper.h
+  X/XFileHelper.h
-  XFileImporter.cpp
+  X/XFileImporter.cpp
-  XFileImporter.h
+  X/XFileImporter.h
-  XFileParser.cpp
+  X/XFileParser.cpp
-  XFileParser.h
+  X/XFileParser.h
 )
 
 ADD_ASSIMP_EXPORTER( X
-  XFileExporter.h
+  X/XFileExporter.h
-  XFileExporter.cpp
+  X/XFileExporter.cpp
 )
 
 ADD_ASSIMP_IMPORTER( X3D
-  X3DImporter.cpp
+  X3D/X3DImporter.cpp
-  X3DImporter.hpp
+  X3D/X3DImporter.hpp
-  X3DImporter_Geometry2D.cpp
+  X3D/X3DImporter_Geometry2D.cpp
-  X3DImporter_Geometry3D.cpp
+  X3D/X3DImporter_Geometry3D.cpp
-  X3DImporter_Group.cpp
+  X3D/X3DImporter_Group.cpp
-  X3DImporter_Light.cpp
+  X3D/X3DImporter_Light.cpp
-  X3DImporter_Macro.hpp
+  X3D/X3DImporter_Macro.hpp
-  X3DImporter_Metadata.cpp
+  X3D/X3DImporter_Metadata.cpp
-  X3DImporter_Networking.cpp
+  X3D/X3DImporter_Networking.cpp
-  X3DImporter_Node.hpp
+  X3D/X3DImporter_Node.hpp
-  X3DImporter_Postprocess.cpp
+  X3D/X3DImporter_Postprocess.cpp
-  X3DImporter_Rendering.cpp
+  X3D/X3DImporter_Rendering.cpp
-  X3DImporter_Shape.cpp
+  X3D/X3DImporter_Shape.cpp
-  X3DImporter_Texturing.cpp
+  X3D/X3DImporter_Texturing.cpp
-  FIReader.hpp
+  X3D/FIReader.hpp
-  FIReader.cpp
+  X3D/FIReader.cpp
-  X3DVocabulary.cpp
+  X3D/X3DVocabulary.cpp
 )
 
 ADD_ASSIMP_EXPORTER( X3D
-  X3DExporter.cpp
+  X3D/X3DExporter.cpp
-  X3DExporter.hpp
+  X3D/X3DExporter.hpp
 )
 
 ADD_ASSIMP_IMPORTER( GLTF
-  glTFAsset.h
+  glTF/glTFAsset.h
-  glTFAsset.inl
+  glTF/glTFAsset.inl
-  glTFAssetWriter.h
+  glTF/glTFAssetWriter.h
-  glTFAssetWriter.inl
+  glTF/glTFAssetWriter.inl
-  glTFImporter.cpp
+  glTF/glTFImporter.cpp
-  glTFImporter.h
+  glTF/glTFImporter.h
-  glTF2Asset.h
+  glTF2/glTF2Asset.h
-  glTF2Asset.inl
+  glTF2/glTF2Asset.inl
-  glTF2AssetWriter.h
+  glTF2/glTF2AssetWriter.h
-  glTF2AssetWriter.inl
+  glTF2/glTF2AssetWriter.inl
-  glTF2Importer.cpp
+  glTF2/glTF2Importer.cpp
-  glTF2Importer.h
+  glTF2/glTF2Importer.h
 )
 
 ADD_ASSIMP_EXPORTER( GLTF
-  glTFExporter.h
+  glTF/glTFExporter.h
-  glTFExporter.cpp
+  glTF/glTFExporter.cpp
-  glTF2Exporter.h
+  glTF2/glTF2Exporter.h
-  glTF2Exporter.cpp
+  glTF2/glTF2Exporter.cpp
 )
 
 ADD_ASSIMP_IMPORTER( 3MF
-	D3MFImporter.h
+  3MF/D3MFImporter.h
-    D3MFImporter.cpp
+  3MF/D3MFImporter.cpp
-	D3MFOpcPackage.h
+  3MF/D3MFOpcPackage.h
-    D3MFOpcPackage.cpp
+  3MF/D3MFOpcPackage.cpp
-    3MFXmlTags.h
+  3MF/3MFXmlTags.h
 )
 
 ADD_ASSIMP_EXPORTER( 3MF
-    D3MFExporter.h
+  3MF/D3MFExporter.h
-    D3MFExporter.cpp
+  3MF/D3MFExporter.cpp
 )
 
 ADD_ASSIMP_IMPORTER( MMD
-  MMDCpp14.h
+  MMD/MMDCpp14.h
-  MMDImporter.cpp
+  MMD/MMDImporter.cpp
-  MMDImporter.h
+  MMD/MMDImporter.h
-  MMDPmdParser.h
+  MMD/MMDPmdParser.h
-  MMDPmxParser.h
+  MMD/MMDPmxParser.h
-  MMDPmxParser.cpp
+  MMD/MMDPmxParser.cpp
-  MMDVmdParser.h
+  MMD/MMDVmdParser.h
 )
 
 # Workaround for issue #2406 - force problematic large file to be optimized to prevent string table overflow error
@@ -817,7 +820,7 @@ if ((CMAKE_COMPILER_IS_MINGW) AND (CMAKE_BUILD_TYPE MATCHES Debug))
 endif()
 
 ADD_ASSIMP_IMPORTER( STEP
-    STEPFile.h
+    Step/STEPFile.h
     Importer/StepFile/StepFileImporter.h
     Importer/StepFile/StepFileImporter.cpp
     Importer/StepFile/StepFileGen1.cpp
@@ -827,14 +830,14 @@ ADD_ASSIMP_IMPORTER( STEP
 )
 
 ADD_ASSIMP_EXPORTER( STEP
-    StepExporter.h
+    Step/StepExporter.h
-    StepExporter.cpp
+    Step/StepExporter.cpp
 )
 
 if ((NOT ASSIMP_NO_EXPORT) OR (NOT ASSIMP_EXPORTERS_ENABLED STREQUAL ""))
 	SET( Exporter_SRCS
-	  Exporter.cpp
+	  Common/Exporter.cpp
-	  AssimpCExport.cpp
+	  CApi/AssimpCExport.cpp
 	  ${HEADER_PATH}/BlobIOSystem.h
 	)
 	SOURCE_GROUP( Exporter FILES ${Exporter_SRCS})
@@ -987,6 +990,7 @@ MESSAGE(STATUS "Disabled exporter formats:${ASSIMP_EXPORTERS_DISABLED}")
 SET( assimp_src
   # Assimp Files
   ${Core_SRCS}
+  ${CApi_SRCS}
   ${Common_SRCS}
   ${Logging_SRCS}
   ${Exporter_SRCS}

code/COB/COBLoader.cpp

@@ -45,20 +45,22 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 #ifndef ASSIMP_BUILD_NO_COB_IMPORTER
-#include "COBLoader.h"
+#include "COB/COBLoader.h"
-#include "COBScene.h"
+#include "COB/COBScene.h"
-#include "ConvertToLHProcess.h"
+#include "PostProcessing/ConvertToLHProcess.h"
+
 #include <assimp/StreamReader.h>
 #include <assimp/ParsingUtils.h>
 #include <assimp/fast_atof.h>
 #include <assimp/LineSplitter.h>
 #include <assimp/TinyFormatter.h>
-#include <memory>
 #include <assimp/IOSystem.hpp>
 #include <assimp/DefaultLogger.hpp>
 #include <assimp/scene.h>
 #include <assimp/importerdesc.h>
 
+#include <memory>
+
 using namespace Assimp;
 using namespace Assimp::COB;
 using namespace Assimp::Formatter;

code/Common/Assimp.cpp

@@ -54,7 +54,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/Exceptional.h>
 #include <assimp/BaseImporter.h>
 
-#include "CInterfaceIOWrapper.h"
+#include "CApi/CInterfaceIOWrapper.h"
 #include "Importer.h"
 #include "ScenePrivate.h"
 

code/Common/Exporter.cpp

@@ -61,15 +61,16 @@ Here we implement only the C++ interface (Assimp::Exporter).
 #include <assimp/mesh.h>
 #include <assimp/postprocess.h>
 #include <assimp/scene.h>
-
-#include "DefaultProgressHandler.h"
-#include "BaseProcess.h"
-#include "JoinVerticesProcess.h"
-#include "MakeVerboseFormat.h"
-#include "ConvertToLHProcess.h"
-#include "PretransformVertices.h"
 #include <assimp/Exceptional.h>
-#include "ScenePrivate.h"
+
+#include "Common/DefaultProgressHandler.h"
+#include "Common/BaseProcess.h"
+#include "Common/ScenePrivate.h"
+#include "PostProcessing/CalcTangentsProcess.h"
+#include "PostProcessing/MakeVerboseFormat.h"
+#include "PostProcessing/JoinVerticesProcess.h"
+#include "PostProcessing/ConvertToLHProcess.h"
+#include "PostProcessing/PretransformVertices.h"
 
 #include <memory>
 

code/Common/Importer.cpp

@@ -64,15 +64,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 // ------------------------------------------------------------------------------------------------
 // Internal headers
 // ------------------------------------------------------------------------------------------------
-#include "Importer.h"
+#include "Common/Importer.h"
-#include <assimp/BaseImporter.h>
+#include "Common/BaseProcess.h"
-#include "BaseProcess.h"
+#include "Common/DefaultProgressHandler.h"
+#include "PostProcessing/ProcessHelper.h"
+#include "Common/ScenePreprocessor.h"
+#include "Common/ScenePrivate.h"
 
-#include "DefaultProgressHandler.h"
+#include <assimp/BaseImporter.h>
 #include <assimp/GenericProperty.h>
-#include "ProcessHelper.h"
-#include "ScenePreprocessor.h"
-#include "ScenePrivate.h"
 #include <assimp/MemoryIOWrapper.h>
 #include <assimp/Profiler.h>
 #include <assimp/TinyFormatter.h>
@@ -86,7 +86,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/DefaultIOSystem.h>
 
 #ifndef ASSIMP_BUILD_NO_VALIDATEDS_PROCESS
-#   include "ValidateDataStructure.h"
+#   include "PostProcessing/ValidateDataStructure.h"
 #endif
 
 using namespace Assimp::Profiling;

code/Common/ImporterRegistry.cpp

@@ -56,146 +56,146 @@ corresponding preprocessor flag to selectively disable formats.
 // (include_new_importers_here)
 // ------------------------------------------------------------------------------------------------
 #ifndef ASSIMP_BUILD_NO_X_IMPORTER
-#   include "XFileImporter.h"
+#   include "X/XFileImporter.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_AMF_IMPORTER
-#   include "AMFImporter.hpp"
+#   include "AMF/AMFImporter.hpp"
 #endif
 #ifndef ASSIMP_BUILD_NO_3DS_IMPORTER
-#   include "3DSLoader.h"
+#   include "3DS/3DSLoader.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_MD3_IMPORTER
-#   include "MD3Loader.h"
+#   include "MD3/MD3Loader.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_MDL_IMPORTER
-#   include "MDLLoader.h"
+#   include "MDL/MDLLoader.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_MD2_IMPORTER
-#   include "MD2Loader.h"
+#   include "MD2/MD2Loader.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_PLY_IMPORTER
-#   include "PlyLoader.h"
+#   include "Ply/PlyLoader.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_ASE_IMPORTER
-#   include "ASELoader.h"
+#   include "ASE/ASELoader.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_OBJ_IMPORTER
-#   include "ObjFileImporter.h"
+#   include "Obj/ObjFileImporter.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_HMP_IMPORTER
-#   include "HMPLoader.h"
+#   include "HMP/HMPLoader.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_SMD_IMPORTER
-#   include "SMDLoader.h"
+#   include "SMD/SMDLoader.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_MDC_IMPORTER
-#   include "MDCLoader.h"
+#   include "MDC/MDCLoader.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_MD5_IMPORTER
-#   include "MD5Loader.h"
+#   include "MD5/MD5Loader.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_STL_IMPORTER
-#   include "STLLoader.h"
+#   include "STL/STLLoader.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_LWO_IMPORTER
-#   include "LWOLoader.h"
+#   include "LWO/LWOLoader.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_DXF_IMPORTER
-#   include "DXFLoader.h"
+#   include "DXF/DXFLoader.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_NFF_IMPORTER
-#   include "NFFLoader.h"
+#   include "NFF/NFFLoader.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_RAW_IMPORTER
-#   include "RawLoader.h"
+#   include "Raw/RawLoader.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_SIB_IMPORTER
-#   include "SIBImporter.h"
+#   include "SIB/SIBImporter.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_OFF_IMPORTER
-#   include "OFFLoader.h"
+#   include "OFF/OFFLoader.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_AC_IMPORTER
-#   include "ACLoader.h"
+#   include "AC/ACLoader.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_BVH_IMPORTER
-#   include "BVHLoader.h"
+#   include "BVH/BVHLoader.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_IRRMESH_IMPORTER
-#   include "IRRMeshLoader.h"
+#   include "Irr/IRRMeshLoader.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_IRR_IMPORTER
-#   include "IRRLoader.h"
+#   include "Irr/IRRLoader.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_Q3D_IMPORTER
-#   include "Q3DLoader.h"
+#   include "Q3D/Q3DLoader.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_B3D_IMPORTER
-#   include "B3DImporter.h"
+#   include "B3D/B3DImporter.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_COLLADA_IMPORTER
-#   include "ColladaLoader.h"
+#   include "Collada/ColladaLoader.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_TERRAGEN_IMPORTER
-#   include "TerragenLoader.h"
+#   include "Terragen/TerragenLoader.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_CSM_IMPORTER
-#   include "CSMLoader.h"
+#   include "CSM/CSMLoader.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_3D_IMPORTER
-#   include "UnrealLoader.h"
+#   include "Unreal/UnrealLoader.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_LWS_IMPORTER
-#   include "LWSLoader.h"
+#   include "LWS/LWSLoader.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_OGRE_IMPORTER
-#   include "OgreImporter.h"
+#   include "Ogre/OgreImporter.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_OPENGEX_IMPORTER
-#   include "OpenGEXImporter.h"
+#   include "OpenGEX/OpenGEXImporter.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_MS3D_IMPORTER
-#   include "MS3DLoader.h"
+#   include "MS3D/MS3DLoader.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_COB_IMPORTER
-#   include "COBLoader.h"
+#   include "COB/COBLoader.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_BLEND_IMPORTER
-#   include "BlenderLoader.h"
+#   include "Blender/BlenderLoader.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_Q3BSP_IMPORTER
-#   include "Q3BSPFileImporter.h"
+#   include "Q3BSP/Q3BSPFileImporter.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_NDO_IMPORTER
-#   include "NDOLoader.h"
+#   include "NDO/NDOLoader.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_IFC_IMPORTER
 #   include "Importer/IFC/IFCLoader.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_XGL_IMPORTER
-#   include "XGLLoader.h"
+#   include "XGL/XGLLoader.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_FBX_IMPORTER
-#   include "FBXImporter.h"
+#   include "FBX/FBXImporter.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_ASSBIN_IMPORTER
-#   include "AssbinLoader.h"
+#   include "Assbin/AssbinLoader.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_GLTF_IMPORTER
-#   include "glTFImporter.h"
+#   include "glTF/glTFImporter.h"
-#   include "glTF2Importer.h"
+#   include "glTF2/glTF2Importer.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_C4D_IMPORTER
-#   include "C4DImporter.h"
+#   include "C4D/C4DImporter.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_3MF_IMPORTER
-#   include "D3MFImporter.h"
+#   include "3MF/D3MFImporter.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_X3D_IMPORTER
-#   include "X3DImporter.hpp"
+#   include "X3D/X3DImporter.hpp"
 #endif
 #ifndef ASSIMP_BUILD_NO_MMD_IMPORTER
-#   include "MMDImporter.h"
+#   include "MMD/MMDImporter.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_STEP_IMPORTER
 #   include "Importer/StepFile/StepFileImporter.h"

code/Common/PostStepRegistry.cpp

@@ -48,88 +48,88 @@ directly (unless you are adding new steps), instead use the
 corresponding preprocessor flag to selectively disable steps.
 */
 
-#include "ProcessHelper.h"
+#include "PostProcessing/ProcessHelper.h"
 
 #ifndef ASSIMP_BUILD_NO_CALCTANGENTS_PROCESS
-#   include "CalcTangentsProcess.h"
+#   include "PostProcessing/CalcTangentsProcess.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_JOINVERTICES_PROCESS
-#   include "JoinVerticesProcess.h"
+#   include "PostProcessing/JoinVerticesProcess.h"
 #endif
 #if !(defined ASSIMP_BUILD_NO_MAKELEFTHANDED_PROCESS && defined ASSIMP_BUILD_NO_FLIPUVS_PROCESS && defined ASSIMP_BUILD_NO_FLIPWINDINGORDER_PROCESS)
-#   include "ConvertToLHProcess.h"
+#   include "PostProcessing/ConvertToLHProcess.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_TRIANGULATE_PROCESS
-#   include "TriangulateProcess.h"
+#   include "PostProcessing/TriangulateProcess.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_DROPFACENORMALS_PROCESS
-#   include "DropFaceNormalsProcess.h"
+#   include "PostProcessing/DropFaceNormalsProcess.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_GENFACENORMALS_PROCESS
-#   include "GenFaceNormalsProcess.h"
+#   include "PostProcessing/GenFaceNormalsProcess.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_GENVERTEXNORMALS_PROCESS
-#   include "GenVertexNormalsProcess.h"
+#   include "PostProcessing/GenVertexNormalsProcess.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_REMOVEVC_PROCESS
-#   include "RemoveVCProcess.h"
+#   include "PostProcessing/RemoveVCProcess.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_SPLITLARGEMESHES_PROCESS
-#   include "SplitLargeMeshes.h"
+#   include "PostProcessing/SplitLargeMeshes.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_PRETRANSFORMVERTICES_PROCESS
-#   include "PretransformVertices.h"
+#   include "PostProcessing/PretransformVertices.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_LIMITBONEWEIGHTS_PROCESS
-#   include "LimitBoneWeightsProcess.h"
+#   include "PostProcessing/LimitBoneWeightsProcess.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_VALIDATEDS_PROCESS
-#   include "ValidateDataStructure.h"
+#   include "PostProcessing/ValidateDataStructure.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_IMPROVECACHELOCALITY_PROCESS
-#   include "ImproveCacheLocality.h"
+#   include "PostProcessing/ImproveCacheLocality.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_FIXINFACINGNORMALS_PROCESS
-#   include "FixNormalsStep.h"
+#   include "PostProcessing/FixNormalsStep.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_REMOVE_REDUNDANTMATERIALS_PROCESS
-#   include "RemoveRedundantMaterials.h"
+#   include "PostProcessing/RemoveRedundantMaterials.h"
 #endif
 #if (!defined ASSIMP_BUILD_NO_EMBEDTEXTURES_PROCESS)
-#   include "EmbedTexturesProcess.h"
+#   include "PostProcessing/EmbedTexturesProcess.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_FINDINVALIDDATA_PROCESS
-#   include "FindInvalidDataProcess.h"
+#   include "PostProcessing/FindInvalidDataProcess.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_FINDDEGENERATES_PROCESS
-#   include "FindDegenerates.h"
+#   include "PostProcessing/FindDegenerates.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_SORTBYPTYPE_PROCESS
-#   include "SortByPTypeProcess.h"
+#   include "PostProcessing/SortByPTypeProcess.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_GENUVCOORDS_PROCESS
-#   include "ComputeUVMappingProcess.h"
+#   include "PostProcessing/ComputeUVMappingProcess.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_TRANSFORMTEXCOORDS_PROCESS
-#   include "TextureTransform.h"
+#   include "PostProcessing/TextureTransform.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_FINDINSTANCES_PROCESS
-#   include "FindInstancesProcess.h"
+#   include "PostProcessing/FindInstancesProcess.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_OPTIMIZEMESHES_PROCESS
-#   include "OptimizeMeshes.h"
+#   include "PostProcessing/OptimizeMeshes.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_OPTIMIZEGRAPH_PROCESS
-#   include "OptimizeGraph.h"
+#   include "PostProcessing/OptimizeGraph.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_SPLITBYBONECOUNT_PROCESS
-#   include "SplitByBoneCountProcess.h"
+#   include "Common/SplitByBoneCountProcess.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_DEBONE_PROCESS
-#   include "DeboneProcess.h"
+#   include "PostProcessing/DeboneProcess.h"
 #endif
 #if (!defined ASSIMP_BUILD_NO_GLOBALSCALE_PROCESS)
-#   include "ScaleProcess.h"
+#   include "PostProcessing/ScaleProcess.h"
 #endif
 
 namespace Assimp {