Enable C++17 and C99

- closes https://github.com/assimp/assimp/issues/4257
2021-12-16 19:41:09 +01:00
627 changed files with 3103 additions and 5148 deletions
@@ -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
@@ -10,15 +10,16 @@
 :: Also see: https://github.com/assimp/assimp/pull/2646

 SET SOURCE_DIR=.
-SET GENERATOR=Visual Studio 16 2019

-SET BINARIES_DIR="./build/Win32"
-cmake . -G "%GENERATOR%" -A Win32 -S %SOURCE_DIR% -B %BINARIES_DIR%
-cmake --build %BINARIES_DIR% --config debug
+:: For generators see "cmake --help"
+SET GENERATOR=Visual Studio 15 2017
+
+SET BINARIES_DIR="./BINARIES/Win32"
+cmake CMakeLists.txt -G "%GENERATOR%" -S %SOURCE_DIR% -B %BINARIES_DIR%
 cmake --build %BINARIES_DIR% --config release

-SET BINARIES_DIR="./build/x64"
-cmake . -G "%GENERATOR%" -A x64 -S %SOURCE_DIR% -B %BINARIES_DIR%
+SET BINARIES_DIR="./BINARIES/x64"
+cmake CMakeLists.txt -G "%GENERATOR% Win64" -S %SOURCE_DIR% -B %BINARIES_DIR%
 cmake --build %BINARIES_DIR% --config debug
 cmake --build %BINARIES_DIR% --config release

@@ -1,6 +1,6 @@
 # Open Asset Import Library (assimp)
 # ----------------------------------------------------------------------
-# Copyright (c) 2006-2022, assimp team
+# Copyright (c) 2006-2021, assimp team
 #
 # All rights reserved.
 #
@@ -49,14 +49,14 @@ option(ASSIMP_HUNTER_ENABLED "Enable Hunter package manager support" OFF)
 IF(ASSIMP_HUNTER_ENABLED)
  include("cmake-modules/HunterGate.cmake")
  HunterGate(
-    URL "https://github.com/cpp-pm/hunter/archive/v0.24.0.tar.gz"
-    SHA1 "a3d7f4372b1dcd52faa6ff4a3bd5358e1d0e5efd"
+    URL "https://github.com/cpp-pm/hunter/archive/v0.23.311.tar.gz"
+    SHA1 "1a82b9b73055879181cb1466b2ab5d48ee8ae410"
  )

  add_definitions(-DASSIMP_USE_HUNTER)
 ENDIF()

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

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

@@ -134,12 +134,12 @@ OPTION ( ASSIMP_IGNORE_GIT_HASH
   OFF
 )

-IF (WIN32)
+IF ( WIN32 )
  # Use subset of Windows.h
  ADD_DEFINITIONS( -DWIN32_LEAN_AND_MEAN )

  IF(MSVC)
-    OPTION (ASSIMP_BUILD_ASSIMP_VIEW
+    OPTION ( ASSIMP_BUILD_ASSIMP_VIEW
      "If the Assimp view tool is built. (requires DirectX)"
      OFF )

@@ -150,27 +150,6 @@ IF (WIN32)
      # Multibyte character set is deprecated since at least MSVC2015 (possibly earlier)
      ADD_DEFINITIONS( -DUNICODE -D_UNICODE )
    ENDIF()
-
-    # Link statically against c/c++ lib to avoid missing redistriburable such as
-    # "VCRUNTIME140.dll not found. Try reinstalling the app.", but give users
-    # a choice to opt for the shared runtime if they want.
-    option(USE_STATIC_CRT "Link against the static runtime libraries." OFF)
-
-    # The CMAKE_CXX_FLAGS vars can be overriden by some Visual Studio generators, so we use an alternative
-    # global method here:
-    if (${USE_STATIC_CRT})
-      add_compile_options(
-          $<$<CONFIG:>:/MT>
-          $<$<CONFIG:Debug>:/MTd>
-          $<$<CONFIG:Release>:/MT>
-      )
-    else()
-      add_compile_options(
-          $<$<CONFIG:>:/MD>
-          $<$<CONFIG:Debug>:/MDd>
-          $<$<CONFIG:Release>:/MD>
-      )
-    endif()
  ENDIF()
 ENDIF()

@@ -203,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()
@@ -264,17 +243,10 @@ SET(ASSIMP_LIBRARY_SUFFIX "" CACHE STRING "Suffix to append to library names")
 IF( UNIX )
  # Use GNUInstallDirs for Unix predefined directories
  INCLUDE(GNUInstallDirs)
-  # Ensure that we do not run into issues like http://www.tcm.phy.cam.ac.uk/sw/inodes64.html on 32 bit linux
-  IF( ${OPERATING_SYSTEM} MATCHES "Android")
-  ELSE()
-    IF ( CMAKE_SIZEOF_VOID_P EQUAL 4) # only necessary for 32-bit linux
-      ADD_DEFINITIONS(-D_FILE_OFFSET_BITS=64 )
-    ENDIF()
-  ENDIF()
 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)
