Enable C++17 and C99

- closes https://github.com/assimp/assimp/issues/4257
2021-12-16 19:41:09 +01:00
623 changed files with 1937 additions and 3027 deletions
@@ -13,8 +13,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        #name: [ubuntu-latest-g++, macos-latest-clang++, windows-latest-cl.exe, ubuntu-latest-clang++, ubuntu-gcc-hunter, macos-clang-hunter, windows-msvc-hunter]
-        name: [ubuntu-latest-g++, macos-latest-clang++, windows-latest-cl.exe, ubuntu-latest-clang++, ubuntu-gcc-hunter, macos-clang-hunter]
+        name: [ubuntu-latest-g++, macos-latest-clang++, windows-latest-cl.exe, ubuntu-latest-clang++, ubuntu-gcc-hunter, macos-clang-hunter, windows-msvc-hunter]
        # For Windows msvc, for Linux and macOS let's use the clang compiler, use gcc for Linux.
        include:
          - name: windows-latest-cl.exe
@@ -39,9 +38,9 @@ jobs:
          - name: macos-clang-hunter
            os: macos-latest
            toolchain: ninja-clang-cxx17-fpic
-          #- name: windows-msvc-hunter
-          #  os: windows-latest
-          #  toolchain: ninja-vs-win64-cxx17
+          - name: windows-msvc-hunter
+            os: windows-latest
+            toolchain: ninja-vs-win64-cxx17

    steps:
    - uses: actions/checkout@v2
