Add allocator impl

Adapt interface:wq
Add allocator prototypes
2026-03-02 16:42:45 +01:00 · 2025-12-18 11:12:14 +01:00 · 2025-12-15 23:48:34 +01:00 · 2025-12-05 19:57:44 +01:00 · 2025-12-04 14:24:42 +01:00 · 2025-12-01 14:17:45 +01:00
173 changed files with 1881 additions and 2839 deletions
@@ -48,7 +48,7 @@ jobs:
    - name: ccache
      uses: hendrikmuhs/ccache-action@v1.2
      
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
      with:
          submodules: true
          
@@ -109,7 +109,7 @@ jobs:
      run: cd build/bin && ./unit ${{ steps.hunter_extra_test_args.outputs.args }}
      shell: bash

-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v5
      if: matrix.name == 'windows-msvc'
      with:
        name: 'assimp-bins-${{ matrix.name }}'
@@ -141,7 +141,7 @@ jobs:
          prerelease: true
      - run: |
          echo '${{steps.create-release.outputs.upload_url}}' > release_upload_url.txt
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
        with:
          name: create-release
          path: release_upload_url.txt
@@ -188,7 +188,7 @@ jobs:
      - id: upload-url
        run: |
          echo "url=$(cat create-release/release_upload_url.txt)" >> $GITHUB_OUTPUT
-      - uses: actions/download-artifact@v5
+      - uses: actions/download-artifact@v6
        with:
          name: 'assimp-bins-${{ matrix.name }}-${{ github.sha }}'
      - uses: actions/upload-release-asset@v1
@@ -27,7 +27,7 @@ jobs:
            os: ubuntu-latest

    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6

      - uses: lukka/get-cmake@latest

@@ -19,7 +19,7 @@ jobs:
        dry-run: false
        language: c++
    - name: Upload Crash
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
      if: failure() && steps.build.outcome == 'success'
      with:
        name: artifacts
@@ -14,7 +14,7 @@ jobs:
    name: adress-sanitizer
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
    - uses: lukka/get-cmake@latest    
    - uses: lukka/set-shell-env@v1
      with:
@@ -38,7 +38,7 @@ jobs:
    name: undefined-behavior-sanitizer
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
    - uses: lukka/get-cmake@latest    
    - uses: lukka/set-shell-env@v1
      with:
@@ -62,7 +62,7 @@ jobs:
    name: printf-sanitizer
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
    
    - name: run scan_printf script
      run: ./scripts/scan_printf.sh
@@ -30,7 +30,7 @@ cmake --build .
 Note that by default this builds a shared library into the `bin` directory. If you want to build it as a static library see the build options at the bottom of this file.

 ### Build instructions for Windows with Visual-Studio