@@ -311,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)
@@ -369,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.
@@ -715,13 +672,11 @@ ENDIF()
 ADD_SUBDIRECTORY( code/ )
 IF ( ASSIMP_BUILD_ASSIMP_TOOLS )
  # The viewer for windows only
-  IF (WIN32)
+  IF ( WIN32 )
    OPTION ( ASSIMP_BUILD_ASSIMP_VIEW "If the Assimp view tool is built. (requires DirectX)" OFF )
    IF ( ASSIMP_BUILD_ASSIMP_VIEW )
      ADD_SUBDIRECTORY( tools/assimp_view/ )
    ENDIF ()
-  ELSE()
-    MESSAGE("Building Assimp Viewer only supported on Windows.")
  ENDIF ()
  # The command line tool
  ADD_SUBDIRECTORY( tools/assimp_cmd/ )
@@ -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.
@@ -66,12 +66,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 // zlib is needed for compressed blend files
 #ifndef ASSIMP_BUILD_NO_COMPRESSED_BLEND
-#include "Common/Compression.h"
-/* #ifdef ASSIMP_BUILD_NO_OWN_ZLIB
+#  ifdef ASSIMP_BUILD_NO_OWN_ZLIB
 #    include <zlib.h>
 #  else
 #    include "../contrib/zlib/zlib.h"
-#  endif*/
+#  endif
 #endif

 namespace Assimp {
@@ -115,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;
 }

 // ------------------------------------------------------------------------------------------------