@@ -0,0 +1,67 @@
+#---------------------------------------------------------------------------
+#Open Asset Import Library (assimp)
+#---------------------------------------------------------------------------
+# Copyright (c) 2006-2020, assimp team
+#
+# License see LICENSE file
+#
+function generate() {
+    OPTIONS="-DASSIMP_WERROR=ON"
+    OPTIONS="$OPTIONS -DASSIMP_NO_EXPORT=NO"
+    
+    if [ "$DISABLE_EXPORTERS" = "YES" ] ; then
+        OPTIONS="$OPTIONS -DASSIMP_NO_EXPORT=YES"
+    else
+        OPTIONS="$OPTIONS -DASSIMP_NO_EXPORT=NO"
+    fi
+
+    if [ "$SHARED_BUILD" = "ON" ] ; then
+        OPTIONS="$OPTIONS -DBUILD_SHARED_LIBS=ON"
+    else
+        OPTIONS="$OPTIONS -DBUILD_SHARED_LIBS=OFF"
+    fi
+
+    if [ "$ENABLE_COVERALLS" = "ON" ] ; then
+        OPTIONS="$OPTIONS -DASSIMP_COVERALLS=ON"
+    else
+        OPTIONS="$OPTIONS -DASSIMP_COVERALLS=OFF"
+    fi
+
+    if [ "$ASAN" = "ON" ] ; then
+        OPTIONS="$OPTIONS -DASSIMP_ASAN=ON"
+    else
+        OPTIONS="$OPTIONS -DASSIMP_ASAN=OFF"
+    fi
+
+    if [ "$UBSAN" = "ON" ] ; then
+        OPTIONS="$OPTIONS -DASSIMP_UBSAN=ON"
+    fi
+
+    cmake -G "Unix Makefiles" $OPTIONS
+}
+# build and run unittests, if not android
+if [ $ANDROID ]; then
+    ant -v -Dmy.dir=${TRAVIS_BUILD_DIR} -f ${TRAVIS_BUILD_DIR}/port/jassimp/build.xml ndk-jni
+fi
+if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+  if [ $ANALYZE = "ON" ] ; then
+    if [ "$CC" = "clang" ]; then
+        scan-build cmake -G "Unix Makefiles" -DBUILD_SHARED_LIBS=OFF -DASSIMP_BUILD_TESTS=OFF
+        scan-build --status-bugs make -j2
+    else
+        cppcheck --version
+        generate \
+        && cppcheck --error-exitcode=1 -j2 -Iinclude -Icode code 2> cppcheck.txt
+        if [ -s cppcheck.txt ]; then
+            cat cppcheck.txt
+            exit 1
+        fi
+    fi
+  else
+    generate \
+    && make -j4 \
+    && sudo make install \
+    && sudo ldconfig \
+    && (cd test/unit; ../../bin/unit)
+  fi
+fi
@@ -0,0 +1,78 @@
+sudo: required
+language: cpp
+
+cache: ccache
+
+before_install:
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update -qq && sudo apt-get install cmake cppcheck && sudo apt-get install cmake python3 && sudo apt-get install -qq freeglut3-dev libxmu-dev libxi-dev ; echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca- ; fi
+  - 'if [ "$TRAVIS_OS_NAME" = "osx" ];  then
+       if brew ls --versions cmake > /dev/null; then
+         echo cmake already installed.;
+       else
+         brew install cmake;
+       fi;
+       brew install python3;
+       brew install homebrew/x11/freeglut; 
+    fi'
+  - echo -e "#ifndef A_R_H_INC\n#define A_R_H_INC\n#define GitVersion ${TRAVIS_JOB_ID}\n#define GitBranch \"${TRAVIS_BRANCH}\"\n#endif // A_R_H_INC" > revision.h
+  # install latest LCOV (1.9 was failing)
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cd ${TRAVIS_BUILD_DIR} && wget http://ftp.de.debian.org/debian/pool/main/l/lcov/lcov_1.11.orig.tar.gz && tar xf lcov_1.11.orig.tar.gz && sudo make -C lcov-1.11/ install && gem install coveralls-lcov && lcov --version && g++ --version ; fi
+
+os:
+  - linux
+
+compiler:
+  - gcc
+  - clang
+
+env:
+  global:
+    - secure: "lZ7pHQvl5dpZWzBQAaIMf0wqrvtcZ4wiZKeIZjf83TEsflW8+z0uTpIuN30ZV6Glth/Sq1OhLnTP5+N57fZU/1ebA5twHdvP4bS5CIUUg71/CXQZNl36xeaqvxsG/xRrdpKOsPdjAOsQ9KPTQulsX43XDLS7CasMiLvYOpqKcPc="
+    - PV=r8e PLATF=linux-x86_64 NDK_HOME=${TRAVIS_BUILD_DIR}/android-ndk-${PV} PATH=${PATH}:${NDK_HOME}
+
+git:
+  depth: 1
+
+matrix:
+  include:
+    - os: linux
+      compiler: clang
+      env: ASAN=ON
+    - os: linux
+      compiler: clang
+      env: UBSAN=ON
+    - os: linux
+      compiler: clang
+      env: SHARED_BUILD=ON
+    - os: linux
+      compiler: gcc
+      env: ANALYZE=ON
+    - os: linux
+      compiler: gcc
+      env: ENABLE_COVERALLS=ON
+    - os: linux
+      compiler: gcc
+      env: SHARED_BUILD=ON
+
+install:
+  - if [ $ANDROID ]; then wget -c http://dl.google.com/android/ndk/android-ndk-${PV}-${PLATF}.tar.bz2 && tar xf android-ndk-${PV}-${PLATF}.tar.bz2 ; fi
+
+before_script:
+  cmake . -DASSIMP_ENABLE_BOOST_WORKAROUND=YES
+
+script:
+  - export COVERALLS_SERVICE_NAME=travis-ci
+  - export COVERALLS_REPO_TOKEN=abc12345
+  - . ./.travis.sh
+ 
+after_success:
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cd ${TRAVIS_BUILD_DIR} && lcov --directory . --capture --output-file coverage.info && lcov --remove coverage.info '/usr/*' 'contrib/*' 'test/*' --output-file coverage.info && lcov --list coverage.info && coveralls-lcov --source-encoding=ISO-8859-1 --repo-token=${COVERALLS_TOKEN} coverage.info ; fi
+
+addons:
+  coverity_scan:
+    project:
+      name: "assimp/assimp"
+    notification_email: kim.kulling@googlemail.com
+    build_command_prepend: "cmake ./"
+    build_command: "make -j4"
+    branch_pattern: coverity_scan
@@ -1,6 +1,6 @@
 # Open Asset Import Library (assimp)
 # ----------------------------------------------------------------------
-# Copyright (c) 2006-2022, assimp team
+# Copyright (c) 2006-2021, assimp team
 #
 # All rights reserved.
 #
@@ -56,7 +56,7 @@ IF(ASSIMP_HUNTER_ENABLED)
  add_definitions(-DASSIMP_USE_HUNTER)
 ENDIF()