-First, you have to install Visual-Studio on your windows-system. You can get the Community-Version for free here: https://visualstudio.microsoft.com/de/downloads/
+First, you have to install Visual-Studio on your windows-system. You can get the Community-Version for free [here](https://visualstudio.microsoft.com/downloads/)
 To generate the build environment for your IDE open a command prompt, navigate to your repo and type:
 ```bash
 cmake CMakeLists.txt
@@ -1,17 +1,34 @@
 {
-    "version": 3,
-    "cmakeMinimumRequired": {
-        "major": 3,
-        "minor": 20,
-        "patch": 0
+  "version": 3,
+  "cmakeMinimumRequired": {
+    "major": 3,
+    "minor": 20,
+    "patch": 0
+  },
+  "configurePresets": [
+    {
+      "name": "assimp",
+      "binaryDir": "${sourceDir}",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release",
+        "ASSIMP_BUILD_ASSIMP_TOOLS": "OFF"
+      }
    },
-    "configurePresets": [
-        {
-            "name": "assimp_with_tools",
-            "binaryDir": "${sourceDir}",
-            "cacheVariables": {
-                "ASSIMP_BUILD_ASSIMP_TOOLS" : "ON"
-            }
-        }
-    ]
+    {
+      "name": "assimp_double_precision",
+      "binaryDir": "${sourceDir}",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release",
+        "ASSIMP_BUILD_ASSIMP_TOOLS": "OFF",
+        "ASSIMP_DOUBLE_PRECISION": "ON"
+      }
+    },
+    {
+      "name": "assimp_with_tools",
+      "binaryDir": "${sourceDir}",
+      "cacheVariables": {
+        "ASSIMP_BUILD_ASSIMP_TOOLS": "ON"
+      }
+    }
+  ]
 }
@@ -3,7 +3,7 @@ Open Asset Import Library (assimp)

 Open Asset Import Library is a library that loads various 3D file formats into a shared, in-memory format. It supports more than __40 file formats__ for import and a growing selection of file formats for export.

-### Current project status ###
+### Current project status
 ![C/C++ CI](https://github.com/assimp/assimp/workflows/C/C++%20CI/badge.svg)
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/9973693b7bdd4543b07084d5d9cf4745)](https://www.codacy.com/gh/assimp/assimp/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=assimp/assimp&amp;utm_campaign=Badge_Grade)
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=assimp_assimp&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=assimp_assimp)
@@ -16,32 +16,32 @@ Open Asset Import Library is a library that loads various 3D file formats into a
 APIs are provided for C and C++. Various bindings exist to other languages (C#, Java, Python, Delphi, D). Assimp also runs on Android and iOS.
 Additionally, assimp features various __mesh post-processing tools__: normals and tangent space generation, triangulation, vertex cache locality optimization, removal of degenerate primitives and duplicate vertices, sorting by primitive type, merging of redundant materials and many more.

-## Project activity ##
+## Project activity
 ![Alt](https://repobeats.axiom.co/api/embed/997f84e5f9fcf772da1e687f3a4f3a8afdbf4cf0.svg "Repobeats analytics image")

-### Documentation ###
+### Documentation
 Read [our latest documentation](https://the-asset-importer-lib-documentation.readthedocs.io/en/latest/).

-### Pre-built binaries ###
+### Pre-built binaries
 Download binaries from [our Itch Projectspace](https://kimkulling.itch.io/the-asset-importer-lib).

-### Test data ###
+### Test data
 Clone [our model database for testing purposes](https://github.com/assimp/assimp-mdb).

-### Communities ###
+### Communities
 - Ask questions at [the Assimp Discussion Board](https://github.com/assimp/assimp/discussions).
 - Find us on [discord](https://discord.gg/kKazXMXDy2)
 - Ask [the Assimp community on Reddit](https://www.reddit.com/r/Assimp/).
 - Ask on [StackOverflow with the assimp-tag](http://stackoverflow.com/questions/tagged/assimp?sort=newest).
 - Nothing has worked? File a question or an issue report at [The Assimp-Issue Tracker](https://github.com/assimp/assimp/issues)

-#### Supported file formats ####
+#### Supported file formats
 See [the complete list of supported formats](https://github.com/assimp/assimp/blob/master/doc/Fileformats.md).

-### Building ###
+### Building
 Start by reading [our build instructions](https://github.com/assimp/assimp/blob/master/Build.md). We are available in vcpkg, and our build system is CMake; if you used CMake before there is a good chance you know what to do.

-### Ports ###
+### Ports
 * [Android](port/AndroidJNI/README.md)
 * [Python](port/PyAssimp/README.md)
 * [.NET](https://github.com/Saalvage/AssimpNetter)
@@ -54,35 +54,39 @@ Start by reading [our build instructions](https://github.com/assimp/assimp/blob/
 * [HAXE-Port](https://github.com/longde123/assimp-haxe) The Assimp-HAXE-port.
 * [Rust](https://github.com/jkvargas/russimp)

-### Other tools ###
+### Other tools
 [Qt5-ModelViewer](https://github.com/sharjith/ModelViewer-Qt5) is a powerful viewer based on Qt5 and Assimp's import and export abilities.<br>
 [Assimp-Viewer](https://github.com/assimp/assimp_view) is an experimental implementation for an Asset-Viewer based on ImGUI and Assimp (experimental).

 #### Repository structure ####
 Open Asset Import Library is implemented in C++. The directory structure looks like this:

-	/code		Source code
-	/contrib	Third-party libraries
-	/doc		Documentation (Doxygen source and pre-compiled docs)
-	/fuzz           Contains the test code for the Google Fuzzer project
-	/include	Public header C and C++ header files
-	/scripts 	Scripts are used to generate the loading code for some formats
-	/port		Ports to other languages and scripts to maintain those.
-	/test		Unit- and regression tests, test suite of models
-	/tools		Tools (old assimp viewer, command line `assimp`)
-	/samples	A small number of samples to illustrate possible use cases for Assimp
+```txt
+code				Source code
+├── AssetLib/		The asset-importer and exporter lib
+├── CApi/			C-API files
+├── Common/			Common code used from all modules
+├── Geometry/		Geometry utilities
+├── Material/		Common materials
+├── Pbrt/			Physical based materials
+├── PostProcessing/	Post-processing steps
+├── res				Resouce files
+contrib				Third-party libraries
+doc					Documentation (Doxygen source and pre-compiled docs)
+fuzz       			Contains the test code for the Google Fuzzer project
+include				Public header C and C++ header files
+scripts 			Scripts are used to generate the loading code for some formats
+port				Ports to other languages and scripts to maintain those.
+test				Unit- and regression tests, test suite of models
+├── headercheck		Implements headerchecks
+├── models-nonbsd	Non-BSP licensed headers
+├── models			BSP-licensed models
+├── unit			Unit tests
+tools				Tools (old assimp viewer, command line `assimp`)
+samples				Small number of samples to illustrate possible use cases for Assimp
+```
+### Contributing

-The source code is organized in the following way:
-
-	code/Common			The base implementation for importers and the infrastructure
-	code/CApi                       Special implementations which are only used for the C-API
-	code/Geometry                   A collection of geometry tools
-	code/Material                   The material system
-	code/PBR                        An exporter for physical-based models
-	code/PostProcessing		The post-processing steps
-	code/AssetLib/<FormatName>	Implementation for import and export of the format
-
-### Contributing ###
 We would greatly appreciate for you to contribute to assimp. The easiest way to get involved is to submit
 a pull request with your changes against the main repository's `master` branch.

@@ -11,5 +11,5 @@ The current version of Assimp that's being supported with security updates:
 ## Reporting a Vulnerability

 If you have found any security vulnerability you can contact us via
-kim.kulling@googlemail.com
+kim.kulling@assimp.org

@@ -56,23 +56,27 @@ namespace Assimp {

 static constexpr unsigned int NotSet = 0xcdcdcdcd;

+using namespace D3DS;
+
 // ------------------------------------------------------------------------------------------------
-// Setup final material indices, generae a default material if necessary
+// Setup final material indices, generate a default material if necessary
 void Discreet3DSImporter::ReplaceDefaultMaterial() {
    // Try to find an existing material that matches the
    // typical default material setting:
    // - no textures
    // - diffuse color (in grey!)
-    // NOTE: This is here to workaround the fact that some
+    // NOTE: This is here to work-around the fact that some
    // exporters are writing a default material, too.
    unsigned int idx(NotSet);
    for (unsigned int i = 0; i < mScene->mMaterials.size(); ++i) {
-        std::string s = mScene->mMaterials[i].mName;
+        auto s = mScene->mMaterials[i].mName;
        for (char &it : s) {
            it = static_cast<char>(::tolower(static_cast<unsigned char>(it)));
        }

-        if (std::string::npos == s.find("default")) continue;
+        if (std::string::npos == s.find("default")) {
+            continue;
+        }

        if (mScene->mMaterials[i].mDiffuse.r !=
                        mScene->mMaterials[i].mDiffuse.g ||
@@ -85,22 +89,22 @@ void Discreet3DSImporter::ReplaceDefaultMaterial() {
        idx = i;
    }
    if (NotSet == idx) {
-        idx = (unsigned int)mScene->mMaterials.size();
+        idx = static_cast<unsigned int>(mScene->mMaterials.size());
    }

    // now iterate through all meshes and through all faces and
    // find all faces that are using the default material
    unsigned int cnt = 0;
    for (auto i = mScene->mMeshes.begin(); i != mScene->mMeshes.end(); ++i) {
-        for (auto a = (*i).mFaceMaterials.begin(); a != (*i).mFaceMaterials.end(); ++a) {
+        for (auto a = i->mFaceMaterials.begin(); a != i->mFaceMaterials.end(); ++a) {
            // NOTE: The additional check seems to be necessary,
            // some exporters seem to generate invalid data here

-            if (NotSet == (*a)) {
-                (*a) = idx;
+            if (NotSet == *a) {
+                *a = idx;
                ++cnt;
            } else if ((*a) >= mScene->mMaterials.size()) {
-                (*a) = idx;
+                *a = idx;
                ASSIMP_LOG_WARN("Material index overflow in 3DS file. Using default material");
                ++cnt;
            }
@@ -174,7 +178,7 @@ void CopyTexture(aiMaterial &mat, Texture &texture, aiTextureType type) {
        mat.AddProperty<ai_real>(&texture.mTextureBlend, 1, AI_MATKEY_TEXBLEND(type, 0));

    // Setup the texture mapping mode
-    int mapMode = static_cast<int>(texture.mMapMode);
+    auto mapMode = static_cast<int>(texture.mMapMode);
    mat.AddProperty<int>(&mapMode, 1, AI_MATKEY_MAPPINGMODE_U(type, 0));
    mat.AddProperty<int>(&mapMode, 1, AI_MATKEY_MAPPINGMODE_V(type, 0));

@@ -319,17 +323,18 @@ void Discreet3DSImporter::ConvertMaterial(Material &oldMat, aiMaterial &mat) {
 // ------------------------------------------------------------------------------------------------
 // Split meshes by their materials and generate output aiMesh'es
 void Discreet3DSImporter::ConvertMeshes(aiScene *pcOut) {
-    MeshArray avOutMeshes;
+    std::vector<aiMesh *> avOutMeshes;
    avOutMeshes.reserve(mScene->mMeshes.size() * 2);

    unsigned int iFaceCnt = 0, num = 0;
    aiString name;

    // we need to split all meshes by their materials
-    for (std::vector<D3DS::Mesh>::iterator i = mScene->mMeshes.begin(); i != mScene->mMeshes.end(); ++i) {
+    for (auto i = mScene->mMeshes.begin(); i != mScene->mMeshes.end(); ++i) {
        std::unique_ptr<std::vector<unsigned int>[]> aiSplit(new std::vector<unsigned int>[mScene->mMaterials.size()]);

-        name.length = ASSIMP_itoa10(name.data, num++);
+        name.length = ASSIMP_itoa10(name.data, num);
+        ++num;

        unsigned int iNum = 0;
        for (std::vector<unsigned int>::const_iterator a = (*i).mFaceMaterials.begin();
@@ -341,7 +346,7 @@ void Discreet3DSImporter::ConvertMeshes(aiScene *pcOut) {
            if (aiSplit[p].empty()) {
                continue;
            }
-            aiMesh *meshOut = new aiMesh();
+            auto *meshOut = new aiMesh();
            meshOut->mName = name;
            meshOut->mPrimitiveTypes = aiPrimitiveType_TRIANGLE;

@@ -353,7 +358,7 @@ void Discreet3DSImporter::ConvertMeshes(aiScene *pcOut) {
            avOutMeshes.push_back(meshOut);

            // convert vertices
-            meshOut->mNumFaces = (unsigned int)aiSplit[p].size();
+            meshOut->mNumFaces = static_cast<unsigned int>(aiSplit[p].size());
            meshOut->mNumVertices = meshOut->mNumFaces * 3;

            // allocate enough storage for faces
@@ -401,8 +406,7 @@ void Discreet3DSImporter::ConvertMeshes(aiScene *pcOut) {

 // ------------------------------------------------------------------------------------------------
 // Add a node to the scenegraph and setup its final transformation
-void Discreet3DSImporter::AddNodeToGraph(aiScene *pcSOut, aiNode *pcOut,
-        D3DS::Node *pcIn, aiMatrix4x4 & /*absTrafo*/) {
+void Discreet3DSImporter::AddNodeToGraph(aiScene *pcSOut, aiNode *pcOut, D3DS::Node *pcIn, aiMatrix4x4 & /*absTrafo*/) {
    std::vector<unsigned int> iArray;
    iArray.reserve(3);

@@ -410,7 +414,7 @@ void Discreet3DSImporter::AddNodeToGraph(aiScene *pcSOut, aiNode *pcOut,

    // Find all meshes with the same name as the node
    for (unsigned int a = 0; a < pcSOut->mNumMeshes; ++a) {
-        const D3DS::Mesh *pcMesh = (const D3DS::Mesh *)pcSOut->mMeshes[a]->mColors[0];
+        const auto *pcMesh = (const D3DS::Mesh *)pcSOut->mMeshes[a]->mColors[0];
        ai_assert(nullptr != pcMesh);

        if (pcIn->mName == pcMesh->mName)
@@ -419,7 +423,7 @@ void Discreet3DSImporter::AddNodeToGraph(aiScene *pcSOut, aiNode *pcOut,
    if (!iArray.empty()) {
        // The matrix should be identical for all meshes with the
        // same name. It HAS to be identical for all meshes .....
-        D3DS::Mesh *imesh = ((D3DS::Mesh *)pcSOut->mMeshes[iArray[0]]->mColors[0]);
+        auto *imesh = ((D3DS::Mesh *)pcSOut->mMeshes[iArray[0]]->mColors[0]);

        // Compute the inverse of the transformation matrix to move the
        // vertices back to their relative and local space
@@ -428,7 +432,7 @@ void Discreet3DSImporter::AddNodeToGraph(aiScene *pcSOut, aiNode *pcOut,
        mInvTransposed.Transpose();
        aiVector3D pivot = pcIn->vPivot;

-        pcOut->mNumMeshes = (unsigned int)iArray.size();
+        pcOut->mNumMeshes = static_cast<unsigned int>(iArray.size());
        pcOut->mMeshes = new unsigned int[iArray.size()];
        for (unsigned int i = 0; i < iArray.size(); ++i) {
            const unsigned int iIndex = iArray[i];
@@ -447,7 +451,7 @@ void Discreet3DSImporter::AddNodeToGraph(aiScene *pcSOut, aiNode *pcOut,

                // Handle negative transformation matrix determinant -> invert vertex x
                if (imesh->mMat.Determinant() < 0.0f) {
-                    /* we *must* have normals */
+                    // we *must* have normals
                    for (pvCurrent = mesh->mVertices, t2 = mesh->mNormals; pvCurrent != pvEnd; ++pvCurrent, ++t2) {
                        pvCurrent->x *= -1.f;
                        t2->x *= -1.f;
@@ -474,7 +478,7 @@ void Discreet3DSImporter::AddNodeToGraph(aiScene *pcSOut, aiNode *pcOut,
    // Setup the name of the node
    // First instance keeps its name otherwise something might break, all others will be postfixed with their instance number
    if (pcIn->mInstanceNumber > 1) {
-        char tmp[12];
+        char tmp[12] = {'\0'};
        ASSIMP_itoa10(tmp, pcIn->mInstanceNumber);
        std::string tempStr = pcIn->mName + "_inst_";
        tempStr += tmp;
@@ -487,7 +491,7 @@ void Discreet3DSImporter::AddNodeToGraph(aiScene *pcSOut, aiNode *pcOut,
    if (pcIn->aRotationKeys.size()) {

        // FIX to get to Assimp's quaternion conventions
-        for (std::vector<aiQuatKey>::iterator it = pcIn->aRotationKeys.begin(); it != pcIn->aRotationKeys.end(); ++it) {
+        for (auto it = pcIn->aRotationKeys.begin(); it != pcIn->aRotationKeys.end(); ++it) {
            (*it).mValue.w *= -1.f;
        }

@@ -599,11 +603,11 @@ void Discreet3DSImporter::AddNodeToGraph(aiScene *pcSOut, aiNode *pcOut,
        }

        // Allocate a new node anim and setup its name
-        aiNodeAnim *nda = anim->mChannels[anim->mNumChannels++] = new aiNodeAnim();
+        auto *nda = anim->mChannels[anim->mNumChannels++] = new aiNodeAnim();
        nda->mNodeName.Set(pcIn->mName);

        // POSITION keys
-        if (pcIn->aPositionKeys.size() > 0) {
+        if (!pcIn->aPositionKeys.empty()) {
            nda->mNumPositionKeys = (unsigned int)pcIn->aPositionKeys.size();
            nda->mPositionKeys = new aiVectorKey[nda->mNumPositionKeys];
            ::memcpy(nda->mPositionKeys, &pcIn->aPositionKeys[0],
@@ -611,7 +615,7 @@ void Discreet3DSImporter::AddNodeToGraph(aiScene *pcSOut, aiNode *pcOut,
        }

        // ROTATION keys
-        if (pcIn->aRotationKeys.size() > 0) {
+        if (!pcIn->aRotationKeys.empty()) {
            nda->mNumRotationKeys = (unsigned int)pcIn->aRotationKeys.size();
            nda->mRotationKeys = new aiQuatKey[nda->mNumRotationKeys];

@@ -627,7 +631,7 @@ void Discreet3DSImporter::AddNodeToGraph(aiScene *pcSOut, aiNode *pcOut,
        }

        // SCALING keys
-        if (pcIn->aScalingKeys.size() > 0) {
+        if (!pcIn->aScalingKeys.empty()) {
            nda->mNumScalingKeys = (unsigned int)pcIn->aScalingKeys.size();
            nda->mScalingKeys = new aiVectorKey[nda->mNumScalingKeys];
            ::memcpy(nda->mScalingKeys, &pcIn->aScalingKeys[0],
@@ -636,7 +640,7 @@ void Discreet3DSImporter::AddNodeToGraph(aiScene *pcSOut, aiNode *pcOut,
    }

    // Allocate storage for children
-    const unsigned int size = static_cast<unsigned int>(pcIn->mChildren.size());
+    const auto size = static_cast<unsigned int>(pcIn->mChildren.size());

    pcOut->mNumChildren = size;
    if (size == 0) {
@@ -679,7 +683,7 @@ void CountTracks(D3DS::Node *node, unsigned int &cnt) {
 // Generate the output node graph
 void Discreet3DSImporter::GenerateNodeGraph(aiScene *pcOut) {
    pcOut->mRootNode = new aiNode();
-    if (0 == mRootNode->mChildren.size()) {
+    if (mRootNode->mChildren.empty()) {
        //////////////////////////////////////////////////////////////////////////////
        // It seems the file is so messed up that it has not even a hierarchy.
        // generate a flat hiearachy which looks like this:
@@ -701,7 +705,8 @@ void Discreet3DSImporter::GenerateNodeGraph(aiScene *pcOut) {
        // Build dummy nodes for all meshes
        unsigned int a = 0;
        for (unsigned int i = 0; i < pcOut->mNumMeshes; ++i, ++a) {
-            aiNode *pcNode = pcOut->mRootNode->mChildren[a] = new aiNode();
+            pcOut->mRootNode->mChildren[a] = new aiNode();  
+            auto *pcNode = pcOut->mRootNode->mChildren[a];
            pcNode->mParent = pcOut->mRootNode;
            pcNode->mMeshes = new unsigned int[1];
            pcNode->mMeshes[0] = i;
@@ -713,7 +718,7 @@ void Discreet3DSImporter::GenerateNodeGraph(aiScene *pcOut) {

        // Build dummy nodes for all cameras
        for (unsigned int i = 0; i < (unsigned int)mScene->mCameras.size(); ++i, ++a) {
-            aiNode *pcNode = pcOut->mRootNode->mChildren[a] = new aiNode();
+            auto *pcNode = pcOut->mRootNode->mChildren[a] = new aiNode();
            pcNode->mParent = pcOut->mRootNode;

            // Build a name for the node
@@ -722,7 +727,7 @@ void Discreet3DSImporter::GenerateNodeGraph(aiScene *pcOut) {

        // Build dummy nodes for all lights
        for (unsigned int i = 0; i < (unsigned int)mScene->mLights.size(); ++i, ++a) {
-            aiNode *pcNode = pcOut->mRootNode->mChildren[a] = new aiNode();
+            auto *pcNode = pcOut->mRootNode->mChildren[a] = new aiNode();
            pcNode->mParent = pcOut->mRootNode;

            // Build a name for the node
@@ -738,7 +743,7 @@ void Discreet3DSImporter::GenerateNodeGraph(aiScene *pcOut) {
            // Allocate a primary animation channel
            pcOut->mNumAnimations = 1;
            pcOut->mAnimations = new aiAnimation *[1];
-            aiAnimation *anim = pcOut->mAnimations[0] = new aiAnimation();
+            auto *anim = pcOut->mAnimations[0] = new aiAnimation();

            anim->mName.Set("3DSMasterAnim");

@@ -781,7 +786,7 @@ void Discreet3DSImporter::ConvertScene(aiScene *pcOut) {

    //  ... and convert the 3DS materials to aiMaterial's
    for (unsigned int i = 0; i < pcOut->mNumMaterials; ++i) {
-        aiMaterial *pcNew = new aiMaterial();
+        auto *pcNew = new aiMaterial();
        ConvertMaterial(mScene->mMaterials[i], *pcNew);
        pcOut->mMaterials[i] = pcNew;
    }
@@ -76,26 +76,26 @@ class ChunkWriter {

 public:
    ChunkWriter(StreamWriterLE &writer, uint16_t chunk_type) :
-            writer(writer) {
-        chunk_start_pos = writer.GetCurrentPos();
+            mWriter(writer) {
+        mChunkStartPos = writer.GetCurrentPos();
        writer.PutU2(chunk_type);
        writer.PutU4((uint32_t)CHUNK_SIZE_NOT_SET);
    }

    ~ChunkWriter() {
-        std::size_t head_pos = writer.GetCurrentPos();
+        std::size_t head_pos = mWriter.GetCurrentPos();

-        ai_assert(head_pos > chunk_start_pos);
-        const std::size_t chunk_size = head_pos - chunk_start_pos;
+        ai_assert(head_pos > mChunkStartPos);
+        const std::size_t chunk_size = head_pos - mChunkStartPos;

-        writer.SetCurrentPos(chunk_start_pos + SIZE_OFFSET);
-        writer.PutU4(static_cast<uint32_t>(chunk_size));
-        writer.SetCurrentPos(head_pos);
+        mWriter.SetCurrentPos(mChunkStartPos + SIZE_OFFSET);
+        mWriter.PutU4(static_cast<uint32_t>(chunk_size));
+        mWriter.SetCurrentPos(head_pos);
    }

 private:
-    StreamWriterLE &writer;
-    std::size_t chunk_start_pos;
+    StreamWriterLE &mWriter;
+    std::size_t mChunkStartPos;
 };

 // Return an unique name for a given |mesh| attached to |node| that
@@ -122,8 +122,7 @@ std::string GetMaterialName(const aiMaterial &mat, unsigned int index) {
    char postfix[10] = { 0 };
    ASSIMP_itoa10(postfix, index);

-    aiString mat_name;
-    if (AI_SUCCESS == mat.Get(AI_MATKEY_NAME, mat_name)) {
+    if (aiString mat_name; AI_SUCCESS == mat.Get(AI_MATKEY_NAME, mat_name)) {
        return mat_name.C_Str() + underscore + postfix;
    }

@@ -303,8 +302,7 @@ void Discreet3DSExporter::WriteMaterials() {
            WriteColor(color);
        }

-        aiShadingMode shading_mode = aiShadingMode_Flat;
-        if (mat.Get(AI_MATKEY_SHADING_MODEL, shading_mode) == AI_SUCCESS) {
+        if (aiShadingMode shading_mode = aiShadingMode_Flat; mat.Get(AI_MATKEY_SHADING_MODEL, shading_mode) == AI_SUCCESS) {
            ChunkWriter chunk(writer, Discreet3DS::CHUNK_MAT_SHADING);

            Discreet3DS::shadetype3ds shading_mode_out;
@@ -332,7 +330,7 @@ void Discreet3DSExporter::WriteMaterials() {
            default:
                shading_mode_out = Discreet3DS::Flat;
                ai_assert(false);
-            };
+            }
            writer.PutU2(static_cast<uint16_t>(shading_mode_out));
        }

@@ -346,8 +344,7 @@ void Discreet3DSExporter::WriteMaterials() {
            WritePercentChunk(f);
        }

-        int twosided;
-        if (mat.Get(AI_MATKEY_TWOSIDED, twosided) == AI_SUCCESS && twosided != 0) {
+        if (int twosided; mat.Get(AI_MATKEY_TWOSIDED, twosided) == AI_SUCCESS && twosided != 0) {
            ChunkWriter chunk(writer, Discreet3DS::CHUNK_MAT_TWO_SIDE);
            writer.PutI2(1);
        }
@@ -541,7 +538,7 @@ void Discreet3DSExporter::WriteFaceMaterialChunk(const aiMesh &mesh) {

 // ------------------------------------------------------------------------------------------------
 void Discreet3DSExporter::WriteString(const std::string &s) {
-    for (std::string::const_iterator it = s.begin(); it != s.end(); ++it) {
+    for (auto it = s.begin(); it != s.end(); ++it) {
        writer.PutI1(*it);
    }
    writer.PutI1('\0');
@@ -54,8 +54,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/qnan.h>
 #include <cstdio> //sprintf

-namespace Assimp {
-namespace D3DS {
+namespace Assimp::D3DS {

 #include <assimp/Compiler/pushpack1.h>

@@ -579,7 +578,6 @@ struct Scene {
    // Node* pcRootNode;
 };

-} // end of namespace D3DS
-} // end of namespace Assimp
+} // end of namespace Assimp::D3DS

 #endif // AI_XFILEHELPER_H_INC
@@ -56,6 +56,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 namespace Assimp {

+using namespace D3DS;
+
 static constexpr aiImporterDesc desc = {
    "Discreet 3DS Importer",
    "",
@@ -75,7 +77,7 @@ static constexpr aiImporterDesc desc = {
 // - computes its length
 #define ASSIMP_3DS_BEGIN_CHUNK()                                              \
    while (true) {                                                            \
-        if (stream->GetRemainingSizeToLimit() < sizeof(Discreet3DS::Chunk)) { \
+        if (mStream->GetRemainingSizeToLimit() < sizeof(Discreet3DS::Chunk)) { \
            return;                                                           \
        }                                                                     \
        Discreet3DS::Chunk chunk;                                             \
@@ -83,23 +85,23 @@ static constexpr aiImporterDesc desc = {
        int chunkSize = chunk.Size - sizeof(Discreet3DS::Chunk);              \
        if (chunkSize <= 0)                                                   \
            continue;                                                         \
-        const unsigned int oldReadLimit = stream->SetReadLimit(               \
-                stream->GetCurrentPos() + chunkSize);
+        const unsigned int oldReadLimit = mStream->SetReadLimit(               \
+                mStream->GetCurrentPos() + chunkSize);

 // ------------------------------------------------------------------------------------------------
 // End a parsing block
 // Must follow at the end of each parsing block, reset chunk end marker to previous value
 #define ASSIMP_3DS_END_CHUNK()                  \
-    stream->SkipToReadLimit();                  \
-    stream->SetReadLimit(oldReadLimit);         \
-    if (stream->GetRemainingSizeToLimit() == 0) \
+    mStream->SkipToReadLimit();                  \
+    mStream->SetReadLimit(oldReadLimit);         \
+    if (mStream->GetRemainingSizeToLimit() == 0) \
        return;                                 \
    }

 // ------------------------------------------------------------------------------------------------
 // Constructor to be privately used by Importer
 Discreet3DSImporter::Discreet3DSImporter() :
-        stream(), mLastNodeIndex(), mCurrentNode(), mRootNode(), mScene(), mMasterScale(), bHasBG(), bIsPrj() {
+        mStream(nullptr), mLastNodeIndex(), mCurrentNode(), mRootNode(), mScene(), mMasterScale(), bHasBG(), bIsPrj() {
    // empty
 }

@@ -124,9 +126,7 @@ void Discreet3DSImporter::SetupProperties(const Importer * /*pImp*/) {

 // ------------------------------------------------------------------------------------------------
 // Imports the given file into the given scene structure.
-void Discreet3DSImporter::InternReadFile(const std::string &pFile,
-        aiScene *pScene, IOSystem *pIOHandler) {
-
+void Discreet3DSImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSystem *pIOHandler) {
    auto theFile = pIOHandler->Open(pFile, "rb");
    if (!theFile) {
        throw DeadlyImportError("3DS: Could not open ", pFile);
@@ -138,14 +138,14 @@ void Discreet3DSImporter::InternReadFile(const std::string &pFile,
    if (theStream.GetRemainingSize() < 16) {
        throw DeadlyImportError("3DS file is either empty or corrupt: ", pFile);
    }
-    this->stream = &theStream;
+    mStream = &theStream;

    // Allocate our temporary 3DS representation
-    D3DS::Scene _scene;
+    Scene _scene;
    mScene = &_scene;

    // Initialize members
-    D3DS::Node _rootNode("UNNAMED");
+    Node _rootNode("UNNAMED");
    mLastNodeIndex = -1;
    mCurrentNode = &_rootNode;
    mRootNode = mCurrentNode;
@@ -166,12 +166,12 @@ void Discreet3DSImporter::InternReadFile(const std::string &pFile,
    // vectors from the smoothing groups we read from the
    // file.
    for (auto &mesh : mScene->mMeshes) {
-        if (mesh.mFaces.size() > 0 && mesh.mPositions.size() == 0) {
+        if (!mesh.mFaces.empty() && mesh.mPositions.empty()) {
            throw DeadlyImportError("3DS file contains faces but no vertices: ", pFile);
        }
        CheckIndices(mesh);
        MakeUnique(mesh);
-        ComputeNormalsWithSmoothingsGroups<D3DS::Face>(mesh);
+        ComputeNormalsWithSmoothingsGroups<Face>(mesh);
    }

    // Replace all occurrences of the default material with a
@@ -196,12 +196,12 @@ void Discreet3DSImporter::InternReadFile(const std::string &pFile,

    AI_DEBUG_INVALIDATE_PTR(mRootNode);
    AI_DEBUG_INVALIDATE_PTR(mScene);
-    AI_DEBUG_INVALIDATE_PTR(this->stream);
+    AI_DEBUG_INVALIDATE_PTR(mStream);
 }

 // ------------------------------------------------------------------------------------------------
 // Applies a master-scaling factor to the imported scene
-void Discreet3DSImporter::ApplyMasterScale(aiScene *pScene) {
+void Discreet3DSImporter::ApplyMasterScale(const aiScene *pScene) {
    // There are some 3DS files with a zero scaling factor
    if (!mMasterScale)
        mMasterScale = 1.0f;
@@ -223,14 +223,14 @@ void Discreet3DSImporter::ApplyMasterScale(aiScene *pScene) {
 void Discreet3DSImporter::ReadChunk(Discreet3DS::Chunk *pcOut) {
    ai_assert(pcOut != nullptr);

-    pcOut->Flag = stream->GetI2();
-    pcOut->Size = stream->GetI4();
+    pcOut->Flag = mStream->GetI2();
+    pcOut->Size = mStream->GetI4();

-    if (pcOut->Size - sizeof(Discreet3DS::Chunk) > stream->GetRemainingSize()) {
+    if (pcOut->Size - sizeof(Discreet3DS::Chunk) > mStream->GetRemainingSize()) {
        throw DeadlyImportError("Chunk is too large");
    }

-    if (pcOut->Size - sizeof(Discreet3DS::Chunk) > stream->GetRemainingSizeToLimit()) {
+    if (pcOut->Size - sizeof(Discreet3DS::Chunk) > mStream->GetRemainingSizeToLimit()) {
        ASSIMP_LOG_ERROR("3DS: Chunk overflow");
    }
 }
@@ -241,8 +241,7 @@ void Discreet3DSImporter::SkipChunk() {
    Discreet3DS::Chunk psChunk;
    ReadChunk(&psChunk);

-    stream->IncPtr(psChunk.Size - sizeof(Discreet3DS::Chunk));
-    return;
+    mStream->IncPtr(psChunk.Size - sizeof(Discreet3DS::Chunk));
 }

 // ------------------------------------------------------------------------------------------------
@@ -259,7 +258,7 @@ void Discreet3DSImporter::ParseMainChunk() {
    case Discreet3DS::CHUNK_MAIN:
        ParseEditorChunk();
        break;
-    };
+    }

    ASSIMP_3DS_END_CHUNK();
 #if defined(__clang__)
@@ -275,30 +274,29 @@ void Discreet3DSImporter::ParseMainChunk() {

 // ------------------------------------------------------------------------------------------------
 void Discreet3DSImporter::ParseEditorChunk() {
-    ASSIMP_3DS_BEGIN_CHUNK();
+    ASSIMP_3DS_BEGIN_CHUNK()

    // get chunk type
    switch (chunk.Flag) {
-    case Discreet3DS::CHUNK_OBJMESH:
+        case Discreet3DS::CHUNK_OBJMESH:
+            ParseObjectChunk();
+            break;

-        ParseObjectChunk();
+        // NOTE: In several documentations in the internet this
+        // chunk appears at different locations
+        case Discreet3DS::CHUNK_KEYFRAMER:
+            ParseKeyframeChunk();
+            break;
+    
+        case Discreet3DS::CHUNK_VERSION: {
+            // print the version number
+            char buff[10];
+            ASSIMP_itoa10(buff, mStream->GetI2());
+            ASSIMP_LOG_INFO("3DS file format version: ", buff);
+        }
        break;
-
-    // NOTE: In several documentations in the internet this
-    // chunk appears at different locations
-    case Discreet3DS::CHUNK_KEYFRAMER:
-
-        ParseKeyframeChunk();
-        break;
-
-    case Discreet3DS::CHUNK_VERSION: {
-        // print the version number
-        char buff[10];
-        ASSIMP_itoa10(buff, stream->GetI2());
-        ASSIMP_LOG_INFO("3DS file format version: ", buff);
-    } break;
    };
-    ASSIMP_3DS_END_CHUNK();
+    ASSIMP_3DS_END_CHUNK()
 }

 // ------------------------------------------------------------------------------------------------
@@ -309,10 +307,10 @@ void Discreet3DSImporter::ParseObjectChunk() {
    switch (chunk.Flag) {
    case Discreet3DS::CHUNK_OBJBLOCK: {
        unsigned int cnt = 0;
-        const char *sz = (const char *)stream->GetPtr();
+        const auto *sz = (const char *)mStream->GetPtr();

        // Get the name of the geometry object
-        while (stream->GetI1())
+        while (mStream->GetI1())
            ++cnt;
        ParseChunk(sz, cnt);
    } break;
@@ -340,8 +338,8 @@ void Discreet3DSImporter::ParseObjectChunk() {
        // Specifies the background image. The string should already be
        // properly 0 terminated but we need to be sure
        unsigned int cnt = 0;
-        const char *sz = (const char *)stream->GetPtr();
-        while (stream->GetI1())
+        auto *sz = (const char *)mStream->GetPtr();
+        while (mStream->GetI1())
            ++cnt;
        mBackgroundImage = std::string(sz, cnt);
    } break;
@@ -352,7 +350,7 @@ void Discreet3DSImporter::ParseObjectChunk() {

    case Discreet3DS::CHUNK_MASTER_SCALE:
        // Scene master scaling factor
-        mMasterScale = stream->GetF4();
+        mMasterScale = mStream->GetF4();
        break;
    };
    ASSIMP_3DS_END_CHUNK();
@@ -379,15 +377,15 @@ void Discreet3DSImporter::ParseChunk(const char *name, unsigned int num) {

    case Discreet3DS::CHUNK_LIGHT: {
        // This starts a new light
-        aiLight *light = new aiLight();
+        auto *light = new aiLight();
        mScene->mLights.push_back(light);

        light->mName.Set(std::string(name, num));

        // First read the position of the light
-        light->mPosition.x = stream->GetF4();
-        light->mPosition.y = stream->GetF4();
-        light->mPosition.z = stream->GetF4();
+        light->mPosition.x = mStream->GetF4();
+        light->mPosition.y = mStream->GetF4();
+        light->mPosition.z = mStream->GetF4();

        light->mColorDiffuse = aiColor3D(1.f, 1.f, 1.f);

@@ -408,19 +406,19 @@ void Discreet3DSImporter::ParseChunk(const char *name, unsigned int num) {

    case Discreet3DS::CHUNK_CAMERA: {
        // This starts a new camera
-        aiCamera *camera = new aiCamera();
+        auto *camera = new aiCamera();
        mScene->mCameras.push_back(camera);
        camera->mName.Set(std::string(name, num));

        // First read the position of the camera
-        camera->mPosition.x = stream->GetF4();
-        camera->mPosition.y = stream->GetF4();
-        camera->mPosition.z = stream->GetF4();
+        camera->mPosition.x = mStream->GetF4();
+        camera->mPosition.y = mStream->GetF4();
+        camera->mPosition.z = mStream->GetF4();

        // Then the camera target
-        camera->mLookAt.x = stream->GetF4() - camera->mPosition.x;
-        camera->mLookAt.y = stream->GetF4() - camera->mPosition.y;
-        camera->mLookAt.z = stream->GetF4() - camera->mPosition.z;
+        camera->mLookAt.x = mStream->GetF4() - camera->mPosition.x;
+        camera->mLookAt.y = mStream->GetF4() - camera->mPosition.y;
+        camera->mLookAt.z = mStream->GetF4() - camera->mPosition.z;
        ai_real len = camera->mLookAt.Length();
        if (len < 1e-5) {

@@ -432,12 +430,12 @@ void Discreet3DSImporter::ParseChunk(const char *name, unsigned int num) {
            camera->mLookAt /= len;

        // And finally - the camera rotation angle, in counter clockwise direction
-        const ai_real angle = AI_DEG_TO_RAD(stream->GetF4());
+        const ai_real angle = AI_DEG_TO_RAD(mStream->GetF4());
        aiQuaternion quat(camera->mLookAt, angle);
        camera->mUp = quat.GetMatrix() * aiVector3D(0.0, 1.0, 0.0);

        // Read the lense angle
-        camera->mHorizontalFOV = AI_DEG_TO_RAD(stream->GetF4());
+        camera->mHorizontalFOV = AI_DEG_TO_RAD(mStream->GetF4());
        if (camera->mHorizontalFOV < 0.001f) {
            camera->mHorizontalFOV = float(AI_DEG_TO_RAD(45.f));
        }
@@ -463,34 +461,34 @@ void Discreet3DSImporter::ParseLightChunk() {
        light->mType = aiLightSource_SPOT;

        // We wouldn't need to normalize here, but we do it
-        light->mDirection.x = stream->GetF4() - light->mPosition.x;
-        light->mDirection.y = stream->GetF4() - light->mPosition.y;
-        light->mDirection.z = stream->GetF4() - light->mPosition.z;
+        light->mDirection.x = mStream->GetF4() - light->mPosition.x;
+        light->mDirection.y = mStream->GetF4() - light->mPosition.y;
+        light->mDirection.z = mStream->GetF4() - light->mPosition.z;
        light->mDirection.Normalize();

        // Now the hotspot and falloff angles - in degrees
-        light->mAngleInnerCone = AI_DEG_TO_RAD(stream->GetF4());
+        light->mAngleInnerCone = AI_DEG_TO_RAD(mStream->GetF4());

        // FIX: the falloff angle is just an offset
-        light->mAngleOuterCone = light->mAngleInnerCone + AI_DEG_TO_RAD(stream->GetF4());
+        light->mAngleOuterCone = light->mAngleInnerCone + AI_DEG_TO_RAD(mStream->GetF4());
        break;

        // intensity multiplier
    case Discreet3DS::CHUNK_DL_MULTIPLIER:
-        light->mColorDiffuse = light->mColorDiffuse * stream->GetF4();
+        light->mColorDiffuse = light->mColorDiffuse * mStream->GetF4();
        break;

        // light color
    case Discreet3DS::CHUNK_RGBF:
    case Discreet3DS::CHUNK_LINRGBF:
-        light->mColorDiffuse.r *= stream->GetF4();
-        light->mColorDiffuse.g *= stream->GetF4();
-        light->mColorDiffuse.b *= stream->GetF4();
+        light->mColorDiffuse.r *= mStream->GetF4();
+        light->mColorDiffuse.g *= mStream->GetF4();
+        light->mColorDiffuse.b *= mStream->GetF4();
        break;

        // light attenuation
    case Discreet3DS::CHUNK_DL_ATTENUATE:
-        light->mAttenuationLinear = stream->GetF4();
+        light->mAttenuationLinear = mStream->GetF4();
        break;
    };

@@ -505,10 +503,10 @@ void Discreet3DSImporter::ParseCameraChunk() {
    // get chunk type
    switch (chunk.Flag) {
        // near and far clip plane
-    case Discreet3DS::CHUNK_CAM_RANGES:
-        camera->mClipPlaneNear = stream->GetF4();
-        camera->mClipPlaneFar = stream->GetF4();
-        break;
+        case Discreet3DS::CHUNK_CAM_RANGES:
+            camera->mClipPlaneNear = mStream->GetF4();
+            camera->mClipPlaneFar = mStream->GetF4();
+            break;
    }

    ASSIMP_3DS_END_CHUNK();
@@ -555,14 +553,13 @@ void Discreet3DSImporter::InverseNodeSearch(D3DS::Node *pcNode, D3DS::Node *pcCu

 // ------------------------------------------------------------------------------------------------
 // Find a node with a specific name in the import hierarchy
-D3DS::Node *FindNode(D3DS::Node *root, const std::string &name) {
+Node *FindNode(Node *root, const std::string &name) {
    if (root->mName == name) {
        return root;
    }

-    for (std::vector<D3DS::Node *>::iterator it = root->mChildren.begin(); it != root->mChildren.end(); ++it) {
-        D3DS::Node *nd = FindNode(*it, name);
-        if (nullptr != nd) {
+    for (auto it = root->mChildren.begin(); it != root->mChildren.end(); ++it) {
+        if (auto *nd = FindNode(*it, name); nullptr != nd) {
            return nd;
        }
    }
@@ -580,7 +577,7 @@ bool KeyUniqueCompare(const T &first, const T &second) {
 // ------------------------------------------------------------------------------------------------
 // Skip some additional import data.
 void Discreet3DSImporter::SkipTCBInfo() {
-    unsigned int flags = stream->GetI2();
+    unsigned int flags = mStream->GetI2();

    if (!flags) {
        // Currently we can't do anything with these values. They occur
@@ -591,19 +588,19 @@ void Discreet3DSImporter::SkipTCBInfo() {
    }

    if (flags & Discreet3DS::KEY_USE_TENS) {
-        stream->IncPtr(4);
+        mStream->IncPtr(4);
    }
    if (flags & Discreet3DS::KEY_USE_BIAS) {
-        stream->IncPtr(4);
+        mStream->IncPtr(4);
    }
    if (flags & Discreet3DS::KEY_USE_CONT) {
-        stream->IncPtr(4);
+        mStream->IncPtr(4);
    }
    if (flags & Discreet3DS::KEY_USE_EASE_FROM) {
-        stream->IncPtr(4);
+        mStream->IncPtr(4);
    }
    if (flags & Discreet3DS::KEY_USE_EASE_TO) {
-        stream->IncPtr(4);
+        mStream->IncPtr(4);
    }
 }

@@ -622,15 +619,15 @@ void Discreet3DSImporter::ParseHierarchyChunk(uint16_t parent) {

            // First of all: get the name of the object
            unsigned int cnt = 0;
-            const char *sz = (const char *)stream->GetPtr();
+            auto *sz = (const char *)mStream->GetPtr();

-            while (stream->GetI1())
+            while (mStream->GetI1())
                ++cnt;
            std::string name = std::string(sz, cnt);

            // Now find out whether we have this node already (target animation channels
            // are stored with a separate object ID)
-            D3DS::Node *pcNode = FindNode(mRootNode, name);
+            Node *pcNode = FindNode(mRootNode, name);
            int instanceNumber = 1;

            if (pcNode) {
@@ -646,10 +643,10 @@ void Discreet3DSImporter::ParseHierarchyChunk(uint16_t parent) {
            pcNode->mInstanceNumber = instanceNumber;

            // There are two unknown values which we can safely ignore
-            stream->IncPtr(4);
+            mStream->IncPtr(4);

            // Now read the hierarchy position of the object
-            uint16_t hierarchy = stream->GetI2() + 1;
+            uint16_t hierarchy = mStream->GetI2() + 1;
            pcNode->mHierarchyPos = hierarchy;
            pcNode->mHierarchyIndex = mLastNodeIndex;

@@ -678,8 +675,8 @@ void Discreet3DSImporter::ParseHierarchyChunk(uint16_t parent) {

        // This is the "real" name of a $$$DUMMY object
        {
-            const char *sz = (const char *)stream->GetPtr();
-            while (stream->GetI1())
+            const char *sz = (const char *)mStream->GetPtr();
+            while (mStream->GetI1())
                ;

            // If object name is DUMMY, take this one instead
@@ -698,16 +695,16 @@ void Discreet3DSImporter::ParseHierarchyChunk(uint16_t parent) {
        }

        // Pivot = origin of rotation and scaling
-        mCurrentNode->vPivot.x = stream->GetF4();
-        mCurrentNode->vPivot.y = stream->GetF4();
-        mCurrentNode->vPivot.z = stream->GetF4();
+        mCurrentNode->vPivot.x = mStream->GetF4();
+        mCurrentNode->vPivot.y = mStream->GetF4();
+        mCurrentNode->vPivot.z = mStream->GetF4();
        break;

        // ////////////////////////////////////////////////////////////////////
        // POSITION KEYFRAME
    case Discreet3DS::CHUNK_TRACKPOS: {
-        stream->IncPtr(10);
-        const unsigned int numFrames = stream->GetI4();
+        mStream->IncPtr(10);
+        const unsigned int numFrames = mStream->GetI4();
        bool sortKeys = false;

        // This could also be meant as the target position for
@@ -720,16 +717,16 @@ void Discreet3DSImporter::ParseHierarchyChunk(uint16_t parent) {

        l->reserve(numFrames);
        for (unsigned int i = 0; i < numFrames; ++i) {
-            const unsigned int fidx = stream->GetI4();
+            const unsigned int fidx = mStream->GetI4();

            // Setup a new position key
            aiVectorKey v;
            v.mTime = (double)fidx;

            SkipTCBInfo();
-            v.mValue.x = stream->GetF4();
-            v.mValue.y = stream->GetF4();
-            v.mValue.z = stream->GetF4();
+            v.mValue.x = mStream->GetF4();
+            v.mValue.y = mStream->GetF4();
+            v.mValue.z = mStream->GetF4();

            // check whether we'll need to sort the keys
            if (!l->empty() && v.mTime <= l->back().mTime)
@@ -759,11 +756,11 @@ void Discreet3DSImporter::ParseHierarchyChunk(uint16_t parent) {
        bool sortKeys = false;
        std::vector<aiFloatKey> *l = &mCurrentNode->aCameraRollKeys;

-        stream->IncPtr(10);
-        const unsigned int numFrames = stream->GetI4();
+        mStream->IncPtr(10);
+        const unsigned int numFrames = mStream->GetI4();
        l->reserve(numFrames);
        for (unsigned int i = 0; i < numFrames; ++i) {
-            const unsigned int fidx = stream->GetI4();
+            const unsigned int fidx = mStream->GetI4();

            // Setup a new position key
            aiFloatKey v;
@@ -771,7 +768,7 @@ void Discreet3DSImporter::ParseHierarchyChunk(uint16_t parent) {

            // This is just a single float
            SkipTCBInfo();
-            v.mValue = stream->GetF4();
+            v.mValue = mStream->GetF4();

            // Check whether we'll need to sort the keys
            if (!l->empty() && v.mTime <= l->back().mTime)
@@ -798,26 +795,26 @@ void Discreet3DSImporter::ParseHierarchyChunk(uint16_t parent) {
        // ////////////////////////////////////////////////////////////////////
        // ROTATION KEYFRAME
    case Discreet3DS::CHUNK_TRACKROTATE: {
-        stream->IncPtr(10);
-        const unsigned int numFrames = stream->GetI4();
+        mStream->IncPtr(10);
+        const unsigned int numFrames = mStream->GetI4();

        bool sortKeys = false;
        std::vector<aiQuatKey> *l = &mCurrentNode->aRotationKeys;
        l->reserve(numFrames);

        for (unsigned int i = 0; i < numFrames; ++i) {
-            const unsigned int fidx = stream->GetI4();
+            const unsigned int fidx = mStream->GetI4();
            SkipTCBInfo();

            aiQuatKey v;
            v.mTime = (double)fidx;

            // The rotation keyframe is given as an axis-angle pair
-            const float rad = stream->GetF4();
+            const float rad = mStream->GetF4();
            aiVector3D axis;
-            axis.x = stream->GetF4();
-            axis.y = stream->GetF4();
-            axis.z = stream->GetF4();
+            axis.x = mStream->GetF4();
+            axis.y = mStream->GetF4();
+            axis.z = mStream->GetF4();

            if (!axis.x && !axis.y && !axis.z)
                axis.y = 1.f;
@@ -842,16 +839,16 @@ void Discreet3DSImporter::ParseHierarchyChunk(uint16_t parent) {
        // ////////////////////////////////////////////////////////////////////
        // SCALING KEYFRAME
    case Discreet3DS::CHUNK_TRACKSCALE: {
-        stream->IncPtr(10);
-        const unsigned int numFrames = stream->GetI2();
-        stream->IncPtr(2);
+        mStream->IncPtr(10);
+        const unsigned int numFrames = mStream->GetI2();
+        mStream->IncPtr(2);

        bool sortKeys = false;
        std::vector<aiVectorKey> *l = &mCurrentNode->aScalingKeys;
        l->reserve(numFrames);

        for (unsigned int i = 0; i < numFrames; ++i) {
-            const unsigned int fidx = stream->GetI4();
+            const unsigned int fidx = mStream->GetI4();
            SkipTCBInfo();

            // Setup a new key
@@ -859,9 +856,9 @@ void Discreet3DSImporter::ParseHierarchyChunk(uint16_t parent) {
            v.mTime = (double)fidx;

            // ... and read its value
-            v.mValue.x = stream->GetF4();
-            v.mValue.y = stream->GetF4();
-            v.mValue.z = stream->GetF4();
+            v.mValue.x = mStream->GetF4();
+            v.mValue.y = mStream->GetF4();
+            v.mValue.z = mStream->GetF4();

            // check whether we'll need to sort the keys
            if (!l->empty() && v.mTime <= l->back().mTime)
@@ -902,23 +899,23 @@ void Discreet3DSImporter::ParseFaceChunk() {
        if (num > mMesh.mFaces.size()) {
            throw DeadlyImportError("3DS: More smoothing groups than faces");
        }
-        for (std::vector<D3DS::Face>::iterator i = mMesh.mFaces.begin(); m != num; ++i, ++m) {
+        for (auto i = mMesh.mFaces.begin(); m != num; ++i, ++m) {
            // nth bit is set for nth smoothing group
-            (*i).iSmoothGroup = stream->GetI4();
+            i->iSmoothGroup = mStream->GetI4();
        }
    } break;

    case Discreet3DS::CHUNK_FACEMAT: {
        // at fist an asciiz with the material name
-        const char *sz = (const char *)stream->GetPtr();
-        while (stream->GetI1())
+        const char *sz = (const char *)mStream->GetPtr();
+        while (mStream->GetI1())
            ;

        // find the index of the material
        unsigned int idx = 0xcdcdcdcd, cnt = 0;
-        for (std::vector<D3DS::Material>::const_iterator i = mScene->mMaterials.begin(); i != mScene->mMaterials.end(); ++i, ++cnt) {
+        for (auto i = mScene->mMaterials.begin(); i != mScene->mMaterials.end(); ++i, ++cnt) {
            // use case independent comparisons. hopefully it will work.
-            if ((*i).mName.length() && !ASSIMP_stricmp(sz, (*i).mName.c_str())) {
+            if (i->mName.length() && !ASSIMP_stricmp(sz, i->mName.c_str())) {
                idx = cnt;
                break;
            }
@@ -928,9 +925,9 @@ void Discreet3DSImporter::ParseFaceChunk() {
        }

        // Now continue and read all material indices
-        cnt = (uint16_t)stream->GetI2();
+        cnt = (uint16_t)mStream->GetI2();
        for (unsigned int i = 0; i < cnt; ++i) {
-            unsigned int fidx = (uint16_t)stream->GetI2();
+            unsigned int fidx = (uint16_t)mStream->GetI2();

            // check range
            if (fidx >= mMesh.mFaceMaterials.size()) {
@@ -955,59 +952,59 @@ void Discreet3DSImporter::ParseMeshChunk() {
    switch (chunk.Flag) {
    case Discreet3DS::CHUNK_VERTLIST: {
        // This is the list of all vertices in the current mesh
-        int num = (int)(uint16_t)stream->GetI2();
+        int num = (int)(uint16_t)mStream->GetI2();
        mMesh.mPositions.reserve(num);
        while (num-- > 0) {
            aiVector3D v;
-            v.x = stream->GetF4();
-            v.y = stream->GetF4();
-            v.z = stream->GetF4();
+            v.x = mStream->GetF4();
+            v.y = mStream->GetF4();
+            v.z = mStream->GetF4();
            mMesh.mPositions.push_back(v);
        }
    } break;
    case Discreet3DS::CHUNK_TRMATRIX: {
        // This is the RLEATIVE transformation matrix of the current mesh. Vertices are
        // pretransformed by this matrix wonder.
-        mMesh.mMat.a1 = stream->GetF4();
-        mMesh.mMat.b1 = stream->GetF4();
-        mMesh.mMat.c1 = stream->GetF4();
-        mMesh.mMat.a2 = stream->GetF4();
-        mMesh.mMat.b2 = stream->GetF4();
-        mMesh.mMat.c2 = stream->GetF4();
-        mMesh.mMat.a3 = stream->GetF4();
-        mMesh.mMat.b3 = stream->GetF4();
-        mMesh.mMat.c3 = stream->GetF4();
-        mMesh.mMat.a4 = stream->GetF4();
-        mMesh.mMat.b4 = stream->GetF4();
-        mMesh.mMat.c4 = stream->GetF4();
+        mMesh.mMat.a1 = mStream->GetF4();
+        mMesh.mMat.b1 = mStream->GetF4();
+        mMesh.mMat.c1 = mStream->GetF4();
+        mMesh.mMat.a2 = mStream->GetF4();
+        mMesh.mMat.b2 = mStream->GetF4();
+        mMesh.mMat.c2 = mStream->GetF4();
+        mMesh.mMat.a3 = mStream->GetF4();
+        mMesh.mMat.b3 = mStream->GetF4();
+        mMesh.mMat.c3 = mStream->GetF4();
+        mMesh.mMat.a4 = mStream->GetF4();
+        mMesh.mMat.b4 = mStream->GetF4();
+        mMesh.mMat.c4 = mStream->GetF4();
    } break;

    case Discreet3DS::CHUNK_MAPLIST: {
        // This is the list of all UV coords in the current mesh
-        int num = (int)(uint16_t)stream->GetI2();
+        int num = (int)(uint16_t)mStream->GetI2();
        mMesh.mTexCoords.reserve(num);
        while (num-- > 0) {
            aiVector3D v;
-            v.x = stream->GetF4();
-            v.y = stream->GetF4();
+            v.x = mStream->GetF4();
+            v.y = mStream->GetF4();
            mMesh.mTexCoords.push_back(v);
        }
    } break;

    case Discreet3DS::CHUNK_FACELIST: {
        // This is the list of all faces in the current mesh
-        int num = (int)(uint16_t)stream->GetI2();
+        int num = (int)(uint16_t)mStream->GetI2();
        mMesh.mFaces.reserve(num);
        while (num-- > 0) {
            // 3DS faces are ALWAYS triangles
            mMesh.mFaces.emplace_back();
-            D3DS::Face &sFace = mMesh.mFaces.back();
+            Face &sFace = mMesh.mFaces.back();

-            sFace.mIndices[0] = (uint16_t)stream->GetI2();
-            sFace.mIndices[1] = (uint16_t)stream->GetI2();
-            sFace.mIndices[2] = (uint16_t)stream->GetI2();
+            sFace.mIndices[0] = (uint16_t)mStream->GetI2();
+            sFace.mIndices[1] = (uint16_t)mStream->GetI2();
+            sFace.mIndices[2] = (uint16_t)mStream->GetI2();

-            stream->IncPtr(2); // skip edge visibility flag
+            mStream->IncPtr(2); // skip edge visibility flag
        }

        // Resize the material array (0xcdcdcdcd marks the default material; so if a face is
@@ -1015,7 +1012,7 @@ void Discreet3DSImporter::ParseMeshChunk() {
        mMesh.mFaceMaterials.resize(mMesh.mFaces.size(), 0xcdcdcdcd);

        // Larger 3DS files could have multiple FACE chunks here
-        chunkSize = (int)stream->GetRemainingSizeToLimit();
+        chunkSize = (int)mStream->GetRemainingSizeToLimit();
        if (chunkSize > (int)sizeof(Discreet3DS::Chunk))
            ParseFaceChunk();
    } break;
@@ -1032,9 +1029,9 @@ void Discreet3DSImporter::ParseMaterialChunk() {

    {
        // The material name string is already zero-terminated, but we need to be sure ...
-        const char *sz = (const char *)stream->GetPtr();
+        const char *sz = (const char *)mStream->GetPtr();
        unsigned int cnt = 0;
-        while (stream->GetI1())
+        while (mStream->GetI1())
            ++cnt;

        if (!cnt) {
@@ -1102,7 +1099,7 @@ void Discreet3DSImporter::ParseMaterialChunk() {

    case Discreet3DS::CHUNK_MAT_SHADING:
        // This is the material shading mode
-        mScene->mMaterials.back().mShading = (D3DS::Discreet3DS::shadetype3ds)stream->GetI2();
+        mScene->mMaterials.back().mShading = (Discreet3DS::shadetype3ds)mStream->GetI2();
        break;

    case Discreet3DS::CHUNK_MAT_TWO_SIDE:
@@ -1178,31 +1175,31 @@ void Discreet3DSImporter::ParseTextureChunk(D3DS::Texture *pcOut) {
    switch (chunk.Flag) {
    case Discreet3DS::CHUNK_MAPFILE: {
        // The material name string is already zero-terminated, but we need to be sure ...
-        const char *sz = (const char *)stream->GetPtr();
+        const char *sz = (const char *)mStream->GetPtr();
        unsigned int cnt = 0;
-        while (stream->GetI1())
+        while (mStream->GetI1())
            ++cnt;
        pcOut->mMapName = std::string(sz, cnt);
    } break;

    case Discreet3DS::CHUNK_PERCENTD:
        // Manually parse the blend factor
-        pcOut->mTextureBlend = ai_real(stream->GetF8());
+        pcOut->mTextureBlend = ai_real(mStream->GetF8());
        break;

    case Discreet3DS::CHUNK_PERCENTF:
        // Manually parse the blend factor
-        pcOut->mTextureBlend = stream->GetF4();
+        pcOut->mTextureBlend = mStream->GetF4();
        break;

    case Discreet3DS::CHUNK_PERCENTW:
        // Manually parse the blend factor
-        pcOut->mTextureBlend = (ai_real)((uint16_t)stream->GetI2()) / ai_real(100.0);
+        pcOut->mTextureBlend = (ai_real)((uint16_t) mStream->GetI2()) / ai_real(100.0);
        break;

    case Discreet3DS::CHUNK_MAT_MAP_USCALE:
        // Texture coordinate scaling in the U direction
-        pcOut->mScaleU = stream->GetF4();
+        pcOut->mScaleU = mStream->GetF4();
        if (0.0f == pcOut->mScaleU) {
            ASSIMP_LOG_WARN("Texture coordinate scaling in the x direction is zero. Assuming 1.");
            pcOut->mScaleU = 1.0f;
@@ -1210,7 +1207,7 @@ void Discreet3DSImporter::ParseTextureChunk(D3DS::Texture *pcOut) {
        break;
    case Discreet3DS::CHUNK_MAT_MAP_VSCALE:
        // Texture coordinate scaling in the V direction
-        pcOut->mScaleV = stream->GetF4();
+        pcOut->mScaleV = mStream->GetF4();
        if (0.0f == pcOut->mScaleV) {
            ASSIMP_LOG_WARN("Texture coordinate scaling in the y direction is zero. Assuming 1.");
            pcOut->mScaleV = 1.0f;
@@ -1219,21 +1216,21 @@ void Discreet3DSImporter::ParseTextureChunk(D3DS::Texture *pcOut) {

    case Discreet3DS::CHUNK_MAT_MAP_UOFFSET:
        // Texture coordinate offset in the U direction
-        pcOut->mOffsetU = -stream->GetF4();
+        pcOut->mOffsetU = -mStream->GetF4();
        break;

    case Discreet3DS::CHUNK_MAT_MAP_VOFFSET:
        // Texture coordinate offset in the V direction
-        pcOut->mOffsetV = stream->GetF4();
+        pcOut->mOffsetV = mStream->GetF4();
        break;

    case Discreet3DS::CHUNK_MAT_MAP_ANG:
        // Texture coordinate rotation, CCW in DEGREES
-        pcOut->mRotation = -AI_DEG_TO_RAD(stream->GetF4());
+        pcOut->mRotation = -AI_DEG_TO_RAD(mStream->GetF4());
        break;

    case Discreet3DS::CHUNK_MAT_MAP_TILING: {
-        const uint16_t iFlags = stream->GetI2();
+        const uint16_t iFlags = mStream->GetI2();

        // Get the mapping mode (for both axes)
        if (iFlags & 0x2u)
@@ -1258,9 +1255,11 @@ ai_real Discreet3DSImporter::ParsePercentageChunk() {
    ReadChunk(&chunk);

    if (Discreet3DS::CHUNK_PERCENTF == chunk.Flag) {
-        return stream->GetF4() * ai_real(100) / ai_real(0xFFFF);
-    } else if (Discreet3DS::CHUNK_PERCENTW == chunk.Flag) {
-        return (ai_real)((uint16_t)stream->GetI2()) / (ai_real)0xFFFF;
+        return mStream->GetF4() * ai_real(100) / ai_real(0xFFFF);
+    }
+
+    if (Discreet3DS::CHUNK_PERCENTW == chunk.Flag) {
+        return (ai_real)((uint16_t)mStream->GetI2()) / (ai_real)0xFFFF;
    }

    return get_qnan();
@@ -1291,9 +1290,9 @@ void Discreet3DSImporter::ParseColorChunk(aiColor3D *out, bool acceptPercent) {
            *out = clrError;
            return;
        }
-        out->r = stream->GetF4();
-        out->g = stream->GetF4();
-        out->b = stream->GetF4();
+        out->r = mStream->GetF4();
+        out->g = mStream->GetF4();
+        out->b = mStream->GetF4();
        break;

    case Discreet3DS::CHUNK_LINRGBB:
@@ -1305,15 +1304,15 @@ void Discreet3DSImporter::ParseColorChunk(aiColor3D *out, bool acceptPercent) {
            return;
        }
        const ai_real invVal = ai_real(1.0) / ai_real(255.0);
-        out->r = (ai_real)(uint8_t)stream->GetI1() * invVal;
-        out->g = (ai_real)(uint8_t)stream->GetI1() * invVal;
-        out->b = (ai_real)(uint8_t)stream->GetI1() * invVal;
+        out->r = (ai_real)(uint8_t)mStream->GetI1() * invVal;
+        out->g = (ai_real)(uint8_t)mStream->GetI1() * invVal;
+        out->b = (ai_real)(uint8_t)mStream->GetI1() * invVal;
    } break;

    // Percentage chunks are accepted, too.
    case Discreet3DS::CHUNK_PERCENTF:
        if (acceptPercent && 4 <= diff) {
-            out->g = out->b = out->r = stream->GetF4();
+            out->g = out->b = out->r = mStream->GetF4();
            break;
        }
        *out = clrError;
@@ -1321,14 +1320,14 @@ void Discreet3DSImporter::ParseColorChunk(aiColor3D *out, bool acceptPercent) {

    case Discreet3DS::CHUNK_PERCENTW:
        if (acceptPercent && 1 <= diff) {
-            out->g = out->b = out->r = (ai_real)(uint8_t)stream->GetI1() / ai_real(255.0);
+            out->g = out->b = out->r = (ai_real)(uint8_t)mStream->GetI1() / ai_real(255.0);
            break;
        }
        *out = clrError;
        return;

    default:
-        stream->IncPtr(diff);
+        mStream->IncPtr(diff);
        // Skip unknown chunks, hope this won't cause any problems.
        return ParseColorChunk(out, acceptPercent);
    };
@@ -49,7 +49,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/BaseImporter.h>
 #include <assimp/types.h>

-
 #include "3DSHelper.h"
 #include <assimp/StreamReader.h>

@@ -57,8 +56,6 @@ struct aiNode;

 namespace Assimp {

-using namespace D3DS;
-
 // ---------------------------------------------------------------------------------
 /** Importer class for 3D Studio r3 and r4 3DS files
 */
@@ -99,15 +96,14 @@ protected:
    // -------------------------------------------------------------------
    /** Converts a temporary material to the outer representation
     */
-    void ConvertMaterial(D3DS::Material& p_cMat,
-        aiMaterial& p_pcOut);
+    void ConvertMaterial(D3DS::Material& p_cMat, aiMaterial& p_pcOut);

    // -------------------------------------------------------------------
    /** Read a chunk
     *
     *  @param pcOut Receives the current chunk
     */
-    void ReadChunk(Discreet3DS::Chunk* pcOut);
+    void ReadChunk(D3DS::Discreet3DS::Chunk* pcOut);

    // -------------------------------------------------------------------
    /** Parse a percentage chunk. mCurrent will point to the next
@@ -117,12 +113,10 @@ protected:
    ai_real ParsePercentageChunk();

    // -------------------------------------------------------------------
-    /** Parse a color chunk. mCurrent will point to the next
-    * chunk behind afterwards. If no color chunk is found
-    * QNAN is returned in all members.
-    */
-    void ParseColorChunk(aiColor3D* p_pcOut,
-        bool p_bAcceptPercent = true);
+    /** Parse a color chunk. mCurrent will point to the next chunk behind
+     * afterward. If no color chunk is found QNAN is returned in all members.
+     */
+    void ParseColorChunk(aiColor3D* p_pcOut, bool p_bAcceptPercent = true);

    // -------------------------------------------------------------------
    /** Skip a chunk in the file
@@ -130,7 +124,7 @@ protected:
    void SkipChunk();

    // -------------------------------------------------------------------
-    /** Generate the nodegraph
+    /** Generate the node-graph
    */
    void GenerateNodeGraph(aiScene* pcOut);

@@ -226,19 +220,19 @@ protected:
    // -------------------------------------------------------------------
    /** Add a node to the node graph
    */
-    void AddNodeToGraph(aiScene* pcSOut,aiNode* pcOut,D3DS::Node* pcIn,
+    void AddNodeToGraph(aiScene* pcSOut,aiNode* pcOut, D3DS::Node* pcIn,
        aiMatrix4x4& absTrafo);

    // -------------------------------------------------------------------
    /** Search for a node in the graph.
    * Called recursively
    */
-    void InverseNodeSearch(D3DS::Node* pcNode,D3DS::Node* pcCurrent);
+    void InverseNodeSearch(D3DS::Node* pcNode, D3DS::Node* pcCurrent);

    // -------------------------------------------------------------------
    /** Apply the master scaling factor to the mesh
    */
-    void ApplyMasterScale(aiScene* pScene);
+    void ApplyMasterScale(const aiScene* pScene);

    // -------------------------------------------------------------------
    /** Clamp all indices in the file to a valid range
@@ -250,31 +244,26 @@ protected:
    */
    void SkipTCBInfo();

-protected:
-
-    /** Stream to read from */
-    StreamReaderLE* stream;
-
-    /** Last touched node index */
+private:
+    /// Stream to read from
+    StreamReaderLE* mStream;
+    /// Last touched node index
    short mLastNodeIndex;
-
-    /** Current node, root node */
-    D3DS::Node* mCurrentNode, *mRootNode;
-
-    /** Scene under construction */
+    /// Current node
+    D3DS::Node* mCurrentNode;
+    /// Root node
+    D3DS::Node *mRootNode;
+    /// Scene under construction
    D3DS::Scene* mScene;
-
-    /** Ambient base color of the scene */
+    /// Ambient base color of the scene
    aiColor3D mClrAmbient;
-
-    /** Master scaling factor of the scene */
+    /// Master scaling factor of the scene
    ai_real mMasterScale;
-
-    /** Path to the background image of the scene */
+    /// Path to the background image of the scene
    std::string mBackgroundImage;
+    /// true for has a background
    bool bHasBG;
-
-    /** true if PRJ file */
+    /// true if PRJ file
    bool bIsPrj;
 };

@@ -49,8 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 struct aiMaterial;
 struct aiMesh;

-namespace Assimp {
-namespace D3MF {
+namespace Assimp:: D3MF {

 enum class ResourceType {
    RT_Object,
@@ -65,8 +64,7 @@ class Resource {
 public:
    int mId;

-    Resource(int id) :
-            mId(id) {
+    explicit Resource(int id) : mId(id) {
        // empty
    }

@@ -77,7 +75,7 @@ public:
    }
 };

-class EmbeddedTexture : public Resource {
+class EmbeddedTexture final : public Resource {
 public:
    std::string mPath;
    std::string mContentType;
@@ -85,12 +83,7 @@ public:
    std::string mTilestyleV;
    std::vector<char> mBuffer;

-    EmbeddedTexture(int id) :
-            Resource(id),
-            mPath(),
-            mContentType(),
-            mTilestyleU(),
-            mTilestyleV() {
+    explicit EmbeddedTexture(int id) : Resource(id) {
        // empty
    }

@@ -101,13 +94,12 @@ public:
    }
 };

-class Texture2DGroup : public Resource {
+class Texture2DGroup final : public Resource {
 public:
    std::vector<aiVector2D> mTex2dCoords;
    int mTexId;
-    Texture2DGroup(int id) :
-            Resource(id),
-            mTexId(-1) {
+
+    explicit Texture2DGroup(int id) : Resource(id), mTexId(-1) {
        // empty
    }

@@ -118,11 +110,11 @@ public:
    }
 };

-class ColorGroup : public Resource {
+class ColorGroup final : public Resource {
 public:
    std::vector<aiColor4D> mColors;
-    ColorGroup(int id) :
-            Resource(id){
+
+    explicit ColorGroup(int id) : Resource(id) {
        // empty
    }

@@ -133,13 +125,11 @@ public:
    }
 };

-class BaseMaterials : public Resource {
+class BaseMaterials final : public Resource {
 public:
    std::vector<unsigned int> mMaterialIndex;

-    BaseMaterials(int id) :
-            Resource(id),
-            mMaterialIndex() {
+    explicit BaseMaterials(int id) : Resource(id) {
        // empty
    }

@@ -155,14 +145,14 @@ struct Component {
    aiMatrix4x4 mTransformation;
 };

-class Object : public Resource {
+class Object final : public Resource {
 public:
-    MeshArray mMeshes;
+    std::vector<aiMesh *> mMeshes;
    std::vector<unsigned int> mMeshIndex;
    std::vector<Component> mComponents;
    std::string mName;

-    Object(int id) :
+    explicit Object(int id) :
            Resource(id),
            mName(std::string("Object_") + ai_to_string(id)) {
        // empty
@@ -175,5 +165,4 @@ public:
    }
 };

-} // namespace D3MF
-} // namespace Assimp
+} // namespace Assimp::D3MF
@@ -40,85 +40,80 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #pragma once

-namespace Assimp {
-namespace D3MF {
-
-namespace XmlTag {
+namespace Assimp::D3MF::XmlTag {
    // Root tag
-    const char* const RootTag = "3MF";
+    constexpr char RootTag[] = "3MF";

    // Meta-data
-    const char* const meta = "metadata";
-    const char* const meta_name = "name";
+    constexpr char meta[] = "metadata";
+    constexpr char meta_name[] = "name";

    // Model-data specific tags
-    const char* const model = "model";
-    const char* const model_unit = "unit";
-    const char* const metadata = "metadata";
-    const char* const resources = "resources";
-    const char* const object = "object";
-    const char* const mesh = "mesh";
-    const char* const components = "components";
-    const char* const component = "component";
-    const char* const vertices = "vertices";
-    const char* const vertex = "vertex";
-    const char* const triangles = "triangles";
-    const char* const triangle = "triangle";
-    const char* const x = "x";
-    const char* const y = "y";
-    const char* const z = "z";
-    const char* const v1 = "v1";
-    const char* const v2 = "v2";
-    const char* const v3 = "v3";
-    const char* const id = "id";
-    const char* const pid = "pid";
-    const char* const pindex = "pindex";
-    const char* const p1 = "p1";
-    const char *const p2 = "p2";
-    const char *const p3 = "p3";
-    const char* const name = "name";
-    const char* const type = "type";
-    const char* const build = "build";
-    const char* const item = "item";
-    const char* const objectid = "objectid";
-    const char* const transform = "transform";
-    const char *const path = "path";
+    constexpr char model[] = "model";
+    constexpr char model_unit[] = "unit";
+    constexpr char metadata[] = "metadata";
+    constexpr char resources[] = "resources";
+    constexpr char object[] = "object";
+    constexpr char mesh[] = "mesh";
+    constexpr char components[] = "components";
+    constexpr char component[] = "component";
+    constexpr char vertices[] = "vertices";
+    constexpr char vertex[] = "vertex";
+    constexpr char triangles[] = "triangles";
+    constexpr char triangle[] = "triangle";
+    constexpr char x[] = "x";
+    constexpr char y[] = "y";
+    constexpr char z[] = "z";
+    constexpr char v1[] = "v1";
+    constexpr char v2[] = "v2";
+    constexpr char v3[] = "v3";
+    constexpr char id[] = "id";
+    constexpr char pid[] = "pid";
+    constexpr char pindex[] = "pindex";
+    constexpr char p1[] = "p1";
+    constexpr char p2[] = "p2";
+    constexpr char p3[] = "p3";
+    constexpr char name[] = "name";
+    constexpr char type[] = "type";
+    constexpr char build[] = "build";
+    constexpr char item[] = "item";
+    constexpr char objectid[] = "objectid";
+    constexpr char transform[] = "transform";
+    constexpr char path[] = "path";

    // Material definitions
-    const char* const basematerials = "basematerials";
-    const char* const basematerials_base = "base";
-    const char* const basematerials_name = "name";
-    const char* const basematerials_displaycolor = "displaycolor";
-    const char* const texture_2d = "m:texture2d";
-    const char *const texture_group = "m:texture2dgroup";
-    const char *const texture_content_type = "contenttype";
-    const char *const texture_tilestyleu = "tilestyleu";
-    const char *const texture_tilestylev = "tilestylev";
-    const char *const texture_2d_coord = "m:tex2coord";
-    const char *const texture_cuurd_u = "u";
-    const char *const texture_cuurd_v = "v";
+    constexpr char basematerials[] = "basematerials";
+    constexpr char basematerials_base[] = "base";
+    constexpr char basematerials_name[] = "name";
+    constexpr char basematerials_displaycolor[] = "displaycolor";
+    constexpr char texture_2d[] = "m:texture2d";
+    constexpr char texture_group[] = "m:texture2dgroup";
+    constexpr char texture_content_type[] = "contenttype";
+    constexpr char texture_tilestyleu[] = "tilestyleu";
+    constexpr char texture_tilestylev[] = "tilestylev";
+    constexpr char texture_2d_coord[] = "m:tex2coord";
+    constexpr char texture_cuurd_u[] = "u";
+    constexpr char texture_cuurd_v[] = "v";

    // vertex color definitions
-    const char *const colorgroup = "m:colorgroup";
-    const char *const color_item = "m:color";
-    const char *const color_vaule = "color";
+    constexpr char colorgroup[] = "m:colorgroup";
+    constexpr char color_item[] = "m:color";
+    constexpr char color_value[] = "color";

    // Meta info tags
-    const char* const CONTENT_TYPES_ARCHIVE = "[Content_Types].xml";
-    const char* const ROOT_RELATIONSHIPS_ARCHIVE = "_rels/.rels";
-    const char* const SCHEMA_CONTENTTYPES = "http://schemas.openxmlformats.org/package/2006/content-types";
-    const char* const SCHEMA_RELATIONSHIPS = "http://schemas.openxmlformats.org/package/2006/relationships";
-    const char* const RELS_RELATIONSHIP_CONTAINER = "Relationships";
-    const char* const RELS_RELATIONSHIP_NODE = "Relationship";
-    const char* const RELS_ATTRIB_TARGET = "Target";
-    const char* const RELS_ATTRIB_TYPE = "Type";
-    const char* const RELS_ATTRIB_ID = "Id";
-    const char* const PACKAGE_START_PART_RELATIONSHIP_TYPE = "http://schemas.microsoft.com/3dmanufacturing/2013/01/3dmodel";
-    const char* const PACKAGE_PRINT_TICKET_RELATIONSHIP_TYPE = "http://schemas.microsoft.com/3dmanufacturing/2013/01/printticket";
-    const char* const PACKAGE_TEXTURE_RELATIONSHIP_TYPE = "http://schemas.microsoft.com/3dmanufacturing/2013/01/3dtexture";
-    const char* const PACKAGE_CORE_PROPERTIES_RELATIONSHIP_TYPE = "http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties";
-    const char* const PACKAGE_THUMBNAIL_RELATIONSHIP_TYPE = "http://schemas.openxmlformats.org/package/2006/relationships/metadata/thumbnail";
-}
+    constexpr char CONTENT_TYPES_ARCHIVE[] = "[Content_Types].xml";
+    constexpr char ROOT_RELATIONSHIPS_ARCHIVE[] = "_rels/.rels";
+    constexpr char SCHEMA_CONTENTTYPES[] = "http://schemas.openxmlformats.org/package/2006/content-types";
+    constexpr char SCHEMA_RELATIONSHIPS[] = "http://schemas.openxmlformats.org/package/2006/relationships";
+    constexpr char RELS_RELATIONSHIP_CONTAINER[] = "Relationships";
+    constexpr char RELS_RELATIONSHIP_NODE[] = "Relationship";
+    constexpr char RELS_ATTRIB_TARGET[] = "Target";
+    constexpr char RELS_ATTRIB_TYPE[] = "Type";
+    constexpr char RELS_ATTRIB_ID[] = "Id";
+    constexpr char PACKAGE_START_PART_RELATIONSHIP_TYPE[] = "http://schemas.microsoft.com/3dmanufacturing/2013/01/3dmodel";
+    constexpr char PACKAGE_PRINT_TICKET_RELATIONSHIP_TYPE[] = "http://schemas.microsoft.com/3dmanufacturing/2013/01/printticket";
+    constexpr char PACKAGE_TEXTURE_RELATIONSHIP_TYPE[] = "http://schemas.microsoft.com/3dmanufacturing/2013/01/3dtexture";
+    constexpr char PACKAGE_CORE_PROPERTIES_RELATIONSHIP_TYPE[] = "http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties";
+    constexpr char PACKAGE_THUMBNAIL_RELATIONSHIP_TYPE[] = "http://schemas.openxmlformats.org/package/2006/relationships/metadata/thumbnail";

-} // Namespace D3MF
-} // Namespace Assimp
+} // namespace Assimp::D3MF
@@ -48,7 +48,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/scene.h>
 #include <assimp/DefaultLogger.hpp>
 #include <assimp/Exporter.hpp>
-#include <assimp/IOStream.hpp>
 #include <assimp/IOSystem.hpp>

 #include "3MFXmlTags.h"
@@ -94,7 +93,7 @@ D3MFExporter::~D3MFExporter() {
    mRelations.clear();
 }

-bool D3MFExporter::validate() {
+bool D3MFExporter::validate() const {
    if (mArchiveName.empty()) {
        return false;
    }
@@ -68,7 +68,7 @@ class D3MFExporter {
 public:
    D3MFExporter( const char* pFile, const aiScene* pScene );
    ~D3MFExporter();
-    bool validate();
+    bool validate() const;
    bool exportArchive( const char *file );
    bool exportContentTypes();
    bool exportRelations();
@@ -53,7 +53,7 @@ namespace Assimp {
 ///
 /// Implements the basic topology import and embedded textures.
 // ---------------------------------------------------------------------------
-class D3MFImporter : public BaseImporter {
+class D3MFImporter final : public BaseImporter {
 public:
    /// @brief The default class constructor.
    D3MFImporter() = default;
@@ -58,16 +58,16 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <map>
 #include <vector>

-namespace Assimp::D3MF {
+namespace Assimp {

+namespace D3MF {
 // ------------------------------------------------------------------------------------------------

 using OpcPackageRelationshipPtr = std::shared_ptr<OpcPackageRelationship>;

-class OpcPackageRelationshipReader {
+class OpcPackageRelationshipReader final {
 public:
-    OpcPackageRelationshipReader(XmlParser &parser) :
-            mRelations() {
+    explicit OpcPackageRelationshipReader(XmlParser &parser) : mRelations() {
        XmlNode root = parser.getRootNode();
        ParseRootNode(root);
    }
@@ -131,11 +131,9 @@ static bool IsEmbeddedTexture( const std::string &filename ) {
 // ------------------------------------------------------------------------------------------------
 D3MFOpcPackage::D3MFOpcPackage(IOSystem *pIOHandler, const std::string &rFile) :
        mRootStream(nullptr),
-        mZipArchive(nullptr) {
+        mZipArchive() {
    mZipArchive = new ZipArchiveIOSystem(pIOHandler, rFile);
    if (!mZipArchive->isOpen()) {
-        delete mZipArchive;
-        mZipArchive = nullptr;
        throw DeadlyImportError("Failed to open file ", rFile, ".");
    }

@@ -185,9 +183,7 @@ D3MFOpcPackage::D3MFOpcPackage(IOSystem *pIOHandler, const std::string &rFile) :
 }

 D3MFOpcPackage::~D3MFOpcPackage() {
-    if (mRootStream && mZipArchive) {
-        mZipArchive->Close(mRootStream);
-    }
+    mZipArchive->Close(mRootStream);
    delete mZipArchive;
 }

@@ -253,6 +249,7 @@ void D3MFOpcPackage::LoadEmbeddedTextures(IOStream *fileStream, const std::strin
    mEmbeddedTextures.emplace_back(texture);
 }

-} // Namespace Assimp::D3MF
+} // Namespace D3MF
+} // Namespace Assimp

 #endif //ASSIMP_BUILD_NO_3MF_IMPORTER
@@ -495,16 +495,13 @@ void XmlSerializer::ImportTriangles(XmlNode &node, aiMesh *mesh) {
                            }
                            mesh->mTextureCoords[0] = new aiVector3D[mesh->mNumVertices];
                            for (unsigned int vertex_index = 0; vertex_index < mesh->mNumVertices; vertex_index++) {
-                                mesh->mTextureCoords[0][vertex_index].z = IdNotSet; //mark not set
+                                mesh->mTextureCoords[0][vertex_index].z = IdNotSet;//mark not set
                            }
                        }

                        auto update_texture = [&](int idx) {
                            if (pindex[idx] != IdNotSet) {
                                size_t vertex_index = face.mIndices[idx];
-                                if (vertex_index >= mesh->mNumVertices) {
-                                    return;
-                                }
                                mesh->mTextureCoords[0][vertex_index] =
                                        aiVector3D(group->mTex2dCoords[pindex[idx]].x, group->mTex2dCoords[pindex[idx]].y, 0.0f);
                            }
@@ -524,9 +521,6 @@ void XmlSerializer::ImportTriangles(XmlNode &node, aiMesh *mesh) {
                        auto update_color = [&](int idx) {
                            if (pindex[idx] != IdNotSet) {
                                size_t vertex_index = face.mIndices[idx];
-                                if (vertex_index >= mesh->mNumVertices) {
-                                    return;
-                                }
                                mesh->mColors[0][vertex_index] = group->mColors[pindex[idx]];
                            }
                        };
@@ -686,7 +680,7 @@ void XmlSerializer::ReadColor(XmlNode &node, ColorGroup *colorGroup) {
    for (XmlNode currentNode : node.children()) {
        const std::string currentName = currentNode.name();
        if (currentName == XmlTag::color_item) {
-            const char *color = currentNode.attribute(XmlTag::color_vaule).as_string();
+            const char *color = currentNode.attribute(XmlTag::color_value).as_string();
            aiColor4D color_value;
            if (parseColor(color, color_value)) {
                colorGroup->mColors.push_back(color_value);
@@ -59,9 +59,10 @@ class Texture2DGroup;
 class EmbeddedTexture;
 class ColorGroup;

+/// @brief his class implements ther 3mf serialization.
 class XmlSerializer final {
 public:
-    XmlSerializer(XmlParser &xmlParser);
+    explicit XmlSerializer(XmlParser &xmlParser);
    ~XmlSerializer();
    void ImportXml(aiScene *scene);

@@ -418,7 +418,7 @@ void AC3DImporter::ConvertMaterial(const Object &object,
 // ------------------------------------------------------------------------------------------------
 // Converts the loaded data to the internal verbose representation
 aiNode *AC3DImporter::ConvertObjectSection(Object &object,
-        MeshArray &meshes,
+        std::vector<aiMesh *> &meshes,
        std::vector<aiMaterial *> &outMaterials,
        const std::vector<Material> &materials,
        aiNode *parent) {
@@ -710,7 +710,7 @@ aiNode *AC3DImporter::ConvertObjectSection(Object &object,
                    std::unique_ptr<Subdivider> div(Subdivider::Create(Subdivider::CATMULL_CLARKE));
                    ASSIMP_LOG_INFO("AC3D: Evaluating subdivision surface: ", object.name);

-                    MeshArray cpy(meshes.size() - oldm, nullptr);
+                    std::vector<aiMesh *> cpy(meshes.size() - oldm, nullptr);
                    div->Subdivide(&meshes[oldm], cpy.size(), &cpy.front(), object.subDiv, true);
                    std::copy(cpy.begin(), cpy.end(), meshes.begin() + oldm);

@@ -846,7 +846,7 @@ void AC3DImporter::InternReadFile(const std::string &pFile,
    }

    mNumMeshes += (mNumMeshes >> 2u) + 1;
-    MeshArray meshes;
+    std::vector<aiMesh *> meshes;
    meshes.reserve(mNumMeshes);

    std::vector<aiMaterial *> omaterials;
@@ -60,7 +60,7 @@ namespace Assimp {
 // ---------------------------------------------------------------------------
 /** AC3D (*.ac) importer class
 */
-class AC3DImporter : public BaseImporter {
+class AC3DImporter final : public BaseImporter {
 public:
    AC3DImporter();
    ~AC3DImporter() override = default;
@@ -226,7 +226,7 @@ private:
     *  @param materials Material list
     *  @param Scenegraph node for the object */
    aiNode *ConvertObjectSection(Object &object,
-            MeshArray &meshes,
+            std::vector<aiMesh *> &meshes,
            std::vector<aiMaterial *> &outMaterials,
            const std::vector<Material> &materials,
            aiNode *parent = nullptr);
@@ -327,8 +327,7 @@ void AMFImporter::ParseNode_Root() {
 // Multi elements - Yes.
 // Parent element - <amf>.
 void AMFImporter::ParseNode_Constellation(XmlNode &node) {
-    std::string id;
-    id = node.attribute("id").as_string();
+    std::string id = node.attribute("id").as_string();

    // create and if needed - define new grouping object.
    AMFNodeElementBase *ne = new AMFConstellation(mNodeElement_Cur);
@@ -97,8 +97,10 @@ namespace Assimp {
 ///            new - <texmap> and children <utex1>, <utex2>, <utex3>, <vtex1>, <vtex2>, <vtex3>
 ///            old - <map> and children <u1>, <u2>, <u3>, <v1>, <v2>, <v3>
 ///
-class AMFImporter : public BaseImporter {
+class AMFImporter final : public BaseImporter {
    using AMFMetaDataArray = std::vector<AMFMetadata *>;
+    using MeshArray = std::vector<aiMesh *>;
+    using NodeArray = std::vector<aiNode *>;

 public:
    struct SPP_Material;
@@ -107,16 +107,16 @@ protected:
 }; // class IAMFImporter_NodeElement

 /// A collection of objects or constellations with specific relative locations.
-struct AMFConstellation : public AMFNodeElementBase {
+struct AMFConstellation final : public AMFNodeElementBase {
 	/// Constructor.
 	/// \param [in] pParent - pointer to parent node.
-	AMFConstellation(AMFNodeElementBase *pParent) :
+	explicit AMFConstellation(AMFNodeElementBase *pParent) :
 			AMFNodeElementBase(ENET_Constellation, pParent) {}

 }; // struct CAMFImporter_NodeElement_Constellation

 /// Part of constellation.
-struct AMFInstance : public AMFNodeElementBase {
+struct AMFInstance final : public AMFNodeElementBase {

 	std::string ObjectID; ///< ID of object for instantiation.
 	/// \var Delta - The distance of translation in the x, y, or z direction, respectively, in the referenced object's coordinate system, to
@@ -129,7 +129,7 @@ struct AMFInstance : public AMFNodeElementBase {

 	/// Constructor.
 	/// \param [in] pParent - pointer to parent node.
-	AMFInstance(AMFNodeElementBase *pParent) :
+	explicit AMFInstance(AMFNodeElementBase *pParent) :
 			AMFNodeElementBase(ENET_Instance, pParent) {}
 };

@@ -141,8 +141,10 @@ struct AMFMetadata : public AMFNodeElementBase {

 	/// Constructor.
 	/// \param [in] pParent - pointer to parent node.
-	AMFMetadata(AMFNodeElementBase *pParent) :
-			AMFNodeElementBase(ENET_Metadata, pParent) {}
+	explicit AMFMetadata(AMFNodeElementBase *pParent) :
+			AMFNodeElementBase(ENET_Metadata, pParent) {
+	    // empty	
+	}
 };

 /// Structure that define root node.
@@ -153,8 +155,10 @@ struct AMFRoot : public AMFNodeElementBase {

 	/// Constructor.
 	/// \param [in] pParent - pointer to parent node.
-	AMFRoot(AMFNodeElementBase *pParent) :
-			AMFNodeElementBase(ENET_Root, pParent) {}
+	explicit AMFRoot(AMFNodeElementBase *pParent) :
+			AMFNodeElementBase(ENET_Root, pParent) {
+	    // empty	
+	}
 };

 /// Structure that define object node.
@@ -166,7 +170,7 @@ struct AMFColor : public AMFNodeElementBase {

 	/// @brief  Constructor.
 	/// @param [in] pParent - pointer to parent node.
-	AMFColor(AMFNodeElementBase *pParent) :
+	explicit AMFColor(AMFNodeElementBase *pParent) :
 			AMFNodeElementBase(ENET_Color, pParent), Composed(false), Color() {
 		// empty
 	}
@@ -174,53 +178,62 @@ struct AMFColor : public AMFNodeElementBase {

 /// Structure that define material node.
 struct AMFMaterial : public AMFNodeElementBase {
-
 	/// Constructor.
 	/// \param [in] pParent - pointer to parent node.
-	AMFMaterial(AMFNodeElementBase *pParent) :
-			AMFNodeElementBase(ENET_Material, pParent) {}
+	explicit AMFMaterial(AMFNodeElementBase *pParent) :
+			AMFNodeElementBase(ENET_Material, pParent) {
+	    // empty	
+	}
 };

 /// Structure that define object node.
 struct AMFObject : public AMFNodeElementBase {
-
 	/// Constructor.
 	/// \param [in] pParent - pointer to parent node.
-	AMFObject(AMFNodeElementBase *pParent) :
-			AMFNodeElementBase(ENET_Object, pParent) {}
+	explicit AMFObject(AMFNodeElementBase *pParent) :
+			AMFNodeElementBase(ENET_Object, pParent) {
+	    // empty	
+	}
 };

-/// \struct CAMFImporter_NodeElement_Mesh
 /// Structure that define mesh node.
 struct AMFMesh : public AMFNodeElementBase {
 	/// Constructor.
 	/// \param [in] pParent - pointer to parent node.
-	AMFMesh(AMFNodeElementBase *pParent) :
-			AMFNodeElementBase(ENET_Mesh, pParent) {}
+	explicit AMFMesh(AMFNodeElementBase *pParent) :
+			AMFNodeElementBase(ENET_Mesh, pParent) {
+	    // empty	
+	}
 };

 /// Structure that define vertex node.
 struct AMFVertex : public AMFNodeElementBase {
 	/// Constructor.
 	/// \param [in] pParent - pointer to parent node.
-	AMFVertex(AMFNodeElementBase *pParent) :
-			AMFNodeElementBase(ENET_Vertex, pParent) {}
+	explicit AMFVertex(AMFNodeElementBase *pParent) :
+			AMFNodeElementBase(ENET_Vertex, pParent) {
+		// empty
+	}
 };

 /// Structure that define edge node.
 struct AMFEdge : public AMFNodeElementBase {
 	/// Constructor.
 	/// \param [in] pParent - pointer to parent node.
-	AMFEdge(AMFNodeElementBase *pParent) :
-			AMFNodeElementBase(ENET_Edge, pParent) {}
+	explicit AMFEdge(AMFNodeElementBase *pParent) :
+			AMFNodeElementBase(ENET_Edge, pParent) {
+		// empty
+	}
 };

 /// Structure that define vertices node.
 struct AMFVertices : public AMFNodeElementBase {
 	/// Constructor.
 	/// \param [in] pParent - pointer to parent node.
-	AMFVertices(AMFNodeElementBase *pParent) :
-			AMFNodeElementBase(ENET_Vertices, pParent) {}
+	explicit AMFVertices(AMFNodeElementBase *pParent) :
+			AMFNodeElementBase(ENET_Vertices, pParent) {
+		// empty
+	}
 };

 /// Structure that define volume node.
@@ -230,8 +243,10 @@ struct AMFVolume : public AMFNodeElementBase {

 	/// Constructor.
 	/// \param [in] pParent - pointer to parent node.
-	AMFVolume(AMFNodeElementBase *pParent) :
-			AMFNodeElementBase(ENET_Volume, pParent) {}
+	explicit AMFVolume(AMFNodeElementBase *pParent) :
+			AMFNodeElementBase(ENET_Volume, pParent) {
+		// empty
+	}
 };

 /// Structure that define coordinates node.
@@ -240,8 +255,10 @@ struct AMFCoordinates : public AMFNodeElementBase {

 	/// Constructor.
 	/// \param [in] pParent - pointer to parent node.
-	AMFCoordinates(AMFNodeElementBase *pParent) :
-			AMFNodeElementBase(ENET_Coordinates, pParent) {}
+	explicit AMFCoordinates(AMFNodeElementBase *pParent) :
+			AMFNodeElementBase(ENET_Coordinates, pParent) {
+		// empty
+	}
 };

 /// Structure that define texture coordinates node.
@@ -254,7 +271,7 @@ struct AMFTexMap : public AMFNodeElementBase {

 	/// Constructor.
 	/// \param [in] pParent - pointer to parent node.
-	AMFTexMap(AMFNodeElementBase *pParent) :
+	explicit AMFTexMap(AMFNodeElementBase *pParent) :
 			AMFNodeElementBase(ENET_TexMap, pParent), TextureCoordinate{} {
 		// empty
 	}
@@ -266,7 +283,7 @@ struct AMFTriangle : public AMFNodeElementBase {

 	/// Constructor.
 	/// \param [in] pParent - pointer to parent node.
-	AMFTriangle(AMFNodeElementBase *pParent) :
+	explicit AMFTriangle(AMFNodeElementBase *pParent) :
 			AMFNodeElementBase(ENET_Triangle, pParent) {
 		// empty
 	}
@@ -280,7 +297,7 @@ struct AMFTexture : public AMFNodeElementBase {

 	/// Constructor.
 	/// \param [in] pParent - pointer to parent node.
-	AMFTexture(AMFNodeElementBase *pParent) :
+	explicit AMFTexture(AMFNodeElementBase *pParent) :
 			AMFNodeElementBase(ENET_Texture, pParent), Width(0), Height(0), Depth(0), Data(), Tiled(false) {
 		// empty
 	}
@@ -57,8 +57,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 namespace Assimp {

 aiColor4D AMFImporter::SPP_Material::GetColor(const float /*pX*/, const float /*pY*/, const float /*pZ*/) const {
-    aiColor4D tcol;
-
    // Check if stored data are supported.
    if (!Composition.empty()) {
        throw DeadlyImportError("IME. GetColor for composition");
@@ -68,7 +66,7 @@ aiColor4D AMFImporter::SPP_Material::GetColor(const float /*pX*/, const float /*
        throw DeadlyImportError("IME. GetColor, composed color");
    }

-    tcol = Color->Color;
+    aiColor4D tcol = Color->Color;

    // Check if default color must be used
    if ((tcol.r == 0) && (tcol.g == 0) && (tcol.b == 0) && (tcol.a == 0)) {
@@ -532,11 +530,9 @@ void AMFImporter::Postprocess_BuildMeshSet(const AMFMesh &pNodeElement, const st
                col_arr.reserve(VertexCount_Max * 2);

                { // fill arrays
-                    size_t vert_idx_from, vert_idx_to;
-
                    // first iteration.
-                    vert_idx_to = 0;
-                    vert_idx_from = VertexIndex_GetMinimal(face_list_cur, nullptr);
+                    size_t vert_idx_to = 0;
+                    size_t vert_idx_from = VertexIndex_GetMinimal(face_list_cur, nullptr);
                    vert_arr.push_back(pVertexCoordinateArray.at(vert_idx_from));
                    col_arr.push_back(Vertex_CalculateColor(vert_idx_from));
                    if (vert_idx_from != vert_idx_to) VertexIndex_Replace(face_list_cur, vert_idx_from, vert_idx_to);
@@ -162,7 +162,7 @@ void ASEImporter::InternReadFile(const std::string &pFile,

        // process all meshes
        bool tookNormals = false;
-        MeshArray avOutMeshes;
+        std::vector<aiMesh *> avOutMeshes;
        avOutMeshes.reserve(mParser->m_vMeshes.size() * 2);
        for (std::vector<ASE::Mesh>::iterator i = mParser->m_vMeshes.begin(); i != mParser->m_vMeshes.end(); ++i) {
            if ((*i).bSkip) {
@@ -187,7 +187,7 @@ void ASEImporter::InternReadFile(const std::string &pFile,
        // Now build the output mesh list. Remove dummies
        pScene->mNumMeshes = (unsigned int)avOutMeshes.size();
        aiMesh **pp = pScene->mMeshes = new aiMesh *[pScene->mNumMeshes];
-        for (MeshArray::const_iterator i = avOutMeshes.begin(); i != avOutMeshes.end(); ++i) {
+        for (std::vector<aiMesh *>::const_iterator i = avOutMeshes.begin(); i != avOutMeshes.end(); ++i) {
            if (!(*i)->mNumFaces) {
                continue;
            }
@@ -902,7 +902,7 @@ void ASEImporter::ConvertMaterial(ASE::Material &mat) {

 // ------------------------------------------------------------------------------------------------
 // Build output meshes
-void ASEImporter::ConvertMeshes(ASE::Mesh &mesh, MeshArray &avOutMeshes) {
+void ASEImporter::ConvertMeshes(ASE::Mesh &mesh, std::vector<aiMesh *> &avOutMeshes) {
    // validate the material index of the mesh
    if (mesh.iMaterialIndex >= mParser->m_vMaterials.size()) {
        mesh.iMaterialIndex = (unsigned int)mParser->m_vMaterials.size() - 1;
@@ -1270,5 +1270,4 @@ bool ASEImporter::GenerateNormals(ASE::Mesh &mesh) {
 }

 #endif // ASSIMP_BUILD_NO_3DS_IMPORTER
-
-#endif // !! ASSIMP_BUILD_NO_BASE_IMPORTER
+#endif // ASSIMP_BUILD_NO_ASE_IMPORTER
@@ -59,7 +59,7 @@ namespace Assimp {
 /** Importer class for the 3DS ASE ASCII format.
 *
 */
-class ASEImporter : public BaseImporter {
+class ASEImporter final : public BaseImporter {
 public:
    ASEImporter();
    ~ASEImporter() override = default;
@@ -57,14 +57,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 // ASE is quite similar to 3ds. We can reuse some structures
 #include "AssetLib/3DS/3DSLoader.h"

-namespace Assimp {
-namespace ASE {
+namespace Assimp::ASE {

 using namespace D3DS;

 // ---------------------------------------------------------------------------
 /** Helper structure representing an ASE material */
-struct Material : public D3DS::Material {
+struct Material final : D3DS::Material {
    //! Default constructor has been deleted
    Material() = delete;

@@ -115,7 +114,7 @@ struct Material : public D3DS::Material {
        return *this;
    }

-    ~Material() = default;
+    ~Material() override = default;

    //! Contains all sub materials of this material
    std::vector<Material> avSubMaterials;
@@ -373,8 +372,8 @@ struct Dummy : public BaseNode {
 };

 // Parameters to Parser::Parse()
-#define AI_ASE_NEW_FILE_FORMAT 200
-#define AI_ASE_OLD_FILE_FORMAT 110
+static constexpr unsigned int AI_ASE_NEW_FILE_FORMAT = 200;
+static constexpr unsigned int AI_ASE_OLD_FILE_FORMAT = 110;

 // Internally we're a little bit more tolerant
 #define AI_ASE_IS_NEW_FILE_FORMAT() (iFileFormat >= 200)
@@ -668,8 +667,7 @@ public:
    unsigned int iFileFormat;
 };

-} // Namespace ASE
-} // namespace Assimp
+} // Namespace Assimp::ASE

 #endif // ASSIMP_BUILD_NO_3DS_IMPORTER

@@ -239,29 +239,7 @@ inline size_t WriteArray(IOStream *stream, const T *in, unsigned int size) {
 *  and the chunk contents to the container stream. This allows relatively easy chunk
 *  chunk construction, even recursively.
 */
-class AssbinChunkWriter : public IOStream {
-private:
-    uint8_t *buffer;
-    uint32_t magic;
-    IOStream *container;
-    size_t cur_size, cursor, initial;
-
-private:
-    // -------------------------------------------------------------------
-    void Grow(size_t need = 0) {
-        size_t new_size = std::max(initial, std::max(need, cur_size + (cur_size >> 1)));
-
-        const uint8_t *const old = buffer;
-        buffer = new uint8_t[new_size];
-
-        if (old) {
-            memcpy(buffer, old, cur_size);
-            delete[] old;
-        }
-
-        cur_size = new_size;
-    }
-
+class AssbinChunkWriter final : public IOStream {
 public:
    AssbinChunkWriter(IOStream *container, uint32_t magic, size_t initial = 4096) :
            buffer(nullptr),
@@ -315,6 +293,28 @@ public:

        return pCount;
    }
+
+private:
+    // -------------------------------------------------------------------
+    void Grow(size_t need = 0) {
+        size_t new_size = std::max(initial, std::max(need, cur_size + (cur_size >> 1)));
+
+        const uint8_t *const old = buffer;
+        buffer = new uint8_t[new_size];
+
+        if (old) {
+            memcpy(buffer, old, cur_size);
+            delete[] old;
+        }
+
+        cur_size = new_size;
+    }
+
+private:
+    uint8_t *buffer;
+    uint32_t magic;
+    IOStream *container;
+    size_t cur_size, cursor, initial;
 };

 // ----------------------------------------------------------------------------------
@@ -77,8 +77,7 @@ static int ioprintf(IOStream *io, const char *format, ...) {
    }

    static const int Size = 4096;
-    char sz[Size];
-    ::memset(sz, '\0', Size);
+    char sz[Size] = {};
    va_list va;
    va_start(va, format);
    const unsigned int nSize = vsnprintf(sz, Size - 1, format, va);
@@ -302,7 +301,11 @@ static void WriteDump(const char *pFile, const char *cmd, const aiScene *scene,
            bool compressed = (tex->mHeight == 0);

            // mesh header
-            ioprintf(io, "\t<Texture width=\"%u\" height=\"%u\" compressed=\"%s\"> \n",
+            std::string texName = "unknown";
+            if (tex->mFilename.length != 0u) {
+                texName = tex->mFilename.data;
+            }
+            ioprintf(io, "\t<Texture name=\"%s\" width=\"%u\" height=\"%u\" compressed=\"%s\"> \n", texName.c_str(),
                    (compressed ? -1 : tex->mWidth), (compressed ? -1 : tex->mHeight),
                    (compressed ? "true" : "false"));

@@ -350,7 +353,7 @@ static void WriteDump(const char *pFile, const char *cmd, const aiScene *scene,
            for (unsigned int n = 0; n < mat->mNumProperties; ++n) {

                const aiMaterialProperty *prop = mat->mProperties[n];
-                const char *sz = "";
+                auto sz = "";
                if (prop->mType == aiPTI_Float) {
                    sz = "float";
                } else if (prop->mType == aiPTI_Integer) {
@@ -60,7 +60,7 @@ struct aiAnimation;

 namespace Assimp{

-class B3DImporter : public BaseImporter{
+class B3DImporter final : public BaseImporter{
 public:
    B3DImporter() = default;
    ~B3DImporter() override;
@@ -61,7 +61,7 @@ namespace Assimp {
 * the hierarchy. It contains no actual mesh data, but we generate a dummy mesh
 * inside the loader just to be able to see something.
 */
-class BVHLoader : public BaseImporter {
+class BVHLoader final : public BaseImporter {

    /** Possible animation channels for which the motion data holds the values */
    enum ChannelType {
@@ -74,7 +74,9 @@ BlenderBMeshConverter::~BlenderBMeshConverter() {

 // ------------------------------------------------------------------------------------------------
 bool BlenderBMeshConverter::ContainsBMesh() const {
-    // TODO - Should probably do some additional verification here
+    if (BMesh == nullptr) {
+        return false;
+    }
    return BMesh->totpoly && BMesh->totloop && BMesh->totvert;
 }

@@ -63,14 +63,12 @@ namespace Assimp
        struct MLoop;
    }

-    class BlenderBMeshConverter: public LogFunctions< BlenderBMeshConverter >
+    class BlenderBMeshConverter final : public LogFunctions< BlenderBMeshConverter >
    {
    public:
-        BlenderBMeshConverter( const Blender::Mesh* mesh );
-        ~BlenderBMeshConverter( );
-
-        bool ContainsBMesh( ) const;
-
+        explicit BlenderBMeshConverter( const Blender::Mesh* mesh );
+        ~BlenderBMeshConverter();
+        bool ContainsBMesh() const;
        const Blender::Mesh* TriangulateBMesh( );

    private:
@@ -96,7 +96,7 @@ struct CustomDataTypeDescription {
        *           other (like CD_ORCO, ...) uses arrays of rawtypes or even arrays of Structures
        *           use a special readfunction for that cases
        */
-static std::array<CustomDataTypeDescription, CD_NUMTYPES> customDataTypeDescriptions = { {
+static const std::array<CustomDataTypeDescription, CD_NUMTYPES> customDataTypeDescriptions = { {
        DECL_STRUCT_CUSTOMDATATYPEDESCRIPTION(MVert),
        DECL_UNSUPPORTED_CUSTOMDATATYPEDESCRIPTION,
        DECL_UNSUPPORTED_CUSTOMDATATYPEDESCRIPTION,
@@ -142,7 +142,8 @@ static std::array<CustomDataTypeDescription, CD_NUMTYPES> customDataTypeDescript
        DECL_UNSUPPORTED_CUSTOMDATATYPEDESCRIPTION,

        DECL_UNSUPPORTED_CUSTOMDATATYPEDESCRIPTION,
-        DECL_UNSUPPORTED_CUSTOMDATATYPEDESCRIPTION } };
+        DECL_UNSUPPORTED_CUSTOMDATATYPEDESCRIPTION 
+} };

 bool isValidCustomDataType(const int cdtype) {
    return cdtype >= 0 && cdtype < CD_NUMTYPES;
@@ -55,14 +55,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 // enable verbose log output. really verbose, so be careful.
 #ifdef ASSIMP_BUILD_DEBUG
-#define ASSIMP_BUILD_BLENDER_DEBUG
+#   define ASSIMP_BUILD_BLENDER_DEBUG
 #endif

 // set this to non-zero to dump BlenderDNA stuff to dna.txt.
 // you could set it on the assimp build command line too without touching it here.
 // !!! please make sure this is set to 0 in the repo !!!
 #ifndef ASSIMP_BUILD_BLENDER_DEBUG_DNA
-#define ASSIMP_BUILD_BLENDER_DEBUG_DNA 0
+#   define ASSIMP_BUILD_BLENDER_DEBUG_DNA 0
 #endif

 // #define ASSIMP_BUILD_BLENDER_NO_STATS
@@ -124,22 +124,14 @@ struct ElemBase {
 *  they used to point to.*/
 // -------------------------------------------------------------------------------
 struct Pointer {
-    Pointer() :
-            val() {
-        // empty
-    }
-    uint64_t val;
+    uint64_t val{0};
 };

 // -------------------------------------------------------------------------------
 /** Represents a generic offset within a BLEND file */
 // -------------------------------------------------------------------------------
 struct FileOffset {
-    FileOffset() :
-            val() {
-        // empty
-    }
-    uint64_t val;
+    uint64_t val{0};
 };

 // -------------------------------------------------------------------------------
@@ -204,7 +196,7 @@ enum ErrorPolicy {
 };

 #ifdef ASSIMP_BUILD_BLENDER_DEBUG
-#define ErrorPolicy_Igno ErrorPolicy_Warn
+#   define ErrorPolicy_Igno ErrorPolicy_Warn
 #endif

 // -------------------------------------------------------------------------------
@@ -396,10 +388,9 @@ private:
    mutable size_t cache_idx;
 };

-// --------------------------------------------------------
-template <>
+// -------------------------------------------------------------------------------------------------------
+template<>
 struct Structure::_defaultInitializer<ErrorPolicy_Warn> {
-
    template <typename T>
    void operator()(T &out, const char *reason = "<add reason>") {
        ASSIMP_LOG_WARN(reason);
@@ -409,9 +400,9 @@ struct Structure::_defaultInitializer<ErrorPolicy_Warn> {
    }
 };

-template <>
+// -------------------------------------------------------------------------------------------------------
+template<>
 struct Structure::_defaultInitializer<ErrorPolicy_Fail> {
-
    template <typename T>
    void operator()(T & /*out*/, const char *message = "") {
        // obviously, it is crucial that _DefaultInitializer is used
@@ -619,31 +610,23 @@ public:
 /** Import statistics, i.e. number of file blocks read*/
 // -------------------------------------------------------------------------------
 class Statistics {
-
 public:
-    Statistics() :
-            fields_read(), pointers_resolved(), cache_hits()
-            //      , blocks_read       ()
-            ,
-            cached_objects() {}
+    Statistics() = default;
+    ~Statistics() = default;

-public:
-    /** total number of fields we read */
+    /// total number of fields we read
    unsigned int fields_read;

-    /** total number of resolved pointers */
+    /// total number of resolved pointers
    unsigned int pointers_resolved;

-    /** number of pointers resolved from the cache */
+    /// number of pointers resolved from the cache
    unsigned int cache_hits;

-    /** number of blocks (from  FileDatabase::entries)
-      we did actually read from. */
-    // unsigned int blocks_read;
-
-    /** objects in FileData::cache */
+    /// objects in FileData::cache
    unsigned int cached_objects;
 };
+
 #endif

 // -------------------------------------------------------------------------------
@@ -656,15 +639,13 @@ public:
    typedef std::map<Pointer, TOUT<ElemBase>> StructureCache;

 public:
-    ObjectCache(const FileDatabase &db) :
-            db(db) {
+    explicit ObjectCache(const FileDatabase &db) : db(db) {
        // currently there are only ~400 structure records per blend file.
        // we read only a small part of them and don't cache objects
        // which we don't need, so this should suffice.
        caches.reserve(64);
    }

-public:
    // --------------------------------------------------------
    /** Check whether a specific item is in the cache.
     *  @param s Data type of the item
@@ -672,10 +653,7 @@ public:
     *   cache doesn't know the item yet.
     *  @param ptr Item address to look for. */
    template <typename T>
-    void get(
-            const Structure &s,
-            TOUT<T> &out,
-            const Pointer &ptr) const;
+    void get( const Structure &s,TOUT<T> &out, const Pointer &ptr) const;

    // --------------------------------------------------------
    /** Add an item to the cache after the item has
@@ -700,7 +678,7 @@ private:
 template <>
 class ObjectCache<Blender::vector> {
 public:
-    ObjectCache(const FileDatabase &) {}
+    explicit ObjectCache(const FileDatabase &) {}

    template <typename T>
    void get(const Structure &, vector<T> &, const Pointer &) {}
@@ -709,7 +687,7 @@ public:
 };

 #ifdef _MSC_VER
-#pragma warning(disable : 4355)
+#   pragma warning(disable : 4355)
 #endif

 // -------------------------------------------------------------------------------
@@ -724,16 +702,6 @@ public:
    FileDatabase() :
            _cacheArrays(*this), _cache(*this), next_cache_idx() {}

-public:
-    // publicly accessible fields
-    bool i64bit;
-    bool little;
-
-    DNA dna;
-    std::shared_ptr<StreamReaderAny> reader;
-    vector<FileBlockHead> entries;
-
-public:
    Statistics &stats() const {
        return _stats;
    }
@@ -752,6 +720,15 @@ public:
        return _cacheArrays;
    }

+public:
+    // publicly accessible fields
+    bool i64bit;
+    bool little;
+
+    DNA dna;
+    std::shared_ptr<StreamReaderAny> reader;
+    vector<FileBlockHead> entries;
+
 private:
 #ifndef ASSIMP_BUILD_BLENDER_NO_STATS
    mutable Statistics _stats;
@@ -764,20 +741,19 @@ private:
 };

 #ifdef _MSC_VER
-#pragma warning(default : 4355)
+#   pragma warning(default : 4355)
 #endif

 // -------------------------------------------------------------------------------
 /** Factory to extract a #DNA from the DNA1 file block in a BLEND file. */
 // -------------------------------------------------------------------------------
 class DNAParser {
-
 public:
    /** Bind the parser to a empty DNA and an input stream */
-    DNAParser(FileDatabase &db) :
-            db(db) {}
+    explicit DNAParser(FileDatabase &db) : db(db) {
+        // empty
+    }

-public:
    // --------------------------------------------------------
    /** Locate the DNA in the file and parse it. The input
     *  stream is expected to point to the beginning of the DN1
@@ -788,7 +764,6 @@ public:
     *    afterwards.*/
    void Parse();

-public:
    /** Obtain a reference to the extracted DNA information */
    const Blender::DNA &GetDNA() const {
        return db.dna;
@@ -961,7 +961,7 @@ void BlenderImporter::ConvertMesh(const Scene & /*in*/, const Object * /*obj*/,
        if (mesh->totface > static_cast<int>(mesh->mtface.size())) {
            ThrowException("Number of UV faces is larger than the corresponding UV face array (#1)");
        }
-        for (MeshArray::iterator it = temp->begin() + old; it != temp->end(); ++it) {
+        for (std::vector<aiMesh *>::iterator it = temp->begin() + old; it != temp->end(); ++it) {
            ai_assert(0 != (*it)->mNumVertices);
            ai_assert(0 != (*it)->mNumFaces);
            const auto itMatTexUvMapping = matTexUvMappings.find((*it)->mMaterialIndex);
@@ -1030,7 +1030,7 @@ void BlenderImporter::ConvertMesh(const Scene & /*in*/, const Object * /*obj*/,
        if (mesh->totface > static_cast<int>(mesh->tface.size())) {
            ThrowException("Number of faces is larger than the corresponding UV face array (#2)");
        }
-        for (MeshArray::iterator it = temp->begin() + old; it != temp->end(); ++it) {
+        for (std::vector<aiMesh *>::iterator it = temp->begin() + old; it != temp->end(); ++it) {
            ai_assert(0 != (*it)->mNumVertices);
            ai_assert(0 != (*it)->mNumFaces);

@@ -1057,7 +1057,7 @@ void BlenderImporter::ConvertMesh(const Scene & /*in*/, const Object * /*obj*/,
        if (mesh->totface > static_cast<int>((mesh->mcol.size() / 4))) {
            ThrowException("Number of faces is larger than the corresponding color face array");
        }
-        for (MeshArray::iterator it = temp->begin() + old; it != temp->end(); ++it) {
+        for (std::vector<aiMesh *>::iterator it = temp->begin() + old; it != temp->end(); ++it) {
            ai_assert(0 != (*it)->mNumVertices);
            ai_assert(0 != (*it)->mNumFaces);

@@ -105,7 +105,7 @@ class BlenderModifier;
 *  call it is outsourced to BlenderDNA.cpp/BlenderDNA.h. This class only performs the
 *  conversion from intermediate format to aiScene. */
 // -------------------------------------------------------------------------------------------
-class BlenderImporter : public BaseImporter, public LogFunctions<BlenderImporter> {
+class BlenderImporter final : public BaseImporter, public LogFunctions<BlenderImporter> {
 public:
    BlenderImporter();
    ~BlenderImporter() override;
@@ -114,7 +114,7 @@ private:
 *  Mirror modifier. Status: implemented.
 */
 // -------------------------------------------------------------------------------------------
-class BlenderModifier_Mirror : public BlenderModifier {
+class BlenderModifier_Mirror final : public BlenderModifier {
 public:
    // --------------------
    virtual bool IsActive( const ModifierData& modin);
@@ -131,7 +131,7 @@ public:
 // -------------------------------------------------------------------------------------------
 /** Subdivision modifier. Status: dummy. */
 // -------------------------------------------------------------------------------------------
-class BlenderModifier_Subdivision : public BlenderModifier {
+class BlenderModifier_Subdivision final : public BlenderModifier {
 public:

    // --------------------
@@ -47,8 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #include "BlenderDNA.h"

-namespace Assimp {
-namespace Blender {
+namespace Assimp::Blender {

 // Minor parts of this file are extracts from blender data structures,
 // declared in the ./source/blender/makesdna directory.
@@ -115,32 +114,32 @@ struct Collection;
 static const size_t MaxNameLen = 1024;

 // -------------------------------------------------------------------------------
-struct ID : ElemBase {
+struct ID final : ElemBase {
    char name[MaxNameLen] WARN;
    short flag;
 };

 // -------------------------------------------------------------------------------
-struct ListBase : ElemBase {
+struct ListBase final : ElemBase {
    std::shared_ptr<ElemBase> first;
    std::weak_ptr<ElemBase> last;
 };

 // -------------------------------------------------------------------------------
-struct PackedFile : ElemBase {
+struct PackedFile final : ElemBase {
    int size WARN;
    int seek WARN;
    std::shared_ptr<FileOffset> data WARN;
 };

 // -------------------------------------------------------------------------------
-struct GroupObject : ElemBase {
+struct GroupObject final : ElemBase {
    std::shared_ptr<GroupObject> prev, next FAIL;
    std::shared_ptr<Object> ob;
 };

 // -------------------------------------------------------------------------------
-struct Group : ElemBase {
+struct Group final : ElemBase {
    ID id FAIL;
    int layer;

@@ -148,32 +147,32 @@ struct Group : ElemBase {
 };

 // -------------------------------------------------------------------------------
-struct CollectionObject : ElemBase {
+struct CollectionObject final : ElemBase {
    //CollectionObject* prev;
    std::shared_ptr<CollectionObject> next;
    Object *ob;
 };

 // -------------------------------------------------------------------------------
-struct CollectionChild : ElemBase {
+struct CollectionChild final : ElemBase {
    std::shared_ptr<CollectionChild> next, prev;
    std::shared_ptr<Collection> collection;
 };

 // -------------------------------------------------------------------------------
-struct Collection : ElemBase {
+struct Collection final : ElemBase {
    ID id FAIL;
    ListBase gobject; // CollectionObject
    ListBase children; // CollectionChild
 };

 // -------------------------------------------------------------------------------
-struct World : ElemBase {
+struct World final : ElemBase {
    ID id FAIL;
 };

 // -------------------------------------------------------------------------------
-struct MVert : ElemBase {
+struct MVert final : ElemBase {
    float co[3] FAIL;
    float no[3] FAIL; // read as short and divided through / 32767.f
    char flag;
@@ -185,31 +184,31 @@ struct MVert : ElemBase {
 };

 // -------------------------------------------------------------------------------
-struct MEdge : ElemBase {
+struct MEdge final : ElemBase {
    int v1, v2 FAIL;
    char crease, bweight;
    short flag;
 };

 // -------------------------------------------------------------------------------
-struct MLoop : ElemBase {
+struct MLoop final : ElemBase {
    int v, e;
 };

 // -------------------------------------------------------------------------------
-struct MLoopUV : ElemBase {
+struct MLoopUV final : ElemBase {
    float uv[2];
    int flag;
 };

 // -------------------------------------------------------------------------------
 // Note that red and blue are not swapped, as with MCol
-struct MLoopCol : ElemBase {
+struct MLoopCol final : ElemBase {
    unsigned char r, g, b, a;
 };

 // -------------------------------------------------------------------------------
-struct MPoly : ElemBase {
+struct MPoly final : ElemBase {
    int loopstart;
    int totloop;
    short mat_nr;
@@ -217,26 +216,26 @@ struct MPoly : ElemBase {
 };

 // -------------------------------------------------------------------------------
-struct MTexPoly : ElemBase {
+struct MTexPoly final : ElemBase {
    Image *tpage;
    char flag, transp;
    short mode, tile, pad;
 };

 // -------------------------------------------------------------------------------
-struct MCol : ElemBase {
+struct MCol final : ElemBase {
    char r, g, b, a FAIL;
 };

 // -------------------------------------------------------------------------------
-struct MFace : ElemBase {
+struct MFace final : ElemBase {
    int v1, v2, v3, v4 FAIL;
    int mat_nr FAIL;
    char flag;
 };

 // -------------------------------------------------------------------------------
-struct TFace : ElemBase {
+struct TFace final : ElemBase {
    float uv[4][2] FAIL;
    int col[4] FAIL;
    char flag;
@@ -246,7 +245,7 @@ struct TFace : ElemBase {
 };

 // -------------------------------------------------------------------------------
-struct MTFace : ElemBase {
+struct MTFace final : ElemBase {
    MTFace() :
            flag(0),
            mode(0),
@@ -264,24 +263,24 @@ struct MTFace : ElemBase {
 };

 // -------------------------------------------------------------------------------
-struct MDeformWeight : ElemBase {
+struct MDeformWeight final : ElemBase {
    int def_nr FAIL;
    float weight FAIL;
 };

 // -------------------------------------------------------------------------------
-struct MDeformVert : ElemBase {
+struct MDeformVert final : ElemBase {
    vector<MDeformWeight> dw WARN;
    int totweight;
 };

 // -------------------------------------------------------------------------------
-#define MA_RAYMIRROR 0x40000
-#define MA_TRANSPARENCY 0x10000
-#define MA_RAYTRANSP 0x20000
-#define MA_ZTRANSP 0x00040
+constexpr uint32_t MA_RAYMIRROR    = 0x40000;
+constexpr uint32_t MA_TRANSPARENCY = 0x10000;
+constexpr uint32_t MA_RAYTRANSP    = 0x20000;
+constexpr uint32_t MA_ZTRANSP      = 0x00040;

-struct Material : ElemBase {
+struct Material final : ElemBase {
    ID id FAIL;

    float r, g, b WARN;
@@ -403,7 +402,7 @@ CustomDataLayer 104
    char name 32 64
    void *data 96 8
 */
-struct CustomDataLayer : ElemBase {
+struct CustomDataLayer final : ElemBase {
    int type;
    int offset;
    int flag;
@@ -441,7 +440,7 @@ CustomData 208
    BLI_mempool *pool 192 8
    CustomDataExternal *external 200 8
 */
-struct CustomData : ElemBase {
+struct CustomData final : ElemBase {
    vector<std::shared_ptr<struct CustomDataLayer>> layers;
    int typemap[42]; // CD_NUMTYPES
    int totlayer;
@@ -454,7 +453,7 @@ struct CustomData : ElemBase {
 };

 // -------------------------------------------------------------------------------
-struct Mesh : ElemBase {
+struct Mesh final : ElemBase {
    ID id FAIL;

    int totface FAIL;
@@ -491,7 +490,7 @@ struct Mesh : ElemBase {
 };

 // -------------------------------------------------------------------------------
-struct Library : ElemBase {
+struct Library final : ElemBase {
    ID id FAIL;

    char name[240] WARN;
@@ -515,7 +514,7 @@ struct Camera : ElemBase {
 };

 // -------------------------------------------------------------------------------
-struct Lamp : ElemBase {
+struct Lamp final : ElemBase {

    enum FalloffType {
        FalloffType_Constant = 0x0,
@@ -602,7 +601,7 @@ struct Lamp : ElemBase {
 };

 // -------------------------------------------------------------------------------
-struct ModifierData : ElemBase {
+struct ModifierData final : ElemBase {
    enum ModifierType {
        eModifierType_None = 0,
        eModifierType_Subsurf,
@@ -652,9 +651,8 @@ struct SharedModifierData : ElemBase {
    ModifierData modifier;
 };

-
 // -------------------------------------------------------------------------------
-struct SubsurfModifierData : SharedModifierData {
+struct SubsurfModifierData final : SharedModifierData {

    enum Type {

@@ -674,7 +672,7 @@ struct SubsurfModifierData : SharedModifierData {
 };

 // -------------------------------------------------------------------------------
-struct MirrorModifierData : SharedModifierData {
+struct MirrorModifierData final : SharedModifierData {

    enum Flags {
        Flags_CLIPPING = 1 << 0,
@@ -692,7 +690,7 @@ struct MirrorModifierData : SharedModifierData {
 };

 // -------------------------------------------------------------------------------
-struct Object : ElemBase {
+struct Object final : ElemBase {
    ID id FAIL;

    enum Type {
@@ -733,7 +731,7 @@ struct Object : ElemBase {
 };

 // -------------------------------------------------------------------------------
-struct Base : ElemBase {
+struct Base final : ElemBase {
    Base *prev WARN;
    std::shared_ptr<Base> next WARN;
    std::shared_ptr<Object> object WARN;
@@ -745,7 +743,7 @@ struct Base : ElemBase {
 };

 // -------------------------------------------------------------------------------
-struct Scene : ElemBase {
+struct Scene final : ElemBase {
    ID id FAIL;

    std::shared_ptr<Object> camera WARN;
@@ -759,7 +757,7 @@ struct Scene : ElemBase {
 };

 // -------------------------------------------------------------------------------
-struct Image : ElemBase {
+struct Image final : ElemBase {
    ID id FAIL;

    char name[240] WARN;
@@ -789,7 +787,7 @@ struct Image : ElemBase {
 };

 // -------------------------------------------------------------------------------
-struct Tex : ElemBase {
+struct Tex final : ElemBase {

    // actually, the only texture type we support is Type_IMAGE
    enum Type {
@@ -874,14 +872,13 @@ struct Tex : ElemBase {

    //char use_nodes;

-    Tex() :
-            imaflag(ImageFlags_INTERPOL), type(Type_CLOUDS) {
+    Tex() : imaflag(ImageFlags_INTERPOL), type(Type_CLOUDS) {
        // empty
    }
 };

 // -------------------------------------------------------------------------------
-struct MTex : ElemBase {
+struct MTex final : ElemBase {

    enum Projection {
        Proj_N = 0,
@@ -970,6 +967,6 @@ struct MTex : ElemBase {
    MTex() = default;
 };

-} // namespace Blender
-} // namespace Assimp
+} // namespace Assimp::Blender
+
 #endif
@@ -381,7 +381,14 @@ inline PointP2T& BlenderTessellatorP2T::GetActualPointStructure( p2t::Point& poi
 #    pragma clang diagnostic push
 #    pragma clang diagnostic ignored "-Winvalid-offsetof"
 #endif // __clang__
+#if defined __GNUC__
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Winvalid-offsetof"
+#endif // __GNUC__
    unsigned int pointOffset = offsetof( PointP2T, point2D );
+#if defined __GNUC__
+#    pragma GCC diagnostic pop
+#endif // __GNUC__
 #if defined __clang__
 #    pragma clang diagnostic pop
 #endif
@@ -166,10 +166,10 @@ void C4DImporter::InternReadFile( const std::string& pFile, aiScene* pScene, IOS
    // copy meshes over
    pScene->mNumMeshes = static_cast<unsigned int>(meshes.size());
    pScene->mMeshes = new aiMesh*[pScene->mNumMeshes]();
-    std::copy(mMeshes.begin(), mMeshes.end(), pScene->mMeshes);
+    std::copy(meshes.begin(), meshes.end(), pScene->mMeshes);

    // copy materials over, adding a default material if necessary
-    unsigned int mat_count = static_cast<unsigned int>(mMaterials.size());
+    unsigned int mat_count = static_cast<unsigned int>(materials.size());
    for(aiMesh* mesh : meshes) {
        ai_assert(mesh->mMaterialIndex <= mat_count);
        if(mesh->mMaterialIndex >= mat_count) {
@@ -179,14 +179,14 @@ void C4DImporter::InternReadFile( const std::string& pFile, aiScene* pScene, IOS
            const aiString name(AI_DEFAULT_MATERIAL_NAME);
            def_material->AddProperty(&name, AI_MATKEY_NAME);

-            mMaterials.push_back(def_material.release());
+            materials.push_back(def_material.release());
            break;
        }
    }

    pScene->mNumMaterials = static_cast<unsigned int>(materials.size());
    pScene->mMaterials = new aiMaterial*[pScene->mNumMaterials]();
-    std::copy(mMaterials.begin(), mMaterials.end(), pScene->mMaterials);
+    std::copy(materials.begin(), materials.end(), pScene->mMaterials);
 }

 // ------------------------------------------------------------------------------------------------
@@ -251,8 +251,8 @@ void C4DImporter::ReadMaterials(BaseMaterial* mat) {
    while (mat) {
        if (mat->GetType() == Mmaterial) {
            aiMaterial* out = new aiMaterial();
-            mMaterialMapping[mat] = static_cast<unsigned int>(mMaterials.size());
-            mMaterials.push_back(out);
+            material_mapping[mat] = static_cast<unsigned int>(materials.size());
+            materials.push_back(out);

            auto const ai_name = aiStringFrom(mat->GetName());
            out->AddProperty(&ai_name, AI_MATKEY_NAME);
@@ -289,7 +289,7 @@ void C4DImporter::ReadMaterials(BaseMaterial* mat) {
 // ------------------------------------------------------------------------------------------------
 void C4DImporter::RecurseHierarchy(BaseObject* object, aiNode* parent) {
    ai_assert(parent != nullptr );
-    NodeArray nodes;
+    std::vector<aiNode*> nodes;

    // based on Cineware sample code
    while (object) {
@@ -577,7 +577,7 @@ aiMesh* C4DImporter::ReadMesh(BaseObject* object) {
 unsigned int C4DImporter::ResolveMaterial(PolygonObject* obj) {
    ai_assert(obj != nullptr);

-    const unsigned int mat_count = static_cast<unsigned int>(mMaterials.size());
+    const unsigned int mat_count = static_cast<unsigned int>(materials.size());

    BaseTag* tag = obj->GetTag(Ttexture);
    if(tag == nullptr) {
@@ -97,12 +97,11 @@ private:

    bool ReadShader(aiMaterial* out, cineware::BaseShader* shader);

-  private:
-    MeshArray mMeshes;
-    MaterialArray materials;
+    std::vector<aiMesh*> meshes;
+    std::vector<aiMaterial*> materials;

-    using MaterialMap = std::map<cineware::BaseMaterial*, unsigned int> ;
-    MaterialMap mMaterialMapping;
+    typedef std::map<cineware::BaseMaterial*, unsigned int> MaterialMap;
+    MaterialMap material_mapping;

 }; // !class C4DImporter

@@ -62,6 +62,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <memory>

 namespace Assimp {
+
 using namespace Assimp::COB;
 using namespace Assimp::Formatter;

@@ -109,10 +110,29 @@ void COBImporter::SetupProperties(const Importer * /*pImp*/) {
 }

 // ------------------------------------------------------------------------------------------------
-/*static*/ AI_WONT_RETURN void COBImporter::ThrowException(const std::string &msg) {
+AI_WONT_RETURN void COBImporter::ThrowException(const std::string &msg) {
    throw DeadlyImportError("COB: ", msg);
 }

+// ------------------------------------------------------------------------------------------------
+static bool isValidASCIIHeader(const char *head) {
+    ai_assert(head != nullptr);
+
+    if (strncmp(head, "Caligari ", 9) != 0) {
+        COBImporter::ThrowException("Could not found magic id: `Caligari`");
+    }
+
+    if (strncmp(&head[9], "V00.", 4) != 0) {
+        COBImporter::ThrowException("Could not found Version tag: `V00.`");
+    }
+    ASSIMP_LOG_INFO("File format tag: ", std::string(head + 9, 6));
+    if (head[16] != 'L') {
+        COBImporter::ThrowException("File is big-endian, which is not supported");
+    }
+
+    return true;
+}
+
 // ------------------------------------------------------------------------------------------------
 // Imports the given file into the given scene structure.
 void COBImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSystem *pIOHandler) {
@@ -126,19 +146,15 @@ void COBImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
    std::unique_ptr<StreamReaderLE> stream(new StreamReaderLE(file));

    // check header
-    char head[32];
-    stream->CopyAndAdvance(head, 32);
-    if (strncmp(head, "Caligari ", 9) != 0) {
-        ThrowException("Could not found magic id: `Caligari`");
-    }
-
-    ASSIMP_LOG_INFO("File format tag: ", std::string(head + 9, 6));
-    if (head[16] != 'L') {
-        ThrowException("File is big-endian, which is not supported");
-    }
+    static constexpr size_t HeaderSize = 32u;
+    char head[HeaderSize] = {};
+    stream->CopyAndAdvance(head, HeaderSize);

    // load data into intermediate structures
    if (head[15] == 'A') {
+        if (!isValidASCIIHeader(head)) {
+            ThrowException("Invalid ASCII file header");
+        }
        ReadAsciiFile(scene, stream.get());
    } else {
        ReadBinaryFile(scene, stream.get());
@@ -1170,6 +1186,6 @@ void COBImporter::ReadUnit_Binary(COB::Scene &out, StreamReaderLE &reader, const
    ASSIMP_LOG_WARN("`Unit` chunk ", nfo.id, " is a child of ", nfo.parent_id, " which does not exist");
 }

-}
+} // namespace Assimp

 #endif // ASSIMP_BUILD_NO_COB_IMPORTER
@@ -72,7 +72,7 @@ namespace COB {
 *
 *  Currently relatively limited, loads only ASCII files and needs more test coverage. */
 // -------------------------------------------------------------------------------------------
-class COBImporter : public BaseImporter {
+class COBImporter final : public BaseImporter {
 public:
    COBImporter() = default;
    ~COBImporter() override = default;
@@ -81,6 +81,10 @@ public:
    bool CanRead(const std::string &pFile, IOSystem *pIOHandler,
            bool checkSig) const override;

+    // -------------------------------------------------------------------
+    /** Prepend 'COB: ' and throw msg.*/
+    AI_WONT_RETURN static void ThrowException(const std::string &msg) AI_WONT_RETURN_SUFFIX;
+
 protected:
    // --------------------
    const aiImporterDesc *GetInfo() const override;
@@ -93,10 +97,6 @@ protected:
            IOSystem *pIOHandler) override;

 private:
-    // -------------------------------------------------------------------
-    /** Prepend 'COB: ' and throw msg.*/
-    AI_WONT_RETURN static void ThrowException(const std::string &msg) AI_WONT_RETURN_SUFFIX;
-
    // -------------------------------------------------------------------
    /** @brief Read from an ascii scene/object file
     *  @param out Receives output data.
@@ -148,4 +148,5 @@ private:
 }; // !class COBImporter

 } // end of namespace Assimp
+
 #endif // AI_UNREALIMPORTER_H_INC
@@ -52,68 +52,66 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <deque>
 #include <map>

-namespace Assimp {
-namespace COB {
+namespace Assimp::COB {

 // ------------------
 /** Represents a single vertex index in a face */
-struct VertexIndex
-{
+struct VertexIndex {
    // intentionally uninitialized
    unsigned int pos_idx,uv_idx;
 };

 // ------------------
 /** COB Face data structure */
-struct Face
-{
+struct Face {
    // intentionally uninitialized
-    unsigned int material, flags;
+    unsigned int material;
+    unsigned int flags;
    std::vector<VertexIndex> indices;
 };

 // ------------------
 /** COB chunk header information */
-const unsigned int NO_SIZE = UINT_MAX;
+constexpr unsigned int NO_SIZE = UINT_MAX;

-struct ChunkInfo
-{
-    ChunkInfo ()
-        :   id        (0)
-        ,   parent_id (0)
-        ,   version   (0)
-        ,   size      (NO_SIZE)
-    {}
+struct ChunkInfo {
+    ChunkInfo() = default;
+    virtual ~ChunkInfo() = default;

    // Id of this chunk, unique within file
-    unsigned int id;
+    unsigned int id{ 0 };

    // and the corresponding parent
-    unsigned int parent_id;
+    unsigned int parent_id{ 0 };

    // version. v1.23 becomes 123
-    unsigned int version;
+    unsigned int version{ 0 };

    // chunk size in bytes, only relevant for binary files
    // NO_SIZE is also valid.
-    unsigned int size;
+    unsigned int size{NO_SIZE};
 };

 // ------------------
 /** A node in the scenegraph */
-struct Node : public ChunkInfo
-{
+struct Node : ChunkInfo {
    enum Type {
-        TYPE_MESH,TYPE_GROUP,TYPE_LIGHT,TYPE_CAMERA,TYPE_BONE
+        TYPE_INVALID = -1,
+        TYPE_MESH = 0,
+        TYPE_GROUP,
+        TYPE_LIGHT,
+        TYPE_CAMERA,
+        TYPE_BONE,
+        TYPE_COUNT
    };

-    virtual ~Node() = default;
-    Node(Type type) : type(type), unit_scale(1.f){}
+    ~Node() override = default;
+    explicit Node(Type type) : type(type), unit_scale(1.f){}

    Type type;

    // used during resolving
-    typedef std::deque<const Node*> ChildList;
+    using ChildList = std::deque<const Node*> ;
    mutable ChildList temp_children;

    // unique name
@@ -128,8 +126,7 @@ struct Node : public ChunkInfo

 // ------------------
 /** COB Mesh data structure */
-struct Mesh : public Node
-{
+struct Mesh final : Node {
    using ChunkInfo::operator=;
    enum DrawFlags {
        SOLID = 0x1,
@@ -162,107 +159,118 @@ struct Mesh : public Node

 // ------------------
 /** COB Group data structure */
-struct Group : public Node
-{
+struct Group final : Node {
    using ChunkInfo::operator=;
-    Group() : Node(TYPE_GROUP) {}
+    
+    Group() : Node(TYPE_GROUP) {
+        // empty
+    }
 };

 // ------------------
 /** COB Bone data structure */
-struct Bone : public Node
-{
+struct Bone final : Node {
    using ChunkInfo::operator=;
-    Bone() : Node(TYPE_BONE) {}
+    
+    Bone() : Node(TYPE_BONE) {
+        // empty
+    }
 };

 // ------------------
 /** COB Light data structure */
-struct Light : public Node
-{
+struct Light final : Node {
    enum LightType {
-        SPOT,LOCAL,INFINITE
+        SPOT,
+        LOCAL,
+        INFINITE
    };

    using ChunkInfo::operator=;
-    Light() : Node(TYPE_LIGHT),angle(),inner_angle(),ltype(SPOT) {}
+
+    Light() : Node(TYPE_LIGHT), ltype() {
+        // empty
+    }

    aiColor3D color;
-    float angle,inner_angle;
+    float angle{ 0.0f };
+    float inner_angle{ 0.0f };

-    LightType ltype;
+    LightType ltype{SPOT};
 };

 // ------------------
 /** COB Camera data structure */
-struct Camera : public Node
-{
+struct Camera final : Node {
    using ChunkInfo::operator=;
-    Camera() : Node(TYPE_CAMERA) {}
+
+    Camera() : Node(TYPE_CAMERA) {
+        // empty
+    }
 };

 // ------------------
 /** COB Texture data structure */
-struct Texture
-{
+struct Texture {
    std::string path;
    aiUVTransform transform;
 };

 // ------------------
 /** COB Material data structure */
-struct Material : ChunkInfo
-{
+struct Material : ChunkInfo {
    using ChunkInfo::operator=;
+
    enum Shader {
-        FLAT,PHONG,METAL
+        FLAT,
+        PHONG,
+        METAL
    };

    enum AutoFacet {
-        FACETED,AUTOFACETED,SMOOTH
+        FACETED,
+        AUTOFACETED,
+        SMOOTH
    };

-    Material() : alpha(),exp(),ior(),ka(),ks(1.f),
-        matnum(UINT_MAX),
-        shader(FLAT),autofacet(FACETED),
-        autofacet_angle()
-    {}
+    Material() : shader(FLAT) {
+        // empty
+    }

    std::string type;
-
    aiColor3D rgb;
-    float alpha, exp, ior,ka,ks;
-
-    unsigned int matnum;
+    float alpha{ 0.0f };
+    float exp{ 0.0f };
+    float ior{ 0.0f };
+    float ka{ 0.0f };
+    float ks{ 1.0f };
+    unsigned int matnum{ UINT_MAX };
    Shader shader;
-
-    AutoFacet autofacet;
-    float autofacet_angle;
-
+    AutoFacet autofacet{FACETED};
+    float autofacet_angle{ 0.0f };
    std::shared_ptr<Texture> tex_env,tex_bump,tex_color;
 };

 // ------------------
 /** Embedded bitmap, for instance for the thumbnail image */
-struct Bitmap : ChunkInfo
-{
-    Bitmap() : orig_size() {}
-    struct BitmapHeader
-    {
+struct Bitmap : ChunkInfo {
+    Bitmap() = default;
+
+    struct BitmapHeader {
+        // empty
    };

    BitmapHeader head;
-    size_t orig_size;
+    size_t orig_size{ 0u };
    std::vector<char> buff_zipped;
 };

-typedef std::deque< std::shared_ptr<Node> > NodeList;
-typedef std::vector< Material > MaterialList;
+using NodeList      = std::deque< std::shared_ptr<Node>>;
+using MaterialList = std::vector< Material >;

 // ------------------
 /** Represents a master COB scene, even if we loaded just a single COB file */
-struct Scene
-{
+struct Scene {
    NodeList nodes;
    MaterialList materials;

@@ -270,7 +278,6 @@ struct Scene
    Bitmap thumbnail;
 };

-    } // end COB
-} // end Assimp
+} // end Assimp::COB

-#endif
+#endif // INCLUDED_AI_COB_SCENE_H
@@ -58,7 +58,7 @@ namespace Assimp {
 *  Link to file format specification:
 *  <max_8_dvd>\samples\Motion\Docs\CSM.rtf
 */
-class CSMImporter : public BaseImporter {
+class CSMImporter final : public BaseImporter {
 public:
    CSMImporter();
    ~CSMImporter() override = default;
@@ -65,7 +65,7 @@ class IOSystem;

 /// Helper class to export a given scene to a Collada file. Just for my personal
 /// comfort when implementing it.
-class ColladaExporter {
+class ColladaExporter final {
 public:
    /// Constructor for a specific scene to export
    ColladaExporter(const aiScene *pScene, IOSystem *pIOSystem, const std::string &path, const std::string &file);
@@ -341,7 +341,7 @@ struct SubMesh {

 /// Contains data for a single mesh
 struct Mesh {
-    Mesh(const std::string &id) :
+    explicit Mesh(const std::string &id) :
            mId(id) {
        for (unsigned int i = 0; i < AI_MAX_NUMBER_OF_TEXTURECOORDS; ++i) {
            mNumUVComponents[i] = 2;
@@ -77,12 +77,12 @@ static constexpr aiImporterDesc desc = {
    "dae xml zae"
 };

-static const float kMillisecondsFromSeconds = 1000.f;
+static constexpr float kMillisecondsFromSeconds = 1000.f;

 // Add an item of metadata to a node
 // Assumes the key is not already in the list
 template <typename T>
-inline void AddNodeMetaData(aiNode *node, const std::string &key, const T &value) {
+void AddNodeMetaData(aiNode *node, const std::string &key, const T &value) {
    if (nullptr == node->mMetaData) {
        node->mMetaData = new aiMetadata();
    }
@@ -92,7 +92,7 @@ inline void AddNodeMetaData(aiNode *node, const std::string &key, const T &value
 // ------------------------------------------------------------------------------------------------
 // Reads a float value from an accessor and its data array.
 static ai_real ReadFloat(const Accessor &pAccessor, const Data &pData, size_t pIndex, size_t pOffset) {
-    size_t pos = pAccessor.mStride * pIndex + pAccessor.mOffset + pOffset;
+    const size_t pos = pAccessor.mStride * pIndex + pAccessor.mOffset + pOffset;
    ai_assert(pos < pData.mValues.size());
    return pData.mValues[pos];
 }
@@ -668,7 +668,7 @@ aiMesh *ColladaLoader::CreateMesh(const ColladaParser &pParser, const Mesh *pSrc
    }

    // create morph target meshes if any
-    MeshArray targetMeshes;
+    std::vector<aiMesh *> targetMeshes;
    std::vector<float> targetWeights;
    Collada::MorphMethod method = Normalized;

@@ -1819,4 +1819,4 @@ std::string ColladaLoader::FindNameForNode(const Node *pNode) {

 } // Namespace Assimp

-#endif // !! ASSIMP_BUILD_NO_DAE_IMPORTER
+#endif // !! ASSIMP_BUILD_NO_COLLADA_IMPORTER
@@ -82,7 +82,7 @@ struct ColladaMeshIndex {
 * Collada is over-engineered to death, with every new iteration bringing  more useless stuff,
 * so I limited the data to what I think is useful for games.
 */
-class ColladaLoader : public BaseImporter {
+class ColladaLoader final : public BaseImporter {
 public:
    /// The class constructor.
    ColladaLoader();
@@ -206,10 +206,10 @@ private:
    std::map<std::string, size_t> mMaterialIndexByName;

    /** Accumulated meshes for the target scene */
-    MeshArray mMeshes;
+    std::vector<aiMesh *> mMeshes;

    /** Accumulated morph target meshes */
-    MeshArray mTargetMeshes;
+    std::vector<aiMesh *> mTargetMeshes;

    /** Temporary material list */
    std::vector<std::pair<Collada::Effect *, aiMaterial *>> newMats;
@@ -1929,7 +1929,7 @@ size_t ColladaParser::ReadPrimitives(XmlNode &node, Mesh &pMesh, std::vector<Inp
 void ColladaParser::CopyVertex(size_t currentVertex, size_t numOffsets, size_t numPoints, size_t perVertexOffset, Mesh &pMesh,
        std::vector<InputChannel> &pPerIndexChannels, size_t currentPrimitive, const std::vector<size_t> &indices) {
    // calculate the base offset of the vertex whose attributes we ant to copy
-    size_t baseOffset = currentPrimitive * numOffsets * numPoints + currentVertex * numOffsets;
+    const auto baseOffset = currentPrimitive * numOffsets * numPoints + currentVertex * numOffsets;

    // don't overrun the boundaries of the index list
    ai_assert((baseOffset + numOffsets - 1) < indices.size());
@@ -1944,6 +1944,9 @@ void ColladaParser::CopyVertex(size_t currentVertex, size_t numOffsets, size_t n
    }

    // store the vertex-data index for later assignment of bone vertex weights
+    if (const auto indexOffset = baseOffset + perVertexOffset; indexOffset >= indices.size()) {
+        throw DeadlyImportError("index offset out of range");
+    }
    pMesh.mFacePosIndices.push_back(indices[baseOffset + perVertexOffset]);
 }

@@ -2423,4 +2426,4 @@ InputType ColladaParser::GetTypeForSemantic(const std::string &semantic) {
    return IT_Invalid;
 }

-#endif // !! ASSIMP_BUILD_NO_DAE_IMPORTER
+#endif // !! ASSIMP_BUILD_NO_COLLADA_IMPORTER
@@ -53,15 +53,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <vector>
 #include <assimp/DefaultLogger.hpp>

-namespace Assimp {
-namespace DXF {
+namespace Assimp::DXF {

 // read pairs of lines, parse group code and value and provide utilities
 // to convert the data to the target data type.
 // do NOT skip empty lines. In DXF files, they count as valid data.
 class LineReader {
 public:
-    LineReader(StreamReaderLE& reader) : splitter(reader,false,true), groupcode( 0 ), end() {
+    explicit LineReader(StreamReaderLE& reader) : splitter(reader,false,true), groupcode( 0 ), end() {
        // empty
    }

@@ -101,7 +100,7 @@ public:
    }

    // -----------------------------------------
-    float ValueAsFloat() const {
+    ai_real ValueAsFloat() const {
        return fast_atof(value.c_str());
    }

@@ -203,7 +202,6 @@ struct FileData {
    std::vector<Block> blocks;
 };

-} // namespace DXF
-} // namespace Assimp
+} // namespace Assimp::DXF

 #endif // INCLUDED_DXFHELPER_H
@@ -66,7 +66,7 @@ namespace DXF {
 /**
 *  @brief  DXF importer implementation.
 */
-class DXFImporter : public BaseImporter {
+class DXFImporter final : public BaseImporter {
 public:
    DXFImporter() = default;
    ~DXFImporter() override = default;
@@ -47,8 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #ifndef ASSIMP_BUILD_NO_FBX_EXPORTER

-namespace Assimp {
-namespace FBX {
+namespace Assimp::FBX {

 static constexpr size_t NumNullRecords = 25;

@@ -84,8 +83,7 @@ enum TransformInheritance {
    TransformInheritance_MAX // end-of-enum sentinel
 };

-} // namespace FBX
-} // namespace Assimp
+} // namespace Assimp::FBX

 #endif // ASSIMP_BUILD_NO_FBX_EXPORTER

@@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <set>

 //
-#if _MSC_VER > 1500 || (defined __GNUC___)
+#if _MSC_VER > 1500 || (defined __GNUC__)
 #   define ASSIMP_FBX_USE_UNORDERED_MULTIMAP
 #   else
 #   define fbx_unordered_map map
@@ -72,7 +72,7 @@ namespace FBX {

 using namespace Util;

-static constexpr char MAGIC_NODE_TAG[] = "_$AssimpFbx$";
+#define MAGIC_NODE_TAG "_$AssimpFbx$"

 #define CONVERT_FBX_TIME(time) static_cast<double>(time) / 46186158000LL

@@ -125,10 +125,21 @@ static void correctRootTransform(const aiScene *scene) {

 FBXConverter::FBXConverter(aiScene *out, const Document &doc, bool removeEmptyBones) :
        defaultMaterialIndex(),
+        mMeshes(),
+        lights(),
+        cameras(),
+        textures(),
+        materials_converted(),
+        textures_converted(),
+        meshes_converted(),
+        node_anim_chain_bits(),
+        mNodeNames(),
        anim_fps(),
        mSceneOut(out),
        doc(doc),
        mRemoveEmptyBones(removeEmptyBones) {
+
+
    // animations need to be converted first since this will
    // populate the node_anim_chain_bits map, which is needed
    // to determine which nodes need to be generated.
@@ -151,7 +162,7 @@ FBXConverter::FBXConverter(aiScene *out, const Document &doc, bool removeEmptyBo
                continue;
            }

-            auto mat = dynamic_cast<const Material *>(ob);
+            const Material *mat = dynamic_cast<const Material *>(ob);
            if (mat) {

                if (materials_converted.find(mat) == materials_converted.end()) {
@@ -211,6 +222,7 @@ static std::string getAncestorBaseName(const aiNode *node) {
    return std::string(nodeName, length);
 }

+// Make unique name
 std::string FBXConverter::MakeUniqueNodeName(const Model *const model, const aiNode &parent) {
    std::string original_name = FixNodeName(model->Name());
    if (original_name.empty()) {
@@ -224,18 +236,9 @@ std::string FBXConverter::MakeUniqueNodeName(const Model *const model, const aiN
 /// This struct manages nodes which may or may not end up in the node hierarchy.
 /// When a node becomes a child of another node, that node becomes its owner and mOwnership should be released.
 struct FBXConverter::PotentialNode {
-    PotentialNode() : mOwnership(new aiNode), mNode(mOwnership.get()) {
-        // empty
-    }
-    
-    explicit PotentialNode(const std::string& name) : mOwnership(new aiNode(name)), mNode(mOwnership.get()) {
-        // empty
-    }
-    
-    aiNode* operator->() {
-        return mNode;
-    }
-
+    PotentialNode() : mOwnership(new aiNode), mNode(mOwnership.get()) {}
+    explicit PotentialNode(const std::string& name) : mOwnership(new aiNode(name)), mNode(mOwnership.get()) {}
+    aiNode* operator->() { return mNode; }
    std::unique_ptr<aiNode> mOwnership;
    aiNode* mNode;
 };
@@ -1089,14 +1092,14 @@ aiMesh *FBXConverter::SetupEmptyMesh(const Geometry &mesh, aiNode *parent) {
 }

 static aiSkeleton *createAiSkeleton(SkeletonBoneContainer &sbc) {
-    if (sbc.meshArray.empty() || sbc.skeletonBoneToMeshLookup.empty()) {
+    if (sbc.MeshArray.empty() || sbc.SkeletonBoneToMeshLookup.empty()) {
        return nullptr;
    }

    aiSkeleton *skeleton = new aiSkeleton;
-    for (auto *mesh : sbc.meshArray) {
-        auto it = sbc.skeletonBoneToMeshLookup.find(mesh);
-        if (it == sbc.skeletonBoneToMeshLookup.end()) {
+    for (auto *mesh : sbc.MeshArray) {
+        auto it = sbc.SkeletonBoneToMeshLookup.find(mesh);
+        if (it == sbc.SkeletonBoneToMeshLookup.end()) {
            continue;
        }
        SkeletonBoneArray *ba = it->second;
@@ -1544,12 +1547,12 @@ static void copyBoneToSkeletonBone(aiMesh *mesh, aiBone *bone, aiSkeletonBone *s
 void FBXConverter::ConvertWeightsToSkeleton(aiMesh *out, const MeshGeometry &geo, const aiMatrix4x4 &absolute_transform, aiNode *parent, unsigned int materialIndex,
        std::vector<unsigned int> *outputVertStartIndices, SkeletonBoneContainer &skeletonContainer) {

-    if (skeletonContainer.skeletonBoneToMeshLookup.find(out) != skeletonContainer.skeletonBoneToMeshLookup.end()) {
+    if (skeletonContainer.SkeletonBoneToMeshLookup.find(out) != skeletonContainer.SkeletonBoneToMeshLookup.end()) {
        return;
    }

    ConvertWeights(out, geo, absolute_transform, parent, materialIndex, outputVertStartIndices);
-    skeletonContainer.meshArray.emplace_back(out);
+    skeletonContainer.MeshArray.emplace_back(out);
    SkeletonBoneArray *ba = new SkeletonBoneArray;
    for (size_t i = 0; i < out->mNumBones; ++i) {
        aiBone *bone = out->mBones[i];
@@ -1560,7 +1563,7 @@ void FBXConverter::ConvertWeightsToSkeleton(aiMesh *out, const MeshGeometry &geo
        copyBoneToSkeletonBone(out, bone, skeletonBone);
        ba->emplace_back(skeletonBone);
    }
-    skeletonContainer.skeletonBoneToMeshLookup[out] = ba;
+    skeletonContainer.SkeletonBoneToMeshLookup[out] = ba;
 }

 void FBXConverter::ConvertWeights(aiMesh *out, const MeshGeometry &geo, const aiMatrix4x4 &absolute_transform,
@@ -1568,6 +1571,8 @@ void FBXConverter::ConvertWeights(aiMesh *out, const MeshGeometry &geo, const ai
        std::vector<unsigned int> *outputVertStartIndices) {
    ai_assert(geo.DeformerSkin());

+    std::vector<size_t> out_indices, index_out_indices, count_out_indices;
+
    const Skin &sk = *geo.DeformerSkin();

    std::vector<aiBone*> bones;
@@ -1575,10 +1580,6 @@ void FBXConverter::ConvertWeights(aiMesh *out, const MeshGeometry &geo, const ai
    ai_assert(no_mat_check || outputVertStartIndices);

    try {
-        std::vector<size_t> count_out_indices;
-        std::vector<size_t> index_out_indices;
-        std::vector<size_t> out_indices;
-
        // iterate over the sub deformers
        for (const Cluster *cluster : sk.Clusters()) {
            ai_assert(cluster);
@@ -1750,10 +1751,10 @@ unsigned int FBXConverter::GetDefaultMaterial() {
        return defaultMaterialIndex - 1;
    }

-    auto out_mat = new aiMaterial();
+    aiMaterial *out_mat = new aiMaterial();
    materials.push_back(out_mat);

-    const auto diffuse = aiColor3D(0.8f, 0.8f, 0.8f);
+    const aiColor3D diffuse = aiColor3D(0.8f, 0.8f, 0.8f);
    out_mat->AddProperty(&diffuse, 1, AI_MATKEY_COLOR_DIFFUSE);

    aiString s;
@@ -1769,7 +1770,7 @@ unsigned int FBXConverter::ConvertMaterial(const Material &material, const MeshG
    const PropertyTable &props = material.Props();

    // generate empty output material
-    auto out_mat = new aiMaterial();
+    aiMaterial *out_mat = new aiMaterial();
    materials_converted[&material] = static_cast<unsigned int>(materials.size());

    materials.push_back(out_mat);
@@ -1808,7 +1809,7 @@ unsigned int FBXConverter::ConvertMaterial(const Material &material, const MeshG

 unsigned int FBXConverter::ConvertVideo(const Video &video) {
    // generate empty output texture
-    auto out_tex = new aiTexture();
+    aiTexture *out_tex = new aiTexture();
    textures.push_back(out_tex);

    // assuming the texture is compressed
@@ -80,8 +80,8 @@ using SkeletonBoneArray = std::vector<aiSkeletonBone *>;
 using SkeletonBoneToMesh = std::map<aiMesh*, SkeletonBoneArray*>;

 struct SkeletonBoneContainer {
-    MeshArray meshArray;
-    SkeletonBoneToMesh skeletonBoneToMeshLookup;
+    std::vector<aiMesh *> MeshArray;
+    SkeletonBoneToMesh SkeletonBoneToMeshLookup;
 };

 class Document;
@@ -174,7 +174,7 @@ class NodeAttribute : public Object {
 public:
    NodeAttribute(uint64_t id, const Element& element, const Document& doc, const std::string& name);

-    virtual ~NodeAttribute() = default;
+    ~NodeAttribute() override = default;

    const PropertyTable& Props() const {
        ai_assert(props.get());
@@ -186,11 +186,11 @@ private:
 };

 /** DOM base class for FBX camera settings attached to a node */
-class CameraSwitcher : public NodeAttribute {
+class CameraSwitcher final : public NodeAttribute {
 public:
    CameraSwitcher(uint64_t id, const Element& element, const Document& doc, const std::string& name);

-    virtual ~CameraSwitcher() = default;
+    ~CameraSwitcher() override= default;

    int CameraID() const {
        return cameraId;
@@ -231,11 +231,11 @@ private:


 /** DOM base class for FBX cameras attached to a node */
-class Camera : public NodeAttribute {
+class Camera final : public NodeAttribute {
 public:
    Camera(uint64_t id, const Element& element, const Document& doc, const std::string& name);

-    virtual  ~Camera() = default;
+    ~Camera() override = default;

    fbx_simple_property(Position, aiVector3D, aiVector3D(0,0,0))
    fbx_simple_property(UpVector, aiVector3D, aiVector3D(0,1,0))
@@ -257,24 +257,24 @@ public:
 };

 /** DOM base class for FBX null markers attached to a node */
-class Null : public NodeAttribute {
+class Null final : public NodeAttribute {
 public:
    Null(uint64_t id, const Element& element, const Document& doc, const std::string& name);
-    virtual ~Null() = default;
+    ~Null() override = default;
 };

 /** DOM base class for FBX limb node markers attached to a node */
-class LimbNode : public NodeAttribute {
+class LimbNode final : public NodeAttribute {
 public:
    LimbNode(uint64_t id, const Element& element, const Document& doc, const std::string& name);
-    virtual ~LimbNode() = default;
+    ~LimbNode() override = default;
 };

 /** DOM base class for FBX lights attached to a node */
-class Light : public NodeAttribute {
+class Light final : public NodeAttribute {
 public:
    Light(uint64_t id, const Element& element, const Document& doc, const std::string& name);
-    virtual ~Light() = default;
+    ~Light() override = default;

    enum Type {
        Type_Point,
@@ -329,7 +329,7 @@ public:
 };

 /** DOM base class for FBX models (even though its semantics are more "node" than "model" */
-class Model : public Object {
+class Model final : public Object {
 public:
    enum RotOrder {
        RotOrder_EulerXYZ = 0,
@@ -354,7 +354,7 @@ public:

    Model(uint64_t id, const Element& element, const Document& doc, const std::string& name);

-    virtual ~Model() = default;
+    ~Model() override = default;

    fbx_simple_property(QuaternionInterpolate, int, 0)

@@ -477,11 +477,11 @@ private:
 };

 /** DOM class for generic FBX textures */
-class Texture : public Object {
+class Texture final : public Object {
 public:
    Texture(uint64_t id, const Element& element, const Document& doc, const std::string& name);

-    virtual ~Texture();
+    ~Texture() override;

    const std::string& Type() const {
        return type;
@@ -542,10 +542,10 @@ private:
 };

 /** DOM class for layered FBX textures */
-class LayeredTexture : public Object {
+class LayeredTexture final : public Object {
 public:
    LayeredTexture(uint64_t id, const Element& element, const Document& doc, const std::string& name);
-    virtual ~LayeredTexture();
+    ~LayeredTexture() override;

    // Can only be called after construction of the layered texture object due to construction flag.
    void fillTexture(const Document& doc);
@@ -608,11 +608,11 @@ using TextureMap = std::fbx_unordered_map<std::string, const Texture*>;
 using LayeredTextureMap = std::fbx_unordered_map<std::string, const LayeredTexture*>;

 /** DOM class for generic FBX videos */
-class Video : public Object {
+class Video final : public Object {
 public:
    Video(uint64_t id, const Element& element, const Document& doc, const std::string& name);

-    virtual ~Video();
+    ~Video() override;

    const std::string& Type() const {
        return type;
@@ -697,10 +697,10 @@ using KeyTimeList = std::vector<int64_t>;
 using KeyValueList = std::vector<float>;

 /** Represents a FBX animation curve (i.e. a 1-dimensional set of keyframes and values therefore) */
-class AnimationCurve : public Object {
+class AnimationCurve final : public Object {
 public:
    AnimationCurve(uint64_t id, const Element& element, const std::string& name, const Document& doc);
-    virtual ~AnimationCurve() = default;
+    ~AnimationCurve() override = default;

    /** get list of keyframe positions (time).
     *  Invariant: |GetKeys()| > 0 */
@@ -733,7 +733,7 @@ private:
 using AnimationCurveMap = std::map<std::string, const AnimationCurve*>;

 /** Represents a FBX animation curve (i.e. a mapping from single animation curves to nodes) */
-class AnimationCurveNode : public Object {
+class AnimationCurveNode final : public Object {
 public:
    /* the optional white list specifies a list of property names for which the caller
    wants animations for. If the curve node does not match one of these, std::range_error
@@ -741,7 +741,7 @@ public:
    AnimationCurveNode(uint64_t id, const Element& element, const std::string& name, const Document& doc,
            const char *const *target_prop_whitelist = nullptr, size_t whitelist_size = 0);

-    virtual ~AnimationCurveNode() = default;
+   ~AnimationCurveNode() override = default;

    const PropertyTable& Props() const {
        ai_assert(props.get());
@@ -783,7 +783,7 @@ private:
 using AnimationCurveNodeList = std::vector<const AnimationCurveNode*>;

 /** Represents a FBX animation layer (i.e. a list of node animations) */
-class AnimationLayer : public Object {
+class AnimationLayer final : public Object {
 public:
    AnimationLayer(uint64_t id, const Element& element, const std::string& name, const Document& doc);
    virtual ~AnimationLayer() = default;
@@ -806,7 +806,7 @@ private:
 using AnimationLayerList = std::vector<const AnimationLayer*>;

 /** Represents a FBX animation stack (i.e. a list of animation layers) */
-class AnimationStack : public Object {
+class AnimationStack final : public Object {
 public:
    AnimationStack(uint64_t id, const Element& element, const std::string& name, const Document& doc);
    virtual ~AnimationStack() = default;
@@ -851,7 +851,7 @@ using WeightIndexArray = std::vector<unsigned int>;


 /** DOM class for BlendShapeChannel deformers */
-class BlendShapeChannel : public Deformer {
+class BlendShapeChannel final : public Deformer {
 public:
    BlendShapeChannel(uint64_t id, const Element& element, const Document& doc, const std::string& name);

@@ -876,7 +876,7 @@ private:
 };

 /** DOM class for BlendShape deformers */
-class BlendShape : public Deformer {
+class BlendShape final : public Deformer {
 public:
    BlendShape(uint64_t id, const Element& element, const Document& doc, const std::string& name);

@@ -891,7 +891,7 @@ private:
 };

 /** DOM class for skin deformer clusters (aka sub-deformers) */
-class Cluster : public Deformer {
+class Cluster final : public Deformer {
 public:
    Cluster(uint64_t id, const Element& element, const Document& doc, const std::string& name);

@@ -935,7 +935,7 @@ private:
 };

 /** DOM class for skin deformers */
-class Skin : public Deformer {
+class Skin final : public Deformer {
 public:
    Skin(uint64_t id, const Element& element, const Document& doc, const std::string& name);

@@ -1582,6 +1582,7 @@ void FBXExporter::WriteObjects () {
        }
    }

+    std::map<std::string, std::string> tpath_by_image;
    // FbxVideo - stores images used by textures.
    for (const auto &it : uid_by_image) {
        FBX::Node n("Video");
@@ -1601,10 +1602,21 @@ void FBXExporter::WriteObjects () {
            std::stringstream newPath;
            if (embedded_texture->mFilename.length > 0) {
                newPath << embedded_texture->mFilename.C_Str();
+                // If newPath doesn't end in an extension, add extension from embedded_texture->achFormatHint
+                std::string np = newPath.str();
+                size_t dot_pos = np.find_last_of('.');
+                if (dot_pos == std::string::npos || dot_pos < np.find_last_of("/\\")) {
+                    // No extension found, add one
+                    newPath << "." << embedded_texture->achFormatHint;
+                }
            } else if (embedded_texture->achFormatHint[0]) {
                int texture_index = std::stoi(path.substr(1, path.size() - 1));
                newPath << texture_index << "." << embedded_texture->achFormatHint;
            }
+            auto elem = tpath_by_image.find(path);
+            if (elem == tpath_by_image.end()) {
+                tpath_by_image[path] = newPath.str();
+            }
            path = newPath.str();
            // embed the texture
            size_t texture_size = static_cast<size_t>(embedded_texture->mWidth * std::max(embedded_texture->mHeight, 1u));
@@ -1723,6 +1735,17 @@ void FBXExporter::WriteObjects () {
            unsigned int max = sizeof(aiUVTransform);
            aiGetMaterialFloatArray(mat, AI_MATKEY_UVTRANSFORM(aiTextureType_DIFFUSE, 0), (ai_real *)&trafo, &max);

+            auto tp_elem = tpath_by_image.find(texture_path);
+            std::string tfile_path = texture_path;
+            if (tp_elem != tpath_by_image.end()) {
+                tfile_path = tp_elem->second;
+            } else {
+                std::stringstream err;
+                err << "Texture path not found for texure " << texture_path;
+                err << " on material " << i;
+                ASSIMP_LOG_WARN(err.str());
+            }
+
            // now write the actual texture node
            FBX::Node tnode("Texture");
            // TODO: some way to determine texture name?
@@ -1743,8 +1766,8 @@ void FBXExporter::WriteObjects () {
            // can't easily determine which texture path will be correct,
            // so just store what we have in every field.
            // these being incorrect is a common problem with FBX anyway.
-            tnode.AddChild("FileName", texture_path);
-            tnode.AddChild("RelativeFilename", texture_path);
+            tnode.AddChild("FileName", tp_elem->second);
+            tnode.AddChild("RelativeFilename", tp_elem->second);
            tnode.AddChild("ModelUVTranslation", double(0.0), double(0.0));
            tnode.AddChild("ModelUVScaling", double(1.0), double(1.0));
            tnode.AddChild("Texture_Alpha_Source", "None");
@@ -67,7 +67,7 @@ typedef class basic_formatter<char, std::char_traits<char>, std::allocator<char>
 ///
 /// See http://en.wikipedia.org/wiki/FBX
 // -------------------------------------------------------------------------------------------
-class FBXImporter : public BaseImporter, public LogFunctions<FBXImporter> {
+class FBXImporter final : public BaseImporter, public LogFunctions<FBXImporter> {
 public:
    /// @brief The class constructor.
    FBXImporter() = default;
@@ -50,11 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <string>
 #include <cstring>

-#ifndef ASSIMP_BUILD_NO_FBX_IMPORTER
-
-namespace Assimp {
-namespace FBX {
-namespace Util {
+namespace Assimp::FBX::Util {

 // ------------------------------------------------------------------------------------------------
 const char* TokenTypeString(TokenType t)
@@ -233,8 +229,5 @@ std::string EncodeBase64(const char* data, size_t length)
    return encoded_string;
 }

-} // !Util
-} // !FBX
-} // !Assimp
+} // namespace Assimp::FBX::Util

-#endif
@@ -49,10 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "FBXTokenizer.h"
 #include <stdint.h>

-namespace Assimp {
-namespace FBX {
-
-namespace Util {
+namespace Assimp::FBX::Util {

 /** helper for std::for_each to delete all heap-allocated items in a container */
 template<typename T>
@@ -73,12 +70,9 @@ struct destructor_fun {
    }
 };

-
 /** Get a string representation for a #TokenType. */
 const char* TokenTypeString(TokenType t);

-
-
 /** Format log/error messages using a given offset in the source binary file
 *
 *  @param offset offset within the file
@@ -129,8 +123,6 @@ char EncodeBase64(char byte);
 *  @return base64-encoded string*/
 std::string EncodeBase64(const char* data, size_t length);

-}
-}
 }

 #endif // ! INCLUDED_AI_FBX_UTIL_H
@@ -162,7 +162,7 @@ aiMesh *IRRImporter::BuildSingleQuadMesh(const SkyboxVertex &v1,
 }

 // ------------------------------------------------------------------------------------------------
-void IRRImporter::BuildSkybox(MeshArray &meshes, std::vector<aiMaterial *> materials) {
+void IRRImporter::BuildSkybox(std::vector<aiMesh *> &meshes, std::vector<aiMaterial *> materials) {
    // Update the material of the skybox - replace the name and disable shading for skyboxes.
    for (unsigned int i = 0; i < 6; ++i) {
        aiMaterial *out = (aiMaterial *)(*(materials.end() - (6 - i)));
@@ -602,7 +602,7 @@ void SetupMapping(aiMaterial *mat, aiTextureMapping mode, const aiVector3D &axis
 // ------------------------------------------------------------------------------------------------
 void IRRImporter::GenerateGraph(Node *root, aiNode *rootOut, aiScene *scene,
        BatchLoader &batch,
-        MeshArray &meshes,
+        std::vector<aiMesh *> &meshes,
        std::vector<aiNodeAnim *> &anims,
        std::vector<AttachmentInfo> &attach,
        std::vector<aiMaterial *> &materials,
@@ -1283,7 +1283,7 @@ void IRRImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
    std::vector<aiNodeAnim *> anims;
    std::vector<aiMaterial *> materials;
    std::vector<AttachmentInfo> attach;
-    MeshArray meshes;
+    std::vector<aiMesh *> meshes;

    // try to guess how much storage we'll need
    anims.reserve(guessedAnimCnt + (guessedAnimCnt >> 2));
@@ -229,7 +229,7 @@ private:
    /// Fill the scene-graph recursively
    void GenerateGraph(Node *root, aiNode *rootOut, aiScene *scene,
            BatchLoader &batch,
-            MeshArray &meshes,
+            std::vector<aiMesh *> &meshes,
            std::vector<aiNodeAnim *> &anims,
            std::vector<AttachmentInfo> &attach,
            std::vector<aiMaterial *> &materials,
@@ -248,7 +248,7 @@ private:
    /// @param meshes Receives 6 output meshes
    /// @param materials The last 6 materials are assigned to the newly
    ///                  created meshes. The names of the materials are adjusted.
-    void BuildSkybox(MeshArray &meshes,
+    void BuildSkybox(std::vector<aiMesh *> &meshes,
            std::vector<aiMaterial *> materials);

    // -------------------------------------------------------------------
@@ -121,7 +121,7 @@ void IRRMeshImporter::InternReadFile(const std::string &pFile,

    // final data
    std::vector<aiMaterial *> materials;
-    MeshArray meshes;
+    std::vector<aiMesh *> meshes;
    materials.reserve(5);
    meshes.reserve(5);

@@ -239,7 +239,7 @@ void LWOImporter::InternReadFile(const std::string &pFile,
    ResolveClips();

    // now process all layers and build meshes and nodes
-    MeshArray apcMeshes;
+    std::vector<aiMesh *> apcMeshes;
    std::map<uint16_t, aiNode *> apcNodes;

    apcMeshes.reserve(mLayers->size() * std::min(((unsigned int)mSurfaces->size() / 2u), 1u));
@@ -5,8 +5,6 @@ Open Asset Import Library (assimp)

 Copyright (c) 2006-2025, assimp team

-
-
 All rights reserved.

 Redistribution and use of this software in source and binary forms,
@@ -1150,4 +1148,4 @@ void LWOImporter::LoadLWO3Surface(unsigned int size) {
    }
 }

-#endif // !! ASSIMP_BUILD_NO_X_IMPORTER
+#endif // ASSIMP_BUILD_NO_LWO_IMPORTER
@@ -332,7 +332,7 @@ void M3DImporter::importTextures(const M3DWrapper &m3d) {
            /* if we have the texture loaded, set format hint and pcData too */
            tx->mWidth = t->w;
            tx->mHeight = t->h;
-            strcpy(tx->achFormatHint, formatHint[t->f - 1]);
+            strncpy(tx->achFormatHint, formatHint[t->f - 1], 8);
            tx->pcData = new aiTexel[tx->mWidth * tx->mHeight];
            for (j = k = 0; j < tx->mWidth * tx->mHeight; j++) {
                switch (t->f) {
@@ -393,11 +393,15 @@ MD5MeshParser::MD5MeshParser(SectionArray &mSections) {
                else if (TokenMatch(sz, "tri", 3)) {
                    AI_MD5_SKIP_SPACES(&sz, elem.end, elem.iLineNumber);
                    const unsigned int idx = strtoul10(sz, &sz);
-                    if (idx >= desc.mFaces.size())
+                    if (idx >= desc.mFaces.size()) {
                        desc.mFaces.resize(idx + 1);
+					}

                    aiFace &face = desc.mFaces[idx];
-                    face.mIndices = new unsigned int[face.mNumIndices = 3];
+                    if (face.mNumIndices != 3) {
+						delete [] face.mIndices;
+						face.mIndices = new unsigned int[face.mNumIndices = 3];
+					}
                    for (unsigned int i = 0; i < 3; ++i) {
                        AI_MD5_SKIP_SPACES(&sz, elem.end, elem.iLineNumber);
                        face.mIndices[i] = strtoul10(sz, &sz);
@@ -1405,10 +1405,10 @@ void MDLImporter::InternReadFile_3DGS_MDL7() {
    sharedData.apcOutBones = this->LoadBones_3DGS_MDL7();

    // vector to held all created meshes
-    MeshArray *avOutList;
+    std::vector<aiMesh *> *avOutList;

    // 3 meshes per group - that should be OK for most models
-    avOutList = new MeshArray[pcHeader->groups_num];
+    avOutList = new std::vector<aiMesh *>[pcHeader->groups_num];
    for (uint32_t i = 0; i < pcHeader->groups_num; ++i)
        avOutList[i].reserve(3);

@@ -5,8 +5,6 @@ Open Asset Import Library (assimp)

 Copyright (c) 2006-2025, assimp team

-
-
 All rights reserved.

 Redistribution and use of this software in source and binary forms,
@@ -46,10 +44,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *  Written against http://chumbalum.swissquake.ch/ms3d/ms3dspec.txt
 */

-
 #ifndef ASSIMP_BUILD_NO_MS3D_IMPORTER

-// internal headers
 #include "MS3DLoader.h"
 #include <assimp/StreamReader.h>
 #include <assimp/DefaultLogger.hpp>
@@ -392,13 +388,14 @@ void MS3DImporter::InternReadFile( const std::string& pFile,

    if (need_default && materials.size()) {
        ASSIMP_LOG_WARN("MS3D: Found group with no material assigned, spawning default material");
-        // if one of the groups has no material assigned, but there are other
+          // if one of the groups has no material assigned, but there are other
        // groups with materials, a default material needs to be added (
        // scenepreprocessor adds a default material only if nummat==0).
        materials.emplace_back();
        TempMaterial& m = materials.back();
-
-        strcpy(m.name,"<MS3D_DefaultMat>");
+        constexpr char DefaultMat[18] = "<MS3D_DefaultMat>";
+        strncpy(m.name, DefaultMat, sizeof(m.name));
+        m.name[18]='\0';
        m.diffuse = aiColor4D(0.6f,0.6f,0.6f,1.0);
        m.transparency = 1.f;
        m.shininess = 0.f;
@@ -80,7 +80,7 @@ ObjFileParser::ObjFileParser(IOStreamBuffer<char> &streamBuffer, const std::stri
        m_buffer(),
        m_pIO(io),
        m_progress(progress),
-        m_originalObjFileName(originalObjFileName) {
+        m_originalObjFileName(originalObjFileName) { 
    std::fill_n(m_buffer, Buffersize, '\0');

    // Create the model instance to store all the data
@@ -270,7 +270,7 @@ void Q3BSPFileImporter::CreateNodes(const Q3BSP::Q3BSPModel *pModel, aiScene *pS
    }

    unsigned int matIdx(0);
-    MeshArray MeshArray;
+    std::vector<aiMesh *> MeshArray;
    std::vector<aiNode *> NodeArray;
    for (FaceMapIt it = m_MaterialLookupMap.begin(); it != m_MaterialLookupMap.end(); ++it) {
        std::vector<Q3BSP::sQ3BSPFace *> *pArray = (*it).second;
@@ -55,6 +55,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/DefaultLogger.hpp>
 #include <assimp/IOSystem.hpp>

+#include <limits>
+
 namespace Assimp {

 static constexpr aiImporterDesc desc = {
@@ -309,6 +311,11 @@ void Q3DImporter::InternReadFile(const std::string &pFile,
                    throw DeadlyImportError("Quick3D: Invalid texture. Width or height is zero");
                }

+                const unsigned int uint_max = std::numeric_limits<unsigned int>::max();
+                if (tex->mWidth > (uint_max / tex->mHeight)) {
+                    throw DeadlyImportError("Quick3D: Texture dimensions are too large, resulting in overflow.");
+                }
+
                unsigned int mul = tex->mWidth * tex->mHeight;
                aiTexel *begin = tex->pcData = new aiTexel[mul];
                aiTexel *const end = &begin[mul - 1] + 1;
@@ -116,7 +116,7 @@ struct SIBObject {

 struct SIB {
    std::vector<aiMaterial *> mtls;
-    MeshArray meshes;
+    std::vector<aiMesh *> meshes;
    std::vector<aiLight *> lights;
    std::vector<SIBObject> objs, insts;
 };
@@ -222,7 +222,7 @@ void STLImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
 // ------------------------------------------------------------------------------------------------
 // Read an ASCII STL file
 void STLImporter::LoadASCIIFile(aiNode *root) {
-    MeshArray meshes;
+    std::vector<aiMesh *> meshes;
    std::vector<aiNode *> nodes;
    const char *sz = mBuffer;
    const char *bufferEnd = mBuffer + mFileSize;
@@ -58,7 +58,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #    pragma warning(disable : 4127 4456 4245 4512 )
 #endif // _MSC_VER

-#if _MSC_VER > 1500 || (defined __GNUC___)
+#if _MSC_VER > 1500 || (defined __GNUC__)
 #    define ASSIMP_STEP_USE_UNORDERED_MULTIMAP
 #else
 #    define step_unordered_map map
@@ -919,6 +919,10 @@ private:
 #pragma warning(pop)
 #endif // _MSC_VER

+#if _MSC_VER > 1920
+#pragma warning(pop)
+#endif
+
 } // namespace STEP
 } // namespace Assimp

@@ -63,7 +63,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <memory>

 //
-#if _MSC_VER > 1500 || (defined __GNUC___)
+#if _MSC_VER > 1500 || (defined __GNUC__)
 #   define ASSIMP_STEP_USE_UNORDERED_MULTIMAP
 #   else
 #   define step_unordered_map map
@@ -61,6 +61,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "assimp/MemoryIOWrapper.h"
 #include <assimp/StringUtils.h>
 #include <assimp/StreamReader.h>
+#include <assimp/metadata.h>

 #include "io-util.hh" // namespace tinyusdz::io
 #include "tydra/scene-access.hh"
@@ -219,6 +220,9 @@ void USDImporterImplTinyusdz::InternReadFile(
    textures(render_scene, pScene, nameWExt);
    textureImages(render_scene, pScene, nameWExt);
    buffers(render_scene, pScene, nameWExt);
+
+    std::map<size_t, tinyusdz::tydra::Node> meshNodes;
+    setupNodes(render_scene, pScene, stage, meshNodes, nameWExt);
    pScene->mRootNode = nodesRecursive(nullptr, render_scene.nodes[0], render_scene.skeletons);

    setupBlendShapes(render_scene, pScene, nameWExt);
@@ -798,11 +802,50 @@ void USDImporterImplTinyusdz::buffers(
    }
 }

+void USDImporterImplTinyusdz::setupNodes(
+        const tinyusdz::tydra::RenderScene &render_scene,
+        aiScene *pScene,
+        const tinyusdz::Stage &usdStage,
+        std::map<size_t, tinyusdz::tydra::Node> &meshNodes,
+        const std::string &nameWExt) {
+    stringstream ss;
+
+    pScene->mRootNode = nodes(render_scene, usdStage, meshNodes, nameWExt);
+    pScene->mRootNode->mNumMeshes = pScene->mNumMeshes;
+    pScene->mRootNode->mMeshes = new unsigned int[pScene->mRootNode->mNumMeshes];
+    ss.str("");
+    ss << "setupNodes(): pScene->mNumMeshes: " << pScene->mNumMeshes;
+    if (pScene->mRootNode != nullptr) {
+        ss << ", mRootNode->mNumMeshes: " << pScene->mRootNode->mNumMeshes;
+    }
+    TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
+
+    for (unsigned int meshIdx = 0; meshIdx < pScene->mNumMeshes; meshIdx++) {
+        pScene->mRootNode->mMeshes[meshIdx] = meshIdx;
+    }
+
+}
+
+aiNode *USDImporterImplTinyusdz::nodes(
+        const tinyusdz::tydra::RenderScene &render_scene,
+        const tinyusdz::Stage &usdStage,
+        std::map<size_t, tinyusdz::tydra::Node> &meshNodes,
+        const std::string &nameWExt) {
+    const size_t numNodes{render_scene.nodes.size()};
+    (void) numNodes; // Ignore unused variable when -Werror enabled
+    stringstream ss;
+    ss.str("");
+    ss << "nodes(): model" << nameWExt << ", numNodes: " << numNodes;
+    TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
+    return nodesRecursive(nullptr, usdStage.root_prims()[0], render_scene.nodes[0], meshNodes);
+}
+
 using Assimp::tinyusdzNodeTypeFor;
 using Assimp::tinyUsdzMat4ToAiMat4;
 using tinyusdz::tydra::NodeType;
 aiNode *USDImporterImplTinyusdz::nodesRecursive(
        aiNode *pNodeParent,
+        const tinyusdz::Prim& prim,
        const tinyusdz::tydra::Node &node,
        const std::vector<tinyusdz::tydra::SkelHierarchy> &skeletons) {
    stringstream ss;
@@ -844,6 +887,22 @@ aiNode *USDImporterImplTinyusdz::nodesRecursive(
        }
    }

+    // Composition: references
+    if (prim.metas().references.has_value())
+    {
+        const tinyusdz::ListEditQual referenceQual = prim.metas().references->first;
+        const std::vector<tinyusdz::Reference> references = prim.metas().references->second;
+
+        for (const auto &reference : references)
+        {
+            cNode->mMetaData = aiMetadata::Alloc(1);
+            cNode->mMetaData->Add("ref", aiString(reference.asset_path.GetAssetPath()));
+        }
+    }
+
+    size_t i{0};
+    for (const auto &childNode: node.children) {
+        cNode->mChildren[i] = nodesRecursive(cNode, prim.children()[i], childNode, meshNodes);
    cNode->mNumChildren = numChildren;

    // Done. No more children.
@@ -124,8 +124,23 @@ public:
            aiScene *pScene,
            const std::string &nameWExt);

+    void setupNodes(
+            const tinyusdz::tydra::RenderScene &render_scene,
+            aiScene *pScene,
+            const tinyusdz::Stage &usdStage,
+            std::map<size_t, tinyusdz::tydra::Node> &meshNodes,
+            const std::string &nameWExt
+            );
+
+    aiNode *nodes(
+            const tinyusdz::tydra::RenderScene &render_scene,
+            const tinyusdz::Stage &usdStage,
+            std::map<size_t, tinyusdz::tydra::Node> &meshNodes,
+            const std::string &nameWExt);
+
    aiNode *nodesRecursive(
            aiNode *pNodeParent,
+            const tinyusdz::Prim &prim,
            const tinyusdz::tydra::Node &node,
            const std::vector<tinyusdz::tydra::SkelHierarchy> &skeletons);

@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <string>

 #if !defined(ASSIMP_BUILD_NO_VRML_IMPORTER)
-#include "contrib/meshlab/autoclone/meshlab_repo-src/src/meshlabplugins/io_x3d/vrml/Parser.h"
+#include "meshlabplugins/io_x3d/vrml/Parser.h"
 #endif // #if !defined(ASSIMP_BUILD_NO_VRML_IMPORTER)

 namespace Assimp {
@@ -219,7 +219,7 @@ void XFileImporter::CreateMeshes(aiScene *pScene, aiNode *pNode, const std::vect
    }

    // create a mesh for each mesh-material combination in the source node
-    MeshArray meshes;
+    std::vector<aiMesh *> meshes;
    for (unsigned int a = 0; a < pMeshes.size(); ++a) {
        XFile::Mesh *sourceMesh = pMeshes[a];
        if (nullptr == sourceMesh) {
@@ -139,7 +139,7 @@ void XGLImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
 		ReadWorld(*worldNode, scope);
 	}

-	MeshArray &meshes = scope.meshes_linear;
+	std::vector<aiMesh *> &meshes = scope.meshes_linear;
 	std::vector<aiMaterial *> &materials = scope.materials_linear;
 	if (meshes.empty() || materials.empty()) {
 		ThrowException("failed to extract data from XGL file, no meshes loaded");
@@ -49,8 +49,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef GLTFASSET_H_INC
 #define GLTFASSET_H_INC

-#if !defined(ASSIMP_BUILD_NO_GLTF_IMPORTER) && !defined(ASSIMP_BUILD_NO_GLTF1_IMPORTER)
-
 #include "AssetLib/glTFCommon/glTFCommon.h"
 #include <assimp/Exceptional.h>
 #include <list>
@@ -83,7 +81,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #endif


-#if _MSC_VER > 1500 || (defined __GNUC___)
+#if _MSC_VER > 1500 || (defined __GNUC__)
 #       define ASSIMP_GLTF_USE_UNORDERED_MULTIMAP
 #   else
 #       define gltf_unordered_map map
@@ -1008,6 +1006,4 @@ private:
 // Include the implementation of the methods
 #include "glTFAsset.inl"

-#endif // ASSIMP_BUILD_NO_GLTF_IMPORTER
-
 #endif // GLTFASSET_H_INC
@@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef GLTFASSETWRITER_H_INC
 #define GLTFASSETWRITER_H_INC

-#if !defined(ASSIMP_BUILD_NO_GLTF_IMPORTER) && !defined(ASSIMP_BUILD_NO_GLTF1_IMPORTER)
+//#if !defined(ASSIMP_BUILD_NO_GLTF_IMPORTER) && !defined(ASSIMP_BUILD_NO_GLTF1_IMPORTER)

 #include "glTFAsset.h"

@@ -63,16 +63,6 @@ class AssetWriter
    template<class T>
    friend void WriteLazyDict(LazyDict<T>& d, AssetWriter& w);

-private:
-
-    void WriteBinaryData(IOStream* outfile, size_t sceneLength);
-
-    void WriteMetadata();
-    void WriteExtensionsUsed();
-
-    template<class T>
-    void WriteObjects(LazyDict<T>& d);
-
 public:
    Document mDoc;
    Asset& mAsset;
@@ -80,9 +70,19 @@ public:
    MemoryPoolAllocator<>& mAl;

    AssetWriter(Asset& asset);
+    ~AssetWriter() = default;

    void WriteFile(const char* path);
    void WriteGLBFile(const char* path);
+
+private:
+    void WriteBinaryData(IOStream* outfile, size_t sceneLength);
+
+    void WriteMetadata();
+    void WriteExtensionsUsed();
+
+    template<class T>
+    void WriteObjects(LazyDict<T>& d);
 };

 }
@@ -90,6 +90,6 @@ public:
 // Include the implementation of the methods
 #include "glTFAssetWriter.inl"

-#endif // ASSIMP_BUILD_NO_GLTF_IMPORTER
+//#endif // ASSIMP_BUILD_NO_GLTF_IMPORTER

 #endif // GLTFASSETWRITER_H_INC
@@ -42,6 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef ASSIMP_BUILD_NO_GLTF_EXPORTER

 #include "AssetLib/glTF/glTFExporter.h"
+#include "AssetLib/glTF/glTFAsset.h"
 #include "AssetLib/glTF/glTFAssetWriter.h"
 #include "PostProcessing/SplitLargeMeshes.h"

@@ -62,6 +63,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <limits>
 #include <inttypes.h>

+#include <rapidjson/rapidjson.h>
+#include <rapidjson/document.h>
+#include <rapidjson/error/en.h>
+
 #ifdef ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC
 	// Header files, Open3DGC.
 #	include <Open3DGC/o3dgcSC3DMCEncoder.h>
@@ -1064,6 +1069,5 @@ void glTFExporter::ExportAnimations()
    } // End: for-loop mNumAnimations
 }

-
 #endif // ASSIMP_BUILD_NO_GLTF_EXPORTER
 #endif // ASSIMP_BUILD_NO_EXPORT
@@ -56,8 +56,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/scene.h>
 #include <assimp/DefaultLogger.hpp>

-#include <memory>
-
 using namespace Assimp;
 using namespace glTF;

@@ -78,6 +76,74 @@ static constexpr aiImporterDesc desc = {
    "gltf glb"
 };

+namespace {
+
+    void SetMaterialColorProperty(const std::vector<int> &embeddedTexIdxs, Asset &, TexProperty prop, aiMaterial *mat,
+            aiTextureType texType, const char *pKey, unsigned int type, unsigned int idx) {
+        if (prop.texture) {
+            if (prop.texture->source) {
+                aiString uri(prop.texture->source->uri);
+
+                if (const int texIdx = embeddedTexIdxs[prop.texture->source.GetIndex()]; texIdx != -1) { // embedded
+                    // setup texture reference string (copied from ColladaLoader::FindFilenameForEffectTexture)
+                    uri.data[0] = '*';
+                    uri.length = 1 + ASSIMP_itoa10(uri.data + 1, AI_MAXLEN - 1, texIdx);
+                }
+
+                mat->AddProperty(&uri, _AI_MATKEY_TEXTURE_BASE, texType, 0);
+            }
+            return;
+        }
+
+        aiColor4D col;
+        CopyValue(prop.color, col);
+        mat->AddProperty(&col, 1, pKey, type, idx);
+    }
+
+    void SetFace(aiFace &face, int a) {
+        face.mNumIndices = 1;
+        face.mIndices = new unsigned int[1];
+        face.mIndices[0] = a;
+    }
+
+    void SetFace(aiFace &face, int a, int b) {
+        face.mNumIndices = 2;
+        face.mIndices = new unsigned int[2];
+        face.mIndices[0] = a;
+        face.mIndices[1] = b;
+    }
+
+    void SetFace(aiFace &face, int a, int b, int c) {
+        face.mNumIndices = 3;
+        face.mIndices = new unsigned int[3];
+        face.mIndices[0] = a;
+        face.mIndices[1] = b;
+        face.mIndices[2] = c;
+    }
+
+    bool CheckValidFacesIndices(const aiFace *faces, unsigned nFaces, unsigned nVerts) {
+        for (unsigned i = 0; i < nFaces; ++i) {
+            for (unsigned j = 0; j < faces[i].mNumIndices; ++j) {
+                unsigned idx = faces[i].mIndices[j];
+                if (idx >= nVerts)
+                    return false;
+            }
+        }
+        return true;
+    }
+
+    void createDefaultMaterial(aiScene *scene) {
+        if (scene == nullptr) {
+            return;
+        }
+        scene->mNumMaterials = 1;
+        scene->mMaterials = nullptr;
+        scene->mMaterials = new aiMaterial *[1];
+        scene->mMaterials[0] = new aiMaterial();
+    }
+
+} // Anonymous namespace
+
 glTFImporter::glTFImporter() :
        mScene(nullptr) {
    // empty
@@ -99,33 +165,15 @@ bool glTFImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool
        return false;
    }
 }
-
-inline void SetMaterialColorProperty(const std::vector<int> &embeddedTexIdxs, Asset &, TexProperty prop, aiMaterial *mat,
-        aiTextureType texType, const char *pKey, unsigned int type, unsigned int idx) {
-    if (prop.texture) {
-        if (prop.texture->source) {
-            aiString uri(prop.texture->source->uri);
-
-            if (const int texIdx = embeddedTexIdxs[prop.texture->source.GetIndex()]; texIdx != -1) { // embedded
-                // setup texture reference string (copied from ColladaLoader::FindFilenameForEffectTexture)
-                uri.data[0] = '*';
-                uri.length = 1 + ASSIMP_itoa10(uri.data + 1, AI_MAXLEN - 1, texIdx);
-            }
-
-            mat->AddProperty(&uri, _AI_MATKEY_TEXTURE_BASE, texType, 0);
-        }
+ 
+void glTFImporter::ImportMaterials(Asset &r) const {
+    mScene->mNumMaterials = r.materials.Size();
+    if (mScene->mNumMaterials == 0) {
+        createDefaultMaterial(mScene);
        return;
    }

-    aiColor4D col;
-    CopyValue(prop.color, col);
-    mat->AddProperty(&col, 1, pKey, type, idx);
-}
-
-void glTFImporter::ImportMaterials(Asset &r) {
-    mScene->mNumMaterials = static_cast<unsigned int>(r.materials.Size());
    mScene->mMaterials = new aiMaterial *[mScene->mNumMaterials];
-
    for (unsigned int i = 0; i < mScene->mNumMaterials; ++i) {
        aiMaterial *aimat = mScene->mMaterials[i] = new aiMaterial();

@@ -148,51 +196,10 @@ void glTFImporter::ImportMaterials(Asset &r) {
            aimat->AddProperty(&mat.shininess, 1, AI_MATKEY_SHININESS);
        }
    }
-
-    if (mScene->mNumMaterials == 0) {
-        mScene->mNumMaterials = 1;
-        // Delete the array of length zero created above.
-        delete[] mScene->mMaterials;
-        mScene->mMaterials = nullptr;
-        mScene->mMaterials = new aiMaterial *[1];
-        mScene->mMaterials[0] = new aiMaterial();
-    }
-}
-
-static void SetFace(aiFace &face, int a) {
-    face.mNumIndices = 1;
-    face.mIndices = new unsigned int[1];
-    face.mIndices[0] = a;
-}
-
-static void SetFace(aiFace &face, int a, int b) {
-    face.mNumIndices = 2;
-    face.mIndices = new unsigned int[2];
-    face.mIndices[0] = a;
-    face.mIndices[1] = b;
-}
-
-static void SetFace(aiFace &face, int a, int b, int c) {
-    face.mNumIndices = 3;
-    face.mIndices = new unsigned int[3];
-    face.mIndices[0] = a;
-    face.mIndices[1] = b;
-    face.mIndices[2] = c;
-}
-
-static bool CheckValidFacesIndices(const aiFace *faces, unsigned nFaces, unsigned nVerts) {
-    for (unsigned i = 0; i < nFaces; ++i) {
-        for (unsigned j = 0; j < faces[i].mNumIndices; ++j) {
-            unsigned idx = faces[i].mIndices[j];
-            if (idx >= nVerts)
-                return false;
-        }
-    }
-    return true;
 }

 void glTFImporter::ImportMeshes(Asset &r) {
-    MeshArray meshes;
+    std::vector<aiMesh *> meshes;

    unsigned int k = 0;
    meshOffsets.clear();
@@ -452,7 +459,7 @@ void glTFImporter::ImportMeshes(Asset &r) {
    CopyVector(meshes, mScene->mMeshes, mScene->mNumMeshes);
 }

-void glTFImporter::ImportCameras(Asset &r) {
+void glTFImporter::ImportCameras(Asset &r) const {
    if (!r.cameras.Size()) {
        return;
    }
@@ -460,29 +467,30 @@ void glTFImporter::ImportCameras(Asset &r) {
    mScene->mNumCameras = r.cameras.Size();
    mScene->mCameras = new aiCamera *[r.cameras.Size()];
    for (size_t i = 0; i < r.cameras.Size(); ++i) {
-        Camera &cam = r.cameras[i];
-
-        aiCamera *aicam = mScene->mCameras[i] = new aiCamera();
-
+        const Camera &cam = r.cameras[i];
+        mScene->mCameras[i] = new aiCamera();
+        const auto aiCameraPtr = mScene->mCameras[i];
        if (cam.type == Camera::Perspective) {
-            aicam->mAspect = cam.perspective.aspectRatio;
-            aicam->mHorizontalFOV = cam.perspective.yfov * ((aicam->mAspect == 0.f) ? 1.f : aicam->mAspect);
-            aicam->mClipPlaneFar = cam.perspective.zfar;
-            aicam->mClipPlaneNear = cam.perspective.znear;
+            aiCameraPtr->mAspect = cam.perspective.aspectRatio;
+            aiCameraPtr->mHorizontalFOV = cam.perspective.yfov * ((aiCameraPtr->mAspect == 0.f) ? 1.f : aiCameraPtr->mAspect);
+            aiCameraPtr->mClipPlaneFar = cam.perspective.zfar;
+            aiCameraPtr->mClipPlaneNear = cam.perspective.znear;
        } else {
-            aicam->mClipPlaneFar = cam.ortographic.zfar;
-            aicam->mClipPlaneNear = cam.ortographic.znear;
-            aicam->mHorizontalFOV = 0.0;
-            aicam->mAspect = 1.0f;
+            aiCameraPtr->mClipPlaneFar = cam.ortographic.zfar;
+            aiCameraPtr->mClipPlaneNear = cam.ortographic.znear;
+            aiCameraPtr->mHorizontalFOV = 0.0;
+            aiCameraPtr->mAspect = 1.0f;
            if (0.f != cam.ortographic.ymag) {
-                aicam->mAspect = cam.ortographic.xmag / cam.ortographic.ymag;
+                aiCameraPtr->mAspect = cam.ortographic.xmag / cam.ortographic.ymag;
            }
        }
    }
 }

-void glTFImporter::ImportLights(Asset &r) {
-    if (!r.lights.Size()) return;
+void glTFImporter::ImportLights(Asset &r) const {
+    if (!r.lights.Size()) {
+        return;
+    }

    mScene->mNumLights = r.lights.Size();
    mScene->mLights = new aiLight *[r.lights.Size()];
@@ -529,7 +537,7 @@ aiNode *ImportNode(aiScene *pScene, Asset &r, std::vector<unsigned int> &meshOff
    aiNode *ainode = new aiNode(node.id);

    if (!node.children.empty()) {
-        ainode->mNumChildren = unsigned(node.children.size());
+        ainode->mNumChildren = static_cast<unsigned>(node.children.size());
        ainode->mChildren = new aiNode *[ainode->mNumChildren];

        for (unsigned int i = 0; i < ainode->mNumChildren; ++i) {
@@ -578,7 +586,7 @@ aiNode *ImportNode(aiScene *pScene, Asset &r, std::vector<unsigned int> &meshOff

        int k = 0;
        for (size_t i = 0; i < node.meshes.size(); ++i) {
-            int idx = node.meshes[i].GetIndex();
+            const int idx = node.meshes[i].GetIndex();
            for (unsigned int j = meshOffsets[idx]; j < meshOffsets[idx + 1]; ++j, ++k) {
                ainode->mMeshes[k] = j;
            }
@@ -597,13 +605,14 @@ aiNode *ImportNode(aiScene *pScene, Asset &r, std::vector<unsigned int> &meshOff
 }

 void glTFImporter::ImportNodes(Asset &r) {
-    if (!r.scene) return;
+    if (!r.scene) {
+        return;
+    }

    std::vector<Ref<Node>> rootNodes = r.scene->nodes;

    // The root nodes
-    unsigned int numRootNodes = static_cast<unsigned>(rootNodes.size());
-    if (numRootNodes == 1) { // a single root node: use it
+    if (auto numRootNodes = static_cast<unsigned>(rootNodes.size()); numRootNodes == 1) { // a single root node: use it
        mScene->mRootNode = ImportNode(mScene, r, meshOffsets, rootNodes[0]);
    } else if (numRootNodes > 1) { // more than one root node: create a fake root
        aiNode *root = new aiNode("ROOT");
@@ -648,11 +657,10 @@ void glTFImporter::ImportEmbeddedTextures(Asset &r) {
        tex->mFilename = img.name;
        tex->mWidth = static_cast<unsigned int>(length);
        tex->mHeight = 0;
-        tex->pcData = reinterpret_cast<aiTexel *>(data);
+        tex->pcData = static_cast<aiTexel *>(data);

        if (!img.mimeType.empty()) {
-            const char *ext = strchr(img.mimeType.c_str(), '/') + 1;
-            if (ext) {
+            if (const char *ext = strchr(img.mimeType.c_str(), '/') + 1) {
                if (strncmp(ext, "jpeg", 4) == 0) {
                    ext = "jpg";
                }
@@ -666,7 +674,7 @@ void glTFImporter::ImportEmbeddedTextures(Asset &r) {
    }
 }

-void glTFImporter::ImportCommonMetadata(Asset &a) {
+void glTFImporter::ImportCommonMetadata(const Asset &a) const {
    ai_assert(mScene->mMetaData == nullptr);

    const bool hasVersion = !a.asset.version.empty();
@@ -70,12 +70,12 @@ protected:

 private:
    void ImportEmbeddedTextures(glTF::Asset &a);
-    void ImportMaterials(glTF::Asset &a);
+    void ImportMaterials(glTF::Asset &a) const;
    void ImportMeshes(glTF::Asset &a);
-    void ImportCameras(glTF::Asset &a);
-    void ImportLights(glTF::Asset &a);
+    void ImportCameras(glTF::Asset &a) const;
+    void ImportLights(glTF::Asset &a) const;
    void ImportNodes(glTF::Asset &a);
-    void ImportCommonMetadata(glTF::Asset &a);
+    void ImportCommonMetadata(const glTF::Asset &a) const;

 private:
    std::vector<unsigned int> meshOffsets;
@@ -58,13 +58,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef GLTF2ASSET_H_INC
 #define GLTF2ASSET_H_INC

-#if !defined(ASSIMP_BUILD_NO_GLTF_IMPORTER) && !defined(ASSIMP_BUILD_NO_GLTF2_IMPORTER)
+//#if !defined(ASSIMP_BUILD_NO_GLTF_IMPORTER) && !defined(ASSIMP_BUILD_NO_GLTF2_IMPORTER)

 #include <assimp/Exceptional.h>

 #include <algorithm>
 #include <list>
-#include <map>
+#include <unordered_map>
 #include <set>
 #include <stdexcept>
 #include <string>
@@ -95,7 +95,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #   define ai_assert
 #endif

-#if _MSC_VER > 1500 || (defined __GNUC___)
+#if _MSC_VER > 1500 || (defined __GNUC__)
 #   define ASSIMP_GLTF_USE_UNORDERED_MULTIMAP
 #else
 #   define gltf_unordered_map map
@@ -1266,9 +1266,8 @@ private:
    size_t mSceneLength;
    size_t mBodyOffset;
    size_t mBodyLength;
-    IdMap mUsedIds;
-    std::map<std::string, int, std::less<>> mUsedNamesMap;
    Ref<Buffer> mBodyBuffer;
+    std::unordered_map<std::string, int> lastUsedID;
 };

 inline std::string getContextForErrorMessages(const std::string &id, const std::string &name) {
@@ -1284,6 +1283,6 @@ inline std::string getContextForErrorMessages(const std::string &id, const std::
 // Include the implementation of the methods
 #include "glTF2Asset.inl"

-#endif // ASSIMP_BUILD_NO_GLTF_IMPORTER
+//#endif // ASSIMP_BUILD_NO_GLTF_IMPORTER

 #endif // GLTF2ASSET_H_INC
@@ -438,7 +438,6 @@ unsigned int LazyDict<T>::Remove(const char *id) {

    const unsigned int index = objIt->second;

-    mAsset.mUsedIds[id] = false;
    mObjsById.erase(id);
    mObjsByOIndex.erase(index);
    delete mObjs[index];
@@ -472,7 +471,6 @@ unsigned int LazyDict<T>::Remove(const char *id) {

 template <class T>
 Ref<T> LazyDict<T>::Retrieve(unsigned int i) {
-
    typename Dict::iterator it = mObjsByOIndex.find(i);
    if (it != mObjsByOIndex.end()) { // already created?
        return Ref<T>(mObjs, it->second);
@@ -540,16 +538,11 @@ Ref<T> LazyDict<T>::Add(T *obj) {
    mObjs.push_back(obj);
    mObjsByOIndex[obj->oIndex] = idx;
    mObjsById[obj->id] = idx;
-    mAsset.mUsedIds[obj->id] = true;
    return Ref<T>(mObjs, idx);
 }

 template <class T>
 Ref<T> LazyDict<T>::Create(const char *id) {
-    Asset::IdMap::iterator it = mAsset.mUsedIds.find(id);
-    if (it != mAsset.mUsedIds.end()) {
-        throw DeadlyImportError("GLTF: two objects with the same ID exist");
-    }
    T *inst = new T();
    unsigned int idx = unsigned(mObjs.size());
    inst->id = id;
@@ -565,11 +558,12 @@ inline Buffer::Buffer() :
        byteLength(0),
        type(Type_arraybuffer),
        EncodedRegion_Current(nullptr),
-        mIsSpecial(false) {}
+        mIsSpecial(false) {
+    // empty
+}

 inline Buffer::~Buffer() {
-    for (SEncodedRegion *reg : EncodedRegion_List)
-        delete reg;
+    for (SEncodedRegion *reg : EncodedRegion_List) delete reg;
 }

 inline const char *Buffer::TranslateId(Asset & /*r*/, const char *id) {
@@ -693,7 +687,6 @@ inline void Buffer::EncodedRegion_SetCurrent(const std::string &pID) {
 }

 inline bool Buffer::ReplaceData(const size_t pBufferData_Offset, const size_t pBufferData_Count, const uint8_t *pReplace_Data, const size_t pReplace_Count) {
-
    if ((pBufferData_Count == 0) || (pReplace_Count == 0) || (pReplace_Data == nullptr)) {
        return false;
    }
@@ -809,8 +802,7 @@ inline uint8_t *BufferView::GetPointerAndTailSize(size_t accOffset, size_t& outT
        }
    }

-    if (offset >= buffer->byteLength)
-    {
+    if (offset >= buffer->byteLength) {
        outTailSize = 0;
        return nullptr;
    }
@@ -2206,29 +2198,27 @@ inline IOStream *Asset::OpenFile(const std::string &path, const char *mode, bool

 inline std::string Asset::FindUniqueID(const std::string &str, const char *suffix) {
    std::string id = str;
-
-    if (!id.empty()) {
-        if (mUsedIds.find(id) == mUsedIds.end()){
-            mUsedNamesMap[id] = 0;
+    int n = 1;
+    if(!id.empty()) {
+        n = lastUsedID[id];
+        if(!n) {
+            lastUsedID[id] = n+1;
            return id;
        }
-
        id += "_";
    }

-    id += suffix;
-
-    Asset::IdMap::iterator it = mUsedIds.find(id);
-    if (it == mUsedIds.end()) {
-        mUsedNamesMap[id] = 0;
-        return id;
+    if(suffix) {
+        id += suffix;
+        n = lastUsedID[id];
+        if(!n) {
+            lastUsedID[id] = n+1;
+            return id;
+        }
    }

-    auto key = id;
-    id += "_" + std::to_string(mUsedNamesMap[key]);
-    mUsedNamesMap[key] = mUsedNamesMap[key] + 1;
-
-    return id;
+    lastUsedID[id] = n+1;
+    return id + "_" + std::to_string(n-1);
 }

 #if _MSC_VER
@@ -57,8 +57,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef GLTF2ASSETWRITER_H_INC
 #define GLTF2ASSETWRITER_H_INC

-#if !defined(ASSIMP_BUILD_NO_GLTF_IMPORTER) && !defined(ASSIMP_BUILD_NO_GLTF2_IMPORTER)
-
 #include "glTF2Asset.h"

 namespace glTF2
@@ -98,6 +96,4 @@ public:
 // Include the implementation of the methods
 #include "glTF2AssetWriter.inl"

-#endif // ASSIMP_BUILD_NO_GLTF_IMPORTER
-
 #endif // GLTF2ASSETWRITER_H_INC
@@ -64,6 +64,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <memory>
 #include <iostream>

+#include <rapidjson/rapidjson.h>
+#include <rapidjson/document.h>
+#include <rapidjson/error/en.h>
+
 using namespace rapidjson;

 using namespace Assimp;
@@ -45,8 +45,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_GLTF2EXPORTER_H_INC
 #define AI_GLTF2EXPORTER_H_INC

-#if !defined(ASSIMP_BUILD_NO_GLTF_IMPORTER) && !defined(ASSIMP_BUILD_NO_GLTF2_IMPORTER)
-
 #include <assimp/material.h>
 #include <assimp/types.h>
 #include <assimp/defs.h>
@@ -150,6 +148,4 @@ private:

 } // namespace Assimp

-#endif // ASSIMP_BUILD_NO_GLTF_IMPORTER
-
 #endif // AI_GLTF2EXPORTER_H_INC
@@ -65,6 +65,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #include <rapidjson/document.h>
 #include <rapidjson/rapidjson.h>
+#include <rapidjson/error/en.h>

 using namespace Assimp;
 using namespace glTF2;
@@ -1680,7 +1681,8 @@ void glTF2Importer::ImportCommonMetadata(glTF2::Asset &a) {
    const bool hasGenerator = !a.asset.generator.empty();
    const bool hasCopyright = !a.asset.copyright.empty();
    const bool hasSceneMetadata = a.scene->customExtensions;
-    if (hasVersion || hasGenerator || hasCopyright || hasSceneMetadata) {
+    const bool hasSceneExtras = a.scene->extras.HasExtras();
+    if (hasVersion || hasGenerator || hasCopyright || hasSceneMetadata || hasSceneExtras) {
        mScene->mMetaData = new aiMetadata;
        if (hasVersion) {
            mScene->mMetaData->Add(AI_METADATA_SOURCE_FORMAT_VERSION, aiString(a.asset.version));
@@ -1694,6 +1696,9 @@ void glTF2Importer::ImportCommonMetadata(glTF2::Asset &a) {
        if (hasSceneMetadata) {
            ParseExtensions(mScene->mMetaData, a.scene->customExtensions);
        }
+        if (hasSceneExtras) {
+            ParseExtras(mScene->mMetaData, a.scene->extras);
+        }
    }
 }

@@ -38,15 +38,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 ----------------------------------------------------------------------
 */
-#ifndef ASSIMP_BUILD_NO_GLTF_IMPORTER
-
 #include "AssetLib/glTFCommon/glTFCommon.h"

-namespace glTFCommon {
-
 using namespace glTFCommon::Util;

-namespace Util {
+namespace glTFCommon::Util {

 bool ParseDataURI(const char *const_uri, size_t uriLen, DataURI &out) {
    if (nullptr == const_uri) {
@@ -111,7 +107,4 @@ bool ParseDataURI(const char *const_uri, size_t uriLen, DataURI &out) {
    return true;
 }

-} // namespace Util
-} // namespace glTFCommon
-
-#endif
+} // namespace glTFCommon::Uti
@@ -41,8 +41,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_GLFTCOMMON_H_INC
 #define AI_GLFTCOMMON_H_INC

-#ifndef ASSIMP_BUILD_NO_GLTF_IMPORTER
-
 #include <assimp/Exceptional.h>
 #include <assimp/DefaultLogger.hpp>

@@ -69,7 +67,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #   define ai_assert
 #endif

-#if _MSC_VER > 1500 || (defined __GNUC___)
+#if _MSC_VER > 1500 || (defined __GNUC__)
 #   define ASSIMP_GLTF_USE_UNORDERED_MULTIMAP
 #else
 #   define gltf_unordered_map map
@@ -532,6 +530,4 @@ inline Value *FindNumber(Value &val, const char *id) {

 } // namespace glTFCommon

-#endif // ASSIMP_BUILD_NO_GLTF_IMPORTER
-
 #endif // AI_GLFTCOMMON_H_INC
@@ -58,6 +58,7 @@ SET( COMPILER_HEADERS
 SOURCE_GROUP( Compiler FILES ${COMPILER_HEADERS})

 SET( PUBLIC_HEADERS
+  ${HEADER_PATH}/allocator.h
  ${HEADER_PATH}/anim.h
  ${HEADER_PATH}/aabb.h
  ${HEADER_PATH}/ai_assert.h
@@ -167,6 +168,7 @@ SET( Logging_SRCS
 SOURCE_GROUP(Logging FILES ${Logging_SRCS})

 SET( Common_SRCS
+  Common/allocator.cpp
  Common/StbCommon.h
  Common/Compression.cpp
  Common/Compression.h
@@ -602,6 +604,12 @@ ADD_ASSIMP_IMPORTER( XGL
  AssetLib/XGL/XGLLoader.h
 )

+SET( FBX_COMMON_SRCS
+  AssetLib/FBX/FBXUtil.h
+  AssetLib/FBX/FBXUtil.cpp
+  AssetLib/FBX/FBXCommon.h
+)
+
 ADD_ASSIMP_IMPORTER( FBX
  AssetLib/FBX/FBXImporter.cpp
  AssetLib/FBX/FBXCompileConfig.h
@@ -613,8 +621,6 @@ ADD_ASSIMP_IMPORTER( FBX
  AssetLib/FBX/FBXImportSettings.h
  AssetLib/FBX/FBXConverter.h
  AssetLib/FBX/FBXConverter.cpp
-  AssetLib/FBX/FBXUtil.h
-  AssetLib/FBX/FBXUtil.cpp
  AssetLib/FBX/FBXDocument.h
  AssetLib/FBX/FBXDocument.cpp
  AssetLib/FBX/FBXProperties.h
@@ -628,7 +634,6 @@ ADD_ASSIMP_IMPORTER( FBX
  AssetLib/FBX/FBXDeformer.cpp
  AssetLib/FBX/FBXBinaryTokenizer.cpp
  AssetLib/FBX/FBXDocumentUtil.cpp
-  AssetLib/FBX/FBXCommon.h
 )

 if (NOT ASSIMP_NO_EXPORT)
@@ -943,17 +948,14 @@ IF (ASSIMP_BUILD_VRML_IMPORTER)
    message("****")
    message("\n\n**** Cloning meshlab repo, git tag ${Meshlab_GIT_TAG}\n\n")

-    # Use CMAKE_CURRENT_SOURCE_DIR which provides assimp-local path (CMAKE_SOURCE_DIR is
-    # relative to top-level/main project)
-    set(Meshlab_BASE_ABSPATH "${CMAKE_CURRENT_SOURCE_DIR}/../contrib/meshlab")
-
    # Note: Depending on user's OS, build environment etc it may be necessary to change line endings of
    #       "patches/meshlab.patch" file from CRLF to LF in order for patch operation to succeed
    # Patch required to
    #  - replace QtXml w/pugixml
    #  - disable meshlab cmake scripts to prevent breaking assimp build
    #  - address compiler warnings to avoid breaking build for users who wisely treat warnings-as-errors
-    set(Meshlab_PATCH_CMD git apply ${Meshlab_BASE_ABSPATH}/patches/meshlab.patch)
+    set(Meshlab_PATCHFILE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../contrib/meshlab/patches/meshlab.patch")
+    set(Meshlab_PATCH_CMD git apply ${Meshlab_PATCHFILE_PATH})

    # Note: cloning entire meshlab repo is wasteful since we require literally only two source files.
    #       There is a technique using "git archive" e.g.
@@ -969,9 +971,6 @@ IF (ASSIMP_BUILD_VRML_IMPORTER)
    #       block (wait) as long as necessary until cloning is complete, so we immediately have full
    #       access to the cloned source files
    include(FetchContent)
-    set(Meshlab_REPO_ABSPATH "${Meshlab_BASE_ABSPATH}/autoclone")
-    # Only want to clone once (on Android, using SOURCE_DIR will clone per-ABI (x86, x86_64 etc))
-    set(FETCHCONTENT_BASE_DIR ${Meshlab_REPO_ABSPATH})
    set(FETCHCONTENT_QUIET on) # Turn off to troubleshoot repo clone problems
    set(FETCHCONTENT_UPDATES_DISCONNECTED on) # Prevent other ABIs from re-cloning/re-patching etc
    set(Meshlab_GIT_REPO "https://github.com/cnr-isti-vclab/meshlab")
@@ -984,13 +983,17 @@ IF (ASSIMP_BUILD_VRML_IMPORTER)
    FetchContent_MakeAvailable(meshlab_repo)
    message("**** Finished cloning meshlab repo")
    message("****")
-    set(Meshlab_SRC_ABSPATH "${Meshlab_REPO_ABSPATH}/meshlab_repo-src/src/meshlabplugins/io_x3d/vrml")
+    set(Meshlab_REPO_BASEPATH "${CMAKE_BINARY_DIR}/_deps/meshlab_repo-src/src")
+    set(Meshlab_SRC_ABSPATH "${Meshlab_REPO_BASEPATH}/meshlabplugins/io_x3d/vrml")
    set(Meshlab_SRCS
            ${Meshlab_SRC_ABSPATH}/Parser.cpp
            ${Meshlab_SRC_ABSPATH}/Scanner.cpp
    )
-    set(Meshlab_INCLUDE_DIRS "${Meshlab_SRC_ABSPATH}")
-    INCLUDE_DIRECTORIES(${Meshlab_INCLUDE_DIRS})
+    INCLUDE_DIRECTORIES(
+            ${Meshlab_SRC_ABSPATH}
+            # Add this to avoid include of generic-looking "Parser.h" (for sonarCloud)
+            ${Meshlab_REPO_BASEPATH}
+    )
    MESSAGE(STATUS "VRML enabled")
 ELSE() # IF (ASSIMP_BUILD_VRML_IMPORTER)
    set(Meshlab_SRCS "")
@@ -1003,10 +1006,6 @@ IF (ASSIMP_BUILD_USD_IMPORTER)
    if (ASSIMP_BUILD_USD_VERBOSE_LOGS)
        ADD_DEFINITIONS( -DASSIMP_USD_VERBOSE_LOGS)
    endif ()
-    # Use CMAKE_CURRENT_SOURCE_DIR which provides assimp-local path (CMAKE_SOURCE_DIR is
-    # relative to top-level/main project)
-    set(Tinyusdz_BASE_ABSPATH "${CMAKE_CURRENT_SOURCE_DIR}/../contrib/tinyusdz")
-    set(Tinyusdz_REPO_ABSPATH "${Tinyusdz_BASE_ABSPATH}/autoclone")

    # Note: ALWAYS specify a git commit hash (or tag) instead of a branch name; using a branch
    #       name can lead to non-deterministic (unpredictable) results since the code is potentially
@@ -1017,15 +1016,14 @@ IF (ASSIMP_BUILD_USD_IMPORTER)
    message("\n\n**** Cloning tinyusdz repo, git tag ${TINYUSDZ_GIT_TAG}\n\n")

    # Patch required to build arm32 on android
-    set(TINYUSDZ_PATCH_CMD git apply ${Tinyusdz_BASE_ABSPATH}/patches/tinyusdz.patch)
+    set(TINYUSDZ_PATCHFILE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../contrib/tinyusdz/patches/tinyusdz.patch")
+    set(TINYUSDZ_PATCH_CMD git apply ${TINYUSDZ_PATCHFILE_PATH})

    # Note: CMake's "FetchContent" (which executes at configure time) is much better for this use case
    #       than "ExternalProject" (which executes at build time); we just want to clone a repo and
    #       block (wait) as long as necessary until cloning is complete, so we immediately have full
    #       access to the cloned source files
    include(FetchContent)
-    # Only want to clone once (on Android, using SOURCE_DIR will clone per-ABI (x86, x86_64 etc))
-    set(FETCHCONTENT_BASE_DIR ${Tinyusdz_REPO_ABSPATH})
    set(FETCHCONTENT_QUIET on) # Turn off to troubleshoot repo clone problems
    set(FETCHCONTENT_UPDATES_DISCONNECTED on) # Prevent other ABIs from re-cloning/re-patching etc
    FetchContent_Declare(
@@ -1039,7 +1037,7 @@ IF (ASSIMP_BUILD_USD_IMPORTER)
    message("**** Finished cloning tinyusdz repo")
    message("****")

-    set(Tinyusdz_SRC_ABSPATH "${Tinyusdz_REPO_ABSPATH}/tinyusdz_repo-src/src")
+    set(Tinyusdz_SRC_ABSPATH "${CMAKE_BINARY_DIR}/_deps/tinyusdz_repo-src/src")
    set(Tinyusdz_SRCS
            ${Tinyusdz_SRC_ABSPATH}/ascii-parser.cc
            ${Tinyusdz_SRC_ABSPATH}/ascii-parser-basetype.cc
@@ -1355,6 +1353,8 @@ SET( assimp_src
  ${ASSIMP_LOADER_SRCS}
  ${ASSIMP_EXPORTER_SRCS}

+  ${FBX_COMMON_SRCS}
+  
  # Third-party libraries
  ${unzip_compile_SRCS}
  ${Poly2Tri_SRCS}
--- a/Show More
+++ b/Show More