@@ -142,7 +149,7 @@ void BlenderImporter::SetupProperties(const Importer * /*pImp*/) {
 void BlenderImporter::InternReadFile(const std::string &pFile,
        aiScene *pScene, IOSystem *pIOHandler) {
 #ifndef ASSIMP_BUILD_NO_COMPRESSED_BLEND
-    std::vector<char> uncompressed;
+    std::vector<Bytef> uncompressed;
 #endif

    FileDatabase file;
@@ -160,6 +167,7 @@ void BlenderImporter::InternReadFile(const std::string &pFile,
 #ifdef ASSIMP_BUILD_NO_COMPRESSED_BLEND
        ThrowException("BLENDER magic bytes are missing, is this file compressed (Assimp was built without decompression support)?");
 #else
+
        if (magic[0] != 0x1f || static_cast<uint8_t>(magic[1]) != 0x8b) {
            ThrowException("BLENDER magic bytes are missing, couldn't find GZIP header either");
        }
@@ -173,12 +181,42 @@ void BlenderImporter::InternReadFile(const std::string &pFile,
        stream->Seek(0L, aiOrigin_SET);
        std::shared_ptr<StreamReaderLE> reader = std::shared_ptr<StreamReaderLE>(new StreamReaderLE(stream));

-        size_t total = 0;
-        Compression compression;
-        if (compression.open(Compression::Format::Binary, Compression::FlushMode::NoFlush, 16 + Compression::MaxWBits)) {
-            total = compression.decompress((unsigned char *)reader->GetPtr(), reader->GetRemainingSize(), uncompressed);
-            compression.close();
-        }
+        // build a zlib stream
+        z_stream zstream;
+        zstream.opaque = Z_NULL;
+        zstream.zalloc = Z_NULL;
+        zstream.zfree = Z_NULL;
+        zstream.data_type = Z_BINARY;
+
+        // http://hewgill.com/journal/entries/349-how-to-decompress-gzip-stream-with-zlib
+        inflateInit2(&zstream, 16 + MAX_WBITS);
+
+        zstream.next_in = reinterpret_cast<Bytef *>(reader->GetPtr());
+        zstream.avail_in = (uInt)reader->GetRemainingSize();
+
+        size_t total = 0l;
+
+        // TODO: be smarter about this, decompress directly into heap buffer
+        // and decompress the data .... do 1k chunks in the hope that we won't kill the stack
+#define MYBLOCK 1024
+        Bytef block[MYBLOCK];
+        int ret;
+        do {
+            zstream.avail_out = MYBLOCK;
+            zstream.next_out = block;
+            ret = inflate(&zstream, Z_NO_FLUSH);
+
+            if (ret != Z_STREAM_END && ret != Z_OK) {
+                ThrowException("Failure decompressing this file using gzip, seemingly it is NOT a compressed .BLEND file");
+            }
+            const size_t have = MYBLOCK - zstream.avail_out;
+            total += have;
+            uncompressed.resize(total);
+            memcpy(uncompressed.data() + total - have, block, have);
+        } while (ret != Z_STREAM_END);
+
+        // terminate zlib
+        inflateEnd(&zstream);

        // replace the input stream with a memory stream
        stream.reset(new MemoryIOStream(reinterpret_cast<uint8_t *>(uncompressed.data()), total));
@@ -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;
 }

 // ------------------------------------------------------------------------------------------------
@@ -357,9 +379,9 @@ void ColladaLoader::BuildLightsForNode(const ColladaParser &pParser, const Node
            out->mAngleInnerCone = AI_DEG_TO_RAD(srcLight->mFalloffAngle);

            // ... some extension magic.
-            if (srcLight->mOuterAngle >= ASSIMP_COLLADA_LIGHT_ANGLE_NOT_SET * (1 - ai_epsilon)) {
+            if (srcLight->mOuterAngle >= ASSIMP_COLLADA_LIGHT_ANGLE_NOT_SET * (1 - 1e-6f)) {
                // ... some deprecation magic.
-                if (srcLight->mPenumbraAngle >= ASSIMP_COLLADA_LIGHT_ANGLE_NOT_SET * (1 - ai_epsilon)) {
+                if (srcLight->mPenumbraAngle >= ASSIMP_COLLADA_LIGHT_ANGLE_NOT_SET * (1 - 1e-6f)) {
                    // Need to rely on falloff_exponent. I don't know how to interpret it, so I need to guess ....
                    // epsilon chosen to be 0.1
                    float f = 1.0f;
@@ -1065,7 +1087,7 @@ void insertMorphTimeValue(std::vector<MorphTimeValues> &values, float time, floa
        return;
    }
    for (unsigned int i = 0; i < values.size(); i++) {
-        if (std::abs(time - values[i].mTime) < ai_epsilon) {
+        if (std::abs(time - values[i].mTime) < 1e-6f) {
            values[i].mKeys.push_back(k);
            return;
        } else if (time > values[i].mTime && time < values[i + 1].mTime) {
@@ -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.

@@ -80,10 +80,8 @@ enum TransformInheritance {

    TransformInheritance_MAX // end-of-enum sentinel
 };
-
 } // namespace FBX
 } // namespace Assimp
-
 #endif // ASSIMP_BUILD_NO_FBX_EXPORTER

 #endif // AI_FBXCOMMON_H_INC
@@ -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.

@@ -653,7 +653,7 @@ bool FBXConverter::NeedsComplexTransformationChain(const Model &model) {
    const PropertyTable &props = model.Props();
    bool ok;

-    const float zero_epsilon = ai_epsilon;
+    const float zero_epsilon = 1e-6f;
    const aiVector3D all_ones(1.0f, 1.0f, 1.0f);
    for (size_t i = 0; i < TransformationComp_MAXIMUM; ++i) {
        const TransformationComp comp = static_cast<TransformationComp>(i);
@@ -1267,7 +1267,7 @@ unsigned int FBXConverter::ConvertMeshMultiMaterial(const MeshGeometry &mesh, co
    const std::vector<aiVector3D> &normals = mesh.GetNormals();
    if (normals.size()) {
        ai_assert(normals.size() == vertices.size());
-        out_mesh->mNormals = new aiVector3D[count_vertices];
+        out_mesh->mNormals = new aiVector3D[vertices.size()];
    }

    // allocate tangents, binormals.
@@ -1295,8 +1295,8 @@ unsigned int FBXConverter::ConvertMeshMultiMaterial(const MeshGeometry &mesh, co
            ai_assert(tangents.size() == vertices.size());
            ai_assert(binormals->size() == vertices.size());

-            out_mesh->mTangents = new aiVector3D[count_vertices];
-            out_mesh->mBitangents = new aiVector3D[count_vertices];
+            out_mesh->mTangents = new aiVector3D[vertices.size()];
+            out_mesh->mBitangents = new aiVector3D[vertices.size()];
        }
    }

@@ -1308,7 +1308,7 @@ unsigned int FBXConverter::ConvertMeshMultiMaterial(const MeshGeometry &mesh, co
            break;
        }

-        out_mesh->mTextureCoords[i] = new aiVector3D[count_vertices];
+        out_mesh->mTextureCoords[i] = new aiVector3D[vertices.size()];
        out_mesh->mNumUVComponents[i] = 2;
    }

@@ -1320,7 +1320,7 @@ unsigned int FBXConverter::ConvertMeshMultiMaterial(const MeshGeometry &mesh, co
            break;
        }

-        out_mesh->mColors[i] = new aiColor4D[count_vertices];
+        out_mesh->mColors[i] = new aiColor4D[vertices.size()];
    }

    unsigned int cursor = 0, in_cursor = 0;
@@ -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,
@@ -3187,8 +3186,7 @@ aiNodeAnim* FBXConverter::GenerateSimpleNodeAnim(const std::string& name,
    }

    bool ok = false;
-    
-    const float zero_epsilon = ai_epsilon;
+    const float zero_epsilon = 1e-6f;

    const aiVector3D& preRotation = PropertyGet<aiVector3D>(props, "PreRotation", ok);
    if (ok && preRotation.SquareLength() > zero_epsilon) {
@@ -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,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

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

 All rights reserved.

@@ -67,13 +68,23 @@ namespace FBX {
 using namespace Util;

 // ------------------------------------------------------------------------------------------------
-LazyObject::LazyObject(uint64_t id, const Element& element, const Document& doc) : 
-        doc(doc), element(element), id(id), flags() {
+LazyObject::LazyObject(uint64_t id, const Element& element, const Document& doc)
+: doc(doc)
+, element(element)
+, id(id)
+, flags() {
    // empty
 }

 // ------------------------------------------------------------------------------------------------
-const Object* LazyObject::Get(bool dieOnError) {
+LazyObject::~LazyObject()
+{
+    // empty
+}
+
+// ------------------------------------------------------------------------------------------------
+const Object* LazyObject::Get(bool dieOnError)
+{
    if(IsBeingConstructed() || FailedToConstruct()) {
        return nullptr;
    }
@@ -223,8 +234,17 @@ const Object* LazyObject::Get(bool dieOnError) {
 }

 // ------------------------------------------------------------------------------------------------
-Object::Object(uint64_t id, const Element& element, const std::string& name) :
-        element(element), name(name), id(id) {
+Object::Object(uint64_t id, const Element& element, const std::string& name)
+: element(element)
+, name(name)
+, id(id)
+{
+    // empty
+}
+
+// ------------------------------------------------------------------------------------------------
+Object::~Object()
+{
    // empty
 }

@@ -235,8 +255,16 @@ FileGlobalSettings::FileGlobalSettings(const Document &doc, std::shared_ptr<cons
 }

 // ------------------------------------------------------------------------------------------------
-Document::Document(const Parser& parser, const ImportSettings& settings) :
-     settings(settings), parser(parser) {
+FileGlobalSettings::~FileGlobalSettings()
+{
+    // empty
+}
+
+// ------------------------------------------------------------------------------------------------
+Document::Document(const Parser& parser, const ImportSettings& settings)
+: settings(settings)
+, parser(parser)
+{
 	ASSIMP_LOG_DEBUG("Creating FBX Document");

    // Cannot use array default initialization syntax because vc8 fails on it
@@ -257,7 +285,8 @@ Document::Document(const Parser& parser, const ImportSettings& settings) :
 }

 // ------------------------------------------------------------------------------------------------
-Document::~Document() {
+Document::~Document()
+{
    for(ObjectMap::value_type& v : objects) {
        delete v.second;
    }
@@ -319,7 +348,8 @@ void Document::ReadHeader() {
 }

 // ------------------------------------------------------------------------------------------------
-void Document::ReadGlobalSettings() {
+void Document::ReadGlobalSettings()
+{
    const Scope& sc = parser.GetRootScope();
    const Element* const ehead = sc["GlobalSettings"];
    if ( nullptr == ehead || !ehead->Compound() ) {
@@ -340,7 +370,8 @@ void Document::ReadGlobalSettings() {
 }

 // ------------------------------------------------------------------------------------------------
-void Document::ReadObjects() {
+void Document::ReadObjects()
+{
    // read ID objects from "Objects" section
    const Scope& sc = parser.GetRootScope();
    const Element* const eobjects = sc["Objects"];
@@ -387,7 +418,8 @@ void Document::ReadObjects() {
 }

 // ------------------------------------------------------------------------------------------------
-void Document::ReadPropertyTemplates() {
+void Document::ReadPropertyTemplates()
+{
    const Scope& sc = parser.GetRootScope();
    // read property templates from "Definitions" section
    const Element* const edefs = sc["Definitions"];
@@ -444,7 +476,8 @@ void Document::ReadPropertyTemplates() {
 }

 // ------------------------------------------------------------------------------------------------
-void Document::ReadConnections() {
+void Document::ReadConnections()
+{
    const Scope& sc = parser.GetRootScope();
    // read property templates from "Definitions" section
    const Element* const econns = sc["Connections"];
@@ -491,7 +524,8 @@ void Document::ReadConnections() {
 }

 // ------------------------------------------------------------------------------------------------
-const std::vector<const AnimationStack*>& Document::AnimationStacks() const {
+const std::vector<const AnimationStack*>& Document::AnimationStacks() const
+{
    if (!animationStacksResolved.empty() || animationStacks.empty()) {
        return animationStacksResolved;
    }
@@ -511,15 +545,17 @@ const std::vector<const AnimationStack*>& Document::AnimationStacks() const {
 }

 // ------------------------------------------------------------------------------------------------
-LazyObject* Document::GetObject(uint64_t id) const {
+LazyObject* Document::GetObject(uint64_t id) const
+{
    ObjectMap::const_iterator it = objects.find(id);
    return it == objects.end() ? nullptr : (*it).second;
 }

-constexpr size_t MAX_CLASSNAMES  = 6;
+#define MAX_CLASSNAMES 6

 // ------------------------------------------------------------------------------------------------
-std::vector<const Connection*> Document::GetConnectionsSequenced(uint64_t id, const ConnectionMap& conns) const {
+std::vector<const Connection*> Document::GetConnectionsSequenced(uint64_t id, const ConnectionMap& conns) const
+{
    std::vector<const Connection*> temp;

    const std::pair<ConnectionMap::const_iterator,ConnectionMap::const_iterator> range =
@@ -537,9 +573,11 @@ std::vector<const Connection*> Document::GetConnectionsSequenced(uint64_t id, co

 // ------------------------------------------------------------------------------------------------
 std::vector<const Connection*> Document::GetConnectionsSequenced(uint64_t id, bool is_src,
-        const ConnectionMap& conns,
-        const char* const* classnames,
-        size_t count) const {
+    const ConnectionMap& conns,
+    const char* const* classnames,
+    size_t count) const
+
+{
    ai_assert(classnames);
    ai_assert( count != 0 );
    ai_assert( count <= MAX_CLASSNAMES);
@@ -584,72 +622,95 @@ std::vector<const Connection*> Document::GetConnectionsSequenced(uint64_t id, bo
 }

 // ------------------------------------------------------------------------------------------------
-std::vector<const Connection*> Document::GetConnectionsBySourceSequenced(uint64_t source) const {
+std::vector<const Connection*> Document::GetConnectionsBySourceSequenced(uint64_t source) const
+{
    return GetConnectionsSequenced(source, ConnectionsBySource());
 }

 // ------------------------------------------------------------------------------------------------
-std::vector<const Connection*> Document::GetConnectionsBySourceSequenced(uint64_t src, const char* classname) const {
+std::vector<const Connection*> Document::GetConnectionsBySourceSequenced(uint64_t src, const char* classname) const
+{
    const char* arr[] = {classname};
    return GetConnectionsBySourceSequenced(src, arr,1);
 }

 // ------------------------------------------------------------------------------------------------
 std::vector<const Connection*> Document::GetConnectionsBySourceSequenced(uint64_t source,
-        const char* const* classnames, size_t count) const {
+        const char* const* classnames, size_t count) const
+{
    return GetConnectionsSequenced(source, true, ConnectionsBySource(),classnames, count);
 }

 // ------------------------------------------------------------------------------------------------
 std::vector<const Connection*> Document::GetConnectionsByDestinationSequenced(uint64_t dest,
-        const char* classname) const {
+        const char* classname) const
+{
    const char* arr[] = {classname};
    return GetConnectionsByDestinationSequenced(dest, arr,1);
 }

 // ------------------------------------------------------------------------------------------------
-std::vector<const Connection*> Document::GetConnectionsByDestinationSequenced(uint64_t dest) const {
+std::vector<const Connection*> Document::GetConnectionsByDestinationSequenced(uint64_t dest) const
+{
    return GetConnectionsSequenced(dest, ConnectionsByDestination());
 }

 // ------------------------------------------------------------------------------------------------
 std::vector<const Connection*> Document::GetConnectionsByDestinationSequenced(uint64_t dest,
-        const char* const* classnames, size_t count) const {
+    const char* const* classnames, size_t count) const
+
+{
    return GetConnectionsSequenced(dest, false, ConnectionsByDestination(),classnames, count);
 }

 // ------------------------------------------------------------------------------------------------
 Connection::Connection(uint64_t insertionOrder,  uint64_t src, uint64_t dest, const std::string& prop,
-            const Document& doc) :
-            insertionOrder(insertionOrder), prop(prop), src(src), dest(dest), doc(doc) {
+        const Document& doc)
+
+: insertionOrder(insertionOrder)
+, prop(prop)
+, src(src)
+, dest(dest)
+, doc(doc)
+{
    ai_assert(doc.Objects().find(src) != doc.Objects().end());
    // dest may be 0 (root node)
    ai_assert(!dest || doc.Objects().find(dest) != doc.Objects().end());
 }

 // ------------------------------------------------------------------------------------------------
-LazyObject& Connection::LazySourceObject() const {
+Connection::~Connection()
+{
+    // empty
+}
+
+// ------------------------------------------------------------------------------------------------
+LazyObject& Connection::LazySourceObject() const
+{
    LazyObject* const lazy = doc.GetObject(src);
    ai_assert(lazy);
    return *lazy;
 }

 // ------------------------------------------------------------------------------------------------
-LazyObject& Connection::LazyDestinationObject() const {
+LazyObject& Connection::LazyDestinationObject() const
+{
    LazyObject* const lazy = doc.GetObject(dest);
    ai_assert(lazy);
    return *lazy;
 }

 // ------------------------------------------------------------------------------------------------
-const Object* Connection::SourceObject() const {
+const Object* Connection::SourceObject() const
+{
    LazyObject* const lazy = doc.GetObject(src);
    ai_assert(lazy);
    return lazy->Get();
 }

 // ------------------------------------------------------------------------------------------------
-const Object* Connection::DestinationObject() const {
+const Object* Connection::DestinationObject() const
+{
    LazyObject* const lazy = doc.GetObject(dest);
    ai_assert(lazy);
    return lazy->Get();
@@ -658,4 +719,4 @@ const Object* Connection::DestinationObject() const {
 } // !FBX
 } // !Assimp

-#endif // ASSIMP_BUILD_NO_FBX_IMPORTER
+#endif
@@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

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

 All rights reserved.

@@ -88,7 +89,7 @@ class LazyObject {
 public:
    LazyObject(uint64_t id, const Element& element, const Document& doc);

-    ~LazyObject() = default;
+    ~LazyObject();

    const Object* Get(bool dieOnError = false);

@@ -138,7 +139,7 @@ class Object {
 public:
    Object(uint64_t id, const Element& element, const std::string& name);

-    virtual ~Object() = default;
+    virtual ~Object();

    const Element& SourceElement() const {
        return element;
@@ -266,7 +267,8 @@ public:
    Light(uint64_t id, const Element& element, const Document& doc, const std::string& name);
    virtual ~Light();

-    enum Type {
+    enum Type
+    {
        Type_Point,
        Type_Directional,
        Type_Spot,
@@ -276,7 +278,8 @@ public:
        Type_MAX // end-of-enum sentinel
    };

-    enum Decay {
+    enum Decay
+    {
        Decay_None,
        Decay_Linear,
        Decay_Quadratic,
@@ -344,7 +347,7 @@ public:

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

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

    fbx_simple_property(QuaternionInterpolate, int, 0)

@@ -575,27 +578,31 @@ public:
        BlendMode_BlendModeCount
    };

-    const Texture* getTexture(int index=0) const {
+    const Texture* getTexture(int index=0) const
+    {
 		return textures[index];
+
    }
 	int textureCount() const {
 		return static_cast<int>(textures.size());
 	}
-    BlendMode GetBlendMode() const {
+    BlendMode GetBlendMode() const
+    {
        return blendMode;
    }
-    float Alpha() {
+    float Alpha()
+    {
        return alpha;
    }
-
 private:
 	std::vector<const Texture*> textures;
    BlendMode blendMode;
    float alpha;
 };

-using TextureMap = std::fbx_unordered_map<std::string, const Texture*>;
-using LayeredTextureMap = std::fbx_unordered_map<std::string, const LayeredTexture*>;
+typedef std::fbx_unordered_map<std::string, const Texture*> TextureMap;
+typedef std::fbx_unordered_map<std::string, const LayeredTexture*> LayeredTextureMap;
+

 /** DOM class for generic FBX videos */
 class Video : public Object {
@@ -683,8 +690,8 @@ private:
    LayeredTextureMap layeredTextures;
 };

-using KeyTimeList = std::vector<int64_t>;
-using KeyValueList = std::vector<float>;
+typedef std::vector<int64_t> KeyTimeList;
+typedef std::vector<float> KeyValueList;

 /** Represents a FBX animation curve (i.e. a 1-dimensional set of keyframes and values therefore) */
 class AnimationCurve : public Object {
@@ -720,7 +727,7 @@ private:
 };

 // property-name -> animation curve
-using AnimationCurveMap = std::map<std::string, const AnimationCurve*>;
+typedef std::map<std::string, const AnimationCurve*> AnimationCurveMap;

 /** Represents a FBX animation curve (i.e. a mapping from single animation curves to nodes) */
 class AnimationCurveNode : public Object {
@@ -770,7 +777,7 @@ private:
    const Document& doc;
 };

-using AnimationCurveNodeList = std::vector<const AnimationCurveNode*>;
+typedef std::vector<const AnimationCurveNode*> AnimationCurveNodeList;

 /** Represents a FBX animation layer (i.e. a list of node animations) */
 class AnimationLayer : public Object {
@@ -793,7 +800,7 @@ private:
    const Document& doc;
 };

-using AnimationLayerList = std::vector<const AnimationLayer*>;
+typedef std::vector<const AnimationLayer*> AnimationLayerList;

 /** Represents a FBX animation stack (i.e. a list of animation layers) */
 class AnimationStack : public Object {
@@ -836,8 +843,8 @@ private:
    std::shared_ptr<const PropertyTable> props;
 };

-using WeightArray = std::vector<float>;
-using WeightIndexArray = std::vector<unsigned int>;
+typedef std::vector<float> WeightArray;
+typedef std::vector<unsigned int> WeightIndexArray;


 /** DOM class for BlendShapeChannel deformers */
@@ -949,7 +956,7 @@ class Connection {
 public:
    Connection(uint64_t insertionOrder,  uint64_t src, uint64_t dest, const std::string& prop, const Document& doc);

-    ~Connection() = default;
+    ~Connection();

    // note: a connection ensures that the source and dest objects exist, but
    // not that they have DOM representations, so the return value of one of
@@ -1004,9 +1011,10 @@ public:
 // during their entire lifetime (Document). FBX files have
 // up to many thousands of objects (most of which we never use),
 // so the memory overhead for them should be kept at a minimum.
-using ObjectMap = std::fbx_unordered_map<uint64_t, LazyObject*> ;
-using PropertyTemplateMap = std::fbx_unordered_map<std::string, std::shared_ptr<const PropertyTable> > ;
-using ConnectionMap = std::fbx_unordered_multimap<uint64_t, const Connection*>;
+typedef std::fbx_unordered_map<uint64_t, LazyObject*> ObjectMap;
+typedef std::fbx_unordered_map<std::string, std::shared_ptr<const PropertyTable> > PropertyTemplateMap;
+
+typedef std::fbx_unordered_multimap<uint64_t, const Connection*> ConnectionMap;

 /** DOM class for global document settings, a single instance per document can
 *  be accessed via Document.Globals(). */
@@ -1014,7 +1022,7 @@ class FileGlobalSettings {
 public:
    FileGlobalSettings(const Document& doc, std::shared_ptr<const PropertyTable> props);

-    ~FileGlobalSettings() = default;
+    ~FileGlobalSettings();

    const PropertyTable& Props() const {
        ai_assert(props.get());
@@ -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.

@@ -140,32 +140,11 @@ Material::~Material() {
    // empty
 }

-    aiVector2D uvTrans;
-    aiVector2D uvScaling;
-    ai_real    uvRotation;
-
-    std::string type;
-    std::string relativeFileName;
-    std::string fileName;
-    std::string alphaSource;
-    std::shared_ptr<const PropertyTable> props;
-
-    unsigned int crop[4]{};
-
-    const Video* media;
-
 // ------------------------------------------------------------------------------------------------
 Texture::Texture(uint64_t id, const Element& element, const Document& doc, const std::string& name) :
        Object(id,element,name),
-        uvTrans(0.0f, 0.0f),
        uvScaling(1.0f,1.0f),
-        uvRotation(0.0f),
-        type(),
-        relativeFileName(),
-        fileName(),
-        alphaSource(),
-        props(),
-        media(nullptr) {
+        media(0) {
    const Scope& sc = GetRequiredScope(element);

    const Element* const Type = sc["Type"];
@@ -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,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

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

 All rights reserved.

@@ -75,6 +76,10 @@ Model::Model(uint64_t id, const Element &element, const Document &doc, const std
    ResolveLinks(element, doc);
 }

+// ------------------------------------------------------------------------------------------------
+Model::~Model() {
+}
+
 // ------------------------------------------------------------------------------------------------
 void Model::ResolveLinks(const Element&, const Document &doc) {
    const char *const arr[] = { "Geometry", "Material", "NodeAttribute" };
--- a/Show More
+++ b/Show More