-PROJECT(Assimp VERSION 5.2.0)
+PROJECT(Assimp VERSION 5.1.3)

 # All supported options ###############################################

@@ -182,8 +182,8 @@ SET (ASSIMP_SOVERSION 5)

 SET( ASSIMP_PACKAGE_VERSION "0" CACHE STRING "the package-specific version used for uploading the sources" )
 if(NOT ASSIMP_HUNTER_ENABLED)
-  # Enable C++11 support globally
-  set(CMAKE_CXX_STANDARD 11)
+  # Enable C++17 support globally
+  set(CMAKE_CXX_STANDARD 17)
  set(CMAKE_CXX_STANDARD_REQUIRED ON)
  set(CMAKE_C_STANDARD 99)
 endif()
@@ -246,7 +246,7 @@ IF( UNIX )
 ENDIF()

 # Grouped compiler settings ########################################
-IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT MINGW)
+IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT CMAKE_COMPILER_IS_MINGW)
  IF(NOT ASSIMP_HUNTER_ENABLED)
    SET(CMAKE_CXX_STANDARD 11)
    SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
@@ -283,7 +283,7 @@ ELSEIF (CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
  ENDIF()
  SET(CMAKE_CXX_FLAGS "-fvisibility=hidden -fno-strict-aliasing -Wall -Wno-long-long ${CMAKE_CXX_FLAGS}" )
  SET(CMAKE_C_FLAGS "-fno-strict-aliasing ${CMAKE_C_FLAGS}")
-ELSEIF( MINGW )
+ELSEIF( CMAKE_COMPILER_IS_MINGW )
  IF (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0)
    message(FATAL_ERROR "MinGW is too old to be supported. Please update MinGW and try again.")
  ELSEIF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.3)
@@ -341,24 +341,9 @@ INCLUDE (FindPkgMacros)
 INCLUDE (PrecompiledHeader)

 # Set Assimp project output directory variables.
-# Will respect top-level CMAKE_*_OUTPUT_DIRECTORY variables if any are set.
-IF(NOT DEFINED CMAKE_RUNTIME_OUTPUT_DIRECTORY)
-  SET(ASSIMP_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin" CACHE STRING "Path for runtime output files")
-ELSE()
-  SET(ASSIMP_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} CACHE STRING "Path for runtime output files")
-ENDIF()
-
-IF(NOT DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY)
-  SET(ASSIMP_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin" CACHE STRING "Path for library output files")
-ELSE()
-  SET(ASSIMP_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} CACHE STRING "Path for runtime output files")
-ENDIF()
-
-IF(NOT DEFINED CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
-  SET(ASSIMP_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/lib" CACHE STRING "Path for library output files")
-ELSE()
-  SET(ASSIMP_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY} CACHE STRING "Path for runtime output files")
-ENDIF()
+SET(ASSIMP_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin" CACHE STRING "Path for runtime output files")
+SET(ASSIMP_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin" CACHE STRING "Path for library output files")
+SET(ASSIMP_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/lib" CACHE STRING "Path for archive output files")

 # Macro used to set the output directories of a target to the
 # respective Assimp output directories.
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team


 All rights reserved.
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team


 All rights reserved.
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team


 All rights reserved.
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -111,9 +111,20 @@ Discreet3DSImporter::~Discreet3DSImporter() {

 // ------------------------------------------------------------------------------------------------
 // Returns whether the class can handle the format of the given file.
-bool Discreet3DSImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool /*checkSig*/) const {
-    static const uint16_t token[] = { 0x4d4d, 0x3dc2 /*, 0x3daa */ };
-    return CheckMagicToken(pIOHandler, pFile, token, AI_COUNT_OF(token), 0, sizeof token[0]);
+bool Discreet3DSImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool checkSig) const {
+    std::string extension = GetExtension(pFile);
+    if (extension == "3ds" || extension == "prj") {
+        return true;
+    }
+
+    if (!extension.length() || checkSig) {
+        uint16_t token[3];
+        token[0] = 0x4d4d;
+        token[1] = 0x3dc2;
+        //token[2] = 0x3daa;
+        return CheckMagicToken(pIOHandler, pFile, token, 2, 0, 2);
+    }
+    return false;
 }

 // ------------------------------------------------------------------------------------------------
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team


 All rights reserved.
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -90,12 +90,24 @@ D3MFImporter::~D3MFImporter() {
    // empty
 }

-bool D3MFImporter::CanRead(const std::string &filename, IOSystem *pIOHandler, bool /*checkSig*/) const {
-    if (!ZipArchiveIOSystem::isZipArchive(pIOHandler, filename)) {
-        return false;
+bool D3MFImporter::CanRead(const std::string &filename, IOSystem *pIOHandler, bool checkSig) const {
+    const std::string extension(GetExtension(filename));
+    if (extension == desc.mFileExtensions) {
+        return true;
+    } 
+
+    if (!extension.length() || checkSig) {
+        if (nullptr == pIOHandler) {
+            return false;
+        }
+        if (!ZipArchiveIOSystem::isZipArchive(pIOHandler, filename)) {
+            return false;
+        }
+        D3MFOpcPackage opcPackage(pIOHandler, filename);
+        return opcPackage.validate();
    }
-    D3MF::D3MFOpcPackage opcPackage(pIOHandler, filename);
-    return opcPackage.validate();
+
+    return false;
 }

 void D3MFImporter::SetupProperties(const Importer*) {
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -152,9 +152,18 @@ AC3DImporter::~AC3DImporter() {

 // ------------------------------------------------------------------------------------------------
 // Returns whether the class can handle the format of the given file.
-bool AC3DImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool /*checkSig*/) const {
-    static const uint32_t tokens[] = { AI_MAKE_MAGIC("AC3D") };
-    return CheckMagicToken(pIOHandler, pFile, tokens, AI_COUNT_OF(tokens));
+bool AC3DImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool checkSig) const {
+    std::string extension = GetExtension(pFile);
+
+    // fixme: are acc and ac3d *really* used? Some sources say they are
+    if (extension == "ac" || extension == "ac3d" || extension == "acc") {
+        return true;
+    }
+    if (!extension.length() || checkSig) {
+        uint32_t token = AI_MAKE_MAGIC("AC3D");
+        return CheckMagicToken(pIOHandler, pFile, &token, 1, 0);
+    }
+    return false;
 }

 // ------------------------------------------------------------------------------------------------
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -503,9 +503,19 @@ void AMFImporter::ParseNode_Metadata(XmlNode &node) {
    mNodeElement_List.push_back(ne); // and to node element list because its a new object in graph.
 }

-bool AMFImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool /*pCheckSig*/) const {
-    static const char *tokens[] = { "<amf" };
-    return SearchFileHeaderForToken(pIOHandler, pFile, tokens, AI_COUNT_OF(tokens));
+bool AMFImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool pCheckSig) const {
+    const std::string extension = GetExtension(pFile);
+
+    if (extension == "amf") {
+        return true;
+    }
+
+    if (extension.empty() || pCheckSig) {
+        static const char * const tokens[] = { "<amf" };
+        return SearchFileHeaderForToken(pIOHandler, pFile, tokens, 1);
+    }
+
+    return false;
 }

 const aiImporterDesc *AMFImporter::GetInfo() const {
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -95,9 +95,19 @@ ASEImporter::~ASEImporter() {

 // ------------------------------------------------------------------------------------------------
 // Returns whether the class can handle the format of the given file.
-bool ASEImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool /*checkSig*/) const {
-    static const char *tokens[] = { "*3dsmax_asciiexport" };
-    return SearchFileHeaderForToken(pIOHandler, pFile, tokens, AI_COUNT_OF(tokens));
+bool ASEImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool cs) const {
+    // check file extension
+    const std::string extension = GetExtension(pFile);
+
+    if (extension == "ase" || extension == "ask") {
+        return true;
+    }
+
+    if ((!extension.length() || cs) && pIOHandler) {
+        static const char * const tokens[] = { "*3dsmax_asciiexport" };
+        return SearchFileHeaderForToken(pIOHandler, pFile, tokens, 1);
+    }
+    return false;
 }

 // ------------------------------------------------------------------------------------------------
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -112,7 +112,6 @@ using namespace Assimp::ASE;
 // ------------------------------------------------------------------------------------------------
 Parser::Parser(const char *szFile, unsigned int fileFormatDefault) {
    ai_assert(nullptr != szFile);
-
    filePtr = szFile;
    iFileFormat = fileFormatDefault;

@@ -489,7 +488,6 @@ void Parser::ParseLV1MaterialListBlock() {
                if (iIndex >= iMaterialCount) {
                    LogWarning("Out of range: material index is too large");
                    iIndex = iMaterialCount - 1;
-                    return;
                }

                // get a reference to the material
@@ -906,6 +904,7 @@ void Parser::ParseLV2LightSettingsBlock(ASE::Light &light) {
        }
        AI_ASE_HANDLE_SECTION("2", "LIGHT_SETTINGS");
    }
+    return;
 }

 // ------------------------------------------------------------------------------------------------
@@ -1782,9 +1781,7 @@ void Parser::ParseLV4MeshFace(ASE::Face &out) {

    // *MESH_MTLID  is optional, too
    while (true) {
-        if ('*' == *filePtr) {
-            break;
-        }
+        if ('*' == *filePtr) break;
        if (IsLineEnd(*filePtr)) {
            return;
        }
@@ -1833,9 +1830,8 @@ void Parser::ParseLV4MeshFloatTriple(ai_real *apOut, unsigned int &rIndexOut) {
 void Parser::ParseLV4MeshFloatTriple(ai_real *apOut) {
    ai_assert(nullptr != apOut);

-    for (unsigned int i = 0; i < 3; ++i) {
+    for (unsigned int i = 0; i < 3; ++i)
        ParseLV4MeshFloat(apOut[i]);
-    }
 }
 // ------------------------------------------------------------------------------------------------
 void Parser::ParseLV4MeshFloat(ai_real &fOut) {
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team


 All rights reserved.
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -182,8 +182,6 @@ inline size_t Write<aiVertexWeight>(IOStream *stream, const aiVertexWeight &v) {
    return t + Write<float>(stream, v.mWeight);
 }

-constexpr size_t MatrixSize = 64;
-
 // -----------------------------------------------------------------------------------
 // Serialize a mat4x4
 template <>
@@ -194,7 +192,7 @@ inline size_t Write<aiMatrix4x4>(IOStream *stream, const aiMatrix4x4 &m) {
        }
    }

-    return MatrixSize;
+    return 64;
 }

 // -----------------------------------------------------------------------------------
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team


 All rights reserved.
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team


 All rights reserved.
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team


 All rights reserved.
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -81,7 +81,7 @@ static const aiImporterDesc desc = {

 //#define DEBUG_B3D

-template<typename T>
+template <typename T>
 void DeleteAllBarePointers(std::vector<T> &x) {
    for (auto p : x) {
        delete p;
@@ -89,11 +89,11 @@ void DeleteAllBarePointers(std::vector<T> &x) {
 }

 B3DImporter::~B3DImporter() {
-    // empty
 }

 // ------------------------------------------------------------------------------------------------
 bool B3DImporter::CanRead(const std::string &pFile, IOSystem * /*pIOHandler*/, bool /*checkSig*/) const {
+
    size_t pos = pFile.find_last_of('.');
    if (pos == string::npos) {
        return false;
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -4,7 +4,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team



@@ -92,9 +92,18 @@ BVHLoader::~BVHLoader() {}

 // ------------------------------------------------------------------------------------------------
 // Returns whether the class can handle the format of the given file.
-bool BVHLoader::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool /*checkSig*/) const {
-    static const char *tokens[] = { "HIERARCHY" };
-    return SearchFileHeaderForToken(pIOHandler, pFile, tokens, AI_COUNT_OF(tokens));
+bool BVHLoader::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool cs) const {
+    // check file extension
+    const std::string extension = GetExtension(pFile);
+
+    if (extension == "bvh")
+        return true;
+
+    if ((!extension.length() || cs) && pIOHandler) {
+        static const char * const tokens[] = { "HIERARCHY" };
+        return SearchFileHeaderForToken(pIOHandler, pFile, tokens, 1);
+    }
+    return false;
 }

 // ------------------------------------------------------------------------------------------------
@@ -4,7 +4,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team


 All rights reserved.
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team
 All rights reserved.

 Redistribution and use of this software in source and binary forms,
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team
 All rights reserved.

 Redistribution and use of this software in source and binary forms,
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team


 All rights reserved.
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team


 All rights reserved.
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team


 All rights reserved.
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team


 All rights reserved.
@@ -114,14 +114,22 @@ BlenderImporter::~BlenderImporter() {
 }

 static const char * const Tokens[] = { "BLENDER" };
+static const char * const TokensForSearch[] = { "blender" };

 // ------------------------------------------------------------------------------------------------
 // Returns whether the class can handle the format of the given file.
-bool BlenderImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool /*checkSig*/) const {
-    // note: this won't catch compressed files
-    static const char *tokens[] = { "<BLENDER", "blender" };
+bool BlenderImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool checkSig) const {
+    const std::string &extension = GetExtension(pFile);
+    if (extension == "blend") {
+        return true;
+    }

-    return SearchFileHeaderForToken(pIOHandler, pFile, tokens, AI_COUNT_OF(tokens));
+    if ((!extension.length() || checkSig) && pIOHandler) {
+        // note: this won't catch compressed files
+        return SearchFileHeaderForToken(pIOHandler, pFile, TokensForSearch, 1);
+    }
+
+    return false;
 }

 // ------------------------------------------------------------------------------------------------
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team


 All rights reserved.
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team


 All rights reserved.
@@ -49,8 +49,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "BlenderDNA.h"
 #include "BlenderSceneGen.h"

-namespace Assimp {
-namespace Blender {
+using namespace Assimp;
+using namespace Assimp::Blender;

 //--------------------------------------------------------------------------------
 template <>
@@ -885,7 +885,4 @@ void DNA::RegisterConverters() {
    converters["CollectionObject"] = DNA::FactoryPair(&Structure::Allocate<CollectionObject>, &Structure::Convert<CollectionObject>);
 }

-} // namespace Blender
-} //namespace Assimp
-
 #endif // ASSIMP_BUILD_NO_BLEND_IMPORTER
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team


 All rights reserved.
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team


 All rights reserved.
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team


 All rights reserved.
@@ -106,25 +106,14 @@ static const aiImporterDesc desc = {


 // ------------------------------------------------------------------------------------------------
-C4DImporter::C4DImporter()
-: BaseImporter() {
-    // empty
-}
-
-// ------------------------------------------------------------------------------------------------
-C4DImporter::~C4DImporter() {
-    // empty
-}
-
-// ------------------------------------------------------------------------------------------------
-bool C4DImporter::CanRead( const std::string& pFile, IOSystem* /*pIOHandler*/, bool /*checkSig*/) const {
+bool C4DImporter::CanRead( const std::string& pFile, IOSystem* pIOHandler, bool checkSig) const {
    const std::string& extension = GetExtension(pFile);
    if (extension == "c4d") {
        return true;
    } else if ((!extension.length() || checkSig) && pIOHandler)   {
        // TODO
    }
-    
+
    return false;
 }

@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -103,9 +103,17 @@ COBImporter::~COBImporter() {

 // ------------------------------------------------------------------------------------------------
 // Returns whether the class can handle the format of the given file.
-bool COBImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool /*checkSig*/) const {
-    static const char *tokens[] = { "Caligary" };
-    return SearchFileHeaderForToken(pIOHandler, pFile, tokens, AI_COUNT_OF(tokens));
+bool COBImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool checkSig) const {
+    const std::string &extension = GetExtension(pFile);
+    if (extension == "cob" || extension == "scn" || extension == "COB" || extension == "SCN") {
+        return true;
+    }
+
+    else if ((!extension.length() || checkSig) && pIOHandler) {
+        static const char * const tokens[] = { "Caligary" };
+        return SearchFileHeaderForToken(pIOHandler, pFile, tokens, 1);
+    }
+    return false;
 }

 // ------------------------------------------------------------------------------------------------
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team


 All rights reserved.
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team



@@ -90,10 +90,19 @@ CSMImporter::~CSMImporter()

 // ------------------------------------------------------------------------------------------------
 // Returns whether the class can handle the format of the given file.
-bool CSMImporter::CanRead( const std::string& pFile, IOSystem* pIOHandler, bool /*checkSig*/) const
+bool CSMImporter::CanRead( const std::string& pFile, IOSystem* pIOHandler, bool checkSig) const
 {
-    static const char* tokens[] = {"$Filename"};
-    return SearchFileHeaderForToken(pIOHandler,pFile,tokens,AI_COUNT_OF(tokens));
+    // check file extension
+    const std::string extension = GetExtension(pFile);
+
+    if( extension == "csm")
+        return true;
+
+    if ((checkSig || !extension.length()) && pIOHandler) {
+        static const char * const tokens[] = {"$Filename"};
+        return SearchFileHeaderForToken(pIOHandler,pFile,tokens,1);
+    }
+    return false;
 }

 // ------------------------------------------------------------------------------------------------
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team


 All rights reserved.
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team


 All rights reserved.
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -116,15 +116,37 @@ ColladaLoader::~ColladaLoader() {

 // ------------------------------------------------------------------------------------------------
 // Returns whether the class can handle the format of the given file.
-bool ColladaLoader::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool /*checkSig*/) const {
-    // Look for a DAE file inside, but don't extract it
-    ZipArchiveIOSystem zip_archive(pIOHandler, pFile);
-    if (zip_archive.isOpen()) {
-        return !ColladaParser::ReadZaeManifest(zip_archive).empty();
+bool ColladaLoader::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool checkSig) const {
+    // check file extension
+    const std::string extension = GetExtension(pFile);
+    const bool readSig = checkSig && (pIOHandler != nullptr);
+    if (!readSig) {
+        if (extension == "dae" || extension == "zae") {
+            return true;
+        }
+    } else {
+        // Look for a DAE file inside, but don't extract it
+        ZipArchiveIOSystem zip_archive(pIOHandler, pFile);
+        if (zip_archive.isOpen()) {
+            return !ColladaParser::ReadZaeManifest(zip_archive).empty();
+        }
    }

-    static const char *tokens[] = { "<collada" };
-    return SearchFileHeaderForToken(pIOHandler, pFile, tokens, AI_COUNT_OF(tokens));
+    // XML - too generic, we need to open the file and search for typical keywords
+    if (extension == "xml" || !extension.length() || checkSig) {
+        //  If CanRead() is called in order to check whether we
+        //  support a specific file extension in general pIOHandler
+        //  might be nullptr and it's our duty to return true here.
+        if (nullptr == pIOHandler) {
+            return true;
+        }
+        static const char * const tokens[] = {
+            "<collada"
+        };
+        return SearchFileHeaderForToken(pIOHandler, pFile, tokens, 1);
+    }
+
+    return false;
 }

 // ------------------------------------------------------------------------------------------------
@@ -4,7 +4,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team


 All rights reserved.
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -331,16 +331,7 @@ void ColladaParser::ReadAssetInfo(XmlNode &node) {
        const std::string &currentName = currentNode.name();
        if (currentName == "unit") {
            mUnitSize = 1.f;
-            std::string tUnitSizeString;
-            if (XmlParser::getStdStrAttribute(currentNode, "meter", tUnitSizeString)) {
-                try {
-                    fast_atoreal_move<ai_real>(tUnitSizeString.data(), mUnitSize);
-                } catch (const DeadlyImportError& die) {
-                    std::string warning("Collada: Failed to parse meter parameter to real number. Exception:\n");
-                    warning.append(die.what());
-                    ASSIMP_LOG_WARN(warning.data());
-                }
-            }
+            XmlParser::getRealAttribute(currentNode, "meter", mUnitSize);
        } else if (currentName == "up_axis") {
            std::string v;
            if (!XmlParser::getValueAsString(currentNode, v)) {
@@ -2251,26 +2242,20 @@ void ColladaParser::ReadNodeGeometry(XmlNode &node, Node *pNode) {
        if (currentName == "bind_material") {
            XmlNode techNode = currentNode.child("technique_common");
            if (techNode) {
-                for (XmlNode instanceMatNode = techNode.child("instance_material"); instanceMatNode; instanceMatNode = instanceMatNode.next_sibling())
-                {
-                    const std::string &instance_name = instanceMatNode.name();
-                    if (instance_name == "instance_material")
-                    {
-                        // read ID of the geometry subgroup and the target material
-                        std::string group;
-                        XmlParser::getStdStrAttribute(instanceMatNode, "symbol", group);
-                        XmlParser::getStdStrAttribute(instanceMatNode, "target", url);
-                        const char *urlMat = url.c_str();
-                        Collada::SemanticMappingTable s;
-                        if (urlMat[0] == '#')
-                            urlMat++;
+                XmlNode instanceMatNode = techNode.child("instance_material");
+                // read ID of the geometry subgroup and the target material
+                std::string group;
+                XmlParser::getStdStrAttribute(instanceMatNode, "symbol", group);
+                XmlParser::getStdStrAttribute(instanceMatNode, "target", url);
+                const char *urlMat = url.c_str();
+                Collada::SemanticMappingTable s;
+                if (urlMat[0] == '#')
+                    urlMat++;

-                        s.mMatName = urlMat;
-                        // store the association
-                        instance.mMaterials[group] = s;
-                        ReadMaterialVertexInputBinding(instanceMatNode, s);
-                    }
-                }
+                s.mMatName = urlMat;
+                // store the association
+                instance.mMaterials[group] = s;
+                ReadMaterialVertexInputBinding(instanceMatNode, s);
            }
        }
    }
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

- Copyright (c) 2006-2022, assimp team
+ Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team


 All rights reserved.
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -123,9 +123,18 @@ DXFImporter::~DXFImporter() {

 // ------------------------------------------------------------------------------------------------
 // Returns whether the class can handle the format of the given file.
-bool DXFImporter::CanRead( const std::string& filename, IOSystem* pIOHandler, bool /*checkSig*/ ) const {
-    static const char *tokens[] = { "SECTION", "HEADER", "ENDSEC", "BLOCKS" };
-    return SearchFileHeaderForToken(pIOHandler, filename, tokens, AI_COUNT_OF(tokens), 32);
+bool DXFImporter::CanRead( const std::string& filename, IOSystem* pIOHandler, bool checkSig ) const {
+    const std::string& extension = GetExtension( filename );
+    if ( extension == desc.mFileExtensions ) {
+        return true;
+    }
+
+    if ( extension.empty() || checkSig ) {
+        static const char * const pTokens[] = { "SECTION", "HEADER", "ENDSEC", "BLOCKS" };
+        return SearchFileHeaderForToken(pIOHandler, filename, pTokens, 4, 32 );
+    }
+
+    return false;
 }

 // ------------------------------------------------------------------------------------------------
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team


 All rights reserved.
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team


 All rights reserved.
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team


 All rights reserved.
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -2070,7 +2070,6 @@ void FBXConverter::SetTextureProperties(aiMaterial *out_mat, const LayeredTextur
    TrySetTextureProperties(out_mat, layeredTextures, "ShininessExponent", aiTextureType_SHININESS, mesh);
    TrySetTextureProperties(out_mat, layeredTextures, "EmissiveFactor", aiTextureType_EMISSIVE, mesh);
    TrySetTextureProperties(out_mat, layeredTextures, "TransparencyFactor", aiTextureType_OPACITY, mesh);
-    TrySetTextureProperties(out_mat, layeredTextures, "ReflectionFactor", aiTextureType_METALNESS, mesh);
 }

 aiColor3D FBXConverter::GetColorPropertyFactored(const PropertyTable &props, const std::string &colorName,
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team


 All rights reserved.
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team


 All rights reserved.
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team


 All rights reserved.
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team


 All rights reserved.
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team


 All rights reserved.
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -100,10 +100,18 @@ FBXImporter::~FBXImporter() {

 // ------------------------------------------------------------------------------------------------
 // Returns whether the class can handle the format of the given file.
-bool FBXImporter::CanRead(const std::string & pFile, IOSystem * pIOHandler, bool /*checkSig*/) const {
-	// at least ASCII-FBX files usually have a 'FBX' somewhere in their head
-	static const char *tokens[] = { "fbx" };
-	return SearchFileHeaderForToken(pIOHandler, pFile, tokens, AI_COUNT_OF(tokens));
+bool FBXImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool checkSig) const {
+	const std::string &extension = GetExtension(pFile);
+	if (extension == std::string(desc.mFileExtensions)) {
+		return true;
+	}
+
+	else if ((!extension.length() || checkSig) && pIOHandler) {
+		// at least ASCII-FBX files usually have a 'FBX' somewhere in their head
+		static const char * const tokens[] = { "fbx" };
+		return SearchFileHeaderForToken(pIOHandler, pFile, tokens, 1);
+	}
+	return false;
 }

 // ------------------------------------------------------------------------------------------------
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team

 All rights reserved.

@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team


 All rights reserved.
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team


 All rights reserved.
@@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2022, assimp team
+Copyright (c) 2006-2021, assimp team


 All rights reserved.
--- a/Show More
+++ b/Show More