diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 84e3123fe..e0c2bec9e 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,3 +1,2 @@
 patreon: assimp
 custom: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=4JRJVPXC4QJM4
-open_collective: assimp
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 08292d55f..f29e2e500 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -8,30 +8,39 @@ on:
 
 jobs:
   job:
-    name: ${{ matrix.os }}-${{ matrix.cxx }}-build-and-test
+    name: ${{ matrix.name }}-build-and-test
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        name: [ubuntu-gcc, macos-clang, windows-msvc, ubuntu-clang]
+        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-msvc
+          - name: windows-latest-cl.exe
             os: windows-latest
             cxx: cl.exe
             cc: cl.exe
-          - name: ubuntu-clang
+          - name: ubuntu-latest-clang++
             os: ubuntu-latest
             cxx: clang++
             cc: clang
-          - name: macos-clang
+          - name: macos-latest-clang++
             os: macos-latest
             cxx: clang++
             cc: clang
-          - name: ubuntu-gcc
+          - name: ubuntu-latest-g++
             os: ubuntu-latest
             cxx: g++
             cc: gcc
+          - name: ubuntu-gcc-hunter
+            os: ubuntu-latest
+            toolchain: ninja-gcc-cxx17-fpic
+          - name: macos-clang-hunter
+            os: macos-latest
+            toolchain: ninja-clang-cxx17-fpic
+          - name: windows-msvc-hunter
+            os: windows-latest
+            toolchain: ninja-vs-win64-cxx17
 
     steps:
     - uses: actions/checkout@v2
@@ -40,20 +49,75 @@ jobs:
     
     - uses: ilammy/msvc-dev-cmd@v1
     
-    - uses: lukka/set-shell-env@v1
+    - name: Set Compiler Environment
+      if: "!endsWith(matrix.name, 'hunter')"
+      uses: lukka/set-shell-env@v1
       with:
         CXX: ${{ matrix.cxx }}
         CC: ${{ matrix.cc }}
+
+    - name: Set Compiler Environment for Hunter on Windows
+      if: startsWith(matrix.name, 'windows') && endsWith(matrix.name, 'hunter')
+      uses: lukka/set-shell-env@v1
+      with:
+        VS160COMNTOOLS: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools
+
+    - name: Checkout Hunter toolchains
+      if: endsWith(matrix.name, 'hunter')
+      uses: actions/checkout@v2
+      with:
+        repository: cpp-pm/polly
+        path: cmake/polly     
+
+    - name: Cache DX SDK
+      id: dxcache
+      if: contains(matrix.name, 'windows')
+      uses: actions/cache@v2
+      with:
+        path: '${{ github.workspace }}/DX_SDK'
+        key: ${{ runner.os }}-DX_SDK
+        restore-keys: |
+          ${{ runner.os }}-DX_SDK
+
+    - name: Download DXSetup
+      if: contains(matrix.name, 'windows') && steps.dxcache.outputs.cache-hit != 'true'
+      run: |
+        curl -s -o DXSDK_Jun10.exe --location https://download.microsoft.com/download/A/E/7/AE743F1F-632B-4809-87A9-AA1BB3458E31/DXSDK_Jun10.exe
+        cmd.exe /c start /wait .\DXSDK_Jun10.exe /U /O /F /S /P "${{ github.workspace }}\DX_SDK"
+
+    - name: Set Windows specific CMake arguments
+      if: contains(matrix.name, 'windows')
+      id: windows_extra_cmake_args
+      run: echo "::set-output name=args::-DASSIMP_BUILD_ASSIMP_TOOLS=1 -DASSIMP_BUILD_ASSIMP_VIEW=1"
     
+    - name: Set Hunter specific CMake arguments
+      if: contains(matrix.name, 'hunter')
+      id: hunter_extra_cmake_args
+      run: echo "::set-output name=args::-DBUILD_SHARED_LIBS=OFF -DASSIMP_HUNTER_ENABLED=ON -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/cmake/polly/${{ matrix.toolchain }}.cmake"
+
     - name: configure and build
-      uses: lukka/run-cmake@v2
+      uses: lukka/run-cmake@v3
+      env:
+        DXSDK_DIR: '${{ github.workspace }}/DX_SDK'
+
       with:
         cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
         cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt'
-        cmakeAppendedArgs: '-GNinja -DCMAKE_BUILD_TYPE=Release'
+        cmakeAppendedArgs: '-GNinja -DCMAKE_BUILD_TYPE=Release ${{ steps.windows_extra_cmake_args.outputs.args }} ${{ steps.hunter_extra_cmake_args.outputs.args }}'
         buildWithCMakeArgs: '-- -v'
         buildDirectory: '${{ github.workspace }}/build/'
         
+    - name: Exclude certain tests in Hunter specific builds
+      if: contains(matrix.name, 'hunter')
+      id: hunter_extra_test_args
+      run: echo "::set-output name=args::--gtest_filter=-utOpenGEXImportExport.Importissue1340_EmptyCameraObject:utColladaZaeImportExport.importBlenFromFileTest"
+
     - name: test
-      run: cd build/bin && ./unit
+      run: cd build/bin && ./unit ${{ steps.hunter_extra_test_args.outputs.args }}
       shell: bash
+
+    - uses: actions/upload-artifact@v2
+      if: matrix.name == 'windows-msvc'
+      with:
+        name: 'assimp-bins-${{ matrix.name }}-${{ github.sha }}'
+        path: build/bin
diff --git a/.github/workflows/sanitizer.yml b/.github/workflows/sanitizer.yml
index 9bba5f6fd..e2cb1cf53 100644
--- a/.github/workflows/sanitizer.yml
+++ b/.github/workflows/sanitizer.yml
@@ -19,7 +19,7 @@ jobs:
         CC: clang
     
     - name: configure and build
-      uses: lukka/run-cmake@v2
+      uses: lukka/run-cmake@v3
       with:
         cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
         cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt'
diff --git a/AssimpBuildTreeSettings.cmake.in b/AssimpBuildTreeSettings.cmake.in
deleted file mode 100644
index 342da1b08..000000000
--- a/AssimpBuildTreeSettings.cmake.in
+++ /dev/null
@@ -1,3 +0,0 @@
-set(ASSIMP_INCLUDE_DIRS
-  "@PROJECT_SOURCE_DIR@"
-  "@PROJECT_BINARY_DIR@")
diff --git a/AssimpConfigVersion.cmake.in b/AssimpConfigVersion.cmake.in
deleted file mode 100644
index 701fa6158..000000000
--- a/AssimpConfigVersion.cmake.in
+++ /dev/null
@@ -1,11 +0,0 @@
-set(ASSIMP_PACKAGE_VERSION "@ASSIMP_SOVERSION@")
-
-# Check whether the requested PACKAGE_FIND_VERSION is compatible
-if("${ASSIMP_PACKAGE_VERSION}" VERSION_LESS "${ASSIMP_PACKAGE_FIND_VERSION}")
-  set(ASSIMP_PACKAGE_VERSION_COMPATIBLE FALSE)
-else()
-  set(ASSIMP_PACKAGE_VERSION_COMPATIBLE TRUE)
-  if ("${ASSIMP_PACKAGE_VERSION}" VERSION_EQUAL "${ASSIMP_PACKAGE_FIND_VERSION}")
-    set(ASSIMP_PACKAGE_VERSION_EXACT TRUE)
-  endif()
-endif()
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6b350f6e3..4b553ef9e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,7 +34,9 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #----------------------------------------------------------------------
+SET(CMAKE_POLICY_DEFAULT_CMP0012 NEW)
 SET(CMAKE_POLICY_DEFAULT_CMP0074 NEW)
+SET(CMAKE_POLICY_DEFAULT_CMP0092 NEW)
 
 CMAKE_MINIMUM_REQUIRED( VERSION 3.0 )
 
@@ -44,8 +46,8 @@ option(ASSIMP_HUNTER_ENABLED "Enable Hunter package manager support" OFF)
 IF(ASSIMP_HUNTER_ENABLED)
   include("cmake/HunterGate.cmake")
   HunterGate(
-    URL "https://github.com/ruslo/hunter/archive/v0.23.176.tar.gz"
-    SHA1 "2e9ae973d028660b735ac4c6142725ca36a0048a"
+    URL "https://github.com/cpp-pm/hunter/archive/v0.23.269.tar.gz"
+    SHA1 "64024b7b95b4c86d50ae05b926814448c93a70a0"
   )
 
   add_definitions(-DASSIMP_USE_HUNTER)
@@ -116,10 +118,6 @@ OPTION ( ASSIMP_UBSAN
   "Enable Undefined Behavior sanitizer."
   OFF
 )
-OPTION ( ASSIMP_SYSTEM_IRRXML
-  "Use system installed Irrlicht/IrrXML library."
-  OFF
-)
 OPTION ( ASSIMP_BUILD_DOCS
   "Build documentation using Doxygen."
   OFF
@@ -135,8 +133,8 @@ OPTION ( ASSIMP_IGNORE_GIT_HASH
 )
 
 IF ( WIN32 )
-    OPTION ( ASSIMP_BUILD_ASSIMP_VIEW 
-      "If the Assimp view tool is built. (requires DirectX)" 
+    OPTION ( ASSIMP_BUILD_ASSIMP_VIEW
+      "If the Assimp view tool is built. (requires DirectX)"
       OFF )
 ENDIF()
 
@@ -213,7 +211,7 @@ IF(NOT GIT_COMMIT_HASH)
 ENDIF()
 
 IF(ASSIMP_DOUBLE_PRECISION)
-    ADD_DEFINITIONS(-DASSIMP_DOUBLE_PRECISION)
+  ADD_DEFINITIONS(-DASSIMP_DOUBLE_PRECISION)
 ENDIF()
 
 CONFIGURE_FILE(
@@ -252,18 +250,28 @@ IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT CMAKE_COMPILER_IS_MINGW)
     SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
   ENDIF()
   # hide all not-exported symbols
-  SET(CMAKE_CXX_FLAGS "-fvisibility=hidden -fno-strict-aliasing -Wall ${CMAKE_CXX_FLAGS}")
-  SET(CMAKE_C_FLAGS "-fno-strict-aliasing ${CMAKE_C_FLAGS}")
-  SET(LIBSTDC++_LIBRARIES -lstdc++)
+  IF(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips64" )
+	SET(CMAKE_CXX_FLAGS "-mxgot -fvisibility=hidden -fno-strict-aliasing -Wall ${CMAKE_CXX_FLAGS}")
+	SET(CMAKE_C_FLAGS "-fno-strict-aliasing ${CMAKE_C_FLAGS}")
+	SET(LIBSTDC++_LIBRARIES -lstdc++)
+  ELSE()
+	SET(CMAKE_CXX_FLAGS "-fvisibility=hidden -fno-strict-aliasing -Wall ${CMAKE_CXX_FLAGS}")
+	SET(CMAKE_C_FLAGS "-fno-strict-aliasing ${CMAKE_C_FLAGS}")
+	SET(LIBSTDC++_LIBRARIES -lstdc++)
+  ENDIF()
 ELSEIF(MSVC)
   # enable multi-core compilation with MSVC
-  ADD_COMPILE_OPTIONS(/MP /bigobj /W4 /WX ) 
+  IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) # clang-cl
+    ADD_COMPILE_OPTIONS(/bigobj /W4 /WX )
+  ELSE() # msvc
+    ADD_COMPILE_OPTIONS(/MP /bigobj /W4 /WX)
+  ENDIF()
   # disable "elements of array '' will be default initialized" warning on MSVC2013
   IF(MSVC12)
     ADD_COMPILE_OPTIONS(/wd4351)
   ENDIF()
   SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /D_DEBUG /Zi /Od")
-ELSEIF ( "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" )
+ELSEIF (CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
   IF(NOT ASSIMP_HUNTER_ENABLED)
     SET(CMAKE_CXX_STANDARD 11)
     SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
@@ -321,26 +329,27 @@ ENDIF()
 
 IF (ASSIMP_UBSAN)
   MESSAGE(STATUS "Undefined Behavior sanitizer enabled")
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined -fno-sanitize-recover=all")
-  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=undefined -fno-sanitize-recover=all")
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined,shift,shift-exponent,integer-divide-by-zero,unreachable,vla-bound,null,return,signed-integer-overflow,bounds,float-divide-by-zero,float-cast-overflow,nonnull-attribute,returns-nonnull-attribute,bool,enum,vptr,pointer-overflow,builtin -fno-sanitize-recover=all")
+  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=undefined,shift,shift-exponent,integer-divide-by-zero,unreachable,vla-bound,null,return,signed-integer-overflow,bounds,float-divide-by-zero,float-cast-overflow,nonnull-attribute,returns-nonnull-attribute,bool,enum,vptr,pointer-overflow,builtin -fno-sanitize-recover=all")
 ENDIF()
 
 INCLUDE (FindPkgMacros)
 INCLUDE (PrecompiledHeader)
 
-# If this is an in-source build (CMAKE_SOURCE_DIR == CMAKE_BINARY_DIR),
-# write the library/executable files to the respective directories in the
-# source tree. During an out-of-source build, however, do not litter this
-# directory, since that is probably what the user wanted to avoid.
-IF ( CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR )
-  SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_HOME_DIRECTORY}/bin" )
-  SET( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_HOME_DIRECTORY}/lib" )
-  SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_HOME_DIRECTORY}/bin" )
-ELSE()
-  SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/lib")
-  SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin")
-  SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin")
-ENDIF ()
+# Set Assimp project output directory variables.
+SET(ASSIMP_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin")
+SET(ASSIMP_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin")
+SET(ASSIMP_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/lib")
+
+# Macro used to set the output directories of a target to the
+# respective Assimp output directories.
+MACRO(TARGET_USE_COMMON_OUTPUT_DIRECTORY target)
+  set_target_properties(${target} PROPERTIES
+      RUNTIME_OUTPUT_DIRECTORY ${ASSIMP_RUNTIME_OUTPUT_DIRECTORY}
+      LIBRARY_OUTPUT_DIRECTORY ${ASSIMP_LIBRARY_OUTPUT_DIRECTORY}
+      ARCHIVE_OUTPUT_DIRECTORY ${ASSIMP_ARCHIVE_OUTPUT_DIRECTORY}
+  )
+ENDMACRO()
 
 get_cmake_property(is_multi_config GENERATOR_IS_MULTI_CONFIG)
 
@@ -351,110 +360,90 @@ ELSE()
 ENDIF()
 
 # Only generate this target if no higher-level project already has
-IF (NOT TARGET uninstall)
+IF (NOT TARGET uninstall AND ASSIMP_INSTALL)
   # add make uninstall capability
   CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/cmake-modules/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY)
   ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
 ENDIF()
 
+# cmake configuration files
+if(${BUILD_SHARED_LIBS})
+  set(BUILD_LIB_TYPE SHARED)
+else()
+  set(BUILD_LIB_TYPE STATIC)
+endif()
+
+IF( UNIX )
+  # Use GNUInstallDirs for Unix predefined directories
+  INCLUDE(GNUInstallDirs)
+
+  SET( ASSIMP_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR})
+  SET( ASSIMP_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR})
+  SET( ASSIMP_BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR})
+ELSE()
+  # Cache these to allow the user to override them on non-Unix platforms
+  SET( ASSIMP_LIB_INSTALL_DIR "lib" CACHE STRING
+    "Path the built library files are installed to." )
+  SET( ASSIMP_INCLUDE_INSTALL_DIR "include" CACHE STRING
+    "Path the header files are installed to." )
+  SET( ASSIMP_BIN_INSTALL_DIR "bin" CACHE STRING
+    "Path the tool executables are installed to." )
+
+  SET(CMAKE_INSTALL_FULL_INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/${ASSIMP_INCLUDE_INSTALL_DIR})
+  SET(CMAKE_INSTALL_FULL_LIBDIR ${CMAKE_INSTALL_PREFIX}/${ASSIMP_LIB_INSTALL_DIR})
+  SET(CMAKE_INSTALL_FULL_BINDIR ${CMAKE_INSTALL_PREFIX}/${ASSIMP_BIN_INSTALL_DIR})
+ENDIF()
+
+set(GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
+
 IF(ASSIMP_HUNTER_ENABLED)
   set(CONFIG_INSTALL_DIR "lib/cmake/${PROJECT_NAME}")
-  set(INCLUDE_INSTALL_DIR "include")
-
-  set(GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
-
-  # Configuration
+  set(CMAKE_CONFIG_TEMPLATE_FILE "cmake/assimp-hunter-config.cmake.in")
+  set(NAMESPACE "${PROJECT_NAME}::")
+  set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets")
   set(VERSION_CONFIG "${GENERATED_DIR}/${PROJECT_NAME}ConfigVersion.cmake")
   set(PROJECT_CONFIG "${GENERATED_DIR}/${PROJECT_NAME}Config.cmake")
-  set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets")
-  set(NAMESPACE "${PROJECT_NAME}::")
-
-  # Include module with fuction 'write_basic_package_version_file'
-  include(CMakePackageConfigHelpers)
-
-  # Note: PROJECT_VERSION is used as a VERSION
-  write_basic_package_version_file("${VERSION_CONFIG}" COMPATIBILITY SameMajorVersion)
-
-  # Use variables:
-  #   * TARGETS_EXPORT_NAME
-  #   * PROJECT_NAME
-  configure_package_config_file(
-      "cmake/assimp-hunter-config.cmake.in"
-      "${PROJECT_CONFIG}"
-      INSTALL_DESTINATION "${CONFIG_INSTALL_DIR}"
-  )
-
-  install(
-      FILES "${PROJECT_CONFIG}" "${VERSION_CONFIG}"
-      DESTINATION "${CONFIG_INSTALL_DIR}"
-  )
-
-  install(
-      EXPORT "${TARGETS_EXPORT_NAME}"
-      NAMESPACE "${NAMESPACE}"
-      DESTINATION "${CONFIG_INSTALL_DIR}"
-  )
 ELSE()
-  # cmake configuration files
-  if(${BUILD_SHARED_LIBS})
-    set(BUILD_LIB_TYPE SHARED)
-  else()
-    set(BUILD_LIB_TYPE STATIC)
-  endif()
-
-  IF( UNIX )
-    # Use GNUInstallDirs for Unix predefined directories
-    INCLUDE(GNUInstallDirs)
-
-    SET( ASSIMP_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR})
-    SET( ASSIMP_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR})
-    SET( ASSIMP_BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR})
-  ELSE()
-    # Cache these to allow the user to override them on non-Unix platforms
-    SET( ASSIMP_LIB_INSTALL_DIR "lib" CACHE STRING
-      "Path the built library files are installed to." )
-    SET( ASSIMP_INCLUDE_INSTALL_DIR "include" CACHE STRING
-      "Path the header files are installed to." )
-    SET( ASSIMP_BIN_INSTALL_DIR "bin" CACHE STRING
-      "Path the tool executables are installed to." )
-
-    SET(CMAKE_INSTALL_FULL_INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/${ASSIMP_INCLUDE_INSTALL_DIR})
-    SET(CMAKE_INSTALL_FULL_LIBDIR ${CMAKE_INSTALL_PREFIX}/${ASSIMP_LIB_INSTALL_DIR})
-    SET(CMAKE_INSTALL_FULL_BINDIR ${CMAKE_INSTALL_PREFIX}/${ASSIMP_BIN_INSTALL_DIR})
-  ENDIF()
-
-  CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimp-config.cmake.in"         "${CMAKE_CURRENT_BINARY_DIR}/assimp-config.cmake" @ONLY IMMEDIATE)
-  CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets.cmake.in"         "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets.cmake" @ONLY IMMEDIATE)
-  IF (is_multi_config)
-    CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets-debug.cmake.in"   "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-debug.cmake" @ONLY IMMEDIATE)
-    CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets-release.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-release.cmake" @ONLY IMMEDIATE)
-    SET(PACKAGE_TARGETS_FILE "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-debug.cmake" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-release.cmake")
-  ELSEIF (CMAKE_BUILD_TYPE STREQUAL Debug)
-    CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets-debug.cmake.in"   "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-debug.cmake" @ONLY IMMEDIATE)
-    SET(PACKAGE_TARGETS_FILE "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-debug.cmake")
-  ELSE()
-    CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets-release.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-release.cmake" @ONLY IMMEDIATE)
-    SET(PACKAGE_TARGETS_FILE "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-release.cmake")
-  ENDIF()
-  CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimp-config-version.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimp-config-version.cmake" @ONLY IMMEDIATE)
-  #we should generated these scripts after CMake VERSION 3.0.2 using export(EXPORT ...) and write_basic_package_version_file(...)
-  INSTALL(FILES
-    "${CMAKE_CURRENT_BINARY_DIR}/assimp-config.cmake"
-    "${CMAKE_CURRENT_BINARY_DIR}/assimp-config-version.cmake"
-    "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets.cmake"
-    ${PACKAGE_TARGETS_FILE}
-    DESTINATION "${ASSIMP_LIB_INSTALL_DIR}/cmake/assimp-${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_MINOR}" COMPONENT ${LIBASSIMP-DEV_COMPONENT})
+  set(CONFIG_INSTALL_DIR "${ASSIMP_LIB_INSTALL_DIR}/cmake/assimp-${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_MINOR}")
+  set(CMAKE_CONFIG_TEMPLATE_FILE "cmake/assimp-plain-config.cmake.in")
+  string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWERCASE)
+  set(NAMESPACE "${PROJECT_NAME_LOWERCASE}::")
+  set(TARGETS_EXPORT_NAME "${PROJECT_NAME_LOWERCASE}Targets")
+  set(VERSION_CONFIG "${GENERATED_DIR}/${PROJECT_NAME_LOWERCASE}ConfigVersion.cmake")
+  set(PROJECT_CONFIG "${GENERATED_DIR}/${PROJECT_NAME_LOWERCASE}Config.cmake")
 ENDIF()
 
+set(INCLUDE_INSTALL_DIR "include")
+
+# Include module with fuction 'write_basic_package_version_file'
+include(CMakePackageConfigHelpers)
+
+# Note: PROJECT_VERSION is used as a VERSION
+write_basic_package_version_file("${VERSION_CONFIG}" COMPATIBILITY SameMajorVersion)
+
+configure_package_config_file(
+    ${CMAKE_CONFIG_TEMPLATE_FILE}
+    "${PROJECT_CONFIG}"
+    INSTALL_DESTINATION "${CONFIG_INSTALL_DIR}"
+)
+
+install(
+    FILES "${PROJECT_CONFIG}" "${VERSION_CONFIG}"
+    DESTINATION "${CONFIG_INSTALL_DIR}"
+    COMPONENT ${LIBASSIMP-DEV_COMPONENT}
+)
+
+install(
+    EXPORT "${TARGETS_EXPORT_NAME}"
+    NAMESPACE "${NAMESPACE}"
+    DESTINATION "${CONFIG_INSTALL_DIR}"
+    COMPONENT ${LIBASSIMP-DEV_COMPONENT}
+)
+
 IF( ASSIMP_BUILD_DOCS )
   ADD_SUBDIRECTORY(doc)
 ENDIF()
 
-# Look for system installed irrXML
-IF ( ASSIMP_SYSTEM_IRRXML )
-  FIND_PACKAGE( IrrXML REQUIRED )
-ENDIF()
-
 # Search for external dependencies, and build them from source if not found
 # Search for zlib
 IF(ASSIMP_HUNTER_ENABLED)
@@ -581,10 +570,6 @@ ELSE ()
   ADD_DEFINITIONS( -DASSIMP_BUILD_NO_C4D_IMPORTER )
 ENDIF ()
 
-IF(NOT ASSIMP_HUNTER_ENABLED)
-  ADD_SUBDIRECTORY(contrib)
-ENDIF()
-
 ADD_SUBDIRECTORY( code/ )
 IF ( ASSIMP_BUILD_ASSIMP_TOOLS )
   # The viewer for windows only
@@ -679,7 +664,8 @@ if(WIN32)
   ENDIF()
 
   IF(MSVC_TOOLSET_VERSION)
-    set(MSVC_PREFIX "vc${MSVC_TOOLSET_VERSION}")
+    SET(MSVC_PREFIX "vc${MSVC_TOOLSET_VERSION}")
+    SET(ASSIMP_MSVC_VERSION ${MCVS_PREFIX})
   ELSE()
     IF(MSVC12)
       SET(ASSIMP_MSVC_VERSION "vc120")
diff --git a/Readme.md b/Readme.md
index dc54870a0..c6212bcc0 100644
--- a/Readme.md
+++ b/Readme.md
@@ -4,8 +4,6 @@ A library to import and export various 3d-model-formats including scene-post-pro
 ### Current project status ###
 [![Financial Contributors on Open Collective](https://opencollective.com/assimp/all/badge.svg?label=financial+contributors)](https://opencollective.com/assimp) 
 ![C/C++ CI](https://github.com/assimp/assimp/workflows/C/C++%20CI/badge.svg)
-[![Linux Build Status](https://travis-ci.org/assimp/assimp.svg)](https://travis-ci.org/assimp/assimp)
-[![Windows Build Status](https://ci.appveyor.com/api/projects/status/tmo433wax6u6cjp4?svg=true)](https://ci.appveyor.com/project/kimkulling/assimp)
 <a href="https://scan.coverity.com/projects/5607">
   <img alt="Coverity Scan Build Status"
        src="https://scan.coverity.com/projects/5607/badge.svg"/>
@@ -18,13 +16,16 @@ A library to import and export various 3d-model-formats including scene-post-pro
 <br>
 
 APIs are provided for C and C++. There are various bindings to other languages (C#, Java, Python, Delphi, D). Assimp also runs on Android and iOS.
-
-[Check the latest doc](https://assimp-docs.readthedocs.io/en/latest/).
-
 Additionally, assimp features various __mesh post processing tools__: normals and tangent space generation, triangulation, vertex cache locality optimization, removal of degenerate primitives and duplicate vertices, sorting by primitive type, merging of redundant materials and many more.
 
-This is the development repo containing the latest features and bugfixes. For productive use though, we recommend one of the stable releases available from [Github Assimp Releases](https://github.com/assimp/assimp/releases).
+### Latest Doc's ###
+Please check the latest documents at [Asset-Importer-Lib-Doc](https://assimp-docs.readthedocs.io/en/latest/). 
 
+### Get involved ###
+This is the development repo containing the latest features and bugfixes. For productive use though, we recommend one of the stable releases available from [Github Assimp Releases](https://github.com/assimp/assimp/releases).
+<br>
+You find a bug in the docs? Use [Doc-Repo](https://github.com/assimp/assimp-docs).
+<br>
 Please check our Wiki as well: https://github.com/assimp/assimp/wiki
 
 If you want to check our Model-Database, use the following repo: https://github.com/assimp/assimp-mdb
@@ -72,7 +73,7 @@ The source code is organized in the following way:
 For more information, visit [our website](http://assimp.org/). Or check out the `./doc`- folder, which contains the official documentation in HTML format.
 (CHMs for Windows are included in some release packages and should be located right here in the root folder).
 
-If the docs don't solve your problem, ask on [StackOverflow](http://stackoverflow.com/questions/tagged/assimp?sort=newest). If you think you found a bug, please open an issue on Github.
+If the docs don't solve your problem, ask on [StackOverflow with the assimp-tag](http://stackoverflow.com/questions/tagged/assimp?sort=newest). If you think you found a bug, please open an issue on Github.
 
 For development discussions, there is also a (very low-volume) mailing list, _assimp-discussions_
   [(subscribe here)]( https://lists.sourceforge.net/lists/listinfo/assimp-discussions)
diff --git a/assimp-config-version.cmake.in b/assimp-config-version.cmake.in
deleted file mode 100644
index 68366820a..000000000
--- a/assimp-config-version.cmake.in
+++ /dev/null
@@ -1,48 +0,0 @@
-# Open Asset Import Library (assimp)
-# ----------------------------------------------------------------------
-# Copyright (c) 2006-2020, assimp team
-# All rights reserved.
-#
-# Redistribution and use of this software in source and binary forms,
-# with or without modification, are permitted provided that the
-# following conditions are met:
-#
-# * Redistributions of source code must retain the above
-#   copyright notice, this list of conditions and the
-#   following disclaimer.
-#
-# * Redistributions in binary form must reproduce the above
-#   copyright notice, this list of conditions and the
-#   following disclaimer in the documentation and/or other
-#   materials provided with the distribution.
-#
-# * Neither the name of the assimp team, nor the names of its
-#   contributors may be used to endorse or promote products
-#   derived from this software without specific prior
-#   written permission of the assimp team.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#----------------------------------------------------------------------
-set( PACKAGE_VERSION "@ASSIMP_VERSION@" )
-if( "${PACKAGE_FIND_VERSION}" VERSION_EQUAL "@ASSIMP_VERSION@")
-  set(PACKAGE_VERSION_EXACT 1)
-endif()
-if( "${PACKAGE_FIND_VERSION_MAJOR}.${PACKAGE_FIND_VERSION_MINOR}" EQUAL "@ASSIMP_VERSION@" )
-  set(PACKAGE_VERSION_COMPATIBLE 1)
-elseif( "${PACKAGE_FIND_VERSION_MAJOR}" EQUAL "@ASSIMP_VERSION_MAJOR@" )
-  # for now backward compatible if minor version is less
-  if( ${PACKAGE_FIND_VERSION_MINOR}  LESS @ASSIMP_VERSION_MINOR@ )
-    set(PACKAGE_VERSION_COMPATIBLE 1)
-  endif()
-endif()
-set( ASSIMP_STATIC_LIB "@ASSIMP_BUILD_STATIC_LIB@")
diff --git a/assimp-config.cmake.in b/assimp-config.cmake.in
deleted file mode 100644
index 0ab9fd071..000000000
--- a/assimp-config.cmake.in
+++ /dev/null
@@ -1 +0,0 @@
-include(${CMAKE_CURRENT_LIST_DIR}/assimpTargets.cmake)
diff --git a/assimpTargets-debug.cmake.in b/assimpTargets-debug.cmake.in
deleted file mode 100644
index b7efe71f9..000000000
--- a/assimpTargets-debug.cmake.in
+++ /dev/null
@@ -1,126 +0,0 @@
-#----------------------------------------------------------------
-# Generated CMake target import file for configuration "Debug".
-#----------------------------------------------------------------
-
-# Commands may need to know the format version.
-set(CMAKE_IMPORT_FILE_VERSION 1)
-
-set(ASSIMP_BUILD_SHARED_LIBS @BUILD_SHARED_LIBS@)
-
-get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
-
-if(MSVC)
-  if(MSVC_TOOLSET_VERSION)
-    set(MSVC_PREFIX "vc${MSVC_TOOLSET_VERSION}")
-  else()
-    if( MSVC70 OR MSVC71 )
-      set(MSVC_PREFIX "vc70")
-    elseif( MSVC80 )
-      set(MSVC_PREFIX "vc80")
-    elseif( MSVC90 )
-      set(MSVC_PREFIX "vc90")
-    elseif( MSVC10 )
-      set(MSVC_PREFIX "vc100")
-    elseif( MSVC11 )
-      set(MSVC_PREFIX "vc110")
-    elseif( MSVC12 )
-      set(MSVC_PREFIX "vc120")
-    elseif( MSVC_VERSION LESS 1910)
-      set(MSVC_PREFIX "vc140")
-    elseif( MSVC_VERSION LESS 1920)
-      set(MSVC_PREFIX "vc141")
-    elseif( MSVC_VERSION LESS 1930)
-      set(MSVC_PREFIX "vc142")
-    else()
-      set(MSVC_PREFIX "vc150")
-    endif()
-  endif()
-  set(ASSIMP_LIBRARY_SUFFIX "@ASSIMP_LIBRARY_SUFFIX@-${MSVC_PREFIX}-mt" CACHE STRING "the suffix for the assimp windows library" )
-
-  if(ASSIMP_BUILD_SHARED_LIBS)
-    set(sharedLibraryName "assimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@")
-    set(importLibraryName "assimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_IMPORT_LIBRARY_SUFFIX@")
-
-    # Import target "assimp::assimp" for configuration "Debug"
-    set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
-    set_target_properties(assimp::assimp PROPERTIES
-      IMPORTED_IMPLIB_DEBUG "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}"
-      IMPORTED_LOCATION_DEBUG "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}"
-    )
-    list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
-    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}")
-    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}" )
-  else()
-    set(staticLibraryName "assimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_STATIC_LIBRARY_SUFFIX@")
-
-    # Import target "assimp::assimp" for configuration "Debug"
-    set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
-    set_target_properties(assimp::assimp PROPERTIES
-      IMPORTED_LOCATION_DEBUG "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}"
-    )
-    list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
-    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}")
-  endif()
-
-else()
-  set(ASSIMP_LIBRARY_SUFFIX "@ASSIMP_LIBRARY_SUFFIX@" CACHE STRING "the suffix for the assimp libraries" )
-  if(ASSIMP_BUILD_SHARED_LIBS)
-    if(WIN32)
-      # Handle MinGW compiler.
-      set(sharedLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@@CMAKE_STATIC_LIBRARY_SUFFIX@")
-    elseif(APPLE)
-      set(sharedLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@.@ASSIMP_VERSION_MAJOR@@CMAKE_SHARED_LIBRARY_SUFFIX@")
-    else()
-      set(sharedLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@.@ASSIMP_VERSION_MAJOR@")
-    endif()
-
-    # Import target "assimp::assimp" for configuration "Debug"
-    set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
-    set_target_properties(assimp::assimp PROPERTIES
-      IMPORTED_SONAME_DEBUG "${sharedLibraryName}"
-      IMPORTED_LOCATION_DEBUG "@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}"
-    )
-    list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
-    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}" )
-  else()
-    set(staticLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_STATIC_LIBRARY_SUFFIX@")
-
-    # Import target "assimp::assimp" for configuration "Debug"
-    set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
-    set_target_properties(assimp::assimp PROPERTIES
-      IMPORTED_LOCATION_DEBUG "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}"
-    )
-    list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
-    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}" )
-  endif()
-endif()
-
-# Commands beyond this point should not need to know the version.
-set(CMAKE_IMPORT_FILE_VERSION)
-
-get_filename_component(ASSIMP_ROOT_DIR "@CMAKE_INSTALL_PREFIX@" REALPATH)
-set( ASSIMP_CXX_FLAGS ) # dynamically linked library
-set( ASSIMP_LINK_FLAGS "" )
-set( ASSIMP_LIBRARY_DIRS "${ASSIMP_ROOT_DIR}/@ASSIMP_LIB_INSTALL_DIR@")
-set( ASSIMP_INCLUDE_DIRS "${ASSIMP_ROOT_DIR}/@ASSIMP_INCLUDE_INSTALL_DIR@")
-if(ASSIMP_BUILD_SHARED_LIBS)
-  set( ASSIMP_LIBRARIES ${sharedLibraryName})
-else()
-  set( ASSIMP_LIBRARIES ${staticLibraryName})
-endif()
-
-# for compatibility with pkg-config
-set(ASSIMP_CFLAGS_OTHER "${ASSIMP_CXX_FLAGS}")
-set(ASSIMP_LDFLAGS_OTHER "${ASSIMP_LINK_FLAGS}")
-
-MARK_AS_ADVANCED(
-  ASSIMP_ROOT_DIR
-  ASSIMP_CXX_FLAGS
-  ASSIMP_LINK_FLAGS
-  ASSIMP_INCLUDE_DIRS
-  ASSIMP_LIBRARIES
-  ASSIMP_CFLAGS_OTHER
-  ASSIMP_LDFLAGS_OTHER
-  ASSIMP_LIBRARY_SUFFIX
-  ASSIMP_BUILD_SHARED_LIBS
-)
diff --git a/assimpTargets-release.cmake.in b/assimpTargets-release.cmake.in
deleted file mode 100644
index c716006dd..000000000
--- a/assimpTargets-release.cmake.in
+++ /dev/null
@@ -1,127 +0,0 @@
-#----------------------------------------------------------------
-# Generated CMake target import file for configuration "Release".
-#----------------------------------------------------------------
-
-# Commands may need to know the format version.
-set(CMAKE_IMPORT_FILE_VERSION 1)
-
-set(ASSIMP_BUILD_SHARED_LIBS @BUILD_SHARED_LIBS@)
-
-get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
-
-if(MSVC)
-  if(MSVC_TOOLSET_VERSION)
-    set(MSVC_PREFIX "vc${MSVC_TOOLSET_VERSION}")
-  else()
-    if( MSVC70 OR MSVC71 )
-      set(MSVC_PREFIX "vc70")
-    elseif( MSVC80 )
-      set(MSVC_PREFIX "vc80")
-    elseif( MSVC90 )
-      set(MSVC_PREFIX "vc90")
-    elseif( MSVC10 )
-      set(MSVC_PREFIX "vc100")
-    elseif( MSVC11 )
-      set(MSVC_PREFIX "vc110")
-    elseif( MSVC12 )
-      set(MSVC_PREFIX "vc120")
-    elseif( MSVC_VERSION LESS 1910)
-      set(MSVC_PREFIX "vc140")
-    elseif( MSVC_VERSION LESS 1920)
-      set(MSVC_PREFIX "vc141")
-    elseif( MSVC_VERSION LESS 1930)
-      set(MSVC_PREFIX "vc142")
-    else()
-      set(MSVC_PREFIX "vc150")
-    endif()
-  endif()
-  set(ASSIMP_LIBRARY_SUFFIX "@ASSIMP_LIBRARY_SUFFIX@-${MSVC_PREFIX}-mt" CACHE STRING "the suffix for the assimp windows library" )
-
-  if(ASSIMP_BUILD_SHARED_LIBS)
-    set(sharedLibraryName "assimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_SHARED_LIBRARY_SUFFIX@")
-    set(importLibraryName "assimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_IMPORT_LIBRARY_SUFFIX@")
-
-    # Import target "assimp::assimp" for configuration "Release"
-    set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
-    set_target_properties(assimp::assimp PROPERTIES
-      IMPORTED_IMPLIB_RELEASE "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}"
-      IMPORTED_LOCATION_RELEASE "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}"
-    )
-    list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
-    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}")
-    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}" )
-  else()
-    set(staticLibraryName "assimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_STATIC_LIBRARY_SUFFIX@")
-
-    # Import target "assimp::assimp" for configuration "Release"
-    set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
-    set_target_properties(assimp::assimp PROPERTIES
-      IMPORTED_LOCATION_RELEASE "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}"
-    )
-    list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
-    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}")
-  endif()
-
-else()
-  set(ASSIMP_LIBRARY_SUFFIX "@ASSIMP_LIBRARY_SUFFIX@" CACHE STRING "the suffix for the assimp libraries" )
-  if(ASSIMP_BUILD_SHARED_LIBS)
-    if(WIN32)
-      # Handle MinGW compiler.
-      set(sharedLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@@CMAKE_STATIC_LIBRARY_SUFFIX@")
-    elseif(APPLE)
-      set(sharedLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}.@ASSIMP_VERSION_MAJOR@@CMAKE_SHARED_LIBRARY_SUFFIX@")
-    else()
-      set(sharedLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_SHARED_LIBRARY_SUFFIX@.@ASSIMP_VERSION_MAJOR@")
-    endif()
-
-    # Import target "assimp::assimp" for configuration "Release"
-    set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
-    set_target_properties(assimp::assimp PROPERTIES
-      IMPORTED_SONAME_RELEASE "${sharedLibraryName}"
-      IMPORTED_LOCATION_RELEASE "@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}"
-    )
-    list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
-    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}" )
-  else()
-    set(staticLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_STATIC_LIBRARY_SUFFIX@")
-
-    # Import target "assimp::assimp" for configuration "Release"
-    set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
-    set_target_properties(assimp::assimp PROPERTIES
-      IMPORTED_LOCATION_RELEASE "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}"
-    )
-    list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
-    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}" )
-  endif()
-endif()
-
-# Commands beyond this point should not need to know the version.
-set(CMAKE_IMPORT_FILE_VERSION)
-
-get_filename_component(ASSIMP_ROOT_DIR "@CMAKE_INSTALL_PREFIX@" REALPATH)
-
-set( ASSIMP_CXX_FLAGS ) # dynamically linked library
-set( ASSIMP_LINK_FLAGS "" )
-set( ASSIMP_LIBRARY_DIRS "${ASSIMP_ROOT_DIR}/@ASSIMP_LIB_INSTALL_DIR@")
-set( ASSIMP_INCLUDE_DIRS "${ASSIMP_ROOT_DIR}/@ASSIMP_INCLUDE_INSTALL_DIR@")
-if(ASSIMP_BUILD_SHARED_LIBS)
-  set( ASSIMP_LIBRARIES ${sharedLibraryName})
-else()
-  set( ASSIMP_LIBRARIES ${staticLibraryName})
-endif()
-
-# for compatibility with pkg-config
-set(ASSIMP_CFLAGS_OTHER "${ASSIMP_CXX_FLAGS}")
-set(ASSIMP_LDFLAGS_OTHER "${ASSIMP_LINK_FLAGS}")
-
-MARK_AS_ADVANCED(
-  ASSIMP_ROOT_DIR
-  ASSIMP_CXX_FLAGS
-  ASSIMP_LINK_FLAGS
-  ASSIMP_INCLUDE_DIRS
-  ASSIMP_LIBRARIES
-  ASSIMP_CFLAGS_OTHER
-  ASSIMP_LDFLAGS_OTHER
-  ASSIMP_LIBRARY_SUFFIX
-  ASSIMP_BUILD_SHARED_LIBS
-)
diff --git a/assimpTargets.cmake.in b/assimpTargets.cmake.in
deleted file mode 100644
index 897d00217..000000000
--- a/assimpTargets.cmake.in
+++ /dev/null
@@ -1,91 +0,0 @@
-# Generated by CMake
-
-if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5)
-   message(FATAL_ERROR "CMake >= 2.6.0 required")
-endif()
-cmake_policy(PUSH)
-cmake_policy(VERSION 2.6)
-# Required for the evaluation of "if(@BUILD_SHARED_LIBS@)" below to function
-cmake_policy(SET CMP0012 NEW)
-
-#----------------------------------------------------------------
-# Generated CMake target import file.
-#----------------------------------------------------------------
-
-# Commands may need to know the format version.
-set(CMAKE_IMPORT_FILE_VERSION 1)
-
-# Protect against multiple inclusion, which would fail when already imported targets are added once more.
-set(_targetsDefined)
-set(_targetsNotDefined)
-set(_expectedTargets)
-foreach(_expectedTarget assimp::assimp)
-  list(APPEND _expectedTargets ${_expectedTarget})
-  if(NOT TARGET ${_expectedTarget})
-    list(APPEND _targetsNotDefined ${_expectedTarget})
-  endif()
-  if(TARGET ${_expectedTarget})
-    list(APPEND _targetsDefined ${_expectedTarget})
-  endif()
-endforeach()
-if("${_targetsDefined}" STREQUAL "${_expectedTargets}")
-  unset(_targetsDefined)
-  unset(_targetsNotDefined)
-  unset(_expectedTargets)
-  set(CMAKE_IMPORT_FILE_VERSION)
-  cmake_policy(POP)
-  return()
-endif()
-if(NOT "${_targetsDefined}" STREQUAL "")
-  message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_targetsDefined}\nTargets not yet defined: ${_targetsNotDefined}\n")
-endif()
-unset(_targetsDefined)
-unset(_targetsNotDefined)
-unset(_expectedTargets)
-
-# Create imported target assimp::assimp
-add_library(assimp::assimp @BUILD_LIB_TYPE@ IMPORTED)
-
-set_target_properties(assimp::assimp PROPERTIES
-  COMPATIBLE_INTERFACE_STRING "assimp_MAJOR_VERSION"
-  INTERFACE_assimp_MAJOR_VERSION "1"
-  INTERFACE_INCLUDE_DIRECTORIES "@CMAKE_INSTALL_FULL_INCLUDEDIR@"
-  #INTERFACE_LINK_LIBRARIES "TxtUtils::TxtUtils;MealyMachine::MealyMachine"
-)
-
-if(CMAKE_VERSION VERSION_LESS 2.8.12)
-  message(FATAL_ERROR "This file relies on consumers using CMake 2.8.12 or greater.")
-endif()
-
-# Load information for each installed configuration.
-get_filename_component(_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-file(GLOB CONFIG_FILES "${_DIR}/assimpTargets-*.cmake")
-foreach(f ${CONFIG_FILES})
-  include(${f})
-endforeach()
-
-# Loop over all imported files and verify that they actually exist
-foreach(target ${_IMPORT_CHECK_TARGETS} )
-  foreach(file ${_IMPORT_CHECK_FILES_FOR_${target}} )
-    if(NOT EXISTS "${file}" )
-      message(FATAL_ERROR "The imported target \"${target}\" references the file
-   \"${file}\"
-but this file does not exist.  Possible reasons include:
-* The file was deleted, renamed, or moved to another location.
-* An install or uninstall procedure did not complete successfully.
-* The installation package was faulty and contained
-   \"${CMAKE_CURRENT_LIST_FILE}\"
-but not all the files it references.
-")
-    endif()
-  endforeach()
-  unset(_IMPORT_CHECK_FILES_FOR_${target})
-endforeach()
-unset(_IMPORT_CHECK_TARGETS)
-
-# This file does not depend on other imported targets which have
-# been exported from the same project but in a separate export set.
-
-# Commands beyond this point should not need to know the version.
-set(CMAKE_IMPORT_FILE_VERSION)
-cmake_policy(POP)
diff --git a/cmake-modules/FindRT.cmake b/cmake-modules/FindRT.cmake
index 17d5df81d..c397acabd 100644
--- a/cmake-modules/FindRT.cmake
+++ b/cmake-modules/FindRT.cmake
@@ -16,5 +16,5 @@ set(RT_LIBRARIES ${RT_LIBRARY})
 # handle the QUIETLY and REQUIRED arguments and set
 # RT_FOUND to TRUE if all listed variables are TRUE
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(rt DEFAULT_MSG RT_LIBRARY)
+find_package_handle_standard_args(RT DEFAULT_MSG RT_LIBRARY)
 mark_as_advanced(RT_LIBRARY)
diff --git a/cmake/HunterGate.cmake b/cmake/HunterGate.cmake
index 887557a58..6d9cc2401 100644
--- a/cmake/HunterGate.cmake
+++ b/cmake/HunterGate.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2018, Ruslan Baratov
+# Copyright (c) 2013-2019, Ruslan Baratov
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -60,7 +60,7 @@ option(HUNTER_STATUS_PRINT "Print working status" ON)
 option(HUNTER_STATUS_DEBUG "Print a lot info" OFF)
 option(HUNTER_TLS_VERIFY "Enable/disable TLS certificate checking on downloads" ON)
 
-set(HUNTER_WIKI "https://github.com/ruslo/hunter/wiki")
+set(HUNTER_ERROR_PAGE "https://docs.hunter.sh/en/latest/reference/errors")
 
 function(hunter_gate_status_print)
   if(HUNTER_STATUS_PRINT OR HUNTER_STATUS_DEBUG)
@@ -79,9 +79,9 @@ function(hunter_gate_status_debug)
   endif()
 endfunction()
 
-function(hunter_gate_wiki wiki_page)
-  message("------------------------------ WIKI -------------------------------")
-  message("    ${HUNTER_WIKI}/${wiki_page}")
+function(hunter_gate_error_page error_page)
+  message("------------------------------ ERROR ------------------------------")
+  message("    ${HUNTER_ERROR_PAGE}/${error_page}.html")
   message("-------------------------------------------------------------------")
   message("")
   message(FATAL_ERROR "")
@@ -94,14 +94,13 @@ function(hunter_gate_internal_error)
   endforeach()
   message("[hunter ** INTERNAL **] [Directory:${CMAKE_CURRENT_LIST_DIR}]")
   message("")
-  hunter_gate_wiki("error.internal")
+  hunter_gate_error_page("error.internal")
 endfunction()
 
 function(hunter_gate_fatal_error)
-  cmake_parse_arguments(hunter "" "WIKI" "" "${ARGV}")
-  string(COMPARE EQUAL "${hunter_WIKI}" "" have_no_wiki)
-  if(have_no_wiki)
-    hunter_gate_internal_error("Expected wiki")
+  cmake_parse_arguments(hunter "" "ERROR_PAGE" "" "${ARGV}")
+  if("${hunter_ERROR_PAGE}" STREQUAL "")
+    hunter_gate_internal_error("Expected ERROR_PAGE")
   endif()
   message("")
   foreach(x ${hunter_UNPARSED_ARGUMENTS})
@@ -109,11 +108,11 @@ function(hunter_gate_fatal_error)
   endforeach()
   message("[hunter ** FATAL ERROR **] [Directory:${CMAKE_CURRENT_LIST_DIR}]")
   message("")
-  hunter_gate_wiki("${hunter_WIKI}")
+  hunter_gate_error_page("${hunter_ERROR_PAGE}")
 endfunction()
 
 function(hunter_gate_user_error)
-  hunter_gate_fatal_error(${ARGV} WIKI "error.incorrect.input.data")
+  hunter_gate_fatal_error(${ARGV} ERROR_PAGE "error.incorrect.input.data")
 endfunction()
 
 function(hunter_gate_self root version sha1 result)
@@ -195,7 +194,7 @@ function(hunter_gate_detect_root)
 
   hunter_gate_fatal_error(
       "Can't detect HUNTER_ROOT"
-      WIKI "error.detect.hunter.root"
+      ERROR_PAGE "error.detect.hunter.root"
   )
 endfunction()
 
@@ -214,7 +213,7 @@ function(hunter_gate_download dir)
         "Settings:"
         "  HUNTER_ROOT: ${HUNTER_GATE_ROOT}"
         "  HUNTER_SHA1: ${HUNTER_GATE_SHA1}"
-        WIKI "error.run.install"
+        ERROR_PAGE "error.run.install"
     )
   endif()
   string(COMPARE EQUAL "${dir}" "" is_bad)
@@ -400,7 +399,7 @@ macro(HunterGate)
       hunter_gate_fatal_error(
           "Please set HunterGate *before* 'project' command. "
           "Detected project: ${PROJECT_NAME}"
-          WIKI "error.huntergate.before.project"
+          ERROR_PAGE "error.huntergate.before.project"
       )
     endif()
 
@@ -470,7 +469,7 @@ macro(HunterGate)
             "HUNTER_ROOT (${HUNTER_GATE_ROOT}) contains spaces."
             "Set HUNTER_ALLOW_SPACES_IN_PATH=ON to skip this error"
             "(Use at your own risk!)"
-            WIKI "error.spaces.in.hunter.root"
+            ERROR_PAGE "error.spaces.in.hunter.root"
         )
       endif()
     endif()
diff --git a/cmake/assimp-hunter-config.cmake.in b/cmake/assimp-hunter-config.cmake.in
index 34762ac54..b5283f4fb 100644
--- a/cmake/assimp-hunter-config.cmake.in
+++ b/cmake/assimp-hunter-config.cmake.in
@@ -2,13 +2,13 @@
 
 find_package(RapidJSON CONFIG REQUIRED)
 find_package(ZLIB CONFIG REQUIRED)
-find_package(utf8 CONFIG REQUIRED)
-find_package(irrXML CONFIG REQUIRED)
+find_package(utf8cpp CONFIG REQUIRED)
 find_package(minizip CONFIG REQUIRED)
 find_package(openddlparser CONFIG REQUIRED)
 find_package(poly2tri CONFIG REQUIRED)
 find_package(polyclipping CONFIG REQUIRED)
 find_package(zip CONFIG REQUIRED)
+find_package(pugixml CONFIG REQUIRED)
 
 include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake")
 check_required_components("@PROJECT_NAME@")
diff --git a/cmake/assimp-plain-config.cmake.in b/cmake/assimp-plain-config.cmake.in
new file mode 100644
index 000000000..6551dcb68
--- /dev/null
+++ b/cmake/assimp-plain-config.cmake.in
@@ -0,0 +1,9 @@
+@PACKAGE_INIT@
+
+include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake")
+
+set(ASSIMP_ROOT_DIR ${PACKAGE_PREFIX_DIR})
+set(ASSIMP_LIBRARIES assimp::assimp)
+set(ASSIMP_BUILD_SHARED_LIBS @BUILD_SHARED_LIBS@)
+get_property(ASSIMP_INCLUDE_DIRS TARGET assimp::assimp PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
+set(ASSIMP_LIBRARY_DIRS "")
diff --git a/code/AMF/AMFImporter.cpp b/code/AMF/AMFImporter.cpp
deleted file mode 100644
index d93ca54cf..000000000
--- a/code/AMF/AMFImporter.cpp
+++ /dev/null
@@ -1,707 +0,0 @@
-/*
----------------------------------------------------------------------------
-Open Asset Import Library (assimp)
----------------------------------------------------------------------------
-
-Copyright (c) 2006-2020, assimp team
-
-
-
-All rights reserved.
-
-Redistribution and use of this software in source and binary forms,
-with or without modification, are permitted provided that the following
-conditions are met:
-
-* Redistributions of source code must retain the above
-copyright notice, this list of conditions and the
-following disclaimer.
-
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the
-following disclaimer in the documentation and/or other
-materials provided with the distribution.
-
-* Neither the name of the assimp team, nor the names of its
-contributors may be used to endorse or promote products
-derived from this software without specific prior
-written permission of the assimp team.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
----------------------------------------------------------------------------
-*/
-
-/// \file AMFImporter.cpp
-/// \brief AMF-format files importer for Assimp: main algorithm implementation.
-/// \date 2016
-/// \author smal.root@gmail.com
-
-#ifndef ASSIMP_BUILD_NO_AMF_IMPORTER
-
-// Header files, Assimp.
-#include "AMFImporter.hpp"
-#include "AMFImporter_Macro.hpp"
-
-#include <assimp/fast_atof.h>
-#include <assimp/DefaultIOSystem.h>
-
-// Header files, stdlib.
-#include <memory>
-
-namespace Assimp
-{
-
-/// \var aiImporterDesc AMFImporter::Description
-/// Conastant which hold importer description
-const aiImporterDesc AMFImporter::Description = {
-	"Additive manufacturing file format(AMF) Importer",
-	"smalcom",
-	"",
-	"See documentation in source code. Chapter: Limitations.",
-	aiImporterFlags_SupportTextFlavour | aiImporterFlags_LimitedSupport | aiImporterFlags_Experimental,
-	0,
-	0,
-	0,
-	0,
-	"amf"
-};
-
-void AMFImporter::Clear()
-{
-	mNodeElement_Cur = nullptr;
-	mUnit.clear();
-	mMaterial_Converted.clear();
-	mTexture_Converted.clear();
-	// Delete all elements
-	if(!mNodeElement_List.empty())
-	{
-		for(CAMFImporter_NodeElement* ne: mNodeElement_List) { delete ne; }
-
-		mNodeElement_List.clear();
-	}
-}
-
-AMFImporter::~AMFImporter()
-{
-	if(mReader != nullptr) delete mReader;
-	// Clear() is accounting if data already is deleted. So, just check again if all data is deleted.
-	Clear();
-}
-
-/*********************************************************************************************************************************************/
-/************************************************************ Functions: find set ************************************************************/
-/*********************************************************************************************************************************************/
-
-bool AMFImporter::Find_NodeElement(const std::string& pID, const CAMFImporter_NodeElement::EType pType, CAMFImporter_NodeElement** pNodeElement) const
-{
-	for(CAMFImporter_NodeElement* ne: mNodeElement_List)
-	{
-		if((ne->ID == pID) && (ne->Type == pType))
-		{
-			if(pNodeElement != nullptr) *pNodeElement = ne;
-
-			return true;
-		}
-	}// for(CAMFImporter_NodeElement* ne: mNodeElement_List)
-
-	return false;
-}
-
-bool AMFImporter::Find_ConvertedNode(const std::string& pID, std::list<aiNode*>& pNodeList, aiNode** pNode) const
-{
-aiString node_name(pID.c_str());
-
-	for(aiNode* node: pNodeList)
-	{
-		if(node->mName == node_name)
-		{
-			if(pNode != nullptr) *pNode = node;
-
-			return true;
-		}
-	}// for(aiNode* node: pNodeList)
-
-	return false;
-}
-
-bool AMFImporter::Find_ConvertedMaterial(const std::string& pID, const SPP_Material** pConvertedMaterial) const
-{
-	for(const SPP_Material& mat: mMaterial_Converted)
-	{
-		if(mat.ID == pID)
-		{
-			if(pConvertedMaterial != nullptr) *pConvertedMaterial = &mat;
-
-			return true;
-		}
-	}// for(const SPP_Material& mat: mMaterial_Converted)
-
-	return false;
-}
-
-/*********************************************************************************************************************************************/
-/************************************************************ Functions: throw set ***********************************************************/
-/*********************************************************************************************************************************************/
-
-void AMFImporter::Throw_CloseNotFound(const std::string& pNode)
-{
-	throw DeadlyImportError("Close tag for node <" + pNode + "> not found. Seems file is corrupt.");
-}
-
-void AMFImporter::Throw_IncorrectAttr(const std::string& pAttrName)
-{
-	throw DeadlyImportError("Node <" + std::string(mReader->getNodeName()) + "> has incorrect attribute \"" + pAttrName + "\".");
-}
-
-void AMFImporter::Throw_IncorrectAttrValue(const std::string& pAttrName)
-{
-	throw DeadlyImportError("Attribute \"" + pAttrName + "\" in node <" + std::string(mReader->getNodeName()) + "> has incorrect value.");
-}
-
-void AMFImporter::Throw_MoreThanOnceDefined(const std::string& pNodeType, const std::string& pDescription)
-{
-	throw DeadlyImportError("\"" + pNodeType + "\" node can be used only once in " + mReader->getNodeName() + ". Description: " + pDescription);
-}
-
-void AMFImporter::Throw_ID_NotFound(const std::string& pID) const
-{
-	throw DeadlyImportError("Not found node with name \"" + pID + "\".");
-}
-
-/*********************************************************************************************************************************************/
-/************************************************************* Functions: XML set ************************************************************/
-/*********************************************************************************************************************************************/
-
-void AMFImporter::XML_CheckNode_MustHaveChildren()
-{
-	if(mReader->isEmptyElement()) throw DeadlyImportError(std::string("Node <") + mReader->getNodeName() + "> must have children.");
-}
-
-void AMFImporter::XML_CheckNode_SkipUnsupported(const std::string& pParentNodeName)
-{
-    static const size_t Uns_Skip_Len = 3;
-    const char* Uns_Skip[Uns_Skip_Len] = { "composite", "edge", "normal" };
-
-    static bool skipped_before[Uns_Skip_Len] = { false, false, false };
-
-    std::string nn(mReader->getNodeName());
-    bool found = false;
-    bool close_found = false;
-    size_t sk_idx;
-
-	for(sk_idx = 0; sk_idx < Uns_Skip_Len; sk_idx++)
-	{
-		if(nn != Uns_Skip[sk_idx]) continue;
-
-		found = true;
-		if(mReader->isEmptyElement())
-		{
-			close_found = true;
-
-			goto casu_cres;
-		}
-
-		while(mReader->read())
-		{
-			if((mReader->getNodeType() == irr::io::EXN_ELEMENT_END) && (nn == mReader->getNodeName()))
-			{
-				close_found = true;
-
-				goto casu_cres;
-			}
-		}
-	}// for(sk_idx = 0; sk_idx < Uns_Skip_Len; sk_idx++)
-
-casu_cres:
-
-	if(!found) throw DeadlyImportError("Unknown node \"" + nn + "\" in " + pParentNodeName + ".");
-	if(!close_found) Throw_CloseNotFound(nn);
-
-	if(!skipped_before[sk_idx])
-	{
-		skipped_before[sk_idx] = true;
-        ASSIMP_LOG_WARN_F("Skipping node \"", nn, "\" in ", pParentNodeName, ".");
-	}
-}
-
-bool AMFImporter::XML_SearchNode(const std::string& pNodeName)
-{
-	while(mReader->read())
-	{
-		if((mReader->getNodeType() == irr::io::EXN_ELEMENT) && XML_CheckNode_NameEqual(pNodeName)) return true;
-	}
-
-	return false;
-}
-
-bool AMFImporter::XML_ReadNode_GetAttrVal_AsBool(const int pAttrIdx)
-{
-    std::string val(mReader->getAttributeValue(pAttrIdx));
-
-	if((val == "false") || (val == "0"))
-		return false;
-	else if((val == "true") || (val == "1"))
-		return true;
-	else
-		throw DeadlyImportError("Bool attribute value can contain \"false\"/\"0\" or \"true\"/\"1\" not the \"" + val + "\"");
-}
-
-float AMFImporter::XML_ReadNode_GetAttrVal_AsFloat(const int pAttrIdx)
-{
-    std::string val;
-    float tvalf;
-
-	ParseHelper_FixTruncatedFloatString(mReader->getAttributeValue(pAttrIdx), val);
-	fast_atoreal_move(val.c_str(), tvalf, false);
-
-	return tvalf;
-}
-
-uint32_t AMFImporter::XML_ReadNode_GetAttrVal_AsU32(const int pAttrIdx)
-{
-	return strtoul10(mReader->getAttributeValue(pAttrIdx));
-}
-
-float AMFImporter::XML_ReadNode_GetVal_AsFloat()
-{
-    std::string val;
-    float tvalf;
-
-	if(!mReader->read()) throw DeadlyImportError("XML_ReadNode_GetVal_AsFloat. No data, seems file is corrupt.");
-	if(mReader->getNodeType() != irr::io::EXN_TEXT) throw DeadlyImportError("XML_ReadNode_GetVal_AsFloat. Invalid type of XML element, seems file is corrupt.");
-
-	ParseHelper_FixTruncatedFloatString(mReader->getNodeData(), val);
-	fast_atoreal_move(val.c_str(), tvalf, false);
-
-	return tvalf;
-}
-
-uint32_t AMFImporter::XML_ReadNode_GetVal_AsU32()
-{
-	if(!mReader->read()) throw DeadlyImportError("XML_ReadNode_GetVal_AsU32. No data, seems file is corrupt.");
-	if(mReader->getNodeType() != irr::io::EXN_TEXT) throw DeadlyImportError("XML_ReadNode_GetVal_AsU32. Invalid type of XML element, seems file is corrupt.");
-
-	return strtoul10(mReader->getNodeData());
-}
-
-void AMFImporter::XML_ReadNode_GetVal_AsString(std::string& pValue)
-{
-	if(!mReader->read()) throw DeadlyImportError("XML_ReadNode_GetVal_AsString. No data, seems file is corrupt.");
-	if(mReader->getNodeType() != irr::io::EXN_TEXT)
-		throw DeadlyImportError("XML_ReadNode_GetVal_AsString. Invalid type of XML element, seems file is corrupt.");
-
-	pValue = mReader->getNodeData();
-}
-
-/*********************************************************************************************************************************************/
-/************************************************************ Functions: parse set ***********************************************************/
-/*********************************************************************************************************************************************/
-
-void AMFImporter::ParseHelper_Node_Enter(CAMFImporter_NodeElement* pNode)
-{
-	mNodeElement_Cur->Child.push_back(pNode);// add new element to current element child list.
-	mNodeElement_Cur = pNode;// switch current element to new one.
-}
-
-void AMFImporter::ParseHelper_Node_Exit()
-{
-	// check if we can walk up.
-	if(mNodeElement_Cur != nullptr) mNodeElement_Cur = mNodeElement_Cur->Parent;
-}
-
-void AMFImporter::ParseHelper_FixTruncatedFloatString(const char* pInStr, std::string& pOutString)
-{
-    size_t instr_len;
-
-	pOutString.clear();
-	instr_len = strlen(pInStr);
-	if(!instr_len) return;
-
-	pOutString.reserve(instr_len * 3 / 2);
-	// check and correct floats in format ".x". Must be "x.y".
-	if(pInStr[0] == '.') pOutString.push_back('0');
-
-	pOutString.push_back(pInStr[0]);
-	for(size_t ci = 1; ci < instr_len; ci++)
-	{
-		if((pInStr[ci] == '.') && ((pInStr[ci - 1] == ' ') || (pInStr[ci - 1] == '-') || (pInStr[ci - 1] == '+') || (pInStr[ci - 1] == '\t')))
-		{
-			pOutString.push_back('0');
-			pOutString.push_back('.');
-		}
-		else
-		{
-			pOutString.push_back(pInStr[ci]);
-		}
-	}
-}
-
-static bool ParseHelper_Decode_Base64_IsBase64(const char pChar)
-{
-	return (isalnum(pChar) || (pChar == '+') || (pChar == '/'));
-}
-
-void AMFImporter::ParseHelper_Decode_Base64(const std::string& pInputBase64, std::vector<uint8_t>& pOutputData) const
-{
-    // With help from
-    // René Nyffenegger http://www.adp-gmbh.ch/cpp/common/base64.html
-    const std::string base64_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-    uint8_t tidx = 0;
-    uint8_t arr4[4], arr3[3];
-
-	// check input data
-	if(pInputBase64.size() % 4) throw DeadlyImportError("Base64-encoded data must have size multiply of four.");
-	// prepare output place
-	pOutputData.clear();
-	pOutputData.reserve(pInputBase64.size() / 4 * 3);
-
-	for(size_t in_len = pInputBase64.size(), in_idx = 0; (in_len > 0) && (pInputBase64[in_idx] != '='); in_len--)
-	{
-		if(ParseHelper_Decode_Base64_IsBase64(pInputBase64[in_idx]))
-		{
-			arr4[tidx++] = pInputBase64[in_idx++];
-			if(tidx == 4)
-			{
-				for(tidx = 0; tidx < 4; tidx++) arr4[tidx] = (uint8_t)base64_chars.find(arr4[tidx]);
-
-				arr3[0] = (arr4[0] << 2) + ((arr4[1] & 0x30) >> 4);
-				arr3[1] = ((arr4[1] & 0x0F) << 4) + ((arr4[2] & 0x3C) >> 2);
-				arr3[2] = ((arr4[2] & 0x03) << 6) + arr4[3];
-				for(tidx = 0; tidx < 3; tidx++) pOutputData.push_back(arr3[tidx]);
-
-				tidx = 0;
-			}// if(tidx == 4)
-		}// if(ParseHelper_Decode_Base64_IsBase64(pInputBase64[in_idx]))
-		else
-		{
-			in_idx++;
-		}// if(ParseHelper_Decode_Base64_IsBase64(pInputBase64[in_idx])) else
-	}
-
-	if(tidx)
-	{
-		for(uint8_t i = tidx; i < 4; i++) arr4[i] = 0;
-		for(uint8_t i = 0; i < 4; i++) arr4[i] = (uint8_t)(base64_chars.find(arr4[i]));
-
-		arr3[0] = (arr4[0] << 2) + ((arr4[1] & 0x30) >> 4);
-		arr3[1] = ((arr4[1] & 0x0F) << 4) + ((arr4[2] & 0x3C) >> 2);
-		arr3[2] = ((arr4[2] & 0x03) << 6) + arr4[3];
-		for(uint8_t i = 0; i < (tidx - 1); i++) pOutputData.push_back(arr3[i]);
-	}
-}
-
-void AMFImporter::ParseFile(const std::string& pFile, IOSystem* pIOHandler)
-{
-    irr::io::IrrXMLReader* OldReader = mReader;// store current XMLreader.
-    std::unique_ptr<IOStream> file(pIOHandler->Open(pFile, "rb"));
-
-	// Check whether we can read from the file
-    if (file.get() == nullptr) {
-        throw DeadlyImportError("Failed to open AMF file " + pFile + ".");
-    }
-
-	// generate a XML reader for it
-	std::unique_ptr<CIrrXML_IOStreamReader> mIOWrapper(new CIrrXML_IOStreamReader(file.get()));
-	mReader = irr::io::createIrrXMLReader(mIOWrapper.get());
-	if(!mReader) throw DeadlyImportError("Failed to create XML reader for file" + pFile + ".");
-	//
-	// start reading
-	// search for root tag <amf>
-	if(XML_SearchNode("amf"))
-		ParseNode_Root();
-	else
-		throw DeadlyImportError("Root node \"amf\" not found.");
-
-	delete mReader;
-	// restore old XMLreader
-	mReader = OldReader;
-}
-
-// <amf
-// unit="" - The units to be used. May be "inch", "millimeter", "meter", "feet", or "micron".
-// version="" - Version of file format.
-// >
-// </amf>
-// Root XML element.
-// Multi elements - No.
-void AMFImporter::ParseNode_Root()
-{
-    std::string unit, version;
-    CAMFImporter_NodeElement *ne( nullptr );
-
-	// Read attributes for node <amf>.
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECK_RET("unit", unit, mReader->getAttributeValue);
-		MACRO_ATTRREAD_CHECK_RET("version", version, mReader->getAttributeValue);
-	MACRO_ATTRREAD_LOOPEND_WSKIP;
-
-	// Check attributes
-	if(!mUnit.empty())
-	{
-		if((mUnit != "inch") && (mUnit != "millimeter") && (mUnit != "meter") && (mUnit != "feet") && (mUnit != "micron")) Throw_IncorrectAttrValue("unit");
-	}
-
-	// create root node element.
-	ne = new CAMFImporter_NodeElement_Root(nullptr);
-	mNodeElement_Cur = ne;// set first "current" element
-	// and assign attribute's values
-	((CAMFImporter_NodeElement_Root*)ne)->Unit = unit;
-	((CAMFImporter_NodeElement_Root*)ne)->Version = version;
-
-	// Check for child nodes
-	if(!mReader->isEmptyElement())
-	{
-		MACRO_NODECHECK_LOOPBEGIN("amf");
-			if(XML_CheckNode_NameEqual("object")) { ParseNode_Object(); continue; }
-			if(XML_CheckNode_NameEqual("material")) { ParseNode_Material(); continue; }
-			if(XML_CheckNode_NameEqual("texture")) { ParseNode_Texture(); continue; }
-			if(XML_CheckNode_NameEqual("constellation")) { ParseNode_Constellation(); continue; }
-			if(XML_CheckNode_NameEqual("metadata")) { ParseNode_Metadata(); continue; }
-		MACRO_NODECHECK_LOOPEND("amf");
-		mNodeElement_Cur = ne;// force restore "current" element
-	}// if(!mReader->isEmptyElement())
-
-	mNodeElement_List.push_back(ne);// add to node element list because its a new object in graph.
-}
-
-// <constellation
-// id="" - The Object ID of the new constellation being defined.
-// >
-// </constellation>
-// A collection of objects or constellations with specific relative locations.
-// Multi elements - Yes.
-// Parent element - <amf>.
-void AMFImporter::ParseNode_Constellation()
-{
-    std::string id;
-    CAMFImporter_NodeElement* ne( nullptr );
-
-	// Read attributes for node <constellation>.
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECK_RET("id", id, mReader->getAttributeValue);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// create and if needed - define new grouping object.
-	ne = new CAMFImporter_NodeElement_Constellation(mNodeElement_Cur);
-
-	CAMFImporter_NodeElement_Constellation& als = *((CAMFImporter_NodeElement_Constellation*)ne);// alias for convenience
-
-	if(!id.empty()) als.ID = id;
-	// Check for child nodes
-	if(!mReader->isEmptyElement())
-	{
-		ParseHelper_Node_Enter(ne);
-		MACRO_NODECHECK_LOOPBEGIN("constellation");
-			if(XML_CheckNode_NameEqual("instance")) { ParseNode_Instance(); continue; }
-			if(XML_CheckNode_NameEqual("metadata")) { ParseNode_Metadata(); continue; }
-		MACRO_NODECHECK_LOOPEND("constellation");
-		ParseHelper_Node_Exit();
-	}// if(!mReader->isEmptyElement())
-	else
-	{
-		mNodeElement_Cur->Child.push_back(ne);// Add element to child list of current element
-	}// if(!mReader->isEmptyElement()) else
-
-	mNodeElement_List.push_back(ne);// and to node element list because its a new object in graph.
-}
-
-// <instance
-// objectid="" - The Object ID of the new constellation being defined.
-// >
-// </instance>
-// A collection of objects or constellations with specific relative locations.
-// Multi elements - Yes.
-// Parent element - <amf>.
-void AMFImporter::ParseNode_Instance()
-{
-    std::string objectid;
-    CAMFImporter_NodeElement* ne( nullptr );
-
-	// Read attributes for node <constellation>.
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECK_RET("objectid", objectid, mReader->getAttributeValue);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// used object id must be defined, check that.
-	if(objectid.empty()) throw DeadlyImportError("\"objectid\" in <instance> must be defined.");
-	// create and define new grouping object.
-	ne = new CAMFImporter_NodeElement_Instance(mNodeElement_Cur);
-
-	CAMFImporter_NodeElement_Instance& als = *((CAMFImporter_NodeElement_Instance*)ne);// alias for convenience
-
-	als.ObjectID = objectid;
-	// Check for child nodes
-	if(!mReader->isEmptyElement())
-	{
-		bool read_flag[6] = { false, false, false, false, false, false };
-
-		als.Delta.Set(0, 0, 0);
-		als.Rotation.Set(0, 0, 0);
-		ParseHelper_Node_Enter(ne);
-		MACRO_NODECHECK_LOOPBEGIN("instance");
-			MACRO_NODECHECK_READCOMP_F("deltax", read_flag[0], als.Delta.x);
-			MACRO_NODECHECK_READCOMP_F("deltay", read_flag[1], als.Delta.y);
-			MACRO_NODECHECK_READCOMP_F("deltaz", read_flag[2], als.Delta.z);
-			MACRO_NODECHECK_READCOMP_F("rx", read_flag[3], als.Rotation.x);
-			MACRO_NODECHECK_READCOMP_F("ry", read_flag[4], als.Rotation.y);
-			MACRO_NODECHECK_READCOMP_F("rz", read_flag[5], als.Rotation.z);
-		MACRO_NODECHECK_LOOPEND("instance");
-		ParseHelper_Node_Exit();
-		// also convert degrees to radians.
-		als.Rotation.x = AI_MATH_PI_F * als.Rotation.x / 180.0f;
-		als.Rotation.y = AI_MATH_PI_F * als.Rotation.y / 180.0f;
-		als.Rotation.z = AI_MATH_PI_F * als.Rotation.z / 180.0f;
-	}// if(!mReader->isEmptyElement())
-	else
-	{
-		mNodeElement_Cur->Child.push_back(ne);// Add element to child list of current element
-	}// if(!mReader->isEmptyElement()) else
-
-	mNodeElement_List.push_back(ne);// and to node element list because its a new object in graph.
-}
-
-// <object
-// id="" - A unique ObjectID for the new object being defined.
-// >
-// </object>
-// An object definition.
-// Multi elements - Yes.
-// Parent element - <amf>.
-void AMFImporter::ParseNode_Object()
-{
-    std::string id;
-    CAMFImporter_NodeElement* ne( nullptr );
-
-	// Read attributes for node <object>.
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECK_RET("id", id, mReader->getAttributeValue);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// create and if needed - define new geometry object.
-	ne = new CAMFImporter_NodeElement_Object(mNodeElement_Cur);
-
-	CAMFImporter_NodeElement_Object& als = *((CAMFImporter_NodeElement_Object*)ne);// alias for convenience
-
-	if(!id.empty()) als.ID = id;
-	// Check for child nodes
-	if(!mReader->isEmptyElement())
-	{
-		bool col_read = false;
-
-		ParseHelper_Node_Enter(ne);
-		MACRO_NODECHECK_LOOPBEGIN("object");
-			if(XML_CheckNode_NameEqual("color"))
-			{
-				// Check if color already defined for object.
-				if(col_read) Throw_MoreThanOnceDefined("color", "Only one color can be defined for <object>.");
-				// read data and set flag about it
-				ParseNode_Color();
-				col_read = true;
-
-				continue;
-			}
-
-			if(XML_CheckNode_NameEqual("mesh")) { ParseNode_Mesh(); continue; }
-			if(XML_CheckNode_NameEqual("metadata")) { ParseNode_Metadata(); continue; }
-		MACRO_NODECHECK_LOOPEND("object");
-		ParseHelper_Node_Exit();
-	}// if(!mReader->isEmptyElement())
-	else
-	{
-		mNodeElement_Cur->Child.push_back(ne);// Add element to child list of current element
-	}// if(!mReader->isEmptyElement()) else
-
-	mNodeElement_List.push_back(ne);// and to node element list because its a new object in graph.
-}
-
-// <metadata
-// type="" - The type of the attribute.
-// >
-// </metadata>
-// Specify additional information about an entity.
-// Multi elements - Yes.
-// Parent element - <amf>, <object>, <volume>, <material>, <vertex>.
-//
-// Reserved types are:
-// "Name" - The alphanumeric label of the entity, to be used by the interpreter if interacting with the user.
-// "Description" - A description of the content of the entity
-// "URL" - A link to an external resource relating to the entity
-// "Author" - Specifies the name(s) of the author(s) of the entity
-// "Company" - Specifying the company generating the entity
-// "CAD" - specifies the name of the originating CAD software and version
-// "Revision" - specifies the revision of the entity
-// "Tolerance" - specifies the desired manufacturing tolerance of the entity in entity's unit system
-// "Volume" - specifies the total volume of the entity, in the entity's unit system, to be used for verification (object and volume only)
-void AMFImporter::ParseNode_Metadata()
-{
-    std::string type, value;
-    CAMFImporter_NodeElement* ne( nullptr );
-
-	// read attribute
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECK_RET("type", type, mReader->getAttributeValue);
-	MACRO_ATTRREAD_LOOPEND;
-	// and value of node.
-	value = mReader->getNodeData();
-	// Create node element and assign read data.
-	ne = new CAMFImporter_NodeElement_Metadata(mNodeElement_Cur);
-	((CAMFImporter_NodeElement_Metadata*)ne)->Type = type;
-	((CAMFImporter_NodeElement_Metadata*)ne)->Value = value;
-	mNodeElement_Cur->Child.push_back(ne);// Add element to child list of current element
-	mNodeElement_List.push_back(ne);// and to node element list because its a new object in graph.
-}
-
-/*********************************************************************************************************************************************/
-/******************************************************** Functions: BaseImporter set ********************************************************/
-/*********************************************************************************************************************************************/
-
-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.length() || pCheckSig)
-	{
-		const char* tokens[] = { "<amf" };
-
-		return SearchFileHeaderForToken( pIOHandler, pFile, tokens, 1 );
-	}
-
-	return false;
-}
-
-void AMFImporter::GetExtensionList(std::set<std::string>& pExtensionList)
-{
-	pExtensionList.insert("amf");
-}
-
-const aiImporterDesc* AMFImporter::GetInfo () const
-{
-	return &Description;
-}
-
-void AMFImporter::InternReadFile(const std::string& pFile, aiScene* pScene, IOSystem* pIOHandler)
-{
-	Clear();// delete old graph.
-	ParseFile(pFile, pIOHandler);
-	Postprocess_BuildScene(pScene);
-	// scene graph is ready, exit.
-}
-
-}// namespace Assimp
-
-#endif // !ASSIMP_BUILD_NO_AMF_IMPORTER
diff --git a/code/AssetLib/3DS/3DSExporter.cpp b/code/AssetLib/3DS/3DSExporter.cpp
index fed96a51f..ad8e10afe 100644
--- a/code/AssetLib/3DS/3DSExporter.cpp
+++ b/code/AssetLib/3DS/3DSExporter.cpp
@@ -290,12 +290,18 @@ void Discreet3DSExporter::WriteMaterials() {
             ChunkWriter curChunk(writer, Discreet3DS::CHUNK_MAT_SPECULAR);
             WriteColor(color);
         }
-
+                
         if (mat.Get(AI_MATKEY_COLOR_AMBIENT, color) == AI_SUCCESS) {
             ChunkWriter curChunk(writer, Discreet3DS::CHUNK_MAT_AMBIENT);
             WriteColor(color);
         }
 
+        float f;
+        if (mat.Get(AI_MATKEY_OPACITY, f) == AI_SUCCESS) {
+            ChunkWriter chunk(writer, Discreet3DS::CHUNK_MAT_TRANSPARENCY);
+            WritePercentChunk(1.0f - f);
+        }
+
         if (mat.Get(AI_MATKEY_COLOR_EMISSIVE, color) == AI_SUCCESS) {
             ChunkWriter curChunk(writer, Discreet3DS::CHUNK_MAT_SELF_ILLUM);
             WriteColor(color);
@@ -333,7 +339,6 @@ void Discreet3DSExporter::WriteMaterials() {
             writer.PutU2(static_cast<uint16_t>(shading_mode_out));
         }
 
-        float f;
         if (mat.Get(AI_MATKEY_SHININESS, f) == AI_SUCCESS) {
             ChunkWriter chunk(writer, Discreet3DS::CHUNK_MAT_SHININESS);
             WritePercentChunk(f);
diff --git a/code/AssetLib/3DS/3DSHelper.h b/code/AssetLib/3DS/3DSHelper.h
index 89c15f5f2..a2be07874 100644
--- a/code/AssetLib/3DS/3DSHelper.h
+++ b/code/AssetLib/3DS/3DSHelper.h
@@ -321,9 +321,10 @@ public:
 struct Face : public FaceWithSmoothingGroup {
 };
 
-#ifdef _WIN32
+#ifdef _MSC_VER
+#pragma warning(push)
 #pragma warning(disable : 4315)
-#endif
+#endif // _MSC_VER
 
 // ---------------------------------------------------------------------------
 /** Helper structure representing a texture */
@@ -412,6 +413,10 @@ struct Texture {
 
 #include <assimp/Compiler/poppack1.h>
 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif // _MSC_VER
+
 // ---------------------------------------------------------------------------
 /** Helper structure representing a 3ds material */
 struct Material {
diff --git a/code/AssetLib/3DS/3DSLoader.cpp b/code/AssetLib/3DS/3DSLoader.cpp
index e1a6d0f89..4c24394fb 100644
--- a/code/AssetLib/3DS/3DSLoader.cpp
+++ b/code/AssetLib/3DS/3DSLoader.cpp
@@ -147,7 +147,7 @@ void Discreet3DSImporter::InternReadFile(const std::string &pFile,
 
     // We should have at least one chunk
     if (theStream.GetRemainingSize() < 16) {
-        throw DeadlyImportError("3DS file is either empty or corrupt: " + pFile);
+        throw DeadlyImportError("3DS file is either empty or corrupt: ", pFile);
     }
     this->stream = &theStream;
 
@@ -178,7 +178,7 @@ void Discreet3DSImporter::InternReadFile(const std::string &pFile,
     // file.
     for (auto &mesh : mScene->mMeshes) {
         if (mesh.mFaces.size() > 0 && mesh.mPositions.size() == 0) {
-            throw DeadlyImportError("3DS file contains faces but no vertices: " + pFile);
+            throw DeadlyImportError("3DS file contains faces but no vertices: ", pFile);
         }
         CheckIndices(mesh);
         MakeUnique(mesh);
diff --git a/code/AssetLib/3MF/3MFXmlTags.h b/code/AssetLib/3MF/3MFXmlTags.h
index 3f1fc01ed..49e19c658 100644
--- a/code/AssetLib/3MF/3MFXmlTags.h
+++ b/code/AssetLib/3MF/3MFXmlTags.h
@@ -4,7 +4,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -56,6 +55,8 @@ namespace XmlTag {
     static const std::string resources = "resources";
     static const std::string object = "object";
     static const std::string mesh = "mesh";
+    static const std::string components = "components";
+    static const std::string component = "component";
     static const std::string vertices = "vertices";
     static const std::string vertex = "vertex";
     static const std::string triangles = "triangles";
@@ -68,6 +69,7 @@ namespace XmlTag {
     static const std::string v3 = "v3";
     static const std::string id = "id";
     static const std::string pid = "pid";
+    static const std::string pindex = "pindex";
     static const std::string p1 = "p1";
     static const std::string name = "name";
     static const std::string type = "type";
diff --git a/code/AssetLib/3MF/D3MFExporter.cpp b/code/AssetLib/3MF/D3MFExporter.cpp
index 5b85d275b..b4e5d515c 100644
--- a/code/AssetLib/3MF/D3MFExporter.cpp
+++ b/code/AssetLib/3MF/D3MFExporter.cpp
@@ -4,7 +4,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -138,7 +137,7 @@ bool D3MFExporter::exportContentTypes() {
     mContentOutput << std::endl;
     mContentOutput << "</Types>";
     mContentOutput << std::endl;
-    exportContentTyp(XmlTag::CONTENT_TYPES_ARCHIVE);
+    zipContentType(XmlTag::CONTENT_TYPES_ARCHIVE);
 
     return true;
 }
@@ -163,7 +162,7 @@ bool D3MFExporter::exportRelations() {
     mRelOutput << "</Relationships>";
     mRelOutput << std::endl;
 
-    writeRelInfoToFile("_rels", ".rels");
+    zipRelInfo("_rels", ".rels");
     mRelOutput.flush();
 
     return true;
@@ -197,7 +196,7 @@ bool D3MFExporter::export3DModel() {
     info->type = XmlTag::PACKAGE_START_PART_RELATIONSHIP_TYPE;
     mRelations.push_back(info);
 
-    writeModelToArchive("3D", "3DModel.model");
+    zipModel("3D", "3DModel.model");
     mModelOutput.flush();
 
     return true;
@@ -358,42 +357,27 @@ void D3MFExporter::writeBuild() {
     mModelOutput << std::endl;
 }
 
-void D3MFExporter::exportContentTyp(const std::string &filename) {
-    if (nullptr == m_zipArchive) {
-        throw DeadlyExportError("3MF-Export: Zip archive not valid, nullptr.");
-    }
-    const std::string entry = filename;
-    zip_entry_open(m_zipArchive, entry.c_str());
-
-    const std::string &exportTxt(mContentOutput.str());
-    zip_entry_write(m_zipArchive, exportTxt.c_str(), exportTxt.size());
-
-    zip_entry_close(m_zipArchive);
+void D3MFExporter::zipContentType(const std::string &filename) {
+    addFileInZip(filename, mContentOutput.str());
 }
 
-void D3MFExporter::writeModelToArchive(const std::string &folder, const std::string &modelName) {
-    if (nullptr == m_zipArchive) {
-        throw DeadlyExportError("3MF-Export: Zip archive not valid, nullptr.");
-    }
+void D3MFExporter::zipModel(const std::string &folder, const std::string &modelName) {
     const std::string entry = folder + "/" + modelName;
-    zip_entry_open(m_zipArchive, entry.c_str());
-
-    const std::string &exportTxt(mModelOutput.str());
-    zip_entry_write(m_zipArchive, exportTxt.c_str(), exportTxt.size());
-
-    zip_entry_close(m_zipArchive);
+    addFileInZip(entry, mModelOutput.str());
 }
 
-void D3MFExporter::writeRelInfoToFile(const std::string &folder, const std::string &relName) {
+void D3MFExporter::zipRelInfo(const std::string &folder, const std::string &relName) {
+    const std::string entry = folder + "/" + relName;
+    addFileInZip(entry, mRelOutput.str());
+}
+
+void D3MFExporter::addFileInZip(const std::string& entry, const std::string& content) {
     if (nullptr == m_zipArchive) {
         throw DeadlyExportError("3MF-Export: Zip archive not valid, nullptr.");
     }
-    const std::string entry = folder + "/" + relName;
+
     zip_entry_open(m_zipArchive, entry.c_str());
-
-    const std::string &exportTxt(mRelOutput.str());
-    zip_entry_write(m_zipArchive, exportTxt.c_str(), exportTxt.size());
-
+    zip_entry_write(m_zipArchive, content.c_str(), content.size());
     zip_entry_close(m_zipArchive);
 }
 
diff --git a/code/AssetLib/3MF/D3MFExporter.h b/code/AssetLib/3MF/D3MFExporter.h
index 6a447236b..abde3cea3 100644
--- a/code/AssetLib/3MF/D3MFExporter.h
+++ b/code/AssetLib/3MF/D3MFExporter.h
@@ -4,7 +4,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -83,9 +82,12 @@ protected:
     void writeVertex( const aiVector3D &pos );
     void writeFaces( aiMesh *mesh, unsigned int matIdx );
     void writeBuild();
-    void exportContentTyp( const std::string &filename );
-    void writeModelToArchive( const std::string &folder, const std::string &modelName );
-    void writeRelInfoToFile( const std::string &folder, const std::string &relName );
+
+    // Zip the data
+    void zipContentType( const std::string &filename );
+    void zipModel( const std::string &folder, const std::string &modelName );
+    void zipRelInfo( const std::string &folder, const std::string &relName );
+    void addFileInZip( const std::string &entry, const std::string &content );
 
 private:
     std::string mArchiveName;
diff --git a/code/AssetLib/3MF/D3MFImporter.cpp b/code/AssetLib/3MF/D3MFImporter.cpp
index 2093e5e9a..66b2c965b 100644
--- a/code/AssetLib/3MF/D3MFImporter.cpp
+++ b/code/AssetLib/3MF/D3MFImporter.cpp
@@ -4,7 +4,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -46,12 +45,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <assimp/StringComparison.h>
 #include <assimp/StringUtils.h>
+#include <assimp/XmlParser.h>
 #include <assimp/ZipArchiveIOSystem.h>
 #include <assimp/importerdesc.h>
 #include <assimp/scene.h>
 #include <assimp/DefaultLogger.hpp>
 #include <assimp/IOSystem.hpp>
-
 #include <cassert>
 #include <map>
 #include <memory>
@@ -61,29 +60,85 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "3MFXmlTags.h"
 #include "D3MFOpcPackage.h"
 #include <assimp/fast_atof.h>
-#include <assimp/irrXMLWrapper.h>
 
 #include <iomanip>
 
 namespace Assimp {
 namespace D3MF {
 
+enum class ResourceType {
+    RT_Object,
+    RT_BaseMaterials,
+    RT_Unknown
+}; // To be extended with other resource types (eg. material extension resources like Texture2d, Texture2dGroup...)
+
+class Resource
+{
+public:
+    Resource(int id) :
+            mId(id) {}
+
+    virtual ~Resource() {}
+
+    int mId;
+
+    virtual ResourceType getType() {
+        return ResourceType::RT_Unknown;
+    }
+};
+
+class BaseMaterials : public Resource {
+public:
+    BaseMaterials(int id) :
+            Resource(id),
+            mMaterials(),
+            mMaterialIndex() {}
+
+    std::vector<aiMaterial *> mMaterials;
+    std::vector<unsigned int> mMaterialIndex;
+
+    virtual ResourceType getType() {
+        return ResourceType::RT_BaseMaterials;
+    }
+};
+
+struct Component {
+    int mObjectId;
+    aiMatrix4x4 mTransformation;
+};
+
+class Object : public Resource {
+public:
+    std::vector<aiMesh*> mMeshes;
+    std::vector<unsigned int> mMeshIndex;
+    std::vector<Component> mComponents;
+    std::string mName;
+
+    Object(int id) :
+            Resource(id),
+            mName (std::string("Object_") + to_string(id)){}
+
+    virtual ResourceType getType() {
+        return ResourceType::RT_Object;
+    }
+};
+
+
 class XmlSerializer {
 public:
-    using MatArray = std::vector<aiMaterial *>;
-    using MatId2MatArray = std::map<unsigned int, std::vector<unsigned int>>;
 
-    XmlSerializer(XmlReader *xmlReader) :
-            mMeshes(),
-            mMatArray(),
-            mActiveMatGroup(99999999),
-            mMatId2MatArray(),
-            xmlReader(xmlReader) {
+    XmlSerializer(XmlParser *xmlParser) :
+            mResourcesDictionnary(),
+            mMaterialCount(0),
+            mMeshCount(0),
+            mXmlParser(xmlParser) {
         // empty
     }
 
     ~XmlSerializer() {
-        // empty
+        for (auto it = mResourcesDictionnary.begin(); it != mResourcesDictionnary.end(); it++) {
+            delete it->second;
+        }
     }
 
     void ImportXml(aiScene *scene) {
@@ -91,27 +146,47 @@ public:
             return;
         }
 
-        scene->mRootNode = new aiNode();
-        std::vector<aiNode *> children;
+        scene->mRootNode = new aiNode("3MF");
 
-        std::string nodeName;
-        while (ReadToEndElement(D3MF::XmlTag::model)) {
-            nodeName = xmlReader->getNodeName();
-            if (nodeName == D3MF::XmlTag::object) {
-                children.push_back(ReadObject(scene));
-            } else if (nodeName == D3MF::XmlTag::build) {
-                //
-            } else if (nodeName == D3MF::XmlTag::basematerials) {
-                ReadBaseMaterials();
-            } else if (nodeName == D3MF::XmlTag::meta) {
-                ReadMetadata();
+        XmlNode node = mXmlParser->getRootNode().child("model");
+        if (node.empty()) {
+            return;
+        }
+        XmlNode resNode = node.child("resources");
+        for (XmlNode currentNode = resNode.first_child(); currentNode; currentNode = currentNode.next_sibling()) {
+            const std::string &currentNodeName = currentNode.name();
+            if (currentNodeName == D3MF::XmlTag::object) {
+                ReadObject(currentNode);;
+            } else if (currentNodeName == D3MF::XmlTag::basematerials) {
+                ReadBaseMaterials(currentNode);
+            } else if (currentNodeName == D3MF::XmlTag::meta) {
+                ReadMetadata(currentNode);
             }
         }
 
-        if (scene->mRootNode->mName.length == 0) {
-            scene->mRootNode->mName.Set("3MF");
+        XmlNode buildNode = node.child("build");
+        for (XmlNode currentNode = buildNode.first_child(); currentNode; currentNode = currentNode.next_sibling()) {
+            const std::string &currentNodeName = currentNode.name();
+            if (currentNodeName == D3MF::XmlTag::item) {
+                int objectId = -1;
+                std::string transformationMatrixStr;
+                aiMatrix4x4 transformationMatrix;
+                getNodeAttribute(currentNode, D3MF::XmlTag::objectid, objectId);
+                bool hasTransform = getNodeAttribute(currentNode, D3MF::XmlTag::transform, transformationMatrixStr);
+
+                auto it = mResourcesDictionnary.find(objectId);
+                if (it != mResourcesDictionnary.end() && it->second->getType() == ResourceType::RT_Object) {
+                    Object *obj = static_cast<Object *>(it->second);
+                    if (hasTransform) {
+                        transformationMatrix = parseTransformMatrix(transformationMatrixStr);
+                    }
+
+                    addObjectToNode(scene->mRootNode, obj, transformationMatrix);
+                }
+            }
         }
 
+
         // import the metadata
         if (!mMetaData.empty()) {
             const size_t numMeta(mMetaData.size());
@@ -123,83 +198,194 @@ public:
         }
 
         // import the meshes
-        scene->mNumMeshes = static_cast<unsigned int>(mMeshes.size());
-        scene->mMeshes = new aiMesh *[scene->mNumMeshes]();
-        std::copy(mMeshes.begin(), mMeshes.end(), scene->mMeshes);
+        scene->mNumMeshes = static_cast<unsigned int>(mMeshCount);
+        if (scene->mNumMeshes != 0) {
+            scene->mMeshes = new aiMesh *[scene->mNumMeshes]();
+            for (auto it = mResourcesDictionnary.begin(); it != mResourcesDictionnary.end(); it++) {
+                if (it->second->getType() == ResourceType::RT_Object) {
+                    Object *obj = static_cast<Object*>(it->second);
+                    for (unsigned int i = 0; i < obj->mMeshes.size(); ++i) {
+                        scene->mMeshes[obj->mMeshIndex[i]] = obj->mMeshes[i];
+                    }
+                }
+            }
+        }
+        
 
         // import the materials
-        scene->mNumMaterials = static_cast<unsigned int>(mMatArray.size());
-        if (0 != scene->mNumMaterials) {
+        scene->mNumMaterials = static_cast<unsigned int>(mMaterialCount);
+        if (scene->mNumMaterials != 0) {
             scene->mMaterials = new aiMaterial *[scene->mNumMaterials];
-            std::copy(mMatArray.begin(), mMatArray.end(), scene->mMaterials);
+            for (auto it = mResourcesDictionnary.begin(); it != mResourcesDictionnary.end(); it++) {
+                if (it->second->getType() == ResourceType::RT_BaseMaterials) {
+                    BaseMaterials *baseMaterials = static_cast<BaseMaterials *>(it->second);
+                    for (unsigned int i = 0; i < baseMaterials->mMaterials.size(); ++i) {
+                        scene->mMaterials[baseMaterials->mMaterialIndex[i]] = baseMaterials->mMaterials[i];
+                    }
+                }
+            }
         }
-
-        // create the scenegraph
-        scene->mRootNode->mNumChildren = static_cast<unsigned int>(children.size());
-        scene->mRootNode->mChildren = new aiNode *[scene->mRootNode->mNumChildren]();
-        std::copy(children.begin(), children.end(), scene->mRootNode->mChildren);
     }
 
 private:
-    aiNode *ReadObject(aiScene *scene) {
-        std::unique_ptr<aiNode> node(new aiNode());
 
-        std::vector<unsigned long> meshIds;
+    void addObjectToNode(aiNode* parent, Object* obj, aiMatrix4x4 nodeTransform) {
+        aiNode *sceneNode = new aiNode(obj->mName);
+        sceneNode->mNumMeshes = static_cast<unsigned int>(obj->mMeshes.size());
+        sceneNode->mMeshes = new unsigned int[sceneNode->mNumMeshes];
+        std::copy(obj->mMeshIndex.begin(), obj->mMeshIndex.end(), sceneNode->mMeshes);
 
-        const char *attrib(nullptr);
-        std::string name, type;
-        attrib = xmlReader->getAttributeValue(D3MF::XmlTag::id.c_str());
-        if (nullptr != attrib) {
-            name = attrib;
-        }
-        attrib = xmlReader->getAttributeValue(D3MF::XmlTag::type.c_str());
-        if (nullptr != attrib) {
-            type = attrib;
-        }
+        sceneNode->mTransformation = nodeTransform;
 
-        node->mParent = scene->mRootNode;
-        node->mName.Set(name);
+        parent->addChildren(1, &sceneNode);
 
-        size_t meshIdx = mMeshes.size();
-
-        while (ReadToEndElement(D3MF::XmlTag::object)) {
-            if (xmlReader->getNodeName() == D3MF::XmlTag::mesh) {
-                auto mesh = ReadMesh();
-
-                mesh->mName.Set(name);
-                mMeshes.push_back(mesh);
-                meshIds.push_back(static_cast<unsigned long>(meshIdx));
-                ++meshIdx;
+        for (size_t i = 0; i < obj->mComponents.size(); ++i) {
+            Component c = obj->mComponents[i];
+            auto it = mResourcesDictionnary.find(c.mObjectId);
+            if (it != mResourcesDictionnary.end() && it->second->getType() == ResourceType::RT_Object) {
+                addObjectToNode(sceneNode, static_cast<Object*>(it->second), c.mTransformation);
             }
+            
         }
-
-        node->mNumMeshes = static_cast<unsigned int>(meshIds.size());
-
-        node->mMeshes = new unsigned int[node->mNumMeshes];
-
-        std::copy(meshIds.begin(), meshIds.end(), node->mMeshes);
-
-        return node.release();
     }
 
-    aiMesh *ReadMesh() {
-        aiMesh *mesh = new aiMesh();
-        while (ReadToEndElement(D3MF::XmlTag::mesh)) {
-            if (xmlReader->getNodeName() == D3MF::XmlTag::vertices) {
-                ImportVertices(mesh);
-            } else if (xmlReader->getNodeName() == D3MF::XmlTag::triangles) {
-                ImportTriangles(mesh);
+    bool getNodeAttribute(const XmlNode& node, const std::string& attribute, std::string& value) {
+        pugi::xml_attribute objectAttribute = node.attribute(attribute.c_str());
+        if (!objectAttribute.empty()) {
+            value = objectAttribute.as_string();
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    bool getNodeAttribute(const XmlNode &node, const std::string &attribute, int &value) {
+        std::string strValue;
+        bool ret = getNodeAttribute(node, attribute, strValue);
+        if (ret) {
+            value = std::atoi(strValue.c_str());
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    aiMatrix4x4 parseTransformMatrix(std::string matrixStr) {
+        // split the string
+        std::vector<float> numbers;
+        std::string currentNumber;
+        for (size_t i = 0; i < matrixStr.size(); ++i) {
+            const char c = matrixStr[i];
+            if (c == ' ') {
+                if (currentNumber.size() > 0) {
+                    float f = std::stof(currentNumber);
+                    numbers.push_back(f);
+                    currentNumber.clear();
+                }
+            } else {
+                currentNumber.push_back(c);
             }
         }
+        if (currentNumber.size() > 0) {
+            float f = std::stof(currentNumber);
+            numbers.push_back(f);
+        }
+
+        aiMatrix4x4 transformMatrix;
+        transformMatrix.a1 = numbers[0];
+        transformMatrix.b1 = numbers[1];
+        transformMatrix.c1 = numbers[2];
+        transformMatrix.d1 = 0;
+
+        transformMatrix.a2 = numbers[3];
+        transformMatrix.b2 = numbers[4];
+        transformMatrix.c2 = numbers[5];
+        transformMatrix.d2 = 0;
+
+        transformMatrix.a3 = numbers[6];
+        transformMatrix.b3 = numbers[7];
+        transformMatrix.c3 = numbers[8];
+        transformMatrix.d3 = 0;
+
+        transformMatrix.a4 = numbers[9];
+        transformMatrix.b4 = numbers[10];
+        transformMatrix.c4 = numbers[11];
+        transformMatrix.d4 = 1;
+        return transformMatrix;
+    }
+
+    void ReadObject(XmlNode &node) {
+        int id = -1, pid = -1, pindex = -1;
+        bool hasId = getNodeAttribute(node, D3MF::XmlTag::id, id);
+        //bool hasType = getNodeAttribute(node, D3MF::XmlTag::type, type); not used currently
+        bool hasPid = getNodeAttribute(node, D3MF::XmlTag::pid, pid);
+        bool hasPindex = getNodeAttribute(node, D3MF::XmlTag::pindex, pindex);
+
+        std::string idStr = to_string(id);
+
+        if (!hasId) {
+            return;
+        }
+
+        Object *obj = new Object(id);
+
+        for (XmlNode currentNode = node.first_child(); currentNode; currentNode = currentNode.next_sibling()) {
+            const std::string &currentName = currentNode.name();
+            if (currentName == D3MF::XmlTag::mesh) {
+                auto mesh = ReadMesh(currentNode);
+                mesh->mName.Set(idStr);
+
+                if (hasPid) {
+                    auto it = mResourcesDictionnary.find(pid);
+                    if (hasPindex && it != mResourcesDictionnary.end() && it->second->getType() == ResourceType::RT_BaseMaterials) {
+                        BaseMaterials *materials = static_cast<BaseMaterials *>(it->second);
+                        mesh->mMaterialIndex = materials->mMaterialIndex[pindex];
+                    }
+                }
+
+                obj->mMeshes.push_back(mesh);
+                obj->mMeshIndex.push_back(mMeshCount);
+                mMeshCount++;
+            } else if (currentName == D3MF::XmlTag::components) {
+                for (XmlNode currentSubNode = currentNode.first_child(); currentSubNode; currentSubNode = currentSubNode.next_sibling()) {
+                    if (currentSubNode.name() == D3MF::XmlTag::component) {
+                        int objectId = -1;
+                        std::string componentTransformStr;
+                        aiMatrix4x4 componentTransform;
+                        if (getNodeAttribute(currentSubNode, D3MF::XmlTag::transform, componentTransformStr)) {
+                            componentTransform = parseTransformMatrix(componentTransformStr);
+                        }
+
+                        if (getNodeAttribute(currentSubNode, D3MF::XmlTag::objectid, objectId))
+                            obj->mComponents.push_back({ objectId, componentTransform });
+                    }
+                }
+            }
+        }
+
+        mResourcesDictionnary.insert(std::make_pair(id, obj));
+    }
+
+    aiMesh *ReadMesh(XmlNode &node) {
+        aiMesh *mesh = new aiMesh();
+
+        for (XmlNode currentNode = node.first_child(); currentNode; currentNode = currentNode.next_sibling()) {
+            const std::string &currentName = currentNode.name();
+            if (currentName == D3MF::XmlTag::vertices) {
+                ImportVertices(currentNode, mesh);
+            } else if (currentName == D3MF::XmlTag::triangles) {
+                ImportTriangles(currentNode, mesh);
+            }
+
+        }
 
         return mesh;
     }
 
-    void ReadMetadata() {
-        const std::string name = xmlReader->getAttributeValue(D3MF::XmlTag::meta_name.c_str());
-        xmlReader->read();
-        const std::string value = xmlReader->getNodeData();
-
+    void ReadMetadata(XmlNode &node) {
+        pugi::xml_attribute attribute = node.attribute(D3MF::XmlTag::meta_name.c_str());
+        const std::string name = attribute.as_string();
+        const std::string value = node.value();
         if (name.empty()) {
             return;
         }
@@ -210,40 +396,51 @@ private:
         mMetaData.push_back(entry);
     }
 
-    void ImportVertices(aiMesh *mesh) {
+    void ImportVertices(XmlNode &node, aiMesh *mesh) {
         std::vector<aiVector3D> vertices;
-        while (ReadToEndElement(D3MF::XmlTag::vertices)) {
-            if (xmlReader->getNodeName() == D3MF::XmlTag::vertex) {
-                vertices.push_back(ReadVertex());
+        for (XmlNode currentNode = node.first_child(); currentNode; currentNode = currentNode.next_sibling()) {
+            const std::string &currentName = currentNode.name();
+            if (currentName == D3MF::XmlTag::vertex) {
+                vertices.push_back(ReadVertex(currentNode));
             }
         }
+
         mesh->mNumVertices = static_cast<unsigned int>(vertices.size());
         mesh->mVertices = new aiVector3D[mesh->mNumVertices];
-
         std::copy(vertices.begin(), vertices.end(), mesh->mVertices);
     }
 
-    aiVector3D ReadVertex() {
+    aiVector3D ReadVertex(XmlNode &node) {
         aiVector3D vertex;
-
-        vertex.x = ai_strtof(xmlReader->getAttributeValue(D3MF::XmlTag::x.c_str()), nullptr);
-        vertex.y = ai_strtof(xmlReader->getAttributeValue(D3MF::XmlTag::y.c_str()), nullptr);
-        vertex.z = ai_strtof(xmlReader->getAttributeValue(D3MF::XmlTag::z.c_str()), nullptr);
+        vertex.x = ai_strtof(node.attribute(D3MF::XmlTag::x.c_str()).as_string(), nullptr);
+        vertex.y = ai_strtof(node.attribute(D3MF::XmlTag::y.c_str()).as_string(), nullptr);
+        vertex.z = ai_strtof(node.attribute(D3MF::XmlTag::z.c_str()).as_string(), nullptr);
 
         return vertex;
     }
 
-    void ImportTriangles(aiMesh *mesh) {
+    void ImportTriangles(XmlNode &node, aiMesh *mesh) {
         std::vector<aiFace> faces;
+        for (XmlNode currentNode = node.first_child(); currentNode; currentNode = currentNode.next_sibling()) {
+            const std::string &currentName = currentNode.name();
+            if (currentName == D3MF::XmlTag::triangle) {
+                aiFace face = ReadTriangle(currentNode);
+                faces.push_back(face);
 
-        while (ReadToEndElement(D3MF::XmlTag::triangles)) {
-            const std::string nodeName(xmlReader->getNodeName());
-            if (xmlReader->getNodeName() == D3MF::XmlTag::triangle) {
-                faces.push_back(ReadTriangle());
-                const char *pidToken(xmlReader->getAttributeValue(D3MF::XmlTag::p1.c_str()));
-                if (nullptr != pidToken) {
-                    int matIdx(std::atoi(pidToken));
-                    mesh->mMaterialIndex = matIdx;
+                int pid, p1;
+                bool hasPid = getNodeAttribute(currentNode, D3MF::XmlTag::pid, pid);
+                bool hasP1 = getNodeAttribute(currentNode, D3MF::XmlTag::p1, p1);
+
+                if (hasPid && hasP1) {
+                    auto it = mResourcesDictionnary.find(pid);
+                    if (it != mResourcesDictionnary.end())
+                    {
+                        if (it->second->getType() == ResourceType::RT_BaseMaterials) {
+                            BaseMaterials *baseMaterials = static_cast<BaseMaterials *>(it->second);
+                            mesh->mMaterialIndex = baseMaterials->mMaterialIndex[p1];
+                        }
+                        // TODO: manage the separation into several meshes if the triangles of the mesh do not all refer to the same material
+                    }
                 }
             }
         }
@@ -255,40 +452,33 @@ private:
         std::copy(faces.begin(), faces.end(), mesh->mFaces);
     }
 
-    aiFace ReadTriangle() {
+    aiFace ReadTriangle(XmlNode &node) {
         aiFace face;
 
         face.mNumIndices = 3;
         face.mIndices = new unsigned int[face.mNumIndices];
-        face.mIndices[0] = static_cast<unsigned int>(std::atoi(xmlReader->getAttributeValue(D3MF::XmlTag::v1.c_str())));
-        face.mIndices[1] = static_cast<unsigned int>(std::atoi(xmlReader->getAttributeValue(D3MF::XmlTag::v2.c_str())));
-        face.mIndices[2] = static_cast<unsigned int>(std::atoi(xmlReader->getAttributeValue(D3MF::XmlTag::v3.c_str())));
+        face.mIndices[0] = static_cast<unsigned int>(std::atoi(node.attribute(D3MF::XmlTag::v1.c_str()).as_string()));
+        face.mIndices[1] = static_cast<unsigned int>(std::atoi(node.attribute(D3MF::XmlTag::v2.c_str()).as_string()));
+        face.mIndices[2] = static_cast<unsigned int>(std::atoi(node.attribute(D3MF::XmlTag::v3.c_str()).as_string()));
 
         return face;
     }
 
-    void ReadBaseMaterials() {
-        std::vector<unsigned int> MatIdArray;
-        const char *baseMaterialId(xmlReader->getAttributeValue(D3MF::XmlTag::basematerials_id.c_str()));
-        if (nullptr != baseMaterialId) {
-            unsigned int id = std::atoi(baseMaterialId);
-            const size_t newMatIdx(mMatArray.size());
-            if (id != mActiveMatGroup) {
-                mActiveMatGroup = id;
-                MatId2MatArray::const_iterator it(mMatId2MatArray.find(id));
-                if (mMatId2MatArray.end() == it) {
-                    MatIdArray.clear();
-                    mMatId2MatArray[id] = MatIdArray;
-                } else {
-                    MatIdArray = it->second;
+    void ReadBaseMaterials(XmlNode &node) {
+        int id = -1;
+        if (getNodeAttribute(node, D3MF::XmlTag::basematerials_id, id)) {
+            BaseMaterials* baseMaterials = new BaseMaterials(id);
+
+            for (XmlNode currentNode = node.first_child(); currentNode; currentNode = currentNode.next_sibling())
+            {
+                if (currentNode.name() == D3MF::XmlTag::basematerials_base) {
+                    baseMaterials->mMaterialIndex.push_back(mMaterialCount);
+                    baseMaterials->mMaterials.push_back(readMaterialDef(currentNode, id));
+                    mMaterialCount++;
                 }
             }
-            MatIdArray.push_back(static_cast<unsigned int>(newMatIdx));
-            mMatId2MatArray[mActiveMatGroup] = MatIdArray;
-        }
 
-        while (ReadToEndElement(D3MF::XmlTag::basematerials)) {
-            mMatArray.push_back(readMaterialDef());
+            mResourcesDictionnary.insert(std::make_pair(id, baseMaterials));
         }
     }
 
@@ -304,102 +494,60 @@ private:
         }
 
         const char *buf(color);
-        if ('#' != *buf) {
+        if ('#' != buf[0]) {
             return false;
         }
-        ++buf;
-        char comp[3] = { 0, 0, '\0' };
 
-        comp[0] = *buf;
-        ++buf;
-        comp[1] = *buf;
-        ++buf;
-        diffuse.r = static_cast<ai_real>(strtol(comp, nullptr, 16)) / ai_real(255.0);
+        char r[3] = { buf[1], buf[2], '\0' };
+        diffuse.r = static_cast<ai_real>(strtol(r, nullptr, 16)) / ai_real(255.0);
 
-        comp[0] = *buf;
-        ++buf;
-        comp[1] = *buf;
-        ++buf;
-        diffuse.g = static_cast<ai_real>(strtol(comp, nullptr, 16)) / ai_real(255.0);
+        char g[3] = { buf[3], buf[4], '\0' };
+        diffuse.g = static_cast<ai_real>(strtol(g, nullptr, 16)) / ai_real(255.0);
 
-        comp[0] = *buf;
-        ++buf;
-        comp[1] = *buf;
-        ++buf;
-        diffuse.b = static_cast<ai_real>(strtol(comp, nullptr, 16)) / ai_real(255.0);
+        char b[3] = { buf[5], buf[6], '\0' };
+        diffuse.b = static_cast<ai_real>(strtol(b, nullptr, 16)) / ai_real(255.0);
 
         if (7 == len)
             return true;
-        comp[0] = *buf;
-        ++buf;
-        comp[1] = *buf;
-        ++buf;
-        diffuse.a = static_cast<ai_real>(strtol(comp, nullptr, 16)) / ai_real(255.0);
+
+        char a[3] = { buf[7], buf[8], '\0' };
+        diffuse.a = static_cast<ai_real>(strtol(a, nullptr, 16)) / ai_real(255.0);
 
         return true;
     }
 
-    void assignDiffuseColor(aiMaterial *mat) {
-        const char *color = xmlReader->getAttributeValue(D3MF::XmlTag::basematerials_displaycolor.c_str());
+    void assignDiffuseColor(XmlNode &node, aiMaterial *mat) {
+        const char *color = node.attribute(D3MF::XmlTag::basematerials_displaycolor.c_str()).as_string();
         aiColor4D diffuse;
         if (parseColor(color, diffuse)) {
             mat->AddProperty<aiColor4D>(&diffuse, 1, AI_MATKEY_COLOR_DIFFUSE);
         }
     }
-    aiMaterial *readMaterialDef() {
-        aiMaterial *mat(nullptr);
-        const char *name(nullptr);
-        const std::string nodeName(xmlReader->getNodeName());
-        if (nodeName == D3MF::XmlTag::basematerials_base) {
-            name = xmlReader->getAttributeValue(D3MF::XmlTag::basematerials_name.c_str());
-            std::string stdMatName;
-            aiString matName;
-            std::string strId(to_string(mActiveMatGroup));
-            stdMatName += "id";
-            stdMatName += strId;
-            stdMatName += "_";
-            if (nullptr != name) {
-                stdMatName += std::string(name);
-            } else {
-                stdMatName += "basemat";
-            }
-            matName.Set(stdMatName);
 
-            mat = new aiMaterial;
-            mat->AddProperty(&matName, AI_MATKEY_NAME);
+    aiMaterial *readMaterialDef(XmlNode &node, unsigned int basematerialsId) {
+        aiMaterial *material = new aiMaterial();
+        material->mNumProperties = 0;
+        std::string name;
+        bool hasName = getNodeAttribute(node, D3MF::XmlTag::basematerials_name, name);
 
-            assignDiffuseColor(mat);
+        std::string stdMaterialName;
+        std::string strId(to_string(basematerialsId));
+        stdMaterialName += "id";
+        stdMaterialName += strId;
+        stdMaterialName += "_";
+        if (hasName) {
+            stdMaterialName += std::string(name);
+        } else {
+            stdMaterialName += "basemat_";
+            stdMaterialName += to_string(mMaterialCount - basematerialsId);
         }
 
-        return mat;
-    }
+        aiString assimpMaterialName(stdMaterialName);
+        material->AddProperty(&assimpMaterialName, AI_MATKEY_NAME);
 
-private:
-    bool ReadToStartElement(const std::string &startTag) {
-        while (xmlReader->read()) {
-            const std::string &nodeName(xmlReader->getNodeName());
-            if (xmlReader->getNodeType() == irr::io::EXN_ELEMENT && nodeName == startTag) {
-                return true;
-            } else if (xmlReader->getNodeType() == irr::io::EXN_ELEMENT_END && nodeName == startTag) {
-                return false;
-            }
-        }
+        assignDiffuseColor(node, material);
 
-        return false;
-    }
-
-    bool ReadToEndElement(const std::string &closeTag) {
-        while (xmlReader->read()) {
-            const std::string &nodeName(xmlReader->getNodeName());
-            if (xmlReader->getNodeType() == irr::io::EXN_ELEMENT) {
-                return true;
-            } else if (xmlReader->getNodeType() == irr::io::EXN_ELEMENT_END && nodeName == closeTag) {
-                return false;
-            }
-        }
-        ASSIMP_LOG_ERROR("unexpected EOF, expected closing <" + closeTag + "> tag");
-
-        return false;
+        return material;
     }
 
 private:
@@ -408,11 +556,9 @@ private:
         std::string value;
     };
     std::vector<MetaEntry> mMetaData;
-    std::vector<aiMesh *> mMeshes;
-    MatArray mMatArray;
-    unsigned int mActiveMatGroup;
-    MatId2MatArray mMatId2MatArray;
-    XmlReader *xmlReader;
+    std::map<unsigned int, Resource*> mResourcesDictionnary;
+    unsigned int mMaterialCount, mMeshCount;
+    XmlParser *mXmlParser;
 };
 
 } //namespace D3MF
@@ -468,12 +614,11 @@ const aiImporterDesc *D3MFImporter::GetInfo() const {
 void D3MFImporter::InternReadFile(const std::string &filename, aiScene *pScene, IOSystem *pIOHandler) {
     D3MF::D3MFOpcPackage opcPackage(pIOHandler, filename);
 
-    std::unique_ptr<CIrrXML_IOStreamReader> xmlStream(new CIrrXML_IOStreamReader(opcPackage.RootStream()));
-    std::unique_ptr<D3MF::XmlReader> xmlReader(irr::io::createIrrXMLReader(xmlStream.get()));
-
-    D3MF::XmlSerializer xmlSerializer(xmlReader.get());
-
-    xmlSerializer.ImportXml(pScene);
+    XmlParser xmlParser;
+    if (xmlParser.parse(opcPackage.RootStream())) {
+        D3MF::XmlSerializer xmlSerializer(&xmlParser);
+        xmlSerializer.ImportXml(pScene);
+    }
 }
 
 } // Namespace Assimp
diff --git a/code/AssetLib/3MF/D3MFOpcPackage.cpp b/code/AssetLib/3MF/D3MFOpcPackage.cpp
index e8e1e2f5e..29bd3a2c3 100644
--- a/code/AssetLib/3MF/D3MFOpcPackage.cpp
+++ b/code/AssetLib/3MF/D3MFOpcPackage.cpp
@@ -4,7 +4,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -45,6 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "D3MFOpcPackage.h"
 #include <assimp/Exceptional.h>
 
+#include <assimp/XmlParser.h>
 #include <assimp/ZipArchiveIOSystem.h>
 #include <assimp/ai_assert.h>
 #include <assimp/DefaultLogger.hpp>
@@ -68,27 +68,22 @@ typedef std::shared_ptr<OpcPackageRelationship> OpcPackageRelationshipPtr;
 
 class OpcPackageRelationshipReader {
 public:
-    OpcPackageRelationshipReader(XmlReader *xmlReader) {
-        while (xmlReader->read()) {
-            if (xmlReader->getNodeType() == irr::io::EXN_ELEMENT &&
-                    xmlReader->getNodeName() == XmlTag::RELS_RELATIONSHIP_CONTAINER) {
-                ParseRootNode(xmlReader);
+    OpcPackageRelationshipReader(XmlParser &parser) {
+        XmlNode root = parser.getRootNode();
+        ParseRootNode(root);
+    }
+
+    void ParseRootNode(XmlNode &node) {
+        ParseAttributes(node);
+        for (XmlNode currentNode = node.first_child(); currentNode; currentNode = currentNode.next_sibling()) {
+            std::string name = currentNode.name();
+            if (name == "Relationships") {
+                ParseRelationsNode(currentNode);
             }
         }
     }
 
-    void ParseRootNode(XmlReader *xmlReader) {
-        ParseAttributes(xmlReader);
-
-        while (xmlReader->read()) {
-            if (xmlReader->getNodeType() == irr::io::EXN_ELEMENT &&
-                    xmlReader->getNodeName() == XmlTag::RELS_RELATIONSHIP_NODE) {
-                ParseChildNode(xmlReader);
-            }
-        }
-    }
-
-    void ParseAttributes(XmlReader *) {
+    void ParseAttributes(XmlNode & /*node*/) {
         // empty
     }
 
@@ -99,14 +94,22 @@ public:
         return true;
     }
 
-    void ParseChildNode(XmlReader *xmlReader) {
-        OpcPackageRelationshipPtr relPtr(new OpcPackageRelationship());
+    void ParseRelationsNode(XmlNode &node) {
+        if (node.empty()) {
+            return;
+        }
 
-        relPtr->id = xmlReader->getAttributeValueSafe(XmlTag::RELS_ATTRIB_ID.c_str());
-        relPtr->type = xmlReader->getAttributeValueSafe(XmlTag::RELS_ATTRIB_TYPE.c_str());
-        relPtr->target = xmlReader->getAttributeValueSafe(XmlTag::RELS_ATTRIB_TARGET.c_str());
-        if (validateRels(relPtr)) {
-            m_relationShips.push_back(relPtr);
+        for (XmlNode currentNode = node.first_child(); currentNode; currentNode = currentNode.next_sibling()) {
+            std::string name = currentNode.name();
+            if (name == "Relationship") {
+                OpcPackageRelationshipPtr relPtr(new OpcPackageRelationship());
+                relPtr->id = currentNode.attribute(XmlTag::RELS_ATTRIB_ID.c_str()).as_string();
+                relPtr->type = currentNode.attribute(XmlTag::RELS_ATTRIB_TYPE.c_str()).as_string();
+                relPtr->target = currentNode.attribute(XmlTag::RELS_ATTRIB_TARGET.c_str()).as_string();
+                if (validateRels(relPtr)) {
+                    m_relationShips.push_back(relPtr);
+                }
+            }
         }
     }
 
@@ -115,10 +118,11 @@ public:
 
 // ------------------------------------------------------------------------------------------------
 D3MFOpcPackage::D3MFOpcPackage(IOSystem *pIOHandler, const std::string &rFile) :
-        mRootStream(nullptr), mZipArchive() {
+        mRootStream(nullptr),
+        mZipArchive() {
     mZipArchive.reset(new ZipArchiveIOSystem(pIOHandler, rFile));
     if (!mZipArchive->isOpen()) {
-        throw DeadlyImportError("Failed to open file " + rFile + ".");
+        throw DeadlyImportError("Failed to open file ", rFile, ".");
     }
 
     std::vector<std::string> fileList;
@@ -182,17 +186,19 @@ bool D3MFOpcPackage::validate() {
 }
 
 std::string D3MFOpcPackage::ReadPackageRootRelationship(IOStream *stream) {
-    std::unique_ptr<CIrrXML_IOStreamReader> xmlStream(new CIrrXML_IOStreamReader(stream));
-    std::unique_ptr<XmlReader> xml(irr::io::createIrrXMLReader(xmlStream.get()));
+    XmlParser xmlParser;
+    if (!xmlParser.parse(stream)) {
+        return "";
+    }
 
-    OpcPackageRelationshipReader reader(xml.get());
+    OpcPackageRelationshipReader reader(xmlParser);
 
     auto itr = std::find_if(reader.m_relationShips.begin(), reader.m_relationShips.end(), [](const OpcPackageRelationshipPtr &rel) {
         return rel->type == XmlTag::PACKAGE_START_PART_RELATIONSHIP_TYPE;
     });
 
     if (itr == reader.m_relationShips.end()) {
-        throw DeadlyImportError("Cannot find " + XmlTag::PACKAGE_START_PART_RELATIONSHIP_TYPE);
+        throw DeadlyImportError("Cannot find ", XmlTag::PACKAGE_START_PART_RELATIONSHIP_TYPE);
     }
 
     return (*itr)->target;
diff --git a/code/AssetLib/3MF/D3MFOpcPackage.h b/code/AssetLib/3MF/D3MFOpcPackage.h
index 291f8ad53..b2001b980 100644
--- a/code/AssetLib/3MF/D3MFOpcPackage.h
+++ b/code/AssetLib/3MF/D3MFOpcPackage.h
@@ -4,7 +4,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -44,18 +43,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define D3MFOPCPACKAGE_H
 
 #include <memory>
-
+#include <string>
 #include <assimp/IOSystem.hpp>
-#include <assimp/irrXMLWrapper.h>
 
 namespace Assimp {
     class ZipArchiveIOSystem;
 
 namespace D3MF {
 
-using XmlReader = irr::io::IrrXMLReader ;
-using XmlReaderPtr = std::shared_ptr<XmlReader> ;
-
 struct OpcPackageRelationship {
     std::string id;
     std::string type;
@@ -64,7 +59,7 @@ struct OpcPackageRelationship {
 
 class D3MFOpcPackage {
 public:
-    D3MFOpcPackage( IOSystem* pIOHandler, const std::string& rFile );
+    D3MFOpcPackage( IOSystem* pIOHandler, const std::string& file );
     ~D3MFOpcPackage();
     IOStream* RootStream() const;
     bool validate();
diff --git a/code/AssetLib/AC/ACLoader.cpp b/code/AssetLib/AC/ACLoader.cpp
index ac1631a9b..bf2828655 100644
--- a/code/AssetLib/AC/ACLoader.cpp
+++ b/code/AssetLib/AC/ACLoader.cpp
@@ -471,26 +471,33 @@ aiNode *AC3DImporter::ConvertObjectSection(Object &object,
                     ++node->mNumMeshes;
                 }
 
-                switch ((*it).flags & 0xf) {
+                switch ((*it).GetType()) {
                     // closed line
-                case 0x1:
+                case Surface::ClosedLine:
                     needMat[idx].first += (unsigned int)(*it).entries.size();
                     needMat[idx].second += (unsigned int)(*it).entries.size() << 1u;
                     break;
 
                     // unclosed line
-                case 0x2:
+                case Surface::OpenLine:
                     needMat[idx].first += (unsigned int)(*it).entries.size() - 1;
                     needMat[idx].second += ((unsigned int)(*it).entries.size() - 1) << 1u;
                     break;
 
-                    // 0 == polygon, else unknown
-                default:
-                    if ((*it).flags & 0xf) {
-                        ASSIMP_LOG_WARN("AC3D: The type flag of a surface is unknown");
-                        (*it).flags &= ~(0xf);
-                    }
+                    // triangle strip
+                case Surface::TriangleStrip:
+                    needMat[idx].first += (unsigned int)(*it).entries.size() - 2;
+                    needMat[idx].second += ((unsigned int)(*it).entries.size() - 2) * 3;
+                    break;
 
+                default:
+                    // Coerce unknowns to a polygon and warn
+                    ASSIMP_LOG_WARN_F("AC3D: The type flag of a surface is unknown: ", (*it).flags);
+                    (*it).flags &= ~(Surface::Mask);
+                    // fallthrough
+
+                    // polygon
+                case Surface::Polygon:
                     // the number of faces increments by one, the number
                     // of vertices by surface.numref.
                     needMat[idx].first++;
@@ -546,8 +553,8 @@ aiNode *AC3DImporter::ConvertObjectSection(Object &object,
                         const Surface &src = *it;
 
                         // closed polygon
-                        unsigned int type = (*it).flags & 0xf;
-                        if (!type) {
+                        uint8_t type = (*it).GetType();
+                        if (type == Surface::Polygon) {
                             aiFace &face = *faces++;
                             face.mNumIndices = (unsigned int)src.entries.size();
                             if (0 != face.mNumIndices) {
@@ -570,13 +577,71 @@ aiNode *AC3DImporter::ConvertObjectSection(Object &object,
                                     }
                                 }
                             }
+                        } else if (type == Surface::TriangleStrip) {
+                            for (unsigned int i = 0; i < (unsigned int)src.entries.size() - 2; ++i) {
+                                const Surface::SurfaceEntry &entry1 = src.entries[i];
+                                const Surface::SurfaceEntry &entry2 = src.entries[i + 1];
+                                const Surface::SurfaceEntry &entry3 = src.entries[i + 2];
+
+                                // skip degenerate triangles
+                                if (object.vertices[entry1.first] == object.vertices[entry2.first] ||
+                                        object.vertices[entry1.first] == object.vertices[entry3.first] ||
+                                        object.vertices[entry2.first] == object.vertices[entry3.first]) {
+                                    mesh->mNumFaces--;
+                                    mesh->mNumVertices -= 3;
+                                    continue;
+                                }
+
+                                aiFace &face = *faces++;
+                                face.mNumIndices = 3;
+                                face.mIndices = new unsigned int[face.mNumIndices];
+                                face.mIndices[0] = cur++;
+                                face.mIndices[1] = cur++;
+                                face.mIndices[2] = cur++;
+                                if (!(i & 1)) {
+                                    *vertices++ = object.vertices[entry1.first] + object.translation;
+                                    if (uv) {
+                                        uv->x = entry1.second.x;
+                                        uv->y = entry1.second.y;
+                                        ++uv;
+                                    }
+                                    *vertices++ = object.vertices[entry2.first] + object.translation;
+                                    if (uv) {
+                                        uv->x = entry2.second.x;
+                                        uv->y = entry2.second.y;
+                                        ++uv;
+                                    }
+                                } else {
+                                    *vertices++ = object.vertices[entry2.first] + object.translation;
+                                    if (uv) {
+                                        uv->x = entry2.second.x;
+                                        uv->y = entry2.second.y;
+                                        ++uv;
+                                    }
+                                    *vertices++ = object.vertices[entry1.first] + object.translation;
+                                    if (uv) {
+                                        uv->x = entry1.second.x;
+                                        uv->y = entry1.second.y;
+                                        ++uv;
+                                    }
+                                }
+                                if (static_cast<unsigned>(vertices - mesh->mVertices) >= mesh->mNumVertices) {
+                                    throw DeadlyImportError("AC3D: Invalid number of vertices");
+                                }
+                                *vertices++ = object.vertices[entry3.first] + object.translation;
+                                if (uv) {
+                                    uv->x = entry3.second.x;
+                                    uv->y = entry3.second.y;
+                                    ++uv;
+                                }
+                            }
                         } else {
 
                             it2 = (*it).entries.begin();
 
                             // either a closed or an unclosed line
                             unsigned int tmp = (unsigned int)(*it).entries.size();
-                            if (0x2 == type) --tmp;
+                            if (Surface::OpenLine == type) --tmp;
                             for (unsigned int m = 0; m < tmp; ++m) {
                                 aiFace &face = *faces++;
 
@@ -599,7 +664,7 @@ aiNode *AC3DImporter::ConvertObjectSection(Object &object,
                                     ++uv;
                                 }
 
-                                if (0x1 == type && tmp - 1 == m) {
+                                if (Surface::ClosedLine == type && tmp - 1 == m) {
                                     // if this is a closed line repeat its beginning now
                                     it2 = (*it).entries.begin();
                                 } else
@@ -697,7 +762,7 @@ void AC3DImporter::InternReadFile(const std::string &pFile,
 
     // Check whether we can read from the file
     if (file.get() == nullptr) {
-        throw DeadlyImportError("Failed to open AC3D file " + pFile + ".");
+        throw DeadlyImportError("Failed to open AC3D file ", pFile, ".");
     }
 
     // allocate storage and copy the contents of the file to a memory buffer
diff --git a/code/AssetLib/AC/ACLoader.h b/code/AssetLib/AC/ACLoader.h
index e330ddf1b..c0bf97866 100644
--- a/code/AssetLib/AC/ACLoader.h
+++ b/code/AssetLib/AC/ACLoader.h
@@ -4,7 +4,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -69,7 +68,10 @@ public:
     // Represents an AC3D material
     struct Material {
         Material() :
-                rgb(0.6f, 0.6f, 0.6f), spec(1.f, 1.f, 1.f), shin(0.f), trans(0.f) {}
+                rgb(0.6f, 0.6f, 0.6f),
+                spec(1.f, 1.f, 1.f),
+                shin(0.f),
+                trans(0.f) {}
 
         // base color of the material
         aiColor3D rgb;
@@ -96,18 +98,43 @@ public:
     // Represents an AC3D surface
     struct Surface {
         Surface() :
-                mat(0), flags(0) {}
+                mat(0),
+                flags(0) {}
 
         unsigned int mat, flags;
 
         typedef std::pair<unsigned int, aiVector2D> SurfaceEntry;
         std::vector<SurfaceEntry> entries;
+
+        // Type is low nibble of flags
+        enum Type : uint8_t {
+            Polygon = 0x0,
+            ClosedLine = 0x1,
+            OpenLine = 0x2,
+            TriangleStrip = 0x4, // ACC extension (TORCS and Speed Dreams)
+
+            Mask = 0xf,
+        };
+
+        inline const uint8_t GetType() const { return (flags & Mask); }
     };
 
     // Represents an AC3D object
     struct Object {
         Object() :
-                type(World), name(""), children(), texture(""), texRepeat(1.f, 1.f), texOffset(0.0f, 0.0f), rotation(), translation(), vertices(), surfaces(), numRefs(0), subDiv(0), crease() {}
+                type(World),
+                name(""),
+                children(),
+                texture(""),
+                texRepeat(1.f, 1.f),
+                texOffset(0.0f, 0.0f),
+                rotation(),
+                translation(),
+                vertices(),
+                surfaces(),
+                numRefs(0),
+                subDiv(0),
+                crease() {}
 
         // Type description
         enum Type {
diff --git a/code/AssetLib/AMF/AMFImporter.cpp b/code/AssetLib/AMF/AMFImporter.cpp
index 0b76b2652..179197037 100644
--- a/code/AssetLib/AMF/AMFImporter.cpp
+++ b/code/AssetLib/AMF/AMFImporter.cpp
@@ -5,8 +5,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -60,8 +58,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 namespace Assimp {
 
-/// \var aiImporterDesc AMFImporter::Description
-/// Conastant which hold importer description
 const aiImporterDesc AMFImporter::Description = {
     "Additive manufacturing file format(AMF) Importer",
     "smalcom",
@@ -82,7 +78,7 @@ void AMFImporter::Clear() {
     mTexture_Converted.clear();
     // Delete all elements
     if (!mNodeElement_List.empty()) {
-        for (CAMFImporter_NodeElement *ne : mNodeElement_List) {
+        for (AMFNodeElementBase *ne : mNodeElement_List) {
             delete ne;
         }
 
@@ -90,8 +86,18 @@ void AMFImporter::Clear() {
     }
 }
 
+AMFImporter::AMFImporter() AI_NO_EXCEPT :
+        mNodeElement_Cur(nullptr),
+        mXmlParser(nullptr),
+        mUnit(),
+        mVersion(),
+        mMaterial_Converted(),
+        mTexture_Converted() {
+    // empty
+}
+
 AMFImporter::~AMFImporter() {
-    if (mReader != nullptr) delete mReader;
+    delete mXmlParser;
     // Clear() is accounting if data already is deleted. So, just check again if all data is deleted.
     Clear();
 }
@@ -100,10 +106,12 @@ AMFImporter::~AMFImporter() {
 /************************************************************ Functions: find set ************************************************************/
 /*********************************************************************************************************************************************/
 
-bool AMFImporter::Find_NodeElement(const std::string &pID, const CAMFImporter_NodeElement::EType pType, CAMFImporter_NodeElement **pNodeElement) const {
-    for (CAMFImporter_NodeElement *ne : mNodeElement_List) {
+bool AMFImporter::Find_NodeElement(const std::string &pID, const AMFNodeElementBase::EType pType, AMFNodeElementBase **pNodeElement) const {
+    for (AMFNodeElementBase *ne : mNodeElement_List) {
         if ((ne->ID == pID) && (ne->Type == pType)) {
-            if (pNodeElement != nullptr) *pNodeElement = ne;
+            if (pNodeElement != nullptr) {
+                *pNodeElement = ne;
+            }
 
             return true;
         }
@@ -112,12 +120,13 @@ bool AMFImporter::Find_NodeElement(const std::string &pID, const CAMFImporter_No
     return false;
 }
 
-bool AMFImporter::Find_ConvertedNode(const std::string &pID, std::list<aiNode *> &pNodeList, aiNode **pNode) const {
+bool AMFImporter::Find_ConvertedNode(const std::string &pID, NodeArray &nodeArray, aiNode **pNode) const {
     aiString node_name(pID.c_str());
-
-    for (aiNode *node : pNodeList) {
+    for (aiNode *node : nodeArray) {
         if (node->mName == node_name) {
-            if (pNode != nullptr) *pNode = node;
+            if (pNode != nullptr) {
+                *pNode = node;
+            }
 
             return true;
         }
@@ -129,7 +138,9 @@ bool AMFImporter::Find_ConvertedNode(const std::string &pID, std::list<aiNode *>
 bool AMFImporter::Find_ConvertedMaterial(const std::string &pID, const SPP_Material **pConvertedMaterial) const {
     for (const SPP_Material &mat : mMaterial_Converted) {
         if (mat.ID == pID) {
-            if (pConvertedMaterial != nullptr) *pConvertedMaterial = &mat;
+            if (pConvertedMaterial != nullptr) {
+                *pConvertedMaterial = &mat;
+            }
 
             return true;
         }
@@ -142,148 +153,38 @@ bool AMFImporter::Find_ConvertedMaterial(const std::string &pID, const SPP_Mater
 /************************************************************ Functions: throw set ***********************************************************/
 /*********************************************************************************************************************************************/
 
-void AMFImporter::Throw_CloseNotFound(const std::string &pNode) {
-    throw DeadlyImportError("Close tag for node <" + pNode + "> not found. Seems file is corrupt.");
+void AMFImporter::Throw_CloseNotFound(const std::string &nodeName) {
+    throw DeadlyImportError("Close tag for node <" + nodeName + "> not found. Seems file is corrupt.");
 }
 
-void AMFImporter::Throw_IncorrectAttr(const std::string &pAttrName) {
-    throw DeadlyImportError("Node <" + std::string(mReader->getNodeName()) + "> has incorrect attribute \"" + pAttrName + "\".");
+void AMFImporter::Throw_IncorrectAttr(const std::string &nodeName, const std::string &attrName) {
+    throw DeadlyImportError("Node <" + nodeName + "> has incorrect attribute \"" + attrName + "\".");
 }
 
-void AMFImporter::Throw_IncorrectAttrValue(const std::string &pAttrName) {
-    throw DeadlyImportError("Attribute \"" + pAttrName + "\" in node <" + std::string(mReader->getNodeName()) + "> has incorrect value.");
+void AMFImporter::Throw_IncorrectAttrValue(const std::string &nodeName, const std::string &attrName) {
+    throw DeadlyImportError("Attribute \"" + attrName + "\" in node <" + nodeName + "> has incorrect value.");
 }
 
-void AMFImporter::Throw_MoreThanOnceDefined(const std::string &pNodeType, const std::string &pDescription) {
-    throw DeadlyImportError("\"" + pNodeType + "\" node can be used only once in " + mReader->getNodeName() + ". Description: " + pDescription);
+void AMFImporter::Throw_MoreThanOnceDefined(const std::string &nodeName, const std::string &pNodeType, const std::string &pDescription) {
+    throw DeadlyImportError("\"" + pNodeType + "\" node can be used only once in " + nodeName + ". Description: " + pDescription);
 }
 
 void AMFImporter::Throw_ID_NotFound(const std::string &pID) const {
-    throw DeadlyImportError("Not found node with name \"" + pID + "\".");
+    throw DeadlyImportError("Not found node with name \"", pID, "\".");
 }
 
 /*********************************************************************************************************************************************/
 /************************************************************* Functions: XML set ************************************************************/
 /*********************************************************************************************************************************************/
 
-void AMFImporter::XML_CheckNode_MustHaveChildren() {
-    if (mReader->isEmptyElement()) throw DeadlyImportError(std::string("Node <") + mReader->getNodeName() + "> must have children.");
-}
-
-void AMFImporter::XML_CheckNode_SkipUnsupported(const std::string &pParentNodeName) {
-    static const size_t Uns_Skip_Len = 3;
-    const char *Uns_Skip[Uns_Skip_Len] = { "composite", "edge", "normal" };
-
-    static bool skipped_before[Uns_Skip_Len] = { false, false, false };
-
-    std::string nn(mReader->getNodeName());
-    bool found = false;
-    bool close_found = false;
-    size_t sk_idx;
-
-    for (sk_idx = 0; sk_idx < Uns_Skip_Len; sk_idx++) {
-        if (nn != Uns_Skip[sk_idx]) continue;
-
-        found = true;
-        if (mReader->isEmptyElement()) {
-            close_found = true;
-
-            goto casu_cres;
-        }
-
-        while (mReader->read()) {
-            if ((mReader->getNodeType() == irr::io::EXN_ELEMENT_END) && (nn == mReader->getNodeName())) {
-                close_found = true;
-
-                goto casu_cres;
-            }
-        }
-    } // for(sk_idx = 0; sk_idx < Uns_Skip_Len; sk_idx++)
-
-casu_cres:
-
-    if (!found) throw DeadlyImportError("Unknown node \"" + nn + "\" in " + pParentNodeName + ".");
-    if (!close_found) Throw_CloseNotFound(nn);
-
-    if (!skipped_before[sk_idx]) {
-        skipped_before[sk_idx] = true;
-        ASSIMP_LOG_WARN_F("Skipping node \"", nn, "\" in ", pParentNodeName, ".");
+void AMFImporter::XML_CheckNode_MustHaveChildren(pugi::xml_node &node) {
+    if (node.children().begin() == node.children().end()) {
+        throw DeadlyImportError(std::string("Node <") + node.name() + "> must have children.");
     }
 }
 
-bool AMFImporter::XML_SearchNode(const std::string &pNodeName) {
-    while (mReader->read()) {
-        if ((mReader->getNodeType() == irr::io::EXN_ELEMENT) && XML_CheckNode_NameEqual(pNodeName)) return true;
-    }
-
-    return false;
-}
-
-bool AMFImporter::XML_ReadNode_GetAttrVal_AsBool(const int pAttrIdx) {
-    std::string val(mReader->getAttributeValue(pAttrIdx));
-
-    if ((val == "false") || (val == "0"))
-        return false;
-    else if ((val == "true") || (val == "1"))
-        return true;
-    else
-        throw DeadlyImportError("Bool attribute value can contain \"false\"/\"0\" or \"true\"/\"1\" not the \"" + val + "\"");
-}
-
-float AMFImporter::XML_ReadNode_GetAttrVal_AsFloat(const int pAttrIdx) {
-    std::string val;
-    float tvalf;
-
-    ParseHelper_FixTruncatedFloatString(mReader->getAttributeValue(pAttrIdx), val);
-    fast_atoreal_move(val.c_str(), tvalf, false);
-
-    return tvalf;
-}
-
-uint32_t AMFImporter::XML_ReadNode_GetAttrVal_AsU32(const int pAttrIdx) {
-    return strtoul10(mReader->getAttributeValue(pAttrIdx));
-}
-
-float AMFImporter::XML_ReadNode_GetVal_AsFloat() {
-    std::string val;
-    float tvalf;
-
-    if (!mReader->read()) throw DeadlyImportError("XML_ReadNode_GetVal_AsFloat. No data, seems file is corrupt.");
-    if (mReader->getNodeType() != irr::io::EXN_TEXT) throw DeadlyImportError("XML_ReadNode_GetVal_AsFloat. Invalid type of XML element, seems file is corrupt.");
-
-    ParseHelper_FixTruncatedFloatString(mReader->getNodeData(), val);
-    fast_atoreal_move(val.c_str(), tvalf, false);
-
-    return tvalf;
-}
-
-uint32_t AMFImporter::XML_ReadNode_GetVal_AsU32() {
-    if (!mReader->read()) throw DeadlyImportError("XML_ReadNode_GetVal_AsU32. No data, seems file is corrupt.");
-    if (mReader->getNodeType() != irr::io::EXN_TEXT) throw DeadlyImportError("XML_ReadNode_GetVal_AsU32. Invalid type of XML element, seems file is corrupt.");
-
-    return strtoul10(mReader->getNodeData());
-}
-
-void AMFImporter::XML_ReadNode_GetVal_AsString(std::string &pValue) {
-    if (!mReader->read()) throw DeadlyImportError("XML_ReadNode_GetVal_AsString. No data, seems file is corrupt.");
-    if (mReader->getNodeType() != irr::io::EXN_TEXT)
-        throw DeadlyImportError("XML_ReadNode_GetVal_AsString. Invalid type of XML element, seems file is corrupt.");
-
-    pValue = mReader->getNodeData();
-}
-
-/*********************************************************************************************************************************************/
-/************************************************************ Functions: parse set ***********************************************************/
-/*********************************************************************************************************************************************/
-
-void AMFImporter::ParseHelper_Node_Enter(CAMFImporter_NodeElement *pNode) {
-    mNodeElement_Cur->Child.push_back(pNode); // add new element to current element child list.
-    mNodeElement_Cur = pNode; // switch current element to new one.
-}
-
-void AMFImporter::ParseHelper_Node_Exit() {
-    // check if we can walk up.
-    if (mNodeElement_Cur != nullptr) mNodeElement_Cur = mNodeElement_Cur->Parent;
+bool AMFImporter::XML_SearchNode(const std::string &nodeName) {
+    return nullptr != mXmlParser->findNode(nodeName);
 }
 
 void AMFImporter::ParseHelper_FixTruncatedFloatString(const char *pInStr, std::string &pOutString) {
@@ -362,29 +263,33 @@ void AMFImporter::ParseHelper_Decode_Base64(const std::string &pInputBase64, std
 }
 
 void AMFImporter::ParseFile(const std::string &pFile, IOSystem *pIOHandler) {
-    irr::io::IrrXMLReader *OldReader = mReader; // store current XMLreader.
     std::unique_ptr<IOStream> file(pIOHandler->Open(pFile, "rb"));
 
     // Check whether we can read from the file
     if (file.get() == nullptr) {
-        throw DeadlyImportError("Failed to open AMF file " + pFile + ".");
+        throw DeadlyImportError("Failed to open AMF file ", pFile, ".");
     }
 
-    // generate a XML reader for it
-    std::unique_ptr<CIrrXML_IOStreamReader> mIOWrapper(new CIrrXML_IOStreamReader(file.get()));
-    mReader = irr::io::createIrrXMLReader(mIOWrapper.get());
-    if (!mReader) throw DeadlyImportError("Failed to create XML reader for file" + pFile + ".");
-    //
-    // start reading
-    // search for root tag <amf>
-    if (XML_SearchNode("amf"))
-        ParseNode_Root();
-    else
-        throw DeadlyImportError("Root node \"amf\" not found.");
+    mXmlParser = new XmlParser();
+    if (!mXmlParser->parse(file.get())) {
+        delete mXmlParser;
+        throw DeadlyImportError("Failed to create XML reader for file" + pFile + ".");
+    }
 
-    delete mReader;
-    // restore old XMLreader
-    mReader = OldReader;
+    // Start reading, search for root tag <amf>
+    if (!mXmlParser->hasNode("amf")) {
+        throw DeadlyImportError("Root node \"amf\" not found.");
+    }
+    ParseNode_Root();
+} // namespace Assimp
+
+void AMFImporter::ParseHelper_Node_Enter(AMFNodeElementBase *node) {
+    mNodeElement_Cur->Child.push_back(node); // add new element to current element child list.
+    mNodeElement_Cur = node;
+}
+
+void AMFImporter::ParseHelper_Node_Exit() {
+    if (mNodeElement_Cur != nullptr) mNodeElement_Cur = mNodeElement_Cur->Parent;
 }
 
 // <amf
@@ -395,54 +300,48 @@ void AMFImporter::ParseFile(const std::string &pFile, IOSystem *pIOHandler) {
 // Root XML element.
 // Multi elements - No.
 void AMFImporter::ParseNode_Root() {
-    std::string unit, version;
-    CAMFImporter_NodeElement *ne(nullptr);
+    AMFNodeElementBase *ne = nullptr;
+    XmlNode *root = mXmlParser->findNode("amf");
+    if (nullptr == root) {
+        throw DeadlyImportError("Root node \"amf\" not found.");
+    }
+    XmlNode node = *root;
+    mUnit = node.attribute("unit").as_string();
+    mVersion = node.attribute("version").as_string();
 
     // Read attributes for node <amf>.
-    MACRO_ATTRREAD_LOOPBEG;
-    MACRO_ATTRREAD_CHECK_RET("unit", unit, mReader->getAttributeValue);
-    MACRO_ATTRREAD_CHECK_RET("version", version, mReader->getAttributeValue);
-    MACRO_ATTRREAD_LOOPEND_WSKIP;
-
     // Check attributes
     if (!mUnit.empty()) {
-        if ((mUnit != "inch") && (mUnit != "millimeter") && (mUnit != "meter") && (mUnit != "feet") && (mUnit != "micron")) Throw_IncorrectAttrValue("unit");
+        if ((mUnit != "inch") && (mUnit != "millimeter") && (mUnit != "meter") && (mUnit != "feet") && (mUnit != "micron")) {
+            Throw_IncorrectAttrValue("unit", mUnit);
+        }
     }
 
     // create root node element.
-    ne = new CAMFImporter_NodeElement_Root(nullptr);
+    ne = new AMFRoot(nullptr);
+
     mNodeElement_Cur = ne; // set first "current" element
     // and assign attribute's values
-    ((CAMFImporter_NodeElement_Root *)ne)->Unit = unit;
-    ((CAMFImporter_NodeElement_Root *)ne)->Version = version;
+    ((AMFRoot *)ne)->Unit = mUnit;
+    ((AMFRoot *)ne)->Version = mVersion;
 
     // Check for child nodes
-    if (!mReader->isEmptyElement()) {
-        MACRO_NODECHECK_LOOPBEGIN("amf");
-        if (XML_CheckNode_NameEqual("object")) {
-            ParseNode_Object();
-            continue;
+    for (XmlNode &currentNode : node.children() ) {
+        const std::string currentName = currentNode.name();
+        if (currentName == "object") {
+            ParseNode_Object(currentNode);
+        } else if (currentName == "material") {
+            ParseNode_Material(currentNode);
+        } else if (currentName == "texture") {
+            ParseNode_Texture(currentNode);
+        } else if (currentName == "constellation") {
+            ParseNode_Constellation(currentNode);
+        } else if (currentName == "metadata") {
+            ParseNode_Metadata(currentNode);
         }
-        if (XML_CheckNode_NameEqual("material")) {
-            ParseNode_Material();
-            continue;
-        }
-        if (XML_CheckNode_NameEqual("texture")) {
-            ParseNode_Texture();
-            continue;
-        }
-        if (XML_CheckNode_NameEqual("constellation")) {
-            ParseNode_Constellation();
-            continue;
-        }
-        if (XML_CheckNode_NameEqual("metadata")) {
-            ParseNode_Metadata();
-            continue;
-        }
-        MACRO_NODECHECK_LOOPEND("amf");
-        mNodeElement_Cur = ne; // force restore "current" element
-    } // if(!mReader->isEmptyElement())
-
+        mNodeElement_Cur = ne;
+    }
+    mNodeElement_Cur = ne; // force restore "current" element
     mNodeElement_List.push_back(ne); // add to node element list because its a new object in graph.
 }
 
@@ -453,40 +352,34 @@ void AMFImporter::ParseNode_Root() {
 // A collection of objects or constellations with specific relative locations.
 // Multi elements - Yes.
 // Parent element - <amf>.
-void AMFImporter::ParseNode_Constellation() {
+void AMFImporter::ParseNode_Constellation(XmlNode &node) {
     std::string id;
-    CAMFImporter_NodeElement *ne(nullptr);
-
-    // Read attributes for node <constellation>.
-    MACRO_ATTRREAD_LOOPBEG;
-    MACRO_ATTRREAD_CHECK_RET("id", id, mReader->getAttributeValue);
-    MACRO_ATTRREAD_LOOPEND;
+    id = node.attribute("id").as_string();
 
     // create and if needed - define new grouping object.
-    ne = new CAMFImporter_NodeElement_Constellation(mNodeElement_Cur);
+    AMFNodeElementBase *ne = new AMFConstellation(mNodeElement_Cur);
 
-    CAMFImporter_NodeElement_Constellation &als = *((CAMFImporter_NodeElement_Constellation *)ne); // alias for convenience
+    AMFConstellation &als = *((AMFConstellation *)ne); // alias for convenience
+
+    if (!id.empty()) {
+        als.ID = id;
+    }
 
-    if (!id.empty()) als.ID = id;
     // Check for child nodes
-    if (!mReader->isEmptyElement()) {
+    if (!node.empty()) {
         ParseHelper_Node_Enter(ne);
-        MACRO_NODECHECK_LOOPBEGIN("constellation");
-        if (XML_CheckNode_NameEqual("instance")) {
-            ParseNode_Instance();
-            continue;
+        for (XmlNode currentNode = node.first_child(); currentNode; currentNode = currentNode.next_sibling()) {
+            std::string name = currentNode.name();
+            if (name == "instance") {
+                ParseNode_Instance(currentNode);
+            } else if (name == "metadata") {
+                ParseNode_Metadata(currentNode);
+            }
         }
-        if (XML_CheckNode_NameEqual("metadata")) {
-            ParseNode_Metadata();
-            continue;
-        }
-        MACRO_NODECHECK_LOOPEND("constellation");
         ParseHelper_Node_Exit();
-    } // if(!mReader->isEmptyElement())
-    else {
-        mNodeElement_Cur->Child.push_back(ne); // Add element to child list of current element
-    } // if(!mReader->isEmptyElement()) else
-
+    } else {
+        mNodeElement_Cur->Child.push_back(ne);
+    }
     mNodeElement_List.push_back(ne); // and to node element list because its a new object in graph.
 }
 
@@ -497,47 +390,43 @@ void AMFImporter::ParseNode_Constellation() {
 // A collection of objects or constellations with specific relative locations.
 // Multi elements - Yes.
 // Parent element - <amf>.
-void AMFImporter::ParseNode_Instance() {
-    std::string objectid;
-    CAMFImporter_NodeElement *ne(nullptr);
+void AMFImporter::ParseNode_Instance(XmlNode &node) {
+    AMFNodeElementBase *ne(nullptr);
 
     // Read attributes for node <constellation>.
-    MACRO_ATTRREAD_LOOPBEG;
-    MACRO_ATTRREAD_CHECK_RET("objectid", objectid, mReader->getAttributeValue);
-    MACRO_ATTRREAD_LOOPEND;
+    std::string objectid = node.attribute("objectid").as_string();
 
     // used object id must be defined, check that.
-    if (objectid.empty()) throw DeadlyImportError("\"objectid\" in <instance> must be defined.");
+    if (objectid.empty()) {
+        throw DeadlyImportError("\"objectid\" in <instance> must be defined.");
+    }
     // create and define new grouping object.
-    ne = new CAMFImporter_NodeElement_Instance(mNodeElement_Cur);
-
-    CAMFImporter_NodeElement_Instance &als = *((CAMFImporter_NodeElement_Instance *)ne); // alias for convenience
-
+    ne = new AMFInstance(mNodeElement_Cur);
+    AMFInstance &als = *((AMFInstance *)ne);
     als.ObjectID = objectid;
-    // Check for child nodes
-    if (!mReader->isEmptyElement()) {
-        bool read_flag[6] = { false, false, false, false, false, false };
 
-        als.Delta.Set(0, 0, 0);
-        als.Rotation.Set(0, 0, 0);
+    if (!node.empty()) {
         ParseHelper_Node_Enter(ne);
-        MACRO_NODECHECK_LOOPBEGIN("instance");
-        MACRO_NODECHECK_READCOMP_F("deltax", read_flag[0], als.Delta.x);
-        MACRO_NODECHECK_READCOMP_F("deltay", read_flag[1], als.Delta.y);
-        MACRO_NODECHECK_READCOMP_F("deltaz", read_flag[2], als.Delta.z);
-        MACRO_NODECHECK_READCOMP_F("rx", read_flag[3], als.Rotation.x);
-        MACRO_NODECHECK_READCOMP_F("ry", read_flag[4], als.Rotation.y);
-        MACRO_NODECHECK_READCOMP_F("rz", read_flag[5], als.Rotation.z);
-        MACRO_NODECHECK_LOOPEND("instance");
+        for (XmlNode currentNode = node.first_child(); currentNode; currentNode = currentNode.next_sibling()) {
+            const std::string &currentName = currentNode.name();
+            if (currentName == "deltax") {
+                als.Delta.x = (ai_real)std::atof(currentNode.value());
+            } else if (currentName == "deltay") {
+                als.Delta.y = (ai_real)std::atof(currentNode.value());
+            } else if (currentName == "deltaz") {
+                als.Delta.z = (ai_real)std::atof(currentNode.value());
+            } else if (currentName == "rx") {
+                als.Delta.x = (ai_real)std::atof(currentNode.value());
+            } else if (currentName == "ry") {
+                als.Delta.y = (ai_real)std::atof(currentNode.value());
+            } else if (currentName == "rz") {
+                als.Delta.z = (ai_real)std::atof(currentNode.value());
+            }
+        }
         ParseHelper_Node_Exit();
-        // also convert degrees to radians.
-        als.Rotation.x = AI_MATH_PI_F * als.Rotation.x / 180.0f;
-        als.Rotation.y = AI_MATH_PI_F * als.Rotation.y / 180.0f;
-        als.Rotation.z = AI_MATH_PI_F * als.Rotation.z / 180.0f;
-    } // if(!mReader->isEmptyElement())
-    else {
-        mNodeElement_Cur->Child.push_back(ne); // Add element to child list of current element
-    } // if(!mReader->isEmptyElement()) else
+    } else {
+        mNodeElement_Cur->Child.push_back(ne);
+    }
 
     mNodeElement_List.push_back(ne); // and to node element list because its a new object in graph.
 }
@@ -549,51 +438,38 @@ void AMFImporter::ParseNode_Instance() {
 // An object definition.
 // Multi elements - Yes.
 // Parent element - <amf>.
-void AMFImporter::ParseNode_Object() {
-    std::string id;
-    CAMFImporter_NodeElement *ne(nullptr);
+void AMFImporter::ParseNode_Object(XmlNode &node) {
+    AMFNodeElementBase *ne = nullptr;
 
     // Read attributes for node <object>.
-    MACRO_ATTRREAD_LOOPBEG;
-    MACRO_ATTRREAD_CHECK_RET("id", id, mReader->getAttributeValue);
-    MACRO_ATTRREAD_LOOPEND;
+    std::string id = node.attribute("id").as_string();
 
     // create and if needed - define new geometry object.
-    ne = new CAMFImporter_NodeElement_Object(mNodeElement_Cur);
+    ne = new AMFObject(mNodeElement_Cur);
 
-    CAMFImporter_NodeElement_Object &als = *((CAMFImporter_NodeElement_Object *)ne); // alias for convenience
+    AMFObject &als = *((AMFObject *)ne); // alias for convenience
+
+    if (!id.empty()) {
+        als.ID = id;
+    }
 
-    if (!id.empty()) als.ID = id;
     // Check for child nodes
-    if (!mReader->isEmptyElement()) {
-        bool col_read = false;
-
+    if (!node.empty()) {
         ParseHelper_Node_Enter(ne);
-        MACRO_NODECHECK_LOOPBEGIN("object");
-        if (XML_CheckNode_NameEqual("color")) {
-            // Check if color already defined for object.
-            if (col_read) Throw_MoreThanOnceDefined("color", "Only one color can be defined for <object>.");
-            // read data and set flag about it
-            ParseNode_Color();
-            col_read = true;
-
-            continue;
+        for (XmlNode currentNode = node.first_child(); currentNode; currentNode = currentNode.next_sibling()) {
+            const std::string &currentName = currentNode.name();
+            if (currentName == "color") {
+                ParseNode_Color(currentNode);
+            } else if (currentName == "mesh") {
+                ParseNode_Mesh(currentNode);
+            } else if (currentName == "metadata") {
+                ParseNode_Metadata(currentNode);
+            }
         }
-
-        if (XML_CheckNode_NameEqual("mesh")) {
-            ParseNode_Mesh();
-            continue;
-        }
-        if (XML_CheckNode_NameEqual("metadata")) {
-            ParseNode_Metadata();
-            continue;
-        }
-        MACRO_NODECHECK_LOOPEND("object");
         ParseHelper_Node_Exit();
-    } // if(!mReader->isEmptyElement())
-    else {
+    } else {
         mNodeElement_Cur->Child.push_back(ne); // Add element to child list of current element
-    } // if(!mReader->isEmptyElement()) else
+    }
 
     mNodeElement_List.push_back(ne); // and to node element list because its a new object in graph.
 }
@@ -616,28 +492,20 @@ void AMFImporter::ParseNode_Object() {
 // "Revision" - specifies the revision of the entity
 // "Tolerance" - specifies the desired manufacturing tolerance of the entity in entity's unit system
 // "Volume" - specifies the total volume of the entity, in the entity's unit system, to be used for verification (object and volume only)
-void AMFImporter::ParseNode_Metadata() {
-    std::string type, value;
-    CAMFImporter_NodeElement *ne(nullptr);
+void AMFImporter::ParseNode_Metadata(XmlNode &node) {
+    AMFNodeElementBase *ne = nullptr;
+
+    std::string type = node.attribute("type").as_string(), value;
+    XmlParser::getValueAsString(node, value);
 
     // read attribute
-    MACRO_ATTRREAD_LOOPBEG;
-    MACRO_ATTRREAD_CHECK_RET("type", type, mReader->getAttributeValue);
-    MACRO_ATTRREAD_LOOPEND;
-    // and value of node.
-    value = mReader->getNodeData();
-    // Create node element and assign read data.
-    ne = new CAMFImporter_NodeElement_Metadata(mNodeElement_Cur);
-    ((CAMFImporter_NodeElement_Metadata *)ne)->Type = type;
-    ((CAMFImporter_NodeElement_Metadata *)ne)->Value = value;
+    ne = new AMFMetadata(mNodeElement_Cur);
+    ((AMFMetadata *)ne)->Type = type;
+    ((AMFMetadata *)ne)->Value = value;
     mNodeElement_Cur->Child.push_back(ne); // Add element to child list of current element
     mNodeElement_List.push_back(ne); // and to node element list because its a new object in graph.
 }
 
-/*********************************************************************************************************************************************/
-/******************************************************** Functions: BaseImporter set ********************************************************/
-/*********************************************************************************************************************************************/
-
 bool AMFImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool pCheckSig) const {
     const std::string extension = GetExtension(pFile);
 
@@ -645,9 +513,8 @@ bool AMFImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool p
         return true;
     }
 
-    if (!extension.length() || pCheckSig) {
+    if (extension.empty() || pCheckSig) {
         const char *tokens[] = { "<amf" };
-
         return SearchFileHeaderForToken(pIOHandler, pFile, tokens, 1);
     }
 
diff --git a/code/AssetLib/AMF/AMFImporter.hpp b/code/AssetLib/AMF/AMFImporter.hpp
index 5994717b8..4671559ee 100644
--- a/code/AssetLib/AMF/AMFImporter.hpp
+++ b/code/AssetLib/AMF/AMFImporter.hpp
@@ -5,8 +5,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -54,11 +52,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "AMFImporter_Node.hpp"
 
 // Header files, Assimp.
-#include <assimp/DefaultLogger.hpp>
-#include <assimp/importerdesc.h>
 #include "assimp/types.h"
 #include <assimp/BaseImporter.h>
-#include <assimp/irrXMLWrapper.h>
+#include <assimp/XmlParser.h>
+#include <assimp/importerdesc.h>
+#include <assimp/DefaultLogger.hpp>
 
 // Header files, stdlib.
 #include <set>
@@ -101,22 +99,21 @@ namespace Assimp {
 ///
 class AMFImporter : public BaseImporter {
 private:
-    struct SPP_Material;// forward declaration
+    struct SPP_Material; // forward declaration
 
-                        /// \struct SPP_Composite
-                        /// Data type for post-processing step. More suitable container for part of material's composition.
+    /// Data type for post-processing step. More suitable container for part of material's composition.
     struct SPP_Composite {
-        SPP_Material* Material;///< Pointer to material - part of composition.
-        std::string Formula;///< Formula for calculating ratio of \ref Material.
+        SPP_Material *Material; ///< Pointer to material - part of composition.
+        std::string Formula; ///< Formula for calculating ratio of \ref Material.
     };
 
     /// \struct SPP_Material
     /// Data type for post-processing step. More suitable container for material.
     struct SPP_Material {
-        std::string ID;///< Material ID.
-        std::list<CAMFImporter_NodeElement_Metadata*> Metadata;///< Metadata of material.
-        CAMFImporter_NodeElement_Color* Color;///< Color of material.
-        std::list<SPP_Composite> Composition;///< List of child materials if current material is composition of few another.
+        std::string ID; ///< Material ID.
+        std::list<AMFMetadata *> Metadata; ///< Metadata of material.
+        AMFColor *Color; ///< Color of material.
+        std::list<SPP_Composite> Composition; ///< List of child materials if current material is composition of few another.
 
         /// Return color calculated for specified coordinate.
         /// \param [in] pX - "x" coordinate.
@@ -129,304 +126,186 @@ private:
     /// Data type for post-processing step. More suitable container for texture.
     struct SPP_Texture {
         std::string ID;
-        size_t      Width, Height, Depth;
-        bool        Tiled;
-        char        FormatHint[9];// 8 for string + 1 for terminator.
-        uint8_t    *Data;
+        size_t Width, Height, Depth;
+        bool Tiled;
+        char FormatHint[9]; // 8 for string + 1 for terminator.
+        uint8_t *Data;
     };
 
     /// Data type for post-processing step. Contain face data.
     struct SComplexFace {
-        aiFace Face;///< Face vertices.
-        const CAMFImporter_NodeElement_Color* Color;///< Face color. Equal to nullptr if color is not set for the face.
-        const CAMFImporter_NodeElement_TexMap* TexMap;///< Face texture mapping data. Equal to nullptr if texture mapping is not set for the face.
+        aiFace Face; ///< Face vertices.
+        const AMFColor *Color; ///< Face color. Equal to nullptr if color is not set for the face.
+        const AMFTexMap *TexMap; ///< Face texture mapping data. Equal to nullptr if texture mapping is not set for the face.
     };
 
-	/// Clear all temporary data.
-	void Clear();
+    using AMFMetaDataArray = std::vector<AMFMetadata*>;
+    using MeshArray = std::vector<aiMesh*>;
+    using NodeArray = std::vector<aiNode*>;
 
-	/***********************************************/
-	/************* Functions: find set *************/
-	/***********************************************/
+    /// Clear all temporary data.
+    void Clear();
 
-	/// Find specified node element in node elements list ( \ref mNodeElement_List).
-	/// \param [in] pID - ID(name) of requested node element.
-	/// \param [in] pType - type of node element.
-	/// \param [out] pNode - pointer to pointer to item found.
-	/// \return true - if the node element is found, else - false.
-	bool Find_NodeElement(const std::string& pID, const CAMFImporter_NodeElement::EType pType, CAMFImporter_NodeElement** pNodeElement) const;
+    /// Get data stored in <vertices> and place it to arrays.
+    /// \param [in] pNodeElement - reference to node element which kept <object> data.
+    /// \param [in] pVertexCoordinateArray - reference to vertices coordinates kept in <vertices>.
+    /// \param [in] pVertexColorArray - reference to vertices colors for all <vertex's. If color for vertex is not set then corresponding member of array
+    /// contain nullptr.
+    void PostprocessHelper_CreateMeshDataArray(const AMFMesh &pNodeElement, std::vector<aiVector3D> &pVertexCoordinateArray,
+            std::vector<AMFColor *> &pVertexColorArray) const;
 
-	/// Find requested aiNode in node list.
-	/// \param [in] pID - ID(name) of requested node.
-	/// \param [in] pNodeList - list of nodes where to find the node.
-	/// \param [out] pNode - pointer to pointer to item found.
-	/// \return true - if the node is found, else - false.
-	bool Find_ConvertedNode(const std::string& pID, std::list<aiNode*>& pNodeList, aiNode** pNode) const;
+    /// Return converted texture ID which related to specified source textures ID's. If converted texture does not exist then it will be created and ID on new
+    /// converted texture will be returned. Conversion: set of textures from \ref CAMFImporter_NodeElement_Texture to one \ref SPP_Texture and place it
+    /// to converted textures list.
+    /// Any of source ID's can be absent(empty string) or even one ID only specified. But at least one ID must be specified.
+    /// \param [in] pID_R - ID of source "red" texture.
+    /// \param [in] pID_G - ID of source "green" texture.
+    /// \param [in] pID_B - ID of source "blue" texture.
+    /// \param [in] pID_A - ID of source "alpha" texture.
+    /// \return index of the texture in array of the converted textures.
+    size_t PostprocessHelper_GetTextureID_Or_Create(const std::string &pID_R, const std::string &pID_G, const std::string &pID_B, const std::string &pID_A);
 
-	/// Find material in list for converted materials. Use at postprocessing step.
-	/// \param [in] pID - material ID.
-	/// \param [out] pConvertedMaterial - pointer to found converted material (\ref SPP_Material).
-	/// \return true - if the material is found, else - false.
-	bool Find_ConvertedMaterial(const std::string& pID, const SPP_Material** pConvertedMaterial) const;
+    /// Separate input list by texture IDs. This step is needed because aiMesh can contain mesh which is use only one texture (or set: diffuse, bump etc).
+    /// \param [in] pInputList - input list with faces. Some of them can contain color or texture mapping, or both of them, or nothing. Will be cleared after
+    /// processing.
+    /// \param [out] pOutputList_Separated - output list of the faces lists. Separated faces list by used texture IDs. Will be cleared before processing.
+    void PostprocessHelper_SplitFacesByTextureID(std::list<SComplexFace> &pInputList, std::list<std::list<SComplexFace>> &pOutputList_Separated);
 
-    /// Find texture in list of converted textures. Use at postprocessing step,
-	/// \param [in] pID_R - ID of source "red" texture.
-	/// \param [in] pID_G - ID of source "green" texture.
-	/// \param [in] pID_B - ID of source "blue" texture.
-	/// \param [in] pID_A - ID of source "alpha" texture. Use empty string to find RGB-texture.
-	/// \param [out] pConvertedTextureIndex - pointer where index in list of found texture will be written. If equivalent to nullptr then nothing will be
-	/// written.
-	/// \return true - if the texture is found, else - false.
-	bool Find_ConvertedTexture(const std::string& pID_R, const std::string& pID_G, const std::string& pID_B, const std::string& pID_A,
-								uint32_t* pConvertedTextureIndex = nullptr) const;
+    /// Check if child elements of node element is metadata and add it to scene node.
+    /// \param [in] pMetadataList - reference to list with collected metadata.
+    /// \param [out] pSceneNode - scene node in which metadata will be added.
+    void Postprocess_AddMetadata(const AMFMetaDataArray &pMetadataList, aiNode &pSceneNode) const;
 
+    /// To create aiMesh and aiNode for it from <object>.
+    /// \param [in] pNodeElement - reference to node element which kept <object> data.
+    /// \param [out] meshList    - reference to a list with all aiMesh of the scene.
+    /// \param [out] pSceneNode  - pointer to place where new aiNode will be created.
+    void Postprocess_BuildNodeAndObject(const AMFObject &pNodeElement, MeshArray &meshList, aiNode **pSceneNode);
 
-	/// Get data stored in <vertices> and place it to arrays.
-	/// \param [in] pNodeElement - reference to node element which kept <object> data.
-	/// \param [in] pVertexCoordinateArray - reference to vertices coordinates kept in <vertices>.
-	/// \param [in] pVertexColorArray - reference to vertices colors for all <vertex's. If color for vertex is not set then corresponding member of array
-	/// contain nullptr.
-	void PostprocessHelper_CreateMeshDataArray(const CAMFImporter_NodeElement_Mesh& pNodeElement, std::vector<aiVector3D>& pVertexCoordinateArray,
-												std::vector<CAMFImporter_NodeElement_Color*>& pVertexColorArray) const;
+    /// Create mesh for every <volume> in <mesh>.
+    /// \param [in] pNodeElement - reference to node element which kept <mesh> data.
+    /// \param [in] pVertexCoordinateArray - reference to vertices coordinates for all <volume>'s.
+    /// \param [in] pVertexColorArray - reference to vertices colors for all <volume>'s. If color for vertex is not set then corresponding member of array
+    /// contain nullptr.
+    /// \param [in] pObjectColor - pointer to colors for <object>. If color is not set then argument contain nullptr.
+    /// \param [in] pMaterialList - reference to a list with defined materials.
+    /// \param [out] pMeshList - reference to a list with all aiMesh of the scene.
+    /// \param [out] pSceneNode - reference to aiNode which will own new aiMesh's.
+    void Postprocess_BuildMeshSet(const AMFMesh &pNodeElement, const std::vector<aiVector3D> &pVertexCoordinateArray,
+            const std::vector<AMFColor *> &pVertexColorArray, const AMFColor *pObjectColor,
+            MeshArray &pMeshList, aiNode &pSceneNode);
 
-	/// Return converted texture ID which related to specified source textures ID's. If converted texture does not exist then it will be created and ID on new
-	/// converted texture will be returned. Conversion: set of textures from \ref CAMFImporter_NodeElement_Texture to one \ref SPP_Texture and place it
-	/// to converted textures list.
-	/// Any of source ID's can be absent(empty string) or even one ID only specified. But at least one ID must be specified.
-	/// \param [in] pID_R - ID of source "red" texture.
-	/// \param [in] pID_G - ID of source "green" texture.
-	/// \param [in] pID_B - ID of source "blue" texture.
-	/// \param [in] pID_A - ID of source "alpha" texture.
-	/// \return index of the texture in array of the converted textures.
-	size_t PostprocessHelper_GetTextureID_Or_Create(const std::string& pID_R, const std::string& pID_G, const std::string& pID_B, const std::string& pID_A);
+    /// Convert material from \ref CAMFImporter_NodeElement_Material to \ref SPP_Material.
+    /// \param [in] pMaterial - source CAMFImporter_NodeElement_Material.
+    void Postprocess_BuildMaterial(const AMFMaterial &pMaterial);
 
-	/// Separate input list by texture IDs. This step is needed because aiMesh can contain mesh which is use only one texture (or set: diffuse, bump etc).
-	/// \param [in] pInputList - input list with faces. Some of them can contain color or texture mapping, or both of them, or nothing. Will be cleared after
-	/// processing.
-	/// \param [out] pOutputList_Separated - output list of the faces lists. Separated faces list by used texture IDs. Will be cleared before processing.
-	void PostprocessHelper_SplitFacesByTextureID(std::list<SComplexFace>& pInputList, std::list<std::list<SComplexFace> >& pOutputList_Separated);
+    /// Create and add to aiNode's list new part of scene graph defined by <constellation>.
+    /// \param [in] pConstellation - reference to <constellation> node.
+    /// \param [out] nodeArray     - reference to aiNode's list.
+    void Postprocess_BuildConstellation(AMFConstellation &pConstellation, NodeArray &nodeArray) const;
 
-	/// Check if child elements of node element is metadata and add it to scene node.
-	/// \param [in] pMetadataList - reference to list with collected metadata.
-	/// \param [out] pSceneNode - scene node in which metadata will be added.
-	void Postprocess_AddMetadata(const std::list<CAMFImporter_NodeElement_Metadata*>& pMetadataList, aiNode& pSceneNode) const;
+    /// Build Assimp scene graph in aiScene from collected data.
+    /// \param [out] pScene - pointer to aiScene where tree will be built.
+    void Postprocess_BuildScene(aiScene *pScene);
 
-	/// To create aiMesh and aiNode for it from <object>.
-	/// \param [in] pNodeElement - reference to node element which kept <object> data.
-	/// \param [out] pMeshList - reference to a list with all aiMesh of the scene.
-	/// \param [out] pSceneNode - pointer to place where new aiNode will be created.
-	void Postprocess_BuildNodeAndObject(const CAMFImporter_NodeElement_Object& pNodeElement, std::list<aiMesh*>& pMeshList, aiNode** pSceneNode);
+    /// Decode Base64-encoded data.
+    /// \param [in] pInputBase64 - reference to input Base64-encoded string.
+    /// \param [out] pOutputData - reference to output array for decoded data.
+    void ParseHelper_Decode_Base64(const std::string &pInputBase64, std::vector<uint8_t> &pOutputData) const;
 
-	/// Create mesh for every <volume> in <mesh>.
-	/// \param [in] pNodeElement - reference to node element which kept <mesh> data.
-	/// \param [in] pVertexCoordinateArray - reference to vertices coordinates for all <volume>'s.
-	/// \param [in] pVertexColorArray - reference to vertices colors for all <volume>'s. If color for vertex is not set then corresponding member of array
-	/// contain nullptr.
-	/// \param [in] pObjectColor - pointer to colors for <object>. If color is not set then argument contain nullptr.
-	/// \param [in] pMaterialList - reference to a list with defined materials.
-	/// \param [out] pMeshList - reference to a list with all aiMesh of the scene.
-	/// \param [out] pSceneNode - reference to aiNode which will own new aiMesh's.
-	void Postprocess_BuildMeshSet(const CAMFImporter_NodeElement_Mesh& pNodeElement, const std::vector<aiVector3D>& pVertexCoordinateArray,
-									const std::vector<CAMFImporter_NodeElement_Color*>& pVertexColorArray, const CAMFImporter_NodeElement_Color* pObjectColor,
-									std::list<aiMesh*>& pMeshList, aiNode& pSceneNode);
+    /// Parse <AMF> node of the file.
+    void ParseNode_Root();
 
-	/// Convert material from \ref CAMFImporter_NodeElement_Material to \ref SPP_Material.
-	/// \param [in] pMaterial - source CAMFImporter_NodeElement_Material.
-	void Postprocess_BuildMaterial(const CAMFImporter_NodeElement_Material& pMaterial);
+    /// Parse <constellation> node of the file.
+    void ParseNode_Constellation(XmlNode &node);
 
-	/// Create and add to aiNode's list new part of scene graph defined by <constellation>.
-	/// \param [in] pConstellation - reference to <constellation> node.
-	/// \param [out] pNodeList - reference to aiNode's list.
-	void Postprocess_BuildConstellation(CAMFImporter_NodeElement_Constellation& pConstellation, std::list<aiNode*>& pNodeList) const;
+    /// Parse <instance> node of the file.
+    void ParseNode_Instance(XmlNode &node);
 
-	/// Build Assimp scene graph in aiScene from collected data.
-	/// \param [out] pScene - pointer to aiScene where tree will be built.
-	void Postprocess_BuildScene(aiScene* pScene);
+    /// Parse <material> node of the file.
+    void ParseNode_Material(XmlNode &node);
 
+    /// Parse <metadata> node.
+    void ParseNode_Metadata(XmlNode &node);
 
-	/// Call that function when close tag of node not found and exception must be raised.
-	/// E.g.:
-	/// <amf>
-	///     <object>
-	/// </amf> <!--- object not closed --->
-	/// \throw DeadlyImportError.
-	/// \param [in] pNode - node name in which exception happened.
-	void Throw_CloseNotFound(const std::string& pNode);
+    /// Parse <object> node of the file.
+    void ParseNode_Object(XmlNode &node);
 
-	/// Call that function when attribute name is incorrect and exception must be raised.
-	/// \param [in] pAttrName - attribute name.
-	/// \throw DeadlyImportError.
-	void Throw_IncorrectAttr(const std::string& pAttrName);
+    /// Parse <texture> node of the file.
+    void ParseNode_Texture(XmlNode &node);
 
-	/// Call that function when attribute value is incorrect and exception must be raised.
-	/// \param [in] pAttrName - attribute name.
-	/// \throw DeadlyImportError.
-	void Throw_IncorrectAttrValue(const std::string& pAttrName);
+    /// Parse <coordinates> node of the file.
+    void ParseNode_Coordinates(XmlNode &node);
 
-	/// Call that function when some type of nodes are defined twice or more when must be used only once and exception must be raised.
-	/// E.g.:
-	/// <object>
-	///     <color>...    <!--- color defined --->
-	///     <color>...    <!--- color defined again --->
-	/// </object>
-	/// \throw DeadlyImportError.
-	/// \param [in] pNodeType - type of node which defined one more time.
-	/// \param [in] pDescription - message about error. E.g. what the node defined while exception raised.
-	void Throw_MoreThanOnceDefined(const std::string& pNodeType, const std::string& pDescription);
+    /// Parse <edge> node of the file.
+    void ParseNode_Edge(XmlNode &node);
 
-	/// Call that function when referenced element ID are not found in graph and exception must be raised.
-	/// \param [in] pID - ID of of element which not found.
-	/// \throw DeadlyImportError.
-	void Throw_ID_NotFound(const std::string& pID) const;
+    /// Parse <mesh> node of the file.
+    void ParseNode_Mesh(XmlNode &node);
 
-	/// Check if current node have children: <node>...</node>. If not then exception will throwed.
-	void XML_CheckNode_MustHaveChildren();
+    /// Parse <triangle> node of the file.
+    void ParseNode_Triangle(XmlNode &node);
 
-	/// Check if current node name is equal to pNodeName.
-	/// \param [in] pNodeName - name for checking.
-	/// return true if current node name is equal to pNodeName, else - false.
-	bool XML_CheckNode_NameEqual(const std::string& pNodeName) { return mReader->getNodeName() == pNodeName; }
+    /// Parse <vertex> node of the file.
+    void ParseNode_Vertex(XmlNode &node);
 
-	/// Skip unsupported node and report about that. Depend on node name can be skipped begin tag of node all whole node.
-	/// \param [in] pParentNodeName - parent node name. Used for reporting.
-	void XML_CheckNode_SkipUnsupported(const std::string& pParentNodeName);
+    /// Parse <vertices> node of the file.
+    void ParseNode_Vertices(XmlNode &node);
 
-	/// Search for specified node in file. XML file read pointer(mReader) will point to found node or file end after search is end.
-	/// \param [in] pNodeName - requested node name.
-	/// return true - if node is found, else - false.
-	bool XML_SearchNode(const std::string& pNodeName);
+    /// Parse <volume> node of the file.
+    void ParseNode_Volume(XmlNode &node);
 
-	/// Read attribute value.
-	/// \param [in] pAttrIdx - attribute index (\ref mReader->getAttribute* set).
-	/// \return read data.
-	bool XML_ReadNode_GetAttrVal_AsBool(const int pAttrIdx);
+    /// Parse <color> node of the file.
+    void ParseNode_Color(XmlNode &node);
 
-	/// Read attribute value.
-	/// \param [in] pAttrIdx - attribute index (\ref mReader->getAttribute* set).
-	/// \return read data.
-	float XML_ReadNode_GetAttrVal_AsFloat(const int pAttrIdx);
-
-	/// Read attribute value.
-	/// \param [in] pAttrIdx - attribute index (\ref mReader->getAttribute* set).
-	/// \return read data.
-	uint32_t XML_ReadNode_GetAttrVal_AsU32(const int pAttrIdx);
-
-	/// Read node value.
-	/// \return read data.
-	float XML_ReadNode_GetVal_AsFloat();
-
-	/// Read node value.
-	/// \return read data.
-	uint32_t XML_ReadNode_GetVal_AsU32();
-
-	/// Read node value.
-	/// \return read data.
-	void XML_ReadNode_GetVal_AsString(std::string& pValue);
-
-	/// Make pNode as current and enter deeper for parsing child nodes. At end \ref ParseHelper_Node_Exit must be called.
-	/// \param [in] pNode - new current node.
-	void ParseHelper_Node_Enter(CAMFImporter_NodeElement* pNode);
-
-	/// This function must be called when exiting from grouping node. \ref ParseHelper_Group_Begin.
-	void ParseHelper_Node_Exit();
-
-	/// Attribute values of floating point types can take form ".x"(without leading zero). irrXMLReader can not read this form of values and it
-	/// must be converted to right form - "0.xxx".
-	/// \param [in] pInStr - pointer to input string which can contain incorrect form of values.
-	/// \param [out[ pOutString - output string with right form of values.
-	void ParseHelper_FixTruncatedFloatString(const char* pInStr, std::string& pOutString);
-
-	/// Decode Base64-encoded data.
-	/// \param [in] pInputBase64 - reference to input Base64-encoded string.
-	/// \param [out] pOutputData - reference to output array for decoded data.
-	void ParseHelper_Decode_Base64(const std::string& pInputBase64, std::vector<uint8_t>& pOutputData) const;
-
-	/// Parse <AMF> node of the file.
-	void ParseNode_Root();
-
-	/// Parse <constellation> node of the file.
-	void ParseNode_Constellation();
-
-	/// Parse <instance> node of the file.
-	void ParseNode_Instance();
-
-	/// Parse <material> node of the file.
-	void ParseNode_Material();
-
-	/// Parse <metadata> node.
-	void ParseNode_Metadata();
-
-	/// Parse <object> node of the file.
-	void ParseNode_Object();
-
-	/// Parse <texture> node of the file.
-	void ParseNode_Texture();
-
-	/// Parse <coordinates> node of the file.
-	void ParseNode_Coordinates();
-
-	/// Parse <edge> node of the file.
-	void ParseNode_Edge();
-
-	/// Parse <mesh> node of the file.
-	void ParseNode_Mesh();
-
-	/// Parse <triangle> node of the file.
-	void ParseNode_Triangle();
-
-	/// Parse <vertex> node of the file.
-	void ParseNode_Vertex();
-
-	/// Parse <vertices> node of the file.
-	void ParseNode_Vertices();
-
-	/// Parse <volume> node of the file.
-	void ParseNode_Volume();
-
-	/// Parse <color> node of the file.
-	void ParseNode_Color();
-
-	/// Parse <texmap> of <map> node of the file.
-	/// \param [in] pUseOldName - if true then use old name of node(and children) - <map>, instead of new name - <texmap>.
-	void ParseNode_TexMap(const bool pUseOldName = false);
+    /// Parse <texmap> of <map> node of the file.
+    /// \param [in] pUseOldName - if true then use old name of node(and children) - <map>, instead of new name - <texmap>.
+    void ParseNode_TexMap(XmlNode &node, const bool pUseOldName = false);
 
 public:
-	/// Default constructor.
-	AMFImporter() AI_NO_EXCEPT
-    : mNodeElement_Cur(nullptr)
-    , mReader(nullptr) {
-        // empty
-    }
+    /// Default constructor.
+    AMFImporter() AI_NO_EXCEPT;
 
-	/// Default destructor.
-	~AMFImporter();
+    /// Default destructor.
+    ~AMFImporter();
 
-	/// Parse AMF file and fill scene graph. The function has no return value. Result can be found by analyzing the generated graph.
-	/// Also exception can be thrown if trouble will found.
-	/// \param [in] pFile - name of file to be parsed.
-	/// \param [in] pIOHandler - pointer to IO helper object.
-	void ParseFile(const std::string& pFile, IOSystem* pIOHandler);
-
-	bool CanRead(const std::string& pFile, IOSystem* pIOHandler, bool pCheckSig) const;
-	void GetExtensionList(std::set<std::string>& pExtensionList);
-	void InternReadFile(const std::string& pFile, aiScene* pScene, IOSystem* pIOHandler);
-	const aiImporterDesc* GetInfo ()const;
-
-    AMFImporter(const AMFImporter& pScene) = delete;
-    AMFImporter& operator=(const AMFImporter& pScene) = delete;
+    /// Parse AMF file and fill scene graph. The function has no return value. Result can be found by analyzing the generated graph.
+    /// Also exception can be thrown if trouble will found.
+    /// \param [in] pFile - name of file to be parsed.
+    /// \param [in] pIOHandler - pointer to IO helper object.
+    void ParseFile(const std::string &pFile, IOSystem *pIOHandler);
+    void ParseHelper_Node_Enter(AMFNodeElementBase *child);
+    void ParseHelper_Node_Exit();
+    bool CanRead(const std::string &pFile, IOSystem *pIOHandler, bool pCheckSig) const;
+    void GetExtensionList(std::set<std::string> &pExtensionList);
+    void InternReadFile(const std::string &pFile, aiScene *pScene, IOSystem *pIOHandler);
+    const aiImporterDesc *GetInfo() const;
+    bool Find_NodeElement(const std::string &pID, const AMFNodeElementBase::EType pType, AMFNodeElementBase **pNodeElement) const;
+    bool Find_ConvertedNode(const std::string &pID, NodeArray &nodeArray, aiNode **pNode) const;
+    bool Find_ConvertedMaterial(const std::string &pID, const SPP_Material **pConvertedMaterial) const;
+    void Throw_CloseNotFound(const std::string &nodeName);
+    void Throw_IncorrectAttr(const std::string &nodeName, const std::string &pAttrName);
+    void Throw_IncorrectAttrValue(const std::string &nodeName, const std::string &pAttrName);
+    void Throw_MoreThanOnceDefined(const std::string &nodeName, const std::string &pNodeType, const std::string &pDescription);
+    void Throw_ID_NotFound(const std::string &pID) const;
+    void XML_CheckNode_MustHaveChildren(pugi::xml_node &node);
+    bool XML_SearchNode(const std::string &nodeName);
+    void ParseHelper_FixTruncatedFloatString(const char *pInStr, std::string &pOutString);
+    AMFImporter(const AMFImporter &pScene) = delete;
+    AMFImporter &operator=(const AMFImporter &pScene) = delete;
 
 private:
     static const aiImporterDesc Description;
 
-    CAMFImporter_NodeElement* mNodeElement_Cur;///< Current element.
-    std::list<CAMFImporter_NodeElement*> mNodeElement_List;///< All elements of scene graph.
-    irr::io::IrrXMLReader* mReader;///< Pointer to XML-reader object
+    AMFNodeElementBase *mNodeElement_Cur; ///< Current element.
+    std::list<AMFNodeElementBase *> mNodeElement_List; ///< All elements of scene graph.
+    XmlParser *mXmlParser;
     std::string mUnit;
-    std::list<SPP_Material> mMaterial_Converted;///< List of converted materials for postprocessing step.
-    std::list<SPP_Texture> mTexture_Converted;///< List of converted textures for postprocessing step.
-
+    std::string mVersion;
+    std::list<SPP_Material> mMaterial_Converted; ///< List of converted materials for postprocessing step.
+    std::list<SPP_Texture> mTexture_Converted; ///< List of converted textures for postprocessing step.
 };
 
-}// namespace Assimp
+} // namespace Assimp
 
 #endif // INCLUDED_AI_AMF_IMPORTER_H
diff --git a/code/AssetLib/AMF/AMFImporter_Geometry.cpp b/code/AssetLib/AMF/AMFImporter_Geometry.cpp
index 45be05df1..7afe52311 100644
--- a/code/AssetLib/AMF/AMFImporter_Geometry.cpp
+++ b/code/AssetLib/AMF/AMFImporter_Geometry.cpp
@@ -5,8 +5,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -51,48 +49,47 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "AMFImporter.hpp"
 #include "AMFImporter_Macro.hpp"
 
-namespace Assimp
-{
+#include <assimp/ParsingUtils.h>
+
+namespace Assimp {
 
 // <mesh>
 // </mesh>
 // A 3D mesh hull.
 // Multi elements - Yes.
 // Parent element - <object>.
-void AMFImporter::ParseNode_Mesh()
-{
-CAMFImporter_NodeElement* ne;
+void AMFImporter::ParseNode_Mesh(XmlNode &node) {
+    AMFNodeElementBase *ne = nullptr;
 
-	// create new mesh object.
-	ne = new CAMFImporter_NodeElement_Mesh(mNodeElement_Cur);
-	// Check for child nodes
-	if(!mReader->isEmptyElement())
-	{
-		bool vert_read = false;
+    // Check for child nodes
+    if (0 != ASSIMP_stricmp(node.name(), "mesh")) {
+        return;
+    }
+    // create new mesh object.
+    ne = new AMFMesh(mNodeElement_Cur);
+    bool found_verts = false, found_volumes = false;
+    if (!node.empty()) {
+        ParseHelper_Node_Enter(ne);
+        pugi::xml_node vertNode = node.child("vertices");
+        if (!vertNode.empty()) {
+            ParseNode_Vertices(vertNode);
+            found_verts = true;
+        }
 
-		ParseHelper_Node_Enter(ne);
-		MACRO_NODECHECK_LOOPBEGIN("mesh");
-			if(XML_CheckNode_NameEqual("vertices"))
-			{
-				// Check if data already defined.
-				if(vert_read) Throw_MoreThanOnceDefined("vertices", "Only one vertices set can be defined for <mesh>.");
-				// read data and set flag about it
-				ParseNode_Vertices();
-				vert_read = true;
+        pugi::xml_node volumeNode = node.child("volume");
+        if (!volumeNode.empty()) {
+            ParseNode_Volume(volumeNode);
+            found_volumes = true;
+        }
+        ParseHelper_Node_Exit();
+    } 
 
-				continue;
-			}
+    if (!found_verts && !found_volumes) {
+        mNodeElement_Cur->Child.push_back(ne);
+    } // if(!mReader->isEmptyElement()) else
 
-			if(XML_CheckNode_NameEqual("volume")) { ParseNode_Volume(); continue; }
-		MACRO_NODECHECK_LOOPEND("mesh");
-		ParseHelper_Node_Exit();
-	}// if(!mReader->isEmptyElement())
-	else
-	{
-		mNodeElement_Cur->Child.push_back(ne);// Add element to child list of current element
-	}// if(!mReader->isEmptyElement()) else
-
-	mNodeElement_List.push_back(ne);// and to node element list because its a new object in graph.
+    // and to node element list because its a new object in graph.
+    mNodeElement_List.push_back(ne);
 }
 
 // <vertices>
@@ -100,27 +97,25 @@ CAMFImporter_NodeElement* ne;
 // The list of vertices to be used in defining triangles.
 // Multi elements - No.
 // Parent element - <mesh>.
-void AMFImporter::ParseNode_Vertices()
-{
-CAMFImporter_NodeElement* ne;
+void AMFImporter::ParseNode_Vertices(XmlNode &node) {
+    AMFNodeElementBase *ne = nullptr;
 
-	// create new mesh object.
-	ne = new CAMFImporter_NodeElement_Vertices(mNodeElement_Cur);
-	// Check for child nodes
-	if(!mReader->isEmptyElement())
-	{
-		ParseHelper_Node_Enter(ne);
-		MACRO_NODECHECK_LOOPBEGIN("vertices");
-			if(XML_CheckNode_NameEqual("vertex")) { ParseNode_Vertex(); continue; }
-		MACRO_NODECHECK_LOOPEND("vertices");
-		ParseHelper_Node_Exit();
-	}// if(!mReader->isEmptyElement())
-	else
-	{
-		mNodeElement_Cur->Child.push_back(ne);// Add element to child list of current element
-	}// if(!mReader->isEmptyElement()) else
+    // create new mesh object.
+    ne = new AMFVertices(mNodeElement_Cur);
+    // Check for child nodes
+    pugi::xml_node vertexNode = node.child("vertex");
+    if (!vertexNode.empty()) {
+        ParseHelper_Node_Enter(ne);
 
-	mNodeElement_List.push_back(ne);// and to node element list because its a new object in graph.
+        ParseNode_Vertex(vertexNode);
+
+        ParseHelper_Node_Exit();
+
+    } else {
+        mNodeElement_Cur->Child.push_back(ne); // Add element to child list of current element
+    } // if(!mReader->isEmptyElement()) else
+
+    mNodeElement_List.push_back(ne); // and to node element list because its a new object in graph.
 }
 
 // <vertex>
@@ -128,52 +123,35 @@ CAMFImporter_NodeElement* ne;
 // A vertex to be referenced in triangles.
 // Multi elements - Yes.
 // Parent element - <vertices>.
-void AMFImporter::ParseNode_Vertex()
-{
-CAMFImporter_NodeElement* ne;
+void AMFImporter::ParseNode_Vertex(XmlNode &node) {
+    AMFNodeElementBase *ne = nullptr;
 
-	// create new mesh object.
-	ne = new CAMFImporter_NodeElement_Vertex(mNodeElement_Cur);
-	// Check for child nodes
-	if(!mReader->isEmptyElement())
-	{
-		bool col_read = false;
-		bool coord_read = false;
+    // create new mesh object.
+    ne = new AMFVertex(mNodeElement_Cur);
 
-		ParseHelper_Node_Enter(ne);
-		MACRO_NODECHECK_LOOPBEGIN("vertex");
-			if(XML_CheckNode_NameEqual("color"))
-			{
-				// Check if data already defined.
-				if(col_read) Throw_MoreThanOnceDefined("color", "Only one color can be defined for <vertex>.");
-				// read data and set flag about it
-				ParseNode_Color();
-				col_read = true;
+    // Check for child nodes
+    pugi::xml_node colorNode = node.child("color");
+    bool col_read = false;
+    bool coord_read = false;
+    if (!node.empty()) {
+        ParseHelper_Node_Enter(ne);
+        if (!colorNode.empty()) {
+            ParseNode_Color(colorNode);
+            col_read = true;
+        }
+        pugi::xml_node coordNode = node.child("coordinates");
+        if (!coordNode.empty()) {
+            ParseNode_Coordinates(coordNode);
+            coord_read = true;
+        }
+        ParseHelper_Node_Exit();
+    }
 
-				continue;
-			}
+    if (!coord_read && !col_read) {
+        mNodeElement_Cur->Child.push_back(ne); // Add element to child list of current element
+    }
 
-			if(XML_CheckNode_NameEqual("coordinates"))
-			{
-				// Check if data already defined.
-				if(coord_read) Throw_MoreThanOnceDefined("coordinates", "Only one coordinates set can be defined for <vertex>.");
-				// read data and set flag about it
-				ParseNode_Coordinates();
-				coord_read = true;
-
-				continue;
-			}
-
-			if(XML_CheckNode_NameEqual("metadata")) { ParseNode_Metadata(); continue; }
-		MACRO_NODECHECK_LOOPEND("vertex");
-		ParseHelper_Node_Exit();
-	}// if(!mReader->isEmptyElement())
-	else
-	{
-		mNodeElement_Cur->Child.push_back(ne);// Add element to child list of current element
-	}// if(!mReader->isEmptyElement()) else
-
-	mNodeElement_List.push_back(ne);// and to node element list because its a new object in graph.
+    mNodeElement_List.push_back(ne); // and to node element list because its a new object in graph.
 }
 
 // <coordinates>
@@ -186,37 +164,32 @@ CAMFImporter_NodeElement* ne;
 //   <x>, <y>, <z>
 //   Multi elements - No.
 //   X, Y, or Z coordinate, respectively, of a vertex position in space.
-void AMFImporter::ParseNode_Coordinates()
-{
-CAMFImporter_NodeElement* ne;
+void AMFImporter::ParseNode_Coordinates(XmlNode &node) {
+    AMFNodeElementBase *ne = nullptr;
 
-	// create new color object.
-	ne = new CAMFImporter_NodeElement_Coordinates(mNodeElement_Cur);
+    // create new color object.
+    ne = new AMFCoordinates(mNodeElement_Cur);
 
-	CAMFImporter_NodeElement_Coordinates& als = *((CAMFImporter_NodeElement_Coordinates*)ne);// alias for convenience
+    AMFCoordinates &als = *((AMFCoordinates *)ne); // alias for convenience
+    if (!node.empty()) {
+        ParseHelper_Node_Enter(ne);
+        for (XmlNode &currentNode : node.children()) {
+            const std::string &currentName = currentNode.name();
+            if (currentName == "X") {
+                XmlParser::getValueAsFloat(currentNode, als.Coordinate.x);
+            } else if (currentName == "Y") {
+                XmlParser::getValueAsFloat(currentNode, als.Coordinate.y);
+            } else if (currentName == "Z") {
+                XmlParser::getValueAsFloat(currentNode, als.Coordinate.z);
+            }
+        }
 
-	// Check for child nodes
-	if(!mReader->isEmptyElement())
-	{
-		bool read_flag[3] = { false, false, false };
+        ParseHelper_Node_Exit();
+    } else {
+        mNodeElement_Cur->Child.push_back(ne);
+    }
 
-		ParseHelper_Node_Enter(ne);
-		MACRO_NODECHECK_LOOPBEGIN("coordinates");
-			MACRO_NODECHECK_READCOMP_F("x", read_flag[0], als.Coordinate.x);
-			MACRO_NODECHECK_READCOMP_F("y", read_flag[1], als.Coordinate.y);
-			MACRO_NODECHECK_READCOMP_F("z", read_flag[2], als.Coordinate.z);
-		MACRO_NODECHECK_LOOPEND("coordinates");
-		ParseHelper_Node_Exit();
-		// check that all components was defined
-		if((read_flag[0] && read_flag[1] && read_flag[2]) == 0) throw DeadlyImportError("Not all coordinate's components are defined.");
-
-	}// if(!mReader->isEmptyElement())
-	else
-	{
-		mNodeElement_Cur->Child.push_back(ne);// Add element to child list of current element
-	}// if(!mReader->isEmptyElement()) else
-
-	mNodeElement_List.push_back(ne);// and to node element list because its a new object in graph.
+    mNodeElement_List.push_back(ne); // and to node element list because its a new object in graph.
 }
 
 // <volume
@@ -228,52 +201,41 @@ CAMFImporter_NodeElement* ne;
 // Defines a volume from the established vertex list.
 // Multi elements - Yes.
 // Parent element - <mesh>.
-void AMFImporter::ParseNode_Volume()
-{
-std::string materialid;
-std::string type;
-CAMFImporter_NodeElement* ne;
+void AMFImporter::ParseNode_Volume(XmlNode &node) {
+    std::string materialid;
+    std::string type;
+    AMFNodeElementBase *ne = new AMFVolume(mNodeElement_Cur);
 
-	// Read attributes for node <color>.
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECK_RET("materialid", materialid, mReader->getAttributeValue);
-		MACRO_ATTRREAD_CHECK_RET("type", type, mReader->getAttributeValue);
-	MACRO_ATTRREAD_LOOPEND;
+    // Read attributes for node <color>.
+    // and assign read data
+   
+    ((AMFVolume *)ne)->MaterialID = node.attribute("materialid").as_string();
+     
+    ((AMFVolume *)ne)->Type = type;
+    // Check for child nodes
+    bool col_read = false;
+    if (!node.empty()) {
+        ParseHelper_Node_Enter(ne);
+        for (XmlNode currentNode = node.first_child(); currentNode; currentNode = currentNode.next_sibling()) {
+            const std::string currentName = currentNode.name();
+            if (currentName == "color") {
+                if (col_read) Throw_MoreThanOnceDefined(currentName, "color", "Only one color can be defined for <volume>.");
+                ParseNode_Color(currentNode);
+                col_read = true;
+            } else if (currentName == "triangle") {
+                ParseNode_Triangle(currentNode);
+            } else if (currentName == "metadata") {
+                ParseNode_Metadata(currentNode);
+            } else if (currentName == "volume") {
+                ParseNode_Metadata(currentNode);
+            }
+        }
+        ParseHelper_Node_Exit();
+    } else {
+        mNodeElement_Cur->Child.push_back(ne); // Add element to child list of current element
+    }
 
-	// create new object.
-	ne = new CAMFImporter_NodeElement_Volume(mNodeElement_Cur);
-	// and assign read data
-	((CAMFImporter_NodeElement_Volume*)ne)->MaterialID = materialid;
-	((CAMFImporter_NodeElement_Volume*)ne)->Type = type;
-	// Check for child nodes
-	if(!mReader->isEmptyElement())
-	{
-		bool col_read = false;
-
-		ParseHelper_Node_Enter(ne);
-		MACRO_NODECHECK_LOOPBEGIN("volume");
-			if(XML_CheckNode_NameEqual("color"))
-			{
-				// Check if data already defined.
-				if(col_read) Throw_MoreThanOnceDefined("color", "Only one color can be defined for <volume>.");
-				// read data and set flag about it
-				ParseNode_Color();
-				col_read = true;
-
-				continue;
-			}
-
-			if(XML_CheckNode_NameEqual("triangle")) { ParseNode_Triangle(); continue; }
-			if(XML_CheckNode_NameEqual("metadata")) { ParseNode_Metadata(); continue; }
-		MACRO_NODECHECK_LOOPEND("volume");
-		ParseHelper_Node_Exit();
-	}// if(!mReader->isEmptyElement())
-	else
-	{
-		mNodeElement_Cur->Child.push_back(ne);// Add element to child list of current element
-	}// if(!mReader->isEmptyElement()) else
-
-	mNodeElement_List.push_back(ne);// and to node element list because its a new object in graph.
+    mNodeElement_List.push_back(ne); // and to node element list because its a new object in graph.
 }
 
 // <triangle>
@@ -286,72 +248,42 @@ CAMFImporter_NodeElement* ne;
 //   <v1>, <v2>, <v3>
 //   Multi elements - No.
 //   Index of the desired vertices in a triangle or edge.
-void AMFImporter::ParseNode_Triangle()
-{
-CAMFImporter_NodeElement* ne;
+void AMFImporter::ParseNode_Triangle(XmlNode &node) {
+    AMFNodeElementBase *ne = new AMFTriangle(mNodeElement_Cur);
 
-	// create new color object.
-	ne = new CAMFImporter_NodeElement_Triangle(mNodeElement_Cur);
+    // create new triangle object.
 
-	CAMFImporter_NodeElement_Triangle& als = *((CAMFImporter_NodeElement_Triangle*)ne);// alias for convenience
+    AMFTriangle &als = *((AMFTriangle *)ne); // alias for convenience
 
-	// Check for child nodes
-	if(!mReader->isEmptyElement())
-	{
-		bool col_read = false, tex_read = false;
-		bool read_flag[3] = { false, false, false };
+    bool col_read = false;
+    if (!node.empty()) {
+        ParseHelper_Node_Enter(ne);
+        for (XmlNode currentNode = node.first_child(); currentNode; currentNode = currentNode.next_sibling()) {
+            const std::string currentName = currentNode.name();
+            if (currentName == "color") {
+                if (col_read) Throw_MoreThanOnceDefined(currentName, "color", "Only one color can be defined for <triangle>.");
+                ParseNode_Color(currentNode);
+                col_read = true;
+            } else if (currentName == "texmap") {
+                ParseNode_TexMap(currentNode);
+            } else if (currentName == "map") {
+                ParseNode_TexMap(currentNode, true);
+            } else if (currentName == "v1") {
+                als.V[0] = std::atoi(currentNode.value());
+            } else if (currentName == "v2") {
+                als.V[1] = std::atoi(currentNode.value());
+            } else if (currentName == "v3") {
+                als.V[2] = std::atoi(currentNode.value());
+            }
+        }
+        ParseHelper_Node_Exit();
+    } else {
+        mNodeElement_Cur->Child.push_back(ne); // Add element to child list of current element
+    }
 
-		ParseHelper_Node_Enter(ne);
-		MACRO_NODECHECK_LOOPBEGIN("triangle");
-			if(XML_CheckNode_NameEqual("color"))
-			{
-				// Check if data already defined.
-				if(col_read) Throw_MoreThanOnceDefined("color", "Only one color can be defined for <triangle>.");
-				// read data and set flag about it
-				ParseNode_Color();
-				col_read = true;
-
-				continue;
-			}
-
-			if(XML_CheckNode_NameEqual("texmap"))// new name of node: "texmap".
-			{
-				// Check if data already defined.
-				if(tex_read) Throw_MoreThanOnceDefined("texmap", "Only one texture coordinate can be defined for <triangle>.");
-				// read data and set flag about it
-				ParseNode_TexMap();
-				tex_read = true;
-
-				continue;
-			}
-			else if(XML_CheckNode_NameEqual("map"))// old name of node: "map".
-			{
-				// Check if data already defined.
-				if(tex_read) Throw_MoreThanOnceDefined("map", "Only one texture coordinate can be defined for <triangle>.");
-				// read data and set flag about it
-				ParseNode_TexMap(true);
-				tex_read = true;
-
-				continue;
-			}
-
-			MACRO_NODECHECK_READCOMP_U32("v1", read_flag[0], als.V[0]);
-			MACRO_NODECHECK_READCOMP_U32("v2", read_flag[1], als.V[1]);
-			MACRO_NODECHECK_READCOMP_U32("v3", read_flag[2], als.V[2]);
-		MACRO_NODECHECK_LOOPEND("triangle");
-		ParseHelper_Node_Exit();
-		// check that all components was defined
-		if((read_flag[0] && read_flag[1] && read_flag[2]) == 0) throw DeadlyImportError("Not all vertices of the triangle are defined.");
-
-	}// if(!mReader->isEmptyElement())
-	else
-	{
-		mNodeElement_Cur->Child.push_back(ne);// Add element to child list of current element
-	}// if(!mReader->isEmptyElement()) else
-
-	mNodeElement_List.push_back(ne);// and to node element list because its a new object in graph.
+    mNodeElement_List.push_back(ne); // and to node element list because its a new object in graph.
 }
 
-}// namespace Assimp
+} // namespace Assimp
 
 #endif // !ASSIMP_BUILD_NO_AMF_IMPORTER
diff --git a/code/AssetLib/AMF/AMFImporter_Macro.hpp b/code/AssetLib/AMF/AMFImporter_Macro.hpp
index 5877a62d2..c1a6e3f2d 100644
--- a/code/AssetLib/AMF/AMFImporter_Macro.hpp
+++ b/code/AssetLib/AMF/AMFImporter_Macro.hpp
@@ -5,8 +5,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
diff --git a/code/AssetLib/AMF/AMFImporter_Material.cpp b/code/AssetLib/AMF/AMFImporter_Material.cpp
index 7ab5710da..e1b6c3e8b 100644
--- a/code/AssetLib/AMF/AMFImporter_Material.cpp
+++ b/code/AssetLib/AMF/AMFImporter_Material.cpp
@@ -5,8 +5,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -49,10 +47,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef ASSIMP_BUILD_NO_AMF_IMPORTER
 
 #include "AMFImporter.hpp"
-#include "AMFImporter_Macro.hpp"
 
-namespace Assimp
-{
+namespace Assimp {
 
 // <color
 // profile="" - The ICC color space used to interpret the three color channels <r>, <g> and <b>.
@@ -68,46 +64,44 @@ namespace Assimp
 //   Multi elements - No.
 //   Red, Greed, Blue and Alpha (transparency) component of a color in sRGB space, values ranging from 0 to 1. The
 //   values can be specified as constants, or as a formula depending on the coordinates.
-void AMFImporter::ParseNode_Color() {
-    std::string profile;
-    CAMFImporter_NodeElement* ne;
-
-	// Read attributes for node <color>.
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECK_RET("profile", profile, mReader->getAttributeValue);
-	MACRO_ATTRREAD_LOOPEND;
-
+void AMFImporter::ParseNode_Color(XmlNode &node) {
+    std::string profile = node.attribute("profile").as_string();
+    
 	// create new color object.
-	ne = new CAMFImporter_NodeElement_Color(mNodeElement_Cur);
-
-	CAMFImporter_NodeElement_Color& als = *((CAMFImporter_NodeElement_Color*)ne);// alias for convenience
+	AMFNodeElementBase *ne = new AMFColor(mNodeElement_Cur);
+	AMFColor& als = *((AMFColor*)ne);// alias for convenience
 
 	als.Profile = profile;
-	// Check for child nodes
-	if(!mReader->isEmptyElement())
-	{
+	if (!node.empty()) {
+        ParseHelper_Node_Enter(ne);
 		bool read_flag[4] = { false, false, false, false };
-
-		ParseHelper_Node_Enter(ne);
-		MACRO_NODECHECK_LOOPBEGIN("color");
-			MACRO_NODECHECK_READCOMP_F("r", read_flag[0], als.Color.r);
-			MACRO_NODECHECK_READCOMP_F("g", read_flag[1], als.Color.g);
-			MACRO_NODECHECK_READCOMP_F("b", read_flag[2], als.Color.b);
-			MACRO_NODECHECK_READCOMP_F("a", read_flag[3], als.Color.a);
-		MACRO_NODECHECK_LOOPEND("color");
-		ParseHelper_Node_Exit();
+		for (pugi::xml_node &child : node.children()) {
+            std::string name = child.name();
+            if ( name == "r") {
+				read_flag[0] = true;
+                XmlParser::getValueAsFloat(child, als.Color.r);
+            } else if (name == "g") {
+				read_flag[1] = true;
+                XmlParser::getValueAsFloat(child, als.Color.g);
+            } else if (name == "b") {
+				read_flag[2] = true;
+                XmlParser::getValueAsFloat(child, als.Color.b);
+            } else if (name == "a") {
+			    read_flag[3] = true;
+                XmlParser::getValueAsFloat(child, als.Color.a);
+            }
+            ParseHelper_Node_Exit();
+        }
 		// check that all components was defined
-        if (!(read_flag[0] && read_flag[1] && read_flag[2])) {
-            throw DeadlyImportError("Not all color components are defined.");
-        }
+		if (!(read_flag[0] && read_flag[1] && read_flag[2])) {
+			throw DeadlyImportError("Not all color components are defined.");
+		}
 
-        // check if <a> is absent. Then manually add "a == 1".
-        if (!read_flag[3]) {
-            als.Color.a = 1;
-        }
-	}
-	else
-	{
+		// check if <a> is absent. Then manually add "a == 1".
+		if (!read_flag[3]) {
+			als.Color.a = 1;
+		}
+	} else {
 		mNodeElement_Cur->Child.push_back(ne);// Add element to child list of current element
 	}
 
@@ -122,45 +116,25 @@ void AMFImporter::ParseNode_Color() {
 // An available material.
 // Multi elements - Yes.
 // Parent element - <amf>.
-void AMFImporter::ParseNode_Material() {
-    std::string id;
-    CAMFImporter_NodeElement* ne;
-
-	// Read attributes for node <color>.
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECK_RET("id", id, mReader->getAttributeValue);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// create new object.
-	ne = new CAMFImporter_NodeElement_Material(mNodeElement_Cur);
-
-    // and assign read data
-	((CAMFImporter_NodeElement_Material*)ne)->ID = id;
+void AMFImporter::ParseNode_Material(XmlNode &node) {
+    // create new object and assign read data
+	std::string id = node.attribute("id").as_string();
+	AMFNodeElementBase *ne = new AMFMaterial(mNodeElement_Cur);
+	((AMFMaterial*)ne)->ID = id;
 
     // Check for child nodes
-	if(!mReader->isEmptyElement())
-	{
-		bool col_read = false;
-
-		ParseHelper_Node_Enter(ne);
-		MACRO_NODECHECK_LOOPBEGIN("material");
-			if(XML_CheckNode_NameEqual("color"))
-			{
-				// Check if data already defined.
-				if(col_read) Throw_MoreThanOnceDefined("color", "Only one color can be defined for <material>.");
-				// read data and set flag about it
-				ParseNode_Color();
-				col_read = true;
-
-				continue;
+	if (!node.empty()) {
+        ParseHelper_Node_Enter(ne);
+        for (pugi::xml_node &child : node.children()) {
+            const std::string name = child.name();
+            if (name == "color") {
+				ParseNode_Color(child);
+            } else if (name == "metadata") {
+				ParseNode_Metadata(child);
 			}
-
-			if(XML_CheckNode_NameEqual("metadata")) { ParseNode_Metadata(); continue; }
-		MACRO_NODECHECK_LOOPEND("material");
-		ParseHelper_Node_Exit();
-	}
-	else
-	{
+		}
+        ParseHelper_Node_Exit();
+	} else {
 		mNodeElement_Cur->Child.push_back(ne);// Add element to child list of current element
 	}
 
@@ -183,51 +157,41 @@ void AMFImporter::ParseNode_Material() {
 // then layer by layer.
 // Multi elements - Yes.
 // Parent element - <amf>.
-void AMFImporter::ParseNode_Texture()
-{
-    std::string id;
-    uint32_t width = 0;
-    uint32_t height = 0;
-    uint32_t depth = 1;
-    std::string type;
-    bool tiled = false;
-    std::string enc64_data;
+void AMFImporter::ParseNode_Texture(XmlNode &node) {
+    std::string id = node.attribute("id").as_string();
+	uint32_t width = node.attribute("width").as_uint();
+	uint32_t height = node.attribute("height").as_uint();
+	uint32_t depth = node.attribute("depth").as_uint();
+	std::string type = node.attribute("type").as_string();
+	bool tiled = node.attribute("tiled").as_bool();
 
-	// Read attributes for node <color>.
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECK_RET("id", id, mReader->getAttributeValue);
-		MACRO_ATTRREAD_CHECK_RET("width", width, XML_ReadNode_GetAttrVal_AsU32);
-		MACRO_ATTRREAD_CHECK_RET("height", height, XML_ReadNode_GetAttrVal_AsU32);
-		MACRO_ATTRREAD_CHECK_RET("depth", depth, XML_ReadNode_GetAttrVal_AsU32);
-		MACRO_ATTRREAD_CHECK_RET("type", type, mReader->getAttributeValue);
-		MACRO_ATTRREAD_CHECK_RET("tiled", tiled, XML_ReadNode_GetAttrVal_AsBool);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// create new texture object.
-    CAMFImporter_NodeElement *ne = new CAMFImporter_NodeElement_Texture(mNodeElement_Cur);
-
-	CAMFImporter_NodeElement_Texture& als = *((CAMFImporter_NodeElement_Texture*)ne);// alias for convenience
-
-	// Check for child nodes
-    if (!mReader->isEmptyElement()) {
-        XML_ReadNode_GetVal_AsString(enc64_data);
+    if (node.empty()) {
+		return;
     }
 
+    // create new texture object.
+    AMFNodeElementBase *ne = new AMFTexture(mNodeElement_Cur);
+
+	AMFTexture& als = *((AMFTexture*)ne);// alias for convenience
+
+    std::string enc64_data = node.value();
+	// Check for child nodes
+
 	// check that all components was defined
     if (id.empty()) {
-        throw DeadlyImportError("ID for texture must be defined.");
+		throw DeadlyImportError("ID for texture must be defined.");
     }
     if (width < 1) {
-        Throw_IncorrectAttrValue("width");
+		throw DeadlyImportError("INvalid width for texture.");
     }
     if (height < 1) {
-        Throw_IncorrectAttrValue("height");
-    }
+		throw DeadlyImportError("Invalid height for texture.");
+	}
     if (depth < 1) {
-        Throw_IncorrectAttrValue("depth");
+		throw DeadlyImportError("Invalid depth for texture.");
     }
     if (type != "grayscale") {
-        Throw_IncorrectAttrValue("type");
+		throw DeadlyImportError("Invalid type for texture.");
     }
     if (enc64_data.empty()) {
         throw DeadlyImportError("Texture data not defined.");
@@ -263,57 +227,94 @@ void AMFImporter::ParseNode_Texture()
 //   <utex1>, <utex2>, <utex3>, <vtex1>, <vtex2>, <vtex3>. Old name: <u1>, <u2>, <u3>, <v1>, <v2>, <v3>.
 //   Multi elements - No.
 //   Texture coordinates for every vertex of triangle.
-void AMFImporter::ParseNode_TexMap(const bool pUseOldName) {
-    std::string rtexid, gtexid, btexid, atexid;
-
+void AMFImporter::ParseNode_TexMap(XmlNode &node, const bool pUseOldName) {
 	// Read attributes for node <color>.
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECK_RET("rtexid", rtexid, mReader->getAttributeValue);
-		MACRO_ATTRREAD_CHECK_RET("gtexid", gtexid, mReader->getAttributeValue);
-		MACRO_ATTRREAD_CHECK_RET("btexid", btexid, mReader->getAttributeValue);
-		MACRO_ATTRREAD_CHECK_RET("atexid", atexid, mReader->getAttributeValue);
-	MACRO_ATTRREAD_LOOPEND;
+    AMFNodeElementBase *ne = new AMFTexMap(mNodeElement_Cur);
+    AMFTexMap &als = *((AMFTexMap *)ne); //
+    std::string rtexid, gtexid, btexid, atexid;
+    if (!node.empty()) {
+        ParseHelper_Node_Enter(ne);
+        for (XmlNode &currentNode : node.children()) {
+            const std::string &currentName = currentNode.name();
+            if (currentName == "rtexid") {
+                XmlParser::getValueAsString(node, rtexid);
+            } else if (currentName == "gtexid") {
+                XmlParser::getValueAsString(node, gtexid);
+            } else if (currentName == "btexid") {
+                XmlParser::getValueAsString(node, btexid);
+            } else if (currentName == "atexid") {
+                XmlParser::getValueAsString(node, atexid);
+            }
+        }
+        ParseHelper_Node_Exit();
+    }
 
-	// create new texture coordinates object.
-    CAMFImporter_NodeElement *ne = new CAMFImporter_NodeElement_TexMap(mNodeElement_Cur);
-
-	CAMFImporter_NodeElement_TexMap& als = *((CAMFImporter_NodeElement_TexMap*)ne);// alias for convenience
+	// create new texture coordinates object, alias for convenience
 	// check data
-	if(rtexid.empty() && gtexid.empty() && btexid.empty()) throw DeadlyImportError("ParseNode_TexMap. At least one texture ID must be defined.");
+	if (rtexid.empty() && gtexid.empty() && btexid.empty()) {
+		throw DeadlyImportError("ParseNode_TexMap. At least one texture ID must be defined.");
+	}
+
 	// Check for children nodes
-	XML_CheckNode_MustHaveChildren();
+	//XML_CheckNode_MustHaveChildren();
+	if (node.children().begin() == node.children().end()) {
+		throw DeadlyImportError("Invalid children definition.");
+	}
 	// read children nodes
 	bool read_flag[6] = { false, false, false, false, false, false };
 
-	ParseHelper_Node_Enter(ne);
-	if(!pUseOldName)
-	{
-		MACRO_NODECHECK_LOOPBEGIN("texmap");
-			MACRO_NODECHECK_READCOMP_F("utex1", read_flag[0], als.TextureCoordinate[0].x);
-			MACRO_NODECHECK_READCOMP_F("utex2", read_flag[1], als.TextureCoordinate[1].x);
-			MACRO_NODECHECK_READCOMP_F("utex3", read_flag[2], als.TextureCoordinate[2].x);
-			MACRO_NODECHECK_READCOMP_F("vtex1", read_flag[3], als.TextureCoordinate[0].y);
-			MACRO_NODECHECK_READCOMP_F("vtex2", read_flag[4], als.TextureCoordinate[1].y);
-			MACRO_NODECHECK_READCOMP_F("vtex3", read_flag[5], als.TextureCoordinate[2].y);
-		MACRO_NODECHECK_LOOPEND("texmap");
+	if (!pUseOldName) {
+		for (pugi::xml_attribute &attr : node.attributes()) {
+            const std::string name = attr.name();
+            if (name == "utex1") {
+				read_flag[0] = true;
+				als.TextureCoordinate[0].x = attr.as_float();
+            } else if (name == "utex2") {
+				read_flag[1] = true;
+				als.TextureCoordinate[1].x = attr.as_float();
+            } else if (name == "utex3") {
+				read_flag[2] = true;
+				als.TextureCoordinate[2].x = attr.as_float();
+            } else if (name == "vtex1") {
+				read_flag[3] = true;
+				als.TextureCoordinate[0].y = attr.as_float();
+            } else if (name == "vtex2") {
+				read_flag[4] = true;
+				als.TextureCoordinate[1].y = attr.as_float();
+            } else if (name == "vtex3") {
+				read_flag[5] = true;
+				als.TextureCoordinate[0].y = attr.as_float();
+			}
+		}
+	} else {
+		for (pugi::xml_attribute &attr : node.attributes()) {
+            const std::string name = attr.name();
+            if (name == "u") {
+				read_flag[0] = true;
+				als.TextureCoordinate[0].x = attr.as_float();
+            } else if (name == "u2") {
+				read_flag[1] = true;
+				als.TextureCoordinate[1].x = attr.as_float();
+            } else if (name == "u3") {
+				read_flag[2] = true;
+				als.TextureCoordinate[2].x = attr.as_float();
+            } else if (name == "v1") {
+				read_flag[3] = true;
+				als.TextureCoordinate[0].y = attr.as_float();
+            } else if (name == "v2") {
+				read_flag[4] = true;
+				als.TextureCoordinate[1].y = attr.as_float();
+            } else if (name == "v3") {
+				read_flag[5] = true;
+				als.TextureCoordinate[0].y = attr.as_float();
+			}
+		}
 	}
-	else
-	{
-		MACRO_NODECHECK_LOOPBEGIN("map");
-			MACRO_NODECHECK_READCOMP_F("u1", read_flag[0], als.TextureCoordinate[0].x);
-			MACRO_NODECHECK_READCOMP_F("u2", read_flag[1], als.TextureCoordinate[1].x);
-			MACRO_NODECHECK_READCOMP_F("u3", read_flag[2], als.TextureCoordinate[2].x);
-			MACRO_NODECHECK_READCOMP_F("v1", read_flag[3], als.TextureCoordinate[0].y);
-			MACRO_NODECHECK_READCOMP_F("v2", read_flag[4], als.TextureCoordinate[1].y);
-			MACRO_NODECHECK_READCOMP_F("v3", read_flag[5], als.TextureCoordinate[2].y);
-		MACRO_NODECHECK_LOOPEND("map");
-	}// if(!pUseOldName) else
-
-	ParseHelper_Node_Exit();
 
 	// check that all components was defined
-	if(!(read_flag[0] && read_flag[1] && read_flag[2] && read_flag[3] && read_flag[4] && read_flag[5]))
+	if (!(read_flag[0] && read_flag[1] && read_flag[2] && read_flag[3] && read_flag[4] && read_flag[5])) {
 		throw DeadlyImportError("Not all texture coordinates are defined.");
+	}
 
 	// copy attributes data
 	als.TextureID_R = rtexid;
@@ -321,7 +322,7 @@ void AMFImporter::ParseNode_TexMap(const bool pUseOldName) {
 	als.TextureID_B = btexid;
 	als.TextureID_A = atexid;
 
-	mNodeElement_List.push_back(ne);// add to node element list because its a new object in graph.
+	mNodeElement_List.push_back(ne);
 }
 
 }// namespace Assimp
diff --git a/code/AssetLib/AMF/AMFImporter_Node.hpp b/code/AssetLib/AMF/AMFImporter_Node.hpp
index ea65e106b..81e0312b6 100644
--- a/code/AssetLib/AMF/AMFImporter_Node.hpp
+++ b/code/AssetLib/AMF/AMFImporter_Node.hpp
@@ -5,8 +5,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -56,80 +54,76 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <vector>
 
 // Header files, Assimp.
-#include "assimp/types.h"
 #include "assimp/scene.h"
+#include "assimp/types.h"
 
 /// \class CAMFImporter_NodeElement
 /// Base class for elements of nodes.
-class CAMFImporter_NodeElement {
+class AMFNodeElementBase {
 public:
 	/// Define what data type contain node element.
 	enum EType {
-		ENET_Color,        ///< Color element: <color>.
-		ENET_Constellation,///< Grouping element: <constellation>.
-		ENET_Coordinates,  ///< Coordinates element: <coordinates>.
-		ENET_Edge,         ///< Edge element: <edge>.
-		ENET_Instance,     ///< Grouping element: <constellation>.
-		ENET_Material,     ///< Material element: <material>.
-		ENET_Metadata,     ///< Metadata element: <metadata>.
-		ENET_Mesh,         ///< Metadata element: <mesh>.
-		ENET_Object,       ///< Element which hold object: <object>.
-		ENET_Root,         ///< Root element: <amf>.
-		ENET_Triangle,     ///< Triangle element: <triangle>.
-		ENET_TexMap,       ///< Texture coordinates element: <texmap> or <map>.
-		ENET_Texture,      ///< Texture element: <texture>.
-		ENET_Vertex,       ///< Vertex element: <vertex>.
-		ENET_Vertices,     ///< Vertex element: <vertices>.
-		ENET_Volume,       ///< Volume element: <volume>.
+		ENET_Color, ///< Color element: <color>.
+		ENET_Constellation, ///< Grouping element: <constellation>.
+		ENET_Coordinates, ///< Coordinates element: <coordinates>.
+		ENET_Edge, ///< Edge element: <edge>.
+		ENET_Instance, ///< Grouping element: <constellation>.
+		ENET_Material, ///< Material element: <material>.
+		ENET_Metadata, ///< Metadata element: <metadata>.
+		ENET_Mesh, ///< Metadata element: <mesh>.
+		ENET_Object, ///< Element which hold object: <object>.
+		ENET_Root, ///< Root element: <amf>.
+		ENET_Triangle, ///< Triangle element: <triangle>.
+		ENET_TexMap, ///< Texture coordinates element: <texmap> or <map>.
+		ENET_Texture, ///< Texture element: <texture>.
+		ENET_Vertex, ///< Vertex element: <vertex>.
+		ENET_Vertices, ///< Vertex element: <vertices>.
+		ENET_Volume, ///< Volume element: <volume>.
 
-		ENET_Invalid       ///< Element has invalid type and possible contain invalid data.
+		ENET_Invalid ///< Element has invalid type and possible contain invalid data.
 	};
 
-	const EType Type;///< Type of element.
-	std::string ID;///< ID of element.
-	CAMFImporter_NodeElement* Parent;///< Parent element. If nullptr then this node is root.
-	std::list<CAMFImporter_NodeElement*> Child;///< Child elements.
+	const EType Type; ///< Type of element.
+	std::string ID; ///< ID of element.
+	AMFNodeElementBase *Parent; ///< Parent element. If nullptr then this node is root.
+	std::list<AMFNodeElementBase *> Child; ///< Child elements.
 
-public:                                               /// Destructor, virtual..
-    virtual ~CAMFImporter_NodeElement() {
-        // empty
-    }
+public: /// Destructor, virtual..
+	virtual ~AMFNodeElementBase() {
+		// empty
+	}
 
 	/// Disabled copy constructor and co.
-	CAMFImporter_NodeElement(const CAMFImporter_NodeElement& pNodeElement) = delete;
-    CAMFImporter_NodeElement(CAMFImporter_NodeElement&&) = delete;
-    CAMFImporter_NodeElement& operator=(const CAMFImporter_NodeElement& pNodeElement) = delete;
-	CAMFImporter_NodeElement() = delete;
+	AMFNodeElementBase(const AMFNodeElementBase &pNodeElement) = delete;
+	AMFNodeElementBase(AMFNodeElementBase &&) = delete;
+	AMFNodeElementBase &operator=(const AMFNodeElementBase &pNodeElement) = delete;
+	AMFNodeElementBase() = delete;
 
 protected:
 	/// In constructor inheritor must set element type.
 	/// \param [in] pType - element type.
 	/// \param [in] pParent - parent element.
-	CAMFImporter_NodeElement(const EType pType, CAMFImporter_NodeElement* pParent)
-	: Type(pType)
-    , ID()
-    , Parent(pParent)
-    , Child() {
-        // empty
-    }
-};// class IAMFImporter_NodeElement
+	AMFNodeElementBase(const EType pType, AMFNodeElementBase *pParent) :
+			Type(pType), ID(), Parent(pParent), Child() {
+		// empty
+	}
+}; // class IAMFImporter_NodeElement
 
 /// \struct CAMFImporter_NodeElement_Constellation
 /// A collection of objects or constellations with specific relative locations.
-struct CAMFImporter_NodeElement_Constellation : public CAMFImporter_NodeElement {
+struct AMFConstellation : public AMFNodeElementBase {
 	/// Constructor.
 	/// \param [in] pParent - pointer to parent node.
-	CAMFImporter_NodeElement_Constellation(CAMFImporter_NodeElement* pParent)
-		: CAMFImporter_NodeElement(ENET_Constellation, pParent)
-	{}
+	AMFConstellation(AMFNodeElementBase *pParent) :
+			AMFNodeElementBase(ENET_Constellation, pParent) {}
 
-};// struct CAMFImporter_NodeElement_Constellation
+}; // struct CAMFImporter_NodeElement_Constellation
 
 /// \struct CAMFImporter_NodeElement_Instance
 /// Part of constellation.
-struct CAMFImporter_NodeElement_Instance : public CAMFImporter_NodeElement {
+struct AMFInstance : public AMFNodeElementBase {
 
-	std::string ObjectID;///< ID of object for instantiation.
+	std::string ObjectID; ///< ID of object for instantiation.
 	/// \var Delta - The distance of translation in the x, y, or z direction, respectively, in the referenced object's coordinate system, to
 	/// create an instance of the object in the current constellation.
 	aiVector3D Delta;
@@ -140,201 +134,173 @@ struct CAMFImporter_NodeElement_Instance : public CAMFImporter_NodeElement {
 
 	/// Constructor.
 	/// \param [in] pParent - pointer to parent node.
-	CAMFImporter_NodeElement_Instance(CAMFImporter_NodeElement* pParent)
-		: CAMFImporter_NodeElement(ENET_Instance, pParent)
-	{}
+	AMFInstance(AMFNodeElementBase *pParent) :
+			AMFNodeElementBase(ENET_Instance, pParent) {}
 };
 
 /// \struct CAMFImporter_NodeElement_Metadata
 /// Structure that define metadata node.
-struct CAMFImporter_NodeElement_Metadata : public CAMFImporter_NodeElement {
+struct AMFMetadata : public AMFNodeElementBase {
 
-	std::string Type;///< Type of "Value". 
-	std::string Value;///< Value.
+	std::string Type; ///< Type of "Value".
+	std::string Value; ///< Value.
 
 	/// Constructor.
 	/// \param [in] pParent - pointer to parent node.
-	CAMFImporter_NodeElement_Metadata(CAMFImporter_NodeElement* pParent)
-		: CAMFImporter_NodeElement(ENET_Metadata, pParent)
-	{}
+	AMFMetadata(AMFNodeElementBase *pParent) :
+			AMFNodeElementBase(ENET_Metadata, pParent) {}
 };
 
 /// \struct CAMFImporter_NodeElement_Root
 /// Structure that define root node.
-struct CAMFImporter_NodeElement_Root : public CAMFImporter_NodeElement {
+struct AMFRoot : public AMFNodeElementBase {
 
-	std::string Unit;///< The units to be used. May be "inch", "millimeter", "meter", "feet", or "micron".
-	std::string Version;///< Version of format.
+	std::string Unit; ///< The units to be used. May be "inch", "millimeter", "meter", "feet", or "micron".
+	std::string Version; ///< Version of format.
 
 	/// Constructor.
 	/// \param [in] pParent - pointer to parent node.
-	CAMFImporter_NodeElement_Root(CAMFImporter_NodeElement* pParent)
-		: CAMFImporter_NodeElement(ENET_Root, pParent)
-	{}
+	AMFRoot(AMFNodeElementBase *pParent) :
+			AMFNodeElementBase(ENET_Root, pParent) {}
 };
 
 /// \struct CAMFImporter_NodeElement_Color
 /// Structure that define object node.
-struct CAMFImporter_NodeElement_Color : public CAMFImporter_NodeElement {
-	bool Composed;                  ///< Type of color stored: if true then look for formula in \ref Color_Composed[4], else - in \ref Color.
-	std::string Color_Composed[4];  ///< By components formulas of composed color. [0..3] - RGBA.
-	aiColor4D Color;                ///< Constant color.
-	std::string Profile;            ///< The ICC color space used to interpret the three color channels r, g and b..
+struct AMFColor : public AMFNodeElementBase {
+	bool Composed; ///< Type of color stored: if true then look for formula in \ref Color_Composed[4], else - in \ref Color.
+	std::string Color_Composed[4]; ///< By components formulas of composed color. [0..3] - RGBA.
+	aiColor4D Color; ///< Constant color.
+	std::string Profile; ///< The ICC color space used to interpret the three color channels r, g and b..
 
 	/// @brief  Constructor.
 	/// @param [in] pParent - pointer to parent node.
-	CAMFImporter_NodeElement_Color(CAMFImporter_NodeElement* pParent)
-	: CAMFImporter_NodeElement(ENET_Color, pParent)
-    , Composed( false )
-    , Color()
-    , Profile() {
-        // empty
-    }
+	AMFColor(AMFNodeElementBase *pParent) :
+			AMFNodeElementBase(ENET_Color, pParent), Composed(false), Color(), Profile() {
+		// empty
+	}
 };
 
 /// \struct CAMFImporter_NodeElement_Material
 /// Structure that define material node.
-struct CAMFImporter_NodeElement_Material : public CAMFImporter_NodeElement {
-	
+struct AMFMaterial : public AMFNodeElementBase {
+
 	/// Constructor.
 	/// \param [in] pParent - pointer to parent node.
-	CAMFImporter_NodeElement_Material(CAMFImporter_NodeElement* pParent)
-		: CAMFImporter_NodeElement(ENET_Material, pParent)
-	{}
-
+	AMFMaterial(AMFNodeElementBase *pParent) :
+			AMFNodeElementBase(ENET_Material, pParent) {}
 };
 
 /// \struct CAMFImporter_NodeElement_Object
 /// Structure that define object node.
-struct CAMFImporter_NodeElement_Object : public CAMFImporter_NodeElement {
+struct AMFObject : public AMFNodeElementBase {
 
-    /// Constructor.
+	/// Constructor.
 	/// \param [in] pParent - pointer to parent node.
-	CAMFImporter_NodeElement_Object(CAMFImporter_NodeElement* pParent)
-		: CAMFImporter_NodeElement(ENET_Object, pParent)
-	{}
+	AMFObject(AMFNodeElementBase *pParent) :
+			AMFNodeElementBase(ENET_Object, pParent) {}
 };
 
 /// \struct CAMFImporter_NodeElement_Mesh
 /// Structure that define mesh node.
-struct CAMFImporter_NodeElement_Mesh : public CAMFImporter_NodeElement {
+struct AMFMesh : public AMFNodeElementBase {
 	/// Constructor.
 	/// \param [in] pParent - pointer to parent node.
-	CAMFImporter_NodeElement_Mesh(CAMFImporter_NodeElement* pParent)
-		: CAMFImporter_NodeElement(ENET_Mesh, pParent)
-	{}
+	AMFMesh(AMFNodeElementBase *pParent) :
+			AMFNodeElementBase(ENET_Mesh, pParent) {}
 };
 
 /// \struct CAMFImporter_NodeElement_Vertex
 /// Structure that define vertex node.
-struct CAMFImporter_NodeElement_Vertex : public CAMFImporter_NodeElement {
+struct AMFVertex : public AMFNodeElementBase {
 	/// Constructor.
 	/// \param [in] pParent - pointer to parent node.
-	CAMFImporter_NodeElement_Vertex(CAMFImporter_NodeElement* pParent)
-		: CAMFImporter_NodeElement(ENET_Vertex, pParent)
-	{}
+	AMFVertex(AMFNodeElementBase *pParent) :
+			AMFNodeElementBase(ENET_Vertex, pParent) {}
 };
 
 /// \struct CAMFImporter_NodeElement_Edge
 /// Structure that define edge node.
-struct CAMFImporter_NodeElement_Edge : public CAMFImporter_NodeElement {
+struct AMFEdge : public AMFNodeElementBase {
 	/// Constructor.
 	/// \param [in] pParent - pointer to parent node.
-	CAMFImporter_NodeElement_Edge(CAMFImporter_NodeElement* pParent)
-		: CAMFImporter_NodeElement(ENET_Edge, pParent)
-	{}
-
+	AMFEdge(AMFNodeElementBase *pParent) :
+			AMFNodeElementBase(ENET_Edge, pParent) {}
 };
 
 /// \struct CAMFImporter_NodeElement_Vertices
 /// Structure that define vertices node.
-struct CAMFImporter_NodeElement_Vertices : public CAMFImporter_NodeElement {
+struct AMFVertices : public AMFNodeElementBase {
 	/// Constructor.
 	/// \param [in] pParent - pointer to parent node.
-	CAMFImporter_NodeElement_Vertices(CAMFImporter_NodeElement* pParent)
-		: CAMFImporter_NodeElement(ENET_Vertices, pParent)
-	{}
+	AMFVertices(AMFNodeElementBase *pParent) :
+			AMFNodeElementBase(ENET_Vertices, pParent) {}
 };
 
 /// \struct CAMFImporter_NodeElement_Volume
 /// Structure that define volume node.
-struct CAMFImporter_NodeElement_Volume : public CAMFImporter_NodeElement {
-	std::string MaterialID;///< Which material to use.
-	std::string Type;///< What this volume describes can be “region” or “support”. If none specified, “object” is assumed.
+struct AMFVolume : public AMFNodeElementBase {
+	std::string MaterialID; ///< Which material to use.
+	std::string Type; ///< What this volume describes can be “region” or “support”. If none specified, “object” is assumed.
 
 	/// Constructor.
 	/// \param [in] pParent - pointer to parent node.
-	CAMFImporter_NodeElement_Volume(CAMFImporter_NodeElement* pParent)
-		: CAMFImporter_NodeElement(ENET_Volume, pParent)
-	{}
+	AMFVolume(AMFNodeElementBase *pParent) :
+			AMFNodeElementBase(ENET_Volume, pParent) {}
 };
 
 /// \struct CAMFImporter_NodeElement_Coordinates
 /// Structure that define coordinates node.
-struct CAMFImporter_NodeElement_Coordinates : public CAMFImporter_NodeElement
-{
-	aiVector3D Coordinate;///< Coordinate.
+struct AMFCoordinates : public AMFNodeElementBase {
+	aiVector3D Coordinate; ///< Coordinate.
 
 	/// Constructor.
 	/// \param [in] pParent - pointer to parent node.
-	CAMFImporter_NodeElement_Coordinates(CAMFImporter_NodeElement* pParent)
-		: CAMFImporter_NodeElement(ENET_Coordinates, pParent)
-	{}
-
+	AMFCoordinates(AMFNodeElementBase *pParent) :
+			AMFNodeElementBase(ENET_Coordinates, pParent) {}
 };
 
 /// \struct CAMFImporter_NodeElement_TexMap
 /// Structure that define texture coordinates node.
-struct CAMFImporter_NodeElement_TexMap : public CAMFImporter_NodeElement {
-	aiVector3D TextureCoordinate[3];///< Texture coordinates.
-	std::string TextureID_R;///< Texture ID for red color component.
-	std::string TextureID_G;///< Texture ID for green color component.
-	std::string TextureID_B;///< Texture ID for blue color component.
-	std::string TextureID_A;///< Texture ID for alpha color component.
+struct AMFTexMap : public AMFNodeElementBase {
+	aiVector3D TextureCoordinate[3]; ///< Texture coordinates.
+	std::string TextureID_R; ///< Texture ID for red color component.
+	std::string TextureID_G; ///< Texture ID for green color component.
+	std::string TextureID_B; ///< Texture ID for blue color component.
+	std::string TextureID_A; ///< Texture ID for alpha color component.
 
 	/// Constructor.
 	/// \param [in] pParent - pointer to parent node.
-	CAMFImporter_NodeElement_TexMap(CAMFImporter_NodeElement* pParent)
-	: CAMFImporter_NodeElement(ENET_TexMap, pParent)
-    , TextureCoordinate{}
-    , TextureID_R()
-    , TextureID_G()
-    , TextureID_B()
-    , TextureID_A()	{
-        // empty
-    }
+	AMFTexMap(AMFNodeElementBase *pParent) :
+			AMFNodeElementBase(ENET_TexMap, pParent), TextureCoordinate{}, TextureID_R(), TextureID_G(), TextureID_B(), TextureID_A() {
+		// empty
+	}
 };
 
 /// \struct CAMFImporter_NodeElement_Triangle
 /// Structure that define triangle node.
-struct CAMFImporter_NodeElement_Triangle : public CAMFImporter_NodeElement {
-	size_t V[3];///< Triangle vertices.
+struct AMFTriangle : public AMFNodeElementBase {
+	size_t V[3]; ///< Triangle vertices.
 
 	/// Constructor.
 	/// \param [in] pParent - pointer to parent node.
-	CAMFImporter_NodeElement_Triangle(CAMFImporter_NodeElement* pParent)
-	: CAMFImporter_NodeElement(ENET_Triangle, pParent) {
-        // empty
-    }
+	AMFTriangle(AMFNodeElementBase *pParent) :
+			AMFNodeElementBase(ENET_Triangle, pParent) {
+		// empty
+	}
 };
 
 /// Structure that define texture node.
-struct CAMFImporter_NodeElement_Texture : public CAMFImporter_NodeElement {
-	size_t Width, Height, Depth;///< Size of the texture.
-	std::vector<uint8_t> Data;///< Data of the texture.
+struct AMFTexture : public AMFNodeElementBase {
+	size_t Width, Height, Depth; ///< Size of the texture.
+	std::vector<uint8_t> Data; ///< Data of the texture.
 	bool Tiled;
 
 	/// Constructor.
 	/// \param [in] pParent - pointer to parent node.
-	CAMFImporter_NodeElement_Texture(CAMFImporter_NodeElement* pParent)
-	: CAMFImporter_NodeElement(ENET_Texture, pParent)
-    , Width( 0 )
-    , Height( 0 )
-    , Depth( 0 )
-    , Data()
-    , Tiled( false ){
-        // empty
-    }
+	AMFTexture(AMFNodeElementBase *pParent) :
+			AMFNodeElementBase(ENET_Texture, pParent), Width(0), Height(0), Depth(0), Data(), Tiled(false) {
+		// empty
+	}
 };
 
 #endif // INCLUDED_AI_AMF_IMPORTER_NODE_H
diff --git a/code/AssetLib/AMF/AMFImporter_Postprocess.cpp b/code/AssetLib/AMF/AMFImporter_Postprocess.cpp
index 596b0235c..98151d1c0 100644
--- a/code/AssetLib/AMF/AMFImporter_Postprocess.cpp
+++ b/code/AssetLib/AMF/AMFImporter_Postprocess.cpp
@@ -5,8 +5,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -50,12 +48,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "AMFImporter.hpp"
 
-// Header files, Assimp.
 #include <assimp/SceneCombiner.h>
 #include <assimp/StandardShapes.h>
 #include <assimp/StringUtils.h>
 
-// Header files, stdlib.
 #include <iterator>
 
 namespace Assimp {
@@ -83,61 +79,61 @@ aiColor4D AMFImporter::SPP_Material::GetColor(const float /*pX*/, const float /*
     return tcol;
 }
 
-void AMFImporter::PostprocessHelper_CreateMeshDataArray(const CAMFImporter_NodeElement_Mesh &pNodeElement, std::vector<aiVector3D> &pVertexCoordinateArray,
-        std::vector<CAMFImporter_NodeElement_Color *> &pVertexColorArray) const {
-    CAMFImporter_NodeElement_Vertices *vn = nullptr;
+void AMFImporter::PostprocessHelper_CreateMeshDataArray(const AMFMesh &pNodeElement, std::vector<aiVector3D> &pVertexCoordinateArray,
+        std::vector<AMFColor *> &pVertexColorArray) const {
+    AMFVertices  *vn = nullptr;
     size_t col_idx;
 
     // All data stored in "vertices", search for it.
-    for (CAMFImporter_NodeElement *ne_child : pNodeElement.Child) {
-        if (ne_child->Type == CAMFImporter_NodeElement::ENET_Vertices) vn = (CAMFImporter_NodeElement_Vertices *)ne_child;
+    for (AMFNodeElementBase *ne_child : pNodeElement.Child) {
+        if (ne_child->Type == AMFNodeElementBase::ENET_Vertices) {
+            vn = (AMFVertices*)ne_child;
+        }
     }
 
     // If "vertices" not found then no work for us.
-    if (vn == nullptr) return;
+    if (vn == nullptr) {
+        return;
+    }
 
-    pVertexCoordinateArray.reserve(vn->Child.size()); // all coordinates stored as child and we need to reserve space for future push_back's.
-    pVertexColorArray.resize(vn->Child.size()); // colors count equal vertices count.
+    // all coordinates stored as child and we need to reserve space for future push_back's.
+    pVertexCoordinateArray.reserve(vn->Child.size()); 
+
+    // colors count equal vertices count.
+    pVertexColorArray.resize(vn->Child.size()); 
     col_idx = 0;
+
     // Inside vertices collect all data and place to arrays
-    for (CAMFImporter_NodeElement *vn_child : vn->Child) {
+    for (AMFNodeElementBase *vn_child : vn->Child) {
         // vertices, colors
-        if (vn_child->Type == CAMFImporter_NodeElement::ENET_Vertex) {
+        if (vn_child->Type == AMFNodeElementBase::ENET_Vertex) {
             // by default clear color for current vertex
             pVertexColorArray[col_idx] = nullptr;
 
-            for (CAMFImporter_NodeElement *vtx : vn_child->Child) {
-                if (vtx->Type == CAMFImporter_NodeElement::ENET_Coordinates) {
-                    pVertexCoordinateArray.push_back(((CAMFImporter_NodeElement_Coordinates *)vtx)->Coordinate);
-
+            for (AMFNodeElementBase *vtx : vn_child->Child) {
+                if (vtx->Type == AMFNodeElementBase::ENET_Coordinates) {
+                    pVertexCoordinateArray.push_back(((AMFCoordinates *)vtx)->Coordinate);
                     continue;
                 }
 
-                if (vtx->Type == CAMFImporter_NodeElement::ENET_Color) {
-                    pVertexColorArray[col_idx] = (CAMFImporter_NodeElement_Color *)vtx;
-
+                if (vtx->Type == AMFNodeElementBase::ENET_Color) {
+                    pVertexColorArray[col_idx] = (AMFColor *)vtx;
                     continue;
                 }
-            } // for(CAMFImporter_NodeElement* vtx: vn_child->Child)
+            }
 
-            col_idx++;
-        } // if(vn_child->Type == CAMFImporter_NodeElement::ENET_Vertex)
-    } // for(CAMFImporter_NodeElement* vn_child: vn->Child)
+            ++col_idx;
+        }
+    }
 }
 
-size_t AMFImporter::PostprocessHelper_GetTextureID_Or_Create(const std::string &pID_R, const std::string &pID_G, const std::string &pID_B,
-        const std::string &pID_A) {
-    size_t TextureConverted_Index;
-    std::string TextureConverted_ID;
-
-    // check input data
-    if (pID_R.empty() && pID_G.empty() && pID_B.empty() && pID_A.empty())
+size_t AMFImporter::PostprocessHelper_GetTextureID_Or_Create(const std::string &r, const std::string &g, const std::string &b, const std::string &a) {
+    if (r.empty() && g.empty() && b.empty() && a.empty()) {
         throw DeadlyImportError("PostprocessHelper_GetTextureID_Or_Create. At least one texture ID must be defined.");
+    }
 
-    // Create ID
-    TextureConverted_ID = pID_R + "_" + pID_G + "_" + pID_B + "_" + pID_A;
-    // Check if texture specified by set of IDs is converted already.
-    TextureConverted_Index = 0;
+    std::string TextureConverted_ID = r + "_" + g + "_" + b + "_" + a;
+    size_t TextureConverted_Index = 0;
     for (const SPP_Texture &tex_convd : mTexture_Converted) {
         if (tex_convd.ID == TextureConverted_ID) {
             return TextureConverted_Index;
@@ -146,52 +142,60 @@ size_t AMFImporter::PostprocessHelper_GetTextureID_Or_Create(const std::string &
         }
     }
 
-    //
     // Converted texture not found, create it.
-    //
-    CAMFImporter_NodeElement_Texture *src_texture[4]{ nullptr };
-    std::vector<CAMFImporter_NodeElement_Texture *> src_texture_4check;
+    AMFTexture *src_texture[4] {
+        nullptr
+    };
+    std::vector<AMFTexture *> src_texture_4check;
     SPP_Texture converted_texture;
 
     { // find all specified source textures
-        CAMFImporter_NodeElement *t_tex;
+        AMFNodeElementBase *t_tex = nullptr;
 
         // R
-        if (!pID_R.empty()) {
-            if (!Find_NodeElement(pID_R, CAMFImporter_NodeElement::ENET_Texture, &t_tex)) Throw_ID_NotFound(pID_R);
+        if (!r.empty()) {
+            if (!Find_NodeElement(r, AMFNodeElementBase::EType::ENET_Texture, &t_tex)) {
+                Throw_ID_NotFound(r);
+            }
 
-            src_texture[0] = (CAMFImporter_NodeElement_Texture *)t_tex;
-            src_texture_4check.push_back((CAMFImporter_NodeElement_Texture *)t_tex);
+            src_texture[0] = (AMFTexture *)t_tex;
+            src_texture_4check.push_back((AMFTexture *)t_tex);
         } else {
             src_texture[0] = nullptr;
         }
 
         // G
-        if (!pID_G.empty()) {
-            if (!Find_NodeElement(pID_G, CAMFImporter_NodeElement::ENET_Texture, &t_tex)) Throw_ID_NotFound(pID_G);
+        if (!g.empty()) {
+            if (!Find_NodeElement(g, AMFNodeElementBase::ENET_Texture, &t_tex)) {
+                Throw_ID_NotFound(g);
+            }
 
-            src_texture[1] = (CAMFImporter_NodeElement_Texture *)t_tex;
-            src_texture_4check.push_back((CAMFImporter_NodeElement_Texture *)t_tex);
+            src_texture[1] = (AMFTexture *)t_tex;
+            src_texture_4check.push_back((AMFTexture *)t_tex);
         } else {
             src_texture[1] = nullptr;
         }
 
         // B
-        if (!pID_B.empty()) {
-            if (!Find_NodeElement(pID_B, CAMFImporter_NodeElement::ENET_Texture, &t_tex)) Throw_ID_NotFound(pID_B);
+        if (!b.empty()) {
+            if (!Find_NodeElement(b, AMFNodeElementBase::ENET_Texture, &t_tex)) {
+                Throw_ID_NotFound(b);
+            }
 
-            src_texture[2] = (CAMFImporter_NodeElement_Texture *)t_tex;
-            src_texture_4check.push_back((CAMFImporter_NodeElement_Texture *)t_tex);
+            src_texture[2] = (AMFTexture *)t_tex;
+            src_texture_4check.push_back((AMFTexture *)t_tex);
         } else {
             src_texture[2] = nullptr;
         }
 
         // A
-        if (!pID_A.empty()) {
-            if (!Find_NodeElement(pID_A, CAMFImporter_NodeElement::ENET_Texture, &t_tex)) Throw_ID_NotFound(pID_A);
+        if (!a.empty()) {
+            if (!Find_NodeElement(a, AMFNodeElementBase::ENET_Texture, &t_tex)) {
+                Throw_ID_NotFound(a);
+            }
 
-            src_texture[3] = (CAMFImporter_NodeElement_Texture *)t_tex;
-            src_texture_4check.push_back((CAMFImporter_NodeElement_Texture *)t_tex);
+            src_texture[3] = (AMFTexture *)t_tex;
+            src_texture_4check.push_back((AMFTexture *)t_tex);
         } else {
             src_texture[3] = nullptr;
         }
@@ -213,38 +217,37 @@ size_t AMFImporter::PostprocessHelper_GetTextureID_Or_Create(const std::string &
     converted_texture.Depth = src_texture_4check[0]->Depth;
     // if one of source texture is tiled then converted texture is tiled too.
     converted_texture.Tiled = false;
-    for (uint8_t i = 0; i < src_texture_4check.size(); i++)
+    for (uint8_t i = 0; i < src_texture_4check.size(); ++i) {
         converted_texture.Tiled |= src_texture_4check[i]->Tiled;
+    }
 
     // Create format hint.
     strcpy(converted_texture.FormatHint, "rgba0000"); // copy initial string.
-    if (!pID_R.empty()) converted_texture.FormatHint[4] = '8';
-    if (!pID_G.empty()) converted_texture.FormatHint[5] = '8';
-    if (!pID_B.empty()) converted_texture.FormatHint[6] = '8';
-    if (!pID_A.empty()) converted_texture.FormatHint[7] = '8';
+    if (!r.empty()) converted_texture.FormatHint[4] = '8';
+    if (!g.empty()) converted_texture.FormatHint[5] = '8';
+    if (!b.empty()) converted_texture.FormatHint[6] = '8';
+    if (!a.empty()) converted_texture.FormatHint[7] = '8';
 
-    //
     // Сopy data of textures.
-    //
     size_t tex_size = 0;
     size_t step = 0;
     size_t off_g = 0;
     size_t off_b = 0;
 
     // Calculate size of the target array and rule how data will be copied.
-    if (!pID_R.empty() && nullptr != src_texture[0]) {
+    if (!r.empty() && nullptr != src_texture[0]) {
         tex_size += src_texture[0]->Data.size();
         step++, off_g++, off_b++;
     }
-    if (!pID_G.empty() && nullptr != src_texture[1]) {
+    if (!g.empty() && nullptr != src_texture[1]) {
         tex_size += src_texture[1]->Data.size();
         step++, off_b++;
     }
-    if (!pID_B.empty() && nullptr != src_texture[2]) {
+    if (!b.empty() && nullptr != src_texture[2]) {
         tex_size += src_texture[2]->Data.size();
         step++;
     }
-    if (!pID_A.empty() && nullptr != src_texture[3]) {
+    if (!a.empty() && nullptr != src_texture[3]) {
         tex_size += src_texture[3]->Data.size();
         step++;
     }
@@ -255,17 +258,17 @@ size_t AMFImporter::PostprocessHelper_GetTextureID_Or_Create(const std::string &
     auto CopyTextureData = [&](const std::string &pID, const size_t pOffset, const size_t pStep, const uint8_t pSrcTexNum) -> void {
         if (!pID.empty()) {
             for (size_t idx_target = pOffset, idx_src = 0; idx_target < tex_size; idx_target += pStep, idx_src++) {
-                CAMFImporter_NodeElement_Texture *tex = src_texture[pSrcTexNum];
+                AMFTexture *tex = src_texture[pSrcTexNum];
                 ai_assert(tex);
                 converted_texture.Data[idx_target] = tex->Data.at(idx_src);
             }
         }
     }; // auto CopyTextureData = [&](const size_t pOffset, const size_t pStep, const uint8_t pSrcTexNum) -> void
 
-    CopyTextureData(pID_R, 0, step, 0);
-    CopyTextureData(pID_G, off_g, step, 1);
-    CopyTextureData(pID_B, off_b, step, 2);
-    CopyTextureData(pID_A, step - 1, step, 3);
+    CopyTextureData(r, 0, step, 0);
+    CopyTextureData(g, off_g, step, 1);
+    CopyTextureData(b, off_b, step, 2);
+    CopyTextureData(a, step - 1, step, 3);
 
     // Store new converted texture ID
     converted_texture.ID = TextureConverted_ID;
@@ -276,7 +279,7 @@ size_t AMFImporter::PostprocessHelper_GetTextureID_Or_Create(const std::string &
 }
 
 void AMFImporter::PostprocessHelper_SplitFacesByTextureID(std::list<SComplexFace> &pInputList, std::list<std::list<SComplexFace>> &pOutputList_Separated) {
-    auto texmap_is_equal = [](const CAMFImporter_NodeElement_TexMap *pTexMap1, const CAMFImporter_NodeElement_TexMap *pTexMap2) -> bool {
+    auto texmap_is_equal = [](const AMFTexMap *pTexMap1, const AMFTexMap *pTexMap2) -> bool {
         if ((pTexMap1 == nullptr) && (pTexMap2 == nullptr)) return true;
         if (pTexMap1 == nullptr) return false;
         if (pTexMap2 == nullptr) return false;
@@ -313,73 +316,80 @@ void AMFImporter::PostprocessHelper_SplitFacesByTextureID(std::list<SComplexFace
     } while (!pInputList.empty());
 }
 
-void AMFImporter::Postprocess_AddMetadata(const std::list<CAMFImporter_NodeElement_Metadata *> &metadataList, aiNode &sceneNode) const {
-    if (!metadataList.empty()) {
-        if (sceneNode.mMetaData != nullptr) throw DeadlyImportError("Postprocess. MetaData member in node are not nullptr. Something went wrong.");
+void AMFImporter::Postprocess_AddMetadata(const AMFMetaDataArray &metadataList, aiNode &sceneNode) const {
+    if (metadataList.empty()) {
+        return;
+    }
 
-        // copy collected metadata to output node.
-        sceneNode.mMetaData = aiMetadata::Alloc(static_cast<unsigned int>(metadataList.size()));
-        size_t meta_idx(0);
+    if (sceneNode.mMetaData != nullptr) {
+        throw DeadlyImportError("Postprocess. MetaData member in node are not nullptr. Something went wrong.");
+    }
 
-        for (const CAMFImporter_NodeElement_Metadata &metadata : metadataList) {
-            sceneNode.mMetaData->Set(static_cast<unsigned int>(meta_idx++), metadata.Type, aiString(metadata.Value));
-        }
-    } // if(!metadataList.empty())
+    // copy collected metadata to output node.
+    sceneNode.mMetaData = aiMetadata::Alloc(static_cast<unsigned int>(metadataList.size()));
+    size_t meta_idx(0);
+
+    for (const AMFMetadata &metadata : metadataList) {
+        sceneNode.mMetaData->Set(static_cast<unsigned int>(meta_idx++), metadata.Type, aiString(metadata.Value));
+    }
 }
 
-void AMFImporter::Postprocess_BuildNodeAndObject(const CAMFImporter_NodeElement_Object &pNodeElement, std::list<aiMesh *> &pMeshList, aiNode **pSceneNode) {
-    CAMFImporter_NodeElement_Color *object_color = nullptr;
+void AMFImporter::Postprocess_BuildNodeAndObject(const AMFObject &pNodeElement, MeshArray &meshList, aiNode **pSceneNode) {
+    AMFColor *object_color = nullptr;
 
     // create new aiNode and set name as <object> has.
     *pSceneNode = new aiNode;
     (*pSceneNode)->mName = pNodeElement.ID;
     // read mesh and color
-    for (const CAMFImporter_NodeElement *ne_child : pNodeElement.Child) {
+    for (const AMFNodeElementBase *ne_child : pNodeElement.Child) {
         std::vector<aiVector3D> vertex_arr;
-        std::vector<CAMFImporter_NodeElement_Color *> color_arr;
+        std::vector<AMFColor *> color_arr;
 
         // color for object
-        if (ne_child->Type == CAMFImporter_NodeElement::ENET_Color) object_color = (CAMFImporter_NodeElement_Color *)ne_child;
+        if (ne_child->Type == AMFNodeElementBase::ENET_Color) {
+            object_color = (AMFColor *) ne_child;
+        }
 
-        if (ne_child->Type == CAMFImporter_NodeElement::ENET_Mesh) {
+        if (ne_child->Type == AMFNodeElementBase::ENET_Mesh) {
             // Create arrays from children of mesh: vertices.
-            PostprocessHelper_CreateMeshDataArray(*((CAMFImporter_NodeElement_Mesh *)ne_child), vertex_arr, color_arr);
+            PostprocessHelper_CreateMeshDataArray(*((AMFMesh *)ne_child), vertex_arr, color_arr);
             // Use this arrays as a source when creating every aiMesh
-            Postprocess_BuildMeshSet(*((CAMFImporter_NodeElement_Mesh *)ne_child), vertex_arr, color_arr, object_color, pMeshList, **pSceneNode);
+            Postprocess_BuildMeshSet(*((AMFMesh *)ne_child), vertex_arr, color_arr, object_color, meshList, **pSceneNode);
         }
     } // for(const CAMFImporter_NodeElement* ne_child: pNodeElement)
 }
 
-void AMFImporter::Postprocess_BuildMeshSet(const CAMFImporter_NodeElement_Mesh &pNodeElement, const std::vector<aiVector3D> &pVertexCoordinateArray,
-        const std::vector<CAMFImporter_NodeElement_Color *> &pVertexColorArray,
-        const CAMFImporter_NodeElement_Color *pObjectColor, std::list<aiMesh *> &pMeshList, aiNode &pSceneNode) {
+void AMFImporter::Postprocess_BuildMeshSet(const AMFMesh &pNodeElement, const std::vector<aiVector3D> &pVertexCoordinateArray,
+        const std::vector<AMFColor *> &pVertexColorArray, const AMFColor *pObjectColor, MeshArray &pMeshList, aiNode &pSceneNode) {
     std::list<unsigned int> mesh_idx;
 
     // all data stored in "volume", search for it.
-    for (const CAMFImporter_NodeElement *ne_child : pNodeElement.Child) {
-        const CAMFImporter_NodeElement_Color *ne_volume_color = nullptr;
+    for (const AMFNodeElementBase *ne_child : pNodeElement.Child) {
+        const AMFColor *ne_volume_color = nullptr;
         const SPP_Material *cur_mat = nullptr;
 
-        if (ne_child->Type == CAMFImporter_NodeElement::ENET_Volume) {
+        if (ne_child->Type == AMFNodeElementBase::ENET_Volume) {
             /******************* Get faces *******************/
-            const CAMFImporter_NodeElement_Volume *ne_volume = reinterpret_cast<const CAMFImporter_NodeElement_Volume *>(ne_child);
+            const AMFVolume *ne_volume = reinterpret_cast<const AMFVolume *>(ne_child);
 
             std::list<SComplexFace> complex_faces_list; // List of the faces of the volume.
             std::list<std::list<SComplexFace>> complex_faces_toplist; // List of the face list for every mesh.
 
             // check if volume use material
             if (!ne_volume->MaterialID.empty()) {
-                if (!Find_ConvertedMaterial(ne_volume->MaterialID, &cur_mat)) Throw_ID_NotFound(ne_volume->MaterialID);
+                if (!Find_ConvertedMaterial(ne_volume->MaterialID, &cur_mat)) {
+                    Throw_ID_NotFound(ne_volume->MaterialID);
+                }
             }
 
             // inside "volume" collect all data and place to arrays or create new objects
-            for (const CAMFImporter_NodeElement *ne_volume_child : ne_volume->Child) {
+            for (const AMFNodeElementBase *ne_volume_child : ne_volume->Child) {
                 // color for volume
-                if (ne_volume_child->Type == CAMFImporter_NodeElement::ENET_Color) {
-                    ne_volume_color = reinterpret_cast<const CAMFImporter_NodeElement_Color *>(ne_volume_child);
-                } else if (ne_volume_child->Type == CAMFImporter_NodeElement::ENET_Triangle) // triangles, triangles colors
+                if (ne_volume_child->Type == AMFNodeElementBase::ENET_Color) {
+                    ne_volume_color = reinterpret_cast<const AMFColor *>(ne_volume_child);
+                } else if (ne_volume_child->Type == AMFNodeElementBase::ENET_Triangle) // triangles, triangles colors
                 {
-                    const CAMFImporter_NodeElement_Triangle &tri_al = *reinterpret_cast<const CAMFImporter_NodeElement_Triangle *>(ne_volume_child);
+                    const AMFTriangle &tri_al = *reinterpret_cast<const AMFTriangle *>(ne_volume_child);
 
                     SComplexFace complex_face;
 
@@ -388,11 +398,11 @@ void AMFImporter::Postprocess_BuildMeshSet(const CAMFImporter_NodeElement_Mesh &
                     complex_face.TexMap = nullptr;
                     // get data from triangle children: color, texture coordinates.
                     if (tri_al.Child.size()) {
-                        for (const CAMFImporter_NodeElement *ne_triangle_child : tri_al.Child) {
-                            if (ne_triangle_child->Type == CAMFImporter_NodeElement::ENET_Color)
-                                complex_face.Color = reinterpret_cast<const CAMFImporter_NodeElement_Color *>(ne_triangle_child);
-                            else if (ne_triangle_child->Type == CAMFImporter_NodeElement::ENET_TexMap)
-                                complex_face.TexMap = reinterpret_cast<const CAMFImporter_NodeElement_TexMap *>(ne_triangle_child);
+                        for (const AMFNodeElementBase *ne_triangle_child : tri_al.Child) {
+                            if (ne_triangle_child->Type == AMFNodeElementBase::ENET_Color)
+                                complex_face.Color = reinterpret_cast<const AMFColor *>(ne_triangle_child);
+                            else if (ne_triangle_child->Type == AMFNodeElementBase::ENET_TexMap)
+                                complex_face.TexMap = reinterpret_cast<const AMFTexMap *>(ne_triangle_child);
                         }
                     } // if(tri_al.Child.size())
 
@@ -422,15 +432,18 @@ void AMFImporter::Postprocess_BuildMeshSet(const CAMFImporter_NodeElement_Mesh &
                                 if (face.Face.mIndices[idx_vert] > *pBiggerThan) {
                                     rv = face.Face.mIndices[idx_vert];
                                     found = true;
-
                                     break;
                                 }
                             }
 
-                            if (found) break;
+                            if (found) {
+                                break;
+                            }
                         }
 
-                        if (!found) return *pBiggerThan;
+                        if (!found) {
+                            return *pBiggerThan;
+                        }
                     } else {
                         rv = pFaceList.front().Face.mIndices[0];
                     } // if(pBiggerThan != nullptr) else
@@ -505,9 +518,9 @@ void AMFImporter::Postprocess_BuildMeshSet(const CAMFImporter_NodeElement_Mesh &
                 tmesh->mNumFaces = static_cast<unsigned int>(face_list_cur.size());
                 tmesh->mFaces = new aiFace[tmesh->mNumFaces];
 
-                // Create vertices list and optimize indices. Optimisation mean following.In AMF all volumes use one big list of vertices. And one volume
+                // Create vertices list and optimize indices. Optimization mean following.In AMF all volumes use one big list of vertices. And one volume
                 // can use only part of vertices list, for example: vertices list contain few thousands of vertices and volume use vertices 1, 3, 10.
-                // Do you need all this thousands of garbage? Of course no. So, optimisation step transformate sparse indices set to continuous.
+                // Do you need all this thousands of garbage? Of course no. So, optimization step transform sparse indices set to continuous.
                 size_t VertexCount_Max = tmesh->mNumFaces * 3; // 3 - triangles.
                 std::vector<aiVector3D> vert_arr, texcoord_arr;
                 std::vector<aiColor4D> col_arr;
@@ -566,7 +579,7 @@ void AMFImporter::Postprocess_BuildMeshSet(const CAMFImporter_NodeElement_Mesh &
                     size_t idx_vert_new = vert_arr.size();
                     ///TODO: clean unused vertices. "* 2": in certain cases - mesh full of triangle colors - vert_arr will contain duplicated vertices for
                     /// colored triangles and initial vertices (for colored vertices) which in real became unused. This part need more thinking about
-                    /// optimisation.
+                    /// optimization.
                     bool *idx_vert_used;
 
                     idx_vert_used = new bool[VertexCount_Max * 2];
@@ -639,15 +652,15 @@ void AMFImporter::Postprocess_BuildMeshSet(const CAMFImporter_NodeElement_Mesh &
     } // if(mesh_idx.size() > 0)
 }
 
-void AMFImporter::Postprocess_BuildMaterial(const CAMFImporter_NodeElement_Material &pMaterial) {
+void AMFImporter::Postprocess_BuildMaterial(const AMFMaterial &pMaterial) {
     SPP_Material new_mat;
 
     new_mat.ID = pMaterial.ID;
-    for (const CAMFImporter_NodeElement *mat_child : pMaterial.Child) {
-        if (mat_child->Type == CAMFImporter_NodeElement::ENET_Color) {
-            new_mat.Color = (CAMFImporter_NodeElement_Color *)mat_child;
-        } else if (mat_child->Type == CAMFImporter_NodeElement::ENET_Metadata) {
-            new_mat.Metadata.push_back((CAMFImporter_NodeElement_Metadata *)mat_child);
+    for (const AMFNodeElementBase *mat_child : pMaterial.Child) {
+        if (mat_child->Type == AMFNodeElementBase::ENET_Color) {
+            new_mat.Color = (AMFColor*)mat_child;
+        } else if (mat_child->Type == AMFNodeElementBase::ENET_Metadata) {
+            new_mat.Metadata.push_back((AMFMetadata *)mat_child);
         }
     } // for(const CAMFImporter_NodeElement* mat_child; pMaterial.Child)
 
@@ -655,7 +668,7 @@ void AMFImporter::Postprocess_BuildMaterial(const CAMFImporter_NodeElement_Mater
     mMaterial_Converted.push_back(new_mat);
 }
 
-void AMFImporter::Postprocess_BuildConstellation(CAMFImporter_NodeElement_Constellation &pConstellation, std::list<aiNode *> &pNodeList) const {
+void AMFImporter::Postprocess_BuildConstellation(AMFConstellation &pConstellation, NodeArray &nodeArray) const {
     aiNode *con_node;
     std::list<aiNode *> ch_node;
 
@@ -667,18 +680,18 @@ void AMFImporter::Postprocess_BuildConstellation(CAMFImporter_NodeElement_Conste
     con_node = new aiNode;
     con_node->mName = pConstellation.ID;
     // Walk through children and search for instances of another objects, constellations.
-    for (const CAMFImporter_NodeElement *ne : pConstellation.Child) {
+    for (const AMFNodeElementBase *ne : pConstellation.Child) {
         aiMatrix4x4 tmat;
         aiNode *t_node;
         aiNode *found_node;
 
-        if (ne->Type == CAMFImporter_NodeElement::ENET_Metadata) continue;
-        if (ne->Type != CAMFImporter_NodeElement::ENET_Instance) throw DeadlyImportError("Only <instance> nodes can be in <constellation>.");
+        if (ne->Type == AMFNodeElementBase::ENET_Metadata) continue;
+        if (ne->Type != AMFNodeElementBase::ENET_Instance) throw DeadlyImportError("Only <instance> nodes can be in <constellation>.");
 
         // create alias for conveniance
-        CAMFImporter_NodeElement_Instance &als = *((CAMFImporter_NodeElement_Instance *)ne);
+        AMFInstance &als = *((AMFInstance *)ne);
         // find referenced object
-        if (!Find_ConvertedNode(als.ObjectID, pNodeList, &found_node)) Throw_ID_NotFound(als.ObjectID);
+        if (!Find_ConvertedNode(als.ObjectID, nodeArray, &found_node)) Throw_ID_NotFound(als.ObjectID);
 
         // create node for applying transformation
         t_node = new aiNode;
@@ -707,13 +720,13 @@ void AMFImporter::Postprocess_BuildConstellation(CAMFImporter_NodeElement_Conste
         con_node->mChildren[ch_idx++] = node;
 
     // and place "root" of <constellation> node to node list
-    pNodeList.push_back(con_node);
+    nodeArray.push_back(con_node);
 }
 
 void AMFImporter::Postprocess_BuildScene(aiScene *pScene) {
-    std::list<aiNode *> node_list;
-    std::list<aiMesh *> mesh_list;
-    std::list<CAMFImporter_NodeElement_Metadata *> meta_list;
+    NodeArray nodeArray;
+    MeshArray mesh_list;
+    AMFMetaDataArray meta_list;
 
     //
     // Because for AMF "material" is just complex colors mixing so aiMaterial will not be used.
@@ -723,18 +736,21 @@ void AMFImporter::Postprocess_BuildScene(aiScene *pScene) {
     pScene->mRootNode->mParent = nullptr;
     pScene->mFlags |= AI_SCENE_FLAGS_ALLOW_SHARED;
     // search for root(<amf>) element
-    CAMFImporter_NodeElement *root_el = nullptr;
+    AMFNodeElementBase *root_el = nullptr;
 
-    for (CAMFImporter_NodeElement *ne : mNodeElement_List) {
-        if (ne->Type != CAMFImporter_NodeElement::ENET_Root) continue;
+    for (AMFNodeElementBase *ne : mNodeElement_List) {
+        if (ne->Type != AMFNodeElementBase::ENET_Root) {
+            continue;
+        }
 
         root_el = ne;
-
         break;
     } // for(const CAMFImporter_NodeElement* ne: mNodeElement_List)
 
     // Check if root element are found.
-    if (root_el == nullptr) throw DeadlyImportError("Root(<amf>) element not found.");
+    if (root_el == nullptr) {
+        throw DeadlyImportError("Root(<amf>) element not found.");
+    }
 
     // after that walk through children of root and collect data. Five types of nodes can be placed at top level - in <amf>: <object>, <material>, <texture>,
     // <constellation> and <metadata>. But at first we must read <material> and <texture> because they will be used in <object>. <metadata> can be read
@@ -742,34 +758,38 @@ void AMFImporter::Postprocess_BuildScene(aiScene *pScene) {
     //
     // 1. <material>
     // 2. <texture> will be converted later when processing triangles list. \sa Postprocess_BuildMeshSet
-    for (const CAMFImporter_NodeElement *root_child : root_el->Child) {
-        if (root_child->Type == CAMFImporter_NodeElement::ENET_Material) Postprocess_BuildMaterial(*((CAMFImporter_NodeElement_Material *)root_child));
+    for (const AMFNodeElementBase *root_child : root_el->Child) {
+        if (root_child->Type == AMFNodeElementBase::ENET_Material) {
+            Postprocess_BuildMaterial(*((AMFMaterial *)root_child));
+        }
     }
 
     // After "appearance" nodes we must read <object> because it will be used in <constellation> -> <instance>.
     //
     // 3. <object>
-    for (const CAMFImporter_NodeElement *root_child : root_el->Child) {
-        if (root_child->Type == CAMFImporter_NodeElement::ENET_Object) {
+    for (const AMFNodeElementBase *root_child : root_el->Child) {
+        if (root_child->Type == AMFNodeElementBase::ENET_Object) {
             aiNode *tnode = nullptr;
 
             // for <object> mesh and node must be built: object ID assigned to aiNode name and will be used in future for <instance>
-            Postprocess_BuildNodeAndObject(*((CAMFImporter_NodeElement_Object *)root_child), mesh_list, &tnode);
-            if (tnode != nullptr) node_list.push_back(tnode);
+            Postprocess_BuildNodeAndObject(*((AMFObject *)root_child), mesh_list, &tnode);
+            if (tnode != nullptr) {
+                nodeArray.push_back(tnode);
+            }
         }
     } // for(const CAMFImporter_NodeElement* root_child: root_el->Child)
 
     // And finally read rest of nodes.
     //
-    for (const CAMFImporter_NodeElement *root_child : root_el->Child) {
+    for (const AMFNodeElementBase *root_child : root_el->Child) {
         // 4. <constellation>
-        if (root_child->Type == CAMFImporter_NodeElement::ENET_Constellation) {
+        if (root_child->Type == AMFNodeElementBase::ENET_Constellation) {
             // <object> and <constellation> at top of self abstraction use aiNode. So we can use only aiNode list for creating new aiNode's.
-            Postprocess_BuildConstellation(*((CAMFImporter_NodeElement_Constellation *)root_child), node_list);
+            Postprocess_BuildConstellation(*((AMFConstellation *)root_child), nodeArray);
         }
 
         // 5, <metadata>
-        if (root_child->Type == CAMFImporter_NodeElement::ENET_Metadata) meta_list.push_back((CAMFImporter_NodeElement_Metadata *)root_child);
+        if (root_child->Type == AMFNodeElementBase::ENET_Metadata) meta_list.push_back((AMFMetadata *)root_child);
     } // for(const CAMFImporter_NodeElement* root_child: root_el->Child)
 
     // at now we can add collected metadata to root node
@@ -783,17 +803,17 @@ void AMFImporter::Postprocess_BuildScene(aiScene *pScene) {
     // And at this step we are checking that relations.
 nl_clean_loop:
 
-    if (node_list.size() > 1) {
+    if (nodeArray.size() > 1) {
         // walk through all nodes
-        for (std::list<aiNode *>::iterator nl_it = node_list.begin(); nl_it != node_list.end(); ++nl_it) {
+        for (NodeArray::iterator nl_it = nodeArray.begin(); nl_it != nodeArray.end(); ++nl_it) {
             // and try to find them in another top nodes.
-            std::list<aiNode *>::const_iterator next_it = nl_it;
+            NodeArray::const_iterator next_it = nl_it;
 
             ++next_it;
-            for (; next_it != node_list.end(); ++next_it) {
+            for (; next_it != nodeArray.end(); ++next_it) {
                 if ((*next_it)->FindNode((*nl_it)->mName) != nullptr) {
                     // if current top node(nl_it) found in another top node then erase it from node_list and restart search loop.
-                    node_list.erase(nl_it);
+                    nodeArray.erase(nl_it);
 
                     goto nl_clean_loop;
                 }
@@ -806,10 +826,10 @@ nl_clean_loop:
     //
     //
     // Nodes
-    if (!node_list.empty()) {
-        std::list<aiNode *>::const_iterator nl_it = node_list.begin();
+    if (!nodeArray.empty()) {
+        NodeArray::const_iterator nl_it = nodeArray.begin();
 
-        pScene->mRootNode->mNumChildren = static_cast<unsigned int>(node_list.size());
+        pScene->mRootNode->mNumChildren = static_cast<unsigned int>(nodeArray.size());
         pScene->mRootNode->mChildren = new aiNode *[pScene->mRootNode->mNumChildren];
         for (size_t i = 0; i < pScene->mRootNode->mNumChildren; i++) {
             // Objects and constellation that must be showed placed at top of hierarchy in <amf> node. So all aiNode's in node_list must have
@@ -822,7 +842,7 @@ nl_clean_loop:
     //
     // Meshes
     if (!mesh_list.empty()) {
-        std::list<aiMesh *>::const_iterator ml_it = mesh_list.begin();
+        MeshArray::const_iterator ml_it = mesh_list.begin();
 
         pScene->mNumMeshes = static_cast<unsigned int>(mesh_list.size());
         pScene->mMeshes = new aiMesh *[pScene->mNumMeshes];
diff --git a/code/AssetLib/ASE/ASELoader.cpp b/code/AssetLib/ASE/ASELoader.cpp
index a27767229..057272c91 100644
--- a/code/AssetLib/ASE/ASELoader.cpp
+++ b/code/AssetLib/ASE/ASELoader.cpp
@@ -137,7 +137,7 @@ void ASEImporter::InternReadFile(const std::string &pFile,
 
     // Check whether we can read from the file
     if (file.get() == nullptr) {
-        throw DeadlyImportError("Failed to open ASE file " + pFile + ".");
+        throw DeadlyImportError("Failed to open ASE file ", pFile, ".");
     }
 
     // Allocate storage and copy the contents of the file to a memory buffer
diff --git a/code/AssetLib/Assbin/AssbinFileWriter.cpp b/code/AssetLib/Assbin/AssbinFileWriter.cpp
index a879e637c..83a647a0b 100644
--- a/code/AssetLib/Assbin/AssbinFileWriter.cpp
+++ b/code/AssetLib/Assbin/AssbinFileWriter.cpp
@@ -60,10 +60,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <time.h>
 
-#ifdef _WIN32
+#if _MSC_VER
 #pragma warning(push)
 #pragma warning(disable : 4706)
-#endif // _WIN32
+#endif // _MSC_VER
 
 namespace Assimp {
 
@@ -825,8 +825,8 @@ void DumpSceneToAssbin(
     AssbinFileWriter fileWriter(shortened, compressed);
     fileWriter.WriteBinaryDump(pFile, cmd, pIOSystem, pScene);
 }
-#ifdef _WIN32
+#if _MSC_VER
 #pragma warning(pop)
-#endif // _WIN32
+#endif // _MSC_VER
 
 } // end of namespace Assimp
diff --git a/code/AssetLib/Assjson/cencode.c b/code/AssetLib/Assjson/cencode.c
index 0ed979b01..614a2671f 100644
--- a/code/AssetLib/Assjson/cencode.c
+++ b/code/AssetLib/Assjson/cencode.c
@@ -9,8 +9,10 @@ For details, see http://sourceforge.net/projects/libb64
 
 const int CHARS_PER_LINE = 72;
 
+#ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable : 4244)
+#endif // _MSC_VER
 
 void base64_init_encodestate(base64_encodestate* state_in)
 {
@@ -33,9 +35,9 @@ int base64_encode_block(const char* plaintext_in, int length_in, char* code_out,
 	char* codechar = code_out;
 	char result;
 	char fragment;
-	
+
 	result = state_in->result;
-	
+
 	switch (state_in->step)
 	{
 		while (1)
@@ -74,7 +76,7 @@ int base64_encode_block(const char* plaintext_in, int length_in, char* code_out,
 			*codechar++ = base64_encode_value(result);
 			result  = (fragment & 0x03f) >> 0;
 			*codechar++ = base64_encode_value(result);
-			
+
 			++(state_in->stepcount);
 			if (state_in->stepcount == CHARS_PER_LINE/4)
 			{
@@ -90,7 +92,7 @@ int base64_encode_block(const char* plaintext_in, int length_in, char* code_out,
 int base64_encode_blockend(char* code_out, base64_encodestate* state_in)
 {
 	char* codechar = code_out;
-	
+
 	switch (state_in->step)
 	{
 	case step_B:
@@ -106,8 +108,10 @@ int base64_encode_blockend(char* code_out, base64_encodestate* state_in)
 		break;
 	}
 	*codechar++ = '\n';
-	
+
 	return (int)(codechar - code_out);
 }
 
+#ifdef _MSC_VER
 #pragma warning(pop)
+#endif // _MSC_VER
diff --git a/code/AssetLib/Assjson/cencode.h b/code/AssetLib/Assjson/cencode.h
index 6bf76724e..a7893c434 100644
--- a/code/AssetLib/Assjson/cencode.h
+++ b/code/AssetLib/Assjson/cencode.h
@@ -8,9 +8,9 @@ For details, see http://sourceforge.net/projects/libb64
 #ifndef BASE64_CENCODE_H
 #define BASE64_CENCODE_H
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 #pragma warning(disable : 4127 )
-#endif // _WIN32
+#endif // _MSC_VER
 
 typedef enum
 {
diff --git a/code/AssetLib/B3D/B3DImporter.cpp b/code/AssetLib/B3D/B3DImporter.cpp
index ff595aaf1..25e484e02 100644
--- a/code/AssetLib/B3D/B3DImporter.cpp
+++ b/code/AssetLib/B3D/B3DImporter.cpp
@@ -119,7 +119,7 @@ void B3DImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
 
     // Check whether we can read from the file
     if (file.get() == nullptr) {
-        throw DeadlyImportError("Failed to open B3D file " + pFile + ".");
+        throw DeadlyImportError("Failed to open B3D file ", pFile, ".");
     }
 
     // check whether the .b3d file is large enough to contain
@@ -147,7 +147,7 @@ AI_WONT_RETURN void B3DImporter::Fail(string str) {
 #ifdef DEBUG_B3D
     ASSIMP_LOG_ERROR_F("Error in B3D file data: ", str);
 #endif
-    throw DeadlyImportError("B3D Importer - error in B3D file data: " + str);
+    throw DeadlyImportError("B3D Importer - error in B3D file data: ", str);
 }
 
 // ------------------------------------------------------------------------------------------------
diff --git a/code/AssetLib/BVH/BVHLoader.cpp b/code/AssetLib/BVH/BVHLoader.cpp
index 46afc5e64..3bea70c95 100644
--- a/code/AssetLib/BVH/BVHLoader.cpp
+++ b/code/AssetLib/BVH/BVHLoader.cpp
@@ -71,6 +71,13 @@ static const aiImporterDesc desc = {
     "bvh"
 };
 
+// ------------------------------------------------------------------------------------------------
+// Aborts the file reading with an exception
+template<typename... T>
+AI_WONT_RETURN void BVHLoader::ThrowException(T&&... args) {
+    throw DeadlyImportError(mFileName, ":", mLine, " - ", args...);
+}
+
 // ------------------------------------------------------------------------------------------------
 // Constructor to be privately used by Importer
 BVHLoader::BVHLoader() :
@@ -118,7 +125,7 @@ void BVHLoader::InternReadFile(const std::string &pFile, aiScene *pScene, IOSyst
     // read file into memory
     std::unique_ptr<IOStream> file(pIOHandler->Open(pFile));
     if (file.get() == nullptr) {
-        throw DeadlyImportError("Failed to open file " + pFile + ".");
+        throw DeadlyImportError("Failed to open file ", pFile, ".");
     }
 
     size_t fileSize = file->FileSize();
@@ -176,12 +183,12 @@ aiNode *BVHLoader::ReadNode() {
     // first token is name
     std::string nodeName = GetNextToken();
     if (nodeName.empty() || nodeName == "{")
-        ThrowException(format() << "Expected node name, but found \"" << nodeName << "\".");
+        ThrowException("Expected node name, but found \"", nodeName, "\".");
 
     // then an opening brace should follow
     std::string openBrace = GetNextToken();
     if (openBrace != "{")
-        ThrowException(format() << "Expected opening brace \"{\", but found \"" << openBrace << "\".");
+        ThrowException("Expected opening brace \"{\", but found \"", openBrace, "\".");
 
     // Create a node
     aiNode *node = new aiNode(nodeName);
@@ -211,7 +218,7 @@ aiNode *BVHLoader::ReadNode() {
             siteToken.clear();
             siteToken = GetNextToken();
             if (siteToken != "Site")
-                ThrowException(format() << "Expected \"End Site\" keyword, but found \"" << token << " " << siteToken << "\".");
+                ThrowException("Expected \"End Site\" keyword, but found \"", token, " ", siteToken, "\".");
 
             aiNode *child = ReadEndSite(nodeName);
             child->mParent = node;
@@ -221,7 +228,7 @@ aiNode *BVHLoader::ReadNode() {
             break;
         } else {
             // everything else is a parse error
-            ThrowException(format() << "Unknown keyword \"" << token << "\".");
+            ThrowException("Unknown keyword \"", token, "\".");
         }
     }
 
@@ -242,7 +249,7 @@ aiNode *BVHLoader::ReadEndSite(const std::string &pParentName) {
     // check opening brace
     std::string openBrace = GetNextToken();
     if (openBrace != "{")
-        ThrowException(format() << "Expected opening brace \"{\", but found \"" << openBrace << "\".");
+        ThrowException("Expected opening brace \"{\", but found \"", openBrace, "\".");
 
     // Create a node
     aiNode *node = new aiNode("EndSite_" + pParentName);
@@ -261,7 +268,7 @@ aiNode *BVHLoader::ReadEndSite(const std::string &pParentName) {
             break;
         } else {
             // everything else is a parse error
-            ThrowException(format() << "Unknown keyword \"" << token << "\".");
+            ThrowException("Unknown keyword \"", token, "\".");
         }
     }
 
@@ -307,7 +314,7 @@ void BVHLoader::ReadNodeChannels(BVHLoader::Node &pNode) {
         else if (channelToken == "Zrotation")
             pNode.mChannels.push_back(Channel_RotationZ);
         else
-            ThrowException(format() << "Invalid channel specifier \"" << channelToken << "\".");
+            ThrowException("Invalid channel specifier \"", channelToken, "\".");
     }
 }
 
@@ -317,7 +324,7 @@ void BVHLoader::ReadMotion(aiScene * /*pScene*/) {
     // Read number of frames
     std::string tokenFrames = GetNextToken();
     if (tokenFrames != "Frames:")
-        ThrowException(format() << "Expected frame count \"Frames:\", but found \"" << tokenFrames << "\".");
+        ThrowException("Expected frame count \"Frames:\", but found \"", tokenFrames, "\".");
 
     float numFramesFloat = GetNextTokenAsFloat();
     mAnimNumFrames = (unsigned int)numFramesFloat;
@@ -326,7 +333,7 @@ void BVHLoader::ReadMotion(aiScene * /*pScene*/) {
     std::string tokenDuration1 = GetNextToken();
     std::string tokenDuration2 = GetNextToken();
     if (tokenDuration1 != "Frame" || tokenDuration2 != "Time:")
-        ThrowException(format() << "Expected frame duration \"Frame Time:\", but found \"" << tokenDuration1 << " " << tokenDuration2 << "\".");
+        ThrowException("Expected frame duration \"Frame Time:\", but found \"", tokenDuration1, " ", tokenDuration2, "\".");
 
     mAnimTickDuration = GetNextTokenAsFloat();
 
@@ -393,17 +400,11 @@ float BVHLoader::GetNextTokenAsFloat() {
     ctoken = fast_atoreal_move<float>(ctoken, result);
 
     if (ctoken != token.c_str() + token.length())
-        ThrowException(format() << "Expected a floating point number, but found \"" << token << "\".");
+        ThrowException("Expected a floating point number, but found \"", token, "\".");
 
     return result;
 }
 
-// ------------------------------------------------------------------------------------------------
-// Aborts the file reading with an exception
-AI_WONT_RETURN void BVHLoader::ThrowException(const std::string &pError) {
-    throw DeadlyImportError(format() << mFileName << ":" << mLine << " - " << pError);
-}
-
 // ------------------------------------------------------------------------------------------------
 // Constructs an animation for the motion data and stores it in the given scene
 void BVHLoader::CreateAnimation(aiScene *pScene) {
@@ -453,7 +454,7 @@ void BVHLoader::CreateAnimation(aiScene *pScene) {
                     std::map<BVHLoader::ChannelType, int>::iterator mapIter = channelMap.find(channel);
 
                     if (mapIter == channelMap.end())
-                        throw DeadlyImportError("Missing position channel in node " + nodeName);
+                        throw DeadlyImportError("Missing position channel in node ", nodeName);
                     else {
                         int channelIdx = mapIter->second;
                         switch (channel) {
diff --git a/code/AssetLib/BVH/BVHLoader.h b/code/AssetLib/BVH/BVHLoader.h
index c2ecbd102..3af3cbb31 100644
--- a/code/AssetLib/BVH/BVHLoader.h
+++ b/code/AssetLib/BVH/BVHLoader.h
@@ -134,7 +134,8 @@ protected:
     float GetNextTokenAsFloat();
 
     /** Aborts the file reading with an exception */
-    AI_WONT_RETURN void ThrowException(const std::string &pError) AI_WONT_RETURN_SUFFIX;
+    template<typename... T>
+    AI_WONT_RETURN void ThrowException(T&&... args) AI_WONT_RETURN_SUFFIX;
 
     /** Constructs an animation for the motion data and stores it in the given scene */
     void CreateAnimation(aiScene *pScene);
diff --git a/code/AssetLib/Blender/BlenderCustomData.cpp b/code/AssetLib/Blender/BlenderCustomData.cpp
index c752da4e0..c74a6bb75 100644
--- a/code/AssetLib/Blender/BlenderCustomData.cpp
+++ b/code/AssetLib/Blender/BlenderCustomData.cpp
@@ -149,7 +149,7 @@ bool isValidCustomDataType(const int cdtype) {
 
 bool readCustomData(std::shared_ptr<ElemBase> &out, const int cdtype, const size_t cnt, const FileDatabase &db) {
     if (!isValidCustomDataType(cdtype)) {
-        throw Error((Formatter::format(), "CustomData.type ", cdtype, " out of index"));
+        throw Error("CustomData.type ", cdtype, " out of index");
     }
 
     const CustomDataTypeDescription cdtd = customDataTypeDescriptions[cdtype];
diff --git a/code/AssetLib/Blender/BlenderDNA.cpp b/code/AssetLib/Blender/BlenderDNA.cpp
index 920362f24..cd9bce66f 100644
--- a/code/AssetLib/Blender/BlenderDNA.cpp
+++ b/code/AssetLib/Blender/BlenderDNA.cpp
@@ -130,9 +130,7 @@ void DNAParser::Parse() {
 
         uint16_t n = stream.GetI2();
         if (n >= types.size()) {
-            throw DeadlyImportError((format(),
-                    "BlenderDNA: Invalid type index in structure name", n,
-                    " (there are only ", types.size(), " entries)"));
+            throw DeadlyImportError("BlenderDNA: Invalid type index in structure name", n, " (there are only ", types.size(), " entries)");
         }
 
         // maintain separate indexes
@@ -141,7 +139,6 @@ void DNAParser::Parse() {
         dna.structures.push_back(Structure());
         Structure &s = dna.structures.back();
         s.name = types[n].name;
-        //s.index = dna.structures.size()-1;
 
         n = stream.GetI2();
         s.fields.reserve(n);
@@ -151,9 +148,7 @@ void DNAParser::Parse() {
 
             uint16_t j = stream.GetI2();
             if (j >= types.size()) {
-                throw DeadlyImportError((format(),
-                        "BlenderDNA: Invalid type index in structure field ", j,
-                        " (there are only ", types.size(), " entries)"));
+                throw DeadlyImportError("BlenderDNA: Invalid type index in structure field ", j, " (there are only ", types.size(), " entries)");
             }
             s.fields.push_back(Field());
             Field &f = s.fields.back();
@@ -164,9 +159,7 @@ void DNAParser::Parse() {
 
             j = stream.GetI2();
             if (j >= names.size()) {
-                throw DeadlyImportError((format(),
-                        "BlenderDNA: Invalid name index in structure field ", j,
-                        " (there are only ", names.size(), " entries)"));
+                throw DeadlyImportError("BlenderDNA: Invalid name index in structure field ", j, " (there are only ", names.size(), " entries)");
             }
 
             f.name = names[j];
@@ -188,9 +181,7 @@ void DNAParser::Parse() {
             if (*f.name.rbegin() == ']') {
                 const std::string::size_type rb = f.name.find('[');
                 if (rb == std::string::npos) {
-                    throw DeadlyImportError((format(),
-                            "BlenderDNA: Encountered invalid array declaration ",
-                            f.name));
+                    throw DeadlyImportError("BlenderDNA: Encountered invalid array declaration ", f.name);
                 }
 
                 f.flags |= FieldFlag_Array;
diff --git a/code/AssetLib/Blender/BlenderDNA.h b/code/AssetLib/Blender/BlenderDNA.h
index c89b21434..25322a374 100644
--- a/code/AssetLib/Blender/BlenderDNA.h
+++ b/code/AssetLib/Blender/BlenderDNA.h
@@ -83,9 +83,9 @@ class ObjectCache;
  *  ancestry. */
 // -------------------------------------------------------------------------------
 struct Error : DeadlyImportError {
-    Error(const std::string &s) :
-            DeadlyImportError(s) {
-        // empty
+    template <typename... T>
+    explicit Error(T &&...args) :
+            DeadlyImportError(args...) {
     }
 };
 
@@ -186,7 +186,7 @@ struct Field {
 };
 
 // -------------------------------------------------------------------------------
-/** Range of possible behaviours for fields absend in the input file. Some are
+/** Range of possible behaviors for fields absence in the input file. Some are
  *  mission critical so we need them, while others can silently be default
  *  initialized and no animations are harmed. */
 // -------------------------------------------------------------------------------
@@ -394,7 +394,7 @@ private:
 
 // --------------------------------------------------------
 template <>
-struct Structure ::_defaultInitializer<ErrorPolicy_Warn> {
+struct Structure::_defaultInitializer<ErrorPolicy_Warn> {
 
     template <typename T>
     void operator()(T &out, const char *reason = "<add reason>") {
@@ -406,7 +406,7 @@ struct Structure ::_defaultInitializer<ErrorPolicy_Warn> {
 };
 
 template <>
-struct Structure ::_defaultInitializer<ErrorPolicy_Fail> {
+struct Structure::_defaultInitializer<ErrorPolicy_Fail> {
 
     template <typename T>
     void operator()(T & /*out*/, const char * = "") {
diff --git a/code/AssetLib/Blender/BlenderDNA.inl b/code/AssetLib/Blender/BlenderDNA.inl
index 7bb9d586a..c4e84b5e0 100644
--- a/code/AssetLib/Blender/BlenderDNA.inl
+++ b/code/AssetLib/Blender/BlenderDNA.inl
@@ -57,9 +57,7 @@ const Field& Structure :: operator [] (const std::string& ss) const
 {
     std::map<std::string, size_t>::const_iterator it = indices.find(ss);
     if (it == indices.end()) {
-        throw Error((Formatter::format(),
-            "BlendDNA: Did not find a field named `",ss,"` in structure `",name,"`"
-            ));
+        throw Error("BlendDNA: Did not find a field named `",ss,"` in structure `",name,"`");
     }
 
     return fields[(*it).second];
@@ -76,9 +74,7 @@ const Field* Structure :: Get (const std::string& ss) const
 const Field& Structure :: operator [] (const size_t i) const
 {
     if (i >= fields.size()) {
-        throw Error((Formatter::format(),
-            "BlendDNA: There is no field with index `",i,"` in structure `",name,"`"
-            ));
+        throw Error("BlendDNA: There is no field with index `",i,"` in structure `",name,"`");
     }
 
     return fields[i];
@@ -109,9 +105,7 @@ void Structure :: ReadFieldArray(T (& out)[M], const char* name, const FileDatab
 
         // is the input actually an array?
         if (!(f.flags & FieldFlag_Array)) {
-            throw Error((Formatter::format(),"Field `",name,"` of structure `",
-                this->name,"` ought to be an array of size ",M
-                ));
+            throw Error("Field `",name,"` of structure `",this->name,"` ought to be an array of size ",M);
         }
 
         db.reader->IncPtr(f.offset);
@@ -148,9 +142,9 @@ void Structure :: ReadFieldArray2(T (& out)[M][N], const char* name, const FileD
 
         // is the input actually an array?
         if (!(f.flags & FieldFlag_Array)) {
-            throw Error((Formatter::format(),"Field `",name,"` of structure `",
+            throw Error("Field `",name,"` of structure `",
                 this->name,"` ought to be an array of size ",M,"*",N
-                ));
+                );
         }
 
         db.reader->IncPtr(f.offset);
@@ -195,8 +189,8 @@ bool Structure :: ReadFieldPtr(TOUT<T>& out, const char* name, const FileDatabas
 
         // sanity check, should never happen if the genblenddna script is right
         if (!(f->flags & FieldFlag_Pointer)) {
-            throw Error((Formatter::format(),"Field `",name,"` of structure `",
-                this->name,"` ought to be a pointer"));
+            throw Error("Field `",name,"` of structure `",
+                this->name,"` ought to be a pointer");
         }
 
         db.reader->IncPtr(f->offset);
@@ -241,8 +235,8 @@ bool Structure :: ReadFieldPtr(TOUT<T> (&out)[N], const char* name,
 #ifdef _DEBUG
         // sanity check, should never happen if the genblenddna script is right
         if ((FieldFlag_Pointer|FieldFlag_Pointer) != (f->flags & (FieldFlag_Pointer|FieldFlag_Pointer))) {
-            throw Error((Formatter::format(),"Field `",name,"` of structure `",
-                this->name,"` ought to be a pointer AND an array"));
+            throw Error("Field `",name,"` of structure `",
+                this->name,"` ought to be a pointer AND an array");
         }
 #endif // _DEBUG
 
@@ -322,8 +316,8 @@ bool Structure::ReadCustomDataPtr(std::shared_ptr<ElemBase>&out, int cdtype, con
 
 		// sanity check, should never happen if the genblenddna script is right
 		if (!(f->flags & FieldFlag_Pointer)) {
-			throw Error((Formatter::format(), "Field `", name, "` of structure `",
-				this->name, "` ought to be a pointer"));
+			throw Error("Field `", name, "` of structure `",
+				this->name, "` ought to be a pointer");
 		}
 
 		db.reader->IncPtr(f->offset);
@@ -369,8 +363,8 @@ bool Structure::ReadFieldPtrVector(vector<TOUT<T>>&out, const char* name, const
 
 		// sanity check, should never happen if the genblenddna script is right
 		if (!(f->flags & FieldFlag_Pointer)) {
-			throw Error((Formatter::format(), "Field `", name, "` of structure `",
-				this->name, "` ought to be a pointer"));
+			throw Error("Field `", name, "` of structure `",
+				this->name, "` ought to be a pointer");
 		}
 
 		db.reader->IncPtr(f->offset);
@@ -428,9 +422,9 @@ bool Structure :: ResolvePointer(TOUT<T>& out, const Pointer & ptrval, const Fil
     // and check if it matches the type which we expect.
     const Structure& ss = db.dna[block->dna_index];
     if (ss != s) {
-        throw Error((Formatter::format(),"Expected target to be of type `",s.name,
+        throw Error("Expected target to be of type `",s.name,
             "` but seemingly it is a `",ss.name,"` instead"
-            ));
+            );
     }
 
     // try to retrieve the object from the cache
@@ -614,16 +608,14 @@ const FileBlockHead* Structure :: LocateFileBlockForAddress(const Pointer & ptrv
     if (it == db.entries.end()) {
         // this is crucial, pointers may not be invalid.
         // this is either a corrupted file or an attempted attack.
-        throw DeadlyImportError((Formatter::format(),"Failure resolving pointer 0x",
-            std::hex,ptrval.val,", no file block falls into this address range"
-            ));
+        throw DeadlyImportError("Failure resolving pointer 0x",
+            std::hex,ptrval.val,", no file block falls into this address range");
     }
     if (ptrval.val >= (*it).address.val + (*it).size) {
-        throw DeadlyImportError((Formatter::format(),"Failure resolving pointer 0x",
+        throw DeadlyImportError("Failure resolving pointer 0x",
             std::hex,ptrval.val,", nearest file block starting at 0x",
             (*it).address.val," ends at 0x",
-            (*it).address.val + (*it).size
-            ));
+            (*it).address.val + (*it).size);
     }
     return &*it;
 }
@@ -676,7 +668,7 @@ template <typename T> inline void ConvertDispatcher(T& out, const Structure& in,
         out = static_cast<T>(db.reader->GetF8());
     }
     else {
-        throw DeadlyImportError("Unknown source for conversion to primitive data type: "+in.name);
+        throw DeadlyImportError("Unknown source for conversion to primitive data type: ", in.name);
     }
 }
 
@@ -784,9 +776,7 @@ const Structure& DNA :: operator [] (const std::string& ss) const
 {
     std::map<std::string, size_t>::const_iterator it = indices.find(ss);
     if (it == indices.end()) {
-        throw Error((Formatter::format(),
-            "BlendDNA: Did not find a structure named `",ss,"`"
-            ));
+        throw Error("BlendDNA: Did not find a structure named `",ss,"`");
     }
 
     return structures[(*it).second];
@@ -803,9 +793,7 @@ const Structure* DNA :: Get (const std::string& ss) const
 const Structure& DNA :: operator [] (const size_t i) const
 {
     if (i >= structures.size()) {
-        throw Error((Formatter::format(),
-            "BlendDNA: There is no structure with index `",i,"`"
-            ));
+        throw Error("BlendDNA: There is no structure with index `",i,"`");
     }
 
     return structures[i];
diff --git a/code/AssetLib/Blender/BlenderLoader.cpp b/code/AssetLib/Blender/BlenderLoader.cpp
index 508db8422..8d14d0b9b 100644
--- a/code/AssetLib/Blender/BlenderLoader.cpp
+++ b/code/AssetLib/Blender/BlenderLoader.cpp
@@ -748,9 +748,8 @@ void BlenderImporter::BuildMaterials(ConversionData &conv_data) {
 void BlenderImporter::CheckActualType(const ElemBase *dt, const char *check) {
     ai_assert(dt);
     if (strcmp(dt->dna_type, check)) {
-        ThrowException((format(),
-                "Expected object at ", std::hex, dt, " to be of type `", check,
-                "`, but it claims to be a `", dt->dna_type, "`instead"));
+        ThrowException("Expected object at ", std::hex, dt, " to be of type `", check,
+                "`, but it claims to be a `", dt->dna_type, "`instead");
     }
 }
 
diff --git a/code/AssetLib/Blender/BlenderLoader.h b/code/AssetLib/Blender/BlenderLoader.h
index 8110ac946..15a7ea6f0 100644
--- a/code/AssetLib/Blender/BlenderLoader.h
+++ b/code/AssetLib/Blender/BlenderLoader.h
@@ -106,51 +106,18 @@ class BlenderImporter : public BaseImporter, public LogFunctions<BlenderImporter
 public:
     BlenderImporter();
     ~BlenderImporter();
-
-public:
-
-    // --------------------
-    bool CanRead( const std::string& pFile,
-        IOSystem* pIOHandler,
-        bool checkSig
-    ) const;
+    bool CanRead( const std::string& pFile, IOSystem* pIOHandler, bool checkSig) const;
 
 protected:
-
-    // --------------------
     const aiImporterDesc* GetInfo () const;
-
-    // --------------------
     void GetExtensionList(std::set<std::string>& app);
-
-    // --------------------
     void SetupProperties(const Importer* pImp);
-
-    // --------------------
-    void InternReadFile( const std::string& pFile,
-        aiScene* pScene,
-        IOSystem* pIOHandler
-    );
-
-    // --------------------
-    void ParseBlendFile(Blender::FileDatabase& out,
-        std::shared_ptr<IOStream> stream
-    );
-
-    // --------------------
-    void ExtractScene(Blender::Scene& out,
-        const Blender::FileDatabase& file
-    );
-
-    // --------------------
-    void ConvertBlendFile(aiScene* out,
-        const Blender::Scene& in,
-        const Blender::FileDatabase& file
-    );
+    void InternReadFile( const std::string& pFile, aiScene* pScene, IOSystem* pIOHandler);
+    void ParseBlendFile(Blender::FileDatabase& out, std::shared_ptr<IOStream> stream);
+    void ExtractScene(Blender::Scene& out, const Blender::FileDatabase& file);
+    void ConvertBlendFile(aiScene* out, const Blender::Scene& in, const Blender::FileDatabase& file);
 
 private:
-
-    // --------------------
     aiNode* ConvertNode(const Blender::Scene& in,
         const Blender::Object* obj,
         Blender::ConversionData& conv_info,
diff --git a/code/AssetLib/Blender/BlenderScene.h b/code/AssetLib/Blender/BlenderScene.h
index 980dde6e0..19d19ed01 100644
--- a/code/AssetLib/Blender/BlenderScene.h
+++ b/code/AssetLib/Blender/BlenderScene.h
@@ -155,7 +155,7 @@ struct World : ElemBase {
 // -------------------------------------------------------------------------------
 struct MVert : ElemBase {
     float co[3] FAIL;
-    float no[3] FAIL; // readed as short and divided through / 32767.f
+    float no[3] FAIL; // read as short and divided through / 32767.f
     char flag;
     int mat_nr WARN;
     int bweight;
@@ -228,7 +228,10 @@ struct TFace : ElemBase {
 // -------------------------------------------------------------------------------
 struct MTFace : ElemBase {
     MTFace() :
-            flag(0), mode(0), tile(0), unwrap(0) {
+            flag(0),
+            mode(0),
+            tile(0),
+            unwrap(0) {
     }
 
     float uv[4][2] FAIL;
diff --git a/code/AssetLib/Blender/BlenderTessellator.cpp b/code/AssetLib/Blender/BlenderTessellator.cpp
index 3c1cd6ea8..3366d56c5 100644
--- a/code/AssetLib/Blender/BlenderTessellator.cpp
+++ b/code/AssetLib/Blender/BlenderTessellator.cpp
@@ -386,7 +386,14 @@ void BlenderTessellatorP2T::ReferencePoints( std::vector< Blender::PointP2T >& p
 // ------------------------------------------------------------------------------------------------
 inline PointP2T& BlenderTessellatorP2T::GetActualPointStructure( p2t::Point& point ) const
 {
+#if defined __clang__
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Winvalid-offsetof"
+#endif // __clang__
     unsigned int pointOffset = offsetof( PointP2T, point2D );
+#if defined __clang__
+#    pragma clang diagnostic pop
+#endif
     PointP2T& pointStruct = *reinterpret_cast< PointP2T* >( reinterpret_cast< char* >( &point ) - pointOffset );
     if ( pointStruct.magic != static_cast<int>( BLEND_TESS_MAGIC ) )
     {
@@ -394,7 +401,6 @@ inline PointP2T& BlenderTessellatorP2T::GetActualPointStructure( p2t::Point& poi
     }
     return pointStruct;
 }
-
 // ------------------------------------------------------------------------------------------------
 void BlenderTessellatorP2T::MakeFacesFromTriangles( std::vector< p2t::Triangle* >& triangles ) const
 {
diff --git a/code/AssetLib/COB/COBLoader.cpp b/code/AssetLib/COB/COBLoader.cpp
index 86550e776..80b41143e 100644
--- a/code/AssetLib/COB/COBLoader.cpp
+++ b/code/AssetLib/COB/COBLoader.cpp
@@ -125,7 +125,7 @@ void COBImporter::SetupProperties(const Importer * /*pImp*/) {
 
 // ------------------------------------------------------------------------------------------------
 /*static*/ AI_WONT_RETURN void COBImporter::ThrowException(const std::string &msg) {
-    throw DeadlyImportError("COB: " + msg);
+    throw DeadlyImportError("COB: ", msg);
 }
 
 // ------------------------------------------------------------------------------------------------
diff --git a/code/AssetLib/CSM/CSMLoader.cpp b/code/AssetLib/CSM/CSMLoader.cpp
index c455bb3a4..a90bc4b89 100644
--- a/code/AssetLib/CSM/CSMLoader.cpp
+++ b/code/AssetLib/CSM/CSMLoader.cpp
@@ -128,7 +128,7 @@ void CSMImporter::InternReadFile( const std::string& pFile,
 
     // Check whether we can read from the file
     if( file.get() == nullptr) {
-        throw DeadlyImportError( "Failed to open CSM file " + pFile + ".");
+        throw DeadlyImportError( "Failed to open CSM file ", pFile, ".");
     }
 
     // allocate storage and copy the contents of the file to a memory buffer
diff --git a/code/AssetLib/Collada/ColladaExporter.cpp b/code/AssetLib/Collada/ColladaExporter.cpp
index 567f7c8e7..251cbee3e 100644
--- a/code/AssetLib/Collada/ColladaExporter.cpp
+++ b/code/AssetLib/Collada/ColladaExporter.cpp
@@ -573,7 +573,7 @@ bool ColladaExporter::ReadMaterialSurface(Surface &poSurface, const aiMaterial &
             index_str = index_str.substr(1, std::string::npos);
 
             try {
-                index = (unsigned int)strtoul10_64(index_str.c_str());
+                index = (unsigned int)strtoul10_64<DeadlyExportError>(index_str.c_str());
             } catch (std::exception &error) {
                 throw DeadlyExportError(error.what());
             }
diff --git a/code/AssetLib/Collada/ColladaHelper.cpp b/code/AssetLib/Collada/ColladaHelper.cpp
index 50d70e640..1a4bed3b1 100644
--- a/code/AssetLib/Collada/ColladaHelper.cpp
+++ b/code/AssetLib/Collada/ColladaHelper.cpp
@@ -1,5 +1,3 @@
-/** Helper structures for the Collada loader */
-
 /*
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
@@ -40,6 +38,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ----------------------------------------------------------------------
 */
+/** Helper structures for the Collada loader */
 
 #include "ColladaHelper.h"
 
@@ -54,7 +53,7 @@ const MetaKeyPairVector MakeColladaAssimpMetaKeys() {
     result.emplace_back("authoring_tool", AI_METADATA_SOURCE_GENERATOR);
     result.emplace_back("copyright", AI_METADATA_SOURCE_COPYRIGHT);
     return result;
-};
+}
 
 const MetaKeyPairVector &GetColladaAssimpMetaKeys() {
     static const MetaKeyPairVector result = MakeColladaAssimpMetaKeys();
@@ -67,7 +66,7 @@ const MetaKeyPairVector MakeColladaAssimpMetaKeysCamelCase() {
         ToCamelCase(val.first);
     }
     return result;
-};
+}
 
 const MetaKeyPairVector &GetColladaAssimpMetaKeysCamelCase() {
     static const MetaKeyPairVector result = MakeColladaAssimpMetaKeysCamelCase();
diff --git a/code/AssetLib/Collada/ColladaHelper.h b/code/AssetLib/Collada/ColladaHelper.h
index bc93203aa..bfd57918e 100644
--- a/code/AssetLib/Collada/ColladaHelper.h
+++ b/code/AssetLib/Collada/ColladaHelper.h
@@ -1,12 +1,9 @@
-/** Helper structures for the Collada loader */
-
 /*
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
 Copyright (c) 2006-2020, assimp team
 
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -42,12 +39,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ----------------------------------------------------------------------
 */
 
+/** Helper structures for the Collada loader */
+
 #ifndef AI_COLLADAHELPER_H_INC
 #define AI_COLLADAHELPER_H_INC
 
 #include <assimp/light.h>
 #include <assimp/material.h>
 #include <assimp/mesh.h>
+
 #include <stdint.h>
 #include <map>
 #include <set>
@@ -58,14 +58,14 @@ struct aiMaterial;
 namespace Assimp {
 namespace Collada {
 
-/** Collada file versions which evolved during the years ... */
+/// Collada file versions which evolved during the years ...
 enum FormatVersion {
     FV_1_5_n,
     FV_1_4_n,
     FV_1_3_n
 };
 
-/** Transformation types that can be applied to a node */
+/// Transformation types that can be applied to a node
 enum TransformType {
     TF_LOOKAT,
     TF_ROTATE,
@@ -75,7 +75,7 @@ enum TransformType {
     TF_MATRIX
 };
 
-/** Different types of input data to a vertex or face */
+/// Different types of input data to a vertex or face
 enum InputType {
     IT_Invalid,
     IT_Vertex, // special type for per-index data referring to the <vertices> element carrying the per-vertex data.
@@ -87,38 +87,39 @@ enum InputType {
     IT_Bitangent
 };
 
-/** Supported controller types */
+/// Supported controller types
 enum ControllerType {
     Skin,
     Morph
 };
 
-/** Supported morph methods */
+/// Supported morph methods
 enum MorphMethod {
     Normalized,
     Relative
 };
 
-/** Common metadata keys as <Collada, Assimp> */
-typedef std::pair<std::string, std::string> MetaKeyPair;
-typedef std::vector<MetaKeyPair> MetaKeyPairVector;
+/// Common metadata keys as <Collada, Assimp>
+using MetaKeyPair = std::pair<std::string, std::string>;
+using MetaKeyPairVector = std::vector<MetaKeyPair>;
 
-// Collada as lower_case (native)
+/// Collada as lower_case (native)
 const MetaKeyPairVector &GetColladaAssimpMetaKeys();
+
 // Collada as CamelCase (used by Assimp for consistency)
 const MetaKeyPairVector &GetColladaAssimpMetaKeysCamelCase();
 
-/** Convert underscore_separated to CamelCase "authoring_tool" becomes "AuthoringTool" */
+/// Convert underscore_separated to CamelCase "authoring_tool" becomes "AuthoringTool"
 void ToCamelCase(std::string &text);
 
-/** Contains all data for one of the different transformation types */
+/// Contains all data for one of the different transformation types
 struct Transform {
     std::string mID; ///< SID of the transform step, by which anim channels address their target node
     TransformType mType;
     ai_real f[16]; ///< Interpretation of data depends on the type of the transformation
 };
 
-/** A collada camera. */
+/// A collada camera.
 struct Camera {
     Camera() :
             mOrtho(false),
@@ -128,22 +129,22 @@ struct Camera {
             mZNear(0.1f),
             mZFar(1000.f) {}
 
-    // Name of camera
+    /// Name of camera
     std::string mName;
 
-    // True if it is an orthografic camera
+    /// True if it is an orthographic camera
     bool mOrtho;
 
-    //! Horizontal field of view in degrees
+    /// Horizontal field of view in degrees
     ai_real mHorFov;
 
-    //! Vertical field of view in degrees
+    /// Vertical field of view in degrees
     ai_real mVerFov;
 
-    //! Screen aspect
+    /// Screen aspect
     ai_real mAspect;
 
-    //! Near& far z
+    /// Near& far z
     ai_real mZNear, mZFar;
 };
 
@@ -162,27 +163,27 @@ struct Light {
             mOuterAngle(ASSIMP_COLLADA_LIGHT_ANGLE_NOT_SET),
             mIntensity(1.f) {}
 
-    //! Type of the light source aiLightSourceType + ambient
+    /// Type of the light source aiLightSourceType + ambient
     unsigned int mType;
 
-    //! Color of the light
+    /// Color of the light
     aiColor3D mColor;
 
-    //! Light attenuation
+    /// Light attenuation
     ai_real mAttConstant, mAttLinear, mAttQuadratic;
 
-    //! Spot light falloff
+    /// Spot light falloff
     ai_real mFalloffAngle;
     ai_real mFalloffExponent;
 
     // -----------------------------------------------------
     // FCOLLADA extension from here
 
-    //! ... related stuff from maja and max extensions
+    /// ... related stuff from maja and max extensions
     ai_real mPenumbraAngle;
     ai_real mOuterAngle;
 
-    //! Common light intensity
+    /// Common light intensity
     ai_real mIntensity;
 };
 
@@ -192,30 +193,29 @@ struct InputSemanticMapEntry {
             mSet(0),
             mType(IT_Invalid) {}
 
-    //! Index of set, optional
+    /// Index of set, optional
     unsigned int mSet;
 
-    //! Type of referenced vertex input
+    /// Type of referenced vertex input
     InputType mType;
 };
 
-/** Table to map from effect to vertex input semantics */
+/// Table to map from effect to vertex input semantics
 struct SemanticMappingTable {
-    //! Name of material
+    /// Name of material
     std::string mMatName;
 
-    //! List of semantic map commands, grouped by effect semantic name
+    /// List of semantic map commands, grouped by effect semantic name
     std::map<std::string, InputSemanticMapEntry> mMap;
 
-    //! For std::find
+    /// For std::find
     bool operator==(const std::string &s) const {
         return s == mMatName;
     }
 };
 
-/** A reference to a mesh inside a node, including materials assigned to the various subgroups.
- * The ID refers to either a mesh or a controller which specifies the mesh
- */
+/// A reference to a mesh inside a node, including materials assigned to the various subgroups.
+/// The ID refers to either a mesh or a controller which specifies the mesh
 struct MeshInstance {
     ///< ID of the mesh or controller to be instanced
     std::string mMeshOrController;
@@ -224,25 +224,25 @@ struct MeshInstance {
     std::map<std::string, SemanticMappingTable> mMaterials;
 };
 
-/** A reference to a camera inside a node*/
+/// A reference to a camera inside a node
 struct CameraInstance {
     ///< ID of the camera
     std::string mCamera;
 };
 
-/** A reference to a light inside a node*/
+/// A reference to a light inside a node
 struct LightInstance {
     ///< ID of the camera
     std::string mLight;
 };
 
-/** A reference to a node inside a node*/
+/// A reference to a node inside a node
 struct NodeInstance {
     ///< ID of the node
     std::string mNode;
 };
 
-/** A node in a scene hierarchy */
+/// A node in a scene hierarchy
 struct Node {
     std::string mName;
     std::string mID;
@@ -250,52 +250,53 @@ struct Node {
     Node *mParent;
     std::vector<Node *> mChildren;
 
-    /** Operations in order to calculate the resulting transformation to parent. */
+    /// Operations in order to calculate the resulting transformation to parent.
     std::vector<Transform> mTransforms;
 
-    /** Meshes at this node */
+    /// Meshes at this node
     std::vector<MeshInstance> mMeshes;
 
-    /** Lights at this node */
+    /// Lights at this node
     std::vector<LightInstance> mLights;
 
-    /** Cameras at this node */
+    /// Cameras at this node
     std::vector<CameraInstance> mCameras;
 
-    /** Node instances at this node */
+    /// Node instances at this node
     std::vector<NodeInstance> mNodeInstances;
 
-    /** Root-nodes: Name of primary camera, if any */
+    /// Root-nodes: Name of primary camera, if any
     std::string mPrimaryCamera;
 
-    //! Constructor. Begin with a zero parent
+    /// Constructor. Begin with a zero parent
     Node() :
             mParent(nullptr) {
         // empty
     }
 
-    //! Destructor: delete all children subsequently
+    /// Destructor: delete all children subsequently
     ~Node() {
-        for (std::vector<Node *>::iterator it = mChildren.begin(); it != mChildren.end(); ++it)
+        for (std::vector<Node *>::iterator it = mChildren.begin(); it != mChildren.end(); ++it) {
             delete *it;
+        }
     }
 };
 
-/** Data source array: either floats or strings */
+/// Data source array: either floats or strings
 struct Data {
     bool mIsStringArray;
     std::vector<ai_real> mValues;
     std::vector<std::string> mStrings;
 };
 
-/** Accessor to a data array */
+/// Accessor to a data array
 struct Accessor {
     size_t mCount; // in number of objects
     size_t mSize; // size of an object, in elements (floats or strings, mostly 1)
     size_t mOffset; // in number of values
     size_t mStride; // Stride in number of values
     std::vector<std::string> mParams; // names of the data streams in the accessors. Empty string tells to ignore.
-    size_t mSubOffset[4]; // Suboffset inside the object for the common 4 elements. For a vector, that's XYZ, for a color RGBA and so on.
+    size_t mSubOffset[4]; // Sub-offset inside the object for the common 4 elements. For a vector, that's XYZ, for a color RGBA and so on.
             // For example, SubOffset[0] denotes which of the values inside the object is the vector X component.
     std::string mSource; // URL of the source array
     mutable const Data *mData; // Pointer to the source array, if resolved. nullptr else
@@ -310,12 +311,12 @@ struct Accessor {
     }
 };
 
-/** A single face in a mesh */
+/// A single face in a mesh
 struct Face {
     std::vector<size_t> mIndices;
 };
 
-/** An input channel for mesh data, referring to a single accessor */
+/// An input channel for mesh data, referring to a single accessor
 struct InputChannel {
     InputType mType; // Type of the data
     size_t mIndex; // Optional index, if multiple sets of the same data type are given
@@ -331,18 +332,19 @@ struct InputChannel {
     }
 };
 
-/** Subset of a mesh with a certain material */
+/// Subset of a mesh with a certain material
 struct SubMesh {
     std::string mMaterial; ///< subgroup identifier
-    size_t mNumFaces; ///< number of faces in this submesh
+    size_t mNumFaces; ///< number of faces in this sub-mesh
 };
 
-/** Contains data for a single mesh */
+/// Contains data for a single mesh
 struct Mesh {
     Mesh(const std::string &id) :
             mId(id) {
-        for (unsigned int i = 0; i < AI_MAX_NUMBER_OF_TEXTURECOORDS; ++i)
+        for (unsigned int i = 0; i < AI_MAX_NUMBER_OF_TEXTURECOORDS; ++i) {
             mNumUVComponents[i] = 2;
+        }
     }
 
     const std::string mId;
@@ -373,11 +375,11 @@ struct Mesh {
     // necessary for bone weight assignment
     std::vector<size_t> mFacePosIndices;
 
-    // Submeshes in this mesh, each with a given material
+    // Sub-meshes in this mesh, each with a given material
     std::vector<SubMesh> mSubMeshes;
 };
 
-/** Which type of primitives the ReadPrimitives() function is going to read */
+/// Which type of primitives the ReadPrimitives() function is going to read
 enum PrimitiveType {
     Prim_Invalid,
     Prim_Lines,
@@ -389,7 +391,7 @@ enum PrimitiveType {
     Prim_Polygon
 };
 
-/** A skeleton controller to deform a mesh with the use of joints */
+/// A skeleton controller to deform a mesh with the use of joints
 struct Controller {
     // controller type
     ControllerType mType;
@@ -424,25 +426,25 @@ struct Controller {
     std::string mMorphWeight;
 };
 
-/** A collada material. Pretty much the only member is a reference to an effect. */
+/// A collada material. Pretty much the only member is a reference to an effect.
 struct Material {
     std::string mName;
     std::string mEffect;
 };
 
-/** Type of the effect param */
+/// Type of the effect param
 enum ParamType {
     Param_Sampler,
     Param_Surface
 };
 
-/** A param for an effect. Might be of several types, but they all just refer to each other, so I summarize them */
+/// A param for an effect. Might be of several types, but they all just refer to each other, so I summarize them
 struct EffectParam {
     ParamType mType;
     std::string mReference; // to which other thing the param is referring to.
 };
 
-/** Shading type supported by the standard effect spec of Collada */
+/// Shading type supported by the standard effect spec of Collada
 enum ShadeType {
     Shade_Invalid,
     Shade_Constant,
@@ -451,7 +453,7 @@ enum ShadeType {
     Shade_Blinn
 };
 
-/** Represents a texture sampler in collada */
+/// Represents a texture sampler in collada
 struct Sampler {
     Sampler() :
             mWrapU(true),
@@ -463,77 +465,66 @@ struct Sampler {
             mWeighting(1.f),
             mMixWithPrevious(1.f) {}
 
-    /** Name of image reference
-     */
+    /// Name of image reference
     std::string mName;
 
-    /** Wrap U?
-     */
+    /// Wrap U?
     bool mWrapU;
 
-    /** Wrap V?
-     */
+    /// Wrap V?
     bool mWrapV;
 
-    /** Mirror U?
-     */
+    /// Mirror U?
     bool mMirrorU;
 
-    /** Mirror V?
-     */
+    /// Mirror V?
     bool mMirrorV;
 
-    /** Blend mode
-     */
+    /// Blend mode
     aiTextureOp mOp;
 
-    /** UV transformation
-     */
+    /// UV transformation
     aiUVTransform mTransform;
 
-    /** Name of source UV channel
-     */
+    /// Name of source UV channel
     std::string mUVChannel;
 
-    /** Resolved UV channel index or UINT_MAX if not known
-     */
+    /// Resolved UV channel index or UINT_MAX if not known
     unsigned int mUVId;
 
     // OKINO/MAX3D extensions from here
     // -------------------------------------------------------
 
-    /** Weighting factor
-     */
+    /// Weighting factor
     ai_real mWeighting;
 
-    /** Mixing factor from OKINO
-     */
+    /// Mixing factor from OKINO
     ai_real mMixWithPrevious;
 };
 
-/** A collada effect. Can contain about anything according to the Collada spec,
-    but we limit our version to a reasonable subset. */
+/// A collada effect. Can contain about anything according to the Collada spec,
+/// but we limit our version to a reasonable subset.
 struct Effect {
-    // Shading mode
+    /// Shading mode
     ShadeType mShadeType;
 
-    // Colors
+    /// Colors
     aiColor4D mEmissive, mAmbient, mDiffuse, mSpecular,
             mTransparent, mReflective;
 
-    // Textures
+    /// Textures
     Sampler mTexEmissive, mTexAmbient, mTexDiffuse, mTexSpecular,
             mTexTransparent, mTexBump, mTexReflective;
 
-    // Scalar factory
+    /// Scalar factory
     ai_real mShininess, mRefractIndex, mReflectivity;
     ai_real mTransparency;
     bool mHasTransparency;
     bool mRGBTransparency;
     bool mInvertTransparency;
 
-    // local params referring to each other by their SID
-    typedef std::map<std::string, Collada::EffectParam> ParamLibrary;
+    /// local params referring to each other by their SID
+    using ParamLibrary = std::map<std::string, Collada::EffectParam>;
     ParamLibrary mParams;
 
     // MAX3D extensions
@@ -561,65 +552,64 @@ struct Effect {
     }
 };
 
-/** An image, meaning texture */
+/// An image, meaning texture
 struct Image {
     std::string mFileName;
 
-    /** Embedded image data */
+    /// Embedded image data
     std::vector<uint8_t> mImageData;
 
-    /** File format hint of embedded image data */
+    /// File format hint of embedded image data
     std::string mEmbeddedFormat;
 };
 
-/** An animation channel. */
+/// An animation channel.
 struct AnimationChannel {
-    /** URL of the data to animate. Could be about anything, but we support only the
-     * "NodeID/TransformID.SubElement" notation
-     */
+    /// URL of the data to animate. Could be about anything, but we support only the
+    /// "NodeID/TransformID.SubElement" notation
     std::string mTarget;
 
-    /** Source URL of the time values. Collada calls them "input". Meh. */
+    /// Source URL of the time values. Collada calls them "input". Meh.
     std::string mSourceTimes;
-    /** Source URL of the value values. Collada calls them "output". */
+    /// Source URL of the value values. Collada calls them "output".
     std::string mSourceValues;
-    /** Source URL of the IN_TANGENT semantic values. */
+    /// Source URL of the IN_TANGENT semantic values.
     std::string mInTanValues;
-    /** Source URL of the OUT_TANGENT semantic values. */
+    /// Source URL of the OUT_TANGENT semantic values.
     std::string mOutTanValues;
-    /** Source URL of the INTERPOLATION semantic values. */
+    /// Source URL of the INTERPOLATION semantic values.
     std::string mInterpolationValues;
 };
 
-/** An animation. Container for 0-x animation channels or 0-x animations */
+/// An animation. Container for 0-x animation channels or 0-x animations
 struct Animation {
-    /** Anim name */
+    /// Anim name
     std::string mName;
 
-    /** the animation channels, if any */
+    /// the animation channels, if any
     std::vector<AnimationChannel> mChannels;
 
-    /** the sub-animations, if any */
+    /// the sub-animations, if any
     std::vector<Animation *> mSubAnims;
 
-    /** Destructor */
+    /// Destructor
     ~Animation() {
-        for (std::vector<Animation *>::iterator it = mSubAnims.begin(); it != mSubAnims.end(); ++it)
+        for (std::vector<Animation *>::iterator it = mSubAnims.begin(); it != mSubAnims.end(); ++it) {
             delete *it;
+        }
     }
 
-    /** Collect all channels in the animation hierarchy into a single channel list. */
+    /// Collect all channels in the animation hierarchy into a single channel list.
     void CollectChannelsRecursively(std::vector<AnimationChannel> &channels) {
         channels.insert(channels.end(), mChannels.begin(), mChannels.end());
 
         for (std::vector<Animation *>::iterator it = mSubAnims.begin(); it != mSubAnims.end(); ++it) {
             Animation *pAnim = (*it);
-
             pAnim->CollectChannelsRecursively(channels);
         }
     }
 
-    /** Combine all single-channel animations' channel into the same (parent) animation channel list. */
+    /// Combine all single-channel animations' channel into the same (parent) animation channel list.
     void CombineSingleChannelAnimations() {
         CombineSingleChannelAnimationsRecursively(this);
     }
@@ -658,9 +648,9 @@ struct Animation {
     }
 };
 
-/** Description of a collada animation channel which has been determined to affect the current node */
+/// Description of a collada animation channel which has been determined to affect the current node
 struct ChannelEntry {
-    const Collada::AnimationChannel *mChannel; ///> the source channel
+    const Collada::AnimationChannel *mChannel; ///< the source channel
     std::string mTargetId;
     std::string mTransformId; // the ID of the transformation step of the node which is influenced
     size_t mTransformIndex; // Index into the node's transform chain to apply the channel to
diff --git a/code/AssetLib/Collada/ColladaLoader.cpp b/code/AssetLib/Collada/ColladaLoader.cpp
index 7b0fdd8e0..99cb8c305 100644
--- a/code/AssetLib/Collada/ColladaLoader.cpp
+++ b/code/AssetLib/Collada/ColladaLoader.cpp
@@ -45,25 +45,19 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "ColladaLoader.h"
 #include "ColladaParser.h"
-
 #include <assimp/ColladaMetaData.h>
+#include <assimp/CreateAnimMesh.h>
 #include <assimp/Defines.h>
+#include <assimp/ParsingUtils.h>
+#include <assimp/SkeletonMeshBuilder.h>
+#include <assimp/ZipArchiveIOSystem.h>
 #include <assimp/anim.h>
+#include <assimp/fast_atof.h>
 #include <assimp/importerdesc.h>
 #include <assimp/scene.h>
 #include <assimp/DefaultLogger.hpp>
 #include <assimp/Importer.hpp>
 
-#include <assimp/CreateAnimMesh.h>
-#include <assimp/ParsingUtils.h>
-#include <assimp/SkeletonMeshBuilder.h>
-#include <assimp/ZipArchiveIOSystem.h>
-#include <assimp/fast_atof.h>
-
-#include "math.h"
-#include "time.h"
-#include <algorithm>
-#include <memory>
 #include <numeric>
 
 namespace Assimp {
@@ -125,20 +119,17 @@ ColladaLoader::~ColladaLoader() {
 bool ColladaLoader::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool checkSig) const {
     // check file extension
     const std::string extension = GetExtension(pFile);
-
-    bool readSig = checkSig && (pIOHandler != nullptr);
-
+    const bool readSig = checkSig && (pIOHandler != nullptr);
     if (!readSig) {
         if (extension == "dae" || extension == "zae") {
             return true;
         }
-    }
-
-    if (readSig) {
+    } else {
         // Look for a DAE file inside, but don't extract it
         ZipArchiveIOSystem zip_archive(pIOHandler, pFile);
-        if (zip_archive.isOpen())
+        if (zip_archive.isOpen()) {
             return !ColladaParser::ReadZaeManifest(zip_archive).empty();
+        }
     }
 
     // XML - too generic, we need to open the file and search for typical keywords
@@ -337,13 +328,15 @@ void ColladaLoader::ResolveNodeInstances(const ColladaParser &pParser, const Col
 // Resolve UV channels
 void ColladaLoader::ApplyVertexToEffectSemanticMapping(Collada::Sampler &sampler, const Collada::SemanticMappingTable &table) {
     std::map<std::string, Collada::InputSemanticMapEntry>::const_iterator it = table.mMap.find(sampler.mUVChannel);
-    if (it != table.mMap.end()) {
-        if (it->second.mType != Collada::IT_Texcoord) {
-            ASSIMP_LOG_ERROR("Collada: Unexpected effect input mapping");
-        }
-
-        sampler.mUVId = it->second.mSet;
+    if (it == table.mMap.end()) {
+        return;
     }
+
+    if (it->second.mType != Collada::IT_Texcoord) {
+        ASSIMP_LOG_ERROR("Collada: Unexpected effect input mapping");
+    }
+
+    sampler.mUVId = it->second.mSet;
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -390,7 +383,11 @@ void ColladaLoader::BuildLightsForNode(const ColladaParser &pParser, const Colla
                 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
-                    out->mAngleOuterCone = std::acos(std::pow(0.1f, 1.f / srcLight->mFalloffExponent)) +
+                    float f = 1.0f;
+                    if ( 0.0f != srcLight->mFalloffExponent ) {
+                        f = 1.f / srcLight->mFalloffExponent;
+                    }
+                    out->mAngleOuterCone = std::acos(std::pow(0.1f, f)) +
                                            out->mAngleInnerCone;
                 } else {
                     out->mAngleOuterCone = out->mAngleInnerCone + AI_DEG_TO_RAD(srcLight->mPenumbraAngle);
@@ -585,10 +582,10 @@ void ColladaLoader::BuildMeshesForNode(const ColladaParser &pParser, const Colla
 // ------------------------------------------------------------------------------------------------
 // Find mesh from either meshes or morph target meshes
 aiMesh *ColladaLoader::findMesh(const std::string &meshid) {
-    if ( meshid.empty()) {
+    if (meshid.empty()) {
         return nullptr;
     }
-    
+
     for (unsigned int i = 0; i < mMeshes.size(); ++i) {
         if (std::string(mMeshes[i]->mName.data) == meshid) {
             return mMeshes[i];
@@ -1251,7 +1248,7 @@ void ColladaLoader::CreateAnimation(aiScene *pScene, const ColladaParser &pParse
 
             // time count and value count must match
             if (e.mTimeAccessor->mCount != e.mValueAccessor->mCount)
-                throw DeadlyImportError(format() << "Time count / value count mismatch in animation channel \"" << e.mChannel->mTarget << "\".");
+                throw DeadlyImportError("Time count / value count mismatch in animation channel \"", e.mChannel->mTarget, "\".");
 
             if (e.mTimeAccessor->mCount > 0) {
                 // find bounding times
@@ -1377,9 +1374,9 @@ void ColladaLoader::CreateAnimation(aiScene *pScene, const ColladaParser &pParse
                 double time = double(mat.d4); // remember? time is stored in mat.d4
                 mat.d4 = 1.0f;
 
-                dstAnim->mPositionKeys[a].mTime = time * kMillisecondsFromSeconds ;
-                dstAnim->mRotationKeys[a].mTime = time * kMillisecondsFromSeconds ;
-                dstAnim->mScalingKeys[a].mTime = time * kMillisecondsFromSeconds ;
+                dstAnim->mPositionKeys[a].mTime = time * kMillisecondsFromSeconds;
+                dstAnim->mRotationKeys[a].mTime = time * kMillisecondsFromSeconds;
+                dstAnim->mScalingKeys[a].mTime = time * kMillisecondsFromSeconds;
                 mat.Decompose(dstAnim->mScalingKeys[a].mValue, dstAnim->mRotationKeys[a].mValue, dstAnim->mPositionKeys[a].mValue);
             }
 
@@ -1400,7 +1397,7 @@ void ColladaLoader::CreateAnimation(aiScene *pScene, const ColladaParser &pParse
                 if (e.mTargetId.find("morph-weights") != std::string::npos)
                     morphChannels.push_back(e);
             }
-            if (!morphChannels.empty() ) {
+            if (!morphChannels.empty()) {
                 // either 1) morph weight animation count should contain morph target count channels
                 // or     2) one channel with morph target count arrays
                 // assume first
@@ -1434,8 +1431,8 @@ void ColladaLoader::CreateAnimation(aiScene *pScene, const ColladaParser &pParse
                     morphAnim->mKeys[key].mValues = new unsigned int[morphChannels.size()];
                     morphAnim->mKeys[key].mWeights = new double[morphChannels.size()];
 
-                    morphAnim->mKeys[key].mTime = morphTimeValues[key].mTime * kMillisecondsFromSeconds ;
-                    for (unsigned int valueIndex = 0; valueIndex < morphChannels.size(); ++valueIndex ) {
+                    morphAnim->mKeys[key].mTime = morphTimeValues[key].mTime * kMillisecondsFromSeconds;
+                    for (unsigned int valueIndex = 0; valueIndex < morphChannels.size(); ++valueIndex) {
                         morphAnim->mKeys[key].mValues[valueIndex] = valueIndex;
                         morphAnim->mKeys[key].mWeights[valueIndex] = getWeightAtKey(morphTimeValues, key, valueIndex);
                     }
@@ -1468,7 +1465,7 @@ void ColladaLoader::CreateAnimation(aiScene *pScene, const ColladaParser &pParse
         for (size_t a = 0; a < morphAnims.size(); ++a) {
             anim->mDuration = std::max(anim->mDuration, morphAnims[a]->mKeys[morphAnims[a]->mNumKeys - 1].mTime);
         }
-        anim->mTicksPerSecond = 1;
+        anim->mTicksPerSecond = 1000.0;
         mAnims.push_back(anim);
     }
 }
@@ -1552,23 +1549,23 @@ void ColladaLoader::FillMaterials(const ColladaParser &pParser, aiScene * /*pSce
             shadeMode = aiShadingMode_Flat;
         } else {
             switch (effect.mShadeType) {
-                case Collada::Shade_Constant:
-                    shadeMode = aiShadingMode_NoShading;
-                    break;
-                case Collada::Shade_Lambert:
-                    shadeMode = aiShadingMode_Gouraud;
-                    break;
-                case Collada::Shade_Blinn:
-                    shadeMode = aiShadingMode_Blinn;
-                    break;
-                case Collada::Shade_Phong:
-                    shadeMode = aiShadingMode_Phong;
-                    break;
+            case Collada::Shade_Constant:
+                shadeMode = aiShadingMode_NoShading;
+                break;
+            case Collada::Shade_Lambert:
+                shadeMode = aiShadingMode_Gouraud;
+                break;
+            case Collada::Shade_Blinn:
+                shadeMode = aiShadingMode_Blinn;
+                break;
+            case Collada::Shade_Phong:
+                shadeMode = aiShadingMode_Phong;
+                break;
 
-                default:
-                    ASSIMP_LOG_WARN("Collada: Unrecognized shading mode, using gouraud shading");
-                    shadeMode = aiShadingMode_Gouraud;
-                    break;
+            default:
+                ASSIMP_LOG_WARN("Collada: Unrecognized shading mode, using gouraud shading");
+                shadeMode = aiShadingMode_Gouraud;
+                break;
             }
         }
         mat.AddProperty<int>(&shadeMode, 1, AI_MATKEY_SHADING_MODEL);
@@ -1658,7 +1655,7 @@ void ColladaLoader::BuildMaterials(ColladaParser &pParser, aiScene * /*pScene*/)
         const Collada::Material &material = matIt->second;
         // a material is only a reference to an effect
         ColladaParser::EffectLibrary::iterator effIt = pParser.mEffectLibrary.find(material.mEffect);
-        if (effIt == pParser.mEffectLibrary.end())
+        if (effIt == pParser.mEffectLibrary.end())  
             continue;
         Collada::Effect &effect = effIt->second;
 
@@ -1734,7 +1731,7 @@ aiString ColladaLoader::FindFilenameForEffectTexture(const ColladaParser &pParse
         // and add this texture to the list
         mTextures.push_back(tex);
         return result;
-    } 
+    }
 
     if (imIt->second.mFileName.empty()) {
         throw DeadlyImportError("Collada: Invalid texture, no data or file reference given");
diff --git a/code/AssetLib/Collada/ColladaParser.cpp b/code/AssetLib/Collada/ColladaParser.cpp
index 964851d60..d84f76340 100644
--- a/code/AssetLib/Collada/ColladaParser.cpp
+++ b/code/AssetLib/Collada/ColladaParser.cpp
@@ -5,8 +5,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -50,27 +48,59 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "ColladaParser.h"
 #include <assimp/ParsingUtils.h>
 #include <assimp/StringUtils.h>
-#include <assimp/TinyFormatter.h>
 #include <assimp/ZipArchiveIOSystem.h>
 #include <assimp/commonMetaData.h>
 #include <assimp/fast_atof.h>
 #include <assimp/light.h>
-#include <stdarg.h>
 #include <assimp/DefaultLogger.hpp>
 #include <assimp/IOSystem.hpp>
-#include <sstream>
-
-#include <memory>
 
 using namespace Assimp;
 using namespace Assimp::Collada;
 using namespace Assimp::Formatter;
 
+static void ReportWarning(const char *msg, ...) {
+    ai_assert(nullptr != msg);
+
+    va_list args;
+    va_start(args, msg);
+
+    char szBuffer[3000];
+    const int iLen = vsprintf(szBuffer, msg, args);
+    ai_assert(iLen > 0);
+
+    va_end(args);
+    ASSIMP_LOG_WARN_F("Validation warning: ", std::string(szBuffer, iLen));
+}
+
+static bool FindCommonKey(const std::string &collada_key, const MetaKeyPairVector &key_renaming, size_t &found_index) {
+    for (size_t i = 0; i < key_renaming.size(); ++i) {
+        if (key_renaming[i].first == collada_key) {
+            found_index = i;
+            return true;
+        }
+    }
+    found_index = std::numeric_limits<size_t>::max();
+
+    return false;
+}
+
+static void readUrlAttribute(XmlNode &node, std::string &url) {
+    url.clear();
+    if (!XmlParser::getStdStrAttribute(node, "url", url)) {
+        return;
+    }
+    if (url[0] != '#') {
+        throw DeadlyImportError("Unknown reference format");
+    }
+    url = url.c_str() + 1;
+}
+
 // ------------------------------------------------------------------------------------------------
 // Constructor to be privately used by Importer
 ColladaParser::ColladaParser(IOSystem *pIOHandler, const std::string &pFile) :
         mFileName(pFile),
-        mReader(nullptr),
+        mXmlParser(),
         mDataLibrary(),
         mAccessorLibrary(),
         mMeshLibrary(),
@@ -85,9 +115,7 @@ ColladaParser::ColladaParser(IOSystem *pIOHandler, const std::string &pFile) :
         mAnims(),
         mUnitSize(1.0f),
         mUpDirection(UP_Y),
-        mFormat(FV_1_5_n) // We assume the newest file format by default
-{
-    // validate io-handler instance
+        mFormat(FV_1_5_n) {
     if (nullptr == pIOHandler) {
         throw DeadlyImportError("IOSystem is nullptr.");
     }
@@ -105,30 +133,32 @@ ColladaParser::ColladaParser(IOSystem *pIOHandler, const std::string &pFile) :
         std::string dae_filename = ReadZaeManifest(*zip_archive);
 
         if (dae_filename.empty()) {
-            ThrowException(std::string("Invalid ZAE"));
+            throw DeadlyImportError("Invalid ZAE");
         }
 
         daefile.reset(zip_archive->Open(dae_filename.c_str()));
         if (daefile == nullptr) {
-            ThrowException(std::string("Invalid ZAE manifest: '") + std::string(dae_filename) + std::string("' is missing"));
+            throw DeadlyImportError("Invalid ZAE manifest: '", dae_filename, "' is missing");
         }
     } else {
         // attempt to open the file directly
         daefile.reset(pIOHandler->Open(pFile));
         if (daefile.get() == nullptr) {
-            throw DeadlyImportError("Failed to open file '" + pFile + "'.");
+            throw DeadlyImportError("Failed to open file '", pFile, "'.");
         }
     }
 
     // generate a XML reader for it
-    std::unique_ptr<CIrrXML_IOStreamReader> mIOWrapper(new CIrrXML_IOStreamReader(daefile.get()));
-    mReader = irr::io::createIrrXMLReader(mIOWrapper.get());
-    if (!mReader) {
-        ThrowException("Unable to read file, malformed XML");
+    if (!mXmlParser.parse(daefile.get())) {
+        throw DeadlyImportError("Unable to read file, malformed XML");
     }
-
     // start reading
-    ReadContents();
+    XmlNode node = mXmlParser.getRootNode();
+    XmlNode colladaNode = node.child("COLLADA");
+    if (colladaNode.empty()) {
+        return;
+    }
+    ReadContents(colladaNode);
 
     // read embedded textures
     if (zip_archive && zip_archive->isOpen()) {
@@ -139,11 +169,12 @@ ColladaParser::ColladaParser(IOSystem *pIOHandler, const std::string &pFile) :
 // ------------------------------------------------------------------------------------------------
 // Destructor, private as well
 ColladaParser::~ColladaParser() {
-    delete mReader;
-    for (NodeLibrary::iterator it = mNodeLibrary.begin(); it != mNodeLibrary.end(); ++it)
+    for (NodeLibrary::iterator it = mNodeLibrary.begin(); it != mNodeLibrary.end(); ++it) {
         delete it->second;
-    for (MeshLibrary::iterator it = mMeshLibrary.begin(); it != mMeshLibrary.end(); ++it)
+    }
+    for (MeshLibrary::iterator it = mMeshLibrary.begin(); it != mMeshLibrary.end(); ++it) {
         delete it->second;
+    }
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -156,35 +187,31 @@ std::string ColladaParser::ReadZaeManifest(ZipArchiveIOSystem &zip_archive) {
         std::vector<std::string> file_list;
         zip_archive.getFileListExtension(file_list, "dae");
 
-        if (file_list.empty())
+        if (file_list.empty()) {
             return std::string();
+        }
 
         return file_list.front();
     }
-
-    std::unique_ptr<CIrrXML_IOStreamReader> mIOWrapper(new CIrrXML_IOStreamReader(manifestfile.get()));
-    std::unique_ptr<irr::io::IrrXMLReader> manifest_reader(irr::io::createIrrXMLReader(mIOWrapper.get()));
-
-    while (manifest_reader->read()) {
-        // find the manifest "dae_root" element
-        if (manifest_reader->getNodeType() == irr::io::EXN_ELEMENT) {
-            if (::strcmp(manifest_reader->getNodeName(), "dae_root") == 0) {
-                if (!manifest_reader->read())
-                    return std::string();
-                if (manifest_reader->getNodeType() != irr::io::EXN_TEXT && manifest_reader->getNodeType() != irr::io::EXN_CDATA)
-                    return std::string();
-
-                const char *filepath = manifest_reader->getNodeData();
-                if (filepath == nullptr)
-                    return std::string();
-
-                aiString ai_str(filepath);
-                UriDecodePath(ai_str);
-
-                return std::string(ai_str.C_Str());
-            }
-        }
+    XmlParser manifestParser;
+    if (!manifestParser.parse(manifestfile.get())) {
+        return std::string();
     }
+
+    XmlNode root = manifestParser.getRootNode();
+    const std::string &name = root.name();
+    if (name != "dae_root") {
+        root = *manifestParser.findNode("dae_root");
+        if (nullptr == root) {
+            return std::string();
+        }
+        std::string v;
+        XmlParser::getValueAsString(root, v);
+        aiString ai_str(v);
+        UriDecodePath(ai_str);
+        return std::string(ai_str.C_Str());
+    }
+
     return std::string();
 }
 
@@ -233,102 +260,62 @@ void ColladaParser::UriDecodePath(aiString &ss) {
     ss.length = static_cast<ai_uint32>(out - ss.data);
 }
 
-// ------------------------------------------------------------------------------------------------
-// Read bool from text contents of current element
-bool ColladaParser::ReadBoolFromTextContent() {
-    const char *cur = GetTextContent();
-    if (nullptr == cur) {
-        return false;
-    }
-    return (!ASSIMP_strincmp(cur, "true", 4) || '0' != *cur);
-}
-
-// ------------------------------------------------------------------------------------------------
-// Read float from text contents of current element
-ai_real ColladaParser::ReadFloatFromTextContent() {
-    const char *cur = GetTextContent();
-    if (nullptr == cur) {
-        return 0.0;
-    }
-    return fast_atof(cur);
-}
-
 // ------------------------------------------------------------------------------------------------
 // Reads the contents of the file
-void ColladaParser::ReadContents() {
-    while (mReader->read()) {
-        // handle the root element "COLLADA"
-        if (mReader->getNodeType() == irr::io::EXN_ELEMENT) {
-            if (IsElement("COLLADA")) {
-                // check for 'version' attribute
-                const int attrib = TestAttribute("version");
-                if (attrib != -1) {
-                    const char *version = mReader->getAttributeValue(attrib);
-
-                    // Store declared format version string
-                    aiString v;
-                    v.Set(version);
-                    mAssetMetaData.emplace(AI_METADATA_SOURCE_FORMAT_VERSION, v);
-
-                    if (!::strncmp(version, "1.5", 3)) {
-                        mFormat = FV_1_5_n;
-                        ASSIMP_LOG_DEBUG("Collada schema version is 1.5.n");
-                    } else if (!::strncmp(version, "1.4", 3)) {
-                        mFormat = FV_1_4_n;
-                        ASSIMP_LOG_DEBUG("Collada schema version is 1.4.n");
-                    } else if (!::strncmp(version, "1.3", 3)) {
-                        mFormat = FV_1_3_n;
-                        ASSIMP_LOG_DEBUG("Collada schema version is 1.3.n");
-                    }
-                }
-
-                ReadStructure();
-            } else {
-                ASSIMP_LOG_VERBOSE_DEBUG_F("Ignoring global element <", mReader->getNodeName(), ">.");
-                SkipElement();
+void ColladaParser::ReadContents(XmlNode &node) {
+    const std::string name = node.name();
+    if (name == "COLLADA") {
+        std::string version;
+        if (XmlParser::getStdStrAttribute(node, "version", version)) {
+            aiString v;
+            v.Set(version.c_str());
+            mAssetMetaData.emplace(AI_METADATA_SOURCE_FORMAT_VERSION, v);
+            if (!::strncmp(version.c_str(), "1.5", 3)) {
+                mFormat = FV_1_5_n;
+                ASSIMP_LOG_DEBUG("Collada schema version is 1.5.n");
+            } else if (!::strncmp(version.c_str(), "1.4", 3)) {
+                mFormat = FV_1_4_n;
+                ASSIMP_LOG_DEBUG("Collada schema version is 1.4.n");
+            } else if (!::strncmp(version.c_str(), "1.3", 3)) {
+                mFormat = FV_1_3_n;
+                ASSIMP_LOG_DEBUG("Collada schema version is 1.3.n");
             }
-        } else {
-            // skip everything else silently
         }
+        ReadStructure(node);
     }
 }
 
 // ------------------------------------------------------------------------------------------------
 // Reads the structure of the file
-void ColladaParser::ReadStructure() {
-    while (mReader->read()) {
-        // beginning of elements
-        if (mReader->getNodeType() == irr::io::EXN_ELEMENT) {
-            if (IsElement("asset"))
-                ReadAssetInfo();
-            else if (IsElement("library_animations"))
-                ReadAnimationLibrary();
-            else if (IsElement("library_animation_clips"))
-                ReadAnimationClipLibrary();
-            else if (IsElement("library_controllers"))
-                ReadControllerLibrary();
-            else if (IsElement("library_images"))
-                ReadImageLibrary();
-            else if (IsElement("library_materials"))
-                ReadMaterialLibrary();
-            else if (IsElement("library_effects"))
-                ReadEffectLibrary();
-            else if (IsElement("library_geometries"))
-                ReadGeometryLibrary();
-            else if (IsElement("library_visual_scenes"))
-                ReadSceneLibrary();
-            else if (IsElement("library_lights"))
-                ReadLightLibrary();
-            else if (IsElement("library_cameras"))
-                ReadCameraLibrary();
-            else if (IsElement("library_nodes"))
-                ReadSceneNode(nullptr); /* some hacking to reuse this piece of code */
-            else if (IsElement("scene"))
-                ReadScene();
-            else
-                SkipElement();
-        } else if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END) {
-            break;
+void ColladaParser::ReadStructure(XmlNode &node) {
+    for (XmlNode &currentNode : node.children()) {
+        const std::string &currentName = std::string(currentNode.name());
+        if (currentName == "asset") {
+            ReadAssetInfo(currentNode);
+        } else if (currentName == "library_animations") {
+            ReadAnimationLibrary(currentNode);
+        } else if (currentName == "library_animation_clips") {
+            ReadAnimationClipLibrary(currentNode);
+        } else if (currentName == "library_controllers") {
+            ReadControllerLibrary(currentNode);
+        } else if (currentName == "library_images") {
+            ReadImageLibrary(currentNode);
+        } else if (currentName == "library_materials") {
+            ReadMaterialLibrary(currentNode);
+        } else if (currentName == "library_effects") {
+            ReadEffectLibrary(currentNode);
+        } else if (currentName == "library_geometries") {
+            ReadGeometryLibrary(currentNode);
+        } else if (currentName == "library_visual_scenes") {
+            ReadSceneLibrary(currentNode);
+        } else if (currentName == "library_lights") {
+            ReadLightLibrary(currentNode);
+        } else if (currentName == "library_cameras") {
+            ReadCameraLibrary(currentNode);
+        } else if (currentName == "library_nodes") {
+            ReadSceneNode(currentNode, nullptr); /* some hacking to reuse this piece of code */
+        } else if (currentName == "scene") {
+            ReadScene(currentNode);
         }
     }
 
@@ -338,167 +325,94 @@ void ColladaParser::ReadStructure() {
 
 // ------------------------------------------------------------------------------------------------
 // Reads asset information such as coordinate system information and legal blah
-void ColladaParser::ReadAssetInfo() {
-    if (mReader->isEmptyElement())
+void ColladaParser::ReadAssetInfo(XmlNode &node) {
+    if (node.empty()) {
         return;
+    }
 
-    while (mReader->read()) {
-        if (mReader->getNodeType() == irr::io::EXN_ELEMENT) {
-            if (IsElement("unit")) {
-                // read unit data from the element's attributes
-                const int attrIndex = TestAttribute("meter");
-                if (attrIndex == -1) {
-                    mUnitSize = 1.f;
-                } else {
-                    mUnitSize = mReader->getAttributeValueAsFloat(attrIndex);
-                }
-
-                // consume the trailing stuff
-                if (!mReader->isEmptyElement())
-                    SkipElement();
-            } else if (IsElement("up_axis")) {
-                // read content, strip whitespace, compare
-                const char *content = GetTextContent();
-                if (strncmp(content, "X_UP", 4) == 0)
-                    mUpDirection = UP_X;
-                else if (strncmp(content, "Z_UP", 4) == 0)
-                    mUpDirection = UP_Z;
-                else
-                    mUpDirection = UP_Y;
-
-                // check element end
-                TestClosing("up_axis");
-            } else if (IsElement("contributor")) {
-                ReadContributorInfo();
-            } else {
-                ReadMetaDataItem(mAssetMetaData);
+    for (XmlNode &currentNode : node.children()) {
+        const std::string &currentName = currentNode.name();
+        if (currentName == "unit") {
+            mUnitSize = 1.f;
+            XmlParser::getFloatAttribute(node, "meter", mUnitSize);
+        } else if (currentName == "up_axis") {
+            std::string v;
+            if (!XmlParser::getValueAsString(currentNode, v)) {
+                continue;
             }
-        } else if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END) {
-            if (strcmp(mReader->getNodeName(), "asset") != 0)
-                ThrowException("Expected end of <asset> element.");
-
-            break;
+            if (v == "X_UP") {
+                mUpDirection = UP_X;
+            } else if (v == "Z_UP") {
+                mUpDirection = UP_Z;
+            } else {
+                mUpDirection = UP_Y;
+            }
+        } else if (currentName == "contributor") {
+            for (XmlNode currentChildNode : currentNode.children()) {
+                ReadMetaDataItem(currentChildNode, mAssetMetaData);
+            }
+        } else {
+            ReadMetaDataItem(currentNode, mAssetMetaData);
         }
     }
 }
 
-// ------------------------------------------------------------------------------------------------
-// Reads the contributor info
-void ColladaParser::ReadContributorInfo() {
-    if (mReader->isEmptyElement())
-        return;
-
-    while (mReader->read()) {
-        if (mReader->getNodeType() == irr::io::EXN_ELEMENT) {
-            ReadMetaDataItem(mAssetMetaData);
-        } else if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END) {
-            if (strcmp(mReader->getNodeName(), "contributor") != 0)
-                ThrowException("Expected end of <contributor> element.");
-            break;
-        }
-    }
-}
-
-static bool FindCommonKey(const std::string &collada_key, const MetaKeyPairVector &key_renaming, size_t &found_index) {
-    for (size_t i = 0; i < key_renaming.size(); ++i) {
-        if (key_renaming[i].first == collada_key) {
-            found_index = i;
-            return true;
-        }
-    }
-    found_index = std::numeric_limits<size_t>::max();
-    return false;
-}
-
 // ------------------------------------------------------------------------------------------------
 // Reads a single string metadata item
-void ColladaParser::ReadMetaDataItem(StringMetaData &metadata) {
+void ColladaParser::ReadMetaDataItem(XmlNode &node, StringMetaData &metadata) {
     const Collada::MetaKeyPairVector &key_renaming = GetColladaAssimpMetaKeysCamelCase();
-    // Metadata such as created, keywords, subject etc
-    const char *key_char = mReader->getNodeName();
-    if (key_char != nullptr) {
-        const std::string key_str(key_char);
-        const char *value_char = TestTextContent();
-        if (value_char != nullptr) {
-            aiString aistr;
-            aistr.Set(value_char);
+    const std::string name = node.name();
+    if (name.empty()) {
+        return;
+    }
 
-            std::string camel_key_str(key_str);
-            ToCamelCase(camel_key_str);
+    std::string v;
+    if (!XmlParser::getValueAsString(node, v)) {
+        return;
+    }
 
-            size_t found_index;
-            if (FindCommonKey(camel_key_str, key_renaming, found_index)) {
-                metadata.emplace(key_renaming[found_index].second, aistr);
-            } else {
-                metadata.emplace(camel_key_str, aistr);
-            }
-        }
-        TestClosing(key_str.c_str());
-    } else
-        SkipElement();
+    trim(v);
+    aiString aistr;
+    aistr.Set(v);
+
+    std::string camel_key_str(name);
+    ToCamelCase(camel_key_str);
+
+    size_t found_index;
+    if (FindCommonKey(camel_key_str, key_renaming, found_index)) {
+        metadata.emplace(key_renaming[found_index].second, aistr);
+    } else {
+        metadata.emplace(camel_key_str, aistr);
+    }
 }
 
 // ------------------------------------------------------------------------------------------------
 // Reads the animation clips
-void ColladaParser::ReadAnimationClipLibrary() {
-    if (mReader->isEmptyElement())
+void ColladaParser::ReadAnimationClipLibrary(XmlNode &node) {
+    if (node.empty()) {
         return;
+    }
 
-    while (mReader->read()) {
-        if (mReader->getNodeType() == irr::io::EXN_ELEMENT) {
-            if (IsElement("animation_clip")) {
-                // optional name given as an attribute
-                std::string animName;
-                int indexName = TestAttribute("name");
-                int indexID = TestAttribute("id");
-                if (indexName >= 0)
-                    animName = mReader->getAttributeValue(indexName);
-                else if (indexID >= 0)
-                    animName = mReader->getAttributeValue(indexID);
-                else
-                    animName = std::string("animation_") + to_string(mAnimationClipLibrary.size());
+    std::string animName;
+    if (!XmlParser::getStdStrAttribute(node, "name", animName)) {
+        if (!XmlParser::getStdStrAttribute( node, "id", animName )) {
+            animName = std::string("animation_") + to_string(mAnimationClipLibrary.size());
+        }
+    }
 
-                std::pair<std::string, std::vector<std::string>> clip;
+    std::pair<std::string, std::vector<std::string>> clip;
+    clip.first = animName;
 
-                clip.first = animName;
+    for (XmlNode &currentNode : node.children()) {
+        const std::string &currentName = currentNode.name();
+        if (currentName == "instance_animation") {
+            std::string url;
+            readUrlAttribute(node, url);
+            clip.second.push_back(url);
+        }
 
-                while (mReader->read()) {
-                    if (mReader->getNodeType() == irr::io::EXN_ELEMENT) {
-                        if (IsElement("instance_animation")) {
-                            int indexUrl = TestAttribute("url");
-                            if (indexUrl >= 0) {
-                                const char *url = mReader->getAttributeValue(indexUrl);
-                                if (url[0] != '#')
-                                    ThrowException("Unknown reference format");
-
-                                url++;
-
-                                clip.second.push_back(url);
-                            }
-                        } else {
-                            // ignore the rest
-                            SkipElement();
-                        }
-                    } else if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END) {
-                        if (strcmp(mReader->getNodeName(), "animation_clip") != 0)
-                            ThrowException("Expected end of <animation_clip> element.");
-
-                        break;
-                    }
-                }
-
-                if (clip.second.size() > 0) {
-                    mAnimationClipLibrary.push_back(clip);
-                }
-            } else {
-                // ignore the rest
-                SkipElement();
-            }
-        } else if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END) {
-            if (strcmp(mReader->getNodeName(), "library_animation_clips") != 0)
-                ThrowException("Expected end of <library_animation_clips> element.");
-
-            break;
+        if (clip.second.size() > 0) {
+            mAnimationClipLibrary.push_back(clip);
         }
     }
 }
@@ -507,6 +421,10 @@ void ColladaParser::PostProcessControllers() {
     std::string meshId;
     for (ControllerLibrary::iterator it = mControllerLibrary.begin(); it != mControllerLibrary.end(); ++it) {
         meshId = it->second.mMeshId;
+        if (meshId.empty()) {
+            continue;
+        }
+
         ControllerLibrary::iterator findItr = mControllerLibrary.find(meshId);
         while (findItr != mControllerLibrary.end()) {
             meshId = findItr->second.mMeshId;
@@ -520,1317 +438,969 @@ void ColladaParser::PostProcessControllers() {
 // ------------------------------------------------------------------------------------------------
 // Re-build animations from animation clip library, if present, otherwise combine single-channel animations
 void ColladaParser::PostProcessRootAnimations() {
-    if (mAnimationClipLibrary.size() > 0) {
-        Animation temp;
+    if (mAnimationClipLibrary.empty()) {
+        mAnims.CombineSingleChannelAnimations();
+        return;
+    }
 
-        for (AnimationClipLibrary::iterator it = mAnimationClipLibrary.begin(); it != mAnimationClipLibrary.end(); ++it) {
-            std::string clipName = it->first;
+    Animation temp;
+    for (AnimationClipLibrary::iterator it = mAnimationClipLibrary.begin(); it != mAnimationClipLibrary.end(); ++it) {
+        std::string clipName = it->first;
 
-            Animation *clip = new Animation();
-            clip->mName = clipName;
+        Animation *clip = new Animation();
+        clip->mName = clipName;
 
-            temp.mSubAnims.push_back(clip);
+        temp.mSubAnims.push_back(clip);
 
-            for (std::vector<std::string>::iterator a = it->second.begin(); a != it->second.end(); ++a) {
-                std::string animationID = *a;
+        for (std::vector<std::string>::iterator a = it->second.begin(); a != it->second.end(); ++a) {
+            std::string animationID = *a;
 
-                AnimationLibrary::iterator animation = mAnimationLibrary.find(animationID);
+            AnimationLibrary::iterator animation = mAnimationLibrary.find(animationID);
 
-                if (animation != mAnimationLibrary.end()) {
-                    Animation *pSourceAnimation = animation->second;
+            if (animation != mAnimationLibrary.end()) {
+                Animation *pSourceAnimation = animation->second;
 
-                    pSourceAnimation->CollectChannelsRecursively(clip->mChannels);
-                }
+                pSourceAnimation->CollectChannelsRecursively(clip->mChannels);
             }
         }
-
-        mAnims = temp;
-
-        // Ensure no double deletes.
-        temp.mSubAnims.clear();
-    } else {
-        mAnims.CombineSingleChannelAnimations();
     }
+
+    mAnims = temp;
+
+    // Ensure no double deletes.
+    temp.mSubAnims.clear();
 }
 
 // ------------------------------------------------------------------------------------------------
 // Reads the animation library
-void ColladaParser::ReadAnimationLibrary() {
-    if (mReader->isEmptyElement())
+void ColladaParser::ReadAnimationLibrary(XmlNode &node) {
+    if (node.empty()) {
         return;
+    }
 
-    while (mReader->read()) {
-        if (mReader->getNodeType() == irr::io::EXN_ELEMENT) {
-            if (IsElement("animation")) {
-                // delegate the reading. Depending on the inner elements it will be a container or a anim channel
-                ReadAnimation(&mAnims);
-            } else {
-                // ignore the rest
-                SkipElement();
-            }
-        } else if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END) {
-            if (strcmp(mReader->getNodeName(), "library_animations") != 0)
-                ThrowException("Expected end of <library_animations> element.");
-
-            break;
+    for (XmlNode &currentNode : node.children()) {
+        const std::string &currentName = currentNode.name();
+        if (currentName == "animation") {
+            ReadAnimation(currentNode, &mAnims);
         }
     }
 }
 
 // ------------------------------------------------------------------------------------------------
 // Reads an animation into the given parent structure
-void ColladaParser::ReadAnimation(Collada::Animation *pParent) {
-    if (mReader->isEmptyElement())
+void ColladaParser::ReadAnimation(XmlNode &node, Collada::Animation *pParent) {
+    if (node.empty()) {
         return;
+    }
 
     // an <animation> element may be a container for grouping sub-elements or an animation channel
     // this is the channel collection by ID, in case it has channels
-    typedef std::map<std::string, AnimationChannel> ChannelMap;
+    using ChannelMap = std::map<std::string, AnimationChannel> ;
     ChannelMap channels;
     // this is the anim container in case we're a container
     Animation *anim = nullptr;
 
     // optional name given as an attribute
     std::string animName;
-    std::string animID;
-    int indexName = TestAttribute("name");
-    int indexID = TestAttribute("id");
-
-    if (indexID >= 0)
-        animID = mReader->getAttributeValue(indexID);
-
-    if (indexName >= 0)
-        animName = mReader->getAttributeValue(indexName);
-    else if (indexID >= 0)
-        animName = animID;
-    else
+    if (!XmlParser::getStdStrAttribute(node, "name", animName)) {
         animName = "animation";
-
-    while (mReader->read()) {
-        if (mReader->getNodeType() == irr::io::EXN_ELEMENT) {
-            // we have subanimations
-            if (IsElement("animation")) {
-                // create container from our element
-                if (!anim) {
-                    anim = new Animation;
-                    anim->mName = animName;
-                    pParent->mSubAnims.push_back(anim);
-                }
-
-                // recurse into the subelement
-                ReadAnimation(anim);
-            } else if (IsElement("source")) {
-                // possible animation data - we'll never know. Better store it
-                ReadSource();
-            } else if (IsElement("sampler")) {
-                // read the ID to assign the corresponding collada channel afterwards.
-                int indexId = GetAttribute("id");
-                std::string id = mReader->getAttributeValue(indexId);
-                ChannelMap::iterator newChannel = channels.insert(std::make_pair(id, AnimationChannel())).first;
-
-                // have it read into a channel
-                ReadAnimationSampler(newChannel->second);
-            } else if (IsElement("channel")) {
-                // the binding element whose whole purpose is to provide the target to animate
-                // Thanks, Collada! A directly posted information would have been too simple, I guess.
-                // Better add another indirection to that! Can't have enough of those.
-                int indexTarget = GetAttribute("target");
-                int indexSource = GetAttribute("source");
-                const char *sourceId = mReader->getAttributeValue(indexSource);
-                if (sourceId[0] == '#')
-                    sourceId++;
-                ChannelMap::iterator cit = channels.find(sourceId);
-                if (cit != channels.end())
-                    cit->second.mTarget = mReader->getAttributeValue(indexTarget);
-
-                if (!mReader->isEmptyElement())
-                    SkipElement();
-            } else {
-                // ignore the rest
-                SkipElement();
-            }
-        } else if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END) {
-            if (strcmp(mReader->getNodeName(), "animation") != 0)
-                ThrowException("Expected end of <animation> element.");
-
-            break;
-        }
     }
 
-    // it turned out to have channels - add them
-    if (!channels.empty()) {
-        // FIXME: Is this essentially doing the same as "single-anim-node" codepath in
-        //        ColladaLoader::StoreAnimations? For now, this has been deferred to after
-        //        all animations and all clips have been read. Due to handling of
-        //        <library_animation_clips> this cannot be done here, as the channel owner
-        //        is lost, and some exporters make up animations by referring to multiple
-        //        single-channel animations from an <instance_animation>.
-        /*
-        // special filtering for stupid exporters packing each channel into a separate animation
-        if( channels.size() == 1)
-        {
-            pParent->mChannels.push_back( channels.begin()->second);
-        } else
-*/
-        {
-            // else create the animation, if not done yet, and store the channels
+    std::string animID;
+    pugi::xml_attribute idAttr = node.attribute("id");
+    if (idAttr) {
+        animID = idAttr.as_string();
+    }
+
+    for (XmlNode &currentNode : node.children()) {
+        const std::string &currentName = currentNode.name();
+        if (currentName == "animation") {
             if (!anim) {
                 anim = new Animation;
                 anim->mName = animName;
                 pParent->mSubAnims.push_back(anim);
             }
-            for (ChannelMap::const_iterator it = channels.begin(); it != channels.end(); ++it)
-                anim->mChannels.push_back(it->second);
 
-            if (indexID >= 0) {
-                mAnimationLibrary[animID] = anim;
+            // recurse into the sub-element
+            ReadAnimation(currentNode, anim);
+        } else if (currentName == "source") {
+            ReadSource(currentNode);
+        } else if (currentName == "sampler") {
+            std::string id;
+            if (XmlParser::getStdStrAttribute(currentNode, "id", id)) {
+                // have it read into a channel
+                ChannelMap::iterator newChannel = channels.insert(std::make_pair(id, AnimationChannel())).first;
+                ReadAnimationSampler(currentNode, newChannel->second);
+            } else if (currentName == "channel") {
+                std::string source_name, target;
+                XmlParser::getStdStrAttribute(currentNode, "source", source_name);
+                XmlParser::getStdStrAttribute(currentNode, "target", target);
+                if (source_name[0] == '#') {
+                    source_name = source_name.substr(1, source_name.size() - 1);
+                }
+                ChannelMap::iterator cit = channels.find(source_name);
+                if (cit != channels.end()) {
+                    cit->second.mTarget = target;
+                }
             }
         }
     }
+
+    // it turned out to have channels - add them
+    if (!channels.empty()) {
+        if (nullptr == anim) {
+            anim = new Animation;
+            anim->mName = animName;
+            pParent->mSubAnims.push_back(anim);
+        }
+
+        for (ChannelMap::const_iterator it = channels.begin(); it != channels.end(); ++it) {
+            anim->mChannels.push_back(it->second);
+        }
+
+        if (idAttr) {
+            mAnimationLibrary[animID] = anim;
+        }
+    }
 }
 
 // ------------------------------------------------------------------------------------------------
 // Reads an animation sampler into the given anim channel
-void ColladaParser::ReadAnimationSampler(Collada::AnimationChannel &pChannel) {
-    while (mReader->read()) {
-        if (mReader->getNodeType() == irr::io::EXN_ELEMENT) {
-            if (IsElement("input")) {
-                int indexSemantic = GetAttribute("semantic");
-                const char *semantic = mReader->getAttributeValue(indexSemantic);
-                int indexSource = GetAttribute("source");
-                const char *source = mReader->getAttributeValue(indexSource);
-                if (source[0] != '#')
-                    ThrowException("Unsupported URL format");
-                source++;
+void ColladaParser::ReadAnimationSampler(XmlNode &node, Collada::AnimationChannel &pChannel) {
+    for (XmlNode &currentNode : node.children()) {
+        const std::string &currentName = currentNode.name();
+        if (currentName == "input") {
+            if (XmlParser::hasAttribute(currentNode, "semantic")) {
+                std::string semantic, sourceAttr;
+                XmlParser::getStdStrAttribute(currentNode, "semantic", semantic);
+                if (XmlParser::hasAttribute(currentNode, "source")) {
+                    XmlParser::getStdStrAttribute(currentNode, "source", sourceAttr);
+                    const char *source = sourceAttr.c_str();
+                    if (source[0] != '#') {
+                        throw DeadlyImportError("Unsupported URL format");
+                    }
+                    source++;
 
-                if (strcmp(semantic, "INPUT") == 0)
-                    pChannel.mSourceTimes = source;
-                else if (strcmp(semantic, "OUTPUT") == 0)
-                    pChannel.mSourceValues = source;
-                else if (strcmp(semantic, "IN_TANGENT") == 0)
-                    pChannel.mInTanValues = source;
-                else if (strcmp(semantic, "OUT_TANGENT") == 0)
-                    pChannel.mOutTanValues = source;
-                else if (strcmp(semantic, "INTERPOLATION") == 0)
-                    pChannel.mInterpolationValues = source;
-
-                if (!mReader->isEmptyElement())
-                    SkipElement();
-            } else {
-                // ignore the rest
-                SkipElement();
+                    if (semantic == "INPUT") {
+                        pChannel.mSourceTimes = source;
+                    } else if (semantic == "OUTPUT") {
+                        pChannel.mSourceValues = source;
+                    } else if (semantic == "IN_TANGENT") {
+                        pChannel.mInTanValues = source;
+                    } else if (semantic == "OUT_TANGENT") {
+                        pChannel.mOutTanValues = source;
+                    } else if (semantic == "INTERPOLATION") {
+                        pChannel.mInterpolationValues = source;
+                    }
+                }
             }
-        } else if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END) {
-            if (strcmp(mReader->getNodeName(), "sampler") != 0)
-                ThrowException("Expected end of <sampler> element.");
-
-            break;
         }
     }
 }
 
 // ------------------------------------------------------------------------------------------------
 // Reads the skeleton controller library
-void ColladaParser::ReadControllerLibrary() {
-    if (mReader->isEmptyElement())
+void ColladaParser::ReadControllerLibrary(XmlNode &node) {
+    if (node.empty()) {
         return;
+    }
 
-    while (mReader->read()) {
-        if (mReader->getNodeType() == irr::io::EXN_ELEMENT) {
-            if (IsElement("controller")) {
-                // read ID. Ask the spec if it's necessary or optional... you might be surprised.
-                int attrID = GetAttribute("id");
-                std::string id = mReader->getAttributeValue(attrID);
-
-                // create an entry and store it in the library under its ID
-                mControllerLibrary[id] = Controller();
-
-                // read on from there
-                ReadController(mControllerLibrary[id]);
-            } else {
-                // ignore the rest
-                SkipElement();
-            }
-        } else if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END) {
-            if (strcmp(mReader->getNodeName(), "library_controllers") != 0)
-                ThrowException("Expected end of <library_controllers> element.");
-
-            break;
+    for (XmlNode &currentNode : node.children()) {
+        const std::string &currentName = currentNode.name();
+        if (currentName != "controller") {
+            continue;
         }
+        std::string id = node.attribute("id").as_string();
+        mControllerLibrary[id] = Controller();
+        ReadController(node, mControllerLibrary[id]);
     }
 }
 
 // ------------------------------------------------------------------------------------------------
 // Reads a controller into the given mesh structure
-void ColladaParser::ReadController(Collada::Controller &pController) {
+void ColladaParser::ReadController(XmlNode &node, Collada::Controller &pController) {
     // initial values
     pController.mType = Skin;
     pController.mMethod = Normalized;
-    while (mReader->read()) {
-        if (mReader->getNodeType() == irr::io::EXN_ELEMENT) {
-            // two types of controllers: "skin" and "morph". Only the first one is relevant, we skip the other
-            if (IsElement("morph")) {
-                pController.mType = Morph;
-                int baseIndex = GetAttribute("source");
-                pController.mMeshId = mReader->getAttributeValue(baseIndex) + 1;
-                int methodIndex = GetAttribute("method");
-                if (methodIndex > 0) {
-                    const char *method = mReader->getAttributeValue(methodIndex);
-                    if (strcmp(method, "RELATIVE") == 0)
-                        pController.mMethod = Relative;
+    for (XmlNode &currentNode : node.children()) {
+        const std::string &currentName = currentNode.name();
+        if (currentName == "morph") {
+            pController.mType = Morph;
+            pController.mMeshId = currentNode.attribute("source").as_string();
+            int methodIndex = currentNode.attribute("method").as_int();
+            if (methodIndex > 0) {
+                std::string method;
+                XmlParser::getValueAsString(currentNode, method);
+
+                if (method == "RELATIVE") {
+                    pController.mMethod = Relative;
                 }
-            } else if (IsElement("skin")) {
-                // read the mesh it refers to. According to the spec this could also be another
-                // controller, but I refuse to implement every single idea they've come up with
-                int sourceIndex = GetAttribute("source");
-                pController.mMeshId = mReader->getAttributeValue(sourceIndex) + 1;
-            } else if (IsElement("bind_shape_matrix")) {
-                // content is 16 floats to define a matrix... it seems to be important for some models
-                const char *content = GetTextContent();
-
-                // read the 16 floats
-                for (unsigned int a = 0; a < 16; a++) {
-                    // read a number
-                    content = fast_atoreal_move<ai_real>(content, pController.mBindShapeMatrix[a]);
-                    // skip whitespace after it
-                    SkipSpacesAndLineEnd(&content);
-                }
-
-                TestClosing("bind_shape_matrix");
-            } else if (IsElement("source")) {
-                // data array - we have specialists to handle this
-                ReadSource();
-            } else if (IsElement("joints")) {
-                ReadControllerJoints(pController);
-            } else if (IsElement("vertex_weights")) {
-                ReadControllerWeights(pController);
-            } else if (IsElement("targets")) {
-                while (mReader->read()) {
-                    if (mReader->getNodeType() == irr::io::EXN_ELEMENT) {
-                        if (IsElement("input")) {
-                            int semanticsIndex = GetAttribute("semantic");
-                            int sourceIndex = GetAttribute("source");
-
-                            const char *semantics = mReader->getAttributeValue(semanticsIndex);
-                            const char *source = mReader->getAttributeValue(sourceIndex);
-                            if (strcmp(semantics, "MORPH_TARGET") == 0) {
-                                pController.mMorphTarget = source + 1;
-                            } else if (strcmp(semantics, "MORPH_WEIGHT") == 0) {
-                                pController.mMorphWeight = source + 1;
-                            }
-                        }
-                    } else if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END) {
-                        if (strcmp(mReader->getNodeName(), "targets") == 0)
-                            break;
-                        else
-                            ThrowException("Expected end of <targets> element.");
+            }
+        } else if (currentName == "skin") {
+            pController.mMeshId = currentNode.attribute("source").as_string();
+        } else if (currentName == "bind_shape_matrix") {
+            std::string v;
+            XmlParser::getValueAsString(currentNode, v);
+            const char *content = v.c_str();
+            for (unsigned int a = 0; a < 16; a++) {
+                // read a number
+                content = fast_atoreal_move<ai_real>(content, pController.mBindShapeMatrix[a]);
+                // skip whitespace after it
+                SkipSpacesAndLineEnd(&content);
+            }
+        } else if (currentName == "source") {
+            ReadSource(currentNode);
+        } else if (currentName == "joints") {
+            ReadControllerJoints(currentNode, pController);
+        } else if (currentName == "vertex_weights") {
+            ReadControllerWeights(currentNode, pController);
+        } else if (currentName == "targets") {
+            for (XmlNode currentChildNode = node.first_child(); currentNode; currentNode = currentNode.next_sibling()) {
+                const std::string &currentChildName = currentChildNode.name();
+                if (currentChildName == "input") {
+                    const char *semantics = currentChildNode.attribute("semantic").as_string();
+                    const char *source = currentChildNode.attribute("source").as_string();
+                    if (strcmp(semantics, "MORPH_TARGET") == 0) {
+                        pController.mMorphTarget = source + 1;
+                    } else if (strcmp(semantics, "MORPH_WEIGHT") == 0) {
+                        pController.mMorphWeight = source + 1;
                     }
                 }
-            } else {
-                // ignore the rest
-                SkipElement();
             }
-        } else if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END) {
-            if (strcmp(mReader->getNodeName(), "controller") == 0)
-                break;
-            else if (strcmp(mReader->getNodeName(), "skin") != 0 && strcmp(mReader->getNodeName(), "morph") != 0)
-                ThrowException("Expected end of <controller> element.");
         }
     }
 }
 
 // ------------------------------------------------------------------------------------------------
 // Reads the joint definitions for the given controller
-void ColladaParser::ReadControllerJoints(Collada::Controller &pController) {
-    while (mReader->read()) {
-        if (mReader->getNodeType() == irr::io::EXN_ELEMENT) {
-            // Input channels for joint data. Two possible semantics: "JOINT" and "INV_BIND_MATRIX"
-            if (IsElement("input")) {
-                int indexSemantic = GetAttribute("semantic");
-                const char *attrSemantic = mReader->getAttributeValue(indexSemantic);
-                int indexSource = GetAttribute("source");
-                const char *attrSource = mReader->getAttributeValue(indexSource);
-
-                // local URLS always start with a '#'. We don't support global URLs
-                if (attrSource[0] != '#')
-                    ThrowException(format() << "Unsupported URL format in \"" << attrSource << "\" in source attribute of <joints> data <input> element");
-                attrSource++;
-
-                // parse source URL to corresponding source
-                if (strcmp(attrSemantic, "JOINT") == 0)
-                    pController.mJointNameSource = attrSource;
-                else if (strcmp(attrSemantic, "INV_BIND_MATRIX") == 0)
-                    pController.mJointOffsetMatrixSource = attrSource;
-                else
-                    ThrowException(format() << "Unknown semantic \"" << attrSemantic << "\" in <joints> data <input> element");
-
-                // skip inner data, if present
-                if (!mReader->isEmptyElement())
-                    SkipElement();
-            } else {
-                // ignore the rest
-                SkipElement();
+void ColladaParser::ReadControllerJoints(XmlNode &node, Collada::Controller &pController) {
+    for (XmlNode &currentNode : node.children()) {
+        const std::string &currentName = currentNode.name();
+        if (currentName == "input") {
+            const char *attrSemantic = currentNode.attribute("semantic").as_string();
+            const char *attrSource = currentNode.attribute("source").as_string();
+            if (attrSource[0] != '#') {
+                throw DeadlyImportError("Unsupported URL format in \"", attrSource, "\" in source attribute of <joints> data <input> element");
+            }
+            ++attrSource;
+            // parse source URL to corresponding source
+            if (strcmp(attrSemantic, "JOINT") == 0) {
+                pController.mJointNameSource = attrSource;
+            } else if (strcmp(attrSemantic, "INV_BIND_MATRIX") == 0) {
+                pController.mJointOffsetMatrixSource = attrSource;
+            } else {
+                throw DeadlyImportError("Unknown semantic \"" , attrSemantic , "\" in <joints> data <input> element");
             }
-        } else if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END) {
-            if (strcmp(mReader->getNodeName(), "joints") != 0)
-                ThrowException("Expected end of <joints> element.");
-
-            break;
         }
     }
 }
 
 // ------------------------------------------------------------------------------------------------
 // Reads the joint weights for the given controller
-void ColladaParser::ReadControllerWeights(Collada::Controller &pController) {
-    // read vertex count from attributes and resize the array accordingly
-    int indexCount = GetAttribute("count");
-    size_t vertexCount = (size_t)mReader->getAttributeValueAsInt(indexCount);
-    pController.mWeightCounts.resize(vertexCount);
+void ColladaParser::ReadControllerWeights(XmlNode &node, Collada::Controller &pController) {
+    // Read vertex count from attributes and resize the array accordingly
+    int vertexCount=0;
+    XmlParser::getIntAttribute(node, "count", vertexCount);
 
-    while (mReader->read()) {
-        if (mReader->getNodeType() == irr::io::EXN_ELEMENT) {
-            // Input channels for weight data. Two possible semantics: "JOINT" and "WEIGHT"
-            if (IsElement("input") && vertexCount > 0) {
-                InputChannel channel;
+    for (XmlNode &currentNode : node.children()) {
+        const std::string &currentName = currentNode.name();
+        if (currentName == "input") {
+            InputChannel channel;
 
-                int indexSemantic = GetAttribute("semantic");
-                const char *attrSemantic = mReader->getAttributeValue(indexSemantic);
-                int indexSource = GetAttribute("source");
-                const char *attrSource = mReader->getAttributeValue(indexSource);
-                int indexOffset = TestAttribute("offset");
-                if (indexOffset >= 0)
-                    channel.mOffset = mReader->getAttributeValueAsInt(indexOffset);
+            const char *attrSemantic = currentNode.attribute("semantic").as_string();
+            const char *attrSource = currentNode.attribute("source").as_string();
+            channel.mOffset = currentNode.attribute("offset").as_int();
 
-                // local URLS always start with a '#'. We don't support global URLs
-                if (attrSource[0] != '#')
-                    ThrowException(format() << "Unsupported URL format in \"" << attrSource << "\" in source attribute of <vertex_weights> data <input> element");
-                channel.mAccessor = attrSource + 1;
-
-                // parse source URL to corresponding source
-                if (strcmp(attrSemantic, "JOINT") == 0)
-                    pController.mWeightInputJoints = channel;
-                else if (strcmp(attrSemantic, "WEIGHT") == 0)
-                    pController.mWeightInputWeights = channel;
-                else
-                    ThrowException(format() << "Unknown semantic \"" << attrSemantic << "\" in <vertex_weights> data <input> element");
-
-                // skip inner data, if present
-                if (!mReader->isEmptyElement())
-                    SkipElement();
-            } else if (IsElement("vcount") && vertexCount > 0) {
-                // read weight count per vertex
-                const char *text = GetTextContent();
-                size_t numWeights = 0;
-                for (std::vector<size_t>::iterator it = pController.mWeightCounts.begin(); it != pController.mWeightCounts.end(); ++it) {
-                    if (*text == 0)
-                        ThrowException("Out of data while reading <vcount>");
-
-                    *it = strtoul10(text, &text);
-                    numWeights += *it;
-                    SkipSpacesAndLineEnd(&text);
-                }
-
-                TestClosing("vcount");
-
-                // reserve weight count
-                pController.mWeights.resize(numWeights);
-            } else if (IsElement("v") && vertexCount > 0) {
-                // read JointIndex - WeightIndex pairs
-                const char *text = GetTextContent();
-
-                for (std::vector<std::pair<size_t, size_t>>::iterator it = pController.mWeights.begin(); it != pController.mWeights.end(); ++it) {
-                    if (*text == 0)
-                        ThrowException("Out of data while reading <vertex_weights>");
-                    it->first = strtoul10(text, &text);
-                    SkipSpacesAndLineEnd(&text);
-                    if (*text == 0)
-                        ThrowException("Out of data while reading <vertex_weights>");
-                    it->second = strtoul10(text, &text);
-                    SkipSpacesAndLineEnd(&text);
-                }
-
-                TestClosing("v");
-            } else {
-                // ignore the rest
-                SkipElement();
+            // local URLS always start with a '#'. We don't support global URLs
+            if (attrSource[0] != '#') {
+                throw DeadlyImportError( "Unsupported URL format in \"", attrSource, "\" in source attribute of <vertex_weights> data <input> element");
             }
-        } else if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END) {
-            if (strcmp(mReader->getNodeName(), "vertex_weights") != 0)
-                ThrowException("Expected end of <vertex_weights> element.");
+            channel.mAccessor = attrSource + 1;
 
-            break;
+            // parse source URL to corresponding source
+            if (strcmp(attrSemantic, "JOINT") == 0) {
+                pController.mWeightInputJoints = channel;
+            } else if (strcmp(attrSemantic, "WEIGHT") == 0) {
+                pController.mWeightInputWeights = channel;
+            } else {
+                throw DeadlyImportError("Unknown semantic \"", attrSemantic, "\" in <vertex_weights> data <input> element");
+            }
+        } else if (currentName == "vcount" && vertexCount > 0) {
+            const char *text = currentNode.value();
+            size_t numWeights = 0;
+            for (std::vector<size_t>::iterator it = pController.mWeightCounts.begin(); it != pController.mWeightCounts.end(); ++it) {
+                if (*text == 0) {
+                    throw DeadlyImportError("Out of data while reading <vcount>");
+                }
+
+                *it = strtoul10(text, &text);
+                numWeights += *it;
+                SkipSpacesAndLineEnd(&text);
+            }
+            // reserve weight count
+            pController.mWeights.resize(numWeights);
+        } else if (currentName == "v" && vertexCount > 0) {
+            // read JointIndex - WeightIndex pairs
+            std::string stdText;
+            XmlParser::getValueAsString(currentNode, stdText);
+            const char *text = stdText.c_str();
+            for (std::vector<std::pair<size_t, size_t>>::iterator it = pController.mWeights.begin(); it != pController.mWeights.end(); ++it) {
+                if (text == 0) {
+                    throw DeadlyImportError("Out of data while reading <vertex_weights>");
+                }
+                it->first = strtoul10(text, &text);
+                SkipSpacesAndLineEnd(&text);
+                if (*text == 0) {
+                    throw DeadlyImportError("Out of data while reading <vertex_weights>");
+                }
+                it->second = strtoul10(text, &text);
+                SkipSpacesAndLineEnd(&text);
+            }
         }
     }
 }
 
 // ------------------------------------------------------------------------------------------------
 // Reads the image library contents
-void ColladaParser::ReadImageLibrary() {
-    if (mReader->isEmptyElement())
+void ColladaParser::ReadImageLibrary(XmlNode &node) {
+    if (node.empty()) {
         return;
+    }
 
-    while (mReader->read()) {
-        if (mReader->getNodeType() == irr::io::EXN_ELEMENT) {
-            if (IsElement("image")) {
-                // read ID. Another entry which is "optional" by design but obligatory in reality
-                int attrID = GetAttribute("id");
-                std::string id = mReader->getAttributeValue(attrID);
+    for (XmlNode &currentNode : node.children()) {
+        const std::string &currentName = currentNode.name();
+        if (currentName == "image") {
+            std::string id = currentNode.attribute("id").as_string();
+            mImageLibrary[id] = Image();
 
-                // create an entry and store it in the library under its ID
-                mImageLibrary[id] = Image();
-
-                // read on from there
-                ReadImage(mImageLibrary[id]);
-            } else {
-                // ignore the rest
-                SkipElement();
-            }
-        } else if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END) {
-            if (strcmp(mReader->getNodeName(), "library_images") != 0)
-                ThrowException("Expected end of <library_images> element.");
-
-            break;
+            // read on from there
+            ReadImage(currentNode, mImageLibrary[id]);
         }
     }
 }
 
 // ------------------------------------------------------------------------------------------------
 // Reads an image entry into the given image
-void ColladaParser::ReadImage(Collada::Image &pImage) {
-    while (mReader->read()) {
-        if (mReader->getNodeType() == irr::io::EXN_ELEMENT) {
-            // Need to run different code paths here, depending on the Collada XSD version
-            if (IsElement("image")) {
-                SkipElement();
-            } else if (IsElement("init_from")) {
-                if (mFormat == FV_1_4_n) {
-                    // FIX: C4D exporter writes empty <init_from/> tags
-                    if (!mReader->isEmptyElement()) {
-                        // element content is filename - hopefully
-                        const char *sz = TestTextContent();
-                        if (sz) {
-                            aiString filepath(sz);
-                            UriDecodePath(filepath);
-                            pImage.mFileName = filepath.C_Str();
-                        }
-                        TestClosing("init_from");
-                    }
-                    if (!pImage.mFileName.length()) {
-                        pImage.mFileName = "unknown_texture";
-                    }
-                } else if (mFormat == FV_1_5_n) {
-                    // make sure we skip over mip and array initializations, which
-                    // we don't support, but which could confuse the loader if
-                    // they're not skipped.
-                    int attrib = TestAttribute("array_index");
-                    if (attrib != -1 && mReader->getAttributeValueAsInt(attrib) > 0) {
-                        ASSIMP_LOG_WARN("Collada: Ignoring texture array index");
-                        continue;
-                    }
-
-                    attrib = TestAttribute("mip_index");
-                    if (attrib != -1 && mReader->getAttributeValueAsInt(attrib) > 0) {
-                        ASSIMP_LOG_WARN("Collada: Ignoring MIP map layer");
-                        continue;
-                    }
-
-                    // TODO: correctly jump over cube and volume maps?
-                }
-            } else if (mFormat == FV_1_5_n) {
-                if (IsElement("ref")) {
+void ColladaParser::ReadImage(XmlNode &node, Collada::Image &pImage) {
+    for (XmlNode &currentNode : node.children()) {
+        const std::string currentName = currentNode.name();
+        if (currentName == "image") {
+            // Ignore
+            continue;
+        } else if (currentName == "init_from") {
+            if (mFormat == FV_1_4_n) {
+                // FIX: C4D exporter writes empty <init_from/> tags
+                if (!currentNode.empty()) {
                     // element content is filename - hopefully
-                    const char *sz = TestTextContent();
+                    const char *sz = currentNode.text().as_string();
                     if (sz) {
                         aiString filepath(sz);
                         UriDecodePath(filepath);
                         pImage.mFileName = filepath.C_Str();
                     }
-                    TestClosing("ref");
-                } else if (IsElement("hex") && !pImage.mFileName.length()) {
-                    // embedded image. get format
-                    const int attrib = TestAttribute("format");
-                    if (-1 == attrib)
-                        ASSIMP_LOG_WARN("Collada: Unknown image file format");
-                    else
-                        pImage.mEmbeddedFormat = mReader->getAttributeValue(attrib);
-
-                    const char *data = GetTextContent();
-
-                    // hexadecimal-encoded binary octets. First of all, find the
-                    // required buffer size to reserve enough storage.
-                    const char *cur = data;
-                    while (!IsSpaceOrNewLine(*cur))
-                        cur++;
-
-                    const unsigned int size = (unsigned int)(cur - data) * 2;
-                    pImage.mImageData.resize(size);
-                    for (unsigned int i = 0; i < size; ++i)
-                        pImage.mImageData[i] = HexOctetToDecimal(data + (i << 1));
-
-                    TestClosing("hex");
                 }
-            } else {
-                // ignore the rest
-                SkipElement();
+                if (!pImage.mFileName.length()) {
+                    pImage.mFileName = "unknown_texture";
+                }
+            }
+        } else if (mFormat == FV_1_5_n) {
+            std::string value;
+            XmlNode refChild = currentNode.child("ref");
+            XmlNode hexChild = currentNode.child("hex");
+            if (refChild) {
+                // element content is filename - hopefully
+                if (XmlParser::getValueAsString(refChild, value)) {
+                    aiString filepath(value);
+                    UriDecodePath(filepath);
+                    pImage.mFileName = filepath.C_Str();
+                }
+            } else if (hexChild && !pImage.mFileName.length()) {
+                // embedded image. get format
+                pImage.mEmbeddedFormat = hexChild.attribute("format").as_string();
+                if (pImage.mEmbeddedFormat.empty()) {
+                    ASSIMP_LOG_WARN("Collada: Unknown image file format");
+                }
+
+                XmlParser::getValueAsString(hexChild, value);
+                const char *data = value.c_str();
+                // hexadecimal-encoded binary octets. First of all, find the
+                // required buffer size to reserve enough storage.
+                const char *cur = data;
+                while (!IsSpaceOrNewLine(*cur)) {
+                    ++cur;
+                }
+
+                const unsigned int size = (unsigned int)(cur - data) * 2;
+                pImage.mImageData.resize(size);
+                for (unsigned int i = 0; i < size; ++i) {
+                    pImage.mImageData[i] = HexOctetToDecimal(data + (i << 1));
+                }
             }
-        } else if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END) {
-            if (strcmp(mReader->getNodeName(), "image") == 0)
-                break;
         }
     }
 }
 
 // ------------------------------------------------------------------------------------------------
 // Reads the material library
-void ColladaParser::ReadMaterialLibrary() {
-    if (mReader->isEmptyElement())
+void ColladaParser::ReadMaterialLibrary(XmlNode &node) {
+    if (node.empty()) {
         return;
+    }
 
     std::map<std::string, int> names;
-    while (mReader->read()) {
-        if (mReader->getNodeType() == irr::io::EXN_ELEMENT) {
-            if (IsElement("material")) {
-                // read ID. By now you probably know my opinion about this "specification"
-                int attrID = GetAttribute("id");
-                std::string id = mReader->getAttributeValue(attrID);
+    for (XmlNode &currentNode : node.children()) {
+        std::string id = currentNode.attribute("id").as_string();
+        std::string name = currentNode.attribute("name").as_string();
+        mMaterialLibrary[id] = Material();
 
-                std::string name;
-                int attrName = TestAttribute("name");
-                if (attrName >= 0)
-                    name = mReader->getAttributeValue(attrName);
-
-                // create an entry and store it in the library under its ID
-                mMaterialLibrary[id] = Material();
-
-                if (!name.empty()) {
-                    std::map<std::string, int>::iterator it = names.find(name);
-                    if (it != names.end()) {
-                        std::ostringstream strStream;
-                        strStream << ++it->second;
-                        name.append(" " + strStream.str());
-                    } else {
-                        names[name] = 0;
-                    }
-
-                    mMaterialLibrary[id].mName = name;
-                }
-
-                ReadMaterial(mMaterialLibrary[id]);
+        if (!name.empty()) {
+            std::map<std::string, int>::iterator it = names.find(name);
+            if (it != names.end()) {
+                std::ostringstream strStream;
+                strStream << ++it->second;
+                name.append(" " + strStream.str());
             } else {
-                // ignore the rest
-                SkipElement();
+                names[name] = 0;
             }
-        } else if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END) {
-            if (strcmp(mReader->getNodeName(), "library_materials") != 0)
-                ThrowException("Expected end of <library_materials> element.");
 
-            break;
+            mMaterialLibrary[id].mName = name;
         }
+
+        ReadMaterial(currentNode, mMaterialLibrary[id]);
     }
 }
 
 // ------------------------------------------------------------------------------------------------
 // Reads the light library
-void ColladaParser::ReadLightLibrary() {
-    if (mReader->isEmptyElement())
+void ColladaParser::ReadLightLibrary(XmlNode &node) {
+    if (node.empty()) {
         return;
+    }
 
-    while (mReader->read()) {
-        if (mReader->getNodeType() == irr::io::EXN_ELEMENT) {
-            if (IsElement("light")) {
-                // read ID. By now you probably know my opinion about this "specification"
-                int attrID = GetAttribute("id");
-                std::string id = mReader->getAttributeValue(attrID);
-
-                // create an entry and store it in the library under its ID
-                ReadLight(mLightLibrary[id] = Light());
-
-            } else {
-                // ignore the rest
-                SkipElement();
+    for (XmlNode &currentNode : node.children()) {
+        const std::string &currentName = currentNode.name();
+        if (currentName == "light") {
+            std::string id;
+            if (XmlParser::getStdStrAttribute(currentNode, "id", id)) {
+                ReadLight(currentNode, mLightLibrary[id] = Light());
             }
-        } else if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END) {
-            if (strcmp(mReader->getNodeName(), "library_lights") != 0)
-                ThrowException("Expected end of <library_lights> element.");
-
-            break;
         }
     }
 }
 
 // ------------------------------------------------------------------------------------------------
 // Reads the camera library
-void ColladaParser::ReadCameraLibrary() {
-    if (mReader->isEmptyElement())
+void ColladaParser::ReadCameraLibrary(XmlNode &node) {
+    if (node.empty()) {
         return;
+    }
 
-    while (mReader->read()) {
-        if (mReader->getNodeType() == irr::io::EXN_ELEMENT) {
-            if (IsElement("camera")) {
-                // read ID. By now you probably know my opinion about this "specification"
-                int attrID = GetAttribute("id");
-                std::string id = mReader->getAttributeValue(attrID);
-
-                // create an entry and store it in the library under its ID
-                Camera &cam = mCameraLibrary[id];
-                attrID = TestAttribute("name");
-                if (attrID != -1)
-                    cam.mName = mReader->getAttributeValue(attrID);
-
-                ReadCamera(cam);
-
-            } else {
-                // ignore the rest
-                SkipElement();
+    for (XmlNode &currentNode : node.children()) {
+        const std::string &currentName = currentNode.name();
+        if (currentName == "camera") {
+            std::string id;
+            if (!XmlParser::getStdStrAttribute(currentNode, "id", id)) {
+                continue;
             }
-        } else if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END) {
-            if (strcmp(mReader->getNodeName(), "library_cameras") != 0)
-                ThrowException("Expected end of <library_cameras> element.");
 
-            break;
+            // create an entry and store it in the library under its ID
+            Camera &cam = mCameraLibrary[id];
+            std::string name;
+            if (!XmlParser::getStdStrAttribute(currentNode, "name", name)) {
+                continue;
+            }
+            if (!name.empty()) {
+                cam.mName = name;
+            }
+            ReadCamera(currentNode, cam);            
         }
     }
 }
 
 // ------------------------------------------------------------------------------------------------
 // Reads a material entry into the given material
-void ColladaParser::ReadMaterial(Collada::Material &pMaterial) {
-    while (mReader->read()) {
-        if (mReader->getNodeType() == irr::io::EXN_ELEMENT) {
-            if (IsElement("material")) {
-                SkipElement();
-            } else if (IsElement("instance_effect")) {
-                // referred effect by URL
-                int attrUrl = GetAttribute("url");
-                const char *url = mReader->getAttributeValue(attrUrl);
-                if (url[0] != '#')
-                    ThrowException("Unknown reference format");
-
-                pMaterial.mEffect = url + 1;
-
-                SkipElement();
-            } else {
-                // ignore the rest
-                SkipElement();
-            }
-        } else if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END) {
-            if (strcmp(mReader->getNodeName(), "material") != 0)
-                ThrowException("Expected end of <material> element.");
-
-            break;
+void ColladaParser::ReadMaterial(XmlNode &node, Collada::Material &pMaterial) {
+    for (XmlNode &currentNode : node.children()) {
+        const std::string &currentName = currentNode.name();
+        if (currentName == "instance_effect") {
+            std::string url;
+            readUrlAttribute(currentNode, url);
+            pMaterial.mEffect = url.c_str();
         }
     }
 }
 
 // ------------------------------------------------------------------------------------------------
 // Reads a light entry into the given light
-void ColladaParser::ReadLight(Collada::Light &pLight) {
-    while (mReader->read()) {
-        if (mReader->getNodeType() == irr::io::EXN_ELEMENT) {
-            if (IsElement("light")) {
-                SkipElement();
-            } else if (IsElement("spot")) {
-                pLight.mType = aiLightSource_SPOT;
-            } else if (IsElement("ambient")) {
-                pLight.mType = aiLightSource_AMBIENT;
-            } else if (IsElement("directional")) {
-                pLight.mType = aiLightSource_DIRECTIONAL;
-            } else if (IsElement("point")) {
-                pLight.mType = aiLightSource_POINT;
-            } else if (IsElement("color")) {
-                // text content contains 3 floats
-                const char *content = GetTextContent();
+void ColladaParser::ReadLight(XmlNode &node, Collada::Light &pLight) {
+    XmlNodeIterator xmlIt(node);
+    xmlIt.collectChildrenPreOrder(node);
+    XmlNode currentNode;
+    while (xmlIt.getNext(currentNode)) {
+        const std::string &currentName = currentNode.name();
+        if (currentName == "spot") {
+            pLight.mType = aiLightSource_SPOT;
+        } else if (currentName == "ambient") {
+            pLight.mType = aiLightSource_AMBIENT;
+        } else if (currentName == "directional") {
+            pLight.mType = aiLightSource_DIRECTIONAL;
+        } else if (currentName == "point") {
+            pLight.mType = aiLightSource_POINT;
+        } else if (currentName == "color") {
+            // text content contains 3 floats
+            std::string v;
+            XmlParser::getValueAsString(currentNode, v);
+            const char *content = v.c_str();
 
-                content = fast_atoreal_move<ai_real>(content, (ai_real &)pLight.mColor.r);
-                SkipSpacesAndLineEnd(&content);
+            content = fast_atoreal_move<ai_real>(content, (ai_real &)pLight.mColor.r);
+            SkipSpacesAndLineEnd(&content);
 
-                content = fast_atoreal_move<ai_real>(content, (ai_real &)pLight.mColor.g);
-                SkipSpacesAndLineEnd(&content);
+            content = fast_atoreal_move<ai_real>(content, (ai_real &)pLight.mColor.g);
+            SkipSpacesAndLineEnd(&content);
 
-                content = fast_atoreal_move<ai_real>(content, (ai_real &)pLight.mColor.b);
-                SkipSpacesAndLineEnd(&content);
-
-                TestClosing("color");
-            } else if (IsElement("constant_attenuation")) {
-                pLight.mAttConstant = ReadFloatFromTextContent();
-                TestClosing("constant_attenuation");
-            } else if (IsElement("linear_attenuation")) {
-                pLight.mAttLinear = ReadFloatFromTextContent();
-                TestClosing("linear_attenuation");
-            } else if (IsElement("quadratic_attenuation")) {
-                pLight.mAttQuadratic = ReadFloatFromTextContent();
-                TestClosing("quadratic_attenuation");
-            } else if (IsElement("falloff_angle")) {
-                pLight.mFalloffAngle = ReadFloatFromTextContent();
-                TestClosing("falloff_angle");
-            } else if (IsElement("falloff_exponent")) {
-                pLight.mFalloffExponent = ReadFloatFromTextContent();
-                TestClosing("falloff_exponent");
-            }
-            // FCOLLADA extensions
-            // -------------------------------------------------------
-            else if (IsElement("outer_cone")) {
-                pLight.mOuterAngle = ReadFloatFromTextContent();
-                TestClosing("outer_cone");
-            }
-            // ... and this one is even deprecated
-            else if (IsElement("penumbra_angle")) {
-                pLight.mPenumbraAngle = ReadFloatFromTextContent();
-                TestClosing("penumbra_angle");
-            } else if (IsElement("intensity")) {
-                pLight.mIntensity = ReadFloatFromTextContent();
-                TestClosing("intensity");
-            } else if (IsElement("falloff")) {
-                pLight.mOuterAngle = ReadFloatFromTextContent();
-                TestClosing("falloff");
-            } else if (IsElement("hotspot_beam")) {
-                pLight.mFalloffAngle = ReadFloatFromTextContent();
-                TestClosing("hotspot_beam");
-            }
-            // OpenCOLLADA extensions
-            // -------------------------------------------------------
-            else if (IsElement("decay_falloff")) {
-                pLight.mOuterAngle = ReadFloatFromTextContent();
-                TestClosing("decay_falloff");
-            }
-        } else if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END) {
-            if (strcmp(mReader->getNodeName(), "light") == 0)
-                break;
+            content = fast_atoreal_move<ai_real>(content, (ai_real &)pLight.mColor.b);
+            SkipSpacesAndLineEnd(&content);
+        } else if (currentName == "constant_attenuation") {
+            XmlParser::getFloatAttribute(currentNode, "constant_attenuation", pLight.mAttConstant);
+        } else if (currentName == "linear_attenuation") {
+            XmlParser::getFloatAttribute(currentNode, "linear_attenuation", pLight.mAttLinear);
+        } else if (currentName == "quadratic_attenuation") {
+            XmlParser::getFloatAttribute(currentNode, "quadratic_attenuation", pLight.mAttQuadratic);
+        } else if (currentName == "falloff_angle") {
+            XmlParser::getFloatAttribute(currentNode, "falloff_angle", pLight.mFalloffAngle);
+        } else if (currentName == "falloff_exponent") {
+            XmlParser::getFloatAttribute(currentNode, "falloff_exponent", pLight.mFalloffExponent);
+        }
+        // FCOLLADA extensions
+        // -------------------------------------------------------
+        else if (currentName == "outer_cone") {
+            XmlParser::getFloatAttribute(currentNode, "outer_cone", pLight.mOuterAngle);
+        } else if (currentName == "penumbra_angle") { // ... and this one is even deprecated
+            XmlParser::getFloatAttribute(currentNode, "penumbra_angle", pLight.mPenumbraAngle);
+        } else if (currentName == "intensity") {
+            XmlParser::getFloatAttribute(currentNode, "intensity", pLight.mIntensity);
+        } else if (currentName == "falloff") {
+            XmlParser::getFloatAttribute(currentNode, "falloff", pLight.mOuterAngle);
+        } else if (currentName == "hotspot_beam") {
+            XmlParser::getFloatAttribute(currentNode, "hotspot_beam", pLight.mFalloffAngle);
+        }
+        // OpenCOLLADA extensions
+        // -------------------------------------------------------
+        else if (currentName == "decay_falloff") {
+            XmlParser::getFloatAttribute(currentNode, "decay_falloff", pLight.mOuterAngle);
         }
     }
 }
 
 // ------------------------------------------------------------------------------------------------
 // Reads a camera entry into the given light
-void ColladaParser::ReadCamera(Collada::Camera &pCamera) {
-    while (mReader->read()) {
-        if (mReader->getNodeType() == irr::io::EXN_ELEMENT) {
-            if (IsElement("camera")) {
-                SkipElement();
-            } else if (IsElement("orthographic")) {
-                pCamera.mOrtho = true;
-            } else if (IsElement("xfov") || IsElement("xmag")) {
-                pCamera.mHorFov = ReadFloatFromTextContent();
-                TestClosing((pCamera.mOrtho ? "xmag" : "xfov"));
-            } else if (IsElement("yfov") || IsElement("ymag")) {
-                pCamera.mVerFov = ReadFloatFromTextContent();
-                TestClosing((pCamera.mOrtho ? "ymag" : "yfov"));
-            } else if (IsElement("aspect_ratio")) {
-                pCamera.mAspect = ReadFloatFromTextContent();
-                TestClosing("aspect_ratio");
-            } else if (IsElement("znear")) {
-                pCamera.mZNear = ReadFloatFromTextContent();
-                TestClosing("znear");
-            } else if (IsElement("zfar")) {
-                pCamera.mZFar = ReadFloatFromTextContent();
-                TestClosing("zfar");
-            }
-        } else if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END) {
-            if (strcmp(mReader->getNodeName(), "camera") == 0)
-                break;
+void ColladaParser::ReadCamera(XmlNode &node, Collada::Camera &camera) {
+    XmlNodeIterator xmlIt(node);
+    xmlIt.collectChildrenPreOrder(node);
+    XmlNode currentNode;
+
+    while (xmlIt.getNext(currentNode)) {
+        const std::string &currentName = currentNode.name();
+        if (currentName == "orthographic") {
+            camera.mOrtho = true;
+        } else if (currentName == "xfov" || currentName == "xmag") {
+            XmlParser::getValueAsFloat(currentNode, camera.mHorFov);
+        } else if (currentName == "yfov" || currentName == "ymag") {
+            XmlParser::getValueAsFloat(currentNode, camera.mVerFov);
+        } else if (currentName == "aspect_ratio") {
+            XmlParser::getValueAsFloat(currentNode, camera.mAspect);
+        } else if (currentName == "znear") {
+            XmlParser::getValueAsFloat(currentNode, camera.mZNear);
+        } else if (currentName == "zfar") {
+            XmlParser::getValueAsFloat(currentNode, camera.mZFar);
         }
     }
 }
 
 // ------------------------------------------------------------------------------------------------
 // Reads the effect library
-void ColladaParser::ReadEffectLibrary() {
-    if (mReader->isEmptyElement()) {
+void ColladaParser::ReadEffectLibrary(XmlNode &node) {
+    if (node.empty()) {
         return;
     }
 
-    while (mReader->read()) {
-        if (mReader->getNodeType() == irr::io::EXN_ELEMENT) {
-            if (IsElement("effect")) {
-                // read ID. Do I have to repeat my ranting about "optional" attributes?
-                int attrID = GetAttribute("id");
-                std::string id = mReader->getAttributeValue(attrID);
+    for (XmlNode &currentNode : node.children()) {
+        const std::string &currentName = currentNode.name();
+        if (currentName == "effect") {
+            // read ID. Do I have to repeat my ranting about "optional" attributes?
+            std::string id;
+            XmlParser::getStdStrAttribute(currentNode, "id", id);
 
-                // create an entry and store it in the library under its ID
-                mEffectLibrary[id] = Effect();
-                // read on from there
-                ReadEffect(mEffectLibrary[id]);
-            } else {
-                // ignore the rest
-                SkipElement();
-            }
-        } else if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END) {
-            if (strcmp(mReader->getNodeName(), "library_effects") != 0)
-                ThrowException("Expected end of <library_effects> element.");
+            // create an entry and store it in the library under its ID
+            mEffectLibrary[id] = Effect();
 
-            break;
+            // read on from there
+            ReadEffect(currentNode, mEffectLibrary[id]);
         }
     }
 }
 
 // ------------------------------------------------------------------------------------------------
 // Reads an effect entry into the given effect
-void ColladaParser::ReadEffect(Collada::Effect &pEffect) {
-    // for the moment we don't support any other type of effect.
-    while (mReader->read()) {
-        if (mReader->getNodeType() == irr::io::EXN_ELEMENT) {
-            if (IsElement("profile_COMMON"))
-                ReadEffectProfileCommon(pEffect);
-            else
-                SkipElement();
-        } else if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END) {
-            if (strcmp(mReader->getNodeName(), "effect") != 0)
-                ThrowException("Expected end of <effect> element.");
-
-            break;
+void ColladaParser::ReadEffect(XmlNode &node, Collada::Effect &pEffect) {
+    for (XmlNode &currentNode : node.children()) {
+        const std::string &currentName = currentNode.name();
+        if (currentName == "profile_COMMON") {
+            ReadEffectProfileCommon(currentNode, pEffect);
         }
     }
 }
 
 // ------------------------------------------------------------------------------------------------
 // Reads an COMMON effect profile
-void ColladaParser::ReadEffectProfileCommon(Collada::Effect &pEffect) {
-    while (mReader->read()) {
-        if (mReader->getNodeType() == irr::io::EXN_ELEMENT) {
-            if (IsElement("newparam")) {
-                // save ID
-                int attrSID = GetAttribute("sid");
-                std::string sid = mReader->getAttributeValue(attrSID);
-                pEffect.mParams[sid] = EffectParam();
-                ReadEffectParam(pEffect.mParams[sid]);
-            } else if (IsElement("technique") || IsElement("extra")) {
-                // just syntactic sugar
+void ColladaParser::ReadEffectProfileCommon(XmlNode &node, Collada::Effect &pEffect) {
+    XmlNodeIterator xmlIt(node);
+    xmlIt.collectChildrenPreOrder(node);
+    XmlNode currentNode;
+    while (xmlIt.getNext(currentNode)) {
+        const std::string &currentName = currentNode.name();
+        if (currentName == "newparam") {
+            // save ID
+            std::string sid = currentNode.attribute("sid").as_string();
+            pEffect.mParams[sid] = EffectParam();
+            ReadEffectParam(currentNode, pEffect.mParams[sid]);
+        } else if (currentName == "technique" || currentName == "extra") {
+            // just syntactic sugar
+        } else if (mFormat == FV_1_4_n && currentName == "image") {
+            // read ID. Another entry which is "optional" by design but obligatory in reality
+            std::string id = currentNode.attribute("id").as_string();
+
+            // create an entry and store it in the library under its ID
+            mImageLibrary[id] = Image();
+
+            // read on from there
+            ReadImage(currentNode, mImageLibrary[id]);
+        } else if (currentName == "phong")
+            pEffect.mShadeType = Shade_Phong;
+        else if (currentName == "constant")
+            pEffect.mShadeType = Shade_Constant;
+        else if (currentName == "lambert")
+            pEffect.mShadeType = Shade_Lambert;
+        else if (currentName == "blinn")
+            pEffect.mShadeType = Shade_Blinn;
+
+        /* Color + texture properties */
+        else if (currentName == "emission")
+            ReadEffectColor(currentNode, pEffect.mEmissive, pEffect.mTexEmissive);
+        else if (currentName == "ambient")
+            ReadEffectColor(currentNode, pEffect.mAmbient, pEffect.mTexAmbient);
+        else if (currentName == "diffuse")
+            ReadEffectColor(currentNode, pEffect.mDiffuse, pEffect.mTexDiffuse);
+        else if (currentName == "specular")
+            ReadEffectColor(currentNode, pEffect.mSpecular, pEffect.mTexSpecular);
+        else if (currentName == "reflective") {
+            ReadEffectColor(currentNode, pEffect.mReflective, pEffect.mTexReflective);
+        } else if (currentName == "transparent") {
+            pEffect.mHasTransparency = true;
+            const char *opaque = currentNode.attribute("opaque").as_string();
+            //const char *opaque = mReader->getAttributeValueSafe("opaque");
+
+            if (::strcmp(opaque, "RGB_ZERO") == 0 || ::strcmp(opaque, "RGB_ONE") == 0) {
+                pEffect.mRGBTransparency = true;
             }
 
-            else if (mFormat == FV_1_4_n && IsElement("image")) {
-                // read ID. Another entry which is "optional" by design but obligatory in reality
-                int attrID = GetAttribute("id");
-                std::string id = mReader->getAttributeValue(attrID);
-
-                // create an entry and store it in the library under its ID
-                mImageLibrary[id] = Image();
-
-                // read on from there
-                ReadImage(mImageLibrary[id]);
+            // In RGB_ZERO mode, the transparency is interpreted in reverse, go figure...
+            if (::strcmp(opaque, "RGB_ZERO") == 0 || ::strcmp(opaque, "A_ZERO") == 0) {
+                pEffect.mInvertTransparency = true;
             }
 
-            /* Shading modes */
-            else if (IsElement("phong"))
-                pEffect.mShadeType = Shade_Phong;
-            else if (IsElement("constant"))
-                pEffect.mShadeType = Shade_Constant;
-            else if (IsElement("lambert"))
-                pEffect.mShadeType = Shade_Lambert;
-            else if (IsElement("blinn"))
-                pEffect.mShadeType = Shade_Blinn;
+            ReadEffectColor(currentNode, pEffect.mTransparent, pEffect.mTexTransparent);
+        } else if (currentName == "shininess")
+            ReadEffectFloat(currentNode, pEffect.mShininess);
+        else if (currentName == "reflectivity")
+            ReadEffectFloat(currentNode, pEffect.mReflectivity);
 
-            /* Color + texture properties */
-            else if (IsElement("emission"))
-                ReadEffectColor(pEffect.mEmissive, pEffect.mTexEmissive);
-            else if (IsElement("ambient"))
-                ReadEffectColor(pEffect.mAmbient, pEffect.mTexAmbient);
-            else if (IsElement("diffuse"))
-                ReadEffectColor(pEffect.mDiffuse, pEffect.mTexDiffuse);
-            else if (IsElement("specular"))
-                ReadEffectColor(pEffect.mSpecular, pEffect.mTexSpecular);
-            else if (IsElement("reflective")) {
-                ReadEffectColor(pEffect.mReflective, pEffect.mTexReflective);
-            } else if (IsElement("transparent")) {
-                pEffect.mHasTransparency = true;
+        /* Single scalar properties */
+        else if (currentName == "transparency")
+            ReadEffectFloat(currentNode, pEffect.mTransparency);
+        else if (currentName == "index_of_refraction")
+            ReadEffectFloat(currentNode, pEffect.mRefractIndex);
 
-                const char *opaque = mReader->getAttributeValueSafe("opaque");
+        // GOOGLEEARTH/OKINO extensions
+        // -------------------------------------------------------
+        else if (currentName == "double_sided")
+            XmlParser::getBoolAttribute(currentNode, currentName.c_str(), pEffect.mDoubleSided);
 
-                if (::strcmp(opaque, "RGB_ZERO") == 0 || ::strcmp(opaque, "RGB_ONE") == 0) {
-                    pEffect.mRGBTransparency = true;
-                }
+        // FCOLLADA extensions
+        // -------------------------------------------------------
+        else if (currentName == "bump") {
+            aiColor4D dummy;
+            ReadEffectColor(currentNode, dummy, pEffect.mTexBump);
+        }
 
-                // In RGB_ZERO mode, the transparency is interpreted in reverse, go figure...
-                if (::strcmp(opaque, "RGB_ZERO") == 0 || ::strcmp(opaque, "A_ZERO") == 0) {
-                    pEffect.mInvertTransparency = true;
-                }
-
-                ReadEffectColor(pEffect.mTransparent, pEffect.mTexTransparent);
-            } else if (IsElement("shininess"))
-                ReadEffectFloat(pEffect.mShininess);
-            else if (IsElement("reflectivity"))
-                ReadEffectFloat(pEffect.mReflectivity);
-
-            /* Single scalar properties */
-            else if (IsElement("transparency"))
-                ReadEffectFloat(pEffect.mTransparency);
-            else if (IsElement("index_of_refraction"))
-                ReadEffectFloat(pEffect.mRefractIndex);
-
-            // GOOGLEEARTH/OKINO extensions
-            // -------------------------------------------------------
-            else if (IsElement("double_sided"))
-                pEffect.mDoubleSided = ReadBoolFromTextContent();
-
-            // FCOLLADA extensions
-            // -------------------------------------------------------
-            else if (IsElement("bump")) {
-                aiColor4D dummy;
-                ReadEffectColor(dummy, pEffect.mTexBump);
-            }
-
-            // MAX3D extensions
-            // -------------------------------------------------------
-            else if (IsElement("wireframe")) {
-                pEffect.mWireframe = ReadBoolFromTextContent();
-                TestClosing("wireframe");
-            } else if (IsElement("faceted")) {
-                pEffect.mFaceted = ReadBoolFromTextContent();
-                TestClosing("faceted");
-            } else {
-                // ignore the rest
-                SkipElement();
-            }
-        } else if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END) {
-            if (strcmp(mReader->getNodeName(), "profile_COMMON") == 0) {
-                break;
-            }
+        // MAX3D extensions
+        // -------------------------------------------------------
+        else if (currentName == "wireframe") {
+            XmlParser::getBoolAttribute(currentNode, currentName.c_str(), pEffect.mWireframe);
+        } else if (currentName == "faceted") {
+            XmlParser::getBoolAttribute(currentNode, currentName.c_str(), pEffect.mFaceted);
         }
     }
 }
 
 // ------------------------------------------------------------------------------------------------
 // Read texture wrapping + UV transform settings from a profile==Maya chunk
-void ColladaParser::ReadSamplerProperties(Sampler &out) {
-    if (mReader->isEmptyElement()) {
+void ColladaParser::ReadSamplerProperties(XmlNode &node, Sampler &out) {
+    if (node.empty()) {
         return;
     }
+    XmlNodeIterator xmlIt(node);
+    xmlIt.collectChildrenPreOrder(node);
+    XmlNode currentNode;
 
-    while (mReader->read()) {
-        if (mReader->getNodeType() == irr::io::EXN_ELEMENT) {
-
-            // MAYA extensions
-            // -------------------------------------------------------
-            if (IsElement("wrapU")) {
-                out.mWrapU = ReadBoolFromTextContent();
-                TestClosing("wrapU");
-            } else if (IsElement("wrapV")) {
-                out.mWrapV = ReadBoolFromTextContent();
-                TestClosing("wrapV");
-            } else if (IsElement("mirrorU")) {
-                out.mMirrorU = ReadBoolFromTextContent();
-                TestClosing("mirrorU");
-            } else if (IsElement("mirrorV")) {
-                out.mMirrorV = ReadBoolFromTextContent();
-                TestClosing("mirrorV");
-            } else if (IsElement("repeatU")) {
-                out.mTransform.mScaling.x = ReadFloatFromTextContent();
-                TestClosing("repeatU");
-            } else if (IsElement("repeatV")) {
-                out.mTransform.mScaling.y = ReadFloatFromTextContent();
-                TestClosing("repeatV");
-            } else if (IsElement("offsetU")) {
-                out.mTransform.mTranslation.x = ReadFloatFromTextContent();
-                TestClosing("offsetU");
-            } else if (IsElement("offsetV")) {
-                out.mTransform.mTranslation.y = ReadFloatFromTextContent();
-                TestClosing("offsetV");
-            } else if (IsElement("rotateUV")) {
-                out.mTransform.mRotation = ReadFloatFromTextContent();
-                TestClosing("rotateUV");
-            } else if (IsElement("blend_mode")) {
-
-                const char *sz = GetTextContent();
-                // http://www.feelingsoftware.com/content/view/55/72/lang,en/
-                // NONE, OVER, IN, OUT, ADD, SUBTRACT, MULTIPLY, DIFFERENCE, LIGHTEN, DARKEN, SATURATE, DESATURATE and ILLUMINATE
-                if (0 == ASSIMP_strincmp(sz, "ADD", 3))
-                    out.mOp = aiTextureOp_Add;
-
-                else if (0 == ASSIMP_strincmp(sz, "SUBTRACT", 8))
-                    out.mOp = aiTextureOp_Subtract;
-
-                else if (0 == ASSIMP_strincmp(sz, "MULTIPLY", 8))
-                    out.mOp = aiTextureOp_Multiply;
-
-                else {
-                    ASSIMP_LOG_WARN("Collada: Unsupported MAYA texture blend mode");
-                }
-                TestClosing("blend_mode");
+    while (xmlIt.getNext(currentNode)) {
+        const std::string &currentName = currentNode.name();
+        // MAYA extensions
+        // -------------------------------------------------------
+        if (currentName == "wrapU") {
+            XmlParser::getBoolAttribute(currentNode, currentName.c_str(), out.mWrapU);
+        } else if (currentName == "wrapV") {
+            XmlParser::getBoolAttribute(currentNode, currentName.c_str(), out.mWrapV);
+        } else if (currentName == "mirrorU") {
+            XmlParser::getBoolAttribute(currentNode, currentName.c_str(), out.mMirrorU);
+        } else if (currentName == "mirrorV") {
+            XmlParser::getBoolAttribute(currentNode, currentName.c_str(), out.mMirrorV);
+        } else if (currentName == "repeatU") {
+            XmlParser::getFloatAttribute(currentNode, currentName.c_str(), out.mTransform.mScaling.x);
+        } else if (currentName == "repeatV") {
+            XmlParser::getFloatAttribute(currentNode, currentName.c_str(), out.mTransform.mScaling.y);
+        } else if (currentName == "offsetU") {
+            XmlParser::getFloatAttribute(currentNode, currentName.c_str(), out.mTransform.mTranslation.x);
+        } else if (currentName == "offsetV") {
+            XmlParser::getFloatAttribute(currentNode, currentName.c_str(), out.mTransform.mTranslation.y);
+        } else if (currentName == "rotateUV") {
+            XmlParser::getFloatAttribute(currentNode, currentName.c_str(), out.mTransform.mRotation);
+        } else if (currentName == "blend_mode") {
+            std::string v;
+            XmlParser::getValueAsString(currentNode, v);
+            const char *sz = v.c_str();
+            // http://www.feelingsoftware.com/content/view/55/72/lang,en/
+            // NONE, OVER, IN, OUT, ADD, SUBTRACT, MULTIPLY, DIFFERENCE, LIGHTEN, DARKEN, SATURATE, DESATURATE and ILLUMINATE
+            if (0 == ASSIMP_strincmp(sz, "ADD", 3))
+                out.mOp = aiTextureOp_Add;
+            else if (0 == ASSIMP_strincmp(sz, "SUBTRACT", 8))
+                out.mOp = aiTextureOp_Subtract;
+            else if (0 == ASSIMP_strincmp(sz, "MULTIPLY", 8))
+                out.mOp = aiTextureOp_Multiply;
+            else {
+                ASSIMP_LOG_WARN("Collada: Unsupported MAYA texture blend mode");
             }
-            // OKINO extensions
-            // -------------------------------------------------------
-            else if (IsElement("weighting")) {
-                out.mWeighting = ReadFloatFromTextContent();
-                TestClosing("weighting");
-            } else if (IsElement("mix_with_previous_layer")) {
-                out.mMixWithPrevious = ReadFloatFromTextContent();
-                TestClosing("mix_with_previous_layer");
-            }
-            // MAX3D extensions
-            // -------------------------------------------------------
-            else if (IsElement("amount")) {
-                out.mWeighting = ReadFloatFromTextContent();
-                TestClosing("amount");
-            }
-        } else if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END) {
-            if (strcmp(mReader->getNodeName(), "technique") == 0)
-                break;
+        }
+        // OKINO extensions
+        // -------------------------------------------------------
+        else if (currentName == "weighting") {
+            XmlParser::getFloatAttribute(currentNode, currentName.c_str(), out.mWeighting);
+        } else if (currentName == "mix_with_previous_layer") {
+            XmlParser::getFloatAttribute(currentNode, currentName.c_str(), out.mMixWithPrevious);
+        }
+        // MAX3D extensions
+        // -------------------------------------------------------
+        else if (currentName == "amount") {
+            XmlParser::getFloatAttribute(currentNode, currentName.c_str(), out.mWeighting);
         }
     }
 }
 
 // ------------------------------------------------------------------------------------------------
 // Reads an effect entry containing a color or a texture defining that color
-void ColladaParser::ReadEffectColor(aiColor4D &pColor, Sampler &pSampler) {
-    if (mReader->isEmptyElement())
+void ColladaParser::ReadEffectColor(XmlNode &node, aiColor4D &pColor, Sampler &pSampler) {
+    if (node.empty()) {
         return;
+    }
+    XmlNodeIterator xmlIt(node);
+    xmlIt.collectChildrenPreOrder(node);
+    XmlNode currentNode;
 
-    // Save current element name
-    const std::string curElem = mReader->getNodeName();
+    while (xmlIt.getNext(currentNode)) {
+        const std::string &currentName = currentNode.name();
+        if (currentName == "color") {
+            // text content contains 4 floats
+            std::string v;
+            XmlParser::getValueAsString(currentNode, v);
+            const char *content = v.c_str();
 
-    while (mReader->read()) {
-        if (mReader->getNodeType() == irr::io::EXN_ELEMENT) {
-            if (IsElement("color")) {
-                // text content contains 4 floats
-                const char *content = GetTextContent();
+            content = fast_atoreal_move<ai_real>(content, (ai_real &)pColor.r);
+            SkipSpacesAndLineEnd(&content);
 
-                content = fast_atoreal_move<ai_real>(content, (ai_real &)pColor.r);
-                SkipSpacesAndLineEnd(&content);
+            content = fast_atoreal_move<ai_real>(content, (ai_real &)pColor.g);
+            SkipSpacesAndLineEnd(&content);
 
-                content = fast_atoreal_move<ai_real>(content, (ai_real &)pColor.g);
-                SkipSpacesAndLineEnd(&content);
+            content = fast_atoreal_move<ai_real>(content, (ai_real &)pColor.b);
+            SkipSpacesAndLineEnd(&content);
 
-                content = fast_atoreal_move<ai_real>(content, (ai_real &)pColor.b);
-                SkipSpacesAndLineEnd(&content);
+            content = fast_atoreal_move<ai_real>(content, (ai_real &)pColor.a);
+            SkipSpacesAndLineEnd(&content);
+        } else if (currentName == "texture") {
+            // get name of source texture/sampler
+            XmlParser::getStdStrAttribute(currentNode, "texture", pSampler.mName);
 
-                content = fast_atoreal_move<ai_real>(content, (ai_real &)pColor.a);
-                SkipSpacesAndLineEnd(&content);
-                TestClosing("color");
-            } else if (IsElement("texture")) {
-                // get name of source texture/sampler
-                int attrTex = GetAttribute("texture");
-                pSampler.mName = mReader->getAttributeValue(attrTex);
+            // get name of UV source channel. Specification demands it to be there, but some exporters
+            // don't write it. It will be the default UV channel in case it's missing.
+            XmlParser::getStdStrAttribute(currentNode, "texcoord", pSampler.mUVChannel);
 
-                // get name of UV source channel. Specification demands it to be there, but some exporters
-                // don't write it. It will be the default UV channel in case it's missing.
-                attrTex = TestAttribute("texcoord");
-                if (attrTex >= 0)
-                    pSampler.mUVChannel = mReader->getAttributeValue(attrTex);
-                //SkipElement();
+            // as we've read texture, the color needs to be 1,1,1,1
+            pColor = aiColor4D(1.f, 1.f, 1.f, 1.f);
+        } else if (currentName == "technique") {
+            std::string profile;
+            XmlParser::getStdStrAttribute(currentNode, "profile", profile);
 
-                // as we've read texture, the color needs to be 1,1,1,1
-                pColor = aiColor4D(1.f, 1.f, 1.f, 1.f);
-            } else if (IsElement("technique")) {
-                const int _profile = GetAttribute("profile");
-                const char *profile = mReader->getAttributeValue(_profile);
-
-                // Some extensions are quite useful ... ReadSamplerProperties processes
-                // several extensions in MAYA, OKINO and MAX3D profiles.
-                if (!::strcmp(profile, "MAYA") || !::strcmp(profile, "MAX3D") || !::strcmp(profile, "OKINO")) {
-                    // get more information on this sampler
-                    ReadSamplerProperties(pSampler);
-                } else
-                    SkipElement();
-            } else if (!IsElement("extra")) {
-                // ignore the rest
-                SkipElement();
+            // Some extensions are quite useful ... ReadSamplerProperties processes
+            // several extensions in MAYA, OKINO and MAX3D profiles.
+            if (!::strcmp(profile.c_str(), "MAYA") || !::strcmp(profile.c_str(), "MAX3D") || !::strcmp(profile.c_str(), "OKINO")) {
+                // get more information on this sampler
+                ReadSamplerProperties(currentNode, pSampler);
             }
-        } else if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END) {
-            if (mReader->getNodeName() == curElem)
-                break;
         }
     }
 }
 
 // ------------------------------------------------------------------------------------------------
 // Reads an effect entry containing a float
-void ColladaParser::ReadEffectFloat(ai_real &pFloat) {
-    while (mReader->read()) {
-        if (mReader->getNodeType() == irr::io::EXN_ELEMENT) {
-            if (IsElement("float")) {
-                // text content contains a single floats
-                const char *content = GetTextContent();
-                content = fast_atoreal_move<ai_real>(content, pFloat);
-                SkipSpacesAndLineEnd(&content);
-
-                TestClosing("float");
-            } else {
-                // ignore the rest
-                SkipElement();
-            }
-        } else if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END) {
-            break;
-        }
+void ColladaParser::ReadEffectFloat(XmlNode &node, ai_real &pFloat) {
+    pFloat = 0.f;
+    XmlNode floatNode = node.child("float");
+    if (floatNode.empty()) {
+        return;
     }
+    XmlParser::getValueAsFloat(floatNode, pFloat);
 }
 
 // ------------------------------------------------------------------------------------------------
 // Reads an effect parameter specification of any kind
-void ColladaParser::ReadEffectParam(Collada::EffectParam &pParam) {
-    while (mReader->read()) {
-        if (mReader->getNodeType() == irr::io::EXN_ELEMENT) {
-            if (IsElement("surface")) {
-                // image ID given inside <init_from> tags
-                TestOpening("init_from");
-                const char *content = GetTextContent();
+void ColladaParser::ReadEffectParam(XmlNode &node, Collada::EffectParam &pParam) {
+    if (node.empty()) {
+        return;
+    }
+
+    XmlNodeIterator xmlIt(node);
+    xmlIt.collectChildrenPreOrder(node);
+    XmlNode currentNode;
+    while (xmlIt.getNext(currentNode)) {
+        const std::string &currentName = currentNode.name();
+        if (currentName == "surface") {
+            // image ID given inside <init_from> tags
+            XmlNode initNode = currentNode.child("init_from");
+            if (initNode) {
+                std::string v;
+                XmlParser::getValueAsString(initNode, v);
                 pParam.mType = Param_Surface;
-                pParam.mReference = content;
-                TestClosing("init_from");
-
-                // don't care for remaining stuff
-                SkipElement("surface");
-            } else if (IsElement("sampler2D") && (FV_1_4_n == mFormat || FV_1_3_n == mFormat)) {
-                // surface ID is given inside <source> tags
-                TestOpening("source");
-                const char *content = GetTextContent();
-                pParam.mType = Param_Sampler;
-                pParam.mReference = content;
-                TestClosing("source");
-
-                // don't care for remaining stuff
-                SkipElement("sampler2D");
-            } else if (IsElement("sampler2D")) {
-                // surface ID is given inside <instance_image> tags
-                TestOpening("instance_image");
-                int attrURL = GetAttribute("url");
-                const char *url = mReader->getAttributeValue(attrURL);
-                if (url[0] != '#')
-                    ThrowException("Unsupported URL format in instance_image");
-                url++;
-                pParam.mType = Param_Sampler;
-                pParam.mReference = url;
-                SkipElement("sampler2D");
-            } else {
-                // ignore unknown element
-                SkipElement();
+                pParam.mReference = v.c_str();
+            }
+        } else if (currentName == "sampler2D" && (FV_1_4_n == mFormat || FV_1_3_n == mFormat)) {
+            // surface ID is given inside <source> tags
+            const char *content = currentNode.value();
+            pParam.mType = Param_Sampler;
+            pParam.mReference = content;
+        } else if (currentName == "sampler2D") {
+            // surface ID is given inside <instance_image> tags
+            std::string url;
+            XmlParser::getStdStrAttribute(currentNode, "url", url);
+            if (url[0] != '#') {
+                throw DeadlyImportError("Unsupported URL format in instance_image");
+            }
+            pParam.mType = Param_Sampler;
+            pParam.mReference = url.c_str() + 1;
+        } else if (currentName == "source") {
+            const char *source = currentNode.child_value();
+            if (nullptr != source) {
+                pParam.mReference = source;
             }
-        } else if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END) {
-            break;
         }
     }
 }
 
 // ------------------------------------------------------------------------------------------------
 // Reads the geometry library contents
-void ColladaParser::ReadGeometryLibrary() {
-    if (mReader->isEmptyElement())
+void ColladaParser::ReadGeometryLibrary(XmlNode &node) {
+    if (node.empty()) {
         return;
+    }
+    for (XmlNode &currentNode : node.children()) {
+        const std::string &currentName = currentNode.name();
+        if (currentName == "geometry") {
+            // read ID. Another entry which is "optional" by design but obligatory in reality
 
-    while (mReader->read()) {
-        if (mReader->getNodeType() == irr::io::EXN_ELEMENT) {
-            if (IsElement("geometry")) {
-                // read ID. Another entry which is "optional" by design but obligatory in reality
-                int indexID = GetAttribute("id");
-                std::string id = mReader->getAttributeValue(indexID);
+            std::string id;
+            XmlParser::getStdStrAttribute(currentNode, "id", id);
+            // create a mesh and store it in the library under its (resolved) ID
+            // Skip and warn if ID is not unique
+            if (mMeshLibrary.find(id) == mMeshLibrary.cend()) {
+                std::unique_ptr<Mesh> mesh(new Mesh(id));
 
-                // create a mesh and store it in the library under its (resolved) ID
-                // Skip and warn if ID is not unique
-                if (mMeshLibrary.find(id) == mMeshLibrary.cend()) {
-                    std::unique_ptr<Mesh> mesh(new Mesh(id));
+                XmlParser::getStdStrAttribute(currentNode, "name", mesh->mName);
 
-                    // read the mesh name if it exists
-                    const int nameIndex = TestAttribute("name");
-                    if (nameIndex != -1) {
-                        mesh->mName = mReader->getAttributeValue(nameIndex);
-                    }
-
-                    // read on from there
-                    ReadGeometry(*mesh);
-                    // Read successfully, add to library
-                    mMeshLibrary.insert({ id, mesh.release() });
-                } else {
-                    ASSIMP_LOG_ERROR_F("Collada: Skipped duplicate geometry id: \"", id, "\"");
-                    SkipElement();
-                }
-            } else {
-                // ignore the rest
-                SkipElement();
+                // read on from there
+                ReadGeometry(currentNode, *mesh);
+                // Read successfully, add to library
+                mMeshLibrary.insert({ id, mesh.release() });
             }
-        } else if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END) {
-            if (strcmp(mReader->getNodeName(), "library_geometries") != 0)
-                ThrowException("Expected end of <library_geometries> element.");
-
-            break;
         }
     }
 }
 
 // ------------------------------------------------------------------------------------------------
 // Reads a geometry from the geometry library.
-void ColladaParser::ReadGeometry(Collada::Mesh &pMesh) {
-    if (mReader->isEmptyElement())
+void ColladaParser::ReadGeometry(XmlNode &node, Collada::Mesh &pMesh) {
+    if (node.empty()) {
         return;
-
-    while (mReader->read()) {
-        if (mReader->getNodeType() == irr::io::EXN_ELEMENT) {
-            if (IsElement("mesh")) {
-                // read on from there
-                ReadMesh(pMesh);
-            } else {
-                // ignore the rest
-                SkipElement();
-            }
-        } else if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END) {
-            if (strcmp(mReader->getNodeName(), "geometry") != 0)
-                ThrowException("Expected end of <geometry> element.");
-
-            break;
+    }
+    for (XmlNode &currentNode : node.children()) {
+        const std::string &currentName = currentNode.name();
+        if (currentName == "mesh") {
+            ReadMesh(currentNode, pMesh);
         }
     }
 }
 
 // ------------------------------------------------------------------------------------------------
 // Reads a mesh from the geometry library
-void ColladaParser::ReadMesh(Mesh &pMesh) {
-    if (mReader->isEmptyElement())
+void ColladaParser::ReadMesh(XmlNode &node, Mesh &pMesh) {
+    if (node.empty()) {
         return;
+    }
 
-    while (mReader->read()) {
-        if (mReader->getNodeType() == irr::io::EXN_ELEMENT) {
-            if (IsElement("source")) {
-                // we have professionals dealing with this
-                ReadSource();
-            } else if (IsElement("vertices")) {
-                // read per-vertex mesh data
-                ReadVertexData(pMesh);
-            } else if (IsElement("triangles") || IsElement("lines") || IsElement("linestrips") || IsElement("polygons") || IsElement("polylist") || IsElement("trifans") || IsElement("tristrips")) {
-                // read per-index mesh data and faces setup
-                ReadIndexData(pMesh);
-            } else {
-                // ignore the restf
-                SkipElement();
-            }
-        } else if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END) {
-            if (strcmp(mReader->getNodeName(), "technique_common") == 0) {
-                // end of another meaningless element - read over it
-            } else if (strcmp(mReader->getNodeName(), "mesh") == 0) {
-                // end of <mesh> element - we're done here
-                break;
-            } else {
-                // everything else should be punished
-                ThrowException("Expected end of <mesh> element.");
-            }
+    XmlNodeIterator xmlIt(node);
+    xmlIt.collectChildrenPreOrder(node);
+    XmlNode currentNode;
+    while (xmlIt.getNext(currentNode)) {
+        const std::string &currentName = currentNode.name();
+        if (currentName == "source") {
+            ReadSource(currentNode);
+        } else if (currentName == "vertices") {
+            ReadVertexData(currentNode, pMesh);
+        } else if (currentName == "triangles" || currentName == "lines" || currentName == "linestrips" ||
+                currentName == "polygons" || currentName == "polylist" || currentName == "trifans" ||
+                currentName == "tristrips") {
+            ReadIndexData(currentNode, pMesh);
         }
     }
 }
 
 // ------------------------------------------------------------------------------------------------
 // Reads a source element
-void ColladaParser::ReadSource() {
-    int indexID = GetAttribute("id");
-    std::string sourceID = mReader->getAttributeValue(indexID);
+void ColladaParser::ReadSource(XmlNode &node) {
+    if (node.empty()) {
+        return;
+    }
 
-    while (mReader->read()) {
-        if (mReader->getNodeType() == irr::io::EXN_ELEMENT) {
-            if (IsElement("float_array") || IsElement("IDREF_array") || IsElement("Name_array")) {
-                ReadDataArray();
-            } else if (IsElement("technique_common")) {
-                // I don't care for your profiles
-            } else if (IsElement("accessor")) {
-                ReadAccessor(sourceID);
-            } else {
-                // ignore the rest
-                SkipElement();
-            }
-        } else if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END) {
-            if (strcmp(mReader->getNodeName(), "source") == 0) {
-                // end of <source> - we're done
-                break;
-            } else if (strcmp(mReader->getNodeName(), "technique_common") == 0) {
-                // end of another meaningless element - read over it
-            } else {
-                // everything else should be punished
-                ThrowException("Expected end of <source> element.");
+    std::string sourceID;
+    XmlParser::getStdStrAttribute(node, "id", sourceID);
+    XmlNodeIterator xmlIt(node);
+    xmlIt.collectChildrenPreOrder(node);
+    XmlNode currentNode;
+    while (xmlIt.getNext(currentNode)) {
+        const std::string &currentName = currentNode.name();
+        if (currentName == "float_array" || currentName == "IDREF_array" || currentName == "Name_array") {
+            ReadDataArray(currentNode);
+        } else if (currentName == "technique_common") {
+            XmlNode technique = currentNode.child("accessor");
+            if (!technique.empty()) {
+                ReadAccessor(technique, sourceID);
             }
         }
     }
@@ -1838,17 +1408,19 @@ void ColladaParser::ReadSource() {
 
 // ------------------------------------------------------------------------------------------------
 // Reads a data array holding a number of floats, and stores it in the global library
-void ColladaParser::ReadDataArray() {
-    std::string elmName = mReader->getNodeName();
-    bool isStringArray = (elmName == "IDREF_array" || elmName == "Name_array");
-    bool isEmptyElement = mReader->isEmptyElement();
+void ColladaParser::ReadDataArray(XmlNode &node) {
+    std::string name = node.name();
+    bool isStringArray = (name == "IDREF_array" || name == "Name_array");
 
     // read attributes
-    int indexID = GetAttribute("id");
-    std::string id = mReader->getAttributeValue(indexID);
-    int indexCount = GetAttribute("count");
-    unsigned int count = (unsigned int)mReader->getAttributeValueAsInt(indexCount);
-    const char *content = TestTextContent();
+    std::string id;
+    XmlParser::getStdStrAttribute(node, "id", id);
+    unsigned int count = 0;
+    XmlParser::getUIntAttribute(node, "count", count);
+    std::string v;
+    XmlParser::getValueAsString(node, v);
+    trim(v);
+    const char *content = v.c_str();
 
     // read values and store inside an array in the data library
     mDataLibrary[id] = Data();
@@ -1862,8 +1434,9 @@ void ColladaParser::ReadDataArray() {
             std::string s;
 
             for (unsigned int a = 0; a < count; a++) {
-                if (*content == 0)
-                    ThrowException("Expected more values while reading IDREF_array contents.");
+                if (*content == 0) {
+                    throw DeadlyImportError("Expected more values while reading IDREF_array contents.");
+                }
 
                 s.clear();
                 while (!IsSpaceOrNewLine(*content))
@@ -1876,11 +1449,13 @@ void ColladaParser::ReadDataArray() {
             data.mValues.reserve(count);
 
             for (unsigned int a = 0; a < count; a++) {
-                if (*content == 0)
-                    ThrowException("Expected more values while reading float_array contents.");
+                if (*content == 0) {
+                    throw DeadlyImportError("Expected more values while reading float_array contents.");
+                }
 
                 ai_real value;
                 // read a number
+                //SkipSpacesAndLineEnd(&content);
                 content = fast_atoreal_move<ai_real>(content, value);
                 data.mValues.push_back(value);
                 // skip whitespace after it
@@ -1888,221 +1463,193 @@ void ColladaParser::ReadDataArray() {
             }
         }
     }
-
-    // test for closing tag
-    if (!isEmptyElement)
-        TestClosing(elmName.c_str());
 }
 
 // ------------------------------------------------------------------------------------------------
 // Reads an accessor and stores it in the global library
-void ColladaParser::ReadAccessor(const std::string &pID) {
+void ColladaParser::ReadAccessor(XmlNode &node, const std::string &pID) {
     // read accessor attributes
-    int attrSource = GetAttribute("source");
-    const char *source = mReader->getAttributeValue(attrSource);
-    if (source[0] != '#')
-        ThrowException(format() << "Unknown reference format in url \"" << source << "\" in source attribute of <accessor> element.");
-    int attrCount = GetAttribute("count");
-    unsigned int count = (unsigned int)mReader->getAttributeValueAsInt(attrCount);
-    int attrOffset = TestAttribute("offset");
-    unsigned int offset = 0;
-    if (attrOffset > -1)
-        offset = (unsigned int)mReader->getAttributeValueAsInt(attrOffset);
-    int attrStride = TestAttribute("stride");
-    unsigned int stride = 1;
-    if (attrStride > -1)
-        stride = (unsigned int)mReader->getAttributeValueAsInt(attrStride);
+    std::string source;
+    XmlParser::getStdStrAttribute(node, "source", source);
+    if (source[0] != '#') {
+        throw DeadlyImportError("Unknown reference format in url \"", source, "\" in source attribute of <accessor> element.");
+    }
+    int count = 0;
+    XmlParser::getIntAttribute(node, "count", count);
 
+    unsigned int offset = 0;
+    if (XmlParser::hasAttribute(node, "offset")) {
+        XmlParser::getUIntAttribute(node, "offset", offset);
+    }
+    unsigned int stride = 1;
+    if (XmlParser::hasAttribute(node, "stride")) {
+        XmlParser::getUIntAttribute(node, "stride", stride);
+    }
     // store in the library under the given ID
     mAccessorLibrary[pID] = Accessor();
     Accessor &acc = mAccessorLibrary[pID];
     acc.mCount = count;
     acc.mOffset = offset;
     acc.mStride = stride;
-    acc.mSource = source + 1; // ignore the leading '#'
+    acc.mSource = source.c_str() + 1; // ignore the leading '#'
     acc.mSize = 0; // gets incremented with every param
 
-    // and read the components
-    while (mReader->read()) {
-        if (mReader->getNodeType() == irr::io::EXN_ELEMENT) {
-            if (IsElement("param")) {
-                // read data param
-                int attrName = TestAttribute("name");
-                std::string name;
-                if (attrName > -1) {
-                    name = mReader->getAttributeValue(attrName);
+    XmlNodeIterator xmlIt(node);
+    xmlIt.collectChildrenPreOrder(node);
+    XmlNode currentNode;
+    while (xmlIt.getNext(currentNode)) {
+        const std::string &currentName = currentNode.name();
+        if (currentName == "param") {
+            // read data param
+            std::string name;
+            if (XmlParser::hasAttribute(currentNode, "name")) {
+                XmlParser::getStdStrAttribute(currentNode, "name", name);
+                //name = mReader->getAttributeValue(attrName);
 
-                    // analyse for common type components and store it's sub-offset in the corresponding field
+                // analyse for common type components and store it's sub-offset in the corresponding field
 
-                    /* Cartesian coordinates */
-                    if (name == "X")
-                        acc.mSubOffset[0] = acc.mParams.size();
-                    else if (name == "Y")
-                        acc.mSubOffset[1] = acc.mParams.size();
-                    else if (name == "Z")
-                        acc.mSubOffset[2] = acc.mParams.size();
+                /* Cartesian coordinates */
+                if (name == "X")
+                    acc.mSubOffset[0] = acc.mParams.size();
+                else if (name == "Y")
+                    acc.mSubOffset[1] = acc.mParams.size();
+                else if (name == "Z")
+                    acc.mSubOffset[2] = acc.mParams.size();
 
-                    /* RGBA colors */
-                    else if (name == "R")
-                        acc.mSubOffset[0] = acc.mParams.size();
-                    else if (name == "G")
-                        acc.mSubOffset[1] = acc.mParams.size();
-                    else if (name == "B")
-                        acc.mSubOffset[2] = acc.mParams.size();
-                    else if (name == "A")
-                        acc.mSubOffset[3] = acc.mParams.size();
+                /* RGBA colors */
+                else if (name == "R")
+                    acc.mSubOffset[0] = acc.mParams.size();
+                else if (name == "G")
+                    acc.mSubOffset[1] = acc.mParams.size();
+                else if (name == "B")
+                    acc.mSubOffset[2] = acc.mParams.size();
+                else if (name == "A")
+                    acc.mSubOffset[3] = acc.mParams.size();
 
-                    /* UVWQ (STPQ) texture coordinates */
-                    else if (name == "S")
-                        acc.mSubOffset[0] = acc.mParams.size();
-                    else if (name == "T")
-                        acc.mSubOffset[1] = acc.mParams.size();
-                    else if (name == "P")
-                        acc.mSubOffset[2] = acc.mParams.size();
-                    //  else if( name == "Q") acc.mSubOffset[3] = acc.mParams.size();
-                    /* 4D uv coordinates are not supported in Assimp */
-
-                    /* Generic extra data, interpreted as UV data, too*/
-                    else if (name == "U")
-                        acc.mSubOffset[0] = acc.mParams.size();
-                    else if (name == "V")
-                        acc.mSubOffset[1] = acc.mParams.size();
-                    //else
-                    //  DefaultLogger::get()->warn( format() << "Unknown accessor parameter \"" << name << "\". Ignoring data channel." );
-                }
-
-                // read data type
-                int attrType = TestAttribute("type");
-                if (attrType > -1) {
-                    // for the moment we only distinguish between a 4x4 matrix and anything else.
-                    // TODO: (thom) I don't have a spec here at work. Check if there are other multi-value types
-                    // which should be tested for here.
-                    std::string type = mReader->getAttributeValue(attrType);
-                    if (type == "float4x4")
-                        acc.mSize += 16;
-                    else
-                        acc.mSize += 1;
-                }
-
-                acc.mParams.push_back(name);
-
-                // skip remaining stuff of this element, if any
-                SkipElement();
-            } else {
-                ThrowException(format() << "Unexpected sub element <" << mReader->getNodeName() << "> in tag <accessor>");
+                /* UVWQ (STPQ) texture coordinates */
+                else if (name == "S")
+                    acc.mSubOffset[0] = acc.mParams.size();
+                else if (name == "T")
+                    acc.mSubOffset[1] = acc.mParams.size();
+                else if (name == "P")
+                    acc.mSubOffset[2] = acc.mParams.size();
+                /* Generic extra data, interpreted as UV data, too*/
+                else if (name == "U")
+                    acc.mSubOffset[0] = acc.mParams.size();
+                else if (name == "V")
+                    acc.mSubOffset[1] = acc.mParams.size();
             }
-        } else if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END) {
-            if (strcmp(mReader->getNodeName(), "accessor") != 0)
-                ThrowException("Expected end of <accessor> element.");
-            break;
+            if (XmlParser::hasAttribute(currentNode, "type")) {
+                // read data type
+                // TODO: (thom) I don't have a spec here at work. Check if there are other multi-value types
+                // which should be tested for here.
+                std::string type;
+
+                XmlParser::getStdStrAttribute(currentNode, "type", type);
+                if (type == "float4x4")
+                    acc.mSize += 16;
+                else
+                    acc.mSize += 1;
+            }
+
+            acc.mParams.push_back(name);
         }
     }
 }
 
 // ------------------------------------------------------------------------------------------------
 // Reads input declarations of per-vertex mesh data into the given mesh
-void ColladaParser::ReadVertexData(Mesh &pMesh) {
+void ColladaParser::ReadVertexData(XmlNode &node, Mesh &pMesh) {
     // extract the ID of the <vertices> element. Not that we care, but to catch strange referencing schemes we should warn about
-    int attrID = GetAttribute("id");
-    pMesh.mVertexID = mReader->getAttributeValue(attrID);
-
-    // a number of <input> elements
-    while (mReader->read()) {
-        if (mReader->getNodeType() == irr::io::EXN_ELEMENT) {
-            if (IsElement("input")) {
-                ReadInputChannel(pMesh.mPerVertexData);
-            } else {
-                ThrowException(format() << "Unexpected sub element <" << mReader->getNodeName() << "> in tag <vertices>");
-            }
-        } else if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END) {
-            if (strcmp(mReader->getNodeName(), "vertices") != 0)
-                ThrowException("Expected end of <vertices> element.");
-
-            break;
+    XmlParser::getStdStrAttribute(node, "id", pMesh.mVertexID);
+    for (XmlNode &currentNode : node.children()) {
+        const std::string &currentName = currentNode.name();
+        if (currentName == "input") {
+            ReadInputChannel(currentNode, pMesh.mPerVertexData);
+        } else {
+            throw DeadlyImportError("Unexpected sub element <", currentName, "> in tag <vertices>");
         }
     }
 }
 
 // ------------------------------------------------------------------------------------------------
 // Reads input declarations of per-index mesh data into the given mesh
-void ColladaParser::ReadIndexData(Mesh &pMesh) {
+void ColladaParser::ReadIndexData(XmlNode &node, Mesh &pMesh) {
     std::vector<size_t> vcount;
     std::vector<InputChannel> perIndexData;
 
+    unsigned int numPrimitives = 0;
+    XmlParser::getUIntAttribute(node, "count", numPrimitives);
     // read primitive count from the attribute
-    int attrCount = GetAttribute("count");
-    size_t numPrimitives = (size_t)mReader->getAttributeValueAsInt(attrCount);
+    //int attrCount = GetAttribute("count");
+    //size_t numPrimitives = (size_t)mReader->getAttributeValueAsInt(attrCount);
     // some mesh types (e.g. tristrips) don't specify primitive count upfront,
     // so we need to sum up the actual number of primitives while we read the <p>-tags
     size_t actualPrimitives = 0;
-
-    // material subgroup
-    int attrMaterial = TestAttribute("material");
     SubMesh subgroup;
-    if (attrMaterial > -1)
-        subgroup.mMaterial = mReader->getAttributeValue(attrMaterial);
+    if (XmlParser::hasAttribute(node, "material")) {
+        XmlParser::getStdStrAttribute(node, "material", subgroup.mMaterial);
+    }
 
     // distinguish between polys and triangles
-    std::string elementName = mReader->getNodeName();
+    std::string elementName = node.name();
     PrimitiveType primType = Prim_Invalid;
-    if (IsElement("lines"))
+    if (elementName == "lines")
         primType = Prim_Lines;
-    else if (IsElement("linestrips"))
+    else if (elementName == "linestrips")
         primType = Prim_LineStrip;
-    else if (IsElement("polygons"))
+    else if (elementName == "polygons")
         primType = Prim_Polygon;
-    else if (IsElement("polylist"))
+    else if (elementName == "polylist")
         primType = Prim_Polylist;
-    else if (IsElement("triangles"))
+    else if (elementName == "triangles")
         primType = Prim_Triangles;
-    else if (IsElement("trifans"))
+    else if (elementName == "trifans")
         primType = Prim_TriFans;
-    else if (IsElement("tristrips"))
+    else if (elementName == "tristrips")
         primType = Prim_TriStrips;
 
     ai_assert(primType != Prim_Invalid);
 
     // also a number of <input> elements, but in addition a <p> primitive collection and probably index counts for all primitives
-    while (mReader->read()) {
-        if (mReader->getNodeType() == irr::io::EXN_ELEMENT) {
-            if (IsElement("input")) {
-                ReadInputChannel(perIndexData);
-            } else if (IsElement("vcount")) {
-                if (!mReader->isEmptyElement()) {
-                    if (numPrimitives) // It is possible to define a mesh without any primitives
-                    {
-                        // case <polylist> - specifies the number of indices for each polygon
-                        const char *content = GetTextContent();
-                        vcount.reserve(numPrimitives);
-                        for (unsigned int a = 0; a < numPrimitives; a++) {
-                            if (*content == 0)
-                                ThrowException("Expected more values while reading <vcount> contents.");
-                            // read a number
-                            vcount.push_back((size_t)strtoul10(content, &content));
-                            // skip whitespace after it
-                            SkipSpacesAndLineEnd(&content);
+    XmlNodeIterator xmlIt(node);
+    xmlIt.collectChildrenPreOrder(node);
+    XmlNode currentNode;
+    while (xmlIt.getNext(currentNode)) {
+        const std::string &currentName = currentNode.name();
+        if (currentName == "input") {
+            ReadInputChannel(currentNode, perIndexData);
+        } else if (currentName == "vcount") {
+            if (!currentNode.empty()) {
+                if (numPrimitives) // It is possible to define a mesh without any primitives
+                {
+                    // case <polylist> - specifies the number of indices for each polygon
+                    std::string v;
+                    XmlParser::getValueAsString(currentNode, v);
+                    const char *content = v.c_str();
+                    vcount.reserve(numPrimitives);
+                    for (unsigned int a = 0; a < numPrimitives; a++) {
+                        if (*content == 0) {
+                            throw DeadlyImportError("Expected more values while reading <vcount> contents.");
                         }
+                        // read a number
+                        vcount.push_back((size_t)strtoul10(content, &content));
+                        // skip whitespace after it
+                        SkipSpacesAndLineEnd(&content);
                     }
-
-                    TestClosing("vcount");
                 }
-            } else if (IsElement("p")) {
-                if (!mReader->isEmptyElement()) {
-                    // now here the actual fun starts - these are the indices to construct the mesh data from
-                    actualPrimitives += ReadPrimitives(pMesh, perIndexData, numPrimitives, vcount, primType);
-                }
-            } else if (IsElement("extra")) {
-                SkipElement("extra");
-            } else if (IsElement("ph")) {
-                SkipElement("ph");
-            } else {
-                ThrowException(format() << "Unexpected sub element <" << mReader->getNodeName() << "> in tag <" << elementName << ">");
             }
-        } else if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END) {
-            if (mReader->getNodeName() != elementName)
-                ThrowException(format() << "Expected end of <" << elementName << "> element.");
-
-            break;
+        } else if (currentName == "p") {
+            if (!currentNode.empty()) {
+                // now here the actual fun starts - these are the indices to construct the mesh data from
+                actualPrimitives += ReadPrimitives(currentNode, pMesh, perIndexData, numPrimitives, vcount, primType);
+            }
+        } else if (currentName == "extra") {
+            // skip
+        } else if (currentName == "ph") {
+            // skip
+        } else {
+            throw DeadlyImportError("Unexpected sub element <", currentName, "> in tag <", elementName, ">");
         }
     }
 
@@ -2120,49 +1667,45 @@ void ColladaParser::ReadIndexData(Mesh &pMesh) {
 
 // ------------------------------------------------------------------------------------------------
 // Reads a single input channel element and stores it in the given array, if valid
-void ColladaParser::ReadInputChannel(std::vector<InputChannel> &poChannels) {
+void ColladaParser::ReadInputChannel(XmlNode &node, std::vector<InputChannel> &poChannels) {
     InputChannel channel;
 
     // read semantic
-    int attrSemantic = GetAttribute("semantic");
-    std::string semantic = mReader->getAttributeValue(attrSemantic);
+    std::string semantic;
+    XmlParser::getStdStrAttribute(node, "semantic", semantic);
     channel.mType = GetTypeForSemantic(semantic);
 
     // read source
-    int attrSource = GetAttribute("source");
-    const char *source = mReader->getAttributeValue(attrSource);
-    if (source[0] != '#')
-        ThrowException(format() << "Unknown reference format in url \"" << source << "\" in source attribute of <input> element.");
-    channel.mAccessor = source + 1; // skipping the leading #, hopefully the remaining text is the accessor ID only
+    std::string source;
+    XmlParser::getStdStrAttribute(node, "source", source);
+    if (source[0] != '#') {
+        throw DeadlyImportError("Unknown reference format in url \"", source, "\" in source attribute of <input> element.");
+    }
+    channel.mAccessor = source.c_str() + 1; // skipping the leading #, hopefully the remaining text is the accessor ID only
 
     // read index offset, if per-index <input>
-    int attrOffset = TestAttribute("offset");
-    if (attrOffset > -1)
-        channel.mOffset = mReader->getAttributeValueAsInt(attrOffset);
+    if (XmlParser::hasAttribute(node, "offset")) {
+        XmlParser::getUIntAttribute(node, "offset", (unsigned int &)channel.mOffset);
+    }
 
     // read set if texture coordinates
     if (channel.mType == IT_Texcoord || channel.mType == IT_Color) {
-        int attrSet = TestAttribute("set");
-        if (attrSet > -1) {
-            attrSet = mReader->getAttributeValueAsInt(attrSet);
-            if (attrSet < 0)
-                ThrowException(format() << "Invalid index \"" << (attrSet) << "\" in set attribute of <input> element");
-
-            channel.mIndex = attrSet;
+        int attrSet = -1;
+        if (XmlParser::hasAttribute(node, "set")) {
+            XmlParser::getIntAttribute(node, "set", attrSet);
         }
+
+        channel.mIndex = attrSet;
     }
 
     // store, if valid type
     if (channel.mType != IT_Invalid)
         poChannels.push_back(channel);
-
-    // skip remaining stuff of this element, if any
-    SkipElement();
 }
 
 // ------------------------------------------------------------------------------------------------
 // Reads a <p> primitive index list and assembles the mesh data into the given mesh
-size_t ColladaParser::ReadPrimitives(Mesh &pMesh, std::vector<InputChannel> &pPerIndexChannels,
+size_t ColladaParser::ReadPrimitives(XmlNode &node, Mesh &pMesh, std::vector<InputChannel> &pPerIndexChannels,
         size_t pNumPrimitives, const std::vector<size_t> &pVCount, PrimitiveType pPrimType) {
     // determine number of indices coming per vertex
     // find the offset index for all per-vertex channels
@@ -2177,20 +1720,20 @@ size_t ColladaParser::ReadPrimitives(Mesh &pMesh, std::vector<InputChannel> &pPe
     // determine the expected number of indices
     size_t expectedPointCount = 0;
     switch (pPrimType) {
-    case Prim_Polylist: {
-        for (size_t i : pVCount)
-            expectedPointCount += i;
-        break;
-    }
-    case Prim_Lines:
-        expectedPointCount = 2 * pNumPrimitives;
-        break;
-    case Prim_Triangles:
-        expectedPointCount = 3 * pNumPrimitives;
-        break;
-    default:
-        // other primitive types don't state the index count upfront... we need to guess
-        break;
+        case Prim_Polylist: {
+            for (size_t i : pVCount)
+                expectedPointCount += i;
+            break;
+        }
+        case Prim_Lines:
+            expectedPointCount = 2 * pNumPrimitives;
+            break;
+        case Prim_Triangles:
+            expectedPointCount = 3 * pNumPrimitives;
+            break;
+        default:
+            // other primitive types don't state the index count upfront... we need to guess
+            break;
     }
 
     // and read all indices into a temporary array
@@ -2200,7 +1743,9 @@ size_t ColladaParser::ReadPrimitives(Mesh &pMesh, std::vector<InputChannel> &pPe
 
     if (pNumPrimitives > 0) // It is possible to not contain any indices
     {
-        const char *content = GetTextContent();
+        std::string v;
+        XmlParser::getValueAsString(node, v);
+        const char *content = v.c_str();
         while (*content != 0) {
             // read a value.
             // Hack: (thom) Some exporters put negative indices sometimes. We just try to carry on anyways.
@@ -2217,11 +1762,12 @@ size_t ColladaParser::ReadPrimitives(Mesh &pMesh, std::vector<InputChannel> &pPe
             // HACK: We just fix this number since SketchUp 15.3.331 writes the wrong 'count' for 'lines'
             ReportWarning("Expected different index count in <p> element, %zu instead of %zu.", indices.size(), expectedPointCount * numOffsets);
             pNumPrimitives = (indices.size() / numOffsets) / 2;
-        } else
-            ThrowException("Expected different index count in <p> element.");
-
-    } else if (expectedPointCount == 0 && (indices.size() % numOffsets) != 0)
-        ThrowException("Expected different index count in <p> element.");
+        } else {
+            throw DeadlyImportError("Expected different index count in <p> element.");
+        }
+    } else if (expectedPointCount == 0 && (indices.size() % numOffsets) != 0) {
+        throw DeadlyImportError("Expected different index count in <p> element.");
+    }
 
     // find the data for all sources
     for (std::vector<InputChannel>::iterator it = pMesh.mPerVertexData.begin(); it != pMesh.mPerVertexData.end(); ++it) {
@@ -2245,8 +1791,9 @@ size_t ColladaParser::ReadPrimitives(Mesh &pMesh, std::vector<InputChannel> &pPe
         // ignore vertex pointer, it doesn't refer to an accessor
         if (input.mType == IT_Vertex) {
             // warn if the vertex channel does not refer to the <vertices> element in the same mesh
-            if (input.mAccessor != pMesh.mVertexID)
-                ThrowException("Unsupported vertex referencing scheme.");
+            if (input.mAccessor != pMesh.mVertexID) {
+                throw DeadlyImportError("Unsupported vertex referencing scheme.");
+            }
             continue;
         }
 
@@ -2313,7 +1860,7 @@ size_t ColladaParser::ReadPrimitives(Mesh &pMesh, std::vector<InputChannel> &pPe
             break;
         default:
             // LineStrip is not supported due to expected index unmangling
-            ThrowException("Unsupported primitive type.");
+            throw DeadlyImportError("Unsupported primitive type.");
             break;
         }
 
@@ -2322,14 +1869,14 @@ size_t ColladaParser::ReadPrimitives(Mesh &pMesh, std::vector<InputChannel> &pPe
     }
 
     // if I ever get my hands on that guy who invented this steaming pile of indirection...
-    TestClosing("p");
     return numPrimitives;
 }
 
 ///@note This function won't work correctly if both PerIndex and PerVertex channels have same channels.
 ///For example if TEXCOORD present in both <vertices> and <polylist> tags this function will create wrong uv coordinates.
 ///It's not clear from COLLADA documentation is this allowed or not. For now only exporter fixed to avoid such behavior
-void ColladaParser::CopyVertex(size_t currentVertex, size_t numOffsets, size_t numPoints, size_t perVertexOffset, Mesh &pMesh, std::vector<InputChannel> &pPerIndexChannels, size_t currentPrimitive, const std::vector<size_t> &indices) {
+void ColladaParser::CopyVertex(size_t currentVertex, size_t numOffsets, size_t numPoints, size_t perVertexOffset, Mesh &pMesh,
+        std::vector<InputChannel> &pPerIndexChannels, size_t currentPrimitive, const std::vector<size_t> &indices) {
     // calculate the base offset of the vertex whose attributes we ant to copy
     size_t baseOffset = currentPrimitive * numOffsets * numPoints + currentVertex * numOffsets;
 
@@ -2347,7 +1894,8 @@ void ColladaParser::CopyVertex(size_t currentVertex, size_t numOffsets, size_t n
     pMesh.mFacePosIndices.push_back(indices[baseOffset + perVertexOffset]);
 }
 
-void ColladaParser::ReadPrimTriStrips(size_t numOffsets, size_t perVertexOffset, Mesh &pMesh, std::vector<InputChannel> &pPerIndexChannels, size_t currentPrimitive, const std::vector<size_t> &indices) {
+void ColladaParser::ReadPrimTriStrips(size_t numOffsets, size_t perVertexOffset, Mesh &pMesh, std::vector<InputChannel> &pPerIndexChannels,
+        size_t currentPrimitive, const std::vector<size_t> &indices) {
     if (currentPrimitive % 2 != 0) {
         //odd tristrip triangles need their indices mangled, to preserve winding direction
         CopyVertex(1, numOffsets, 1, perVertexOffset, pMesh, pPerIndexChannels, currentPrimitive, indices);
@@ -2368,8 +1916,9 @@ void ColladaParser::ExtractDataObjectFromChannel(const InputChannel &pInput, siz
         return;
 
     const Accessor &acc = *pInput.mResolved;
-    if (pLocalIndex >= acc.mCount)
-        ThrowException(format() << "Invalid data index (" << pLocalIndex << "/" << acc.mCount << ") in primitive specification");
+    if (pLocalIndex >= acc.mCount) {
+        throw DeadlyImportError("Invalid data index (", pLocalIndex, "/", acc.mCount, ") in primitive specification");
+    }
 
     // get a pointer to the start of the data object referred to by the accessor and the local index
     const ai_real *dataObject = &(acc.mData->mValues[0]) + acc.mOffset + pLocalIndex * acc.mStride;
@@ -2462,179 +2011,162 @@ void ColladaParser::ExtractDataObjectFromChannel(const InputChannel &pInput, siz
 
 // ------------------------------------------------------------------------------------------------
 // Reads the library of node hierarchies and scene parts
-void ColladaParser::ReadSceneLibrary() {
-    if (mReader->isEmptyElement())
+void ColladaParser::ReadSceneLibrary(XmlNode &node) {
+    if (node.empty()) {
         return;
+    }
 
-    while (mReader->read()) {
-        if (mReader->getNodeType() == irr::io::EXN_ELEMENT) {
-            // a visual scene - generate root node under its ID and let ReadNode() do the recursive work
-            if (IsElement("visual_scene")) {
-                // read ID. Is optional according to the spec, but how on earth should a scene_instance refer to it then?
-                int indexID = GetAttribute("id");
-                const char *attrID = mReader->getAttributeValue(indexID);
+    for (XmlNode &currentNode : node.children()) {
+        const std::string &currentName = currentNode.name();
+        if (currentName == "visual_scene") {
+            // read ID. Is optional according to the spec, but how on earth should a scene_instance refer to it then?
+            std::string id;
+            XmlParser::getStdStrAttribute(currentNode, "id", id);
 
-                // read name if given.
-                int indexName = TestAttribute("name");
-                const char *attrName = "Scene";
-                if (indexName > -1)
-                    attrName = mReader->getAttributeValue(indexName);
-
-                // create a node and store it in the library under its ID
-                Node *node = new Node;
-                node->mID = attrID;
-                node->mName = attrName;
-                mNodeLibrary[node->mID] = node;
-
-                ReadSceneNode(node);
-            } else {
-                // ignore the rest
-                SkipElement();
+            // read name if given.
+            std::string attrName = "Scene";
+            if (XmlParser::hasAttribute(currentNode, "name")) {
+                XmlParser::getStdStrAttribute(currentNode, "name", attrName);
             }
-        } else if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END) {
-            if (strcmp(mReader->getNodeName(), "library_visual_scenes") == 0)
-                //ThrowException( "Expected end of \"library_visual_scenes\" element.");
 
-                break;
+            // create a node and store it in the library under its ID
+            Node *sceneNode = new Node;
+            sceneNode->mID = id;
+            sceneNode->mName = attrName;
+            mNodeLibrary[sceneNode->mID] = sceneNode;
+
+            ReadSceneNode(currentNode, sceneNode);
         }
     }
 }
 
 // ------------------------------------------------------------------------------------------------
 // Reads a scene node's contents including children and stores it in the given node
-void ColladaParser::ReadSceneNode(Node *pNode) {
+void ColladaParser::ReadSceneNode(XmlNode &node, Node *pNode) {
     // quit immediately on <bla/> elements
-    if (mReader->isEmptyElement())
+    if (node.empty()) {
         return;
+    }
 
-    while (mReader->read()) {
-        if (mReader->getNodeType() == irr::io::EXN_ELEMENT) {
-            if (IsElement("node")) {
-                Node *child = new Node;
-                int attrID = TestAttribute("id");
-                if (attrID > -1)
-                    child->mID = mReader->getAttributeValue(attrID);
-                int attrSID = TestAttribute("sid");
-                if (attrSID > -1)
-                    child->mSID = mReader->getAttributeValue(attrSID);
-
-                int attrName = TestAttribute("name");
-                if (attrName > -1)
-                    child->mName = mReader->getAttributeValue(attrName);
-
-
-                if (pNode) {
-                    pNode->mChildren.push_back(child);
-                    child->mParent = pNode;
-                } else {
-                    // no parent node given, probably called from <library_nodes> element.
-                    // create new node in node library
-                    mNodeLibrary[child->mID] = child;
-                }
-
-                // read on recursively from there
-                ReadSceneNode(child);
-                continue;
+    for (XmlNode &currentNode : node.children()) {
+        const std::string &currentName = currentNode.name();
+        if (currentName == "node") {
+            Node *child = new Node;
+            if (XmlParser::hasAttribute(currentNode, "id")) {
+                XmlParser::getStdStrAttribute(currentNode, "id", child->mID);
             }
-            // For any further stuff we need a valid node to work on
-            else if (!pNode)
-                continue;
-
-            if (IsElement("lookat"))
-                ReadNodeTransformation(pNode, TF_LOOKAT);
-            else if (IsElement("matrix"))
-                ReadNodeTransformation(pNode, TF_MATRIX);
-            else if (IsElement("rotate"))
-                ReadNodeTransformation(pNode, TF_ROTATE);
-            else if (IsElement("scale"))
-                ReadNodeTransformation(pNode, TF_SCALE);
-            else if (IsElement("skew"))
-                ReadNodeTransformation(pNode, TF_SKEW);
-            else if (IsElement("translate"))
-                ReadNodeTransformation(pNode, TF_TRANSLATE);
-            else if (IsElement("render") && pNode->mParent == nullptr && 0 == pNode->mPrimaryCamera.length()) {
-                // ... scene evaluation or, in other words, postprocessing pipeline,
-                // or, again in other words, a turing-complete description how to
-                // render a Collada scene. The only thing that is interesting for
-                // us is the primary camera.
-                int attrId = TestAttribute("camera_node");
-                if (-1 != attrId) {
-                    const char *s = mReader->getAttributeValue(attrId);
-                    if (s[0] != '#')
-                        ASSIMP_LOG_ERROR("Collada: Unresolved reference format of camera");
-                    else
-                        pNode->mPrimaryCamera = s + 1;
-                }
-            } else if (IsElement("instance_node")) {
-                // find the node in the library
-                int attrID = TestAttribute("url");
-                if (attrID != -1) {
-                    const char *s = mReader->getAttributeValue(attrID);
-                    if (s[0] != '#')
-                        ASSIMP_LOG_ERROR("Collada: Unresolved reference format of node");
-                    else {
-                        pNode->mNodeInstances.push_back(NodeInstance());
-                        pNode->mNodeInstances.back().mNode = s + 1;
-                    }
-                }
-            } else if (IsElement("instance_geometry") || IsElement("instance_controller")) {
-                // Reference to a mesh or controller, with possible material associations
-                ReadNodeGeometry(pNode);
-            } else if (IsElement("instance_light")) {
-                // Reference to a light, name given in 'url' attribute
-                int attrID = TestAttribute("url");
-                if (-1 == attrID)
-                    ASSIMP_LOG_WARN("Collada: Expected url attribute in <instance_light> element");
-                else {
-                    const char *url = mReader->getAttributeValue(attrID);
-                    if (url[0] != '#')
-                        ThrowException("Unknown reference format in <instance_light> element");
-
-                    pNode->mLights.push_back(LightInstance());
-                    pNode->mLights.back().mLight = url + 1;
-                }
-            } else if (IsElement("instance_camera")) {
-                // Reference to a camera, name given in 'url' attribute
-                int attrID = TestAttribute("url");
-                if (-1 == attrID)
-                    ASSIMP_LOG_WARN("Collada: Expected url attribute in <instance_camera> element");
-                else {
-                    const char *url = mReader->getAttributeValue(attrID);
-                    if (url[0] != '#')
-                        ThrowException("Unknown reference format in <instance_camera> element");
-
-                    pNode->mCameras.push_back(CameraInstance());
-                    pNode->mCameras.back().mCamera = url + 1;
-                }
+            if (XmlParser::hasAttribute(currentNode, "sid")) {
+                XmlParser::getStdStrAttribute(currentNode, "id", child->mSID);
+            }
+            if (XmlParser::hasAttribute(currentNode, "name")) {
+                XmlParser::getStdStrAttribute(currentNode, "name", child->mName);
+            }
+            if (pNode) {
+                pNode->mChildren.push_back(child);
+                child->mParent = pNode;
             } else {
-                // skip everything else for the moment
-                SkipElement();
+                // no parent node given, probably called from <library_nodes> element.
+                // create new node in node library
+                mNodeLibrary[child->mID] = child;
+            }
+
+            // read on recursively from there
+            ReadSceneNode(currentNode, child);
+            continue;
+        } else if (!pNode) {
+            // For any further stuff we need a valid node to work on
+            continue;
+        }
+        if (currentName == "lookat") {
+            ReadNodeTransformation(currentNode, pNode, TF_LOOKAT);
+        } else if (currentName == "matrix") {
+            ReadNodeTransformation(currentNode, pNode, TF_MATRIX);
+        } else if (currentName == "rotate") {
+            ReadNodeTransformation(currentNode, pNode, TF_ROTATE);
+        } else if (currentName == "scale") {
+            ReadNodeTransformation(currentNode, pNode, TF_SCALE);
+        } else if (currentName == "skew") {
+            ReadNodeTransformation(currentNode, pNode, TF_SKEW);
+        } else if (currentName == "translate") {
+            ReadNodeTransformation(currentNode, pNode, TF_TRANSLATE);
+        } else if (currentName == "render" && pNode->mParent == nullptr && 0 == pNode->mPrimaryCamera.length()) {
+            // ... scene evaluation or, in other words, postprocessing pipeline,
+            // or, again in other words, a turing-complete description how to
+            // render a Collada scene. The only thing that is interesting for
+            // us is the primary camera.
+            if (XmlParser::hasAttribute(currentNode, "camera_node")) {
+                std::string s;
+                XmlParser::getStdStrAttribute(currentNode, "camera_node", s);
+                if (s[0] != '#') {
+                    ASSIMP_LOG_ERROR("Collada: Unresolved reference format of camera");
+                } else {
+                    pNode->mPrimaryCamera = s.c_str() + 1;
+                }
+            }
+        } else if (currentName == "instance_node") {
+            // find the node in the library
+            if (XmlParser::hasAttribute(currentNode, "url")) {
+                std::string s;
+                XmlParser::getStdStrAttribute(currentNode, "url", s);
+                if (s[0] != '#') {
+                    ASSIMP_LOG_ERROR("Collada: Unresolved reference format of node");
+                } else {
+                    pNode->mNodeInstances.push_back(NodeInstance());
+                    pNode->mNodeInstances.back().mNode = s.c_str() + 1;
+                }
+            }
+        } else if (currentName == "instance_geometry" || currentName == "instance_controller") {
+            // Reference to a mesh or controller, with possible material associations
+            ReadNodeGeometry(currentNode, pNode);
+        } else if (currentName == "instance_light") {
+            // Reference to a light, name given in 'url' attribute
+            if (XmlParser::hasAttribute(currentNode, "url")) {
+                std::string url;
+                XmlParser::getStdStrAttribute(currentNode, "url", url);
+                if (url[0] != '#') {
+                    throw DeadlyImportError("Unknown reference format in <instance_light> element");
+                }
+
+                pNode->mLights.push_back(LightInstance());
+                pNode->mLights.back().mLight = url.c_str() + 1;
+            }
+        } else if (currentName == "instance_camera") {
+            // Reference to a camera, name given in 'url' attribute
+            if (XmlParser::hasAttribute(currentNode, "url")) {
+                std::string url;
+                XmlParser::getStdStrAttribute(currentNode, "url", url);
+                if (url[0] != '#') {
+                    throw DeadlyImportError("Unknown reference format in <instance_camera> element");
+                }
+                pNode->mCameras.push_back(CameraInstance());
+                pNode->mCameras.back().mCamera = url.c_str() + 1;
             }
-        } else if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END) {
-            break;
         }
     }
 }
 
 // ------------------------------------------------------------------------------------------------
 // Reads a node transformation entry of the given type and adds it to the given node's transformation list.
-void ColladaParser::ReadNodeTransformation(Node *pNode, TransformType pType) {
-    if (mReader->isEmptyElement())
+void ColladaParser::ReadNodeTransformation(XmlNode &node, Node *pNode, TransformType pType) {
+    if (node.empty()) {
         return;
+    }
 
-    std::string tagName = mReader->getNodeName();
+    std::string tagName = node.name();
 
     Transform tf;
     tf.mType = pType;
 
     // read SID
-    int indexSID = TestAttribute("sid");
-    if (indexSID >= 0)
-        tf.mID = mReader->getAttributeValue(indexSID);
+    if (XmlParser::hasAttribute(node, "sid")) {
+        XmlParser::getStdStrAttribute(node, "sid", tf.mID);
+    }
 
     // how many parameters to read per transformation type
     static const unsigned int sNumParameters[] = { 9, 4, 3, 3, 7, 16 };
-    const char *content = GetTextContent();
+    std::string value;
+    XmlParser::getValueAsString(node, value);
+    const char *content = value.c_str();
 
     // read as many parameters and store in the transformation
     for (unsigned int a = 0; a < sNumParameters[pType]; a++) {
@@ -2646,39 +2178,37 @@ void ColladaParser::ReadNodeTransformation(Node *pNode, TransformType pType) {
 
     // place the transformation at the queue of the node
     pNode->mTransforms.push_back(tf);
-
-    // and consume the closing tag
-    TestClosing(tagName.c_str());
 }
 
 // ------------------------------------------------------------------------------------------------
 // Processes bind_vertex_input and bind elements
-void ColladaParser::ReadMaterialVertexInputBinding(Collada::SemanticMappingTable &tbl) {
-    while (mReader->read()) {
-        if (mReader->getNodeType() == irr::io::EXN_ELEMENT) {
-            if (IsElement("bind_vertex_input")) {
-                Collada::InputSemanticMapEntry vn;
+void ColladaParser::ReadMaterialVertexInputBinding(XmlNode &node, Collada::SemanticMappingTable &tbl) {
+    std::string name = node.name();
+    for (XmlNode &currentNode : node.children()) {
+        const std::string &currentName = currentNode.name();
+        if (currentName == "bind_vertex_input") {
+            Collada::InputSemanticMapEntry vn;
 
-                // effect semantic
-                int n = GetAttribute("semantic");
-                std::string s = mReader->getAttributeValue(n);
-
-                // input semantic
-                n = GetAttribute("input_semantic");
-                vn.mType = GetTypeForSemantic(mReader->getAttributeValue(n));
-
-                // index of input set
-                n = TestAttribute("input_set");
-                if (-1 != n)
-                    vn.mSet = mReader->getAttributeValueAsInt(n);
-
-                tbl.mMap[s] = vn;
-            } else if (IsElement("bind")) {
-                ASSIMP_LOG_WARN("Collada: Found unsupported <bind> element");
+            // effect semantic
+            if (XmlParser::hasAttribute(currentNode, "semantic")) {
+                std::string s;
+                XmlParser::getStdStrAttribute(currentNode, "semantic", s);
+                XmlParser::getUIntAttribute(currentNode, "input_semantic", (unsigned int &)vn.mType);
             }
-        } else if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END) {
-            if (strcmp(mReader->getNodeName(), "instance_material") == 0)
-                break;
+            std::string s;
+            XmlParser::getStdStrAttribute(currentNode, "semantic", s);
+
+            // input semantic
+            XmlParser::getUIntAttribute(currentNode, "input_semantic", (unsigned int &)vn.mType);
+
+            // index of input set
+            if (XmlParser::hasAttribute(currentNode, "input_set")) {
+                XmlParser::getUIntAttribute(currentNode, "input_set", vn.mSet);
+            }
+
+            tbl.mMap[s] = vn;
+        } else if (currentName == "bind") {
+            ASSIMP_LOG_WARN("Collada: Found unsupported <bind> element");
         }
     }
 }
@@ -2704,42 +2234,36 @@ void ColladaParser::ReadEmbeddedTextures(ZipArchiveIOSystem &zip_archive) {
 
 // ------------------------------------------------------------------------------------------------
 // Reads a mesh reference in a node and adds it to the node's mesh list
-void ColladaParser::ReadNodeGeometry(Node *pNode) {
+void ColladaParser::ReadNodeGeometry(XmlNode &node, Node *pNode) {
     // referred mesh is given as an attribute of the <instance_geometry> element
-    int attrUrl = GetAttribute("url");
-    const char *url = mReader->getAttributeValue(attrUrl);
-    if (url[0] != '#')
-        ThrowException("Unknown reference format");
+    std::string url;
+    XmlParser::getStdStrAttribute(node, "url", url);
+    if (url[0] != '#') {
+        throw DeadlyImportError("Unknown reference format");
+    }
 
     Collada::MeshInstance instance;
-    instance.mMeshOrController = url + 1; // skipping the leading #
+    instance.mMeshOrController = url.c_str() + 1; // skipping the leading #
 
-    if (!mReader->isEmptyElement()) {
-        // read material associations. Ignore additional elements in between
-        while (mReader->read()) {
-            if (mReader->getNodeType() == irr::io::EXN_ELEMENT) {
-                if (IsElement("instance_material")) {
-                    // read ID of the geometry subgroup and the target material
-                    int attrGroup = GetAttribute("symbol");
-                    std::string group = mReader->getAttributeValue(attrGroup);
-                    int attrMaterial = GetAttribute("target");
-                    const char *urlMat = mReader->getAttributeValue(attrMaterial);
-                    Collada::SemanticMappingTable s;
-                    if (urlMat[0] == '#')
-                        urlMat++;
+    for (XmlNode currentNode = node.first_child(); currentNode; currentNode = currentNode.next_sibling()) {
+        const std::string &currentName = currentNode.name();
+        if (currentName == "bind_material") {
+            XmlNode techNode = currentNode.child("technique_common");
+            if (techNode) {
+                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;
-
-                    // resolve further material details + THIS UGLY AND NASTY semantic mapping stuff
-                    if (!mReader->isEmptyElement())
-                        ReadMaterialVertexInputBinding(s);
-
-                    // store the association
-                    instance.mMaterials[group] = s;
-                }
-            } else if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END) {
-                if (strcmp(mReader->getNodeName(), "instance_geometry") == 0 || strcmp(mReader->getNodeName(), "instance_controller") == 0)
-                    break;
+                s.mMatName = urlMat;
+                // store the association
+                instance.mMaterials[group] = s;
+                ReadMaterialVertexInputBinding(instanceMatNode, s);
             }
         }
     }
@@ -2750,189 +2274,38 @@ void ColladaParser::ReadNodeGeometry(Node *pNode) {
 
 // ------------------------------------------------------------------------------------------------
 // Reads the collada scene
-void ColladaParser::ReadScene() {
-    if (mReader->isEmptyElement())
+void ColladaParser::ReadScene(XmlNode &node) {
+    if (node.empty()) {
         return;
+    }
 
-    while (mReader->read()) {
-        if (mReader->getNodeType() == irr::io::EXN_ELEMENT) {
-            if (IsElement("instance_visual_scene")) {
-                // should be the first and only occurrence
-                if (mRootNode)
-                    ThrowException("Invalid scene containing multiple root nodes in <instance_visual_scene> element");
-
-                // read the url of the scene to instance. Should be of format "#some_name"
-                int urlIndex = GetAttribute("url");
-                const char *url = mReader->getAttributeValue(urlIndex);
-                if (url[0] != '#')
-                    ThrowException("Unknown reference format in <instance_visual_scene> element");
-
-                // find the referred scene, skip the leading #
-                NodeLibrary::const_iterator sit = mNodeLibrary.find(url + 1);
-                if (sit == mNodeLibrary.end())
-                    ThrowException("Unable to resolve visual_scene reference \"" + std::string(url) + "\" in <instance_visual_scene> element.");
-                mRootNode = sit->second;
-            } else {
-                SkipElement();
+    for (XmlNode &currentNode : node.children()) {
+        const std::string &currentName = currentNode.name();
+        if (currentName == "instance_visual_scene") {
+            // should be the first and only occurrence
+            if (mRootNode) {
+                throw DeadlyImportError("Invalid scene containing multiple root nodes in <instance_visual_scene> element");
             }
-        } else if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END) {
-            break;
-        }
-    }
-}
 
-// ------------------------------------------------------------------------------------------------
-// Aborts the file reading with an exception
-AI_WONT_RETURN void ColladaParser::ThrowException(const std::string &pError) const {
-    throw DeadlyImportError(format() << "Collada: " << mFileName << " - " << pError);
-}
-
-void ColladaParser::ReportWarning(const char *msg, ...) {
-    ai_assert(nullptr != msg);
-
-    va_list args;
-    va_start(args, msg);
-
-    char szBuffer[3000];
-    const int iLen = vsprintf(szBuffer, msg, args);
-    ai_assert(iLen > 0);
-
-    va_end(args);
-    ASSIMP_LOG_WARN_F("Validation warning: ", std::string(szBuffer, iLen));
-}
-
-// ------------------------------------------------------------------------------------------------
-// Skips all data until the end node of the current element
-void ColladaParser::SkipElement() {
-    // nothing to skip if it's an <element />
-    if (mReader->isEmptyElement()) {
-        return;
-    }
-
-    // reroute
-    SkipElement(mReader->getNodeName());
-}
-
-// ------------------------------------------------------------------------------------------------
-// Skips all data until the end node of the given element
-void ColladaParser::SkipElement(const char *pElement) {
-    // copy the current node's name because it'a pointer to the reader's internal buffer,
-    // which is going to change with the upcoming parsing
-    std::string element = pElement;
-    while (mReader->read()) {
-        if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END) {
-            if (mReader->getNodeName() == element) {
-                break;
+            // read the url of the scene to instance. Should be of format "#some_name"
+            std::string url;
+            XmlParser::getStdStrAttribute(currentNode, "url", url);
+            if (url[0] != '#') {
+                throw DeadlyImportError("Unknown reference format in <instance_visual_scene> element");
             }
+
+            // find the referred scene, skip the leading #
+            NodeLibrary::const_iterator sit = mNodeLibrary.find(url.c_str() + 1);
+            if (sit == mNodeLibrary.end()) {
+                throw DeadlyImportError("Unable to resolve visual_scene reference \"", std::string(url), "\" in <instance_visual_scene> element.");
+            }
+            mRootNode = sit->second;
         }
     }
 }
 
 // ------------------------------------------------------------------------------------------------
-// Tests for an opening element of the given name, throws an exception if not found
-void ColladaParser::TestOpening(const char *pName) {
-    // read element start
-    if (!mReader->read()) {
-        ThrowException(format() << "Unexpected end of file while beginning of <" << pName << "> element.");
-    }
-    // whitespace in front is ok, just read again if found
-    if (mReader->getNodeType() == irr::io::EXN_TEXT) {
-        if (!mReader->read()) {
-            ThrowException(format() << "Unexpected end of file while reading beginning of <" << pName << "> element.");
-        }
-    }
-
-    if (mReader->getNodeType() != irr::io::EXN_ELEMENT || strcmp(mReader->getNodeName(), pName) != 0) {
-        ThrowException(format() << "Expected start of <" << pName << "> element.");
-    }
-}
-
-// ------------------------------------------------------------------------------------------------
-// Tests for the closing tag of the given element, throws an exception if not found
-void ColladaParser::TestClosing(const char *pName) {
-    // check if we have an empty (self-closing) element
-    if (mReader->isEmptyElement()) {
-        return;
-    }
-
-    // check if we're already on the closing tag and return right away
-    if (mReader->getNodeType() == irr::io::EXN_ELEMENT_END && strcmp(mReader->getNodeName(), pName) == 0) {
-        return;
-    }
-
-    // if not, read some more
-    if (!mReader->read()) {
-        ThrowException(format() << "Unexpected end of file while reading end of <" << pName << "> element.");
-    }
-    // whitespace in front is ok, just read again if found
-    if (mReader->getNodeType() == irr::io::EXN_TEXT) {
-        if (!mReader->read()) {
-            ThrowException(format() << "Unexpected end of file while reading end of <" << pName << "> element.");
-        }
-    }
-
-    // but this has the be the closing tag, or we're lost
-    if (mReader->getNodeType() != irr::io::EXN_ELEMENT_END || strcmp(mReader->getNodeName(), pName) != 0) {
-        ThrowException(format() << "Expected end of <" << pName << "> element.");
-    }
-}
-
-// ------------------------------------------------------------------------------------------------
-// Returns the index of the named attribute or -1 if not found. Does not throw, therefore useful for optional attributes
-int ColladaParser::GetAttribute(const char *pAttr) const {
-    int index = TestAttribute(pAttr);
-    if (index == -1) {
-        ThrowException(format() << "Expected attribute \"" << pAttr << "\" for element <" << mReader->getNodeName() << ">.");
-    }
-
-    // attribute not found -> throw an exception
-    return index;
-}
-
-// ------------------------------------------------------------------------------------------------
-// Tests the present element for the presence of one attribute, returns its index or throws an exception if not found
-int ColladaParser::TestAttribute(const char *pAttr) const {
-    for (int a = 0; a < mReader->getAttributeCount(); a++)
-        if (strcmp(mReader->getAttributeName(a), pAttr) == 0)
-            return a;
-
-    return -1;
-}
-
-// ------------------------------------------------------------------------------------------------
-// Reads the text contents of an element, throws an exception if not given. Skips leading whitespace.
-const char *ColladaParser::GetTextContent() {
-    const char *sz = TestTextContent();
-    if (!sz) {
-        ThrowException("Invalid contents in element \"n\".");
-    }
-    return sz;
-}
-
-// ------------------------------------------------------------------------------------------------
-// Reads the text contents of an element, returns nullptr if not given. Skips leading whitespace.
-const char *ColladaParser::TestTextContent() {
-    // present node should be the beginning of an element
-    if (mReader->getNodeType() != irr::io::EXN_ELEMENT || mReader->isEmptyElement())
-        return nullptr;
-
-    // read contents of the element
-    if (!mReader->read()) {
-        return nullptr;
-    }
-    if (mReader->getNodeType() != irr::io::EXN_TEXT && mReader->getNodeType() != irr::io::EXN_CDATA) {
-        return nullptr;
-    }
-
-    // skip leading whitespace
-    const char *text = mReader->getNodeData();
-    SkipSpacesAndLineEnd(&text);
-
-    return text;
-}
-
-// ------------------------------------------------------------------------------------------------
-// Calculates the resulting transformation fromm all the given transform steps
+// Calculates the resulting transformation from all the given transform steps
 aiMatrix4x4 ColladaParser::CalculateResultTransform(const std::vector<Transform> &pTransforms) const {
     aiMatrix4x4 res;
 
diff --git a/code/AssetLib/Collada/ColladaParser.h b/code/AssetLib/Collada/ColladaParser.h
index f6056abcc..5b8526b47 100644
--- a/code/AssetLib/Collada/ColladaParser.h
+++ b/code/AssetLib/Collada/ColladaParser.h
@@ -4,7 +4,6 @@
 
  Copyright (c) 2006-2020, assimp team
 
-
  All rights reserved.
 
  Redistribution and use of this software in source and binary forms,
@@ -50,9 +49,12 @@
 #include "ColladaHelper.h"
 #include <assimp/TinyFormatter.h>
 #include <assimp/ai_assert.h>
-#include <assimp/irrXMLWrapper.h>
+#include <assimp/XmlParser.h>
+
+#include <map>
 
 namespace Assimp {
+
 class ZipArchiveIOSystem;
 
 // ------------------------------------------------------------------------------------------
@@ -81,25 +83,25 @@ protected:
     static std::string ReadZaeManifest(ZipArchiveIOSystem &zip_archive);
 
     /** Reads the contents of the file */
-    void ReadContents();
+    void ReadContents(XmlNode &node);
 
     /** Reads the structure of the file */
-    void ReadStructure();
+    void ReadStructure(XmlNode &node);
 
     /** Reads asset information such as coordinate system information and legal blah */
-    void ReadAssetInfo();
+    void ReadAssetInfo(XmlNode &node);
 
     /** Reads contributor information such as author and legal blah */
-    void ReadContributorInfo();
+    void ReadContributorInfo(XmlNode &node);
 
     /** Reads generic metadata into provided map and renames keys for Assimp */
-    void ReadMetaDataItem(StringMetaData &metadata);
+    void ReadMetaDataItem(XmlNode &node, StringMetaData &metadata);
 
     /** Reads the animation library */
-    void ReadAnimationLibrary();
+    void ReadAnimationLibrary(XmlNode &node);
 
     /** Reads the animation clip library */
-    void ReadAnimationClipLibrary();
+    void ReadAnimationClipLibrary(XmlNode &node);
 
     /** Unwrap controllers dependency hierarchy */
     void PostProcessControllers();
@@ -108,103 +110,103 @@ protected:
     void PostProcessRootAnimations();
 
     /** Reads an animation into the given parent structure */
-    void ReadAnimation(Collada::Animation *pParent);
+    void ReadAnimation(XmlNode &node, Collada::Animation *pParent);
 
     /** Reads an animation sampler into the given anim channel */
-    void ReadAnimationSampler(Collada::AnimationChannel &pChannel);
+    void ReadAnimationSampler(XmlNode &node, Collada::AnimationChannel &pChannel);
 
     /** Reads the skeleton controller library */
-    void ReadControllerLibrary();
+    void ReadControllerLibrary(XmlNode &node);
 
     /** Reads a controller into the given mesh structure */
-    void ReadController(Collada::Controller &pController);
+    void ReadController(XmlNode &node, Collada::Controller &pController);
 
     /** Reads the joint definitions for the given controller */
-    void ReadControllerJoints(Collada::Controller &pController);
+    void ReadControllerJoints(XmlNode &node, Collada::Controller &pController);
 
     /** Reads the joint weights for the given controller */
-    void ReadControllerWeights(Collada::Controller &pController);
+    void ReadControllerWeights(XmlNode &node, Collada::Controller &pController);
 
     /** Reads the image library contents */
-    void ReadImageLibrary();
+    void ReadImageLibrary(XmlNode &node);
 
     /** Reads an image entry into the given image */
-    void ReadImage(Collada::Image &pImage);
+    void ReadImage(XmlNode &node, Collada::Image &pImage);
 
     /** Reads the material library */
-    void ReadMaterialLibrary();
+    void ReadMaterialLibrary(XmlNode &node);
 
     /** Reads a material entry into the given material */
-    void ReadMaterial(Collada::Material &pMaterial);
+    void ReadMaterial(XmlNode &node, Collada::Material &pMaterial);
 
     /** Reads the camera library */
-    void ReadCameraLibrary();
+    void ReadCameraLibrary(XmlNode &node);
 
     /** Reads a camera entry into the given camera */
-    void ReadCamera(Collada::Camera &pCamera);
+    void ReadCamera(XmlNode &node, Collada::Camera &pCamera);
 
     /** Reads the light library */
-    void ReadLightLibrary();
+    void ReadLightLibrary(XmlNode &node);
 
     /** Reads a light entry into the given light */
-    void ReadLight(Collada::Light &pLight);
+    void ReadLight(XmlNode &node, Collada::Light &pLight);
 
     /** Reads the effect library */
-    void ReadEffectLibrary();
+    void ReadEffectLibrary(XmlNode &node);
 
     /** Reads an effect entry into the given effect*/
-    void ReadEffect(Collada::Effect &pEffect);
+    void ReadEffect(XmlNode &node, Collada::Effect &pEffect);
 
     /** Reads an COMMON effect profile */
-    void ReadEffectProfileCommon(Collada::Effect &pEffect);
+    void ReadEffectProfileCommon(XmlNode &node, Collada::Effect &pEffect);
 
     /** Read sampler properties */
-    void ReadSamplerProperties(Collada::Sampler &pSampler);
+    void ReadSamplerProperties(XmlNode &node, Collada::Sampler &pSampler);
 
     /** Reads an effect entry containing a color or a texture defining that color */
-    void ReadEffectColor(aiColor4D &pColor, Collada::Sampler &pSampler);
+    void ReadEffectColor(XmlNode &node, aiColor4D &pColor, Collada::Sampler &pSampler);
 
     /** Reads an effect entry containing a float */
-    void ReadEffectFloat(ai_real &pFloat);
+    void ReadEffectFloat(XmlNode &node, ai_real &pFloat);
 
     /** Reads an effect parameter specification of any kind */
-    void ReadEffectParam(Collada::EffectParam &pParam);
+    void ReadEffectParam(XmlNode &node, Collada::EffectParam &pParam);
 
     /** Reads the geometry library contents */
-    void ReadGeometryLibrary();
+    void ReadGeometryLibrary(XmlNode &node);
 
     /** Reads a geometry from the geometry library. */
-    void ReadGeometry(Collada::Mesh &pMesh);
+    void ReadGeometry(XmlNode &node, Collada::Mesh &pMesh);
 
     /** Reads a mesh from the geometry library */
-    void ReadMesh(Collada::Mesh &pMesh);
+    void ReadMesh(XmlNode &node, Collada::Mesh &pMesh);
 
     /** Reads a source element - a combination of raw data and an accessor defining
          * things that should not be redefinable. Yes, that's another rant.
          */
-    void ReadSource();
+    void ReadSource(XmlNode &node);
 
     /** Reads a data array holding a number of elements, and stores it in the global library.
          * Currently supported are array of floats and arrays of strings.
          */
-    void ReadDataArray();
+    void ReadDataArray(XmlNode &node);
 
     /** Reads an accessor and stores it in the global library under the given ID -
          * accessors use the ID of the parent <source> element
          */
-    void ReadAccessor(const std::string &pID);
+    void ReadAccessor(XmlNode &node, const std::string &pID);
 
     /** Reads input declarations of per-vertex mesh data into the given mesh */
-    void ReadVertexData(Collada::Mesh &pMesh);
+    void ReadVertexData(XmlNode &node, Collada::Mesh &pMesh);
 
     /** Reads input declarations of per-index mesh data into the given mesh */
-    void ReadIndexData(Collada::Mesh &pMesh);
+    void ReadIndexData(XmlNode &node, Collada::Mesh &pMesh);
 
     /** Reads a single input channel element and stores it in the given array, if valid */
-    void ReadInputChannel(std::vector<Collada::InputChannel> &poChannels);
+    void ReadInputChannel(XmlNode &node, std::vector<Collada::InputChannel> &poChannels);
 
     /** Reads a <p> primitive index list and assembles the mesh data into the given mesh */
-    size_t ReadPrimitives(Collada::Mesh &pMesh, std::vector<Collada::InputChannel> &pPerIndexChannels,
+    size_t ReadPrimitives(XmlNode &node, Collada::Mesh &pMesh, std::vector<Collada::InputChannel> &pPerIndexChannels,
             size_t pNumPrimitives, const std::vector<size_t> &pVCount, Collada::PrimitiveType pPrimType);
 
     /** Copies the data for a single primitive into the mesh, based on the InputChannels */
@@ -220,68 +222,27 @@ protected:
     void ExtractDataObjectFromChannel(const Collada::InputChannel &pInput, size_t pLocalIndex, Collada::Mesh &pMesh);
 
     /** Reads the library of node hierarchies and scene parts */
-    void ReadSceneLibrary();
+    void ReadSceneLibrary(XmlNode &node);
 
     /** Reads a scene node's contents including children and stores it in the given node */
-    void ReadSceneNode(Collada::Node *pNode);
+    void ReadSceneNode(XmlNode &node, Collada::Node *pNode);
 
     /** Reads a node transformation entry of the given type and adds it to the given node's transformation list. */
-    void ReadNodeTransformation(Collada::Node *pNode, Collada::TransformType pType);
+    void ReadNodeTransformation(XmlNode &node, Collada::Node *pNode, Collada::TransformType pType);
 
     /** Reads a mesh reference in a node and adds it to the node's mesh list */
-    void ReadNodeGeometry(Collada::Node *pNode);
+    void ReadNodeGeometry(XmlNode &node, Collada::Node *pNode);
 
     /** Reads the collada scene */
-    void ReadScene();
+    void ReadScene(XmlNode &node);
 
     // Processes bind_vertex_input and bind elements
-    void ReadMaterialVertexInputBinding(Collada::SemanticMappingTable &tbl);
+    void ReadMaterialVertexInputBinding(XmlNode &node, Collada::SemanticMappingTable &tbl);
 
     /** Reads embedded textures from a ZAE archive*/
     void ReadEmbeddedTextures(ZipArchiveIOSystem &zip_archive);
 
 protected:
-    /** Aborts the file reading with an exception */
-    AI_WONT_RETURN void ThrowException(const std::string &pError) const AI_WONT_RETURN_SUFFIX;
-    void ReportWarning(const char *msg, ...);
-
-    /** Skips all data until the end node of the current element */
-    void SkipElement();
-
-    /** Skips all data until the end node of the given element */
-    void SkipElement(const char *pElement);
-
-    /** Compares the current xml element name to the given string and returns true if equal */
-    bool IsElement(const char *pName) const;
-
-    /** Tests for the opening tag of the given element, throws an exception if not found */
-    void TestOpening(const char *pName);
-
-    /** Tests for the closing tag of the given element, throws an exception if not found */
-    void TestClosing(const char *pName);
-
-    /** Checks the present element for the presence of the attribute, returns its index
-         or throws an exception if not found */
-    int GetAttribute(const char *pAttr) const;
-
-    /** Returns the index of the named attribute or -1 if not found. Does not throw,
-         therefore useful for optional attributes */
-    int TestAttribute(const char *pAttr) const;
-
-    /** Reads the text contents of an element, throws an exception if not given.
-         Skips leading whitespace. */
-    const char *GetTextContent();
-
-    /** Reads the text contents of an element, returns nullptr if not given.
-         Skips leading whitespace. */
-    const char *TestTextContent();
-
-    /** Reads a single bool from current text content */
-    bool ReadBoolFromTextContent();
-
-    /** Reads a single float from current text content */
-    ai_real ReadFloatFromTextContent();
-
     /** Calculates the resulting transformation from all the given transform steps */
     aiMatrix4x4 CalculateResultTransform(const std::vector<Collada::Transform> &pTransforms) const;
 
@@ -293,59 +254,59 @@ protected:
     const Type &ResolveLibraryReference(const std::map<std::string, Type> &pLibrary, const std::string &pURL) const;
 
 protected:
-    /** Filename, for a verbose error message */
+    // Filename, for a verbose error message
     std::string mFileName;
 
-    /** XML reader, member for everyday use */
-    irr::io::IrrXMLReader *mReader;
+    // XML reader, member for everyday use
+    XmlParser mXmlParser;
 
     /** All data arrays found in the file by ID. Might be referred to by actually
          everyone. Collada, you are a steaming pile of indirection. */
-    typedef std::map<std::string, Collada::Data> DataLibrary;
+    using DataLibrary = std::map<std::string, Collada::Data> ;
     DataLibrary mDataLibrary;
 
     /** Same for accessors which define how the data in a data array is accessed. */
-    typedef std::map<std::string, Collada::Accessor> AccessorLibrary;
+    using AccessorLibrary = std::map<std::string, Collada::Accessor> ;
     AccessorLibrary mAccessorLibrary;
 
     /** Mesh library: mesh by ID */
-    typedef std::map<std::string, Collada::Mesh *> MeshLibrary;
+    using MeshLibrary = std::map<std::string, Collada::Mesh *>;
     MeshLibrary mMeshLibrary;
 
     /** node library: root node of the hierarchy part by ID */
-    typedef std::map<std::string, Collada::Node *> NodeLibrary;
+    using NodeLibrary = std::map<std::string, Collada::Node *>;
     NodeLibrary mNodeLibrary;
 
     /** Image library: stores texture properties by ID */
-    typedef std::map<std::string, Collada::Image> ImageLibrary;
+    using ImageLibrary = std::map<std::string, Collada::Image> ;
     ImageLibrary mImageLibrary;
 
     /** Effect library: surface attributes by ID */
-    typedef std::map<std::string, Collada::Effect> EffectLibrary;
+    using EffectLibrary = std::map<std::string, Collada::Effect> ;
     EffectLibrary mEffectLibrary;
 
     /** Material library: surface material by ID */
-    typedef std::map<std::string, Collada::Material> MaterialLibrary;
+    using MaterialLibrary = std::map<std::string, Collada::Material> ;
     MaterialLibrary mMaterialLibrary;
 
     /** Light library: surface light by ID */
-    typedef std::map<std::string, Collada::Light> LightLibrary;
+    using LightLibrary = std::map<std::string, Collada::Light> ;
     LightLibrary mLightLibrary;
 
     /** Camera library: surface material by ID */
-    typedef std::map<std::string, Collada::Camera> CameraLibrary;
+    using CameraLibrary = std::map<std::string, Collada::Camera> ;
     CameraLibrary mCameraLibrary;
 
     /** Controller library: joint controllers by ID */
-    typedef std::map<std::string, Collada::Controller> ControllerLibrary;
+    using ControllerLibrary = std::map<std::string, Collada::Controller> ;
     ControllerLibrary mControllerLibrary;
 
     /** Animation library: animation references by ID */
-    typedef std::map<std::string, Collada::Animation *> AnimationLibrary;
+    using AnimationLibrary = std::map<std::string, Collada::Animation *> ;
     AnimationLibrary mAnimationLibrary;
 
     /** Animation clip library: clip animation references by ID */
-    typedef std::vector<std::pair<std::string, std::vector<std::string>>> AnimationClipLibrary;
+    using AnimationClipLibrary = std::vector<std::pair<std::string, std::vector<std::string>>> ;
     AnimationClipLibrary mAnimationClipLibrary;
 
     /** Pointer to the root node. Don't delete, it just points to one of
@@ -370,20 +331,14 @@ protected:
     Collada::FormatVersion mFormat;
 };
 
-// ------------------------------------------------------------------------------------------------
-// Check for element match
-inline bool ColladaParser::IsElement(const char *pName) const {
-    ai_assert(mReader->getNodeType() == irr::io::EXN_ELEMENT);
-    return ::strcmp(mReader->getNodeName(), pName) == 0;
-}
-
 // ------------------------------------------------------------------------------------------------
 // Finds the item in the given library by its reference, throws if not found
 template <typename Type>
 const Type &ColladaParser::ResolveLibraryReference(const std::map<std::string, Type> &pLibrary, const std::string &pURL) const {
     typename std::map<std::string, Type>::const_iterator it = pLibrary.find(pURL);
-    if (it == pLibrary.end())
-        ThrowException(Formatter::format() << "Unable to resolve library reference \"" << pURL << "\".");
+    if (it == pLibrary.end()) {
+        throw DeadlyImportError("Unable to resolve library reference \"", pURL, "\".");
+    }
     return it->second;
 }
 
diff --git a/code/AssetLib/DXF/DXFLoader.cpp b/code/AssetLib/DXF/DXFLoader.cpp
index 97b0d19dd..cda391fb8 100644
--- a/code/AssetLib/DXF/DXFLoader.cpp
+++ b/code/AssetLib/DXF/DXFLoader.cpp
@@ -152,7 +152,7 @@ void DXFImporter::InternReadFile( const std::string& filename, aiScene* pScene,
 
     // Check whether we can read the file
     if( file.get() == nullptr ) {
-        throw DeadlyImportError( "Failed to open DXF file " + filename + "");
+        throw DeadlyImportError( "Failed to open DXF file ", filename, "");
     }
 
     // Check whether this is a binary DXF file - we can't read binary DXF files :-(
diff --git a/code/AssetLib/FBX/FBXBinaryTokenizer.cpp b/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
index 719b928bc..fae96a66a 100644
--- a/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
+++ b/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
@@ -54,6 +54,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/Exceptional.h>
 #include <assimp/ByteSwapper.h>
 #include <assimp/DefaultLogger.hpp>
+#include <assimp/StringUtils.h>
 
 namespace Assimp {
 namespace FBX {
@@ -126,7 +127,7 @@ namespace {
 AI_WONT_RETURN void TokenizeError(const std::string& message, size_t offset) AI_WONT_RETURN_SUFFIX;
 AI_WONT_RETURN void TokenizeError(const std::string& message, size_t offset)
 {
-    throw DeadlyImportError(Util::AddOffset("FBX-Tokenize",message,offset));
+    throw DeadlyImportError("FBX-Tokenize", Util::GetOffsetText(offset), message);
 }
 
 
@@ -374,6 +375,11 @@ bool ReadScope(TokenList& output_tokens, const char* input, const char*& cursor,
 
     // now come the individual properties
     const char* begin_cursor = cursor;
+
+    if ((begin_cursor + prop_length) > end) {
+        TokenizeError("property length out of bounds reading length ", input, cursor);
+    }
+
     for (unsigned int i = 0; i < prop_count; ++i) {
         ReadData(sbeg, send, input, cursor, begin_cursor + prop_length);
 
@@ -456,11 +462,21 @@ void TokenizeBinary(TokenList& output_tokens, const char* input, size_t length)
 	ASSIMP_LOG_DEBUG_F("FBX version: ", version);
 	const bool is64bits = version >= 7500;
     const char *end = input + length;
-    while (cursor < end ) {
-		if (!ReadScope(output_tokens, input, cursor, input + length, is64bits)) {
-            break;
+    try
+    {
+        while (cursor < end ) {
+		    if (!ReadScope(output_tokens, input, cursor, input + length, is64bits)) {
+                break;
+            }
         }
     }
+    catch (const DeadlyImportError& e)
+    {
+        if (!is64bits && (length > std::numeric_limits<std::uint32_t>::max())) {
+            throw DeadlyImportError("The FBX file is invalid. This may be because the content is too big for this older version (", to_string(version), ") of the FBX format. (", e.what(), ")");
+        }
+        throw;
+    }
 }
 
 } // !FBX
diff --git a/code/AssetLib/FBX/FBXConverter.cpp b/code/AssetLib/FBX/FBXConverter.cpp
index 041153080..c27e48076 100644
--- a/code/AssetLib/FBX/FBXConverter.cpp
+++ b/code/AssetLib/FBX/FBXConverter.cpp
@@ -79,7 +79,7 @@ using namespace Util;
 
 #define MAGIC_NODE_TAG "_$AssimpFbx$"
 
-#define CONVERT_FBX_TIME(time) static_cast<double>(time) / 46186158000LL
+#define CONVERT_FBX_TIME(time) (static_cast<double>(time) * 1000.0 / 46186158000LL)
 
 FBXConverter::FBXConverter(aiScene *out, const Document &doc, bool removeEmptyBones) :
         defaultMaterialIndex(),
@@ -185,6 +185,17 @@ std::string FBXConverter::MakeUniqueNodeName(const Model *const model, const aiN
     return unique_name;
 }
 
+/// This struct manages nodes which may or may not end up in the node hierarchy.
+/// When a node becomes a child of another node, that node becomes its owner and mOwnership should be released.
+struct FBXConverter::PotentialNode
+{
+    PotentialNode() : mOwnership(new aiNode), mNode(mOwnership.get()) {}
+    PotentialNode(const std::string& name) : mOwnership(new aiNode(name)), mNode(mOwnership.get()) {}
+    aiNode* operator->() { return mNode; }
+    std::unique_ptr<aiNode> mOwnership;
+    aiNode* mNode;
+};
+
 /// todo: pre-build node hierarchy
 /// todo: get bone from stack
 /// todo: make map of aiBone* to aiNode*
@@ -192,137 +203,129 @@ std::string FBXConverter::MakeUniqueNodeName(const Model *const model, const aiN
 void FBXConverter::ConvertNodes(uint64_t id, aiNode *parent, aiNode *root_node) {
     const std::vector<const Connection *> &conns = doc.GetConnectionsByDestinationSequenced(id, "Model");
 
-    std::vector<aiNode *> nodes;
+    std::vector<PotentialNode> nodes;
     nodes.reserve(conns.size());
 
-    std::vector<aiNode *> nodes_chain;
-    std::vector<aiNode *> post_nodes_chain;
+    std::vector<PotentialNode> nodes_chain;
+    std::vector<PotentialNode> post_nodes_chain;
 
-    try {
-        for (const Connection *con : conns) {
-            // ignore object-property links
-            if (con->PropertyName().length()) {
-                // really important we document why this is ignored.
-                FBXImporter::LogInfo("ignoring property link - no docs on why this is ignored");
-                continue; //?
+    for (const Connection *con : conns) {
+        // ignore object-property links
+        if (con->PropertyName().length()) {
+            // really important we document why this is ignored.
+            FBXImporter::LogInfo("ignoring property link - no docs on why this is ignored");
+            continue; //?
+        }
+
+        // convert connection source object into Object base class
+        const Object *const object = con->SourceObject();
+        if (nullptr == object) {
+            FBXImporter::LogError("failed to convert source object for Model link");
+            continue;
+        }
+
+        // FBX Model::Cube, Model::Bone001, etc elements
+        // This detects if we can cast the object into this model structure.
+        const Model *const model = dynamic_cast<const Model *>(object);
+
+        if (nullptr != model) {
+            nodes_chain.clear();
+            post_nodes_chain.clear();
+
+            aiMatrix4x4 new_abs_transform = parent->mTransformation;
+            std::string node_name = FixNodeName(model->Name());
+            // even though there is only a single input node, the design of
+            // assimp (or rather: the complicated transformation chain that
+            // is employed by fbx) means that we may need multiple aiNode's
+            // to represent a fbx node's transformation.
+
+            // generate node transforms - this includes pivot data
+            // if need_additional_node is true then you t
+            const bool need_additional_node = GenerateTransformationNodeChain(*model, node_name, nodes_chain, post_nodes_chain);
+
+            // assert that for the current node we must have at least a single transform
+            ai_assert(nodes_chain.size());
+
+            if (need_additional_node) {
+                nodes_chain.emplace_back(PotentialNode(node_name));
             }
 
-            // convert connection source object into Object base class
-            const Object *const object = con->SourceObject();
-            if (nullptr == object) {
-                FBXImporter::LogError("failed to convert source object for Model link");
-                continue;
-            }
+            //setup metadata on newest node
+            SetupNodeMetadata(*model, *nodes_chain.back().mNode);
 
-            // FBX Model::Cube, Model::Bone001, etc elements
-            // This detects if we can cast the object into this model structure.
-            const Model *const model = dynamic_cast<const Model *>(object);
+            // link all nodes in a row
+            aiNode *last_parent = parent;
+            for (PotentialNode& child : nodes_chain) {
+                ai_assert(child.mNode);
 
-            if (nullptr != model) {
-                nodes_chain.clear();
-                post_nodes_chain.clear();
-
-                aiMatrix4x4 new_abs_transform = parent->mTransformation;
-                std::string node_name = FixNodeName(model->Name());
-                // even though there is only a single input node, the design of
-                // assimp (or rather: the complicated transformation chain that
-                // is employed by fbx) means that we may need multiple aiNode's
-                // to represent a fbx node's transformation.
-
-                // generate node transforms - this includes pivot data
-                // if need_additional_node is true then you t
-                const bool need_additional_node = GenerateTransformationNodeChain(*model, node_name, nodes_chain, post_nodes_chain);
-
-                // assert that for the current node we must have at least a single transform
-                ai_assert(nodes_chain.size());
-
-                if (need_additional_node) {
-                    nodes_chain.push_back(new aiNode(node_name));
+                if (last_parent != parent) {
+                    last_parent->mNumChildren = 1;
+                    last_parent->mChildren = new aiNode *[1];
+                    last_parent->mChildren[0] = child.mOwnership.release();
                 }
 
-                //setup metadata on newest node
-                SetupNodeMetadata(*model, *nodes_chain.back());
+                child->mParent = last_parent;
+                last_parent = child.mNode;
 
-                // link all nodes in a row
-                aiNode *last_parent = parent;
-                for (aiNode *child : nodes_chain) {
-                    ai_assert(child);
+                new_abs_transform *= child->mTransformation;
+            }
+
+            // attach geometry
+            ConvertModel(*model, nodes_chain.back().mNode, root_node, new_abs_transform);
+
+            // check if there will be any child nodes
+            const std::vector<const Connection *> &child_conns = doc.GetConnectionsByDestinationSequenced(model->ID(), "Model");
+
+            // if so, link the geometric transform inverse nodes
+            // before we attach any child nodes
+            if (child_conns.size()) {
+                for (PotentialNode& postnode : post_nodes_chain) {
+                    ai_assert(postnode.mNode);
 
                     if (last_parent != parent) {
                         last_parent->mNumChildren = 1;
                         last_parent->mChildren = new aiNode *[1];
-                        last_parent->mChildren[0] = child;
+                        last_parent->mChildren[0] = postnode.mOwnership.release();
                     }
 
-                    child->mParent = last_parent;
-                    last_parent = child;
+                    postnode->mParent = last_parent;
+                    last_parent = postnode.mNode;
 
-                    new_abs_transform *= child->mTransformation;
+                    new_abs_transform *= postnode->mTransformation;
                 }
-
-                // attach geometry
-                ConvertModel(*model, nodes_chain.back(), root_node, new_abs_transform);
-
-                // check if there will be any child nodes
-                const std::vector<const Connection *> &child_conns = doc.GetConnectionsByDestinationSequenced(model->ID(), "Model");
-
-                // if so, link the geometric transform inverse nodes
-                // before we attach any child nodes
-                if (child_conns.size()) {
-                    for (aiNode *postnode : post_nodes_chain) {
-                        ai_assert(postnode);
-
-                        if (last_parent != parent) {
-                            last_parent->mNumChildren = 1;
-                            last_parent->mChildren = new aiNode *[1];
-                            last_parent->mChildren[0] = postnode;
-                        }
-
-                        postnode->mParent = last_parent;
-                        last_parent = postnode;
-
-                        new_abs_transform *= postnode->mTransformation;
-                    }
-                } else {
-                    // free the nodes we allocated as we don't need them
-                    Util::delete_fun<aiNode> deleter;
-                    std::for_each(
-                            post_nodes_chain.begin(),
-                            post_nodes_chain.end(),
-                            deleter);
-                }
-
-                // recursion call - child nodes
-                ConvertNodes(model->ID(), last_parent, root_node);
-
-                if (doc.Settings().readLights) {
-                    ConvertLights(*model, node_name);
-                }
-
-                if (doc.Settings().readCameras) {
-                    ConvertCameras(*model, node_name);
-                }
-
-                nodes.push_back(nodes_chain.front());
-                nodes_chain.clear();
+            } else {
+                // free the nodes we allocated as we don't need them
+                post_nodes_chain.clear();
             }
+
+            // recursion call - child nodes
+            ConvertNodes(model->ID(), last_parent, root_node);
+
+            if (doc.Settings().readLights) {
+                ConvertLights(*model, node_name);
+            }
+
+            if (doc.Settings().readCameras) {
+                ConvertCameras(*model, node_name);
+            }
+
+            nodes.push_back(std::move(nodes_chain.front()));
+            nodes_chain.clear();
         }
+    }
 
-        if (nodes.size()) {
-            parent->mChildren = new aiNode *[nodes.size()]();
-            parent->mNumChildren = static_cast<unsigned int>(nodes.size());
+    if (nodes.size()) {
+        parent->mChildren = new aiNode *[nodes.size()]();
+        parent->mNumChildren = static_cast<unsigned int>(nodes.size());
 
-            std::swap_ranges(nodes.begin(), nodes.end(), parent->mChildren);
-        } else {
-            parent->mNumChildren = 0;
-            parent->mChildren = nullptr;
+        for (unsigned int i = 0; i < nodes.size(); ++i)
+        {
+            parent->mChildren[i] = nodes[i].mOwnership.release();
         }
-
-    } catch (std::exception &) {
-        Util::delete_fun<aiNode> deleter;
-        std::for_each(nodes.begin(), nodes.end(), deleter);
-        std::for_each(nodes_chain.begin(), nodes_chain.end(), deleter);
-        std::for_each(post_nodes_chain.begin(), post_nodes_chain.end(), deleter);
+        nodes.clear();
+    } else {
+        parent->mNumChildren = 0;
+        parent->mChildren = nullptr;
     }
 }
 
@@ -681,8 +684,8 @@ std::string FBXConverter::NameTransformationChainNode(const std::string &name, T
     return name + std::string(MAGIC_NODE_TAG) + "_" + NameTransformationComp(comp);
 }
 
-bool FBXConverter::GenerateTransformationNodeChain(const Model &model, const std::string &name, std::vector<aiNode *> &output_nodes,
-        std::vector<aiNode *> &post_output_nodes) {
+bool FBXConverter::GenerateTransformationNodeChain(const Model &model, const std::string &name, std::vector<PotentialNode> &output_nodes,
+        std::vector<PotentialNode> &post_output_nodes) {
     const PropertyTable &props = model.Props();
     const Model::RotOrder rot = model.RotationOrder();
 
@@ -828,7 +831,7 @@ bool FBXConverter::GenerateTransformationNodeChain(const Model &model, const std
                 chain[i] = chain[i].Inverse();
             }
 
-            aiNode *nd = new aiNode();
+            PotentialNode nd;
             nd->mName.Set(NameTransformationChainNode(name, comp));
             nd->mTransformation = chain[i];
 
@@ -836,9 +839,9 @@ bool FBXConverter::GenerateTransformationNodeChain(const Model &model, const std
             if (comp == TransformationComp_GeometricScalingInverse ||
                     comp == TransformationComp_GeometricRotationInverse ||
                     comp == TransformationComp_GeometricTranslationInverse) {
-                post_output_nodes.push_back(nd);
+                post_output_nodes.emplace_back(std::move(nd));
             } else {
-                output_nodes.push_back(nd);
+                output_nodes.emplace_back(std::move(nd));
             }
         }
 
@@ -847,8 +850,7 @@ bool FBXConverter::GenerateTransformationNodeChain(const Model &model, const std
     }
 
     // else, we can just multiply the matrices together
-    aiNode *nd = new aiNode();
-    output_nodes.push_back(nd);
+    PotentialNode nd;
 
     // name passed to the method is already unique
     nd->mName.Set(name);
@@ -857,6 +859,7 @@ bool FBXConverter::GenerateTransformationNodeChain(const Model &model, const std
     for (unsigned int i = TransformationComp_Translation; i < TransformationComp_MAXIMUM; i++) {
       nd->mTransformation = nd->mTransformation * chain[i];
     }
+    output_nodes.push_back(std::move(nd));
     return false;
 }
   
@@ -1715,14 +1718,14 @@ aiString FBXConverter::GetTexturePath(const Texture *tex) {
         bool textureReady = false; //tells if our texture is ready (if it was loaded or if it was found)
         unsigned int index=0;
 
-        VideoMap::const_iterator it = textures_converted.find(*media);
+        VideoMap::const_iterator it = textures_converted.find(media);
         if (it != textures_converted.end()) {
             index = (*it).second;
             textureReady = true;
         } else {
             if (media->ContentLength() > 0) {
                 index = ConvertVideo(*media);
-                textures_converted[*media] = index;
+                textures_converted[media] = index;
                 textureReady = true;
             }
         }
@@ -1988,6 +1991,7 @@ void FBXConverter::SetTextureProperties(aiMaterial *out_mat, const TextureMap &_
     TrySetTextureProperties(out_mat, _textures, "ShininessExponent", aiTextureType_SHININESS, mesh);
     TrySetTextureProperties(out_mat, _textures, "TransparencyFactor", aiTextureType_OPACITY, mesh);
     TrySetTextureProperties(out_mat, _textures, "EmissiveFactor", aiTextureType_EMISSIVE, mesh);
+    TrySetTextureProperties(out_mat, _textures, "ReflectionFactor", aiTextureType_METALNESS, mesh);
     //Maya counterparts
     TrySetTextureProperties(out_mat, _textures, "Maya|DiffuseTexture", aiTextureType_DIFFUSE, mesh);
     TrySetTextureProperties(out_mat, _textures, "Maya|NormalTexture", aiTextureType_NORMALS, mesh);
@@ -2010,12 +2014,40 @@ void FBXConverter::SetTextureProperties(aiMaterial *out_mat, const TextureMap &_
     TrySetTextureProperties(out_mat, _textures, "Maya|TEX_roughness_map", aiTextureType_DIFFUSE_ROUGHNESS, mesh);
     TrySetTextureProperties(out_mat, _textures, "Maya|TEX_ao_map", aiTextureType_AMBIENT_OCCLUSION, mesh);
 
-    // 3DSMax PBR
+    // 3DSMax Physical material
     TrySetTextureProperties(out_mat, _textures, "3dsMax|Parameters|base_color_map", aiTextureType_BASE_COLOR, mesh);
     TrySetTextureProperties(out_mat, _textures, "3dsMax|Parameters|bump_map", aiTextureType_NORMAL_CAMERA, mesh);
     TrySetTextureProperties(out_mat, _textures, "3dsMax|Parameters|emission_map", aiTextureType_EMISSION_COLOR, mesh);
     TrySetTextureProperties(out_mat, _textures, "3dsMax|Parameters|metalness_map", aiTextureType_METALNESS, mesh);
     TrySetTextureProperties(out_mat, _textures, "3dsMax|Parameters|roughness_map", aiTextureType_DIFFUSE_ROUGHNESS, mesh);
+
+    // 3DSMax PBR materials
+    TrySetTextureProperties(out_mat, _textures, "3dsMax|main|base_color_map", aiTextureType_BASE_COLOR, mesh);
+    TrySetTextureProperties(out_mat, _textures, "3dsMax|main|norm_map", aiTextureType_NORMAL_CAMERA, mesh);
+    TrySetTextureProperties(out_mat, _textures, "3dsMax|main|emit_color_map", aiTextureType_EMISSION_COLOR, mesh);
+    TrySetTextureProperties(out_mat, _textures, "3dsMax|main|ao_map", aiTextureType_AMBIENT_OCCLUSION, mesh);
+    TrySetTextureProperties(out_mat, _textures, "3dsMax|main|opacity_map", aiTextureType_OPACITY, mesh);
+    // Metalness/Roughness material type
+    TrySetTextureProperties(out_mat, _textures, "3dsMax|main|metalness_map", aiTextureType_METALNESS, mesh);
+    // Specular/Gloss material type
+    TrySetTextureProperties(out_mat, _textures, "3dsMax|main|specular_map", aiTextureType_SPECULAR, mesh);
+
+    // Glossiness vs roughness in 3ds Max Pbr Materials
+    int useGlossiness;
+    if (out_mat->Get("$raw.3dsMax|main|useGlossiness", aiTextureType_NONE, 0, useGlossiness) == aiReturn_SUCCESS) {
+        // These textures swap meaning if ((useGlossiness == 1) != (material type is Specular/Gloss))
+        if (useGlossiness == 1) {
+            TrySetTextureProperties(out_mat, _textures, "3dsMax|main|roughness_map", aiTextureType_SHININESS, mesh);
+            TrySetTextureProperties(out_mat, _textures, "3dsMax|main|glossiness_map", aiTextureType_SHININESS, mesh);
+        }
+        else if (useGlossiness == 2) {
+            TrySetTextureProperties(out_mat, _textures, "3dsMax|main|roughness_map", aiTextureType_DIFFUSE_ROUGHNESS, mesh);
+            TrySetTextureProperties(out_mat, _textures, "3dsMax|main|glossiness_map", aiTextureType_DIFFUSE_ROUGHNESS, mesh);
+        }
+        else {
+            FBXImporter::LogWarn("A 3dsMax Pbr Material must have a useGlossiness value to correctly interpret roughness and glossiness textures.");
+        }
+    }
 }
 
 void FBXConverter::SetTextureProperties(aiMaterial *out_mat, const LayeredTextureMap &layeredTextures, const MeshGeometry *const mesh) {
@@ -2220,12 +2252,12 @@ void FBXConverter::SetShadingPropertiesRaw(aiMaterial *out_mat, const PropertyTa
             if (media != nullptr && media->ContentLength() > 0) {
                 unsigned int index;
 
-                VideoMap::const_iterator videoIt = textures_converted.find(*media);
+                VideoMap::const_iterator videoIt = textures_converted.find(media);
                 if (videoIt != textures_converted.end()) {
                     index = videoIt->second;
                 } else {
                     index = ConvertVideo(*media);
-                    textures_converted[*media] = index;
+                    textures_converted[media] = index;
                 }
 
                 // setup texture reference string (copied from ColladaLoader::FindFilenameForEffectTexture)
@@ -2528,7 +2560,7 @@ void FBXConverter::ConvertAnimationStack(const AnimationStack &st) {
                     meshMorphAnim->mKeys[j].mNumValuesAndWeights = numValuesAndWeights;
                     meshMorphAnim->mKeys[j].mValues = new unsigned int[numValuesAndWeights];
                     meshMorphAnim->mKeys[j].mWeights = new double[numValuesAndWeights];
-                    meshMorphAnim->mKeys[j].mTime = CONVERT_FBX_TIME(animIt.first) * anim_fps;
+                    meshMorphAnim->mKeys[j].mTime = CONVERT_FBX_TIME(animIt.first);
                     for (unsigned int k = 0; k < numValuesAndWeights; k++) {
                         meshMorphAnim->mKeys[j].mValues[k] = keyData->values.at(k);
                         meshMorphAnim->mKeys[j].mWeights[k] = keyData->weights.at(k);
@@ -2546,8 +2578,8 @@ void FBXConverter::ConvertAnimationStack(const AnimationStack &st) {
         return;
     }
 
-    double start_time_fps = has_local_startstop ? (CONVERT_FBX_TIME(start_time) * anim_fps) : min_time;
-    double stop_time_fps = has_local_startstop ? (CONVERT_FBX_TIME(stop_time) * anim_fps) : max_time;
+    double start_time_fps = has_local_startstop ? CONVERT_FBX_TIME(start_time) : min_time;
+    double stop_time_fps = has_local_startstop ? CONVERT_FBX_TIME(stop_time) : max_time;
 
     // adjust relative timing for animation
     for (unsigned int c = 0; c < anim->mNumChannels; c++) {
@@ -3067,7 +3099,7 @@ aiNodeAnim* FBXConverter::GenerateSimpleNodeAnim(const std::string& name,
         InterpolateKeys(outTranslations, keytimes, keyframeLists[TransformationComp_Translation], defTranslate, maxTime, minTime);
     } else {
         for (size_t i = 0; i < keyCount; ++i) {
-            outTranslations[i].mTime = CONVERT_FBX_TIME(keytimes[i]) * anim_fps;
+            outTranslations[i].mTime = CONVERT_FBX_TIME(keytimes[i]);
             outTranslations[i].mValue = defTranslate;
         }
     }
@@ -3076,7 +3108,7 @@ aiNodeAnim* FBXConverter::GenerateSimpleNodeAnim(const std::string& name,
         InterpolateKeys(outRotations, keytimes, keyframeLists[TransformationComp_Rotation], defRotation, maxTime, minTime, rotOrder);
     } else {
         for (size_t i = 0; i < keyCount; ++i) {
-            outRotations[i].mTime = CONVERT_FBX_TIME(keytimes[i]) * anim_fps;
+            outRotations[i].mTime = CONVERT_FBX_TIME(keytimes[i]);
             outRotations[i].mValue = defQuat;
         }
     }
@@ -3085,7 +3117,7 @@ aiNodeAnim* FBXConverter::GenerateSimpleNodeAnim(const std::string& name,
         InterpolateKeys(outScales, keytimes, keyframeLists[TransformationComp_Scaling], defScale, maxTime, minTime);
     } else {
         for (size_t i = 0; i < keyCount; ++i) {
-            outScales[i].mTime = CONVERT_FBX_TIME(keytimes[i]) * anim_fps;
+            outScales[i].mTime = CONVERT_FBX_TIME(keytimes[i]);
             outScales[i].mValue = defScale;
         }
     }
@@ -3274,7 +3306,7 @@ void FBXConverter::InterpolateKeys(aiVectorKey *valOut, const KeyTimeList &keys,
         }
 
         // magic value to convert fbx times to seconds
-        valOut->mTime = CONVERT_FBX_TIME(time) * anim_fps;
+        valOut->mTime = CONVERT_FBX_TIME(time);
 
         min_time = std::min(min_time, valOut->mTime);
         max_time = std::max(max_time, valOut->mTime);
@@ -3480,10 +3512,11 @@ void FBXConverter::ConvertOrphanedEmbeddedTextures() {
                 const char *obtype = key.begin();
                 const size_t length = static_cast<size_t>(key.end() - key.begin());
                 if (strncmp(obtype, "Texture", length) == 0) {
-                    const Texture *texture = static_cast<const Texture *>(object->Get());
-                    if (texture->Media() && texture->Media()->ContentLength() > 0) {
-                        realTexture = texture;
-                    }
+                    if (const Texture *texture = static_cast<const Texture *>(object->Get())) {
+                        if (texture->Media() && texture->Media()->ContentLength() > 0) {
+                            realTexture = texture;
+                        }
+                    }    
                 }
             } catch (...) {
                 // do nothing
@@ -3491,7 +3524,7 @@ void FBXConverter::ConvertOrphanedEmbeddedTextures() {
             if (realTexture) {
                 const Video *media = realTexture->Media();
                 unsigned int index = ConvertVideo(*media);
-                textures_converted[*media] = index;
+                textures_converted[media] = index;
             }
         }
     }
diff --git a/code/AssetLib/FBX/FBXConverter.h b/code/AssetLib/FBX/FBXConverter.h
index 7db4b795b..52f978a7b 100644
--- a/code/AssetLib/FBX/FBXConverter.h
+++ b/code/AssetLib/FBX/FBXConverter.h
@@ -171,9 +171,10 @@ private:
 
     // ------------------------------------------------------------------------------------------------
     /**
-    *  note: memory for output_nodes will be managed by the caller
+    *  note: memory for output_nodes is managed by the caller, via the PotentialNode struct.
     */
-    bool GenerateTransformationNodeChain(const Model& model, const std::string& name, std::vector<aiNode*>& output_nodes, std::vector<aiNode*>& post_output_nodes);
+    struct PotentialNode;
+    bool GenerateTransformationNodeChain(const Model& model, const std::string& name, std::vector<PotentialNode>& output_nodes, std::vector<PotentialNode>& post_output_nodes);
 
     // ------------------------------------------------------------------------------------------------
     void SetupNodeMetadata(const Model& model, aiNode& nd);
@@ -428,7 +429,7 @@ private:
     using MaterialMap = std::fbx_unordered_map<const Material*, unsigned int>;
     MaterialMap materials_converted;
 
-    using VideoMap = std::fbx_unordered_map<const Video, unsigned int>;
+    using VideoMap = std::fbx_unordered_map<const Video*, unsigned int>;
     VideoMap textures_converted;
 
     using MeshMap = std::fbx_unordered_map<const Geometry*, std::vector<unsigned int> >;
diff --git a/code/AssetLib/FBX/FBXDocument.h b/code/AssetLib/FBX/FBXDocument.h
index 165bb900e..85ccca5d0 100644
--- a/code/AssetLib/FBX/FBXDocument.h
+++ b/code/AssetLib/FBX/FBXDocument.h
@@ -638,20 +638,6 @@ public:
         return ptr;
     }
 
-    bool operator==(const Video& other) const
-    {
-        return (
-               type == other.type
-            && relativeFileName == other.relativeFileName
-            && fileName == other.fileName
-        );
-    }
-
-    bool operator<(const Video& other) const
-    {
-        return std::tie(type, relativeFileName, fileName) < std::tie(other.type, other.relativeFileName, other.fileName);
-    }
-
 private:
     std::string type;
     std::string relativeFileName;
@@ -1192,25 +1178,4 @@ private:
 } // Namespace FBX
 } // Namespace Assimp
 
-namespace std
-{
-    template <>
-    struct hash<const Assimp::FBX::Video>
-    {
-        std::size_t operator()(const Assimp::FBX::Video& video) const
-        {
-            using std::size_t;
-            using std::hash;
-            using std::string;
-
-            size_t res = 17;
-            res = res * 31 + hash<string>()(video.Name());
-            res = res * 31 + hash<string>()(video.RelativeFilename());
-            res = res * 31 + hash<string>()(video.Type());
-
-            return res;
-        }
-    };
-}
-
 #endif // INCLUDED_AI_FBX_DOCUMENT_H
diff --git a/code/AssetLib/FBX/FBXDocumentUtil.cpp b/code/AssetLib/FBX/FBXDocumentUtil.cpp
index 16235645c..42c056628 100644
--- a/code/AssetLib/FBX/FBXDocumentUtil.cpp
+++ b/code/AssetLib/FBX/FBXDocumentUtil.cpp
@@ -61,7 +61,7 @@ namespace Util {
 // signal DOM construction error, this is always unrecoverable. Throws DeadlyImportError.
 void DOMError(const std::string& message, const Token& token)
 {
-    throw DeadlyImportError(Util::AddTokenText("FBX-DOM",message,&token));
+    throw DeadlyImportError("FBX-DOM", Util::GetTokenText(&token), message);
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -70,7 +70,7 @@ void DOMError(const std::string& message, const Element* element /*= nullptr*/)
     if(element) {
         DOMError(message,element->KeyToken());
     }
-    throw DeadlyImportError("FBX-DOM " + message);
+    throw DeadlyImportError("FBX-DOM ", message);
 }
 
 
@@ -79,7 +79,7 @@ void DOMError(const std::string& message, const Element* element /*= nullptr*/)
 void DOMWarning(const std::string& message, const Token& token)
 {
     if(DefaultLogger::get()) {
-        ASSIMP_LOG_WARN(Util::AddTokenText("FBX-DOM",message,&token));
+        ASSIMP_LOG_WARN_F("FBX-DOM", Util::GetTokenText(&token), message);
     }
 }
 
diff --git a/code/AssetLib/FBX/FBXExporter.cpp b/code/AssetLib/FBX/FBXExporter.cpp
index 3fc7701f5..99ab7508e 100644
--- a/code/AssetLib/FBX/FBXExporter.cpp
+++ b/code/AssetLib/FBX/FBXExporter.cpp
@@ -400,6 +400,65 @@ void FBXExporter::WriteHeaderExtension ()
     );
 }
 
+// WriteGlobalSettings helpers
+
+void WritePropInt(const aiScene* scene, FBX::Node& p, const std::string& key, int defaultValue)
+{
+    int value;
+    if (scene->mMetaData != nullptr && scene->mMetaData->Get(key, value)) {
+        p.AddP70int(key, value);
+    } else {
+        p.AddP70int(key, defaultValue);
+    }
+}
+
+void WritePropDouble(const aiScene* scene, FBX::Node& p, const std::string& key, double defaultValue)
+{
+    double value;
+    if (scene->mMetaData != nullptr && scene->mMetaData->Get(key, value)) {
+        p.AddP70double(key, value);
+    } else {
+        // fallback lookup float instead
+        float floatValue;
+        if (scene->mMetaData != nullptr && scene->mMetaData->Get(key, floatValue)) {
+            p.AddP70double(key, (double)floatValue);
+        } else {
+            p.AddP70double(key, defaultValue);
+        }
+    }
+}
+
+void WritePropEnum(const aiScene* scene, FBX::Node& p, const std::string& key, int defaultValue)
+{
+    int value;
+    if (scene->mMetaData != nullptr && scene->mMetaData->Get(key, value)) {
+        p.AddP70enum(key, value);
+    } else {
+        p.AddP70enum(key, defaultValue);
+    }
+}
+
+void WritePropColor(const aiScene* scene, FBX::Node& p, const std::string& key, const aiVector3D& defaultValue)
+{
+    aiVector3D value;
+    if (scene->mMetaData != nullptr && scene->mMetaData->Get(key, value)) {
+        // ai_real can be float or double, cast to avoid warnings
+        p.AddP70color(key, (double)value.x, (double)value.y, (double)value.z);
+    } else {
+        p.AddP70color(key, (double)defaultValue.x, (double)defaultValue.y, (double)defaultValue.z);
+    }
+}
+
+void WritePropString(const aiScene* scene, FBX::Node& p, const std::string& key, const std::string& defaultValue)
+{
+    aiString value; // MetaData doesn't hold std::string
+    if (scene->mMetaData != nullptr && scene->mMetaData->Get(key, value)) {
+        p.AddP70string(key, value.C_Str());
+    } else {
+        p.AddP70string(key, defaultValue);
+    }
+}
+
 void FBXExporter::WriteGlobalSettings ()
 {
     if (!binary) {
@@ -409,26 +468,26 @@ void FBXExporter::WriteGlobalSettings ()
     gs.AddChild("Version", int32_t(1000));
 
     FBX::Node p("Properties70");
-    p.AddP70int("UpAxis", 1);
-    p.AddP70int("UpAxisSign", 1);
-    p.AddP70int("FrontAxis", 2);
-    p.AddP70int("FrontAxisSign", 1);
-    p.AddP70int("CoordAxis", 0);
-    p.AddP70int("CoordAxisSign", 1);
-    p.AddP70int("OriginalUpAxis", 1);
-    p.AddP70int("OriginalUpAxisSign", 1);
-    p.AddP70double("UnitScaleFactor", 1.0);
-    p.AddP70double("OriginalUnitScaleFactor", 1.0);
-    p.AddP70color("AmbientColor", 0.0, 0.0, 0.0);
-    p.AddP70string("DefaultCamera", "Producer Perspective");
-    p.AddP70enum("TimeMode", 11);
-    p.AddP70enum("TimeProtocol", 2);
-    p.AddP70enum("SnapOnFrameMode", 0);
+    WritePropInt(mScene, p, "UpAxis", 1);
+    WritePropInt(mScene, p, "UpAxisSign", 1);
+    WritePropInt(mScene, p, "FrontAxis", 2);
+    WritePropInt(mScene, p, "FrontAxisSign", 1);
+    WritePropInt(mScene, p, "CoordAxis", 0);
+    WritePropInt(mScene, p, "CoordAxisSign", 1);
+    WritePropInt(mScene, p, "OriginalUpAxis", 1);
+    WritePropInt(mScene, p, "OriginalUpAxisSign", 1);
+    WritePropDouble(mScene, p, "UnitScaleFactor", 1.0);
+    WritePropDouble(mScene, p, "OriginalUnitScaleFactor", 1.0);
+    WritePropColor(mScene, p, "AmbientColor", aiVector3D((ai_real)0.0, (ai_real)0.0, (ai_real)0.0));
+    WritePropString(mScene, p,"DefaultCamera", "Producer Perspective");
+    WritePropEnum(mScene, p, "TimeMode", 11);
+    WritePropEnum(mScene, p, "TimeProtocol", 2);
+    WritePropEnum(mScene, p, "SnapOnFrameMode", 0);
     p.AddP70time("TimeSpanStart", 0); // TODO: animation support
     p.AddP70time("TimeSpanStop", FBX::SECOND); // TODO: animation support
-    p.AddP70double("CustomFrameRate", -1.0);
+    WritePropDouble(mScene, p, "CustomFrameRate", -1.0);
     p.AddP70("TimeMarker", "Compound", "", ""); // not sure what this is
-    p.AddP70int("CurrentTimeMarker", -1);
+    WritePropInt(mScene, p, "CurrentTimeMarker", -1);
     gs.AddChild(p);
 
     gs.Dump(outfile, binary, 0);
diff --git a/code/AssetLib/FBX/FBXImporter.cpp b/code/AssetLib/FBX/FBXImporter.cpp
index 8c908be40..a097568a5 100644
--- a/code/AssetLib/FBX/FBXImporter.cpp
+++ b/code/AssetLib/FBX/FBXImporter.cpp
@@ -130,6 +130,7 @@ void FBXImporter::SetupProperties(const Importer *pImp) {
 	settings.readCameras = pImp->GetPropertyBool(AI_CONFIG_IMPORT_FBX_READ_CAMERAS, true);
 	settings.readLights = pImp->GetPropertyBool(AI_CONFIG_IMPORT_FBX_READ_LIGHTS, true);
 	settings.readAnimations = pImp->GetPropertyBool(AI_CONFIG_IMPORT_FBX_READ_ANIMATIONS, true);
+	settings.readWeights = pImp->GetPropertyBool(AI_CONFIG_IMPORT_FBX_READ_WEIGHTS, true);
 	settings.strictMode = pImp->GetPropertyBool(AI_CONFIG_IMPORT_FBX_STRICT_MODE, false);
 	settings.preservePivots = pImp->GetPropertyBool(AI_CONFIG_IMPORT_FBX_PRESERVE_PIVOTS, true);
 	settings.optimizeEmptyAnimationCurves = pImp->GetPropertyBool(AI_CONFIG_IMPORT_FBX_OPTIMIZE_EMPTY_ANIMATION_CURVES, true);
@@ -141,7 +142,10 @@ void FBXImporter::SetupProperties(const Importer *pImp) {
 // ------------------------------------------------------------------------------------------------
 // Imports the given file into the given scene structure.
 void FBXImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSystem *pIOHandler) {
-	std::unique_ptr<IOStream> stream(pIOHandler->Open(pFile, "rb"));
+	auto streamCloser = [&](IOStream *pStream) {
+		pIOHandler->Close(pStream);
+	};
+	std::unique_ptr<IOStream, decltype(streamCloser)> stream(pIOHandler->Open(pFile, "rb"), streamCloser);
 	if (!stream) {
 		ThrowException("Could not open file for reading");
 	}
@@ -184,6 +188,11 @@ void FBXImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
 
 		// size relative to cm
 		float size_relative_to_cm = doc.GlobalSettings().UnitScaleFactor();
+        if (size_relative_to_cm == 0.0)
+        {
+			// BaseImporter later asserts that fileScale is non-zero.
+			ThrowException("The UnitScaleFactor must be non-zero");
+        }
 
 		// Set FBX file scale is relative to CM must be converted to M for
 		// assimp universal format (M)
diff --git a/code/AssetLib/FBX/FBXMaterial.cpp b/code/AssetLib/FBX/FBXMaterial.cpp
index 9679e62a5..9fe4ce5be 100644
--- a/code/AssetLib/FBX/FBXMaterial.cpp
+++ b/code/AssetLib/FBX/FBXMaterial.cpp
@@ -86,7 +86,7 @@ Material::Material(uint64_t id, const Element& element, const Document& doc, con
     std::string templateName;
 
     // lower-case shading because Blender (for example) writes "Phong"
-    std::transform(shading.begin(), shading.end(), shading.begin(), Assimp::ToLower<char>);
+    std::transform(shading.data(), shading.data() + shading.size(), std::addressof(shading[0]), Assimp::ToLower<char>);
     if(shading == "phong") {
         templateName = "Material.FbxSurfacePhong";
     }
diff --git a/code/AssetLib/FBX/FBXParser.cpp b/code/AssetLib/FBX/FBXParser.cpp
index 3c9137ccc..8d4bbd866 100644
--- a/code/AssetLib/FBX/FBXParser.cpp
+++ b/code/AssetLib/FBX/FBXParser.cpp
@@ -73,7 +73,7 @@ namespace {
     AI_WONT_RETURN void ParseError(const std::string& message, const Token& token) AI_WONT_RETURN_SUFFIX;
     AI_WONT_RETURN void ParseError(const std::string& message, const Token& token)
     {
-        throw DeadlyImportError(Util::AddTokenText("FBX-Parser",message,&token));
+        throw DeadlyImportError("FBX-Parser", Util::GetTokenText(&token), message);
     }
 
     // ------------------------------------------------------------------------------------------------
@@ -83,7 +83,7 @@ namespace {
         if(element) {
             ParseError(message,element->KeyToken());
         }
-        throw DeadlyImportError("FBX-Parser " + message);
+        throw DeadlyImportError("FBX-Parser ", message);
     }
 
 
@@ -641,7 +641,11 @@ void ParseVectorDataArray(std::vector<aiVector3D>& out, const Element& el)
         ReadBinaryDataArray(type, count, data, end, buff, el);
 
         ai_assert(data == end);
-        ai_assert(buff.size() == count * (type == 'd' ? 8 : 4));
+        uint64_t dataToRead = static_cast<uint64_t>(count) * (type == 'd' ? 8 : 4);
+        ai_assert(buff.size() == dataToRead);
+        if (dataToRead > buff.size()) {
+            ParseError("Invalid read size (binary)",&el);
+        }
 
         const uint32_t count3 = count / 3;
         out.reserve(count3);
@@ -728,7 +732,11 @@ void ParseVectorDataArray(std::vector<aiColor4D>& out, const Element& el)
         ReadBinaryDataArray(type, count, data, end, buff, el);
 
         ai_assert(data == end);
-        ai_assert(buff.size() == count * (type == 'd' ? 8 : 4));
+        uint64_t dataToRead = static_cast<uint64_t>(count) * (type == 'd' ? 8 : 4);
+        ai_assert(buff.size() == dataToRead);
+        if (dataToRead > buff.size()) {
+            ParseError("Invalid read size (binary)",&el);
+        }
 
         const uint32_t count4 = count / 4;
         out.reserve(count4);
@@ -807,7 +815,11 @@ void ParseVectorDataArray(std::vector<aiVector2D>& out, const Element& el)
         ReadBinaryDataArray(type, count, data, end, buff, el);
 
         ai_assert(data == end);
-        ai_assert(buff.size() == count * (type == 'd' ? 8 : 4));
+        uint64_t dataToRead = static_cast<uint64_t>(count) * (type == 'd' ? 8 : 4);
+        ai_assert(buff.size() == dataToRead);
+        if (dataToRead > buff.size()) {
+            ParseError("Invalid read size (binary)",&el);
+        }
 
         const uint32_t count2 = count / 2;
         out.reserve(count2);
@@ -879,7 +891,11 @@ void ParseVectorDataArray(std::vector<int>& out, const Element& el)
         ReadBinaryDataArray(type, count, data, end, buff, el);
 
         ai_assert(data == end);
-        ai_assert(buff.size() == count * 4);
+        uint64_t dataToRead = static_cast<uint64_t>(count) * 4;
+        ai_assert(buff.size() == dataToRead);
+        if (dataToRead > buff.size()) {
+            ParseError("Invalid read size (binary)",&el);
+        }
 
         out.reserve(count);
 
@@ -937,7 +953,11 @@ void ParseVectorDataArray(std::vector<float>& out, const Element& el)
         ReadBinaryDataArray(type, count, data, end, buff, el);
 
         ai_assert(data == end);
-        ai_assert(buff.size() == count * (type == 'd' ? 8 : 4));
+        uint64_t dataToRead = static_cast<uint64_t>(count) * (type == 'd' ? 8 : 4);
+        ai_assert(buff.size() == dataToRead);
+        if (dataToRead > buff.size()) {
+            ParseError("Invalid read size (binary)",&el);
+        }
 
         if (type == 'd') {
             const double* d = reinterpret_cast<const double*>(&buff[0]);
@@ -998,7 +1018,11 @@ void ParseVectorDataArray(std::vector<unsigned int>& out, const Element& el)
         ReadBinaryDataArray(type, count, data, end, buff, el);
 
         ai_assert(data == end);
-        ai_assert(buff.size() == count * 4);
+        uint64_t dataToRead = static_cast<uint64_t>(count) * 4;
+        ai_assert(buff.size() == dataToRead);
+        if (dataToRead > buff.size()) {
+            ParseError("Invalid read size (binary)",&el);
+        }
 
         out.reserve(count);
 
@@ -1063,7 +1087,11 @@ void ParseVectorDataArray(std::vector<uint64_t>& out, const Element& el)
         ReadBinaryDataArray(type, count, data, end, buff, el);
 
         ai_assert(data == end);
-        ai_assert(buff.size() == count * 8);
+        uint64_t dataToRead = static_cast<uint64_t>(count) * 8;
+        ai_assert(buff.size() == dataToRead);
+        if (dataToRead > buff.size()) {
+            ParseError("Invalid read size (binary)",&el);
+        }
 
         out.reserve(count);
 
@@ -1121,7 +1149,11 @@ void ParseVectorDataArray(std::vector<int64_t>& out, const Element& el)
         ReadBinaryDataArray(type, count, data, end, buff, el);
 
         ai_assert(data == end);
-        ai_assert(buff.size() == count * 8);
+        uint64_t dataToRead = static_cast<uint64_t>(count) * 8;
+        ai_assert(buff.size() == dataToRead);
+        if (dataToRead > buff.size()) {
+            ParseError("Invalid read size (binary)",&el);
+        }
 
         out.reserve(count);
 
diff --git a/code/AssetLib/FBX/FBXProperties.cpp b/code/AssetLib/FBX/FBXProperties.cpp
index 25282b637..84098cf10 100644
--- a/code/AssetLib/FBX/FBXProperties.cpp
+++ b/code/AssetLib/FBX/FBXProperties.cpp
@@ -69,6 +69,20 @@ Property::~Property()
 
 namespace {
 
+void checkTokenCount(const TokenList& tok, unsigned int expectedCount)
+{
+    ai_assert(expectedCount >= 2);
+    if (tok.size() < expectedCount) {
+        const std::string& s = ParseTokenAsString(*tok[1]);
+        if (tok[1]->IsBinary()) {
+            throw DeadlyImportError("Not enough tokens for property of type ", s, " at offset ", tok[1]->Offset());
+        }
+        else {
+            throw DeadlyImportError("Not enough tokens for property of type ", s, " at line ", tok[1]->Line());
+        }
+    }
+}
+
 // ------------------------------------------------------------------------------------------------
 // read a typed property out of a FBX element. The return value is nullptr if the property cannot be read.
 Property* ReadTypedProperty(const Element& element)
@@ -76,23 +90,30 @@ Property* ReadTypedProperty(const Element& element)
     ai_assert(element.KeyToken().StringContents() == "P");
 
     const TokenList& tok = element.Tokens();
-    ai_assert(tok.size() >= 5);
+    if (tok.size() < 2) {
+        return nullptr;
+    }
 
     const std::string& s = ParseTokenAsString(*tok[1]);
     const char* const cs = s.c_str();
     if (!strcmp(cs,"KString")) {
+        checkTokenCount(tok, 5);
         return new TypedProperty<std::string>(ParseTokenAsString(*tok[4]));
     }
     else if (!strcmp(cs,"bool") || !strcmp(cs,"Bool")) {
+        checkTokenCount(tok, 5);
         return new TypedProperty<bool>(ParseTokenAsInt(*tok[4]) != 0);
     }
-    else if (!strcmp(cs, "int") || !strcmp(cs, "Int") || !strcmp(cs, "enum") || !strcmp(cs, "Enum")) {
+    else if (!strcmp(cs, "int") || !strcmp(cs, "Int") || !strcmp(cs, "enum") || !strcmp(cs, "Enum") || !strcmp(cs, "Integer")) {
+        checkTokenCount(tok, 5);
         return new TypedProperty<int>(ParseTokenAsInt(*tok[4]));
     }
     else if (!strcmp(cs, "ULongLong")) {
+        checkTokenCount(tok, 5);
         return new TypedProperty<uint64_t>(ParseTokenAsID(*tok[4]));
     }
     else if (!strcmp(cs, "KTime")) {
+        checkTokenCount(tok, 5);
         return new TypedProperty<int64_t>(ParseTokenAsInt64(*tok[4]));
     }
     else if (!strcmp(cs,"Vector3D") ||
@@ -103,6 +124,7 @@ Property* ReadTypedProperty(const Element& element)
         !strcmp(cs,"Lcl Rotation") ||
         !strcmp(cs,"Lcl Scaling")
         ) {
+        checkTokenCount(tok, 7);
         return new TypedProperty<aiVector3D>(aiVector3D(
             ParseTokenAsFloat(*tok[4]),
             ParseTokenAsFloat(*tok[5]),
@@ -110,8 +132,18 @@ Property* ReadTypedProperty(const Element& element)
         );
     }
     else if (!strcmp(cs,"double") || !strcmp(cs,"Number") || !strcmp(cs,"Float") || !strcmp(cs,"FieldOfView") || !strcmp( cs, "UnitScaleFactor" ) ) {
+        checkTokenCount(tok, 5);
         return new TypedProperty<float>(ParseTokenAsFloat(*tok[4]));
     }
+    else if (!strcmp(cs, "ColorAndAlpha")) {
+        checkTokenCount(tok, 8);
+        return new TypedProperty<aiColor4D>(aiColor4D(
+            ParseTokenAsFloat(*tok[4]),
+            ParseTokenAsFloat(*tok[5]),
+            ParseTokenAsFloat(*tok[6]),
+            ParseTokenAsFloat(*tok[7]))
+        );
+    }
     return nullptr;
 }
 
diff --git a/code/AssetLib/FBX/FBXTokenizer.cpp b/code/AssetLib/FBX/FBXTokenizer.cpp
index bd3ee7ad1..2bb054d8e 100644
--- a/code/AssetLib/FBX/FBXTokenizer.cpp
+++ b/code/AssetLib/FBX/FBXTokenizer.cpp
@@ -90,7 +90,7 @@ namespace {
 AI_WONT_RETURN void TokenizeError(const std::string& message, unsigned int line, unsigned int column) AI_WONT_RETURN_SUFFIX;
 AI_WONT_RETURN void TokenizeError(const std::string& message, unsigned int line, unsigned int column)
 {
-    throw DeadlyImportError(Util::AddLineAndColumn("FBX-Tokenize",message,line,column));
+    throw DeadlyImportError("FBX-Tokenize", Util::GetLineAndColumnText(line,column), message);
 }
 
 
diff --git a/code/AssetLib/FBX/FBXUtil.cpp b/code/AssetLib/FBX/FBXUtil.cpp
index 50dd78a4c..983730011 100644
--- a/code/AssetLib/FBX/FBXUtil.cpp
+++ b/code/AssetLib/FBX/FBXUtil.cpp
@@ -86,32 +86,30 @@ const char* TokenTypeString(TokenType t)
 
 
 // ------------------------------------------------------------------------------------------------
-std::string AddOffset(const std::string& prefix, const std::string& text, size_t offset)
+std::string GetOffsetText(size_t offset)
 {
-    return static_cast<std::string>( (Formatter::format() << prefix << " (offset 0x" << std::hex << offset << ") " << text) );
+    return static_cast<std::string>( Formatter::format() << " (offset 0x" << std::hex << offset << ") " );
 }
 
 // ------------------------------------------------------------------------------------------------
-std::string AddLineAndColumn(const std::string& prefix, const std::string& text, unsigned int line, unsigned int column)
+std::string GetLineAndColumnText(unsigned int line, unsigned int column)
 {
-    return static_cast<std::string>( (Formatter::format() << prefix << " (line " << line << " <<  col " << column << ") " << text) );
+    return static_cast<std::string>( Formatter::format() << " (line " << line << " <<  col " << column << ") " );
 }
 
 // ------------------------------------------------------------------------------------------------
-std::string AddTokenText(const std::string& prefix, const std::string& text, const Token* tok)
+std::string GetTokenText(const Token* tok)
 {
     if(tok->IsBinary()) {
-        return static_cast<std::string>( (Formatter::format() << prefix <<
+        return static_cast<std::string>( Formatter::format() << 
             " (" << TokenTypeString(tok->Type()) <<
-            ", offset 0x" << std::hex << tok->Offset() << ") " <<
-            text) );
+            ", offset 0x" << std::hex << tok->Offset() << ") " );
     }
 
-    return static_cast<std::string>( (Formatter::format() << prefix <<
+    return static_cast<std::string>( Formatter::format() <<
         " (" << TokenTypeString(tok->Type()) <<
         ", line " << tok->Line() <<
-        ", col " << tok->Column() << ") " <<
-        text) );
+        ", col " << tok->Column() << ") " );
 }
 
 // Generated by this formula: T["ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[i]] = i;
diff --git a/code/AssetLib/FBX/FBXUtil.h b/code/AssetLib/FBX/FBXUtil.h
index 77bb0ad30..82d53eea1 100644
--- a/code/AssetLib/FBX/FBXUtil.h
+++ b/code/AssetLib/FBX/FBXUtil.h
@@ -73,31 +73,24 @@ const char* TokenTypeString(TokenType t);
 
 /** Format log/error messages using a given offset in the source binary file
  *
- *  @param prefix Message prefix to be preprended to the location info.
- *  @param text Message text
- *  @param line Line index, 1-based
- *  @param column Column index, 1-based
- *  @return A string of the following format: {prefix} (offset 0x{offset}) {text}*/
-std::string AddOffset(const std::string& prefix, const std::string& text, size_t offset);
+ *  @param offset offset within the file
+ *  @return A string of the following format: " (offset 0x{offset}) "*/
+std::string GetOffsetText(size_t offset);
 
 
 /** Format log/error messages using a given line location in the source file.
  *
- *  @param prefix Message prefix to be preprended to the location info.
- *  @param text Message text
  *  @param line Line index, 1-based
  *  @param column Column index, 1-based
- *  @return A string of the following format: {prefix} (line {line}, col {column}) {text}*/
-std::string AddLineAndColumn(const std::string& prefix, const std::string& text, unsigned int line, unsigned int column);
+ *  @return A string of the following format: " (line {line}, col {column}) "*/
+std::string GetLineAndColumnText(unsigned int line, unsigned int column);
 
 
 /** Format log/error messages using a given cursor token.
  *
- *  @param prefix Message prefix to be preprended to the location info.
- *  @param text Message text
  *  @param tok Token where parsing/processing stopped
- *  @return A string of the following format: {prefix} ({token-type}, line {line}, col {column}) {text}*/
-std::string AddTokenText(const std::string& prefix, const std::string& text, const Token* tok);
+ *  @return A string of the following format: " ({token-type}, line {line}, col {column}) "*/
+std::string GetTokenText(const Token* tok);
 
 /** Decode a single Base64-encoded character.
 *
diff --git a/code/AssetLib/HMP/HMPLoader.cpp b/code/AssetLib/HMP/HMPLoader.cpp
index 33460cc73..8ccba2ea4 100644
--- a/code/AssetLib/HMP/HMPLoader.cpp
+++ b/code/AssetLib/HMP/HMPLoader.cpp
@@ -115,7 +115,7 @@ void HMPImporter::InternReadFile(const std::string &pFile,
 
     // Check whether we can read from the file
     if (file.get() == nullptr) {
-        throw DeadlyImportError("Failed to open HMP file " + pFile + ".");
+        throw DeadlyImportError("Failed to open HMP file ", pFile, ".");
     }
 
     // Check whether the HMP file is large enough to contain
@@ -159,8 +159,8 @@ void HMPImporter::InternReadFile(const std::string &pFile,
         szBuffer[4] = '\0';
 
         // We're definitely unable to load this file
-        throw DeadlyImportError("Unknown HMP subformat " + pFile +
-                                ". Magic word (" + szBuffer + ") is not known");
+        throw DeadlyImportError("Unknown HMP subformat ", pFile,
+                                ". Magic word (", szBuffer, ") is not known");
     }
 
     // Set the AI_SCENE_FLAGS_TERRAIN bit
diff --git a/code/AssetLib/IFC/IFCReaderGen1_2x3.cpp b/code/AssetLib/IFC/IFCReaderGen1_2x3.cpp
index 3376f4d9e..2cfa22530 100644
--- a/code/AssetLib/IFC/IFCReaderGen1_2x3.cpp
+++ b/code/AssetLib/IFC/IFCReaderGen1_2x3.cpp
@@ -45,6 +45,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "IFCReaderGen_2x3.h"
 
+#if _MSC_VER
+#    pragma warning(push)
+#    pragma warning(disable : 4702)
+#endif // _MSC_VER
+
 namespace Assimp {
 
 using namespace ::Assimp::IFC;
@@ -3165,4 +3170,8 @@ template <> size_t GenericFill<IfcLightSourceDirectional>(const DB& db, const LI
 } // ! STEP
 } // ! Assimp
 
+#if _MSC_VER
+#    pragma warning(pop)
+#endif // _MSC_VER
+
 #endif
diff --git a/code/AssetLib/IFC/IFCReaderGen2_2x3.cpp b/code/AssetLib/IFC/IFCReaderGen2_2x3.cpp
index e6687014d..c58c7c42f 100644
--- a/code/AssetLib/IFC/IFCReaderGen2_2x3.cpp
+++ b/code/AssetLib/IFC/IFCReaderGen2_2x3.cpp
@@ -43,6 +43,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "IFCReaderGen_2x3.h"
 
+#if _MSC_VER
+#    pragma warning(push)
+#    pragma warning(disable : 4702)
+#endif // _MSC_VER
+
 namespace Assimp {
 using namespace IFC;
 using namespace ::Assimp::IFC::Schema_2x3;
@@ -1915,4 +1920,8 @@ template <> size_t GenericFill<IfcConditionCriterion>(const DB& db, const LIST&
 } // ! STEP
 } // ! Assimp
 
+#if _MSC_VER
+#    pragma warning(pop)
+#endif // _MSC_VER
+
 #endif
diff --git a/code/AssetLib/IFC/IFCReaderGen_2x3.h b/code/AssetLib/IFC/IFCReaderGen_2x3.h
index 8ae623dd8..f87f121b9 100644
--- a/code/AssetLib/IFC/IFCReaderGen_2x3.h
+++ b/code/AssetLib/IFC/IFCReaderGen_2x3.h
@@ -45,9 +45,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "AssetLib/Step/STEPFile.h"
 
-#ifdef _WIN32
+#ifdef _MSC_VER
+#    pragma warning(push)
 #    pragma warning( disable : 4512 )
-#endif // _WIN32
+#endif // _MSC_VER
 
 namespace Assimp {
 namespace IFC {
@@ -4372,4 +4373,8 @@ namespace STEP {
 } //! STEP
 } //! Assimp
 
+#ifdef _MSC_VER
+#    pragma warning(pop)
+#endif // _MSC_VER
+
 #endif // INCLUDED_IFC_READER_GEN_H
diff --git a/code/AssetLib/Irr/IRRLoader.cpp b/code/AssetLib/Irr/IRRLoader.cpp
index 5d5253516..e176e83a6 100644
--- a/code/AssetLib/Irr/IRRLoader.cpp
+++ b/code/AssetLib/Irr/IRRLoader.cpp
@@ -5,8 +5,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -67,200 +65,198 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <memory>
 
 using namespace Assimp;
-using namespace irr;
-using namespace irr::io;
 
 static const aiImporterDesc desc = {
-    "Irrlicht Scene Reader",
-    "",
-    "",
-    "http://irrlicht.sourceforge.net/",
-    aiImporterFlags_SupportTextFlavour,
-    0,
-    0,
-    0,
-    0,
-    "irr xml"
+	"Irrlicht Scene Reader",
+	"",
+	"",
+	"http://irrlicht.sourceforge.net/",
+	aiImporterFlags_SupportTextFlavour,
+	0,
+	0,
+	0,
+	0,
+	"irr xml"
 };
 
 // ------------------------------------------------------------------------------------------------
 // Constructor to be privately used by Importer
 IRRImporter::IRRImporter() :
-        fps(), configSpeedFlag() {
-    // empty
+		fps(), configSpeedFlag() {
+	// empty
 }
 
 // ------------------------------------------------------------------------------------------------
 // Destructor, private as well
 IRRImporter::~IRRImporter() {
-    // empty
+	// empty
 }
 
 // ------------------------------------------------------------------------------------------------
 // Returns whether the class can handle the format of the given file.
 bool IRRImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool checkSig) const {
-    const std::string extension = GetExtension(pFile);
-    if (extension == "irr") {
-        return true;
-    } else if (extension == "xml" || checkSig) {
-        /*  If CanRead() is called in order to check whether we
+	const std::string extension = GetExtension(pFile);
+	if (extension == "irr") {
+		return true;
+	} else if (extension == "xml" || 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;
-        }
-        const char *tokens[] = { "irr_scene" };
-        return SearchFileHeaderForToken(pIOHandler, pFile, tokens, 1);
-    }
+		if (nullptr == pIOHandler) {
+			return true;
+		}
+		const char *tokens[] = { "irr_scene" };
+		return SearchFileHeaderForToken(pIOHandler, pFile, tokens, 1);
+	}
 
-    return false;
+	return false;
 }
 
 // ------------------------------------------------------------------------------------------------
 const aiImporterDesc *IRRImporter::GetInfo() const {
-    return &desc;
+	return &desc;
 }
 
 // ------------------------------------------------------------------------------------------------
 void IRRImporter::SetupProperties(const Importer *pImp) {
-    // read the output frame rate of all node animation channels
-    fps = pImp->GetPropertyInteger(AI_CONFIG_IMPORT_IRR_ANIM_FPS, 100);
-    if (fps < 10.) {
-        ASSIMP_LOG_ERROR("IRR: Invalid FPS configuration");
-        fps = 100;
-    }
+	// read the output frame rate of all node animation channels
+	fps = pImp->GetPropertyInteger(AI_CONFIG_IMPORT_IRR_ANIM_FPS, 100);
+	if (fps < 10.) {
+		ASSIMP_LOG_ERROR("IRR: Invalid FPS configuration");
+		fps = 100;
+	}
 
-    // AI_CONFIG_FAVOUR_SPEED
-    configSpeedFlag = (0 != pImp->GetPropertyInteger(AI_CONFIG_FAVOUR_SPEED, 0));
+	// AI_CONFIG_FAVOUR_SPEED
+	configSpeedFlag = (0 != pImp->GetPropertyInteger(AI_CONFIG_FAVOUR_SPEED, 0));
 }
 
 // ------------------------------------------------------------------------------------------------
 // Build a mesh tha consists of a single squad (a side of a skybox)
 aiMesh *IRRImporter::BuildSingleQuadMesh(const SkyboxVertex &v1,
-        const SkyboxVertex &v2,
-        const SkyboxVertex &v3,
-        const SkyboxVertex &v4) {
-    // allocate and prepare the mesh
-    aiMesh *out = new aiMesh();
+		const SkyboxVertex &v2,
+		const SkyboxVertex &v3,
+		const SkyboxVertex &v4) {
+	// allocate and prepare the mesh
+	aiMesh *out = new aiMesh();
 
-    out->mPrimitiveTypes = aiPrimitiveType_POLYGON;
-    out->mNumFaces = 1;
+	out->mPrimitiveTypes = aiPrimitiveType_POLYGON;
+	out->mNumFaces = 1;
 
-    // build the face
-    out->mFaces = new aiFace[1];
-    aiFace &face = out->mFaces[0];
+	// build the face
+	out->mFaces = new aiFace[1];
+	aiFace &face = out->mFaces[0];
 
-    face.mNumIndices = 4;
-    face.mIndices = new unsigned int[4];
-    for (unsigned int i = 0; i < 4; ++i)
-        face.mIndices[i] = i;
+	face.mNumIndices = 4;
+	face.mIndices = new unsigned int[4];
+	for (unsigned int i = 0; i < 4; ++i)
+		face.mIndices[i] = i;
 
-    out->mNumVertices = 4;
+	out->mNumVertices = 4;
 
-    // copy vertex positions
-    aiVector3D *vec = out->mVertices = new aiVector3D[4];
-    *vec++ = v1.position;
-    *vec++ = v2.position;
-    *vec++ = v3.position;
-    *vec = v4.position;
+	// copy vertex positions
+	aiVector3D *vec = out->mVertices = new aiVector3D[4];
+	*vec++ = v1.position;
+	*vec++ = v2.position;
+	*vec++ = v3.position;
+	*vec = v4.position;
 
-    // copy vertex normals
-    vec = out->mNormals = new aiVector3D[4];
-    *vec++ = v1.normal;
-    *vec++ = v2.normal;
-    *vec++ = v3.normal;
-    *vec = v4.normal;
+	// copy vertex normals
+	vec = out->mNormals = new aiVector3D[4];
+	*vec++ = v1.normal;
+	*vec++ = v2.normal;
+	*vec++ = v3.normal;
+	*vec = v4.normal;
 
-    // copy texture coordinates
-    vec = out->mTextureCoords[0] = new aiVector3D[4];
-    *vec++ = v1.uv;
-    *vec++ = v2.uv;
-    *vec++ = v3.uv;
-    *vec = v4.uv;
-    return out;
+	// copy texture coordinates
+	vec = out->mTextureCoords[0] = new aiVector3D[4];
+	*vec++ = v1.uv;
+	*vec++ = v2.uv;
+	*vec++ = v3.uv;
+	*vec = v4.uv;
+	return out;
 }
 
 // ------------------------------------------------------------------------------------------------
 void IRRImporter::BuildSkybox(std::vector<aiMesh *> &meshes, std::vector<aiMaterial *> materials) {
-    // Update the material of the skybox - replace the name and disable shading for skyboxes.
-    for (unsigned int i = 0; i < 6; ++i) {
-        aiMaterial *out = (aiMaterial *)(*(materials.end() - (6 - i)));
+	// Update the material of the skybox - replace the name and disable shading for skyboxes.
+	for (unsigned int i = 0; i < 6; ++i) {
+		aiMaterial *out = (aiMaterial *)(*(materials.end() - (6 - i)));
 
-        aiString s;
-        s.length = ::ai_snprintf(s.data, MAXLEN, "SkyboxSide_%u", i);
-        out->AddProperty(&s, AI_MATKEY_NAME);
+		aiString s;
+		s.length = ::ai_snprintf(s.data, MAXLEN, "SkyboxSide_%u", i);
+		out->AddProperty(&s, AI_MATKEY_NAME);
 
-        int shading = aiShadingMode_NoShading;
-        out->AddProperty(&shading, 1, AI_MATKEY_SHADING_MODEL);
-    }
+		int shading = aiShadingMode_NoShading;
+		out->AddProperty(&shading, 1, AI_MATKEY_SHADING_MODEL);
+	}
 
-    // Skyboxes are much more difficult. They are represented
-    // by six single planes with different textures, so we'll
-    // need to build six meshes.
+	// Skyboxes are much more difficult. They are represented
+	// by six single planes with different textures, so we'll
+	// need to build six meshes.
 
-    const ai_real l = 10.0; // the size used by Irrlicht
+	const ai_real l = 10.0; // the size used by Irrlicht
 
-    // FRONT SIDE
-    meshes.push_back(BuildSingleQuadMesh(
-            SkyboxVertex(-l, -l, -l, 0, 0, 1, 1.0, 1.0),
-            SkyboxVertex(l, -l, -l, 0, 0, 1, 0.0, 1.0),
-            SkyboxVertex(l, l, -l, 0, 0, 1, 0.0, 0.0),
-            SkyboxVertex(-l, l, -l, 0, 0, 1, 1.0, 0.0)));
-    meshes.back()->mMaterialIndex = static_cast<unsigned int>(materials.size() - 6u);
+	// FRONT SIDE
+	meshes.push_back(BuildSingleQuadMesh(
+			SkyboxVertex(-l, -l, -l, 0, 0, 1, 1.0, 1.0),
+			SkyboxVertex(l, -l, -l, 0, 0, 1, 0.0, 1.0),
+			SkyboxVertex(l, l, -l, 0, 0, 1, 0.0, 0.0),
+			SkyboxVertex(-l, l, -l, 0, 0, 1, 1.0, 0.0)));
+	meshes.back()->mMaterialIndex = static_cast<unsigned int>(materials.size() - 6u);
 
-    // LEFT SIDE
-    meshes.push_back(BuildSingleQuadMesh(
-            SkyboxVertex(l, -l, -l, -1, 0, 0, 1.0, 1.0),
-            SkyboxVertex(l, -l, l, -1, 0, 0, 0.0, 1.0),
-            SkyboxVertex(l, l, l, -1, 0, 0, 0.0, 0.0),
-            SkyboxVertex(l, l, -l, -1, 0, 0, 1.0, 0.0)));
-    meshes.back()->mMaterialIndex = static_cast<unsigned int>(materials.size() - 5u);
+	// LEFT SIDE
+	meshes.push_back(BuildSingleQuadMesh(
+			SkyboxVertex(l, -l, -l, -1, 0, 0, 1.0, 1.0),
+			SkyboxVertex(l, -l, l, -1, 0, 0, 0.0, 1.0),
+			SkyboxVertex(l, l, l, -1, 0, 0, 0.0, 0.0),
+			SkyboxVertex(l, l, -l, -1, 0, 0, 1.0, 0.0)));
+	meshes.back()->mMaterialIndex = static_cast<unsigned int>(materials.size() - 5u);
 
-    // BACK SIDE
-    meshes.push_back(BuildSingleQuadMesh(
-            SkyboxVertex(l, -l, l, 0, 0, -1, 1.0, 1.0),
-            SkyboxVertex(-l, -l, l, 0, 0, -1, 0.0, 1.0),
-            SkyboxVertex(-l, l, l, 0, 0, -1, 0.0, 0.0),
-            SkyboxVertex(l, l, l, 0, 0, -1, 1.0, 0.0)));
-    meshes.back()->mMaterialIndex = static_cast<unsigned int>(materials.size() - 4u);
+	// BACK SIDE
+	meshes.push_back(BuildSingleQuadMesh(
+			SkyboxVertex(l, -l, l, 0, 0, -1, 1.0, 1.0),
+			SkyboxVertex(-l, -l, l, 0, 0, -1, 0.0, 1.0),
+			SkyboxVertex(-l, l, l, 0, 0, -1, 0.0, 0.0),
+			SkyboxVertex(l, l, l, 0, 0, -1, 1.0, 0.0)));
+	meshes.back()->mMaterialIndex = static_cast<unsigned int>(materials.size() - 4u);
 
-    // RIGHT SIDE
-    meshes.push_back(BuildSingleQuadMesh(
-            SkyboxVertex(-l, -l, l, 1, 0, 0, 1.0, 1.0),
-            SkyboxVertex(-l, -l, -l, 1, 0, 0, 0.0, 1.0),
-            SkyboxVertex(-l, l, -l, 1, 0, 0, 0.0, 0.0),
-            SkyboxVertex(-l, l, l, 1, 0, 0, 1.0, 0.0)));
-    meshes.back()->mMaterialIndex = static_cast<unsigned int>(materials.size() - 3u);
+	// RIGHT SIDE
+	meshes.push_back(BuildSingleQuadMesh(
+			SkyboxVertex(-l, -l, l, 1, 0, 0, 1.0, 1.0),
+			SkyboxVertex(-l, -l, -l, 1, 0, 0, 0.0, 1.0),
+			SkyboxVertex(-l, l, -l, 1, 0, 0, 0.0, 0.0),
+			SkyboxVertex(-l, l, l, 1, 0, 0, 1.0, 0.0)));
+	meshes.back()->mMaterialIndex = static_cast<unsigned int>(materials.size() - 3u);
 
-    // TOP SIDE
-    meshes.push_back(BuildSingleQuadMesh(
-            SkyboxVertex(l, l, -l, 0, -1, 0, 1.0, 1.0),
-            SkyboxVertex(l, l, l, 0, -1, 0, 0.0, 1.0),
-            SkyboxVertex(-l, l, l, 0, -1, 0, 0.0, 0.0),
-            SkyboxVertex(-l, l, -l, 0, -1, 0, 1.0, 0.0)));
-    meshes.back()->mMaterialIndex = static_cast<unsigned int>(materials.size() - 2u);
+	// TOP SIDE
+	meshes.push_back(BuildSingleQuadMesh(
+			SkyboxVertex(l, l, -l, 0, -1, 0, 1.0, 1.0),
+			SkyboxVertex(l, l, l, 0, -1, 0, 0.0, 1.0),
+			SkyboxVertex(-l, l, l, 0, -1, 0, 0.0, 0.0),
+			SkyboxVertex(-l, l, -l, 0, -1, 0, 1.0, 0.0)));
+	meshes.back()->mMaterialIndex = static_cast<unsigned int>(materials.size() - 2u);
 
-    // BOTTOM SIDE
-    meshes.push_back(BuildSingleQuadMesh(
-            SkyboxVertex(l, -l, l, 0, 1, 0, 0.0, 0.0),
-            SkyboxVertex(l, -l, -l, 0, 1, 0, 1.0, 0.0),
-            SkyboxVertex(-l, -l, -l, 0, 1, 0, 1.0, 1.0),
-            SkyboxVertex(-l, -l, l, 0, 1, 0, 0.0, 1.0)));
-    meshes.back()->mMaterialIndex = static_cast<unsigned int>(materials.size() - 1u);
+	// BOTTOM SIDE
+	meshes.push_back(BuildSingleQuadMesh(
+			SkyboxVertex(l, -l, l, 0, 1, 0, 0.0, 0.0),
+			SkyboxVertex(l, -l, -l, 0, 1, 0, 1.0, 0.0),
+			SkyboxVertex(-l, -l, -l, 0, 1, 0, 1.0, 1.0),
+			SkyboxVertex(-l, -l, l, 0, 1, 0, 0.0, 1.0)));
+	meshes.back()->mMaterialIndex = static_cast<unsigned int>(materials.size() - 1u);
 }
 
 // ------------------------------------------------------------------------------------------------
 void IRRImporter::CopyMaterial(std::vector<aiMaterial *> &materials,
-        std::vector<std::pair<aiMaterial *, unsigned int>> &inmaterials,
-        unsigned int &defMatIdx,
-        aiMesh *mesh) {
-    if (inmaterials.empty()) {
-        // Do we have a default material? If not we need to create one
-        if (UINT_MAX == defMatIdx) {
-            defMatIdx = (unsigned int)materials.size();
-            //TODO: add this materials to someone?
-            /*aiMaterial* mat = new aiMaterial();
+		std::vector<std::pair<aiMaterial *, unsigned int>> &inmaterials,
+		unsigned int &defMatIdx,
+		aiMesh *mesh) {
+	if (inmaterials.empty()) {
+		// Do we have a default material? If not we need to create one
+		if (UINT_MAX == defMatIdx) {
+			defMatIdx = (unsigned int)materials.size();
+			//TODO: add this materials to someone?
+			/*aiMaterial* mat = new aiMaterial();
 
             aiString s;
             s.Set(AI_DEFAULT_MATERIAL_NAME);
@@ -268,1120 +264,1110 @@ void IRRImporter::CopyMaterial(std::vector<aiMaterial *> &materials,
 
             aiColor3D c(0.6f,0.6f,0.6f);
             mat->AddProperty(&c,1,AI_MATKEY_COLOR_DIFFUSE);*/
-        }
-        mesh->mMaterialIndex = defMatIdx;
-        return;
-    } else if (inmaterials.size() > 1) {
-        ASSIMP_LOG_INFO("IRR: Skipping additional materials");
-    }
+		}
+		mesh->mMaterialIndex = defMatIdx;
+		return;
+	} else if (inmaterials.size() > 1) {
+		ASSIMP_LOG_INFO("IRR: Skipping additional materials");
+	}
 
-    mesh->mMaterialIndex = (unsigned int)materials.size();
-    materials.push_back(inmaterials[0].first);
+	mesh->mMaterialIndex = (unsigned int)materials.size();
+	materials.push_back(inmaterials[0].first);
 }
 
 // ------------------------------------------------------------------------------------------------
 inline int ClampSpline(int idx, int size) {
-    return (idx < 0 ? size + idx : (idx >= size ? idx - size : idx));
+	return (idx < 0 ? size + idx : (idx >= size ? idx - size : idx));
 }
 
 // ------------------------------------------------------------------------------------------------
 inline void FindSuitableMultiple(int &angle) {
-    if (angle < 3)
-        angle = 3;
-    else if (angle < 10)
-        angle = 10;
-    else if (angle < 20)
-        angle = 20;
-    else if (angle < 30)
-        angle = 30;
+	if (angle < 3)
+		angle = 3;
+	else if (angle < 10)
+		angle = 10;
+	else if (angle < 20)
+		angle = 20;
+	else if (angle < 30)
+		angle = 30;
 }
 
 // ------------------------------------------------------------------------------------------------
 void IRRImporter::ComputeAnimations(Node *root, aiNode *real, std::vector<aiNodeAnim *> &anims) {
-    ai_assert(nullptr != root);
-    ai_assert(nullptr != real);
+	ai_assert(nullptr != root && nullptr != real);
 
-    // XXX totally WIP - doesn't produce proper results, need to evaluate
-    // whether there's any use for Irrlicht's proprietary scene format
-    // outside Irrlicht ...
-    // This also applies to the above function of FindSuitableMultiple and ClampSpline which are
-    // solely used in this function
+	// XXX totally WIP - doesn't produce proper results, need to evaluate
+	// whether there's any use for Irrlicht's proprietary scene format
+	// outside Irrlicht ...
+	// This also applies to the above function of FindSuitableMultiple and ClampSpline which are
+	// solely used in this function
 
-    if (root->animators.empty()) {
-        return;
-    }
-    unsigned int total(0);
-    for (std::list<Animator>::iterator it = root->animators.begin(); it != root->animators.end(); ++it) {
-        if ((*it).type == Animator::UNKNOWN || (*it).type == Animator::OTHER) {
-            ASSIMP_LOG_WARN("IRR: Skipping unknown or unsupported animator");
-            continue;
-        }
-        ++total;
-    }
-    if (!total) {
-        return;
-    } else if (1 == total) {
-        ASSIMP_LOG_WARN("IRR: Adding dummy nodes to simulate multiple animators");
-    }
+	if (root->animators.empty()) {
+		return;
+	}
+	unsigned int total(0);
+	for (std::list<Animator>::iterator it = root->animators.begin(); it != root->animators.end(); ++it) {
+		if ((*it).type == Animator::UNKNOWN || (*it).type == Animator::OTHER) {
+			ASSIMP_LOG_WARN("IRR: Skipping unknown or unsupported animator");
+			continue;
+		}
+		++total;
+	}
+	if (!total) {
+		return;
+	} else if (1 == total) {
+		ASSIMP_LOG_WARN("IRR: Adding dummy nodes to simulate multiple animators");
+	}
 
-    // NOTE: 1 tick == i millisecond
+	// NOTE: 1 tick == i millisecond
 
-    unsigned int cur = 0;
-    for (std::list<Animator>::iterator it = root->animators.begin();
-            it != root->animators.end(); ++it) {
-        if ((*it).type == Animator::UNKNOWN || (*it).type == Animator::OTHER) continue;
+	unsigned int cur = 0;
+	for (std::list<Animator>::iterator it = root->animators.begin();
+			it != root->animators.end(); ++it) {
+		if ((*it).type == Animator::UNKNOWN || (*it).type == Animator::OTHER) continue;
 
-        Animator &in = *it;
-        aiNodeAnim *anim = new aiNodeAnim();
+		Animator &in = *it;
+		aiNodeAnim *anim = new aiNodeAnim();
 
-        if (cur != total - 1) {
-            // Build a new name - a prefix instead of a suffix because it is
-            // easier to check against
-            anim->mNodeName.length = ::ai_snprintf(anim->mNodeName.data, MAXLEN,
-                    "$INST_DUMMY_%i_%s", total - 1,
-                    (root->name.length() ? root->name.c_str() : ""));
+		if (cur != total - 1) {
+			// Build a new name - a prefix instead of a suffix because it is
+			// easier to check against
+			anim->mNodeName.length = ::ai_snprintf(anim->mNodeName.data, MAXLEN,
+					"$INST_DUMMY_%i_%s", total - 1,
+					(root->name.length() ? root->name.c_str() : ""));
 
-            // we'll also need to insert a dummy in the node hierarchy.
-            aiNode *dummy = new aiNode();
+			// we'll also need to insert a dummy in the node hierarchy.
+			aiNode *dummy = new aiNode();
 
-            for (unsigned int i = 0; i < real->mParent->mNumChildren; ++i)
-                if (real->mParent->mChildren[i] == real)
-                    real->mParent->mChildren[i] = dummy;
+			for (unsigned int i = 0; i < real->mParent->mNumChildren; ++i)
+				if (real->mParent->mChildren[i] == real)
+					real->mParent->mChildren[i] = dummy;
 
-            dummy->mParent = real->mParent;
-            dummy->mName = anim->mNodeName;
+			dummy->mParent = real->mParent;
+			dummy->mName = anim->mNodeName;
 
-            dummy->mNumChildren = 1;
-            dummy->mChildren = new aiNode *[dummy->mNumChildren];
-            dummy->mChildren[0] = real;
+			dummy->mNumChildren = 1;
+			dummy->mChildren = new aiNode *[dummy->mNumChildren];
+			dummy->mChildren[0] = real;
 
-            // the transformation matrix of the dummy node is the identity
+			// the transformation matrix of the dummy node is the identity
 
-            real->mParent = dummy;
-        } else
-            anim->mNodeName.Set(root->name);
-        ++cur;
+			real->mParent = dummy;
+		} else
+			anim->mNodeName.Set(root->name);
+		++cur;
 
-        switch (in.type) {
-        case Animator::ROTATION: {
-            // -----------------------------------------------------
-            // find out how long a full rotation will take
-            // This is the least common multiple of 360.f and all
-            // three euler angles. Although we'll surely find a
-            // possible multiple (haha) it could be somewhat large
-            // for our purposes. So we need to modify the angles
-            // here in order to get good results.
-            // -----------------------------------------------------
-            int angles[3];
-            angles[0] = (int)(in.direction.x * 100);
-            angles[1] = (int)(in.direction.y * 100);
-            angles[2] = (int)(in.direction.z * 100);
+		switch (in.type) {
+			case Animator::ROTATION: {
+				// -----------------------------------------------------
+				// find out how long a full rotation will take
+				// This is the least common multiple of 360.f and all
+				// three euler angles. Although we'll surely find a
+				// possible multiple (haha) it could be somewhat large
+				// for our purposes. So we need to modify the angles
+				// here in order to get good results.
+				// -----------------------------------------------------
+				int angles[3];
+				angles[0] = (int)(in.direction.x * 100);
+				angles[1] = (int)(in.direction.y * 100);
+				angles[2] = (int)(in.direction.z * 100);
 
-            angles[0] %= 360;
-            angles[1] %= 360;
-            angles[2] %= 360;
+				angles[0] %= 360;
+				angles[1] %= 360;
+				angles[2] %= 360;
 
-            if ((angles[0] * angles[1]) != 0 && (angles[1] * angles[2]) != 0) {
-                FindSuitableMultiple(angles[0]);
-                FindSuitableMultiple(angles[1]);
-                FindSuitableMultiple(angles[2]);
-            }
+				if ((angles[0] * angles[1]) != 0 && (angles[1] * angles[2]) != 0) {
+					FindSuitableMultiple(angles[0]);
+					FindSuitableMultiple(angles[1]);
+					FindSuitableMultiple(angles[2]);
+				}
 
-            int lcm = 360;
+				int lcm = 360;
 
-            if (angles[0])
-                lcm = Math::lcm(lcm, angles[0]);
+				if (angles[0])
+					lcm = Math::lcm(lcm, angles[0]);
 
-            if (angles[1])
-                lcm = Math::lcm(lcm, angles[1]);
+				if (angles[1])
+					lcm = Math::lcm(lcm, angles[1]);
 
-            if (angles[2])
-                lcm = Math::lcm(lcm, angles[2]);
+				if (angles[2])
+					lcm = Math::lcm(lcm, angles[2]);
 
-            if (360 == lcm)
-                break;
+				if (360 == lcm)
+					break;
 
-#if 0
-                // This can be a division through zero, but we don't care
-                float f1 = (float)lcm / angles[0];
-                float f2 = (float)lcm / angles[1];
-                float f3 = (float)lcm / angles[2];
-#endif
 
-            // find out how many time units we'll need for the finest
-            // track (in seconds) - this defines the number of output
-            // keys (fps * seconds)
-            float max = 0.f;
-            if (angles[0])
-                max = (float)lcm / angles[0];
-            if (angles[1])
-                max = std::max(max, (float)lcm / angles[1]);
-            if (angles[2])
-                max = std::max(max, (float)lcm / angles[2]);
+				// find out how many time units we'll need for the finest
+				// track (in seconds) - this defines the number of output
+				// keys (fps * seconds)
+				float max = 0.f;
+				if (angles[0])
+					max = (float)lcm / angles[0];
+				if (angles[1])
+					max = std::max(max, (float)lcm / angles[1]);
+				if (angles[2])
+					max = std::max(max, (float)lcm / angles[2]);
 
-            anim->mNumRotationKeys = (unsigned int)(max * fps);
-            anim->mRotationKeys = new aiQuatKey[anim->mNumRotationKeys];
+				anim->mNumRotationKeys = (unsigned int)(max * fps);
+				anim->mRotationKeys = new aiQuatKey[anim->mNumRotationKeys];
 
-            // begin with a zero angle
-            aiVector3D angle;
-            for (unsigned int i = 0; i < anim->mNumRotationKeys; ++i) {
-                // build the quaternion for the given euler angles
-                aiQuatKey &q = anim->mRotationKeys[i];
+				// begin with a zero angle
+				aiVector3D angle;
+				for (unsigned int i = 0; i < anim->mNumRotationKeys; ++i) {
+					// build the quaternion for the given euler angles
+					aiQuatKey &q = anim->mRotationKeys[i];
 
-                q.mValue = aiQuaternion(angle.x, angle.y, angle.z);
-                q.mTime = (double)i;
+					q.mValue = aiQuaternion(angle.x, angle.y, angle.z);
+					q.mTime = (double)i;
 
-                // increase the angle
-                angle += in.direction;
-            }
+					// increase the angle
+					angle += in.direction;
+				}
 
-            // This animation is repeated and repeated ...
-            anim->mPostState = anim->mPreState = aiAnimBehaviour_REPEAT;
-        } break;
+				// This animation is repeated and repeated ...
+				anim->mPostState = anim->mPreState = aiAnimBehaviour_REPEAT;
+			} break;
 
-        case Animator::FLY_CIRCLE: {
-            // -----------------------------------------------------
-            // Find out how much time we'll need to perform a
-            // full circle.
-            // -----------------------------------------------------
-            const double seconds = (1. / in.speed) / 1000.;
-            const double tdelta = 1000. / fps;
+			case Animator::FLY_CIRCLE: {
+				// -----------------------------------------------------
+				// Find out how much time we'll need to perform a
+				// full circle.
+				// -----------------------------------------------------
+				const double seconds = (1. / in.speed) / 1000.;
+				const double tdelta = 1000. / fps;
 
-            anim->mNumPositionKeys = (unsigned int)(fps * seconds);
-            anim->mPositionKeys = new aiVectorKey[anim->mNumPositionKeys];
+				anim->mNumPositionKeys = (unsigned int)(fps * seconds);
+				anim->mPositionKeys = new aiVectorKey[anim->mNumPositionKeys];
 
-            // from Irrlicht, what else should we do than copying it?
-            aiVector3D vecU, vecV;
-            if (in.direction.y) {
-                vecV = aiVector3D(50, 0, 0) ^ in.direction;
-            } else
-                vecV = aiVector3D(0, 50, 00) ^ in.direction;
-            vecV.Normalize();
-            vecU = (vecV ^ in.direction).Normalize();
+				// from Irrlicht, what else should we do than copying it?
+				aiVector3D vecU, vecV;
+				if (in.direction.y) {
+					vecV = aiVector3D(50, 0, 0) ^ in.direction;
+				} else
+					vecV = aiVector3D(0, 50, 00) ^ in.direction;
+				vecV.Normalize();
+				vecU = (vecV ^ in.direction).Normalize();
 
-            // build the output keys
-            for (unsigned int i = 0; i < anim->mNumPositionKeys; ++i) {
-                aiVectorKey &key = anim->mPositionKeys[i];
-                key.mTime = i * tdelta;
+				// build the output keys
+				for (unsigned int i = 0; i < anim->mNumPositionKeys; ++i) {
+					aiVectorKey &key = anim->mPositionKeys[i];
+					key.mTime = i * tdelta;
 
-                const ai_real t = (ai_real)(in.speed * key.mTime);
-                key.mValue = in.circleCenter + in.circleRadius * ((vecU * std::cos(t)) + (vecV * std::sin(t)));
-            }
+					const ai_real t = (ai_real)(in.speed * key.mTime);
+					key.mValue = in.circleCenter + in.circleRadius * ((vecU * std::cos(t)) + (vecV * std::sin(t)));
+				}
 
-            // This animation is repeated and repeated ...
-            anim->mPostState = anim->mPreState = aiAnimBehaviour_REPEAT;
-        } break;
+				// This animation is repeated and repeated ...
+				anim->mPostState = anim->mPreState = aiAnimBehaviour_REPEAT;
+			} break;
 
-        case Animator::FLY_STRAIGHT: {
-            anim->mPostState = anim->mPreState = (in.loop ? aiAnimBehaviour_REPEAT : aiAnimBehaviour_CONSTANT);
-            const double seconds = in.timeForWay / 1000.;
-            const double tdelta = 1000. / fps;
+			case Animator::FLY_STRAIGHT: {
+				anim->mPostState = anim->mPreState = (in.loop ? aiAnimBehaviour_REPEAT : aiAnimBehaviour_CONSTANT);
+				const double seconds = in.timeForWay / 1000.;
+				const double tdelta = 1000. / fps;
 
-            anim->mNumPositionKeys = (unsigned int)(fps * seconds);
-            anim->mPositionKeys = new aiVectorKey[anim->mNumPositionKeys];
+				anim->mNumPositionKeys = (unsigned int)(fps * seconds);
+				anim->mPositionKeys = new aiVectorKey[anim->mNumPositionKeys];
 
-            aiVector3D diff = in.direction - in.circleCenter;
-            const ai_real lengthOfWay = diff.Length();
-            diff.Normalize();
+				aiVector3D diff = in.direction - in.circleCenter;
+				const ai_real lengthOfWay = diff.Length();
+				diff.Normalize();
 
-            const double timeFactor = lengthOfWay / in.timeForWay;
+				const double timeFactor = lengthOfWay / in.timeForWay;
 
-            // build the output keys
-            for (unsigned int i = 0; i < anim->mNumPositionKeys; ++i) {
-                aiVectorKey &key = anim->mPositionKeys[i];
-                key.mTime = i * tdelta;
-                key.mValue = in.circleCenter + diff * ai_real(timeFactor * key.mTime);
-            }
-        } break;
+				// build the output keys
+				for (unsigned int i = 0; i < anim->mNumPositionKeys; ++i) {
+					aiVectorKey &key = anim->mPositionKeys[i];
+					key.mTime = i * tdelta;
+					key.mValue = in.circleCenter + diff * ai_real(timeFactor * key.mTime);
+				}
+			} break;
 
-        case Animator::FOLLOW_SPLINE: {
-            // repeat outside the defined time range
-            anim->mPostState = anim->mPreState = aiAnimBehaviour_REPEAT;
-            const int size = (int)in.splineKeys.size();
-            if (!size) {
-                // We have no point in the spline. That's bad. Really bad.
-                ASSIMP_LOG_WARN("IRR: Spline animators with no points defined");
+			case Animator::FOLLOW_SPLINE: {
+				// repeat outside the defined time range
+				anim->mPostState = anim->mPreState = aiAnimBehaviour_REPEAT;
+				const int size = (int)in.splineKeys.size();
+				if (!size) {
+					// We have no point in the spline. That's bad. Really bad.
+					ASSIMP_LOG_WARN("IRR: Spline animators with no points defined");
 
-                delete anim;
-                anim = nullptr;
-                break;
-            } else if (size == 1) {
-                // We have just one point in the spline so we don't need the full calculation
-                anim->mNumPositionKeys = 1;
-                anim->mPositionKeys = new aiVectorKey[anim->mNumPositionKeys];
+					delete anim;
+					anim = nullptr;
+					break;
+				} else if (size == 1) {
+					// We have just one point in the spline so we don't need the full calculation
+					anim->mNumPositionKeys = 1;
+					anim->mPositionKeys = new aiVectorKey[anim->mNumPositionKeys];
 
-                anim->mPositionKeys[0].mValue = in.splineKeys[0].mValue;
-                anim->mPositionKeys[0].mTime = 0.f;
-                break;
-            }
+					anim->mPositionKeys[0].mValue = in.splineKeys[0].mValue;
+					anim->mPositionKeys[0].mTime = 0.f;
+					break;
+				}
 
-            unsigned int ticksPerFull = 15;
-            anim->mNumPositionKeys = (unsigned int)(ticksPerFull * fps);
-            anim->mPositionKeys = new aiVectorKey[anim->mNumPositionKeys];
+				unsigned int ticksPerFull = 15;
+				anim->mNumPositionKeys = (unsigned int)(ticksPerFull * fps);
+				anim->mPositionKeys = new aiVectorKey[anim->mNumPositionKeys];
 
-            for (unsigned int i = 0; i < anim->mNumPositionKeys; ++i) {
-                aiVectorKey &key = anim->mPositionKeys[i];
+				for (unsigned int i = 0; i < anim->mNumPositionKeys; ++i) {
+					aiVectorKey &key = anim->mPositionKeys[i];
 
-                const ai_real dt = (i * in.speed * ai_real(0.001));
-                const ai_real u = dt - std::floor(dt);
-                const int idx = (int)std::floor(dt) % size;
+					const ai_real dt = (i * in.speed * ai_real(0.001));
+					const ai_real u = dt - std::floor(dt);
+					const int idx = (int)std::floor(dt) % size;
 
-                // get the 4 current points to evaluate the spline
-                const aiVector3D &p0 = in.splineKeys[ClampSpline(idx - 1, size)].mValue;
-                const aiVector3D &p1 = in.splineKeys[ClampSpline(idx + 0, size)].mValue;
-                const aiVector3D &p2 = in.splineKeys[ClampSpline(idx + 1, size)].mValue;
-                const aiVector3D &p3 = in.splineKeys[ClampSpline(idx + 2, size)].mValue;
+					// get the 4 current points to evaluate the spline
+					const aiVector3D &p0 = in.splineKeys[ClampSpline(idx - 1, size)].mValue;
+					const aiVector3D &p1 = in.splineKeys[ClampSpline(idx + 0, size)].mValue;
+					const aiVector3D &p2 = in.splineKeys[ClampSpline(idx + 1, size)].mValue;
+					const aiVector3D &p3 = in.splineKeys[ClampSpline(idx + 2, size)].mValue;
 
-                // compute polynomials
-                const ai_real u2 = u * u;
-                const ai_real u3 = u2 * 2;
+					// compute polynomials
+					const ai_real u2 = u * u;
+					const ai_real u3 = u2 * 2;
 
-                const ai_real h1 = ai_real(2.0) * u3 - ai_real(3.0) * u2 + ai_real(1.0);
-                const ai_real h2 = ai_real(-2.0) * u3 + ai_real(3.0) * u3;
-                const ai_real h3 = u3 - ai_real(2.0) * u3;
-                const ai_real h4 = u3 - u2;
+					const ai_real h1 = ai_real(2.0) * u3 - ai_real(3.0) * u2 + ai_real(1.0);
+					const ai_real h2 = ai_real(-2.0) * u3 + ai_real(3.0) * u3;
+					const ai_real h3 = u3 - ai_real(2.0) * u3;
+					const ai_real h4 = u3 - u2;
 
-                // compute the spline tangents
-                const aiVector3D t1 = (p2 - p0) * in.tightness;
-                aiVector3D t2 = (p3 - p1) * in.tightness;
+					// compute the spline tangents
+					const aiVector3D t1 = (p2 - p0) * in.tightness;
+					aiVector3D t2 = (p3 - p1) * in.tightness;
 
-                // and use them to get the interpolated point
-                t2 = (h1 * p1 + p2 * h2 + t1 * h3 + h4 * t2);
+					// and use them to get the interpolated point
+					t2 = (h1 * p1 + p2 * h2 + t1 * h3 + h4 * t2);
 
-                // build a simple translation matrix from it
-                key.mValue = t2;
-                key.mTime = (double)i;
-            }
-        } break;
-        default:
-            // UNKNOWN , OTHER
-            break;
-        };
-        if (anim) {
-            anims.push_back(anim);
-            ++total;
-        }
-    }
+					// build a simple translation matrix from it
+					key.mValue = t2;
+					key.mTime = (double)i;
+				}
+			} break;
+			default:
+				// UNKNOWN , OTHER
+				break;
+		};
+		if (anim) {
+			anims.push_back(anim);
+			++total;
+		}
+	}
 }
 
 // ------------------------------------------------------------------------------------------------
 // This function is maybe more generic than we'd need it here
 void SetupMapping(aiMaterial *mat, aiTextureMapping mode, const aiVector3D &axis = aiVector3D(0.f, 0.f, -1.f)) {
+	if (nullptr == mat) {
+		return;
+	}
+
     // Check whether there are texture properties defined - setup
-    // the desired texture mapping mode for all of them and ignore
-    // all UV settings we might encounter. WE HAVE NO UVS!
+	// the desired texture mapping mode for all of them and ignore
+	// all UV settings we might encounter. WE HAVE NO UVS!
 
-    std::vector<aiMaterialProperty *> p;
-    p.reserve(mat->mNumProperties + 1);
+	std::vector<aiMaterialProperty *> p;
+	p.reserve(mat->mNumProperties + 1);
 
-    for (unsigned int i = 0; i < mat->mNumProperties; ++i) {
-        aiMaterialProperty *prop = mat->mProperties[i];
-        if (!::strcmp(prop->mKey.data, "$tex.file")) {
-            // Setup the mapping key
-            aiMaterialProperty *m = new aiMaterialProperty();
-            m->mKey.Set("$tex.mapping");
-            m->mIndex = prop->mIndex;
-            m->mSemantic = prop->mSemantic;
-            m->mType = aiPTI_Integer;
+	for (unsigned int i = 0; i < mat->mNumProperties; ++i) {
+		aiMaterialProperty *prop = mat->mProperties[i];
+		if (!::strcmp(prop->mKey.data, "$tex.file")) {
+			// Setup the mapping key
+			aiMaterialProperty *m = new aiMaterialProperty();
+			m->mKey.Set("$tex.mapping");
+			m->mIndex = prop->mIndex;
+			m->mSemantic = prop->mSemantic;
+			m->mType = aiPTI_Integer;
 
-            m->mDataLength = 4;
-            m->mData = new char[4];
-            *((int *)m->mData) = mode;
+			m->mDataLength = 4;
+			m->mData = new char[4];
+			*((int *)m->mData) = mode;
 
-            p.push_back(prop);
-            p.push_back(m);
+			p.push_back(prop);
+			p.push_back(m);
 
-            // Setup the mapping axis
-            if (mode == aiTextureMapping_CYLINDER || mode == aiTextureMapping_PLANE || mode == aiTextureMapping_SPHERE) {
-                m = new aiMaterialProperty();
-                m->mKey.Set("$tex.mapaxis");
-                m->mIndex = prop->mIndex;
-                m->mSemantic = prop->mSemantic;
-                m->mType = aiPTI_Float;
+			// Setup the mapping axis
+			if (mode == aiTextureMapping_CYLINDER || mode == aiTextureMapping_PLANE || mode == aiTextureMapping_SPHERE) {
+				m = new aiMaterialProperty();
+				m->mKey.Set("$tex.mapaxis");
+				m->mIndex = prop->mIndex;
+				m->mSemantic = prop->mSemantic;
+				m->mType = aiPTI_Float;
 
-                m->mDataLength = 12;
-                m->mData = new char[12];
-                *((aiVector3D *)m->mData) = axis;
-                p.push_back(m);
-            }
-        } else if (!::strcmp(prop->mKey.data, "$tex.uvwsrc")) {
-            delete mat->mProperties[i];
-        } else
-            p.push_back(prop);
-    }
+				m->mDataLength = 12;
+				m->mData = new char[12];
+				*((aiVector3D *)m->mData) = axis;
+				p.push_back(m);
+			}
+		} else if (!::strcmp(prop->mKey.data, "$tex.uvwsrc")) {
+			delete mat->mProperties[i];
+		} else
+			p.push_back(prop);
+	}
 
-    if (p.empty()) return;
+	if (p.empty()) return;
 
-    // rebuild the output array
-    if (p.size() > mat->mNumAllocated) {
-        delete[] mat->mProperties;
-        mat->mProperties = new aiMaterialProperty *[p.size() * 2];
+	// rebuild the output array
+	if (p.size() > mat->mNumAllocated) {
+		delete[] mat->mProperties;
+		mat->mProperties = new aiMaterialProperty *[p.size() * 2];
 
-        mat->mNumAllocated = static_cast<unsigned int>(p.size() * 2);
-    }
-    mat->mNumProperties = (unsigned int)p.size();
-    ::memcpy(mat->mProperties, &p[0], sizeof(void *) * mat->mNumProperties);
+		mat->mNumAllocated = static_cast<unsigned int>(p.size() * 2);
+	}
+	mat->mNumProperties = (unsigned int)p.size();
+	::memcpy(mat->mProperties, &p[0], sizeof(void *) * mat->mNumProperties);
 }
 
 // ------------------------------------------------------------------------------------------------
 void IRRImporter::GenerateGraph(Node *root, aiNode *rootOut, aiScene *scene,
-        BatchLoader &batch,
-        std::vector<aiMesh *> &meshes,
-        std::vector<aiNodeAnim *> &anims,
-        std::vector<AttachmentInfo> &attach,
-        std::vector<aiMaterial *> &materials,
-        unsigned int &defMatIdx) {
-    unsigned int oldMeshSize = (unsigned int)meshes.size();
-    //unsigned int meshTrafoAssign = 0;
+		BatchLoader &batch,
+		std::vector<aiMesh *> &meshes,
+		std::vector<aiNodeAnim *> &anims,
+		std::vector<AttachmentInfo> &attach,
+		std::vector<aiMaterial *> &materials,
+		unsigned int &defMatIdx) {
+	unsigned int oldMeshSize = (unsigned int)meshes.size();
+	//unsigned int meshTrafoAssign = 0;
 
-    // Now determine the type of the node
-    switch (root->type) {
-    case Node::ANIMMESH:
-    case Node::MESH: {
-        if (!root->meshPath.length())
-            break;
+	// Now determine the type of the node
+	switch (root->type) {
+		case Node::ANIMMESH:
+		case Node::MESH: {
+			if (!root->meshPath.length())
+				break;
 
-        // Get the loaded mesh from the scene and add it to
-        // the list of all scenes to be attached to the
-        // graph we're currently building
-        aiScene *localScene = batch.GetImport(root->id);
-        if (!localScene) {
-            ASSIMP_LOG_ERROR("IRR: Unable to load external file: " + root->meshPath);
-            break;
-        }
-        attach.push_back(AttachmentInfo(localScene, rootOut));
+			// Get the loaded mesh from the scene and add it to
+			// the list of all scenes to be attached to the
+			// graph we're currently building
+			aiScene *localScene = batch.GetImport(root->id);
+			if (!localScene) {
+				ASSIMP_LOG_ERROR("IRR: Unable to load external file: " + root->meshPath);
+				break;
+			}
+			attach.push_back(AttachmentInfo(localScene, rootOut));
 
-        // Now combine the material we've loaded for this mesh
-        // with the real materials we got from the file. As we
-        // don't execute any pp-steps on the file, the numbers
-        // should be equal. If they are not, we can impossibly
-        // do this  ...
-        if (root->materials.size() != (unsigned int)localScene->mNumMaterials) {
-            ASSIMP_LOG_WARN("IRR: Failed to match imported materials "
-                            "with the materials found in the IRR scene file");
+			// Now combine the material we've loaded for this mesh
+			// with the real materials we got from the file. As we
+			// don't execute any pp-steps on the file, the numbers
+			// should be equal. If they are not, we can impossibly
+			// do this  ...
+			if (root->materials.size() != (unsigned int)localScene->mNumMaterials) {
+				ASSIMP_LOG_WARN("IRR: Failed to match imported materials "
+								"with the materials found in the IRR scene file");
 
-            break;
-        }
-        for (unsigned int i = 0; i < localScene->mNumMaterials; ++i) {
-            // Delete the old material, we don't need it anymore
-            delete localScene->mMaterials[i];
+				break;
+			}
+			for (unsigned int i = 0; i < localScene->mNumMaterials; ++i) {
+				// Delete the old material, we don't need it anymore
+				delete localScene->mMaterials[i];
 
-            std::pair<aiMaterial *, unsigned int> &src = root->materials[i];
-            localScene->mMaterials[i] = src.first;
-        }
+				std::pair<aiMaterial *, unsigned int> &src = root->materials[i];
+				localScene->mMaterials[i] = src.first;
+			}
 
-        // NOTE: Each mesh should have exactly one material assigned,
-        // but we do it in a separate loop if this behaviour changes
-        // in future.
-        for (unsigned int i = 0; i < localScene->mNumMeshes; ++i) {
-            // Process material flags
-            aiMesh *mesh = localScene->mMeshes[i];
+			// NOTE: Each mesh should have exactly one material assigned,
+			// but we do it in a separate loop if this behavior changes
+			// in future.
+			for (unsigned int i = 0; i < localScene->mNumMeshes; ++i) {
+				// Process material flags
+				aiMesh *mesh = localScene->mMeshes[i];
 
-            // If "trans_vertex_alpha" mode is enabled, search all vertex colors
-            // and check whether they have a common alpha value. This is quite
-            // often the case so we can simply extract it to a shared oacity
-            // value.
-            std::pair<aiMaterial *, unsigned int> &src = root->materials[mesh->mMaterialIndex];
-            aiMaterial *mat = (aiMaterial *)src.first;
+				// If "trans_vertex_alpha" mode is enabled, search all vertex colors
+				// and check whether they have a common alpha value. This is quite
+				// often the case so we can simply extract it to a shared oacity
+				// value.
+				std::pair<aiMaterial *, unsigned int> &src = root->materials[mesh->mMaterialIndex];
+				aiMaterial *mat = (aiMaterial *)src.first;
 
-            if (mesh->HasVertexColors(0) && src.second & AI_IRRMESH_MAT_trans_vertex_alpha) {
-                bool bdo = true;
-                for (unsigned int a = 1; a < mesh->mNumVertices; ++a) {
+				if (mesh->HasVertexColors(0) && src.second & AI_IRRMESH_MAT_trans_vertex_alpha) {
+					bool bdo = true;
+					for (unsigned int a = 1; a < mesh->mNumVertices; ++a) {
 
-                    if (mesh->mColors[0][a].a != mesh->mColors[0][a - 1].a) {
-                        bdo = false;
-                        break;
-                    }
-                }
-                if (bdo) {
-                    ASSIMP_LOG_INFO("IRR: Replacing mesh vertex alpha with common opacity");
+						if (mesh->mColors[0][a].a != mesh->mColors[0][a - 1].a) {
+							bdo = false;
+							break;
+						}
+					}
+					if (bdo) {
+						ASSIMP_LOG_INFO("IRR: Replacing mesh vertex alpha with common opacity");
 
-                    for (unsigned int a = 0; a < mesh->mNumVertices; ++a)
-                        mesh->mColors[0][a].a = 1.f;
+						for (unsigned int a = 0; a < mesh->mNumVertices; ++a)
+							mesh->mColors[0][a].a = 1.f;
 
-                    mat->AddProperty(&mesh->mColors[0][0].a, 1, AI_MATKEY_OPACITY);
-                }
-            }
+						mat->AddProperty(&mesh->mColors[0][0].a, 1, AI_MATKEY_OPACITY);
+					}
+				}
 
-            // If we have a second texture coordinate set and a second texture
-            // (either lightmap, normalmap, 2layered material) we need to
-            // setup the correct UV index for it. The texture can either
-            // be diffuse (lightmap & 2layer) or a normal map (normal & parallax)
-            if (mesh->HasTextureCoords(1)) {
+				// If we have a second texture coordinate set and a second texture
+				// (either light-map, normal-map, 2layered material) we need to
+				// setup the correct UV index for it. The texture can either
+				// be diffuse (light-map & 2layer) or a normal map (normal & parallax)
+				if (mesh->HasTextureCoords(1)) {
 
-                int idx = 1;
-                if (src.second & (AI_IRRMESH_MAT_solid_2layer | AI_IRRMESH_MAT_lightmap)) {
-                    mat->AddProperty(&idx, 1, AI_MATKEY_UVWSRC_DIFFUSE(0));
-                } else if (src.second & AI_IRRMESH_MAT_normalmap_solid) {
-                    mat->AddProperty(&idx, 1, AI_MATKEY_UVWSRC_NORMALS(0));
-                }
-            }
-        }
-    } break;
+					int idx = 1;
+					if (src.second & (AI_IRRMESH_MAT_solid_2layer | AI_IRRMESH_MAT_lightmap)) {
+						mat->AddProperty(&idx, 1, AI_MATKEY_UVWSRC_DIFFUSE(0));
+					} else if (src.second & AI_IRRMESH_MAT_normalmap_solid) {
+						mat->AddProperty(&idx, 1, AI_MATKEY_UVWSRC_NORMALS(0));
+					}
+				}
+			}
+		} break;
 
-    case Node::LIGHT:
-    case Node::CAMERA:
+		case Node::LIGHT:
+		case Node::CAMERA:
 
-        // We're already finished with lights and cameras
-        break;
+			// We're already finished with lights and cameras
+			break;
 
-    case Node::SPHERE: {
-        // Generate the sphere model. Our input parameter to
-        // the sphere generation algorithm is the number of
-        // subdivisions of each triangle - but here we have
-        // the number of poylgons on a specific axis. Just
-        // use some hardcoded limits to approximate this ...
-        unsigned int mul = root->spherePolyCountX * root->spherePolyCountY;
-        if (mul < 100)
-            mul = 2;
-        else if (mul < 300)
-            mul = 3;
-        else
-            mul = 4;
+		case Node::SPHERE: {
+			// Generate the sphere model. Our input parameter to
+			// the sphere generation algorithm is the number of
+			// subdivisions of each triangle - but here we have
+			// the number of polygons on a specific axis. Just
+			// use some hard-coded limits to approximate this ...
+			unsigned int mul = root->spherePolyCountX * root->spherePolyCountY;
+			if (mul < 100)
+				mul = 2;
+			else if (mul < 300)
+				mul = 3;
+			else
+				mul = 4;
 
-        meshes.push_back(StandardShapes::MakeMesh(mul,
-                &StandardShapes::MakeSphere));
+			meshes.push_back(StandardShapes::MakeMesh(mul,
+					&StandardShapes::MakeSphere));
 
-        // Adjust scaling
-        root->scaling *= root->sphereRadius / 2;
+			// Adjust scaling
+			root->scaling *= root->sphereRadius / 2;
 
-        // Copy one output material
-        CopyMaterial(materials, root->materials, defMatIdx, meshes.back());
+			// Copy one output material
+			CopyMaterial(materials, root->materials, defMatIdx, meshes.back());
 
-        // Now adjust this output material - if there is a first texture
-        // set, setup spherical UV mapping around the Y axis.
-        SetupMapping((aiMaterial *)materials.back(), aiTextureMapping_SPHERE);
-    } break;
+			// Now adjust this output material - if there is a first texture
+			// set, setup spherical UV mapping around the Y axis.
+			SetupMapping((aiMaterial *)materials.back(), aiTextureMapping_SPHERE);
+		} break;
 
-    case Node::CUBE: {
-        // Generate an unit cube first
-        meshes.push_back(StandardShapes::MakeMesh(
-                &StandardShapes::MakeHexahedron));
+		case Node::CUBE: {
+			// Generate an unit cube first
+			meshes.push_back(StandardShapes::MakeMesh(
+					&StandardShapes::MakeHexahedron));
 
-        // Adjust scaling
-        root->scaling *= root->sphereRadius;
+			// Adjust scaling
+			root->scaling *= root->sphereRadius;
 
-        // Copy one output material
-        CopyMaterial(materials, root->materials, defMatIdx, meshes.back());
+			// Copy one output material
+			CopyMaterial(materials, root->materials, defMatIdx, meshes.back());
 
-        // Now adjust this output material - if there is a first texture
-        // set, setup cubic UV mapping
-        SetupMapping((aiMaterial *)materials.back(), aiTextureMapping_BOX);
-    } break;
+			// Now adjust this output material - if there is a first texture
+			// set, setup cubic UV mapping
+			SetupMapping((aiMaterial *)materials.back(), aiTextureMapping_BOX);
+		} break;
 
-    case Node::SKYBOX: {
-        // A skybox is defined by six materials
-        if (root->materials.size() < 6) {
-            ASSIMP_LOG_ERROR("IRR: There should be six materials for a skybox");
-            break;
-        }
+		case Node::SKYBOX: {
+			// A sky-box is defined by six materials
+			if (root->materials.size() < 6) {
+				ASSIMP_LOG_ERROR("IRR: There should be six materials for a skybox");
+				break;
+			}
 
-        // copy those materials and generate 6 meshes for our new skybox
-        materials.reserve(materials.size() + 6);
-        for (unsigned int i = 0; i < 6; ++i)
-            materials.insert(materials.end(), root->materials[i].first);
+			// copy those materials and generate 6 meshes for our new sky-box
+			materials.reserve(materials.size() + 6);
+			for (unsigned int i = 0; i < 6; ++i)
+				materials.insert(materials.end(), root->materials[i].first);
 
-        BuildSkybox(meshes, materials);
+			BuildSkybox(meshes, materials);
 
-        // *************************************************************
-        // Skyboxes will require a different code path for rendering,
-        // so there must be a way for the user to add special support
-        // for IRR skyboxes. We add a 'IRR.SkyBox_' prefix to the node.
-        // *************************************************************
-        root->name = "IRR.SkyBox_" + root->name;
-        ASSIMP_LOG_INFO("IRR: Loading skybox, this will "
-                        "require special handling to be displayed correctly");
-    } break;
+			// *************************************************************
+			// Skyboxes will require a different code path for rendering,
+			// so there must be a way for the user to add special support
+			// for IRR skyboxes. We add a 'IRR.SkyBox_' prefix to the node.
+			// *************************************************************
+			root->name = "IRR.SkyBox_" + root->name;
+			ASSIMP_LOG_INFO("IRR: Loading skybox, this will "
+							"require special handling to be displayed correctly");
+		} break;
 
-    case Node::TERRAIN: {
-        // to support terrains, we'd need to have a texture decoder
-        ASSIMP_LOG_ERROR("IRR: Unsupported node - TERRAIN");
-    } break;
-    default:
-        // DUMMY
-        break;
-    };
+		case Node::TERRAIN: {
+			// to support terrains, we'd need to have a texture decoder
+			ASSIMP_LOG_ERROR("IRR: Unsupported node - TERRAIN");
+		} break;
+		default:
+			// DUMMY
+			break;
+	};
 
-    // Check whether we added a mesh (or more than one ...). In this case
-    // we'll also need to attach it to the node
-    if (oldMeshSize != (unsigned int)meshes.size()) {
+	// Check whether we added a mesh (or more than one ...). In this case
+	// we'll also need to attach it to the node
+	if (oldMeshSize != (unsigned int)meshes.size()) {
 
-        rootOut->mNumMeshes = (unsigned int)meshes.size() - oldMeshSize;
-        rootOut->mMeshes = new unsigned int[rootOut->mNumMeshes];
+		rootOut->mNumMeshes = (unsigned int)meshes.size() - oldMeshSize;
+		rootOut->mMeshes = new unsigned int[rootOut->mNumMeshes];
 
-        for (unsigned int a = 0; a < rootOut->mNumMeshes; ++a) {
-            rootOut->mMeshes[a] = oldMeshSize + a;
-        }
-    }
+		for (unsigned int a = 0; a < rootOut->mNumMeshes; ++a) {
+			rootOut->mMeshes[a] = oldMeshSize + a;
+		}
+	}
 
-    // Setup the name of this node
-    rootOut->mName.Set(root->name);
+	// Setup the name of this node
+	rootOut->mName.Set(root->name);
 
-    // Now compute the final local transformation matrix of the
-    // node from the given translation, rotation and scaling values.
-    // (the rotation is given in Euler angles, XYZ order)
-    //std::swap((float&)root->rotation.z,(float&)root->rotation.y);
-    rootOut->mTransformation.FromEulerAnglesXYZ(AI_DEG_TO_RAD(root->rotation));
+	// Now compute the final local transformation matrix of the
+	// node from the given translation, rotation and scaling values.
+	// (the rotation is given in Euler angles, XYZ order)
+	//std::swap((float&)root->rotation.z,(float&)root->rotation.y);
+	rootOut->mTransformation.FromEulerAnglesXYZ(AI_DEG_TO_RAD(root->rotation));
 
-    // apply scaling
-    aiMatrix4x4 &mat = rootOut->mTransformation;
-    mat.a1 *= root->scaling.x;
-    mat.b1 *= root->scaling.x;
-    mat.c1 *= root->scaling.x;
-    mat.a2 *= root->scaling.y;
-    mat.b2 *= root->scaling.y;
-    mat.c2 *= root->scaling.y;
-    mat.a3 *= root->scaling.z;
-    mat.b3 *= root->scaling.z;
-    mat.c3 *= root->scaling.z;
+	// apply scaling
+	aiMatrix4x4 &mat = rootOut->mTransformation;
+	mat.a1 *= root->scaling.x;
+	mat.b1 *= root->scaling.x;
+	mat.c1 *= root->scaling.x;
+	mat.a2 *= root->scaling.y;
+	mat.b2 *= root->scaling.y;
+	mat.c2 *= root->scaling.y;
+	mat.a3 *= root->scaling.z;
+	mat.b3 *= root->scaling.z;
+	mat.c3 *= root->scaling.z;
 
-    // apply translation
-    mat.a4 += root->position.x;
-    mat.b4 += root->position.y;
-    mat.c4 += root->position.z;
+	// apply translation
+	mat.a4 += root->position.x;
+	mat.b4 += root->position.y;
+	mat.c4 += root->position.z;
 
-    // now compute animations for the node
-    ComputeAnimations(root, rootOut, anims);
+	// now compute animations for the node
+	ComputeAnimations(root, rootOut, anims);
 
-    // Add all children recursively. First allocate enough storage
-    // for them, then call us again
-    rootOut->mNumChildren = (unsigned int)root->children.size();
-    if (rootOut->mNumChildren) {
+	// Add all children recursively. First allocate enough storage
+	// for them, then call us again
+	rootOut->mNumChildren = (unsigned int)root->children.size();
+	if (rootOut->mNumChildren) {
 
-        rootOut->mChildren = new aiNode *[rootOut->mNumChildren];
-        for (unsigned int i = 0; i < rootOut->mNumChildren; ++i) {
+		rootOut->mChildren = new aiNode *[rootOut->mNumChildren];
+		for (unsigned int i = 0; i < rootOut->mNumChildren; ++i) {
 
-            aiNode *node = rootOut->mChildren[i] = new aiNode();
-            node->mParent = rootOut;
-            GenerateGraph(root->children[i], node, scene, batch, meshes,
-                    anims, attach, materials, defMatIdx);
-        }
-    }
+			aiNode *node = rootOut->mChildren[i] = new aiNode();
+			node->mParent = rootOut;
+			GenerateGraph(root->children[i], node, scene, batch, meshes,
+					anims, attach, materials, defMatIdx);
+		}
+	}
 }
 
 // ------------------------------------------------------------------------------------------------
 // Imports the given file into the given scene structure.
-void IRRImporter::InternReadFile(const std::string &pFile,
-        aiScene *pScene, IOSystem *pIOHandler) {
-    std::unique_ptr<IOStream> file(pIOHandler->Open(pFile));
+void IRRImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSystem *pIOHandler) {
+	std::unique_ptr<IOStream> file(pIOHandler->Open(pFile));
 
-    // Check whether we can read from the file
-    if (file.get() == nullptr) {
-        throw DeadlyImportError("Failed to open IRR file " + pFile + "");
+	// Check whether we can read from the file
+	if (file.get() == nullptr) {
+		throw DeadlyImportError("Failed to open IRR file " + pFile + "");
+	}
+
+	// Construct the irrXML parser
+	XmlParser st;
+    if (!st.parse( file.get() )) {
+        return;
     }
+    pugi::xml_node rootElement = st.getRootNode();
 
-    // Construct the irrXML parser
-    CIrrXML_IOStreamReader st(file.get());
-    reader = createIrrXMLReader((IFileReadCallBack *)&st);
+	// The root node of the scene
+	Node *root = new Node(Node::DUMMY);
+	root->parent = nullptr;
+	root->name = "<IRRSceneRoot>";
 
-    // The root node of the scene
-    Node *root = new Node(Node::DUMMY);
-    root->parent = nullptr;
-    root->name = "<IRRSceneRoot>";
+	// Current node parent
+	Node *curParent = root;
 
-    // Current node parent
-    Node *curParent = root;
+	// Scene-graph node we're currently working on
+	Node *curNode = nullptr;
 
-    // Scenegraph node we're currently working on
-    Node *curNode = nullptr;
+	// List of output cameras
+	std::vector<aiCamera *> cameras;
 
-    // List of output cameras
-    std::vector<aiCamera *> cameras;
+	// List of output lights
+	std::vector<aiLight *> lights;
 
-    // List of output lights
-    std::vector<aiLight *> lights;
+	// Batch loader used to load external models
+	BatchLoader batch(pIOHandler);
+	//  batch.SetBasePath(pFile);
 
-    // Batch loader used to load external models
-    BatchLoader batch(pIOHandler);
-    //  batch.SetBasePath(pFile);
+	cameras.reserve(5);
+	lights.reserve(5);
 
-    cameras.reserve(5);
-    lights.reserve(5);
+	bool inMaterials = false, inAnimator = false;
+	unsigned int guessedAnimCnt = 0, guessedMeshCnt = 0, guessedMatCnt = 0;
 
-    bool inMaterials = false, inAnimator = false;
-    unsigned int guessedAnimCnt = 0, guessedMeshCnt = 0, guessedMatCnt = 0;
+	// Parse the XML file
 
-    // Parse the XML file
-    while (reader->read()) {
-        switch (reader->getNodeType()) {
-        case EXN_ELEMENT:
-
-            if (!ASSIMP_stricmp(reader->getNodeName(), "node")) {
-                // ***********************************************************************
-                /*  What we're going to do with the node depends
-                 *  on its type:
-                 *
-                 *  "mesh" - Load a mesh from an external file
-                 *  "cube" - Generate a cube
-                 *  "skybox" - Generate a skybox
-                 *  "light" - A light source
-                 *  "sphere" - Generate a sphere mesh
-                 *  "animatedMesh" - Load an animated mesh from an external file
-                 *    and join its animation channels with ours.
-                 *  "empty" - A dummy node
-                 *  "camera" - A camera
-                 *  "terrain" - a terrain node (data comes from a heightmap)
-                 *  "billboard", ""
-                 *
-                 *  Each of these nodes can be animated and all can have multiple
-                 *  materials assigned (except lights, cameras and dummies, of course).
-                 */
-                // ***********************************************************************
-                const char *sz = reader->getAttributeValueSafe("type");
-                Node *nd;
-                if (!ASSIMP_stricmp(sz, "mesh") || !ASSIMP_stricmp(sz, "octTree")) {
-                    // OctTree's and meshes are treated equally
-                    nd = new Node(Node::MESH);
-                } else if (!ASSIMP_stricmp(sz, "cube")) {
-                    nd = new Node(Node::CUBE);
-                    ++guessedMeshCnt;
-                    // meshes.push_back(StandardShapes::MakeMesh(&StandardShapes::MakeHexahedron));
-                } else if (!ASSIMP_stricmp(sz, "skybox")) {
-                    nd = new Node(Node::SKYBOX);
-                    guessedMeshCnt += 6;
-                } else if (!ASSIMP_stricmp(sz, "camera")) {
-                    nd = new Node(Node::CAMERA);
-
-                    // Setup a temporary name for the camera
-                    aiCamera *cam = new aiCamera();
-                    cam->mName.Set(nd->name);
-                    cameras.push_back(cam);
-                } else if (!ASSIMP_stricmp(sz, "light")) {
-                    nd = new Node(Node::LIGHT);
-
-                    // Setup a temporary name for the light
-                    aiLight *cam = new aiLight();
-                    cam->mName.Set(nd->name);
-                    lights.push_back(cam);
-                } else if (!ASSIMP_stricmp(sz, "sphere")) {
-                    nd = new Node(Node::SPHERE);
-                    ++guessedMeshCnt;
-                } else if (!ASSIMP_stricmp(sz, "animatedMesh")) {
-                    nd = new Node(Node::ANIMMESH);
-                } else if (!ASSIMP_stricmp(sz, "empty")) {
-                    nd = new Node(Node::DUMMY);
-                } else if (!ASSIMP_stricmp(sz, "terrain")) {
-                    nd = new Node(Node::TERRAIN);
-                } else if (!ASSIMP_stricmp(sz, "billBoard")) {
-                    // We don't support billboards, so ignore them
-                    ASSIMP_LOG_ERROR("IRR: Billboards are not supported by Assimp");
-                    nd = new Node(Node::DUMMY);
-                } else {
-                    ASSIMP_LOG_WARN("IRR: Found unknown node: " + std::string(sz));
-
-                    /*  We skip the contents of nodes we don't know.
-                     *  We parse the transformation and all animators
-                     *  and skip the rest.
+	//while (reader->read())  {
+	for (pugi::xml_node child : rootElement.children())
+		switch (child.type()) {
+			case pugi::node_element:
+				if (!ASSIMP_stricmp(child.name(), "node")) {
+					// ***********************************************************************
+					/*  What we're going to do with the node depends
+                     *  on its type:
+                     *
+                     *  "mesh" - Load a mesh from an external file
+                     *  "cube" - Generate a cube
+                     *  "skybox" - Generate a skybox
+                     *  "light" - A light source
+                     *  "sphere" - Generate a sphere mesh
+                     *  "animatedMesh" - Load an animated mesh from an external file
+                     *    and join its animation channels with ours.
+                     *  "empty" - A dummy node
+                     *  "camera" - A camera
+                     *  "terrain" - a terrain node (data comes from a heightmap)
+                     *  "billboard", ""
+                     *
+                     *  Each of these nodes can be animated and all can have multiple
+                     *  materials assigned (except lights, cameras and dummies, of course).
                      */
-                    nd = new Node(Node::DUMMY);
-                }
+					// ***********************************************************************
+					//const char *sz = reader->getAttributeValueSafe("type");
+					pugi::xml_attribute attrib = child.attribute("type");
+					Node *nd;
+					if (!ASSIMP_stricmp(attrib.name(), "mesh") || !ASSIMP_stricmp(attrib.name(), "octTree")) {
+						// OctTree's and meshes are treated equally
+						nd = new Node(Node::MESH);
+					} else if (!ASSIMP_stricmp(attrib.name(), "cube")) {
+						nd = new Node(Node::CUBE);
+						++guessedMeshCnt;
+					} else if (!ASSIMP_stricmp(attrib.name(), "skybox")) {
+						nd = new Node(Node::SKYBOX);
+						guessedMeshCnt += 6;
+					} else if (!ASSIMP_stricmp(attrib.name(), "camera")) {
+						nd = new Node(Node::CAMERA);
 
-                /* Attach the newly created node to the scenegraph
-                 */
-                curNode = nd;
-                nd->parent = curParent;
-                curParent->children.push_back(nd);
-            } else if (!ASSIMP_stricmp(reader->getNodeName(), "materials")) {
-                inMaterials = true;
-            } else if (!ASSIMP_stricmp(reader->getNodeName(), "animators")) {
-                inAnimator = true;
-            } else if (!ASSIMP_stricmp(reader->getNodeName(), "attributes")) {
-                /*  We should have a valid node here
-                 *  FIX: no ... the scene root node is also contained in an attributes block
-                 */
-                if (!curNode) {
-#if 0
-                    ASSIMP_LOG_ERROR("IRR: Encountered <attributes> element, but "
-                        "there is no node active");
-#endif
-                    continue;
-                }
+						// Setup a temporary name for the camera
+						aiCamera *cam = new aiCamera();
+						cam->mName.Set(nd->name);
+						cameras.push_back(cam);
+					} else if (!ASSIMP_stricmp(attrib.name(), "light")) {
+						nd = new Node(Node::LIGHT);
 
-                Animator *curAnim = nullptr;
+						// Setup a temporary name for the light
+						aiLight *cam = new aiLight();
+						cam->mName.Set(nd->name);
+						lights.push_back(cam);
+					} else if (!ASSIMP_stricmp(attrib.name(), "sphere")) {
+						nd = new Node(Node::SPHERE);
+						++guessedMeshCnt;
+					} else if (!ASSIMP_stricmp(attrib.name(), "animatedMesh")) {
+						nd = new Node(Node::ANIMMESH);
+					} else if (!ASSIMP_stricmp(attrib.name(), "empty")) {
+						nd = new Node(Node::DUMMY);
+					} else if (!ASSIMP_stricmp(attrib.name(), "terrain")) {
+						nd = new Node(Node::TERRAIN);
+					} else if (!ASSIMP_stricmp(attrib.name(), "billBoard")) {
+						// We don't support billboards, so ignore them
+						ASSIMP_LOG_ERROR("IRR: Billboards are not supported by Assimp");
+						nd = new Node(Node::DUMMY);
+					} else {
+						ASSIMP_LOG_WARN("IRR: Found unknown node: " + std::string(attrib.name()));
 
-                // Materials can occur for nearly any type of node
-                if (inMaterials && curNode->type != Node::DUMMY) {
-                    /*  This is a material description - parse it!
+						/*  We skip the contents of nodes we don't know.
+                         *  We parse the transformation and all animators
+                         *  and skip the rest.
+                         */
+						nd = new Node(Node::DUMMY);
+					}
+
+					/* Attach the newly created node to the scene-graph
                      */
-                    curNode->materials.push_back(std::pair<aiMaterial *, unsigned int>());
-                    std::pair<aiMaterial *, unsigned int> &p = curNode->materials.back();
+					curNode = nd;
+					nd->parent = curParent;
+					curParent->children.push_back(nd);
+				} else if (!ASSIMP_stricmp(child.name(), "materials")) {
+					inMaterials = true;
+				} else if (!ASSIMP_stricmp(child.name(), "animators")) {
+					inAnimator = true;
+				} else if (!ASSIMP_stricmp(child.name(), "attributes")) {
+					//  We should have a valid node here
+					//  FIX: no ... the scene root node is also contained in an attributes block
+					if (!curNode) {
+						continue;
+					}
 
-                    p.first = ParseMaterial(p.second);
+					Animator *curAnim = nullptr;
 
-                    ++guessedMatCnt;
-                    continue;
-                } else if (inAnimator) {
-                    /*  This is an animation path - add a new animator
-                     *  to the list.
+					// Materials can occur for nearly any type of node
+					if (inMaterials && curNode->type != Node::DUMMY) {
+						//  This is a material description - parse it!
+						curNode->materials.push_back(std::pair<aiMaterial *, unsigned int>());
+						std::pair<aiMaterial *, unsigned int> &p = curNode->materials.back();
+
+						p.first = ParseMaterial(p.second);
+						++guessedMatCnt;
+						continue;
+					} else if (inAnimator) {
+						//  This is an animation path - add a new animator
+						//  to the list.
+						curNode->animators.push_back(Animator());
+						curAnim = &curNode->animators.back();
+
+						++guessedAnimCnt;
+					}
+
+					/*  Parse all elements in the attributes block
+                     *  and process them.
                      */
-                    curNode->animators.push_back(Animator());
-                    curAnim = &curNode->animators.back();
+					//					while (reader->read()) {
+					for (pugi::xml_node attrib : child.children()) {
+						if (attrib.type() == pugi::node_element) {
+							//if (reader->getNodeType() == EXN_ELEMENT) {
+							//if (!ASSIMP_stricmp(reader->getNodeName(), "vector3d")) {
+							if (!ASSIMP_stricmp(attrib.name(), "vector3d")) {
+								VectorProperty prop;
+								ReadVectorProperty(prop);
 
-                    ++guessedAnimCnt;
-                }
+								if (inAnimator) {
+									if (curAnim->type == Animator::ROTATION && prop.name == "Rotation") {
+										// We store the rotation euler angles in 'direction'
+										curAnim->direction = prop.value;
+									} else if (curAnim->type == Animator::FOLLOW_SPLINE) {
+										// Check whether the vector follows the PointN naming scheme,
+										// here N is the ONE-based index of the point
+										if (prop.name.length() >= 6 && prop.name.substr(0, 5) == "Point") {
+											// Add a new key to the list
+											curAnim->splineKeys.push_back(aiVectorKey());
+											aiVectorKey &key = curAnim->splineKeys.back();
 
-                /*  Parse all elements in the attributes block
-                 *  and process them.
-                 */
-                while (reader->read()) {
-                    if (reader->getNodeType() == EXN_ELEMENT) {
-                        if (!ASSIMP_stricmp(reader->getNodeName(), "vector3d")) {
-                            VectorProperty prop;
-                            ReadVectorProperty(prop);
+											// and parse its properties
+											key.mValue = prop.value;
+											key.mTime = strtoul10(&prop.name[5]);
+										}
+									} else if (curAnim->type == Animator::FLY_CIRCLE) {
+										if (prop.name == "Center") {
+											curAnim->circleCenter = prop.value;
+										} else if (prop.name == "Direction") {
+											curAnim->direction = prop.value;
 
-                            if (inAnimator) {
-                                if (curAnim->type == Animator::ROTATION && prop.name == "Rotation") {
-                                    // We store the rotation euler angles in 'direction'
-                                    curAnim->direction = prop.value;
-                                } else if (curAnim->type == Animator::FOLLOW_SPLINE) {
-                                    // Check whether the vector follows the PointN naming scheme,
-                                    // here N is the ONE-based index of the point
-                                    if (prop.name.length() >= 6 && prop.name.substr(0, 5) == "Point") {
-                                        // Add a new key to the list
-                                        curAnim->splineKeys.push_back(aiVectorKey());
-                                        aiVectorKey &key = curAnim->splineKeys.back();
+											// From Irrlicht's source - a workaround for backward compatibility with Irrlicht 1.1
+											if (curAnim->direction == aiVector3D()) {
+												curAnim->direction = aiVector3D(0.f, 1.f, 0.f);
+											} else
+												curAnim->direction.Normalize();
+										}
+									} else if (curAnim->type == Animator::FLY_STRAIGHT) {
+										if (prop.name == "Start") {
+											// We reuse the field here
+											curAnim->circleCenter = prop.value;
+										} else if (prop.name == "End") {
+											// We reuse the field here
+											curAnim->direction = prop.value;
+										}
+									}
+								} else {
+									if (prop.name == "Position") {
+										curNode->position = prop.value;
+									} else if (prop.name == "Rotation") {
+										curNode->rotation = prop.value;
+									} else if (prop.name == "Scale") {
+										curNode->scaling = prop.value;
+									} else if (Node::CAMERA == curNode->type) {
+										aiCamera *cam = cameras.back();
+										if (prop.name == "Target") {
+											cam->mLookAt = prop.value;
+										} else if (prop.name == "UpVector") {
+											cam->mUp = prop.value;
+										}
+									}
+								}
+								//} else if (!ASSIMP_stricmp(reader->getNodeName(), "bool")) {
+							} else if (!ASSIMP_stricmp(attrib.name(), "bool")) {
+								BoolProperty prop;
+								ReadBoolProperty(prop);
 
-                                        // and parse its properties
-                                        key.mValue = prop.value;
-                                        key.mTime = strtoul10(&prop.name[5]);
-                                    }
-                                } else if (curAnim->type == Animator::FLY_CIRCLE) {
-                                    if (prop.name == "Center") {
-                                        curAnim->circleCenter = prop.value;
-                                    } else if (prop.name == "Direction") {
-                                        curAnim->direction = prop.value;
+								if (inAnimator && curAnim->type == Animator::FLY_CIRCLE && prop.name == "Loop") {
+									curAnim->loop = prop.value;
+								}
+								//} else if (!ASSIMP_stricmp(reader->getNodeName(), "float")) {
+							} else if (!ASSIMP_stricmp(attrib.name(), "float")) {
+								FloatProperty prop;
+								ReadFloatProperty(prop);
 
-                                        // From Irrlicht's source - a workaround for backward compatibility with Irrlicht 1.1
-                                        if (curAnim->direction == aiVector3D()) {
-                                            curAnim->direction = aiVector3D(0.f, 1.f, 0.f);
-                                        } else
-                                            curAnim->direction.Normalize();
-                                    }
-                                } else if (curAnim->type == Animator::FLY_STRAIGHT) {
-                                    if (prop.name == "Start") {
-                                        // We reuse the field here
-                                        curAnim->circleCenter = prop.value;
-                                    } else if (prop.name == "End") {
-                                        // We reuse the field here
-                                        curAnim->direction = prop.value;
-                                    }
-                                }
-                            } else {
-                                if (prop.name == "Position") {
-                                    curNode->position = prop.value;
-                                } else if (prop.name == "Rotation") {
-                                    curNode->rotation = prop.value;
-                                } else if (prop.name == "Scale") {
-                                    curNode->scaling = prop.value;
-                                } else if (Node::CAMERA == curNode->type) {
-                                    aiCamera *cam = cameras.back();
-                                    if (prop.name == "Target") {
-                                        cam->mLookAt = prop.value;
-                                    } else if (prop.name == "UpVector") {
-                                        cam->mUp = prop.value;
-                                    }
-                                }
-                            }
-                        } else if (!ASSIMP_stricmp(reader->getNodeName(), "bool")) {
-                            BoolProperty prop;
-                            ReadBoolProperty(prop);
-
-                            if (inAnimator && curAnim->type == Animator::FLY_CIRCLE && prop.name == "Loop") {
-                                curAnim->loop = prop.value;
-                            }
-                        } else if (!ASSIMP_stricmp(reader->getNodeName(), "float")) {
-                            FloatProperty prop;
-                            ReadFloatProperty(prop);
-
-                            if (inAnimator) {
-                                // The speed property exists for several animators
-                                if (prop.name == "Speed") {
-                                    curAnim->speed = prop.value;
-                                } else if (curAnim->type == Animator::FLY_CIRCLE && prop.name == "Radius") {
-                                    curAnim->circleRadius = prop.value;
-                                } else if (curAnim->type == Animator::FOLLOW_SPLINE && prop.name == "Tightness") {
-                                    curAnim->tightness = prop.value;
-                                }
-                            } else {
-                                if (prop.name == "FramesPerSecond" && Node::ANIMMESH == curNode->type) {
-                                    curNode->framesPerSecond = prop.value;
-                                } else if (Node::CAMERA == curNode->type) {
-                                    /*  This is the vertical, not the horizontal FOV.
+								if (inAnimator) {
+									// The speed property exists for several animators
+									if (prop.name == "Speed") {
+										curAnim->speed = prop.value;
+									} else if (curAnim->type == Animator::FLY_CIRCLE && prop.name == "Radius") {
+										curAnim->circleRadius = prop.value;
+									} else if (curAnim->type == Animator::FOLLOW_SPLINE && prop.name == "Tightness") {
+										curAnim->tightness = prop.value;
+									}
+								} else {
+									if (prop.name == "FramesPerSecond" && Node::ANIMMESH == curNode->type) {
+										curNode->framesPerSecond = prop.value;
+									} else if (Node::CAMERA == curNode->type) {
+										/*  This is the vertical, not the horizontal FOV.
                                     *  We need to compute the right FOV from the
                                     *  screen aspect which we don't know yet.
                                     */
-                                    if (prop.name == "Fovy") {
-                                        cameras.back()->mHorizontalFOV = prop.value;
-                                    } else if (prop.name == "Aspect") {
-                                        cameras.back()->mAspect = prop.value;
-                                    } else if (prop.name == "ZNear") {
-                                        cameras.back()->mClipPlaneNear = prop.value;
-                                    } else if (prop.name == "ZFar") {
-                                        cameras.back()->mClipPlaneFar = prop.value;
-                                    }
-                                } else if (Node::LIGHT == curNode->type) {
-                                    /*  Additional light information
+										if (prop.name == "Fovy") {
+											cameras.back()->mHorizontalFOV = prop.value;
+										} else if (prop.name == "Aspect") {
+											cameras.back()->mAspect = prop.value;
+										} else if (prop.name == "ZNear") {
+											cameras.back()->mClipPlaneNear = prop.value;
+										} else if (prop.name == "ZFar") {
+											cameras.back()->mClipPlaneFar = prop.value;
+										}
+									} else if (Node::LIGHT == curNode->type) {
+										/*  Additional light information
                                      */
-                                    if (prop.name == "Attenuation") {
-                                        lights.back()->mAttenuationLinear = prop.value;
-                                    } else if (prop.name == "OuterCone") {
-                                        lights.back()->mAngleOuterCone = AI_DEG_TO_RAD(prop.value);
-                                    } else if (prop.name == "InnerCone") {
-                                        lights.back()->mAngleInnerCone = AI_DEG_TO_RAD(prop.value);
-                                    }
-                                }
-                                // radius of the sphere to be generated -
-                                // or alternatively, size of the cube
-                                else if ((Node::SPHERE == curNode->type && prop.name == "Radius") || (Node::CUBE == curNode->type && prop.name == "Size")) {
+										if (prop.name == "Attenuation") {
+											lights.back()->mAttenuationLinear = prop.value;
+										} else if (prop.name == "OuterCone") {
+											lights.back()->mAngleOuterCone = AI_DEG_TO_RAD(prop.value);
+										} else if (prop.name == "InnerCone") {
+											lights.back()->mAngleInnerCone = AI_DEG_TO_RAD(prop.value);
+										}
+									}
+									// radius of the sphere to be generated -
+									// or alternatively, size of the cube
+									else if ((Node::SPHERE == curNode->type && prop.name == "Radius") || (Node::CUBE == curNode->type && prop.name == "Size")) {
 
-                                    curNode->sphereRadius = prop.value;
-                                }
-                            }
-                        } else if (!ASSIMP_stricmp(reader->getNodeName(), "int")) {
-                            IntProperty prop;
-                            ReadIntProperty(prop);
+										curNode->sphereRadius = prop.value;
+									}
+								}
+								//} else if (!ASSIMP_stricmp(reader->getNodeName(), "int")) {
+							} else if (!ASSIMP_stricmp(attrib.name(), "int")) {
+								IntProperty prop;
+								ReadIntProperty(prop);
 
-                            if (inAnimator) {
-                                if (curAnim->type == Animator::FLY_STRAIGHT && prop.name == "TimeForWay") {
-                                    curAnim->timeForWay = prop.value;
-                                }
-                            } else {
-                                // sphere polgon numbers in each direction
-                                if (Node::SPHERE == curNode->type) {
+								if (inAnimator) {
+									if (curAnim->type == Animator::FLY_STRAIGHT && prop.name == "TimeForWay") {
+										curAnim->timeForWay = prop.value;
+									}
+								} else {
+									// sphere polygon numbers in each direction
+									if (Node::SPHERE == curNode->type) {
 
-                                    if (prop.name == "PolyCountX") {
-                                        curNode->spherePolyCountX = prop.value;
-                                    } else if (prop.name == "PolyCountY") {
-                                        curNode->spherePolyCountY = prop.value;
-                                    }
-                                }
-                            }
-                        } else if (!ASSIMP_stricmp(reader->getNodeName(), "string") || !ASSIMP_stricmp(reader->getNodeName(), "enum")) {
-                            StringProperty prop;
-                            ReadStringProperty(prop);
-                            if (prop.value.length()) {
-                                if (prop.name == "Name") {
-                                    curNode->name = prop.value;
+										if (prop.name == "PolyCountX") {
+											curNode->spherePolyCountX = prop.value;
+										} else if (prop.name == "PolyCountY") {
+											curNode->spherePolyCountY = prop.value;
+										}
+									}
+								}
+								//} else if (!ASSIMP_stricmp(reader->getNodeName(), "string") || !ASSIMP_stricmp(reader->getNodeName(), "enum")) {
+							} else if (!ASSIMP_stricmp(attrib.name(), "string") || !ASSIMP_stricmp(attrib.name(), "enum")) {
+								StringProperty prop;
+								ReadStringProperty(prop);
+								if (prop.value.length()) {
+									if (prop.name == "Name") {
+										curNode->name = prop.value;
 
-                                    /*  If we're either a camera or a light source
+										/*  If we're either a camera or a light source
                                      *  we need to update the name in the aiLight/
                                      *  aiCamera structure, too.
                                      */
-                                    if (Node::CAMERA == curNode->type) {
-                                        cameras.back()->mName.Set(prop.value);
-                                    } else if (Node::LIGHT == curNode->type) {
-                                        lights.back()->mName.Set(prop.value);
-                                    }
-                                } else if (Node::LIGHT == curNode->type && "LightType" == prop.name) {
-                                    if (prop.value == "Spot")
-                                        lights.back()->mType = aiLightSource_SPOT;
-                                    else if (prop.value == "Point")
-                                        lights.back()->mType = aiLightSource_POINT;
-                                    else if (prop.value == "Directional")
-                                        lights.back()->mType = aiLightSource_DIRECTIONAL;
-                                    else {
-                                        // We won't pass the validation with aiLightSourceType_UNDEFINED,
-                                        // so we remove the light and replace it with a silly dummy node
-                                        delete lights.back();
-                                        lights.pop_back();
-                                        curNode->type = Node::DUMMY;
+										if (Node::CAMERA == curNode->type) {
+											cameras.back()->mName.Set(prop.value);
+										} else if (Node::LIGHT == curNode->type) {
+											lights.back()->mName.Set(prop.value);
+										}
+									} else if (Node::LIGHT == curNode->type && "LightType" == prop.name) {
+										if (prop.value == "Spot")
+											lights.back()->mType = aiLightSource_SPOT;
+										else if (prop.value == "Point")
+											lights.back()->mType = aiLightSource_POINT;
+										else if (prop.value == "Directional")
+											lights.back()->mType = aiLightSource_DIRECTIONAL;
+										else {
+											// We won't pass the validation with aiLightSourceType_UNDEFINED,
+											// so we remove the light and replace it with a silly dummy node
+											delete lights.back();
+											lights.pop_back();
+											curNode->type = Node::DUMMY;
 
-                                        ASSIMP_LOG_ERROR("Ignoring light of unknown type: " + prop.value);
-                                    }
-                                } else if ((prop.name == "Mesh" && Node::MESH == curNode->type) ||
-                                           Node::ANIMMESH == curNode->type) {
-                                    /*  This is the file name of the mesh - either
+											ASSIMP_LOG_ERROR("Ignoring light of unknown type: " + prop.value);
+										}
+									} else if ((prop.name == "Mesh" && Node::MESH == curNode->type) ||
+											   Node::ANIMMESH == curNode->type) {
+    								/*  This is the file name of the mesh - either
                                      *  animated or not. We need to make sure we setup
                                      *  the correct post-processing settings here.
                                      */
-                                    unsigned int pp = 0;
-                                    BatchLoader::PropertyMap map;
+										unsigned int pp = 0;
+										BatchLoader::PropertyMap map;
 
-                                    /* If the mesh is a static one remove all animations from the impor data
+										/* If the mesh is a static one remove all animations from the impor data
                                      */
-                                    if (Node::ANIMMESH != curNode->type) {
-                                        pp |= aiProcess_RemoveComponent;
-                                        SetGenericProperty<int>(map.ints, AI_CONFIG_PP_RVC_FLAGS,
-                                                aiComponent_ANIMATIONS | aiComponent_BONEWEIGHTS);
-                                    }
+										if (Node::ANIMMESH != curNode->type) {
+											pp |= aiProcess_RemoveComponent;
+											SetGenericProperty<int>(map.ints, AI_CONFIG_PP_RVC_FLAGS,
+													aiComponent_ANIMATIONS | aiComponent_BONEWEIGHTS);
+										}
 
-                                    /*  TODO: maybe implement the protection against recursive
-                                    *  loading calls directly in BatchLoader? The current
-                                    *  implementation is not absolutely safe. A LWS and an IRR
-                                    *  file referencing each other *could* cause the system to
-                                    *  recurse forever.
-                                    */
+										/*  TODO: maybe implement the protection against recursive
+                                        *  loading calls directly in BatchLoader? The current
+                                        *  implementation is not absolutely safe. A LWS and an IRR
+                                        *  file referencing each other *could* cause the system to
+                                        *  recurse forever.
+                                        */
 
-                                    const std::string extension = GetExtension(prop.value);
-                                    if ("irr" == extension) {
-                                        ASSIMP_LOG_ERROR("IRR: Can't load another IRR file recursively");
-                                    } else {
-                                        curNode->id = batch.AddLoadRequest(prop.value, pp, &map);
-                                        curNode->meshPath = prop.value;
-                                    }
-                                } else if (inAnimator && prop.name == "Type") {
-                                    // type of the animator
-                                    if (prop.value == "rotation") {
-                                        curAnim->type = Animator::ROTATION;
-                                    } else if (prop.value == "flyCircle") {
-                                        curAnim->type = Animator::FLY_CIRCLE;
-                                    } else if (prop.value == "flyStraight") {
-                                        curAnim->type = Animator::FLY_CIRCLE;
-                                    } else if (prop.value == "followSpline") {
-                                        curAnim->type = Animator::FOLLOW_SPLINE;
-                                    } else {
-                                        ASSIMP_LOG_WARN("IRR: Ignoring unknown animator: " + prop.value);
+										const std::string extension = GetExtension(prop.value);
+										if ("irr" == extension) {
+											ASSIMP_LOG_ERROR("IRR: Can't load another IRR file recursively");
+										} else {
+											curNode->id = batch.AddLoadRequest(prop.value, pp, &map);
+											curNode->meshPath = prop.value;
+										}
+									} else if (inAnimator && prop.name == "Type") {
+										// type of the animator
+										if (prop.value == "rotation") {
+											curAnim->type = Animator::ROTATION;
+										} else if (prop.value == "flyCircle") {
+											curAnim->type = Animator::FLY_CIRCLE;
+										} else if (prop.value == "flyStraight") {
+											curAnim->type = Animator::FLY_CIRCLE;
+										} else if (prop.value == "followSpline") {
+											curAnim->type = Animator::FOLLOW_SPLINE;
+										} else {
+											ASSIMP_LOG_WARN("IRR: Ignoring unknown animator: " + prop.value);
 
-                                        curAnim->type = Animator::UNKNOWN;
-                                    }
-                                }
-                            }
-                        }
-                    } else if (reader->getNodeType() == EXN_ELEMENT_END && !ASSIMP_stricmp(reader->getNodeName(), "attributes")) {
-                        break;
-                    }
-                }
-            }
-            break;
+											curAnim->type = Animator::UNKNOWN;
+										}
+									}
+								}
+							}
+							//} else if (reader->getNodeType() == EXN_ELEMENT_END && !ASSIMP_stricmp(reader->getNodeName(), "attributes")) {
+						} else if (attrib.type() == pugi::node_null && !ASSIMP_stricmp(attrib.name(), "attributes")) {
+							break;
+						}
+					}
+				}
+				break;
 
-        case EXN_ELEMENT_END:
+				/*case EXN_ELEMENT_END:
 
-            // If we reached the end of a node, we need to continue processing its parent
-            if (!ASSIMP_stricmp(reader->getNodeName(), "node")) {
-                if (!curNode) {
-                    // currently is no node set. We need to go
-                    // back in the node hierarchy
-                    if (!curParent) {
-                        curParent = root;
-                        ASSIMP_LOG_ERROR("IRR: Too many closing <node> elements");
-                    } else
-                        curParent = curParent->parent;
-                } else
-                    curNode = nullptr;
-            }
-            // clear all flags
-            else if (!ASSIMP_stricmp(reader->getNodeName(), "materials")) {
-                inMaterials = false;
-            } else if (!ASSIMP_stricmp(reader->getNodeName(), "animators")) {
-                inAnimator = false;
-            }
-            break;
+				// If we reached the end of a node, we need to continue processing its parent
+				if (!ASSIMP_stricmp(reader->getNodeName(), "node")) {
+					if (!curNode) {
+						// currently is no node set. We need to go
+						// back in the node hierarchy
+						if (!curParent) {
+							curParent = root;
+							ASSIMP_LOG_ERROR("IRR: Too many closing <node> elements");
+						} else
+							curParent = curParent->parent;
+					} else
+						curNode = nullptr;
+				}
+				// clear all flags
+				else if (!ASSIMP_stricmp(reader->getNodeName(), "materials")) {
+					inMaterials = false;
+				} else if (!ASSIMP_stricmp(reader->getNodeName(), "animators")) {
+					inAnimator = false;
+				}
+				break;*/
 
-        default:
-            // GCC complains that not all enumeration values are handled
-            break;
-        }
-    }
+			default:
+				// GCC complains that not all enumeration values are handled
+				break;
+		}
+	//}
 
-    //  Now iterate through all cameras and compute their final (horizontal) FOV
-    for (aiCamera *cam : cameras) {
-        // screen aspect could be missing
-        if (cam->mAspect) {
-            cam->mHorizontalFOV *= cam->mAspect;
-        } else {
-            ASSIMP_LOG_WARN("IRR: Camera aspect is not given, can't compute horizontal FOV");
-        }
-    }
+	//  Now iterate through all cameras and compute their final (horizontal) FOV
+	for (aiCamera *cam : cameras) {
+		// screen aspect could be missing
+		if (cam->mAspect) {
+			cam->mHorizontalFOV *= cam->mAspect;
+		} else {
+			ASSIMP_LOG_WARN("IRR: Camera aspect is not given, can't compute horizontal FOV");
+		}
+	}
 
-    batch.LoadAll();
+	batch.LoadAll();
 
-    /* Allocate a tempoary scene data structure
-     */
-    aiScene *tempScene = new aiScene();
-    tempScene->mRootNode = new aiNode();
-    tempScene->mRootNode->mName.Set("<IRRRoot>");
+	// Allocate a temporary scene data structure
+	aiScene *tempScene = new aiScene();
+	tempScene->mRootNode = new aiNode();
+	tempScene->mRootNode->mName.Set("<IRRRoot>");
 
-    /* Copy the cameras to the output array
-     */
-    if (!cameras.empty()) {
-        tempScene->mNumCameras = (unsigned int)cameras.size();
-        tempScene->mCameras = new aiCamera *[tempScene->mNumCameras];
-        ::memcpy(tempScene->mCameras, &cameras[0], sizeof(void *) * tempScene->mNumCameras);
-    }
+	// Copy the cameras to the output array
+	if (!cameras.empty()) {
+		tempScene->mNumCameras = (unsigned int)cameras.size();
+		tempScene->mCameras = new aiCamera *[tempScene->mNumCameras];
+		::memcpy(tempScene->mCameras, &cameras[0], sizeof(void *) * tempScene->mNumCameras);
+	}
 
-    /* Copy the light sources to the output array
-     */
-    if (!lights.empty()) {
-        tempScene->mNumLights = (unsigned int)lights.size();
-        tempScene->mLights = new aiLight *[tempScene->mNumLights];
-        ::memcpy(tempScene->mLights, &lights[0], sizeof(void *) * tempScene->mNumLights);
-    }
+	// Copy the light sources to the output array
+	if (!lights.empty()) {
+		tempScene->mNumLights = (unsigned int)lights.size();
+		tempScene->mLights = new aiLight *[tempScene->mNumLights];
+		::memcpy(tempScene->mLights, &lights[0], sizeof(void *) * tempScene->mNumLights);
+	}
 
-    // temporary data
-    std::vector<aiNodeAnim *> anims;
-    std::vector<aiMaterial *> materials;
-    std::vector<AttachmentInfo> attach;
-    std::vector<aiMesh *> meshes;
+	// temporary data
+	std::vector<aiNodeAnim *> anims;
+	std::vector<aiMaterial *> materials;
+	std::vector<AttachmentInfo> attach;
+	std::vector<aiMesh *> meshes;
 
-    // try to guess how much storage we'll need
-    anims.reserve(guessedAnimCnt + (guessedAnimCnt >> 2));
-    meshes.reserve(guessedMeshCnt + (guessedMeshCnt >> 2));
-    materials.reserve(guessedMatCnt + (guessedMatCnt >> 2));
+	// try to guess how much storage we'll need
+	anims.reserve(guessedAnimCnt + (guessedAnimCnt >> 2));
+	meshes.reserve(guessedMeshCnt + (guessedMeshCnt >> 2));
+	materials.reserve(guessedMatCnt + (guessedMatCnt >> 2));
 
-    /* Now process our scenegraph recursively: generate final
-     * meshes and generate animation channels for all nodes.
-     */
-    unsigned int defMatIdx = UINT_MAX;
-    GenerateGraph(root, tempScene->mRootNode, tempScene,
-            batch, meshes, anims, attach, materials, defMatIdx);
+	// Now process our scene-graph recursively: generate final
+	// meshes and generate animation channels for all nodes.
+	unsigned int defMatIdx = UINT_MAX;
+	GenerateGraph(root, tempScene->mRootNode, tempScene,
+			batch, meshes, anims, attach, materials, defMatIdx);
 
-    if (!anims.empty()) {
-        tempScene->mNumAnimations = 1;
-        tempScene->mAnimations = new aiAnimation *[tempScene->mNumAnimations];
-        aiAnimation *an = tempScene->mAnimations[0] = new aiAnimation();
+	if (!anims.empty()) {
+		tempScene->mNumAnimations = 1;
+		tempScene->mAnimations = new aiAnimation *[tempScene->mNumAnimations];
+		aiAnimation *an = tempScene->mAnimations[0] = new aiAnimation();
 
-        // ***********************************************************
-        // This is only the global animation channel of the scene.
-        // If there are animated models, they will have separate
-        // animation channels in the scene. To display IRR scenes
-        // correctly, users will need to combine the global anim
-        // channel with all the local animations they want to play
-        // ***********************************************************
-        an->mName.Set("Irr_GlobalAnimChannel");
+		// ***********************************************************
+		// This is only the global animation channel of the scene.
+		// If there are animated models, they will have separate
+		// animation channels in the scene. To display IRR scenes
+		// correctly, users will need to combine the global anim
+		// channel with all the local animations they want to play
+		// ***********************************************************
+		an->mName.Set("Irr_GlobalAnimChannel");
 
-        // copy all node animation channels to the global channel
-        an->mNumChannels = (unsigned int)anims.size();
-        an->mChannels = new aiNodeAnim *[an->mNumChannels];
-        ::memcpy(an->mChannels, &anims[0], sizeof(void *) * an->mNumChannels);
-    }
-    if (!meshes.empty()) {
-        // copy all meshes to the temporary scene
-        tempScene->mNumMeshes = (unsigned int)meshes.size();
-        tempScene->mMeshes = new aiMesh *[tempScene->mNumMeshes];
-        ::memcpy(tempScene->mMeshes, &meshes[0], tempScene->mNumMeshes * sizeof(void *));
-    }
+		// copy all node animation channels to the global channel
+		an->mNumChannels = (unsigned int)anims.size();
+		an->mChannels = new aiNodeAnim *[an->mNumChannels];
+		::memcpy(an->mChannels, &anims[0], sizeof(void *) * an->mNumChannels);
+	}
+	if (!meshes.empty()) {
+		// copy all meshes to the temporary scene
+		tempScene->mNumMeshes = (unsigned int)meshes.size();
+		tempScene->mMeshes = new aiMesh *[tempScene->mNumMeshes];
+		::memcpy(tempScene->mMeshes, &meshes[0], tempScene->mNumMeshes * sizeof(void *));
+	}
 
-    /* Copy all materials to the output array
-     */
-    if (!materials.empty()) {
-        tempScene->mNumMaterials = (unsigned int)materials.size();
-        tempScene->mMaterials = new aiMaterial *[tempScene->mNumMaterials];
-        ::memcpy(tempScene->mMaterials, &materials[0], sizeof(void *) * tempScene->mNumMaterials);
-    }
+	// Copy all materials to the output array
+	if (!materials.empty()) {
+		tempScene->mNumMaterials = (unsigned int)materials.size();
+		tempScene->mMaterials = new aiMaterial *[tempScene->mNumMaterials];
+		::memcpy(tempScene->mMaterials, &materials[0], sizeof(void *) * tempScene->mNumMaterials);
+	}
 
-    /*  Now merge all sub scenes and attach them to the correct
-     *  attachment points in the scenegraph.
-     */
-    SceneCombiner::MergeScenes(&pScene, tempScene, attach,
-            AI_INT_MERGE_SCENE_GEN_UNIQUE_NAMES | (!configSpeedFlag ? (
-                                                                              AI_INT_MERGE_SCENE_GEN_UNIQUE_NAMES_IF_NECESSARY | AI_INT_MERGE_SCENE_GEN_UNIQUE_MATNAMES) :
-                                                                      0));
+	//  Now merge all sub scenes and attach them to the correct
+	//  attachment points in the scenegraph.
+	SceneCombiner::MergeScenes(&pScene, tempScene, attach,
+			AI_INT_MERGE_SCENE_GEN_UNIQUE_NAMES | (!configSpeedFlag ? (
+																			  AI_INT_MERGE_SCENE_GEN_UNIQUE_NAMES_IF_NECESSARY | AI_INT_MERGE_SCENE_GEN_UNIQUE_MATNAMES) :
+																	  0));
 
-    /*  If we have no meshes | no materials now set the INCOMPLETE
-     *  scene flag. This is necessary if we failed to load all
-     *  models from external files
-     */
-    if (!pScene->mNumMeshes || !pScene->mNumMaterials) {
-        ASSIMP_LOG_WARN("IRR: No meshes loaded, setting AI_SCENE_FLAGS_INCOMPLETE");
-        pScene->mFlags |= AI_SCENE_FLAGS_INCOMPLETE;
-    }
+	// If we have no meshes | no materials now set the INCOMPLETE
+	// scene flag. This is necessary if we failed to load all
+	// models from external files
+	if (!pScene->mNumMeshes || !pScene->mNumMaterials) {
+		ASSIMP_LOG_WARN("IRR: No meshes loaded, setting AI_SCENE_FLAGS_INCOMPLETE");
+		pScene->mFlags |= AI_SCENE_FLAGS_INCOMPLETE;
+	}
 
-    /* Finished ... everything destructs automatically and all
-     * temporary scenes have already been deleted by MergeScenes()
-     */
-
-    delete root;
-    delete reader;
+	// Finished ... everything destructs automatically and all
+	// temporary scenes have already been deleted by MergeScenes()
+	delete root;
 }
 
 #endif // !! ASSIMP_BUILD_NO_IRR_IMPORTER
diff --git a/code/AssetLib/Irr/IRRLoader.h b/code/AssetLib/Irr/IRRLoader.h
index 21908c14a..b9e6486f4 100644
--- a/code/AssetLib/Irr/IRRLoader.h
+++ b/code/AssetLib/Irr/IRRLoader.h
@@ -4,7 +4,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -40,7 +39,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ----------------------------------------------------------------------
 */
 
-
 /** @file IRRLoader.h
  *  @brief Declaration of the .irrMesh (Irrlight Engine Mesh Format)
  *  importer class.
@@ -83,7 +81,7 @@ protected:
 
 private:
 
-    /** Data structure for a scenegraph node animator
+    /** Data structure for a scene-graph node animator
      */
     struct Animator {
         // Type of the animator
@@ -129,7 +127,7 @@ private:
         int timeForWay;
     };
 
-    /** Data structure for a scenegraph node in an IRR file
+    /** Data structure for a scene-graph node in an IRR file
      */
     struct Node
     {
@@ -227,8 +225,7 @@ private:
 
 
     // -------------------------------------------------------------------
-    /** Fill the scenegraph recursively
-     */
+    /// Fill the scene-graph recursively
     void GenerateGraph(Node* root,aiNode* rootOut ,aiScene* scene,
         BatchLoader& batch,
         std::vector<aiMesh*>& meshes,
@@ -237,27 +234,22 @@ private:
         std::vector<aiMaterial*>& materials,
         unsigned int& defaultMatIdx);
 
-
     // -------------------------------------------------------------------
-    /** Generate a mesh that consists of just a single quad
-     */
+    /// Generate a mesh that consists of just a single quad
     aiMesh* BuildSingleQuadMesh(const SkyboxVertex& v1,
         const SkyboxVertex& v2,
         const SkyboxVertex& v3,
         const SkyboxVertex& v4);
 
-
     // -------------------------------------------------------------------
-    /** Build a skybox
-     *
-     *  @param meshes Receives 6 output meshes
-     *  @param materials The last 6 materials are assigned to the newly
-     *    created meshes. The names of the materials are adjusted.
-     */
+    /// Build a sky-box
+    ///
+    /// @param meshes Receives 6 output meshes
+    /// @param materials The last 6 materials are assigned to the newly
+    ///                  created meshes. The names of the materials are adjusted.
     void BuildSkybox(std::vector<aiMesh*>& meshes,
         std::vector<aiMaterial*> materials);
 
-
     // -------------------------------------------------------------------
     /** Copy a material for a mesh to the output material list
      *
@@ -271,7 +263,6 @@ private:
         unsigned int& defMatIdx,
         aiMesh* mesh);
 
-
     // -------------------------------------------------------------------
     /** Compute animations for a specific node
      *
@@ -281,13 +272,11 @@ private:
     void ComputeAnimations(Node* root, aiNode* real,
         std::vector<aiNodeAnim*>& anims);
 
-
 private:
-
-    /** Configuration option: desired output FPS */
+    /// Configuration option: desired output FPS 
     double fps;
 
-    /** Configuration option: speed flag was set? */
+    /// Configuration option: speed flag was set?
     bool configSpeedFlag;
 };
 
diff --git a/code/AssetLib/Irr/IRRMeshLoader.cpp b/code/AssetLib/Irr/IRRMeshLoader.cpp
index d07ff87ea..b6a9b4777 100644
--- a/code/AssetLib/Irr/IRRMeshLoader.cpp
+++ b/code/AssetLib/Irr/IRRMeshLoader.cpp
@@ -43,494 +43,474 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /** @file Implementation of the IrrMesh importer class */
 
-
-
 #ifndef ASSIMP_BUILD_NO_IRRMESH_IMPORTER
 
 #include "IRRMeshLoader.h"
 #include <assimp/ParsingUtils.h>
 #include <assimp/fast_atof.h>
-#include <memory>
-#include <assimp/IOSystem.hpp>
-#include <assimp/mesh.h>
-#include <assimp/DefaultLogger.hpp>
-#include <assimp/material.h>
-#include <assimp/scene.h>
 #include <assimp/importerdesc.h>
+#include <assimp/material.h>
+#include <assimp/mesh.h>
+#include <assimp/scene.h>
+#include <assimp/DefaultLogger.hpp>
+#include <assimp/IOSystem.hpp>
+#include <memory>
 
 using namespace Assimp;
-using namespace irr;
-using namespace irr::io;
 
 static const aiImporterDesc desc = {
-    "Irrlicht Mesh Reader",
-    "",
-    "",
-    "http://irrlicht.sourceforge.net/",
-    aiImporterFlags_SupportTextFlavour,
-    0,
-    0,
-    0,
-    0,
-    "xml irrmesh"
+	"Irrlicht Mesh Reader",
+	"",
+	"",
+	"http://irrlicht.sourceforge.net/",
+	aiImporterFlags_SupportTextFlavour,
+	0,
+	0,
+	0,
+	0,
+	"xml irrmesh"
 };
 
 // ------------------------------------------------------------------------------------------------
 // Constructor to be privately used by Importer
-IRRMeshImporter::IRRMeshImporter()
-{}
+IRRMeshImporter::IRRMeshImporter() :
+        BaseImporter(),
+        IrrlichtBase() {
+    // empty
+}
 
 // ------------------------------------------------------------------------------------------------
 // Destructor, private as well
-IRRMeshImporter::~IRRMeshImporter()
-{}
+IRRMeshImporter::~IRRMeshImporter() {}
 
 // ------------------------------------------------------------------------------------------------
 // Returns whether the class can handle the format of the given file.
-bool IRRMeshImporter::CanRead( const std::string& pFile, IOSystem* pIOHandler, bool checkSig) const
-{
-    /* NOTE: A simple check for the file extension is not enough
+bool IRRMeshImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool checkSig) const {
+	/* NOTE: A simple check for the file extension is not enough
      * here. Irrmesh and irr are easy, but xml is too generic
      * and could be collada, too. So we need to open the file and
      * search for typical tokens.
      */
-    const std::string extension = GetExtension(pFile);
+	const std::string extension = GetExtension(pFile);
 
-    if (extension == "irrmesh")return true;
-    else if (extension == "xml" || checkSig)
-    {
-        /*  If CanRead() is called to check whether the loader
+	if (extension == "irrmesh")
+		return true;
+	else if (extension == "xml" || checkSig) {
+		/*  If CanRead() is called to check whether the loader
          *  supports a specific file extension in general we
          *  must return true here.
          */
-        if (!pIOHandler)return true;
-        const char* tokens[] = {"irrmesh"};
-        return SearchFileHeaderForToken(pIOHandler,pFile,tokens,1);
-    }
-    return false;
+		if (!pIOHandler) return true;
+		const char *tokens[] = { "irrmesh" };
+		return SearchFileHeaderForToken(pIOHandler, pFile, tokens, 1);
+	}
+	return false;
 }
 
 // ------------------------------------------------------------------------------------------------
 // Get a list of all file extensions which are handled by this class
-const aiImporterDesc* IRRMeshImporter::GetInfo () const
-{
-    return &desc;
+const aiImporterDesc *IRRMeshImporter::GetInfo() const {
+	return &desc;
 }
 
-static void releaseMaterial( aiMaterial **mat ) {
-    if(*mat!= nullptr) {
-        delete *mat;
-        *mat = nullptr;
-    }
+static void releaseMaterial(aiMaterial **mat) {
+	if (*mat != nullptr) {
+		delete *mat;
+		*mat = nullptr;
+	}
 }
 
-static void releaseMesh( aiMesh **mesh ) {
-    if (*mesh != nullptr){
-        delete *mesh;
-        *mesh = nullptr;
-    }
+static void releaseMesh(aiMesh **mesh) {
+	if (*mesh != nullptr) {
+		delete *mesh;
+		*mesh = nullptr;
+	}
 }
 
 // ------------------------------------------------------------------------------------------------
 // Imports the given file into the given scene structure.
-void IRRMeshImporter::InternReadFile( const std::string& pFile,
-    aiScene* pScene, IOSystem* pIOHandler)
-{
-    std::unique_ptr<IOStream> file( pIOHandler->Open( pFile));
+void IRRMeshImporter::InternReadFile(const std::string &pFile,
+		aiScene *pScene, IOSystem *pIOHandler) {
+	std::unique_ptr<IOStream> file(pIOHandler->Open(pFile));
 
-    // Check whether we can read from the file
-    if (file.get() == nullptr) {
-        throw DeadlyImportError("Failed to open IRRMESH file " + pFile + ".");
+	// Check whether we can read from the file
+	if (file.get() == NULL)
+		throw DeadlyImportError("Failed to open IRRMESH file " + pFile + "");
+
+	// Construct the irrXML parser
+	XmlParser parser;
+    if (!parser.parse( file.get() )) {
+        return;
     }
-
-    // Construct the irrXML parser
-    CIrrXML_IOStreamReader st(file.get());
-    reader = createIrrXMLReader((IFileReadCallBack*) &st);
-
-    // final data
-    std::vector<aiMaterial*> materials;
-    std::vector<aiMesh*>     meshes;
-    materials.reserve (5);
-    meshes.reserve(5);
-
-    // temporary data - current mesh buffer
-    aiMaterial* curMat  = nullptr;
-    aiMesh* curMesh     = nullptr;
-    unsigned int curMatFlags = 0;
-
-    std::vector<aiVector3D> curVertices,curNormals,curTangents,curBitangents;
-    std::vector<aiColor4D>  curColors;
-    std::vector<aiVector3D> curUVs,curUV2s;
-
-    // some temporary variables
-    int textMeaning = 0;
-    int vertexFormat = 0; // 0 = normal; 1 = 2 tcoords, 2 = tangents
-    bool useColors = false;
-
-    // Parse the XML file
-    while (reader->read())  {
-        switch (reader->getNodeType())  {
-        case EXN_ELEMENT:
-
-            if (!ASSIMP_stricmp(reader->getNodeName(),"buffer") && (curMat || curMesh)) {
-                // end of previous buffer. A material and a mesh should be there
-                if ( !curMat || !curMesh)   {
-                    ASSIMP_LOG_ERROR("IRRMESH: A buffer must contain a mesh and a material");
-                    releaseMaterial( &curMat );
-                    releaseMesh( &curMesh );
-                } else {
-                    materials.push_back(curMat);
-                    meshes.push_back(curMesh);
-                }
-                curMat  = nullptr;
-                curMesh = nullptr;
-
-                curVertices.clear();
-                curColors.clear();
-                curNormals.clear();
-                curUV2s.clear();
-                curUVs.clear();
-                curTangents.clear();
-                curBitangents.clear();
-            }
-
-
-            if (!ASSIMP_stricmp(reader->getNodeName(),"material"))  {
-                if (curMat) {
-                    ASSIMP_LOG_WARN("IRRMESH: Only one material description per buffer, please");
-                    releaseMaterial( &curMat );
-                }
-                curMat = ParseMaterial(curMatFlags);
-            }
-            /* no else here! */ if (!ASSIMP_stricmp(reader->getNodeName(),"vertices"))
-            {
-                int num = reader->getAttributeValueAsInt("vertexCount");
-
-                if (!num)   {
-                    // This is possible ... remove the mesh from the list and skip further reading
-                    ASSIMP_LOG_WARN("IRRMESH: Found mesh with zero vertices");
-
-                    releaseMaterial( &curMat );
-                    releaseMesh( &curMesh );
-                    textMeaning = 0;
-                    continue;
-                }
-
-                curVertices.reserve(num);
-                curNormals.reserve(num);
-                curColors.reserve(num);
-                curUVs.reserve(num);
-
-                // Determine the file format
-                const char* t = reader->getAttributeValueSafe("type");
-                if (!ASSIMP_stricmp("2tcoords", t)) {
-                    curUV2s.reserve (num);
-                    vertexFormat = 1;
-
-                    if (curMatFlags & AI_IRRMESH_EXTRA_2ND_TEXTURE) {
-                        // *********************************************************
-                        // We have a second texture! So use this UV channel
-                        // for it. The 2nd texture can be either a normal
-                        // texture (solid_2layer or lightmap_xxx) or a normal
-                        // map (normal_..., parallax_...)
-                        // *********************************************************
-                        int idx = 1;
-                        aiMaterial* mat = ( aiMaterial* ) curMat;
-
-                        if (curMatFlags & AI_IRRMESH_MAT_lightmap){
-                            mat->AddProperty(&idx,1,AI_MATKEY_UVWSRC_LIGHTMAP(0));
-                        }
-                        else if (curMatFlags & AI_IRRMESH_MAT_normalmap_solid){
-                            mat->AddProperty(&idx,1,AI_MATKEY_UVWSRC_NORMALS(0));
-                        }
-                        else if (curMatFlags & AI_IRRMESH_MAT_solid_2layer) {
-                            mat->AddProperty(&idx,1,AI_MATKEY_UVWSRC_DIFFUSE(1));
-                        }
-                    }
-                }
-                else if (!ASSIMP_stricmp("tangents", t))    {
-                    curTangents.reserve (num);
-                    curBitangents.reserve (num);
-                    vertexFormat = 2;
-                }
-                else if (ASSIMP_stricmp("standard", t)) {
-                    releaseMaterial( &curMat );
-                    ASSIMP_LOG_WARN("IRRMESH: Unknown vertex format");
-                }
-                else vertexFormat = 0;
-                textMeaning = 1;
-            }
-            else if (!ASSIMP_stricmp(reader->getNodeName(),"indices"))  {
-                if (curVertices.empty() && curMat)  {
-                    releaseMaterial( &curMat );
-                    throw DeadlyImportError("IRRMESH: indices must come after vertices");
-                }
-
-                textMeaning = 2;
-
-                // start a new mesh
-                curMesh = new aiMesh();
-
-                // allocate storage for all faces
-                curMesh->mNumVertices = reader->getAttributeValueAsInt("indexCount");
-                if (!curMesh->mNumVertices) {
-                    // This is possible ... remove the mesh from the list and skip further reading
-                    ASSIMP_LOG_WARN("IRRMESH: Found mesh with zero indices");
-
-                    // mesh - away
-                    releaseMesh( &curMesh );
-
-                    // material - away
-                    releaseMaterial( &curMat );
-
-                    textMeaning = 0;
-                    continue;
-                }
-
-                if (curMesh->mNumVertices % 3)  {
-                    ASSIMP_LOG_WARN("IRRMESH: Number if indices isn't divisible by 3");
-                }
-
-                curMesh->mNumFaces = curMesh->mNumVertices / 3;
-                curMesh->mFaces = new aiFace[curMesh->mNumFaces];
-
-                // setup some members
-                curMesh->mMaterialIndex = (unsigned int)materials.size();
-                curMesh->mPrimitiveTypes = aiPrimitiveType_TRIANGLE;
-
-                // allocate storage for all vertices
-                curMesh->mVertices = new aiVector3D[curMesh->mNumVertices];
-
-                if (curNormals.size() == curVertices.size())    {
-                    curMesh->mNormals = new aiVector3D[curMesh->mNumVertices];
-                }
-                if (curTangents.size() == curVertices.size())   {
-                    curMesh->mTangents = new aiVector3D[curMesh->mNumVertices];
-                }
-                if (curBitangents.size() == curVertices.size()) {
-                    curMesh->mBitangents = new aiVector3D[curMesh->mNumVertices];
-                }
-                if (curColors.size() == curVertices.size() && useColors)    {
-                    curMesh->mColors[0] = new aiColor4D[curMesh->mNumVertices];
-                }
-                if (curUVs.size() == curVertices.size())    {
-                    curMesh->mTextureCoords[0] = new aiVector3D[curMesh->mNumVertices];
-                }
-                if (curUV2s.size() == curVertices.size())   {
-                    curMesh->mTextureCoords[1] = new aiVector3D[curMesh->mNumVertices];
-                }
-            }
-            break;
-
-        case EXN_TEXT:
-            {
-            const char* sz = reader->getNodeData();
-            if (textMeaning == 1)   {
-                textMeaning = 0;
-
-                // read vertices
-                do  {
-                    SkipSpacesAndLineEnd(&sz);
-                    aiVector3D temp;aiColor4D c;
-
-                    // Read the vertex position
-                    sz = fast_atoreal_move<float>(sz,(float&)temp.x);
-                    SkipSpaces(&sz);
-
-                    sz = fast_atoreal_move<float>(sz,(float&)temp.y);
-                    SkipSpaces(&sz);
-
-                    sz = fast_atoreal_move<float>(sz,(float&)temp.z);
-                    SkipSpaces(&sz);
-                    curVertices.push_back(temp);
-
-                    // Read the vertex normals
-                    sz = fast_atoreal_move<float>(sz,(float&)temp.x);
-                    SkipSpaces(&sz);
-
-                    sz = fast_atoreal_move<float>(sz,(float&)temp.y);
-                    SkipSpaces(&sz);
-
-                    sz = fast_atoreal_move<float>(sz,(float&)temp.z);
-                    SkipSpaces(&sz);
-                    curNormals.push_back(temp);
-
-                    // read the vertex colors
-                    uint32_t clr = strtoul16(sz,&sz);
-                    ColorFromARGBPacked(clr,c);
-
-                    if (!curColors.empty() && c != *(curColors.end()-1))
-                        useColors = true;
-
-                    curColors.push_back(c);
-                    SkipSpaces(&sz);
-
-
-                    // read the first UV coordinate set
-                    sz = fast_atoreal_move<float>(sz,(float&)temp.x);
-                    SkipSpaces(&sz);
-
-                    sz = fast_atoreal_move<float>(sz,(float&)temp.y);
-                    SkipSpaces(&sz);
-                    temp.z = 0.f;
-                    temp.y = 1.f - temp.y;  // DX to OGL
-                    curUVs.push_back(temp);
-
-                    // read the (optional) second UV coordinate set
-                    if (vertexFormat == 1)  {
-                        sz = fast_atoreal_move<float>(sz,(float&)temp.x);
-                        SkipSpaces(&sz);
-
-                        sz = fast_atoreal_move<float>(sz,(float&)temp.y);
-                        temp.y = 1.f - temp.y; // DX to OGL
-                        curUV2s.push_back(temp);
-                    }
-                    // read optional tangent and bitangent vectors
-                    else if (vertexFormat == 2) {
-                        // tangents
-                        sz = fast_atoreal_move<float>(sz,(float&)temp.x);
-                        SkipSpaces(&sz);
-
-                        sz = fast_atoreal_move<float>(sz,(float&)temp.z);
-                        SkipSpaces(&sz);
-
-                        sz = fast_atoreal_move<float>(sz,(float&)temp.y);
-                        SkipSpaces(&sz);
-                        temp.y *= -1.0f;
-                        curTangents.push_back(temp);
-
-                        // bitangents
-                        sz = fast_atoreal_move<float>(sz,(float&)temp.x);
-                        SkipSpaces(&sz);
-
-                        sz = fast_atoreal_move<float>(sz,(float&)temp.z);
-                        SkipSpaces(&sz);
-
-                        sz = fast_atoreal_move<float>(sz,(float&)temp.y);
-                        SkipSpaces(&sz);
-                        temp.y *= -1.0f;
-                        curBitangents.push_back(temp);
-                    }
-                }
-
-                /* IMPORTANT: We assume that each vertex is specified in one
-                   line. So we can skip the rest of the line - unknown vertex
-                   elements are ignored.
-                 */
-
-                while (SkipLine(&sz));
-            }
-            else if (textMeaning == 2)  {
-                textMeaning = 0;
-
-                // read indices
-                aiFace* curFace = curMesh->mFaces;
-                aiFace* const faceEnd = curMesh->mFaces  + curMesh->mNumFaces;
-
-                aiVector3D* pcV  = curMesh->mVertices;
-                aiVector3D* pcN  = curMesh->mNormals;
-                aiVector3D* pcT  = curMesh->mTangents;
-                aiVector3D* pcB  = curMesh->mBitangents;
-                aiColor4D* pcC0  = curMesh->mColors[0];
-                aiVector3D* pcT0 = curMesh->mTextureCoords[0];
-                aiVector3D* pcT1 = curMesh->mTextureCoords[1];
-
-                unsigned int curIdx = 0;
-                unsigned int total = 0;
-                while(SkipSpacesAndLineEnd(&sz))    {
-                    if (curFace >= faceEnd) {
-                        ASSIMP_LOG_ERROR("IRRMESH: Too many indices");
-                        break;
-                    }
-                    if (!curIdx)    {
-                        curFace->mNumIndices = 3;
-                        curFace->mIndices = new unsigned int[3];
-                    }
-
-                    unsigned int idx = strtoul10(sz,&sz);
-                    if (idx >= curVertices.size())  {
-                        ASSIMP_LOG_ERROR("IRRMESH: Index out of range");
-                        idx = 0;
-                    }
-
-                    curFace->mIndices[curIdx] = total++;
-
-                    *pcV++ = curVertices[idx];
-                    if (pcN)*pcN++ = curNormals[idx];
-                    if (pcT)*pcT++ = curTangents[idx];
-                    if (pcB)*pcB++ = curBitangents[idx];
-                    if (pcC0)*pcC0++ = curColors[idx];
-                    if (pcT0)*pcT0++ = curUVs[idx];
-                    if (pcT1)*pcT1++ = curUV2s[idx];
-
-                    if (++curIdx == 3)  {
-                        ++curFace;
-                        curIdx = 0;
-                    }
-                }
-
-                if (curFace != faceEnd)
-                    ASSIMP_LOG_ERROR("IRRMESH: Not enough indices");
-
-                // Finish processing the mesh - do some small material workarounds
-                if (curMatFlags & AI_IRRMESH_MAT_trans_vertex_alpha && !useColors)  {
-                    // Take the opacity value of the current material
-                    // from the common vertex color alpha
-                    aiMaterial* mat = (aiMaterial*)curMat;
-                    mat->AddProperty(&curColors[0].a,1,AI_MATKEY_OPACITY);
-                }
-            }}
-            break;
-
-            default:
-                // GCC complains here ...
-                break;
-
-        };
-    }
-
-    // End of the last buffer. A material and a mesh should be there
-    if (curMat || curMesh)  {
-        if ( !curMat || !curMesh)   {
-            ASSIMP_LOG_ERROR("IRRMESH: A buffer must contain a mesh and a material");
-            releaseMaterial( &curMat );
-            releaseMesh( &curMesh );
-        }
-        else    {
-            materials.push_back(curMat);
-            meshes.push_back(curMesh);
-        }
-    }
-
-    if (materials.empty())
-        throw DeadlyImportError("IRRMESH: Unable to read a mesh from this file");
-
-
-    // now generate the output scene
-    pScene->mNumMeshes = (unsigned int)meshes.size();
-    pScene->mMeshes = new aiMesh*[pScene->mNumMeshes];
-    for (unsigned int i = 0; i < pScene->mNumMeshes;++i)    {
-        pScene->mMeshes[i] = meshes[i];
-
-        // clean this value ...
-        pScene->mMeshes[i]->mNumUVComponents[3] = 0;
-    }
-
-    pScene->mNumMaterials = (unsigned int)materials.size();
-    pScene->mMaterials = new aiMaterial*[pScene->mNumMaterials];
-    ::memcpy(pScene->mMaterials,&materials[0],sizeof(void*)*pScene->mNumMaterials);
-
-    pScene->mRootNode = new aiNode();
-    pScene->mRootNode->mName.Set("<IRRMesh>");
-    pScene->mRootNode->mNumMeshes = pScene->mNumMeshes;
-    pScene->mRootNode->mMeshes = new unsigned int[pScene->mNumMeshes];
-
-    for (unsigned int i = 0; i < pScene->mNumMeshes;++i)
-        pScene->mRootNode->mMeshes[i] = i;
-
-    // clean up and return
-    delete reader;
-    AI_DEBUG_INVALIDATE_PTR(reader);
+    XmlNode root = parser.getRootNode();
+
+	// final data
+	std::vector<aiMaterial *> materials;
+	std::vector<aiMesh *> meshes;
+	materials.reserve(5);
+	meshes.reserve(5);
+
+	// temporary data - current mesh buffer
+	aiMaterial *curMat = nullptr;
+	aiMesh *curMesh = nullptr;
+	unsigned int curMatFlags = 0;
+
+	std::vector<aiVector3D> curVertices, curNormals, curTangents, curBitangents;
+	std::vector<aiColor4D> curColors;
+	std::vector<aiVector3D> curUVs, curUV2s;
+
+	// some temporary variables
+	int textMeaning = 0;
+	int vertexFormat = 0; // 0 = normal; 1 = 2 tcoords, 2 = tangents
+	bool useColors = false;
+
+	// Parse the XML file
+	for (pugi::xml_node child : root.children()) {
+		if (child.type() == pugi::node_element) {
+			if (!ASSIMP_stricmp(child.name(), "buffer") && (curMat || curMesh)) {
+				// end of previous buffer. A material and a mesh should be there
+				if (!curMat || !curMesh) {
+					ASSIMP_LOG_ERROR("IRRMESH: A buffer must contain a mesh and a material");
+					releaseMaterial(&curMat);
+					releaseMesh(&curMesh);
+				} else {
+					materials.push_back(curMat);
+					meshes.push_back(curMesh);
+				}
+				curMat = nullptr;
+				curMesh = nullptr;
+
+				curVertices.clear();
+				curColors.clear();
+				curNormals.clear();
+				curUV2s.clear();
+				curUVs.clear();
+				curTangents.clear();
+				curBitangents.clear();
+			}
+
+			if (!ASSIMP_stricmp(child.name(), "material")) {
+				if (curMat) {
+					ASSIMP_LOG_WARN("IRRMESH: Only one material description per buffer, please");
+					releaseMaterial(&curMat);
+				}
+				curMat = ParseMaterial(curMatFlags);
+			}
+			/* no else here! */ if (!ASSIMP_stricmp(child.name(), "vertices")) {
+				pugi::xml_attribute attr = child.attribute("vertexCount");
+				int num = attr.as_int();
+                //int num = reader->getAttributeValueAsInt("vertexCount");
+
+				if (!num) {
+					// This is possible ... remove the mesh from the list and skip further reading
+					ASSIMP_LOG_WARN("IRRMESH: Found mesh with zero vertices");
+
+					releaseMaterial(&curMat);
+					releaseMesh(&curMesh);
+					textMeaning = 0;
+					continue;
+				}
+
+				curVertices.reserve(num);
+				curNormals.reserve(num);
+				curColors.reserve(num);
+				curUVs.reserve(num);
+
+				// Determine the file format
+				//const char *t = reader->getAttributeValueSafe("type");
+                pugi::xml_attribute t = child.attribute("type");
+				if (!ASSIMP_stricmp("2tcoords", t.name())) {
+					curUV2s.reserve(num);
+					vertexFormat = 1;
+
+					if (curMatFlags & AI_IRRMESH_EXTRA_2ND_TEXTURE) {
+						// *********************************************************
+						// We have a second texture! So use this UV channel
+						// for it. The 2nd texture can be either a normal
+						// texture (solid_2layer or lightmap_xxx) or a normal
+						// map (normal_..., parallax_...)
+						// *********************************************************
+						int idx = 1;
+						aiMaterial *mat = (aiMaterial *)curMat;
+
+						if (curMatFlags & AI_IRRMESH_MAT_lightmap) {
+							mat->AddProperty(&idx, 1, AI_MATKEY_UVWSRC_LIGHTMAP(0));
+						} else if (curMatFlags & AI_IRRMESH_MAT_normalmap_solid) {
+							mat->AddProperty(&idx, 1, AI_MATKEY_UVWSRC_NORMALS(0));
+						} else if (curMatFlags & AI_IRRMESH_MAT_solid_2layer) {
+							mat->AddProperty(&idx, 1, AI_MATKEY_UVWSRC_DIFFUSE(1));
+						}
+					}
+				} else if (!ASSIMP_stricmp("tangents", t.name())) {
+					curTangents.reserve(num);
+					curBitangents.reserve(num);
+					vertexFormat = 2;
+				} else if (ASSIMP_stricmp("standard", t.name())) {
+					releaseMaterial(&curMat);
+					ASSIMP_LOG_WARN("IRRMESH: Unknown vertex format");
+				} else
+					vertexFormat = 0;
+				textMeaning = 1;
+			} else if (!ASSIMP_stricmp(child.name(), "indices")) {
+				if (curVertices.empty() && curMat) {
+					releaseMaterial(&curMat);
+					throw DeadlyImportError("IRRMESH: indices must come after vertices");
+				}
+
+				textMeaning = 2;
+
+				// start a new mesh
+				curMesh = new aiMesh();
+
+				// allocate storage for all faces
+				pugi::xml_attribute attr = child.attribute("indexCount");
+				curMesh->mNumVertices = attr.as_int();
+				if (!curMesh->mNumVertices) {
+					// This is possible ... remove the mesh from the list and skip further reading
+					ASSIMP_LOG_WARN("IRRMESH: Found mesh with zero indices");
+
+					// mesh - away
+					releaseMesh(&curMesh);
+
+					// material - away
+					releaseMaterial(&curMat);
+
+					textMeaning = 0;
+					continue;
+				}
+
+				if (curMesh->mNumVertices % 3) {
+					ASSIMP_LOG_WARN("IRRMESH: Number if indices isn't divisible by 3");
+				}
+
+				curMesh->mNumFaces = curMesh->mNumVertices / 3;
+				curMesh->mFaces = new aiFace[curMesh->mNumFaces];
+
+				// setup some members
+				curMesh->mMaterialIndex = (unsigned int)materials.size();
+				curMesh->mPrimitiveTypes = aiPrimitiveType_TRIANGLE;
+
+				// allocate storage for all vertices
+				curMesh->mVertices = new aiVector3D[curMesh->mNumVertices];
+
+				if (curNormals.size() == curVertices.size()) {
+					curMesh->mNormals = new aiVector3D[curMesh->mNumVertices];
+				}
+				if (curTangents.size() == curVertices.size()) {
+					curMesh->mTangents = new aiVector3D[curMesh->mNumVertices];
+				}
+				if (curBitangents.size() == curVertices.size()) {
+					curMesh->mBitangents = new aiVector3D[curMesh->mNumVertices];
+				}
+				if (curColors.size() == curVertices.size() && useColors) {
+					curMesh->mColors[0] = new aiColor4D[curMesh->mNumVertices];
+				}
+				if (curUVs.size() == curVertices.size()) {
+					curMesh->mTextureCoords[0] = new aiVector3D[curMesh->mNumVertices];
+				}
+				if (curUV2s.size() == curVertices.size()) {
+					curMesh->mTextureCoords[1] = new aiVector3D[curMesh->mNumVertices];
+				}
+			}
+			//break;
+
+			//case EXN_TEXT: {
+			const char *sz = child.child_value();
+			if (textMeaning == 1) {
+				textMeaning = 0;
+
+				// read vertices
+				do {
+					SkipSpacesAndLineEnd(&sz);
+					aiVector3D temp;
+					aiColor4D c;
+
+					// Read the vertex position
+					sz = fast_atoreal_move<float>(sz, (float &)temp.x);
+					SkipSpaces(&sz);
+
+					sz = fast_atoreal_move<float>(sz, (float &)temp.y);
+					SkipSpaces(&sz);
+
+					sz = fast_atoreal_move<float>(sz, (float &)temp.z);
+					SkipSpaces(&sz);
+					curVertices.push_back(temp);
+
+					// Read the vertex normals
+					sz = fast_atoreal_move<float>(sz, (float &)temp.x);
+					SkipSpaces(&sz);
+
+					sz = fast_atoreal_move<float>(sz, (float &)temp.y);
+					SkipSpaces(&sz);
+
+					sz = fast_atoreal_move<float>(sz, (float &)temp.z);
+					SkipSpaces(&sz);
+					curNormals.push_back(temp);
+
+					// read the vertex colors
+					uint32_t clr = strtoul16(sz, &sz);
+					ColorFromARGBPacked(clr, c);
+
+					if (!curColors.empty() && c != *(curColors.end() - 1))
+						useColors = true;
+
+					curColors.push_back(c);
+					SkipSpaces(&sz);
+
+					// read the first UV coordinate set
+					sz = fast_atoreal_move<float>(sz, (float &)temp.x);
+					SkipSpaces(&sz);
+
+					sz = fast_atoreal_move<float>(sz, (float &)temp.y);
+					SkipSpaces(&sz);
+					temp.z = 0.f;
+					temp.y = 1.f - temp.y; // DX to OGL
+					curUVs.push_back(temp);
+
+					// read the (optional) second UV coordinate set
+					if (vertexFormat == 1) {
+						sz = fast_atoreal_move<float>(sz, (float &)temp.x);
+						SkipSpaces(&sz);
+
+						sz = fast_atoreal_move<float>(sz, (float &)temp.y);
+						temp.y = 1.f - temp.y; // DX to OGL
+						curUV2s.push_back(temp);
+					}
+					// read optional tangent and bitangent vectors
+					else if (vertexFormat == 2) {
+						// tangents
+						sz = fast_atoreal_move<float>(sz, (float &)temp.x);
+						SkipSpaces(&sz);
+
+						sz = fast_atoreal_move<float>(sz, (float &)temp.z);
+						SkipSpaces(&sz);
+
+						sz = fast_atoreal_move<float>(sz, (float &)temp.y);
+						SkipSpaces(&sz);
+						temp.y *= -1.0f;
+						curTangents.push_back(temp);
+
+						// bitangents
+						sz = fast_atoreal_move<float>(sz, (float &)temp.x);
+						SkipSpaces(&sz);
+
+						sz = fast_atoreal_move<float>(sz, (float &)temp.z);
+						SkipSpaces(&sz);
+
+						sz = fast_atoreal_move<float>(sz, (float &)temp.y);
+						SkipSpaces(&sz);
+						temp.y *= -1.0f;
+						curBitangents.push_back(temp);
+					}
+				}
+
+				/* IMPORTANT: We assume that each vertex is specified in one
+                line. So we can skip the rest of the line - unknown vertex
+                elements are ignored.
+                */
+
+				while (SkipLine(&sz));
+			} else if (textMeaning == 2) {
+				textMeaning = 0;
+
+				// read indices
+				aiFace *curFace = curMesh->mFaces;
+				aiFace *const faceEnd = curMesh->mFaces + curMesh->mNumFaces;
+
+				aiVector3D *pcV = curMesh->mVertices;
+				aiVector3D *pcN = curMesh->mNormals;
+				aiVector3D *pcT = curMesh->mTangents;
+				aiVector3D *pcB = curMesh->mBitangents;
+				aiColor4D *pcC0 = curMesh->mColors[0];
+				aiVector3D *pcT0 = curMesh->mTextureCoords[0];
+				aiVector3D *pcT1 = curMesh->mTextureCoords[1];
+
+				unsigned int curIdx = 0;
+				unsigned int total = 0;
+				while (SkipSpacesAndLineEnd(&sz)) {
+					if (curFace >= faceEnd) {
+						ASSIMP_LOG_ERROR("IRRMESH: Too many indices");
+						break;
+					}
+					if (!curIdx) {
+						curFace->mNumIndices = 3;
+						curFace->mIndices = new unsigned int[3];
+					}
+
+					unsigned int idx = strtoul10(sz, &sz);
+					if (idx >= curVertices.size()) {
+						ASSIMP_LOG_ERROR("IRRMESH: Index out of range");
+						idx = 0;
+					}
+
+					curFace->mIndices[curIdx] = total++;
+
+					*pcV++ = curVertices[idx];
+					if (pcN) *pcN++ = curNormals[idx];
+					if (pcT) *pcT++ = curTangents[idx];
+					if (pcB) *pcB++ = curBitangents[idx];
+					if (pcC0) *pcC0++ = curColors[idx];
+					if (pcT0) *pcT0++ = curUVs[idx];
+					if (pcT1) *pcT1++ = curUV2s[idx];
+
+					if (++curIdx == 3) {
+						++curFace;
+						curIdx = 0;
+					}
+				}
+
+				if (curFace != faceEnd)
+					ASSIMP_LOG_ERROR("IRRMESH: Not enough indices");
+
+				// Finish processing the mesh - do some small material workarounds
+				if (curMatFlags & AI_IRRMESH_MAT_trans_vertex_alpha && !useColors) {
+					// Take the opacity value of the current material
+					// from the common vertex color alpha
+					aiMaterial *mat = (aiMaterial *)curMat;
+					mat->AddProperty(&curColors[0].a, 1, AI_MATKEY_OPACITY);
+				}
+			}
+		}
+	}
+
+	// End of the last buffer. A material and a mesh should be there
+	if (curMat || curMesh) {
+		if (!curMat || !curMesh) {
+			ASSIMP_LOG_ERROR("IRRMESH: A buffer must contain a mesh and a material");
+			releaseMaterial(&curMat);
+			releaseMesh(&curMesh);
+		} else {
+			materials.push_back(curMat);
+			meshes.push_back(curMesh);
+		}
+	}
+
+	if (materials.empty()) {
+		throw DeadlyImportError("IRRMESH: Unable to read a mesh from this file");
+	}
+
+	// now generate the output scene
+	pScene->mNumMeshes = (unsigned int)meshes.size();
+	pScene->mMeshes = new aiMesh *[pScene->mNumMeshes];
+	for (unsigned int i = 0; i < pScene->mNumMeshes; ++i) {
+		pScene->mMeshes[i] = meshes[i];
+
+		// clean this value ...
+		pScene->mMeshes[i]->mNumUVComponents[3] = 0;
+	}
+
+	pScene->mNumMaterials = (unsigned int)materials.size();
+	pScene->mMaterials = new aiMaterial *[pScene->mNumMaterials];
+	::memcpy(pScene->mMaterials, &materials[0], sizeof(void *) * pScene->mNumMaterials);
+
+	pScene->mRootNode = new aiNode();
+	pScene->mRootNode->mName.Set("<IRRMesh>");
+	pScene->mRootNode->mNumMeshes = pScene->mNumMeshes;
+	pScene->mRootNode->mMeshes = new unsigned int[pScene->mNumMeshes];
+
+	for (unsigned int i = 0; i < pScene->mNumMeshes; ++i) {
+		pScene->mRootNode->mMeshes[i] = i;
+	}
 }
 
 #endif // !! ASSIMP_BUILD_NO_IRRMESH_IMPORTER
diff --git a/code/AssetLib/Irr/IRRMeshLoader.h b/code/AssetLib/Irr/IRRMeshLoader.h
index f0d249f71..b77033ea2 100644
--- a/code/AssetLib/Irr/IRRMeshLoader.h
+++ b/code/AssetLib/Irr/IRRMeshLoader.h
@@ -4,7 +4,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -47,12 +46,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_IRRMESHLOADER_H_INCLUDED
 #define AI_IRRMESHLOADER_H_INCLUDED
 
-#include <assimp/BaseImporter.h>
 #include "IRRShared.h"
+#include <assimp/BaseImporter.h>
 
 #ifndef ASSIMP_BUILD_NO_IRRMESH_IMPORTER
 
-namespace Assimp    {
+namespace Assimp {
 
 // ---------------------------------------------------------------------------
 /** IrrMesh importer class.
@@ -61,37 +60,31 @@ namespace Assimp    {
  * irrEdit. As IrrEdit itself is capable of importing quite many file formats,
  * it might be a good file format for data exchange.
  */
-class IRRMeshImporter : public BaseImporter, public IrrlichtBase
-{
+class IRRMeshImporter : public BaseImporter, public IrrlichtBase {
 public:
     IRRMeshImporter();
     ~IRRMeshImporter();
 
-
-public:
-
     // -------------------------------------------------------------------
     /** Returns whether the class can handle the format of the given file.
      *  See BaseImporter::CanRead() for details.
      */
-    bool CanRead( const std::string& pFile, IOSystem* pIOHandler,
-        bool checkSig) const;
+    bool CanRead(const std::string &pFile, IOSystem *pIOHandler,
+            bool checkSig) const;
 
 protected:
-
     // -------------------------------------------------------------------
     /** Return importer meta information.
      * See #BaseImporter::GetInfo for the details
      */
-    const aiImporterDesc* GetInfo () const;
+    const aiImporterDesc *GetInfo() const;
 
     // -------------------------------------------------------------------
     /** Imports the given file into the given scene structure.
      * See BaseImporter::InternReadFile() for details
      */
-    void InternReadFile( const std::string& pFile, aiScene* pScene,
-        IOSystem* pIOHandler);
-
+    void InternReadFile(const std::string &pFile, aiScene *pScene,
+            IOSystem *pIOHandler);
 };
 
 } // end of namespace Assimp
diff --git a/code/AssetLib/Irr/IRRShared.cpp b/code/AssetLib/Irr/IRRShared.cpp
index 5dacc2ae1..a809f7ce6 100644
--- a/code/AssetLib/Irr/IRRShared.cpp
+++ b/code/AssetLib/Irr/IRRShared.cpp
@@ -5,8 +5,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -45,8 +43,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Shared utilities for the IRR and IRRMESH loaders
  */
 
-
-
 //This section should be excluded only if both the Irrlicht AND the Irrlicht Mesh importers were omitted.
 #if !(defined(ASSIMP_BUILD_NO_IRR_IMPORTER) && defined(ASSIMP_BUILD_NO_IRRMESH_IMPORTER))
 
@@ -56,10 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/DefaultLogger.hpp>
 #include <assimp/material.h>
 
-
 using namespace Assimp;
-using namespace irr;
-using namespace irr::io;
 
 // Transformation matrix to convert from Assimp to IRR space
 const aiMatrix4x4 Assimp::AI_TO_IRR_MATRIX = aiMatrix4x4 (
@@ -70,125 +63,94 @@ const aiMatrix4x4 Assimp::AI_TO_IRR_MATRIX = aiMatrix4x4 (
 
 // ------------------------------------------------------------------------------------------------
 // read a property in hexadecimal format (i.e. ffffffff)
-void IrrlichtBase::ReadHexProperty    (HexProperty&    out)
-{
-    for (int i = 0; i < reader->getAttributeCount();++i)
-    {
-        if (!ASSIMP_stricmp(reader->getAttributeName(i),"name"))
-        {
-            out.name = std::string( reader->getAttributeValue(i) );
-        }
-        else if (!ASSIMP_stricmp(reader->getAttributeName(i),"value"))
-        {
+void IrrlichtBase::ReadHexProperty(HexProperty &out ) {
+	for (pugi::xml_attribute attrib : mNode->attributes()) {
+        if (!ASSIMP_stricmp(attrib.name(), "name")) {
+            out.name = std::string( attrib.value() );
+        } else if (!ASSIMP_stricmp(attrib.name(),"value")) {
             // parse the hexadecimal value
-            out.value = strtoul16(reader->getAttributeValue(i));
+			out.value = strtoul16(attrib.name());
         }
     }
 }
 
 // ------------------------------------------------------------------------------------------------
 // read a decimal property
-void IrrlichtBase::ReadIntProperty    (IntProperty&    out)
-{
-    for (int i = 0; i < reader->getAttributeCount();++i)
-    {
-        if (!ASSIMP_stricmp(reader->getAttributeName(i),"name"))
-        {
-            out.name = std::string( reader->getAttributeValue(i) );
-        }
-        else if (!ASSIMP_stricmp(reader->getAttributeName(i),"value"))
-        {
-            // parse the ecimal value
-            out.value = strtol10(reader->getAttributeValue(i));
+void IrrlichtBase::ReadIntProperty(IntProperty & out) {
+	for (pugi::xml_attribute attrib : mNode->attributes()) {
+		if (!ASSIMP_stricmp(attrib.name(), "name")) {
+			out.name = std::string(attrib.value());
+        } else if (!ASSIMP_stricmp(attrib.value(),"value")) {
+            // parse the int value
+			out.value = strtol10(attrib.name());
         }
     }
 }
 
 // ------------------------------------------------------------------------------------------------
 // read a string property
-void IrrlichtBase::ReadStringProperty (StringProperty& out)
-{
-    for (int i = 0; i < reader->getAttributeCount();++i)
-    {
-        if (!ASSIMP_stricmp(reader->getAttributeName(i),"name"))
-        {
-            out.name = std::string( reader->getAttributeValue(i) );
-        }
-        else if (!ASSIMP_stricmp(reader->getAttributeName(i),"value"))
-        {
+void IrrlichtBase::ReadStringProperty( StringProperty& out) {
+	for (pugi::xml_attribute attrib : mNode->attributes()) {
+		if (!ASSIMP_stricmp(attrib.name(), "name")) {
+			out.name = std::string(attrib.value());
+		} else if (!ASSIMP_stricmp(attrib.name(), "value")) {
             // simple copy the string
-            out.value = std::string (reader->getAttributeValue(i));
+			out.value = std::string(attrib.value());
         }
     }
 }
 
 // ------------------------------------------------------------------------------------------------
 // read a boolean property
-void IrrlichtBase::ReadBoolProperty   (BoolProperty&   out)
-{
-    for (int i = 0; i < reader->getAttributeCount();++i)
-    {
-        if (!ASSIMP_stricmp(reader->getAttributeName(i),"name"))
-        {
-            out.name = std::string( reader->getAttributeValue(i) );
-        }
-        else if (!ASSIMP_stricmp(reader->getAttributeName(i),"value"))
-        {
+void IrrlichtBase::ReadBoolProperty(BoolProperty &out) {
+	for (pugi::xml_attribute attrib : mNode->attributes()) {
+		if (!ASSIMP_stricmp(attrib.name(), "name")){
+			out.name = std::string(attrib.value());
+		} else if (!ASSIMP_stricmp(attrib.name(), "value")) {
             // true or false, case insensitive
-            out.value = (ASSIMP_stricmp( reader->getAttributeValue(i),
-                "true") ? false : true);
+			out.value = (ASSIMP_stricmp(attrib.value(), "true") ? false : true);
         }
     }
 }
 
 // ------------------------------------------------------------------------------------------------
 // read a float property
-void IrrlichtBase::ReadFloatProperty  (FloatProperty&  out)
-{
-    for (int i = 0; i < reader->getAttributeCount();++i)
-    {
-        if (!ASSIMP_stricmp(reader->getAttributeName(i),"name"))
-        {
-            out.name = std::string( reader->getAttributeValue(i) );
-        }
-        else if (!ASSIMP_stricmp(reader->getAttributeName(i),"value"))
-        {
+void IrrlichtBase::ReadFloatProperty(FloatProperty &out) {
+	for (pugi::xml_attribute attrib : mNode->attributes()) {
+		if (!ASSIMP_stricmp(attrib.name(), "name")) {
+			out.name = std::string(attrib.value());
+		} else if (!ASSIMP_stricmp(attrib.name(), "value")) {
             // just parse the float
-            out.value = fast_atof( reader->getAttributeValue(i) );
+			out.value = fast_atof(attrib.value());
         }
     }
 }
 
 // ------------------------------------------------------------------------------------------------
 // read a vector property
-void IrrlichtBase::ReadVectorProperty  (VectorProperty&  out)
-{
-    for (int i = 0; i < reader->getAttributeCount();++i)
-    {
-        if (!ASSIMP_stricmp(reader->getAttributeName(i),"name"))
-        {
-            out.name = std::string( reader->getAttributeValue(i) );
-        }
-        else if (!ASSIMP_stricmp(reader->getAttributeName(i),"value"))
-        {
+void IrrlichtBase::ReadVectorProperty( VectorProperty &out ) {
+	for (pugi::xml_attribute attrib : mNode->attributes()) {
+		if (!ASSIMP_stricmp(attrib.name(), "name")) {
+			out.name = std::string(attrib.value());
+		} else if (!ASSIMP_stricmp(attrib.name(), "value")) {
             // three floats, separated with commas
-            const char* ptr = reader->getAttributeValue(i);
+            const char *ptr = attrib.value();
 
             SkipSpaces(&ptr);
             ptr = fast_atoreal_move<float>( ptr,(float&)out.value.x );
             SkipSpaces(&ptr);
-            if (',' != *ptr)
-            {
+            if (',' != *ptr) {
                 ASSIMP_LOG_ERROR("IRR(MESH): Expected comma in vector definition");
-            }
-            else SkipSpaces(ptr+1,&ptr);
+			} else {
+				SkipSpaces(ptr + 1, &ptr);
+			}
             ptr = fast_atoreal_move<float>( ptr,(float&)out.value.y );
             SkipSpaces(&ptr);
-            if (',' != *ptr)
-            {
+            if (',' != *ptr) {
                 ASSIMP_LOG_ERROR("IRR(MESH): Expected comma in vector definition");
-            }
-            else SkipSpaces(ptr+1,&ptr);
+			} else {
+				SkipSpaces(ptr + 1, &ptr);
+			}
             ptr = fast_atoreal_move<float>( ptr,(float&)out.value.z );
         }
     }
@@ -196,22 +158,19 @@ void IrrlichtBase::ReadVectorProperty  (VectorProperty&  out)
 
 // ------------------------------------------------------------------------------------------------
 // Convert a string to a proper aiMappingMode
-int ConvertMappingMode(const std::string& mode)
-{
-    if (mode == "texture_clamp_repeat")
-    {
+int ConvertMappingMode(const std::string& mode) {
+    if (mode == "texture_clamp_repeat") {
         return aiTextureMapMode_Wrap;
-    }
-    else if (mode == "texture_clamp_mirror")
-        return aiTextureMapMode_Mirror;
+	} else if (mode == "texture_clamp_mirror") {
+		return aiTextureMapMode_Mirror;
+	}
 
     return aiTextureMapMode_Clamp;
 }
 
 // ------------------------------------------------------------------------------------------------
 // Parse a material from the XML file
-aiMaterial* IrrlichtBase::ParseMaterial(unsigned int& matFlags)
-{
+aiMaterial* IrrlichtBase::ParseMaterial(unsigned int& matFlags) {
     aiMaterial* mat = new aiMaterial();
     aiColor4D clr;
     aiString s;
@@ -220,244 +179,170 @@ aiMaterial* IrrlichtBase::ParseMaterial(unsigned int& matFlags)
     int cnt  = 0; // number of used texture channels
     unsigned int nd = 0;
 
-    // Continue reading from the file
-    while (reader->read())
-    {
-        switch (reader->getNodeType())
-        {
-        case EXN_ELEMENT:
+    for (pugi::xml_node child : mNode->children()) {
+		if (!ASSIMP_stricmp(child.name(), "color")) { // Hex properties
+			HexProperty prop;
+			ReadHexProperty(prop);
+			if (prop.name == "Diffuse") {
+				ColorFromARGBPacked(prop.value, clr);
+				mat->AddProperty(&clr, 1, AI_MATKEY_COLOR_DIFFUSE);
+			} else if (prop.name == "Ambient") {
+				ColorFromARGBPacked(prop.value, clr);
+				mat->AddProperty(&clr, 1, AI_MATKEY_COLOR_AMBIENT);
+			} else if (prop.name == "Specular") {
+				ColorFromARGBPacked(prop.value, clr);
+				mat->AddProperty(&clr, 1, AI_MATKEY_COLOR_SPECULAR);
+			}
 
-            // Hex properties
-            if (!ASSIMP_stricmp(reader->getNodeName(),"color"))
-            {
-                HexProperty prop;
-                ReadHexProperty(prop);
-                if (prop.name == "Diffuse")
-                {
-                    ColorFromARGBPacked(prop.value,clr);
-                    mat->AddProperty(&clr,1,AI_MATKEY_COLOR_DIFFUSE);
-                }
-                else if (prop.name == "Ambient")
-                {
-                    ColorFromARGBPacked(prop.value,clr);
-                    mat->AddProperty(&clr,1,AI_MATKEY_COLOR_AMBIENT);
-                }
-                else if (prop.name == "Specular")
-                {
-                    ColorFromARGBPacked(prop.value,clr);
-                    mat->AddProperty(&clr,1,AI_MATKEY_COLOR_SPECULAR);
-                }
-
-                // NOTE: The 'emissive' property causes problems. It is
-                // often != 0, even if there is obviously no light
-                // emitted by the described surface. In fact I think
-                // IRRLICHT ignores this property, too.
+			// NOTE: The 'emissive' property causes problems. It is
+			// often != 0, even if there is obviously no light
+			// emitted by the described surface. In fact I think
+			// IRRLICHT ignores this property, too.
 #if 0
-                else if (prop.name == "Emissive")
-                {
-                    ColorFromARGBPacked(prop.value,clr);
-                    mat->AddProperty(&clr,1,AI_MATKEY_COLOR_EMISSIVE);
-                }
+            else if (prop.name == "Emissive") {
+                ColorFromARGBPacked(prop.value,clr);
+                mat->AddProperty(&clr,1,AI_MATKEY_COLOR_EMISSIVE);
+            }
 #endif
-            }
-            // Float properties
-            else if (!ASSIMP_stricmp(reader->getNodeName(),"float"))
-            {
-                FloatProperty prop;
-                ReadFloatProperty(prop);
-                if (prop.name == "Shininess")
-                {
-                    mat->AddProperty(&prop.value,1,AI_MATKEY_SHININESS);
-                }
-            }
-            // Bool properties
-            else if (!ASSIMP_stricmp(reader->getNodeName(),"bool"))
-            {
-                BoolProperty prop;
-                ReadBoolProperty(prop);
-                if (prop.name == "Wireframe")
-                {
-                    int val = (prop.value ? true : false);
-                    mat->AddProperty(&val,1,AI_MATKEY_ENABLE_WIREFRAME);
-                }
-                else if (prop.name == "GouraudShading")
-                {
-                    int val = (prop.value ? aiShadingMode_Gouraud
-                        : aiShadingMode_NoShading);
-                    mat->AddProperty(&val,1,AI_MATKEY_SHADING_MODEL);
-                }
-                else if (prop.name == "BackfaceCulling")
-                {
-                    int val = (!prop.value);
-                    mat->AddProperty(&val,1,AI_MATKEY_TWOSIDED);
-                }
-            }
-            // String properties - textures and texture related properties
-            else if (!ASSIMP_stricmp(reader->getNodeName(),"texture") ||
-                     !ASSIMP_stricmp(reader->getNodeName(),"enum"))
-            {
-                StringProperty prop;
-                ReadStringProperty(prop);
-                if (prop.value.length())
-                {
-                    // material type (shader)
-                    if (prop.name == "Type")
-                    {
-                        if (prop.value == "solid")
-                        {
-                            // default material ...
-                        }
-                        else if (prop.value == "trans_vertex_alpha")
-                        {
-                            matFlags = AI_IRRMESH_MAT_trans_vertex_alpha;
-                        }
-                        else if (prop.value == "lightmap")
-                        {
-                            matFlags = AI_IRRMESH_MAT_lightmap;
-                        }
-                        else if (prop.value == "solid_2layer")
-                        {
-                            matFlags = AI_IRRMESH_MAT_solid_2layer;
-                        }
-                        else if (prop.value == "lightmap_m2")
-                        {
-                            matFlags = AI_IRRMESH_MAT_lightmap_m2;
-                        }
-                        else if (prop.value == "lightmap_m4")
-                        {
-                            matFlags = AI_IRRMESH_MAT_lightmap_m4;
-                        }
-                        else if (prop.value == "lightmap_light")
-                        {
-                            matFlags = AI_IRRMESH_MAT_lightmap_light;
-                        }
-                        else if (prop.value == "lightmap_light_m2")
-                        {
-                            matFlags = AI_IRRMESH_MAT_lightmap_light_m2;
-                        }
-                        else if (prop.value == "lightmap_light_m4")
-                        {
-                            matFlags = AI_IRRMESH_MAT_lightmap_light_m4;
-                        }
-                        else if (prop.value == "lightmap_add")
-                        {
-                            matFlags = AI_IRRMESH_MAT_lightmap_add;
-                        }
-                        // Normal and parallax maps are treated equally
-                        else if (prop.value == "normalmap_solid" ||
-                            prop.value == "parallaxmap_solid")
-                        {
-                            matFlags = AI_IRRMESH_MAT_normalmap_solid;
-                        }
-                        else if (prop.value == "normalmap_trans_vertex_alpha" ||
-                            prop.value == "parallaxmap_trans_vertex_alpha")
-                        {
-                            matFlags = AI_IRRMESH_MAT_normalmap_tva;
-                        }
-                        else if (prop.value == "normalmap_trans_add" ||
-                            prop.value == "parallaxmap_trans_add")
-                        {
-                            matFlags = AI_IRRMESH_MAT_normalmap_ta;
-                        }
-                        else {
-                            ASSIMP_LOG_WARN("IRRMat: Unrecognized material type: " + prop.value);
-                        }
-                    }
+		} else if (!ASSIMP_stricmp(child.name(), "float")) { // Float properties
+			FloatProperty prop;
+			ReadFloatProperty(prop);
+			if (prop.name == "Shininess") {
+				mat->AddProperty(&prop.value, 1, AI_MATKEY_SHININESS);
+			}
+		} else if (!ASSIMP_stricmp(child.name(), "bool")) { // Bool properties
+			BoolProperty prop;
+			ReadBoolProperty(prop);
+			if (prop.name == "Wireframe") {
+				int val = (prop.value ? true : false);
+				mat->AddProperty(&val, 1, AI_MATKEY_ENABLE_WIREFRAME);
+			} else if (prop.name == "GouraudShading") {
+				int val = (prop.value ? aiShadingMode_Gouraud : aiShadingMode_NoShading);
+				mat->AddProperty(&val, 1, AI_MATKEY_SHADING_MODEL);
+			} else if (prop.name == "BackfaceCulling") {
+				int val = (!prop.value);
+				mat->AddProperty(&val, 1, AI_MATKEY_TWOSIDED);
+			}
+		} else if (!ASSIMP_stricmp(child.name(), "texture") ||
+				   !ASSIMP_stricmp(child.name(), "enum")) { // String properties - textures and texture related properties
+			StringProperty prop;
+			ReadStringProperty(prop);
+			if (prop.value.length()) {
+				// material type (shader)
+				if (prop.name == "Type") {
+					if (prop.value == "solid") {
+						// default material ...
+					} else if (prop.value == "trans_vertex_alpha") {
+						matFlags = AI_IRRMESH_MAT_trans_vertex_alpha;
+					} else if (prop.value == "lightmap") {
+						matFlags = AI_IRRMESH_MAT_lightmap;
+					} else if (prop.value == "solid_2layer") {
+						matFlags = AI_IRRMESH_MAT_solid_2layer;
+					} else if (prop.value == "lightmap_m2") {
+						matFlags = AI_IRRMESH_MAT_lightmap_m2;
+					} else if (prop.value == "lightmap_m4") {
+						matFlags = AI_IRRMESH_MAT_lightmap_m4;
+					} else if (prop.value == "lightmap_light") {
+						matFlags = AI_IRRMESH_MAT_lightmap_light;
+					} else if (prop.value == "lightmap_light_m2") {
+						matFlags = AI_IRRMESH_MAT_lightmap_light_m2;
+					} else if (prop.value == "lightmap_light_m4") {
+						matFlags = AI_IRRMESH_MAT_lightmap_light_m4;
+					} else if (prop.value == "lightmap_add") {
+						matFlags = AI_IRRMESH_MAT_lightmap_add;
+					} else if (prop.value == "normalmap_solid" ||
+							   prop.value == "parallaxmap_solid") { // Normal and parallax maps are treated equally
+						matFlags = AI_IRRMESH_MAT_normalmap_solid;
+					} else if (prop.value == "normalmap_trans_vertex_alpha" ||
+							   prop.value == "parallaxmap_trans_vertex_alpha") {
+						matFlags = AI_IRRMESH_MAT_normalmap_tva;
+					} else if (prop.value == "normalmap_trans_add" ||
+							   prop.value == "parallaxmap_trans_add") {
+						matFlags = AI_IRRMESH_MAT_normalmap_ta;
+					} else {
+						ASSIMP_LOG_WARN("IRRMat: Unrecognized material type: " + prop.value);
+					}
+				}
 
-                    // Up to 4 texture channels are supported
-                    if (prop.name == "Texture1")
-                    {
-                        // Always accept the primary texture channel
-                        ++cnt;
-                        s.Set(prop.value);
-                        mat->AddProperty(&s,AI_MATKEY_TEXTURE_DIFFUSE(0));
-                    }
-                    else if (prop.name == "Texture2" && cnt == 1)
-                    {
-                        // 2-layer material lightmapped?
-                        if (matFlags & AI_IRRMESH_MAT_lightmap) {
-                            ++cnt;
-                            s.Set(prop.value);
-                            mat->AddProperty(&s,AI_MATKEY_TEXTURE_LIGHTMAP(0));
+				// Up to 4 texture channels are supported
+				if (prop.name == "Texture1") {
+					// Always accept the primary texture channel
+					++cnt;
+					s.Set(prop.value);
+					mat->AddProperty(&s, AI_MATKEY_TEXTURE_DIFFUSE(0));
+				} else if (prop.name == "Texture2" && cnt == 1) {
+					// 2-layer material lightmapped?
+					if (matFlags & AI_IRRMESH_MAT_lightmap) {
+						++cnt;
+						s.Set(prop.value);
+						mat->AddProperty(&s, AI_MATKEY_TEXTURE_LIGHTMAP(0));
 
-                            // set the corresponding material flag
-                            matFlags |= AI_IRRMESH_EXTRA_2ND_TEXTURE;
-                        }
-                        // alternatively: normal or parallax mapping
-                        else if (matFlags & AI_IRRMESH_MAT_normalmap_solid) {
-                            ++cnt;
-                            s.Set(prop.value);
-                            mat->AddProperty(&s,AI_MATKEY_TEXTURE_NORMALS(0));
+						// set the corresponding material flag
+						matFlags |= AI_IRRMESH_EXTRA_2ND_TEXTURE;
+					} else if (matFlags & AI_IRRMESH_MAT_normalmap_solid) { // alternatively: normal or parallax mapping
+						++cnt;
+						s.Set(prop.value);
+						mat->AddProperty(&s, AI_MATKEY_TEXTURE_NORMALS(0));
 
-                            // set the corresponding material flag
-                            matFlags |= AI_IRRMESH_EXTRA_2ND_TEXTURE;
-                        } else if (matFlags & AI_IRRMESH_MAT_solid_2layer)    {// or just as second diffuse texture
-                            ++cnt;
-                            s.Set(prop.value);
-                            mat->AddProperty(&s,AI_MATKEY_TEXTURE_DIFFUSE(1));
-                            ++nd;
+						// set the corresponding material flag
+						matFlags |= AI_IRRMESH_EXTRA_2ND_TEXTURE;
+					} else if (matFlags & AI_IRRMESH_MAT_solid_2layer) { // or just as second diffuse texture
+						++cnt;
+						s.Set(prop.value);
+						mat->AddProperty(&s, AI_MATKEY_TEXTURE_DIFFUSE(1));
+						++nd;
 
-                            // set the corresponding material flag
-                            matFlags |= AI_IRRMESH_EXTRA_2ND_TEXTURE;
-                        } else {
-                            ASSIMP_LOG_WARN("IRRmat: Skipping second texture");
-                        }
-                    } else if (prop.name == "Texture3" && cnt == 2) {
-                        // Irrlicht does not seem to use these channels.
-                        ++cnt;
-                        s.Set(prop.value);
-                        mat->AddProperty(&s,AI_MATKEY_TEXTURE_DIFFUSE(nd+1));
-                    } else if (prop.name == "Texture4" && cnt == 3) {
-                        // Irrlicht does not seem to use these channels.
-                        ++cnt;
-                        s.Set(prop.value);
-                        mat->AddProperty(&s,AI_MATKEY_TEXTURE_DIFFUSE(nd+2));
-                    }
+						// set the corresponding material flag
+						matFlags |= AI_IRRMESH_EXTRA_2ND_TEXTURE;
+					} else {
+						ASSIMP_LOG_WARN("IRRmat: Skipping second texture");
+					}
+				} else if (prop.name == "Texture3" && cnt == 2) {
+					// Irrlicht does not seem to use these channels.
+					++cnt;
+					s.Set(prop.value);
+					mat->AddProperty(&s, AI_MATKEY_TEXTURE_DIFFUSE(nd + 1));
+				} else if (prop.name == "Texture4" && cnt == 3) {
+					// Irrlicht does not seem to use these channels.
+					++cnt;
+					s.Set(prop.value);
+					mat->AddProperty(&s, AI_MATKEY_TEXTURE_DIFFUSE(nd + 2));
+				}
 
-                    // Texture mapping options
-                    if (prop.name == "TextureWrap1" && cnt >= 1)
-                    {
-                        int map = ConvertMappingMode(prop.value);
-                        mat->AddProperty(&map,1,AI_MATKEY_MAPPINGMODE_U_DIFFUSE(0));
-                        mat->AddProperty(&map,1,AI_MATKEY_MAPPINGMODE_V_DIFFUSE(0));
-                    }
-                    else if (prop.name == "TextureWrap2" && cnt >= 2)
-                    {
-                        int map = ConvertMappingMode(prop.value);
-                        if (matFlags & AI_IRRMESH_MAT_lightmap) {
-                            mat->AddProperty(&map,1,AI_MATKEY_MAPPINGMODE_U_LIGHTMAP(0));
-                            mat->AddProperty(&map,1,AI_MATKEY_MAPPINGMODE_V_LIGHTMAP(0));
-                        }
-                        else if (matFlags & (AI_IRRMESH_MAT_normalmap_solid)) {
-                            mat->AddProperty(&map,1,AI_MATKEY_MAPPINGMODE_U_NORMALS(0));
-                            mat->AddProperty(&map,1,AI_MATKEY_MAPPINGMODE_V_NORMALS(0));
-                        }
-                        else if (matFlags & AI_IRRMESH_MAT_solid_2layer) {
-                            mat->AddProperty(&map,1,AI_MATKEY_MAPPINGMODE_U_DIFFUSE(1));
-                            mat->AddProperty(&map,1,AI_MATKEY_MAPPINGMODE_V_DIFFUSE(1));
-                        }
-                    }
-                    else if (prop.name == "TextureWrap3" && cnt >= 3)
-                    {
-                        int map = ConvertMappingMode(prop.value);
-                        mat->AddProperty(&map,1,AI_MATKEY_MAPPINGMODE_U_DIFFUSE(nd+1));
-                        mat->AddProperty(&map,1,AI_MATKEY_MAPPINGMODE_V_DIFFUSE(nd+1));
-                    }
-                    else if (prop.name == "TextureWrap4" && cnt >= 4)
-                    {
-                        int map = ConvertMappingMode(prop.value);
-                        mat->AddProperty(&map,1,AI_MATKEY_MAPPINGMODE_U_DIFFUSE(nd+2));
-                        mat->AddProperty(&map,1,AI_MATKEY_MAPPINGMODE_V_DIFFUSE(nd+2));
-                    }
-                }
-            }
-            break;
-            case EXN_ELEMENT_END:
+				// Texture mapping options
+				if (prop.name == "TextureWrap1" && cnt >= 1) {
+					int map = ConvertMappingMode(prop.value);
+					mat->AddProperty(&map, 1, AI_MATKEY_MAPPINGMODE_U_DIFFUSE(0));
+					mat->AddProperty(&map, 1, AI_MATKEY_MAPPINGMODE_V_DIFFUSE(0));
+				} else if (prop.name == "TextureWrap2" && cnt >= 2) {
+					int map = ConvertMappingMode(prop.value);
+					if (matFlags & AI_IRRMESH_MAT_lightmap) {
+						mat->AddProperty(&map, 1, AI_MATKEY_MAPPINGMODE_U_LIGHTMAP(0));
+						mat->AddProperty(&map, 1, AI_MATKEY_MAPPINGMODE_V_LIGHTMAP(0));
+					} else if (matFlags & (AI_IRRMESH_MAT_normalmap_solid)) {
+						mat->AddProperty(&map, 1, AI_MATKEY_MAPPINGMODE_U_NORMALS(0));
+						mat->AddProperty(&map, 1, AI_MATKEY_MAPPINGMODE_V_NORMALS(0));
+					} else if (matFlags & AI_IRRMESH_MAT_solid_2layer) {
+						mat->AddProperty(&map, 1, AI_MATKEY_MAPPINGMODE_U_DIFFUSE(1));
+						mat->AddProperty(&map, 1, AI_MATKEY_MAPPINGMODE_V_DIFFUSE(1));
+					}
+				} else if (prop.name == "TextureWrap3" && cnt >= 3) {
+					int map = ConvertMappingMode(prop.value);
+					mat->AddProperty(&map, 1, AI_MATKEY_MAPPINGMODE_U_DIFFUSE(nd + 1));
+					mat->AddProperty(&map, 1, AI_MATKEY_MAPPINGMODE_V_DIFFUSE(nd + 1));
+				} else if (prop.name == "TextureWrap4" && cnt >= 4) {
+					int map = ConvertMappingMode(prop.value);
+					mat->AddProperty(&map, 1, AI_MATKEY_MAPPINGMODE_U_DIFFUSE(nd + 2));
+					mat->AddProperty(&map, 1, AI_MATKEY_MAPPINGMODE_V_DIFFUSE(nd + 2));
+				}
+			}
+		}
+		//break;
+		/*case EXN_ELEMENT_END:
 
-                /* Assume there are no further nested nodes in <material> elements
-                 */
-                if (/* IRRMESH */ !ASSIMP_stricmp(reader->getNodeName(),"material") ||
-                    /* IRR     */ !ASSIMP_stricmp(reader->getNodeName(),"attributes"))
+                // Assume there are no further nested nodes in <material> elements
+                if ( !ASSIMP_stricmp(reader->getNodeName(),"material") ||
+                     !ASSIMP_stricmp(reader->getNodeName(),"attributes"))
                 {
                     // Now process lightmapping flags
                     // We should have at least one textur to do that ..
@@ -492,7 +377,8 @@ aiMaterial* IrrlichtBase::ParseMaterial(unsigned int& matFlags)
                 // GCC complains here ...
                 break;
         }
-    }
+    }*/
+	}
     ASSIMP_LOG_ERROR("IRRMESH: Unexpected end of file. Material is not complete");
 
     return mat;
diff --git a/code/AssetLib/Irr/IRRShared.h b/code/AssetLib/Irr/IRRShared.h
index 2f6f87405..ce8851ebc 100644
--- a/code/AssetLib/Irr/IRRShared.h
+++ b/code/AssetLib/Irr/IRRShared.h
@@ -7,50 +7,48 @@
 #ifndef INCLUDED_AI_IRRSHARED_H
 #define INCLUDED_AI_IRRSHARED_H
 
-#include <assimp/irrXMLWrapper.h>
 #include <assimp/BaseImporter.h>
+#include <assimp/XmlParser.h>
 #include <stdint.h>
 
 struct aiMaterial;
 
-namespace Assimp    {
-
+namespace Assimp {
 
 /** @brief Matrix to convert from Assimp to IRR and backwards
  */
 extern const aiMatrix4x4 AI_TO_IRR_MATRIX;
 
-
 // Default: 0 = solid, one texture
-#define AI_IRRMESH_MAT_solid_2layer         0x10000
+#define AI_IRRMESH_MAT_solid_2layer 0x10000
 
 // Transparency flags
-#define AI_IRRMESH_MAT_trans_vertex_alpha   0x1
-#define AI_IRRMESH_MAT_trans_add            0x2
+#define AI_IRRMESH_MAT_trans_vertex_alpha 0x1
+#define AI_IRRMESH_MAT_trans_add 0x2
 
 // Lightmapping flags
-#define AI_IRRMESH_MAT_lightmap             0x2
-#define AI_IRRMESH_MAT_lightmap_m2          (AI_IRRMESH_MAT_lightmap|0x4)
-#define AI_IRRMESH_MAT_lightmap_m4          (AI_IRRMESH_MAT_lightmap|0x8)
-#define AI_IRRMESH_MAT_lightmap_light       (AI_IRRMESH_MAT_lightmap|0x10)
-#define AI_IRRMESH_MAT_lightmap_light_m2    (AI_IRRMESH_MAT_lightmap|0x20)
-#define AI_IRRMESH_MAT_lightmap_light_m4    (AI_IRRMESH_MAT_lightmap|0x40)
-#define AI_IRRMESH_MAT_lightmap_add         (AI_IRRMESH_MAT_lightmap|0x80)
+#define AI_IRRMESH_MAT_lightmap 0x2
+#define AI_IRRMESH_MAT_lightmap_m2 (AI_IRRMESH_MAT_lightmap | 0x4)
+#define AI_IRRMESH_MAT_lightmap_m4 (AI_IRRMESH_MAT_lightmap | 0x8)
+#define AI_IRRMESH_MAT_lightmap_light (AI_IRRMESH_MAT_lightmap | 0x10)
+#define AI_IRRMESH_MAT_lightmap_light_m2 (AI_IRRMESH_MAT_lightmap | 0x20)
+#define AI_IRRMESH_MAT_lightmap_light_m4 (AI_IRRMESH_MAT_lightmap | 0x40)
+#define AI_IRRMESH_MAT_lightmap_add (AI_IRRMESH_MAT_lightmap | 0x80)
 
 // Standard NormalMap (or Parallax map, they're treated equally)
-#define AI_IRRMESH_MAT_normalmap_solid      (0x100)
+#define AI_IRRMESH_MAT_normalmap_solid (0x100)
 
 // Normal map combined with vertex alpha
-#define AI_IRRMESH_MAT_normalmap_tva    \
+#define AI_IRRMESH_MAT_normalmap_tva \
     (AI_IRRMESH_MAT_normalmap_solid | AI_IRRMESH_MAT_trans_vertex_alpha)
 
 // Normal map combined with additive transparency
-#define AI_IRRMESH_MAT_normalmap_ta     \
+#define AI_IRRMESH_MAT_normalmap_ta \
     (AI_IRRMESH_MAT_normalmap_solid | AI_IRRMESH_MAT_trans_add)
 
 // Special flag. It indicates a second texture has been found
 // Its type depends ... either a normal textue or a normal map
-#define AI_IRRMESH_EXTRA_2ND_TEXTURE        0x100000
+#define AI_IRRMESH_EXTRA_2ND_TEXTURE 0x100000
 
 // ---------------------------------------------------------------------------
 /** Base class for the Irr and IrrMesh importers.
@@ -58,61 +56,64 @@ extern const aiMatrix4x4 AI_TO_IRR_MATRIX;
  *  Declares some irrlight-related xml parsing utilities and provides tools
  *  to load materials from IRR and IRRMESH files.
  */
-class IrrlichtBase
-{
+class IrrlichtBase {
 protected:
+    IrrlichtBase() :
+            mNode(nullptr) {
+        // empty
+    }
+
+    ~IrrlichtBase() {
+        // empty
+    }
 
     /** @brief Data structure for a simple name-value property
      */
     template <class T>
-    struct Property
-    {
+    struct Property {
         std::string name;
         T value;
     };
 
-    typedef Property<uint32_t>      HexProperty;
-    typedef Property<std::string>   StringProperty;
-    typedef Property<bool>          BoolProperty;
-    typedef Property<float>         FloatProperty;
-    typedef Property<aiVector3D>    VectorProperty;
-    typedef Property<int>           IntProperty;
+    typedef Property<uint32_t> HexProperty;
+    typedef Property<std::string> StringProperty;
+    typedef Property<bool> BoolProperty;
+    typedef Property<float> FloatProperty;
+    typedef Property<aiVector3D> VectorProperty;
+    typedef Property<int> IntProperty;
 
-    /** XML reader instance
-     */
-  irr::io::IrrXMLReader* reader;
+    /// XML reader instance
+    XmlParser mParser;
+    pugi::xml_node *mNode;
 
     // -------------------------------------------------------------------
     /** Parse a material description from the XML
      *  @return The created material
      *  @param matFlags Receives AI_IRRMESH_MAT_XX flags
      */
-    aiMaterial* ParseMaterial(unsigned int& matFlags);
+    aiMaterial *ParseMaterial(unsigned int &matFlags);
 
     // -------------------------------------------------------------------
     /** Read a property of the specified type from the current XML element.
      *  @param out Receives output data
      */
-    void ReadHexProperty    (HexProperty&    out);
-    void ReadStringProperty (StringProperty& out);
-    void ReadBoolProperty   (BoolProperty&   out);
-    void ReadFloatProperty  (FloatProperty&  out);
-    void ReadVectorProperty (VectorProperty&  out);
-    void ReadIntProperty    (IntProperty&    out);
+    void ReadHexProperty(HexProperty &out);
+    void ReadStringProperty(StringProperty &out);
+    void ReadBoolProperty(BoolProperty &out);
+    void ReadFloatProperty(FloatProperty &out);
+    void ReadVectorProperty(VectorProperty &out);
+    void ReadIntProperty(IntProperty &out);
 };
 
-
 // ------------------------------------------------------------------------------------------------
 // Unpack a hex color, e.g. 0xdcdedfff
-inline void ColorFromARGBPacked(uint32_t in, aiColor4D& clr)
-{
+inline void ColorFromARGBPacked(uint32_t in, aiColor4D &clr) {
     clr.a = ((in >> 24) & 0xff) / 255.f;
     clr.r = ((in >> 16) & 0xff) / 255.f;
-    clr.g = ((in >>  8) & 0xff) / 255.f;
-    clr.b = ((in      ) & 0xff) / 255.f;
+    clr.g = ((in >> 8) & 0xff) / 255.f;
+    clr.b = ((in)&0xff) / 255.f;
 }
 
-
 } // end namespace Assimp
 
 #endif // !! INCLUDED_AI_IRRSHARED_H
diff --git a/code/AssetLib/LWO/LWOLoader.cpp b/code/AssetLib/LWO/LWOLoader.cpp
index ef11f2d15..149360559 100644
--- a/code/AssetLib/LWO/LWOLoader.cpp
+++ b/code/AssetLib/LWO/LWOLoader.cpp
@@ -145,7 +145,7 @@ void LWOImporter::InternReadFile(const std::string &pFile,
 
     // Check whether we can read from the file
     if (file.get() == nullptr) {
-        throw DeadlyImportError("Failed to open LWO file " + pFile + ".");
+        throw DeadlyImportError("Failed to open LWO file ", pFile, ".");
     }
 
     if ((this->fileSize = (unsigned int)file->FileSize()) < 12) {
@@ -212,7 +212,7 @@ void LWOImporter::InternReadFile(const std::string &pFile,
         szBuff[2] = (char)(fileType >> 8u);
         szBuff[3] = (char)(fileType);
         szBuff[4] = '\0';
-        throw DeadlyImportError(std::string("Unknown LWO sub format: ") + szBuff);
+        throw DeadlyImportError("Unknown LWO sub format: ", szBuff);
     }
 
     if (AI_LWO_FOURCC_LWOB != fileType) {
@@ -232,7 +232,7 @@ void LWOImporter::InternReadFile(const std::string &pFile,
         }
 
         if (configLayerName.length() && !hasNamedLayer) {
-            throw DeadlyImportError("LWO2: Unable to find the requested layer: " + configLayerName);
+            throw DeadlyImportError("LWO2: Unable to find the requested layer: ", configLayerName);
         }
     }
 
diff --git a/code/AssetLib/LWS/LWSLoader.cpp b/code/AssetLib/LWS/LWSLoader.cpp
index 38b44f842..2a5cbeb8d 100644
--- a/code/AssetLib/LWS/LWSLoader.cpp
+++ b/code/AssetLib/LWS/LWSLoader.cpp
@@ -502,7 +502,7 @@ void LWSImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
 
     // Check whether we can read from the file
     if (file.get() == nullptr) {
-        throw DeadlyImportError("Failed to open LWS file " + pFile + ".");
+        throw DeadlyImportError("Failed to open LWS file ", pFile, ".");
     }
 
     // Allocate storage and copy the contents of the file to a memory buffer
@@ -750,12 +750,17 @@ void LWSImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
         }
         // 'LightIntensity': set intensity of currently active light
         else if ((*it).tokens[0] == "LightIntensity" || (*it).tokens[0] == "LgtIntensity") {
-            if (nodes.empty() || nodes.back().type != LWS::NodeDesc::LIGHT)
+            if (nodes.empty() || nodes.back().type != LWS::NodeDesc::LIGHT) {
                 ASSIMP_LOG_ERROR("LWS: Unexpected keyword: \'LightIntensity\'");
-
-            else
-                fast_atoreal_move<float>(c, nodes.back().lightIntensity);
-
+            } else {
+                const std::string env = "(envelope)";
+                if (0 == strncmp(c, env.c_str(), env.size())) {
+                    ASSIMP_LOG_ERROR("LWS: envelopes for  LightIntensity not supported, set to 1.0");
+                    nodes.back().lightIntensity = (ai_real)1.0;
+                } else {
+                    fast_atoreal_move<float>(c, nodes.back().lightIntensity);
+                }
+            }
         }
         // 'LightType': set type of currently active light
         else if ((*it).tokens[0] == "LightType") {
diff --git a/code/AssetLib/M3D/M3DExporter.cpp b/code/AssetLib/M3D/M3DExporter.cpp
index 9583636a1..d26722b17 100644
--- a/code/AssetLib/M3D/M3DExporter.cpp
+++ b/code/AssetLib/M3D/M3DExporter.cpp
@@ -197,12 +197,15 @@ M3D_INDEX addMaterial(const Assimp::M3DWrapper &m3d, const aiMaterial *mat) {
                         break;
                     case m3dpf_float:
                         if (mat->Get(aiProps[k].pKey, aiProps[k].type,
-                                    aiProps[k].index, f) == AI_SUCCESS)
+                                    aiProps[k].index, f) == AI_SUCCESS) {
+                            uint32_t f_uint32;
+                            memcpy(&f_uint32, &f, sizeof(uint32_t));
                             addProp(&m3d->material[mi],
                                     m3d_propertytypes[k].id,
                                     /* not (uint32_t)f, because we don't want to convert
                                          * it, we want to see it as 32 bits of memory */
-                                    *((uint32_t *)&f));
+                                    f_uint32);
+                        }
                         break;
                     case m3dpf_uint8:
                         if (mat->Get(aiProps[k].pKey, aiProps[k].type,
diff --git a/code/AssetLib/M3D/M3DImporter.cpp b/code/AssetLib/M3D/M3DImporter.cpp
index d6fe678ec..05b75148b 100644
--- a/code/AssetLib/M3D/M3DImporter.cpp
+++ b/code/AssetLib/M3D/M3DImporter.cpp
@@ -160,21 +160,21 @@ void M3DImporter::InternReadFile(const std::string &file, aiScene *pScene, IOSys
     // Read file into memory
     std::unique_ptr<IOStream> pStream(pIOHandler->Open(file, "rb"));
     if (!pStream.get()) {
-        throw DeadlyImportError("Failed to open file " + file + ".");
+        throw DeadlyImportError("Failed to open file ", file, ".");
     }
 
     // Get the file-size and validate it, throwing an exception when fails
     size_t fileSize = pStream->FileSize();
     if (fileSize < 8) {
-        throw DeadlyImportError("M3D-file " + file + " is too small.");
+        throw DeadlyImportError("M3D-file ", file, " is too small.");
     }
     std::vector<unsigned char> buffer(fileSize);
     if (fileSize != pStream->Read(buffer.data(), 1, fileSize)) {
-        throw DeadlyImportError("Failed to read the file " + file + ".");
+        throw DeadlyImportError("Failed to read the file ", file, ".");
     }
     // extra check for binary format's first 8 bytes. Not done for the ASCII variant
     if (!memcmp(buffer.data(), "3DMO", 4) && memcmp(buffer.data() + 4, &fileSize, 4)) {
-        throw DeadlyImportError("Bad binary header in file " + file + ".");
+        throw DeadlyImportError("Bad binary header in file ", file, ".");
     }
 #ifdef M3D_ASCII
     // make sure there's a terminator zero character, as input must be ASCIIZ
@@ -200,7 +200,7 @@ void M3DImporter::InternReadFile(const std::string &file, aiScene *pScene, IOSys
     M3DWrapper m3d(pIOHandler, buffer);
 
     if (!m3d) {
-        throw DeadlyImportError("Unable to parse " + file + " as M3D.");
+        throw DeadlyImportError("Unable to parse ", file, " as M3D.");
     }
 
     // create the root node
diff --git a/code/AssetLib/M3D/M3DWrapper.cpp b/code/AssetLib/M3D/M3DWrapper.cpp
index b72812377..df3c6bd0c 100644
--- a/code/AssetLib/M3D/M3DWrapper.cpp
+++ b/code/AssetLib/M3D/M3DWrapper.cpp
@@ -133,6 +133,9 @@ unsigned char *M3DWrapper::Save(int quality, int flags, unsigned int &size) {
     saved_output_ = m3d_save(m3d_, quality, flags, &size);
     return saved_output_;
 #else
+    (void)quality;
+    (void)flags;
+    (void)size;
     return nullptr;
 #endif
 }
diff --git a/code/AssetLib/M3D/m3d.h b/code/AssetLib/M3D/m3d.h
index 3d7a2564c..c25c633ba 100644
--- a/code/AssetLib/M3D/m3d.h
+++ b/code/AssetLib/M3D/m3d.h
@@ -84,8 +84,10 @@ typedef uint16_t M3D_INDEX;
 #ifndef M3D_BONEMAXLEVEL
 #define M3D_BONEMAXLEVEL 8
 #endif
-#ifndef _MSC_VER
+#if !defined(_MSC_VER) || defined(__clang__)
+#ifndef _inline
 #define _inline __inline__
+#endif
 #define _pack __attribute__((packed))
 #define _unused __attribute__((unused))
 #else
@@ -99,13 +101,13 @@ typedef uint16_t M3D_INDEX;
 #define _register
 #endif
 
-#ifdef _WIN32
+#if _MSC_VER > 1920 && !defined(__clang__)
 #    pragma warning(push)
 #    pragma warning(disable : 4100 4127 4189 4505 4244 4403  4701 4703)
 #    if (_MSC_VER > 1800 )
 #        pragma warning(disable : 5573 5744)
 #    endif
-#endif // _WIN32
+#endif // _MSC_VER
 
 /*** File format structures ***/
 
@@ -684,7 +686,11 @@ typedef struct
 } _m3dstbi__result_info;
 
 #define STBI_ASSERT(v)
-#define STBI_NOTUSED(v) (void)sizeof(v)
+#ifdef _MSC_VER
+#define STBI_NOTUSED(v)  (void)(v)
+#else
+#define STBI_NOTUSED(v)  (void)sizeof(v)
+#endif
 #define STBI__BYTECAST(x) ((unsigned char)((x)&255))
 #define STBI_MALLOC(sz) M3D_MALLOC(sz)
 #define STBI_REALLOC(p, newsz) M3D_REALLOC(p, newsz)
@@ -697,10 +703,6 @@ _inline static unsigned char _m3dstbi__get8(_m3dstbi__context *s) {
     return 0;
 }
 
-_inline static int _m3dstbi__at_eof(_m3dstbi__context *s) {
-    return s->img_buffer >= s->img_buffer_end;
-}
-
 static void _m3dstbi__skip(_m3dstbi__context *s, int n) {
     if (n < 0) {
         s->img_buffer = s->img_buffer_end;
@@ -819,7 +821,7 @@ static unsigned char *_m3dstbi__convert_format(unsigned char *data, int img_n, i
             break;
             STBI__CASE(4, 3) { dest[0] = src[0], dest[1] = src[1], dest[2] = src[2]; }
             break;
-            default: STBI_ASSERT(0);
+        default: STBI_ASSERT(0);
         }
 #undef STBI__CASE
     }
@@ -879,7 +881,7 @@ static _m3dstbi__uint16 *_m3dstbi__convert_format16(_m3dstbi__uint16 *data, int
             break;
             STBI__CASE(4, 3) { dest[0] = src[0], dest[1] = src[1], dest[2] = src[2]; }
             break;
-            default: STBI_ASSERT(0);
+        default: STBI_ASSERT(0);
         }
 #undef STBI__CASE
     }
@@ -1356,13 +1358,13 @@ static int _m3dstbi__create_png_image_raw(_m3dstbi__png *a, unsigned char *raw,
 
         for (k = 0; k < filter_bytes; ++k) {
             switch (filter) {
-                case STBI__F_none: cur[k] = raw[k]; break;
-                case STBI__F_sub: cur[k] = raw[k]; break;
-                case STBI__F_up: cur[k] = STBI__BYTECAST(raw[k] + prior[k]); break;
-                case STBI__F_avg: cur[k] = STBI__BYTECAST(raw[k] + (prior[k] >> 1)); break;
-                case STBI__F_paeth: cur[k] = STBI__BYTECAST(raw[k] + _m3dstbi__paeth(0, prior[k], 0)); break;
-                case STBI__F_avg_first: cur[k] = raw[k]; break;
-                case STBI__F_paeth_first: cur[k] = raw[k]; break;
+            case STBI__F_none: cur[k] = raw[k]; break;
+            case STBI__F_sub: cur[k] = raw[k]; break;
+            case STBI__F_up: cur[k] = STBI__BYTECAST(raw[k] + prior[k]); break;
+            case STBI__F_avg: cur[k] = STBI__BYTECAST(raw[k] + (prior[k] >> 1)); break;
+            case STBI__F_paeth: cur[k] = STBI__BYTECAST(raw[k] + _m3dstbi__paeth(0, prior[k], 0)); break;
+            case STBI__F_avg_first: cur[k] = raw[k]; break;
+            case STBI__F_paeth_first: cur[k] = raw[k]; break;
             }
         }
 
@@ -1392,21 +1394,21 @@ static int _m3dstbi__create_png_image_raw(_m3dstbi__png *a, unsigned char *raw,
     case f:           \
         for (k = 0; k < nk; ++k)
             switch (filter) {
-                case STBI__F_none:
-                    memcpy(cur, raw, nk);
-                    break;
-                    STBI__CASE(STBI__F_sub) { cur[k] = STBI__BYTECAST(raw[k] + cur[k - filter_bytes]); }
-                    break;
-                    STBI__CASE(STBI__F_up) { cur[k] = STBI__BYTECAST(raw[k] + prior[k]); }
-                    break;
-                    STBI__CASE(STBI__F_avg) { cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k - filter_bytes]) >> 1)); }
-                    break;
-                    STBI__CASE(STBI__F_paeth) { cur[k] = STBI__BYTECAST(raw[k] + _m3dstbi__paeth(cur[k - filter_bytes], prior[k], prior[k - filter_bytes])); }
-                    break;
-                    STBI__CASE(STBI__F_avg_first) { cur[k] = STBI__BYTECAST(raw[k] + (cur[k - filter_bytes] >> 1)); }
-                    break;
-                    STBI__CASE(STBI__F_paeth_first) { cur[k] = STBI__BYTECAST(raw[k] + _m3dstbi__paeth(cur[k - filter_bytes], 0, 0)); }
-                    break;
+            case STBI__F_none:
+                memcpy(cur, raw, nk);
+                break;
+                STBI__CASE(STBI__F_sub) { cur[k] = STBI__BYTECAST(raw[k] + cur[k - filter_bytes]); }
+                break;
+                STBI__CASE(STBI__F_up) { cur[k] = STBI__BYTECAST(raw[k] + prior[k]); }
+                break;
+                STBI__CASE(STBI__F_avg) { cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k - filter_bytes]) >> 1)); }
+                break;
+                STBI__CASE(STBI__F_paeth) { cur[k] = STBI__BYTECAST(raw[k] + _m3dstbi__paeth(cur[k - filter_bytes], prior[k], prior[k - filter_bytes])); }
+                break;
+                STBI__CASE(STBI__F_avg_first) { cur[k] = STBI__BYTECAST(raw[k] + (cur[k - filter_bytes] >> 1)); }
+                break;
+                STBI__CASE(STBI__F_paeth_first) { cur[k] = STBI__BYTECAST(raw[k] + _m3dstbi__paeth(cur[k - filter_bytes], 0, 0)); }
+                break;
             }
 #undef STBI__CASE
             raw += nk;
@@ -1656,155 +1658,155 @@ static int _m3dstbi__parse_png_file(_m3dstbi__png *z, int scan, int req_comp) {
     for (;;) {
         _m3dstbi__pngchunk c = _m3dstbi__get_chunk_header(s);
         switch (c.type) {
-            case STBI__PNG_TYPE('C', 'g', 'B', 'I'):
-                _m3dstbi__skip(s, c.length);
-                break;
-            case STBI__PNG_TYPE('I', 'H', 'D', 'R'): {
-                int comp, filter;
-                if (!first) return _m3dstbi__err("multiple IHDR", "Corrupt PNG");
-                first = 0;
-                if (c.length != 13) return _m3dstbi__err("bad IHDR len", "Corrupt PNG");
-                s->img_x = _m3dstbi__get32be(s);
-                if (s->img_x > (1 << 24)) return _m3dstbi__err("too large", "Very large image (corrupt?)");
-                s->img_y = _m3dstbi__get32be(s);
-                if (s->img_y > (1 << 24)) return _m3dstbi__err("too large", "Very large image (corrupt?)");
-                z->depth = _m3dstbi__get8(s);
-                if (z->depth != 1 && z->depth != 2 && z->depth != 4 && z->depth != 8 && z->depth != 16) return _m3dstbi__err("1/2/4/8/16-bit only", "PNG not supported: 1/2/4/8/16-bit only");
-                color = _m3dstbi__get8(s);
-                if (color > 6) return _m3dstbi__err("bad ctype", "Corrupt PNG");
-                if (color == 3 && z->depth == 16) return _m3dstbi__err("bad ctype", "Corrupt PNG");
-                if (color == 3)
-                    pal_img_n = 3;
-                else if (color & 1)
-                    return _m3dstbi__err("bad ctype", "Corrupt PNG");
-                comp = _m3dstbi__get8(s);
-                if (comp) return _m3dstbi__err("bad comp method", "Corrupt PNG");
-                filter = _m3dstbi__get8(s);
-                if (filter) return _m3dstbi__err("bad filter method", "Corrupt PNG");
-                interlace = _m3dstbi__get8(s);
-                if (interlace > 1) return _m3dstbi__err("bad interlace method", "Corrupt PNG");
-                if (!s->img_x || !s->img_y) return _m3dstbi__err("0-pixel image", "Corrupt PNG");
-                if (!pal_img_n) {
-                    s->img_n = (color & 2 ? 3 : 1) + (color & 4 ? 1 : 0);
-                    if ((1 << 30) / s->img_x / s->img_n < s->img_y) return _m3dstbi__err("too large", "Image too large to decode");
-                    if (scan == STBI__SCAN_header) return 1;
-                } else {
-                    s->img_n = 1;
-                    if ((1 << 30) / s->img_x / 4 < s->img_y) return _m3dstbi__err("too large", "Corrupt PNG");
-                }
-                break;
+        case STBI__PNG_TYPE('C', 'g', 'B', 'I'):
+            _m3dstbi__skip(s, c.length);
+            break;
+        case STBI__PNG_TYPE('I', 'H', 'D', 'R'): {
+            int comp, filter;
+            if (!first) return _m3dstbi__err("multiple IHDR", "Corrupt PNG");
+            first = 0;
+            if (c.length != 13) return _m3dstbi__err("bad IHDR len", "Corrupt PNG");
+            s->img_x = _m3dstbi__get32be(s);
+            if (s->img_x > (1 << 24)) return _m3dstbi__err("too large", "Very large image (corrupt?)");
+            s->img_y = _m3dstbi__get32be(s);
+            if (s->img_y > (1 << 24)) return _m3dstbi__err("too large", "Very large image (corrupt?)");
+            z->depth = _m3dstbi__get8(s);
+            if (z->depth != 1 && z->depth != 2 && z->depth != 4 && z->depth != 8 && z->depth != 16) return _m3dstbi__err("1/2/4/8/16-bit only", "PNG not supported: 1/2/4/8/16-bit only");
+            color = _m3dstbi__get8(s);
+            if (color > 6) return _m3dstbi__err("bad ctype", "Corrupt PNG");
+            if (color == 3 && z->depth == 16) return _m3dstbi__err("bad ctype", "Corrupt PNG");
+            if (color == 3)
+                pal_img_n = 3;
+            else if (color & 1)
+                return _m3dstbi__err("bad ctype", "Corrupt PNG");
+            comp = _m3dstbi__get8(s);
+            if (comp) return _m3dstbi__err("bad comp method", "Corrupt PNG");
+            filter = _m3dstbi__get8(s);
+            if (filter) return _m3dstbi__err("bad filter method", "Corrupt PNG");
+            interlace = _m3dstbi__get8(s);
+            if (interlace > 1) return _m3dstbi__err("bad interlace method", "Corrupt PNG");
+            if (!s->img_x || !s->img_y) return _m3dstbi__err("0-pixel image", "Corrupt PNG");
+            if (!pal_img_n) {
+                s->img_n = (color & 2 ? 3 : 1) + (color & 4 ? 1 : 0);
+                if ((1 << 30) / s->img_x / s->img_n < s->img_y) return _m3dstbi__err("too large", "Image too large to decode");
+                if (scan == STBI__SCAN_header) return 1;
+            } else {
+                s->img_n = 1;
+                if ((1 << 30) / s->img_x / 4 < s->img_y) return _m3dstbi__err("too large", "Corrupt PNG");
             }
+            break;
+        }
 
-            case STBI__PNG_TYPE('P', 'L', 'T', 'E'): {
-                if (first) return _m3dstbi__err("first not IHDR", "Corrupt PNG");
-                if (c.length > 256 * 3) return _m3dstbi__err("invalid PLTE", "Corrupt PNG");
-                pal_len = c.length / 3;
-                if (pal_len * 3 != c.length) return _m3dstbi__err("invalid PLTE", "Corrupt PNG");
-                for (i = 0; i < pal_len; ++i) {
-                    palette[i * 4 + 0] = _m3dstbi__get8(s);
-                    palette[i * 4 + 1] = _m3dstbi__get8(s);
-                    palette[i * 4 + 2] = _m3dstbi__get8(s);
-                    palette[i * 4 + 3] = 255;
-                }
-                break;
+        case STBI__PNG_TYPE('P', 'L', 'T', 'E'): {
+            if (first) return _m3dstbi__err("first not IHDR", "Corrupt PNG");
+            if (c.length > 256 * 3) return _m3dstbi__err("invalid PLTE", "Corrupt PNG");
+            pal_len = c.length / 3;
+            if (pal_len * 3 != c.length) return _m3dstbi__err("invalid PLTE", "Corrupt PNG");
+            for (i = 0; i < pal_len; ++i) {
+                palette[i * 4 + 0] = _m3dstbi__get8(s);
+                palette[i * 4 + 1] = _m3dstbi__get8(s);
+                palette[i * 4 + 2] = _m3dstbi__get8(s);
+                palette[i * 4 + 3] = 255;
             }
+            break;
+        }
 
-            case STBI__PNG_TYPE('t', 'R', 'N', 'S'): {
-                if (first) return _m3dstbi__err("first not IHDR", "Corrupt PNG");
-                if (z->idata) return _m3dstbi__err("tRNS after IDAT", "Corrupt PNG");
-                if (pal_img_n) {
-                    if (scan == STBI__SCAN_header) {
-                        s->img_n = 4;
-                        return 1;
-                    }
-                    if (pal_len == 0) return _m3dstbi__err("tRNS before PLTE", "Corrupt PNG");
-                    if (c.length > pal_len) return _m3dstbi__err("bad tRNS len", "Corrupt PNG");
-                    pal_img_n = 4;
-                    for (i = 0; i < c.length; ++i)
-                        palette[i * 4 + 3] = _m3dstbi__get8(s);
-                } else {
-                    if (!(s->img_n & 1)) return _m3dstbi__err("tRNS with alpha", "Corrupt PNG");
-                    if (c.length != (_m3dstbi__uint32)s->img_n * 2) return _m3dstbi__err("bad tRNS len", "Corrupt PNG");
-                    has_trans = 1;
-                    if (z->depth == 16) {
-                        for (k = 0; k < s->img_n; ++k)
-                            tc16[k] = (_m3dstbi__uint16)_m3dstbi__get16be(s);
-                    } else {
-                        for (k = 0; k < s->img_n; ++k)
-                            tc[k] = (unsigned char)(_m3dstbi__get16be(s) & 255) * _m3dstbi__depth_scale_table[z->depth];
-                    }
-                }
-                break;
-            }
-
-            case STBI__PNG_TYPE('I', 'D', 'A', 'T'): {
-                if (first) return _m3dstbi__err("first not IHDR", "Corrupt PNG");
-                if (pal_img_n && !pal_len) return _m3dstbi__err("no PLTE", "Corrupt PNG");
+        case STBI__PNG_TYPE('t', 'R', 'N', 'S'): {
+            if (first) return _m3dstbi__err("first not IHDR", "Corrupt PNG");
+            if (z->idata) return _m3dstbi__err("tRNS after IDAT", "Corrupt PNG");
+            if (pal_img_n) {
                 if (scan == STBI__SCAN_header) {
-                    s->img_n = pal_img_n;
+                    s->img_n = 4;
                     return 1;
                 }
-                if ((int)(ioff + c.length) < (int)ioff) return 0;
-                if (ioff + c.length > idata_limit) {
-                    _m3dstbi__uint32 idata_limit_old = idata_limit;
-                    unsigned char *p;
-                    if (idata_limit == 0) idata_limit = c.length > 4096 ? c.length : 4096;
-                    while (ioff + c.length > idata_limit)
-                        idata_limit *= 2;
-                    STBI_NOTUSED(idata_limit_old);
-                    p = (unsigned char *)STBI_REALLOC_SIZED(z->idata, idata_limit_old, idata_limit);
-                    if (p == NULL) return _m3dstbi__err("outofmem", "Out of memory");
-                    z->idata = p;
+                if (pal_len == 0) return _m3dstbi__err("tRNS before PLTE", "Corrupt PNG");
+                if (c.length > pal_len) return _m3dstbi__err("bad tRNS len", "Corrupt PNG");
+                pal_img_n = 4;
+                for (i = 0; i < c.length; ++i)
+                    palette[i * 4 + 3] = _m3dstbi__get8(s);
+            } else {
+                if (!(s->img_n & 1)) return _m3dstbi__err("tRNS with alpha", "Corrupt PNG");
+                if (c.length != (_m3dstbi__uint32)s->img_n * 2) return _m3dstbi__err("bad tRNS len", "Corrupt PNG");
+                has_trans = 1;
+                if (z->depth == 16) {
+                    for (k = 0; k < s->img_n; ++k)
+                        tc16[k] = (_m3dstbi__uint16)_m3dstbi__get16be(s);
+                } else {
+                    for (k = 0; k < s->img_n; ++k)
+                        tc[k] = (unsigned char)(_m3dstbi__get16be(s) & 255) * _m3dstbi__depth_scale_table[z->depth];
                 }
-                if (!_m3dstbi__getn(s, z->idata + ioff, c.length)) return _m3dstbi__err("outofdata", "Corrupt PNG");
-                ioff += c.length;
-                break;
             }
+            break;
+        }
 
-            case STBI__PNG_TYPE('I', 'E', 'N', 'D'): {
-                _m3dstbi__uint32 raw_len, bpl;
-                if (first) return _m3dstbi__err("first not IHDR", "Corrupt PNG");
-                if (scan != STBI__SCAN_load) return 1;
-                if (z->idata == NULL) return _m3dstbi__err("no IDAT", "Corrupt PNG");
-                bpl = (s->img_x * z->depth + 7) / 8;
-                raw_len = bpl * s->img_y * s->img_n /* pixels */ + s->img_y /* filter mode per row */;
-                z->expanded = (unsigned char *)_m3dstbi_zlib_decode_malloc_guesssize_headerflag((char *)z->idata, ioff, raw_len, (int *)&raw_len, 1);
-                if (z->expanded == NULL) return 0;
-                STBI_FREE(z->idata);
-                z->idata = NULL;
-                if ((req_comp == s->img_n + 1 && req_comp != 3 && !pal_img_n) || has_trans)
-                    s->img_out_n = s->img_n + 1;
-                else
-                    s->img_out_n = s->img_n;
-                if (!_m3dstbi__create_png_image(z, z->expanded, raw_len, s->img_out_n, z->depth, color, interlace)) return 0;
-                if (has_trans) {
-                    if (z->depth == 16) {
-                        if (!_m3dstbi__compute_transparency16(z, tc16, s->img_out_n)) return 0;
-                    } else {
-                        if (!_m3dstbi__compute_transparency(z, tc, s->img_out_n)) return 0;
-                    }
-                }
-                if (pal_img_n) {
-                    s->img_n = pal_img_n;
-                    s->img_out_n = pal_img_n;
-                    if (req_comp >= 3) s->img_out_n = req_comp;
-                    if (!_m3dstbi__expand_png_palette(z, palette, pal_len, s->img_out_n))
-                        return 0;
-                } else if (has_trans) {
-                    ++s->img_n;
-                }
-                STBI_FREE(z->expanded);
-                z->expanded = NULL;
+        case STBI__PNG_TYPE('I', 'D', 'A', 'T'): {
+            if (first) return _m3dstbi__err("first not IHDR", "Corrupt PNG");
+            if (pal_img_n && !pal_len) return _m3dstbi__err("no PLTE", "Corrupt PNG");
+            if (scan == STBI__SCAN_header) {
+                s->img_n = pal_img_n;
                 return 1;
             }
+            if ((int)(ioff + c.length) < (int)ioff) return 0;
+            if (ioff + c.length > idata_limit) {
+                _m3dstbi__uint32 idata_limit_old = idata_limit;
+                unsigned char *p;
+                if (idata_limit == 0) idata_limit = c.length > 4096 ? c.length : 4096;
+                while (ioff + c.length > idata_limit)
+                    idata_limit *= 2;
+                STBI_NOTUSED(idata_limit_old);
+                p = (unsigned char *)STBI_REALLOC_SIZED(z->idata, idata_limit_old, idata_limit);
+                if (p == NULL) return _m3dstbi__err("outofmem", "Out of memory");
+                z->idata = p;
+            }
+            if (!_m3dstbi__getn(s, z->idata + ioff, c.length)) return _m3dstbi__err("outofdata", "Corrupt PNG");
+            ioff += c.length;
+            break;
+        }
 
-            default:
-                if (first) return _m3dstbi__err("first not IHDR", "Corrupt PNG");
-                if ((c.type & (1 << 29)) == 0) {
-                    return _m3dstbi__err("invalid_chunk", "PNG not supported: unknown PNG chunk type");
+        case STBI__PNG_TYPE('I', 'E', 'N', 'D'): {
+            _m3dstbi__uint32 raw_len, bpl;
+            if (first) return _m3dstbi__err("first not IHDR", "Corrupt PNG");
+            if (scan != STBI__SCAN_load) return 1;
+            if (z->idata == NULL) return _m3dstbi__err("no IDAT", "Corrupt PNG");
+            bpl = (s->img_x * z->depth + 7) / 8;
+            raw_len = bpl * s->img_y * s->img_n /* pixels */ + s->img_y /* filter mode per row */;
+            z->expanded = (unsigned char *)_m3dstbi_zlib_decode_malloc_guesssize_headerflag((char *)z->idata, ioff, raw_len, (int *)&raw_len, 1);
+            if (z->expanded == NULL) return 0;
+            STBI_FREE(z->idata);
+            z->idata = NULL;
+            if ((req_comp == s->img_n + 1 && req_comp != 3 && !pal_img_n) || has_trans)
+                s->img_out_n = s->img_n + 1;
+            else
+                s->img_out_n = s->img_n;
+            if (!_m3dstbi__create_png_image(z, z->expanded, raw_len, s->img_out_n, z->depth, color, interlace)) return 0;
+            if (has_trans) {
+                if (z->depth == 16) {
+                    if (!_m3dstbi__compute_transparency16(z, tc16, s->img_out_n)) return 0;
+                } else {
+                    if (!_m3dstbi__compute_transparency(z, tc, s->img_out_n)) return 0;
                 }
-                _m3dstbi__skip(s, c.length);
-                break;
+            }
+            if (pal_img_n) {
+                s->img_n = pal_img_n;
+                s->img_out_n = pal_img_n;
+                if (req_comp >= 3) s->img_out_n = req_comp;
+                if (!_m3dstbi__expand_png_palette(z, palette, pal_len, s->img_out_n))
+                    return 0;
+            } else if (has_trans) {
+                ++s->img_n;
+            }
+            STBI_FREE(z->expanded);
+            z->expanded = NULL;
+            return 1;
+        }
+
+        default:
+            if (first) return _m3dstbi__err("first not IHDR", "Corrupt PNG");
+            if ((c.type & (1 << 29)) == 0) {
+                return _m3dstbi__err("invalid_chunk", "PNG not supported: unknown PNG chunk type");
+            }
+            _m3dstbi__skip(s, c.length);
+            break;
         }
         _m3dstbi__get32be(s);
     }
@@ -2281,18 +2283,18 @@ void _m3d_getpr(m3d_t *model, _unused m3dread_t readfilecb, _unused m3dfree_t fr
     } while (0)
 _inline static unsigned char *_m3d_getidx(unsigned char *data, char type, M3D_INDEX *idx) {
     switch (type) {
-        case 1:
-            *idx = data[0] > 253 ? (int8_t)data[0] : data[0];
-            data++;
-            break;
-        case 2:
-            *idx = *((uint16_t *)data) > 65533 ? *((int16_t *)data) : *((uint16_t *)data);
-            data += 2;
-            break;
-        case 4:
-            *idx = *((int32_t *)data);
-            data += 4;
-            break;
+    case 1:
+        *idx = data[0] > 253 ? (int8_t)data[0] : data[0];
+        data++;
+        break;
+    case 2:
+        *idx = *((uint16_t *)data) > 65533 ? *((int16_t *)data) : *((uint16_t *)data);
+        data += 2;
+        break;
+    case 4:
+        *idx = *((int32_t *)data);
+        data += 4;
+        break;
     }
     return data;
 }
@@ -2680,27 +2682,27 @@ m3d_t *m3d_load(unsigned char *data, m3dread_t readfilecb, m3dfree_t freecb, m3d
                         if (!m->prop) goto memerr;
                         m->prop[j].type = n + (k == m3dpf_map && n < 128 ? 128 : 0);
                         switch (k) {
-                            case m3dpf_color: ptr = _m3d_gethex(ptr, &m->prop[j].value.color); break;
-                            case m3dpf_uint8:
-                            case m3dpf_uint16:
-                            case m3dpf_uint32: ptr = _m3d_getint(ptr, &m->prop[j].value.num); break;
-                            case m3dpf_float: ptr = _m3d_getfloat(ptr, &m->prop[j].value.fnum); break;
-                            case m3dpf_map:
-                                pe = _m3d_safestr(ptr, 0);
-                                if (!pe || !*pe) goto asciiend;
-                                m->prop[j].value.textureid = _m3d_gettx(model, readfilecb, freecb, pe);
-                                if (model->errcode == M3D_ERR_ALLOC) {
-                                    M3D_FREE(pe);
-                                    goto memerr;
-                                }
-                                /* this error code only returned if readfilecb was specified */
-                                if (m->prop[j].value.textureid == M3D_UNDEF) {
-                                    M3D_LOG("Texture not found");
-                                    M3D_LOG(pe);
-                                    m->numprop--;
-                                }
+                        case m3dpf_color: ptr = _m3d_gethex(ptr, &m->prop[j].value.color); break;
+                        case m3dpf_uint8:
+                        case m3dpf_uint16:
+                        case m3dpf_uint32: ptr = _m3d_getint(ptr, &m->prop[j].value.num); break;
+                        case m3dpf_float: ptr = _m3d_getfloat(ptr, &m->prop[j].value.fnum); break;
+                        case m3dpf_map:
+                            pe = _m3d_safestr(ptr, 0);
+                            if (!pe || !*pe) goto asciiend;
+                            m->prop[j].value.textureid = _m3d_gettx(model, readfilecb, freecb, pe);
+                            if (model->errcode == M3D_ERR_ALLOC) {
                                 M3D_FREE(pe);
-                                break;
+                                goto memerr;
+                            }
+                            /* this error code only returned if readfilecb was specified */
+                            if (m->prop[j].value.textureid == M3D_UNDEF) {
+                                M3D_LOG("Texture not found");
+                                M3D_LOG(pe);
+                                m->numprop--;
+                            }
+                            M3D_FREE(pe);
+                            break;
                         }
                     } else {
                         M3D_LOG("Unknown material property in");
@@ -2833,48 +2835,48 @@ m3d_t *m3d_load(unsigned char *data, m3dread_t readfilecb, m3dfree_t freecb, m3d
                             }
                             if (*ptr == ']' || *ptr == '\r' || *ptr == '\n') break;
                             switch (cd->a[((k - n) % (cd->p - n)) + n]) {
-                                case m3dcp_mi_t:
-                                    mi = M3D_UNDEF;
-                                    if (*ptr != '\r' && *ptr != '\n') {
-                                        pe = _m3d_safestr(ptr, 0);
-                                        if (!pe || !*pe) goto asciiend;
-                                        for (n = 0; n < model->nummaterial; n++)
-                                            if (!strcmp(pe, model->material[n].name)) {
-                                                mi = (M3D_INDEX)n;
-                                                break;
-                                            }
-                                        if (mi == M3D_UNDEF && !(model->flags & M3D_FLG_MTLLIB)) {
-                                            mi = model->nummaterial++;
-                                            model->material = (m3dm_t *)M3D_REALLOC(model->material,
-                                                    model->nummaterial * sizeof(m3dm_t));
-                                            if (!model->material) goto memerr;
-                                            model->material[mi].name = pe;
-                                            model->material[mi].numprop = 1;
-                                            model->material[mi].prop = NULL;
-                                        } else
-                                            M3D_FREE(pe);
-                                    }
-                                    h->cmd[j].arg[k] = mi;
-                                    break;
-                                case m3dcp_vc_t:
-                                    _m3d_getfloat(ptr, &w);
-                                    h->cmd[j].arg[k] = *((uint32_t *)&w);
-                                    break;
-                                case m3dcp_va_t:
-                                    ptr = _m3d_getint(ptr, &h->cmd[j].arg[k]);
-                                    n = k + 1;
-                                    l += (h->cmd[j].arg[k] - 1) * (cd->p - k - 1);
-                                    h->cmd[j].arg = (uint32_t *)M3D_REALLOC(h->cmd[j].arg, l * sizeof(uint32_t));
-                                    if (!h->cmd[j].arg) goto memerr;
-                                    memset(&h->cmd[j].arg[k + 1], 0, (l - k - 1) * sizeof(uint32_t));
-                                    break;
-                                case m3dcp_qi_t:
-                                    ptr = _m3d_getint(ptr, &h->cmd[j].arg[k]);
-                                    model->vertex[h->cmd[i].arg[k]].skinid = M3D_INDEXMAX;
-                                    break;
-                                default:
-                                    ptr = _m3d_getint(ptr, &h->cmd[j].arg[k]);
-                                    break;
+                            case m3dcp_mi_t:
+                                mi = M3D_UNDEF;
+                                if (*ptr != '\r' && *ptr != '\n') {
+                                    pe = _m3d_safestr(ptr, 0);
+                                    if (!pe || !*pe) goto asciiend;
+                                    for (n = 0; n < model->nummaterial; n++)
+                                        if (!strcmp(pe, model->material[n].name)) {
+                                            mi = (M3D_INDEX)n;
+                                            break;
+                                        }
+                                    if (mi == M3D_UNDEF && !(model->flags & M3D_FLG_MTLLIB)) {
+                                        mi = model->nummaterial++;
+                                        model->material = (m3dm_t *)M3D_REALLOC(model->material,
+                                                model->nummaterial * sizeof(m3dm_t));
+                                        if (!model->material) goto memerr;
+                                        model->material[mi].name = pe;
+                                        model->material[mi].numprop = 1;
+                                        model->material[mi].prop = NULL;
+                                    } else
+                                        M3D_FREE(pe);
+                                }
+                                h->cmd[j].arg[k] = mi;
+                                break;
+                            case m3dcp_vc_t:
+                                _m3d_getfloat(ptr, &w);
+                                h->cmd[j].arg[k] = *((uint32_t *)&w);
+                                break;
+                            case m3dcp_va_t:
+                                ptr = _m3d_getint(ptr, &h->cmd[j].arg[k]);
+                                n = k + 1;
+                                l += (h->cmd[j].arg[k] - 1) * (cd->p - k - 1);
+                                h->cmd[j].arg = (uint32_t *)M3D_REALLOC(h->cmd[j].arg, l * sizeof(uint32_t));
+                                if (!h->cmd[j].arg) goto memerr;
+                                memset(&h->cmd[j].arg[k + 1], 0, (l - k - 1) * sizeof(uint32_t));
+                                break;
+                            case m3dcp_qi_t:
+                                ptr = _m3d_getint(ptr, &h->cmd[j].arg[k]);
+                                model->vertex[h->cmd[i].arg[k]].skinid = M3D_INDEXMAX;
+                                break;
+                            default:
+                                ptr = _m3d_getint(ptr, &h->cmd[j].arg[k]);
+                                break;
                             }
                         }
                     } else {
@@ -3205,22 +3207,22 @@ m3d_t *m3d_load(unsigned char *data, m3dread_t readfilecb, m3dfree_t freecb, m3d
             if (!model->tmap) goto memerr;
             for (i = 0, data += sizeof(m3dchunk_t); data < chunk; i++) {
                 switch (model->vc_s) {
-                    case 1:
-                        model->tmap[i].u = (M3D_FLOAT)(data[0]) / (M3D_FLOAT)255.0;
-                        model->tmap[i].v = (M3D_FLOAT)(data[1]) / (M3D_FLOAT)255.0;
-                        break;
-                    case 2:
-                        model->tmap[i].u = (M3D_FLOAT)(*((int16_t *)(data + 0))) / (M3D_FLOAT)65535.0;
-                        model->tmap[i].v = (M3D_FLOAT)(*((int16_t *)(data + 2))) / (M3D_FLOAT)65535.0;
-                        break;
-                    case 4:
-                        model->tmap[i].u = (M3D_FLOAT)(*((float *)(data + 0)));
-                        model->tmap[i].v = (M3D_FLOAT)(*((float *)(data + 4)));
-                        break;
-                    case 8:
-                        model->tmap[i].u = (M3D_FLOAT)(*((double *)(data + 0)));
-                        model->tmap[i].v = (M3D_FLOAT)(*((double *)(data + 8)));
-                        break;
+                case 1:
+                    model->tmap[i].u = (M3D_FLOAT)(data[0]) / (M3D_FLOAT)255.0;
+                    model->tmap[i].v = (M3D_FLOAT)(data[1]) / (M3D_FLOAT)255.0;
+                    break;
+                case 2:
+                    model->tmap[i].u = (M3D_FLOAT)(*((int16_t *)(data + 0))) / (M3D_FLOAT)65535.0;
+                    model->tmap[i].v = (M3D_FLOAT)(*((int16_t *)(data + 2))) / (M3D_FLOAT)65535.0;
+                    break;
+                case 4:
+                    model->tmap[i].u = (M3D_FLOAT)(*((float *)(data + 0)));
+                    model->tmap[i].v = (M3D_FLOAT)(*((float *)(data + 4)));
+                    break;
+                case 8:
+                    model->tmap[i].u = (M3D_FLOAT)(*((double *)(data + 0)));
+                    model->tmap[i].v = (M3D_FLOAT)(*((double *)(data + 8)));
+                    break;
                 }
                 data += reclen;
             }
@@ -3241,49 +3243,49 @@ m3d_t *m3d_load(unsigned char *data, m3dread_t readfilecb, m3dfree_t freecb, m3d
             memset(model->vertex, 0, model->numvertex * sizeof(m3dv_t));
             for (i = 0, data += sizeof(m3dchunk_t); data < chunk && i < model->numvertex; i++) {
                 switch (model->vc_s) {
-                    case 1:
-                        model->vertex[i].x = (M3D_FLOAT)((int8_t)data[0]) / (M3D_FLOAT)127.0;
-                        model->vertex[i].y = (M3D_FLOAT)((int8_t)data[1]) / (M3D_FLOAT)127.0;
-                        model->vertex[i].z = (M3D_FLOAT)((int8_t)data[2]) / (M3D_FLOAT)127.0;
-                        model->vertex[i].w = (M3D_FLOAT)((int8_t)data[3]) / (M3D_FLOAT)127.0;
-                        data += 4;
-                        break;
-                    case 2:
-                        model->vertex[i].x = (M3D_FLOAT)(*((int16_t *)(data + 0))) / (M3D_FLOAT)32767.0;
-                        model->vertex[i].y = (M3D_FLOAT)(*((int16_t *)(data + 2))) / (M3D_FLOAT)32767.0;
-                        model->vertex[i].z = (M3D_FLOAT)(*((int16_t *)(data + 4))) / (M3D_FLOAT)32767.0;
-                        model->vertex[i].w = (M3D_FLOAT)(*((int16_t *)(data + 6))) / (M3D_FLOAT)32767.0;
-                        data += 8;
-                        break;
-                    case 4:
-                        model->vertex[i].x = (M3D_FLOAT)(*((float *)(data + 0)));
-                        model->vertex[i].y = (M3D_FLOAT)(*((float *)(data + 4)));
-                        model->vertex[i].z = (M3D_FLOAT)(*((float *)(data + 8)));
-                        model->vertex[i].w = (M3D_FLOAT)(*((float *)(data + 12)));
-                        data += 16;
-                        break;
-                    case 8:
-                        model->vertex[i].x = (M3D_FLOAT)(*((double *)(data + 0)));
-                        model->vertex[i].y = (M3D_FLOAT)(*((double *)(data + 8)));
-                        model->vertex[i].z = (M3D_FLOAT)(*((double *)(data + 16)));
-                        model->vertex[i].w = (M3D_FLOAT)(*((double *)(data + 24)));
-                        data += 32;
-                        break;
+                case 1:
+                    model->vertex[i].x = (M3D_FLOAT)((int8_t)data[0]) / (M3D_FLOAT)127.0;
+                    model->vertex[i].y = (M3D_FLOAT)((int8_t)data[1]) / (M3D_FLOAT)127.0;
+                    model->vertex[i].z = (M3D_FLOAT)((int8_t)data[2]) / (M3D_FLOAT)127.0;
+                    model->vertex[i].w = (M3D_FLOAT)((int8_t)data[3]) / (M3D_FLOAT)127.0;
+                    data += 4;
+                    break;
+                case 2:
+                    model->vertex[i].x = (M3D_FLOAT)(*((int16_t *)(data + 0))) / (M3D_FLOAT)32767.0;
+                    model->vertex[i].y = (M3D_FLOAT)(*((int16_t *)(data + 2))) / (M3D_FLOAT)32767.0;
+                    model->vertex[i].z = (M3D_FLOAT)(*((int16_t *)(data + 4))) / (M3D_FLOAT)32767.0;
+                    model->vertex[i].w = (M3D_FLOAT)(*((int16_t *)(data + 6))) / (M3D_FLOAT)32767.0;
+                    data += 8;
+                    break;
+                case 4:
+                    model->vertex[i].x = (M3D_FLOAT)(*((float *)(data + 0)));
+                    model->vertex[i].y = (M3D_FLOAT)(*((float *)(data + 4)));
+                    model->vertex[i].z = (M3D_FLOAT)(*((float *)(data + 8)));
+                    model->vertex[i].w = (M3D_FLOAT)(*((float *)(data + 12)));
+                    data += 16;
+                    break;
+                case 8:
+                    model->vertex[i].x = (M3D_FLOAT)(*((double *)(data + 0)));
+                    model->vertex[i].y = (M3D_FLOAT)(*((double *)(data + 8)));
+                    model->vertex[i].z = (M3D_FLOAT)(*((double *)(data + 16)));
+                    model->vertex[i].w = (M3D_FLOAT)(*((double *)(data + 24)));
+                    data += 32;
+                    break;
                 }
                 switch (model->ci_s) {
-                    case 1:
-                        model->vertex[i].color = model->cmap ? model->cmap[data[0]] : 0;
-                        data++;
-                        break;
-                    case 2:
-                        model->vertex[i].color = model->cmap ? model->cmap[*((uint16_t *)data)] : 0;
-                        data += 2;
-                        break;
-                    case 4:
-                        model->vertex[i].color = *((uint32_t *)data);
-                        data += 4;
-                        break;
-                        /* case 8: break; */
+                case 1:
+                    model->vertex[i].color = model->cmap ? model->cmap[data[0]] : 0;
+                    data++;
+                    break;
+                case 2:
+                    model->vertex[i].color = model->cmap ? model->cmap[*((uint16_t *)data)] : 0;
+                    data += 2;
+                    break;
+                case 4:
+                    model->vertex[i].color = *((uint32_t *)data);
+                    data += 4;
+                    break;
+                    /* case 8: break; */
                 }
                 model->vertex[i].skinid = M3D_UNDEF;
                 data = _m3d_getidx(data, model->sk_s, &model->vertex[i].skinid);
@@ -3412,55 +3414,55 @@ m3d_t *m3d_load(unsigned char *data, m3dread_t readfilecb, m3dfree_t freecb, m3d
                             }
                     }
                     switch (k) {
-                        case m3dpf_color:
-                            switch (model->ci_s) {
-                                case 1:
-                                    m->prop[i].value.color = model->cmap ? model->cmap[data[0]] : 0;
-                                    data++;
-                                    break;
-                                case 2:
-                                    m->prop[i].value.color = model->cmap ? model->cmap[*((uint16_t *)data)] : 0;
-                                    data += 2;
-                                    break;
-                                case 4:
-                                    m->prop[i].value.color = *((uint32_t *)data);
-                                    data += 4;
-                                    break;
-                            }
+                    case m3dpf_color:
+                        switch (model->ci_s) {
+                        case 1:
+                            m->prop[i].value.color = model->cmap ? model->cmap[data[0]] : 0;
+                            data++;
                             break;
-
-                        case m3dpf_uint8: m->prop[i].value.num = *data++; break;
-                        case m3dpf_uint16:
-                            m->prop[i].value.num = *((uint16_t *)data);
+                        case 2:
+                            m->prop[i].value.color = model->cmap ? model->cmap[*((uint16_t *)data)] : 0;
                             data += 2;
                             break;
-                        case m3dpf_uint32:
-                            m->prop[i].value.num = *((uint32_t *)data);
-                            data += 4;
-                            break;
-                        case m3dpf_float:
-                            m->prop[i].value.fnum = *((float *)data);
+                        case 4:
+                            m->prop[i].value.color = *((uint32_t *)data);
                             data += 4;
                             break;
+                        }
+                        break;
 
-                        case m3dpf_map:
-                            M3D_GETSTR(name);
-                            m->prop[i].value.textureid = _m3d_gettx(model, readfilecb, freecb, name);
-                            if (model->errcode == M3D_ERR_ALLOC) goto memerr;
-                            /* this error code only returned if readfilecb was specified */
-                            if (m->prop[i].value.textureid == M3D_UNDEF) {
-                                M3D_LOG("Texture not found");
-                                M3D_LOG(m->name);
-                                m->numprop--;
-                            }
-                            break;
+                    case m3dpf_uint8: m->prop[i].value.num = *data++; break;
+                    case m3dpf_uint16:
+                        m->prop[i].value.num = *((uint16_t *)data);
+                        data += 2;
+                        break;
+                    case m3dpf_uint32:
+                        m->prop[i].value.num = *((uint32_t *)data);
+                        data += 4;
+                        break;
+                    case m3dpf_float:
+                        m->prop[i].value.fnum = *((float *)data);
+                        data += 4;
+                        break;
 
-                        default:
-                            M3D_LOG("Unknown material property in");
+                    case m3dpf_map:
+                        M3D_GETSTR(name);
+                        m->prop[i].value.textureid = _m3d_gettx(model, readfilecb, freecb, name);
+                        if (model->errcode == M3D_ERR_ALLOC) goto memerr;
+                        /* this error code only returned if readfilecb was specified */
+                        if (m->prop[i].value.textureid == M3D_UNDEF) {
+                            M3D_LOG("Texture not found");
                             M3D_LOG(m->name);
-                            model->errcode = M3D_ERR_UNKPROP;
-                            data = chunk;
-                            break;
+                            m->numprop--;
+                        }
+                        break;
+
+                    default:
+                        M3D_LOG("Unknown material property in");
+                        M3D_LOG(m->name);
+                        model->errcode = M3D_ERR_UNKPROP;
+                        data = chunk;
+                        break;
                     }
                 }
                 m->prop = (m3dp_t *)M3D_REALLOC(m->prop, m->numprop * sizeof(m3dp_t));
@@ -3568,45 +3570,45 @@ m3d_t *m3d_load(unsigned char *data, m3dread_t readfilecb, m3dfree_t freecb, m3d
                 memset(h->cmd[i].arg, 0, cd->p * sizeof(uint32_t));
                 for (k = n = 0, l = cd->p; k < l; k++)
                     switch (cd->a[((k - n) % (cd->p - n)) + n]) {
-                        case m3dcp_mi_t:
-                            h->cmd[i].arg[k] = M3D_NOTDEFINED;
-                            M3D_GETSTR(name);
-                            if (name) {
-                                for (n = 0; n < model->nummaterial; n++)
-                                    if (!strcmp(name, model->material[n].name)) {
-                                        h->cmd[i].arg[k] = n;
-                                        break;
-                                    }
-                                if (h->cmd[i].arg[k] == M3D_NOTDEFINED) model->errcode = M3D_ERR_MTRL;
-                            }
-                            break;
-                        case m3dcp_vc_t:
-                            f = 0.0f;
-                            switch (model->vc_s) {
-                                case 1: f = (float)((int8_t)data[0]) / 127; break;
-                                case 2: f = (float)(*((int16_t *)(data + 0))) / 32767; break;
-                                case 4: f = (float)(*((float *)(data + 0))); break;
-                                case 8: f = (float)(*((double *)(data + 0))); break;
-                            }
-                            h->cmd[i].arg[k] = *((uint32_t *)&f);
-                            data += model->vc_s;
-                            break;
-                        case m3dcp_hi_t: data = _m3d_getidx(data, model->hi_s, &h->cmd[i].arg[k]); break;
-                        case m3dcp_fi_t: data = _m3d_getidx(data, model->fi_s, &h->cmd[i].arg[k]); break;
-                        case m3dcp_ti_t: data = _m3d_getidx(data, model->ti_s, &h->cmd[i].arg[k]); break;
-                        case m3dcp_qi_t:
-                        case m3dcp_vi_t: data = _m3d_getidx(data, model->vi_s, &h->cmd[i].arg[k]); break;
-                        case m3dcp_i1_t: data = _m3d_getidx(data, 1, &h->cmd[i].arg[k]); break;
-                        case m3dcp_i2_t: data = _m3d_getidx(data, 2, &h->cmd[i].arg[k]); break;
-                        case m3dcp_i4_t: data = _m3d_getidx(data, 4, &h->cmd[i].arg[k]); break;
-                        case m3dcp_va_t:
-                            data = _m3d_getidx(data, 4, &h->cmd[i].arg[k]);
-                            n = k + 1;
-                            l += (h->cmd[i].arg[k] - 1) * (cd->p - k - 1);
-                            h->cmd[i].arg = (uint32_t *)M3D_REALLOC(h->cmd[i].arg, l * sizeof(uint32_t));
-                            if (!h->cmd[i].arg) goto memerr;
-                            memset(&h->cmd[i].arg[k + 1], 0, (l - k - 1) * sizeof(uint32_t));
-                            break;
+                    case m3dcp_mi_t:
+                        h->cmd[i].arg[k] = M3D_NOTDEFINED;
+                        M3D_GETSTR(name);
+                        if (name) {
+                            for (n = 0; n < model->nummaterial; n++)
+                                if (!strcmp(name, model->material[n].name)) {
+                                    h->cmd[i].arg[k] = n;
+                                    break;
+                                }
+                            if (h->cmd[i].arg[k] == M3D_NOTDEFINED) model->errcode = M3D_ERR_MTRL;
+                        }
+                        break;
+                    case m3dcp_vc_t:
+                        f = 0.0f;
+                        switch (model->vc_s) {
+                        case 1: f = (float)((int8_t)data[0]) / 127; break;
+                        case 2: f = (float)(*((int16_t *)(data + 0))) / 32767; break;
+                        case 4: f = (float)(*((float *)(data + 0))); break;
+                        case 8: f = (float)(*((double *)(data + 0))); break;
+                        }
+                        memcpy(&(h->cmd[i].arg[k]), &f, sizeof(uint32_t));
+                        data += model->vc_s;
+                        break;
+                    case m3dcp_hi_t: data = _m3d_getidx(data, model->hi_s, &h->cmd[i].arg[k]); break;
+                    case m3dcp_fi_t: data = _m3d_getidx(data, model->fi_s, &h->cmd[i].arg[k]); break;
+                    case m3dcp_ti_t: data = _m3d_getidx(data, model->ti_s, &h->cmd[i].arg[k]); break;
+                    case m3dcp_qi_t:
+                    case m3dcp_vi_t: data = _m3d_getidx(data, model->vi_s, &h->cmd[i].arg[k]); break;
+                    case m3dcp_i1_t: data = _m3d_getidx(data, 1, &h->cmd[i].arg[k]); break;
+                    case m3dcp_i2_t: data = _m3d_getidx(data, 2, &h->cmd[i].arg[k]); break;
+                    case m3dcp_i4_t: data = _m3d_getidx(data, 4, &h->cmd[i].arg[k]); break;
+                    case m3dcp_va_t:
+                        data = _m3d_getidx(data, 4, &h->cmd[i].arg[k]);
+                        n = k + 1;
+                        l += (h->cmd[i].arg[k] - 1) * (cd->p - k - 1);
+                        h->cmd[i].arg = (uint32_t *)M3D_REALLOC(h->cmd[i].arg, l * sizeof(uint32_t));
+                        if (!h->cmd[i].arg) goto memerr;
+                        memset(&h->cmd[i].arg[k + 1], 0, (l - k - 1) * sizeof(uint32_t));
+                        break;
                     }
             }
         } else
@@ -3625,19 +3627,19 @@ m3d_t *m3d_load(unsigned char *data, m3dread_t readfilecb, m3dfree_t freecb, m3d
             if (model->ci_s && model->ci_s < 4 && !model->cmap) model->errcode = M3D_ERR_CMAP;
             k = 0;
             switch (model->ci_s) {
-                case 1:
-                    k = model->cmap ? model->cmap[data[0]] : 0;
-                    data++;
-                    break;
-                case 2:
-                    k = model->cmap ? model->cmap[*((uint16_t *)data)] : 0;
-                    data += 2;
-                    break;
-                case 4:
-                    k = *((uint32_t *)data);
-                    data += 4;
-                    break;
-                    /* case 8: break; */
+            case 1:
+                k = model->cmap ? model->cmap[data[0]] : 0;
+                data++;
+                break;
+            case 2:
+                k = model->cmap ? model->cmap[*((uint16_t *)data)] : 0;
+                data += 2;
+                break;
+            case 4:
+                k = *((uint32_t *)data);
+                data += 4;
+                break;
+                /* case 8: break; */
             }
             reclen = model->vi_s + model->si_s;
             i = model->numlabel;
@@ -4265,16 +4267,16 @@ static uint32_t _m3d_cmapidx(uint32_t *cmap, uint32_t numcmap, uint32_t color) {
 /* add index to output */
 static unsigned char *_m3d_addidx(unsigned char *out, char type, uint32_t idx) {
     switch (type) {
-        case 1: *out++ = (uint8_t)(idx); break;
-        case 2:
-            *((uint16_t *)out) = (uint16_t)(idx);
-            out += 2;
-            break;
-        case 4:
-            *((uint32_t *)out) = (uint32_t)(idx);
-            out += 4;
-            break;
-            /* case 0: case 8: break; */
+    case 1: *out++ = (uint8_t)(idx); break;
+    case 2:
+        *((uint16_t *)out) = (uint16_t)(idx);
+        out += 2;
+        break;
+    case 4:
+        *((uint32_t *)out) = (uint32_t)(idx);
+        out += 4;
+        break;
+        /* case 0: case 8: break; */
     }
     return out;
 }
@@ -4286,26 +4288,26 @@ static void _m3d_round(int quality, m3dv_t *src, m3dv_t *dst) {
     if (src != dst) memcpy(dst, src, sizeof(m3dv_t));
     /* round according to quality */
     switch (quality) {
-        case M3D_EXP_INT8:
-            t = (int)(src->x * 127 + (src->x >= 0 ? (M3D_FLOAT)0.5 : (M3D_FLOAT)-0.5));
-            dst->x = (M3D_FLOAT)t / (M3D_FLOAT)127.0;
-            t = (int)(src->y * 127 + (src->y >= 0 ? (M3D_FLOAT)0.5 : (M3D_FLOAT)-0.5));
-            dst->y = (M3D_FLOAT)t / (M3D_FLOAT)127.0;
-            t = (int)(src->z * 127 + (src->z >= 0 ? (M3D_FLOAT)0.5 : (M3D_FLOAT)-0.5));
-            dst->z = (M3D_FLOAT)t / (M3D_FLOAT)127.0;
-            t = (int)(src->w * 127 + (src->w >= 0 ? (M3D_FLOAT)0.5 : (M3D_FLOAT)-0.5));
-            dst->w = (M3D_FLOAT)t / (M3D_FLOAT)127.0;
-            break;
-        case M3D_EXP_INT16:
-            t = (int)(src->x * 32767 + (src->x >= 0 ? (M3D_FLOAT)0.5 : (M3D_FLOAT)-0.5));
-            dst->x = (M3D_FLOAT)t / (M3D_FLOAT)32767.0;
-            t = (int)(src->y * 32767 + (src->y >= 0 ? (M3D_FLOAT)0.5 : (M3D_FLOAT)-0.5));
-            dst->y = (M3D_FLOAT)t / (M3D_FLOAT)32767.0;
-            t = (int)(src->z * 32767 + (src->z >= 0 ? (M3D_FLOAT)0.5 : (M3D_FLOAT)-0.5));
-            dst->z = (M3D_FLOAT)t / (M3D_FLOAT)32767.0;
-            t = (int)(src->w * 32767 + (src->w >= 0 ? (M3D_FLOAT)0.5 : (M3D_FLOAT)-0.5));
-            dst->w = (M3D_FLOAT)t / (M3D_FLOAT)32767.0;
-            break;
+    case M3D_EXP_INT8:
+        t = (int)(src->x * 127 + (src->x >= 0 ? (M3D_FLOAT)0.5 : (M3D_FLOAT)-0.5));
+        dst->x = (M3D_FLOAT)t / (M3D_FLOAT)127.0;
+        t = (int)(src->y * 127 + (src->y >= 0 ? (M3D_FLOAT)0.5 : (M3D_FLOAT)-0.5));
+        dst->y = (M3D_FLOAT)t / (M3D_FLOAT)127.0;
+        t = (int)(src->z * 127 + (src->z >= 0 ? (M3D_FLOAT)0.5 : (M3D_FLOAT)-0.5));
+        dst->z = (M3D_FLOAT)t / (M3D_FLOAT)127.0;
+        t = (int)(src->w * 127 + (src->w >= 0 ? (M3D_FLOAT)0.5 : (M3D_FLOAT)-0.5));
+        dst->w = (M3D_FLOAT)t / (M3D_FLOAT)127.0;
+        break;
+    case M3D_EXP_INT16:
+        t = (int)(src->x * 32767 + (src->x >= 0 ? (M3D_FLOAT)0.5 : (M3D_FLOAT)-0.5));
+        dst->x = (M3D_FLOAT)t / (M3D_FLOAT)32767.0;
+        t = (int)(src->y * 32767 + (src->y >= 0 ? (M3D_FLOAT)0.5 : (M3D_FLOAT)-0.5));
+        dst->y = (M3D_FLOAT)t / (M3D_FLOAT)32767.0;
+        t = (int)(src->z * 32767 + (src->z >= 0 ? (M3D_FLOAT)0.5 : (M3D_FLOAT)-0.5));
+        dst->z = (M3D_FLOAT)t / (M3D_FLOAT)32767.0;
+        t = (int)(src->w * 32767 + (src->w >= 0 ? (M3D_FLOAT)0.5 : (M3D_FLOAT)-0.5));
+        dst->w = (M3D_FLOAT)t / (M3D_FLOAT)32767.0;
+        break;
     }
     if (dst->x == (M3D_FLOAT)-0.0) dst->x = (M3D_FLOAT)0.0;
     if (dst->y == (M3D_FLOAT)-0.0) dst->y = (M3D_FLOAT)0.0;
@@ -4345,7 +4347,7 @@ unsigned char *m3d_save(m3d_t *model, int quality, int flags, unsigned int *size
     char vc_s, vi_s, si_s, ci_s, ti_s, bi_s, nb_s, sk_s, fc_s, hi_s, fi_s;
     char *sn = NULL, *sl = NULL, *sa = NULL, *sd = NULL;
     unsigned char *out = NULL, *z = NULL, weights[M3D_NUMBONE], *norm = NULL;
-    unsigned int i, j, k, l, n, len, chunklen, *length;
+    unsigned int i = 0, j = 0, k = 0, l = 0, n = 0, len = 0, chunklen = 0, *length = NULL;
     M3D_FLOAT scale = (M3D_FLOAT)0.0, min_x, max_x, min_y, max_y, min_z, max_z;
     M3D_INDEX last, *vrtxidx = NULL, *mtrlidx = NULL, *tmapidx = NULL, *skinidx = NULL;
     uint32_t idx, numcmap = 0, *cmap = NULL, numvrtx = 0, maxvrtx = 0, numtmap = 0, maxtmap = 0, numproc = 0;
@@ -4482,23 +4484,23 @@ unsigned char *m3d_save(m3d_t *model, int quality, int flags, unsigned int *size
                     cd = &m3d_commandtypes[cmd->type];
                     for (k = n = 0, l = cd->p; k < l; k++)
                         switch (cd->a[((k - n) % (cd->p - n)) + n]) {
-                            case m3dcp_mi_t:
-                                if (!(flags & M3D_EXP_NOMATERIAL) && cmd->arg[k] < model->nummaterial)
-                                    mtrlidx[cmd->arg[k]] = 0;
-                                break;
-                            case m3dcp_ti_t:
-                                if (!(flags & M3D_EXP_NOTXTCRD) && cmd->arg[k] < model->numtmap)
-                                    tmapidx[cmd->arg[k]] = 0;
-                                break;
-                            case m3dcp_qi_t:
-                            case m3dcp_vi_t:
-                                if (cmd->arg[k] < model->numvertex)
-                                    vrtxidx[cmd->arg[k]] = 0;
-                                break;
-                            case m3dcp_va_t:
-                                n = k + 1;
-                                l += (cmd->arg[k] - 1) * (cd->p - k - 1);
-                                break;
+                        case m3dcp_mi_t:
+                            if (!(flags & M3D_EXP_NOMATERIAL) && cmd->arg[k] < model->nummaterial)
+                                mtrlidx[cmd->arg[k]] = 0;
+                            break;
+                        case m3dcp_ti_t:
+                            if (!(flags & M3D_EXP_NOTXTCRD) && cmd->arg[k] < model->numtmap)
+                                tmapidx[cmd->arg[k]] = 0;
+                            break;
+                        case m3dcp_qi_t:
+                        case m3dcp_vi_t:
+                            if (cmd->arg[k] < model->numvertex)
+                                vrtxidx[cmd->arg[k]] = 0;
+                            break;
+                        case m3dcp_va_t:
+                            n = k + 1;
+                            l += (cmd->arg[k] - 1) * (cd->p - k - 1);
+                            break;
                         }
                 }
             }
@@ -4613,22 +4615,22 @@ unsigned char *m3d_save(m3d_t *model, int quality, int flags, unsigned int *size
         for (i = 0; i < model->numtmap; i++) {
             if (tmapidx[i] == M3D_UNDEF) continue;
             switch (quality) {
-                case M3D_EXP_INT8:
-                    l = (unsigned int)(model->tmap[i].u * 255);
-                    tcoord.data.u = (M3D_FLOAT)l / (M3D_FLOAT)255.0;
-                    l = (unsigned int)(model->tmap[i].v * 255);
-                    tcoord.data.v = (M3D_FLOAT)l / (M3D_FLOAT)255.0;
-                    break;
-                case M3D_EXP_INT16:
-                    l = (unsigned int)(model->tmap[i].u * 65535);
-                    tcoord.data.u = (M3D_FLOAT)l / (M3D_FLOAT)65535.0;
-                    l = (unsigned int)(model->tmap[i].v * 65535);
-                    tcoord.data.v = (M3D_FLOAT)l / (M3D_FLOAT)65535.0;
-                    break;
-                default:
-                    tcoord.data.u = model->tmap[i].u;
-                    tcoord.data.v = model->tmap[i].v;
-                    break;
+            case M3D_EXP_INT8:
+                l = (unsigned int)(model->tmap[i].u * 255);
+                tcoord.data.u = (M3D_FLOAT)l / (M3D_FLOAT)255.0;
+                l = (unsigned int)(model->tmap[i].v * 255);
+                tcoord.data.v = (M3D_FLOAT)l / (M3D_FLOAT)255.0;
+                break;
+            case M3D_EXP_INT16:
+                l = (unsigned int)(model->tmap[i].u * 65535);
+                tcoord.data.u = (M3D_FLOAT)l / (M3D_FLOAT)65535.0;
+                l = (unsigned int)(model->tmap[i].v * 65535);
+                tcoord.data.v = (M3D_FLOAT)l / (M3D_FLOAT)65535.0;
+                break;
+            default:
+                tcoord.data.u = model->tmap[i].u;
+                tcoord.data.v = model->tmap[i].v;
+                break;
             }
             if (flags & M3D_EXP_FLIPTXTCRD)
                 tcoord.data.v = (M3D_FLOAT)1.0 - tcoord.data.v;
@@ -4957,26 +4959,26 @@ unsigned char *m3d_save(m3d_t *model, int quality, int flags, unsigned int *size
                             }
                     }
                     switch (k) {
-                        case m3dpf_color: ptr += sprintf(ptr, "%s #%08x\r\n", sn, m->prop[i].value.color); break;
-                        case m3dpf_uint8:
-                        case m3dpf_uint16:
-                        case m3dpf_uint32: ptr += sprintf(ptr, "%s %d\r\n", sn, m->prop[i].value.num); break;
-                        case m3dpf_float: ptr += sprintf(ptr, "%s %g\r\n", sn, m->prop[i].value.fnum); break;
-                        case m3dpf_map:
-                            if (m->prop[i].value.textureid < model->numtexture &&
-                                    model->texture[m->prop[i].value.textureid].name) {
-                                sl = _m3d_safestr(model->texture[m->prop[i].value.textureid].name, 0);
-                                if (!sl) {
-                                    setlocale(LC_NUMERIC, ol);
-                                    goto memerr;
-                                }
-                                if (*sl)
-                                    ptr += sprintf(ptr, "map_%s %s\r\n", sn, sl);
-                                M3D_FREE(sn);
-                                M3D_FREE(sl);
-                                sl = NULL;
+                    case m3dpf_color: ptr += sprintf(ptr, "%s #%08x\r\n", sn, m->prop[i].value.color); break;
+                    case m3dpf_uint8:
+                    case m3dpf_uint16:
+                    case m3dpf_uint32: ptr += sprintf(ptr, "%s %d\r\n", sn, m->prop[i].value.num); break;
+                    case m3dpf_float: ptr += sprintf(ptr, "%s %g\r\n", sn, m->prop[i].value.fnum); break;
+                    case m3dpf_map:
+                        if (m->prop[i].value.textureid < model->numtexture &&
+                                model->texture[m->prop[i].value.textureid].name) {
+                            sl = _m3d_safestr(model->texture[m->prop[i].value.textureid].name, 0);
+                            if (!sl) {
+                                setlocale(LC_NUMERIC, ol);
+                                goto memerr;
                             }
-                            break;
+                            if (*sl)
+                                ptr += sprintf(ptr, "map_%s %s\r\n", sn, sl);
+                            M3D_FREE(sn);
+                            M3D_FREE(sl);
+                            sl = NULL;
+                        }
+                        break;
                     }
                     sn = NULL;
                 }
@@ -5100,16 +5102,16 @@ unsigned char *m3d_save(m3d_t *model, int quality, int flags, unsigned int *size
                     len = (unsigned int)((uintptr_t)ptr + (uintptr_t)strlen(cd->key) + (uintptr_t)3);
                     for (k = 0; k < cd->p; k++)
                         switch (cd->a[k]) {
-                            case m3dcp_mi_t:
-                                if (cmd->arg[k] != M3D_NOTDEFINED) {
-                                    len += (unsigned int)strlen(model->material[cmd->arg[k]].name) + 1;
-                                }
-                                break;
-                            case m3dcp_va_t:
-                                len += cmd->arg[k] * (cd->p - k - 1) * 16;
-                                k = cd->p;
-                                break;
-                            default: len += 16; break;
+                        case m3dcp_mi_t:
+                            if (cmd->arg[k] != M3D_NOTDEFINED) {
+                                len += (unsigned int)strlen(model->material[cmd->arg[k]].name) + 1;
+                            }
+                            break;
+                        case m3dcp_va_t:
+                            len += cmd->arg[k] * (cd->p - k - 1) * 16;
+                            k = cd->p;
+                            break;
+                        default: len += 16; break;
                         }
                     out = (unsigned char *)M3D_REALLOC(out, len);
                     ptr += (uintptr_t)out;
@@ -5120,25 +5122,25 @@ unsigned char *m3d_save(m3d_t *model, int quality, int flags, unsigned int *size
                     ptr += sprintf(ptr, "%s", cd->key);
                     for (k = n = 0, l = cd->p; k < l; k++) {
                         switch (cd->a[((k - n) % (cd->p - n)) + n]) {
-                            case m3dcp_mi_t:
-                                if (cmd->arg[k] != M3D_NOTDEFINED) {
-                                    sn = _m3d_safestr(model->material[cmd->arg[k]].name, 0);
-                                    if (!sn) {
-                                        setlocale(LC_NUMERIC, ol);
-                                        goto memerr;
-                                    }
-                                    ptr += sprintf(ptr, " %s", sn);
-                                    M3D_FREE(sn);
-                                    sn = NULL;
+                        case m3dcp_mi_t:
+                            if (cmd->arg[k] != M3D_NOTDEFINED) {
+                                sn = _m3d_safestr(model->material[cmd->arg[k]].name, 0);
+                                if (!sn) {
+                                    setlocale(LC_NUMERIC, ol);
+                                    goto memerr;
                                 }
-                                break;
-                            case m3dcp_vc_t: ptr += sprintf(ptr, " %g", *((float *)&cmd->arg[k])); break;
-                            case m3dcp_va_t:
-                                ptr += sprintf(ptr, " %d[", cmd->arg[k]);
-                                n = k + 1;
-                                l += (cmd->arg[k] - 1) * (cd->p - k - 1);
-                                break;
-                            default: ptr += sprintf(ptr, " %d", cmd->arg[k]); break;
+                                ptr += sprintf(ptr, " %s", sn);
+                                M3D_FREE(sn);
+                                sn = NULL;
+                            }
+                            break;
+                        case m3dcp_vc_t: ptr += sprintf(ptr, " %g", *((float *)&cmd->arg[k])); break;
+                        case m3dcp_va_t:
+                            ptr += sprintf(ptr, " %d[", cmd->arg[k]);
+                            n = k + 1;
+                            l += (cmd->arg[k] - 1) * (cd->p - k - 1);
+                            break;
+                        default: ptr += sprintf(ptr, " %d", cmd->arg[k]); break;
                         }
                     }
                     ptr += sprintf(ptr, "%s\r\n", l > cd->p ? " ]" : "");
@@ -5382,28 +5384,28 @@ unsigned char *m3d_save(m3d_t *model, int quality, int flags, unsigned int *size
                 if (tmap[i].newidx == last) continue;
                 last = tmap[i].newidx;
                 switch (vc_s) {
-                    case 1:
-                        *out++ = (uint8_t)(tmap[i].data.u * 255);
-                        *out++ = (uint8_t)(tmap[i].data.v * 255);
-                        break;
-                    case 2:
-                        *((uint16_t *)out) = (uint16_t)(tmap[i].data.u * 65535);
-                        out += 2;
-                        *((uint16_t *)out) = (uint16_t)(tmap[i].data.v * 65535);
-                        out += 2;
-                        break;
-                    case 4:
-                        *((float *)out) = tmap[i].data.u;
-                        out += 4;
-                        *((float *)out) = tmap[i].data.v;
-                        out += 4;
-                        break;
-                    case 8:
-                        *((double *)out) = tmap[i].data.u;
-                        out += 8;
-                        *((double *)out) = tmap[i].data.v;
-                        out += 8;
-                        break;
+                case 1:
+                    *out++ = (uint8_t)(tmap[i].data.u * 255);
+                    *out++ = (uint8_t)(tmap[i].data.v * 255);
+                    break;
+                case 2:
+                    *((uint16_t *)out) = (uint16_t)(tmap[i].data.u * 65535);
+                    out += 2;
+                    *((uint16_t *)out) = (uint16_t)(tmap[i].data.v * 65535);
+                    out += 2;
+                    break;
+                case 4:
+                    *((float *)out) = tmap[i].data.u;
+                    out += 4;
+                    *((float *)out) = tmap[i].data.v;
+                    out += 4;
+                    break;
+                case 8:
+                    *((double *)out) = tmap[i].data.u;
+                    out += 8;
+                    *((double *)out) = tmap[i].data.v;
+                    out += 8;
+                    break;
                 }
             }
             *length = (uint32_t)((uintptr_t)out - (uintptr_t)((uint8_t *)h + len));
@@ -5423,54 +5425,54 @@ unsigned char *m3d_save(m3d_t *model, int quality, int flags, unsigned int *size
                 if (vrtx[i].newidx == last) continue;
                 last = vrtx[i].newidx;
                 switch (vc_s) {
-                    case 1:
-                        *out++ = (int8_t)(vrtx[i].data.x * 127);
-                        *out++ = (int8_t)(vrtx[i].data.y * 127);
-                        *out++ = (int8_t)(vrtx[i].data.z * 127);
-                        *out++ = (int8_t)(vrtx[i].data.w * 127);
-                        break;
-                    case 2:
-                        *((int16_t *)out) = (int16_t)(vrtx[i].data.x * 32767);
-                        out += 2;
-                        *((int16_t *)out) = (int16_t)(vrtx[i].data.y * 32767);
-                        out += 2;
-                        *((int16_t *)out) = (int16_t)(vrtx[i].data.z * 32767);
-                        out += 2;
-                        *((int16_t *)out) = (int16_t)(vrtx[i].data.w * 32767);
-                        out += 2;
-                        break;
-                    case 4:
-                        memcpy(out, &vrtx[i].data.x, sizeof(float));
-                        out += 4;
-                        memcpy(out, &vrtx[i].data.y, sizeof(float));
-                        out += 4;
-                        memcpy(out, &vrtx[i].data.z, sizeof(float));
-                        out += 4;
-                        memcpy(out, &vrtx[i].data.w, sizeof(float));
-                        out += 4;
-                        break;
-                    case 8:
-                        *((double *)out) = vrtx[i].data.x;
-                        out += 8;
-                        *((double *)out) = vrtx[i].data.y;
-                        out += 8;
-                        *((double *)out) = vrtx[i].data.z;
-                        out += 8;
-                        *((double *)out) = vrtx[i].data.w;
-                        out += 8;
-                        break;
+                case 1:
+                    *out++ = (int8_t)(vrtx[i].data.x * 127);
+                    *out++ = (int8_t)(vrtx[i].data.y * 127);
+                    *out++ = (int8_t)(vrtx[i].data.z * 127);
+                    *out++ = (int8_t)(vrtx[i].data.w * 127);
+                    break;
+                case 2:
+                    *((int16_t *)out) = (int16_t)(vrtx[i].data.x * 32767);
+                    out += 2;
+                    *((int16_t *)out) = (int16_t)(vrtx[i].data.y * 32767);
+                    out += 2;
+                    *((int16_t *)out) = (int16_t)(vrtx[i].data.z * 32767);
+                    out += 2;
+                    *((int16_t *)out) = (int16_t)(vrtx[i].data.w * 32767);
+                    out += 2;
+                    break;
+                case 4:
+                    memcpy(out, &vrtx[i].data.x, sizeof(float));
+                    out += 4;
+                    memcpy(out, &vrtx[i].data.y, sizeof(float));
+                    out += 4;
+                    memcpy(out, &vrtx[i].data.z, sizeof(float));
+                    out += 4;
+                    memcpy(out, &vrtx[i].data.w, sizeof(float));
+                    out += 4;
+                    break;
+                case 8:
+                    *((double *)out) = vrtx[i].data.x;
+                    out += 8;
+                    *((double *)out) = vrtx[i].data.y;
+                    out += 8;
+                    *((double *)out) = vrtx[i].data.z;
+                    out += 8;
+                    *((double *)out) = vrtx[i].data.w;
+                    out += 8;
+                    break;
                 }
                 idx = _m3d_cmapidx(cmap, numcmap, vrtx[i].data.color);
                 switch (ci_s) {
-                    case 1: *out++ = (uint8_t)(idx); break;
-                    case 2:
-                        *((uint16_t *)out) = (uint16_t)(idx);
-                        out += 2;
-                        break;
-                    case 4:
-                        *((uint32_t *)out) = vrtx[i].data.color;
-                        out += 4;
-                        break;
+                case 1: *out++ = (uint8_t)(idx); break;
+                case 2:
+                    *((uint16_t *)out) = (uint16_t)(idx);
+                    out += 2;
+                    break;
+                case 4:
+                    *((uint32_t *)out) = vrtx[i].data.color;
+                    out += 4;
+                    break;
                 }
                 out = _m3d_addidx(out, sk_s, vrtx[i].data.skinid);
             }
@@ -5508,19 +5510,19 @@ unsigned char *m3d_save(m3d_t *model, int quality, int flags, unsigned int *size
                             j++)
                         weights[j] = (uint8_t)(skin[i].data.weight[j] * 255);
                     switch (nb_s) {
-                        case 1: weights[0] = 255; break;
-                        case 2:
-                            *((uint16_t *)out) = *((uint16_t *)&weights[0]);
-                            out += 2;
-                            break;
-                        case 4:
-                            *((uint32_t *)out) = *((uint32_t *)&weights[0]);
-                            out += 4;
-                            break;
-                        case 8:
-                            *((uint64_t *)out) = *((uint64_t *)&weights[0]);
-                            out += 8;
-                            break;
+                    case 1: weights[0] = 255; break;
+                    case 2:
+                        *((uint16_t *)out) = *((uint16_t *)&weights[0]);
+                        out += 2;
+                        break;
+                    case 4:
+                        *((uint32_t *)out) = *((uint32_t *)&weights[0]);
+                        out += 4;
+                        break;
+                    case 8:
+                        *((uint64_t *)out) = *((uint64_t *)&weights[0]);
+                        out += 8;
+                        break;
                     }
                     for (j = 0; j < (uint32_t)nb_s && skin[i].data.boneid[j] != M3D_UNDEF && weights[j]; j++) {
                         out = _m3d_addidx(out, bi_s, skin[i].data.boneid[j]);
@@ -5559,41 +5561,41 @@ unsigned char *m3d_save(m3d_t *model, int quality, int flags, unsigned int *size
                     if (k == 256) continue;
                     *out++ = m->prop[i].type;
                     switch (k) {
-                        case m3dpf_color:
-                            if (!(flags & M3D_EXP_NOCMAP)) {
-                                idx = _m3d_cmapidx(cmap, numcmap, m->prop[i].value.color);
-                                switch (ci_s) {
-                                    case 1: *out++ = (uint8_t)(idx); break;
-                                    case 2:
-                                        *((uint16_t *)out) = (uint16_t)(idx);
-                                        out += 2;
-                                        break;
-                                    case 4:
-                                        *((uint32_t *)out) = (uint32_t)(m->prop[i].value.color);
-                                        out += 4;
-                                        break;
-                                }
-                            } else
-                                out--;
-                            break;
-                        case m3dpf_uint8: *out++ = m->prop[i].value.num; break;
-                        case m3dpf_uint16:
-                            *((uint16_t *)out) = m->prop[i].value.num;
-                            out += 2;
-                            break;
-                        case m3dpf_uint32:
-                            *((uint32_t *)out) = m->prop[i].value.num;
-                            out += 4;
-                            break;
-                        case m3dpf_float:
-                            *((float *)out) = m->prop[i].value.fnum;
-                            out += 4;
-                            break;
+                    case m3dpf_color:
+                        if (!(flags & M3D_EXP_NOCMAP)) {
+                            idx = _m3d_cmapidx(cmap, numcmap, m->prop[i].value.color);
+                            switch (ci_s) {
+                            case 1: *out++ = (uint8_t)(idx); break;
+                            case 2:
+                                *((uint16_t *)out) = (uint16_t)(idx);
+                                out += 2;
+                                break;
+                            case 4:
+                                *((uint32_t *)out) = (uint32_t)(m->prop[i].value.color);
+                                out += 4;
+                                break;
+                            }
+                        } else
+                            out--;
+                        break;
+                    case m3dpf_uint8: *out++ = (uint8_t)m->prop[i].value.num; break;
+                    case m3dpf_uint16:
+                        *((uint16_t *)out) = (uint16_t)m->prop[i].value.num;
+                        out += 2;
+                        break;
+                    case m3dpf_uint32:
+                        *((uint32_t *)out) = m->prop[i].value.num;
+                        out += 4;
+                        break;
+                    case m3dpf_float:
+                        *((float *)out) = m->prop[i].value.fnum;
+                        out += 4;
+                        break;
 
-                        case m3dpf_map:
-                            idx = _m3d_stridx(str, numstr, model->texture[m->prop[i].value.textureid].name);
-                            out = _m3d_addidx(out, si_s, idx);
-                            break;
+                    case m3dpf_map:
+                        idx = _m3d_stridx(str, numstr, model->texture[m->prop[i].value.textureid].name);
+                        out = _m3d_addidx(out, si_s, idx);
+                        break;
                     }
                 }
                 *length = (uint32_t)((uintptr_t)out - (uintptr_t)((uint8_t *)h + len));
@@ -5653,7 +5655,7 @@ unsigned char *m3d_save(m3d_t *model, int quality, int flags, unsigned int *size
                              face[i].data.normal[1] == M3D_UNDEF || face[i].data.normal[2] == M3D_UNDEF) ?
                                     0 :
                                     2);
-                *out++ = k;
+                *out++ = (uint8_t)k;
                 for (j = 0; j < 3; j++) {
                     out = _m3d_addidx(out, vi_s, vrtxidx[face[i].data.vertex[j]]);
                     if (k & 1)
@@ -5687,40 +5689,40 @@ unsigned char *m3d_save(m3d_t *model, int quality, int flags, unsigned int *size
                     if (cmd->type > 127) *out++ = (cmd->type >> 7) & 0xff;
                     for (k = n = 0, l = cd->p; k < l; k++) {
                         switch (cd->a[((k - n) % (cd->p - n)) + n]) {
-                            case m3dcp_mi_t:
-                                out = _m3d_addidx(out, si_s, cmd->arg[k] < model->nummaterial ? _m3d_stridx(str, numstr, model->material[cmd->arg[k]].name) : 0);
+                        case m3dcp_mi_t:
+                            out = _m3d_addidx(out, si_s, cmd->arg[k] < model->nummaterial ? _m3d_stridx(str, numstr, model->material[cmd->arg[k]].name) : 0);
+                            break;
+                        case m3dcp_vc_t:
+                            min_x = *((float *)&cmd->arg[k]);
+                            switch (vc_s) {
+                            case 1: *out++ = (int8_t)(min_x * 127); break;
+                            case 2:
+                                *((int16_t *)out) = (int16_t)(min_x * 32767);
+                                out += 2;
                                 break;
-                            case m3dcp_vc_t:
-                                min_x = *((float *)&cmd->arg[k]);
-                                switch (vc_s) {
-                                    case 1: *out++ = (int8_t)(min_x * 127); break;
-                                    case 2:
-                                        *((int16_t *)out) = (int16_t)(min_x * 32767);
-                                        out += 2;
-                                        break;
-                                    case 4:
-                                        *((float *)out) = min_x;
-                                        out += 4;
-                                        break;
-                                    case 8:
-                                        *((double *)out) = min_x;
-                                        out += 8;
-                                        break;
-                                }
+                            case 4:
+                                *((float *)out) = min_x;
+                                out += 4;
                                 break;
-                            case m3dcp_hi_t: out = _m3d_addidx(out, hi_s, cmd->arg[k]); break;
-                            case m3dcp_fi_t: out = _m3d_addidx(out, fi_s, cmd->arg[k]); break;
-                            case m3dcp_ti_t: out = _m3d_addidx(out, ti_s, cmd->arg[k]); break;
-                            case m3dcp_qi_t:
-                            case m3dcp_vi_t: out = _m3d_addidx(out, vi_s, cmd->arg[k]); break;
-                            case m3dcp_i1_t: out = _m3d_addidx(out, 1, cmd->arg[k]); break;
-                            case m3dcp_i2_t: out = _m3d_addidx(out, 2, cmd->arg[k]); break;
-                            case m3dcp_i4_t: out = _m3d_addidx(out, 4, cmd->arg[k]); break;
-                            case m3dcp_va_t:
-                                out = _m3d_addidx(out, 4, cmd->arg[k]);
-                                n = k + 1;
-                                l += (cmd->arg[k] - 1) * (cd->p - k - 1);
+                            case 8:
+                                *((double *)out) = min_x;
+                                out += 8;
                                 break;
+                            }
+                            break;
+                        case m3dcp_hi_t: out = _m3d_addidx(out, hi_s, cmd->arg[k]); break;
+                        case m3dcp_fi_t: out = _m3d_addidx(out, fi_s, cmd->arg[k]); break;
+                        case m3dcp_ti_t: out = _m3d_addidx(out, ti_s, cmd->arg[k]); break;
+                        case m3dcp_qi_t:
+                        case m3dcp_vi_t: out = _m3d_addidx(out, vi_s, cmd->arg[k]); break;
+                        case m3dcp_i1_t: out = _m3d_addidx(out, 1, cmd->arg[k]); break;
+                        case m3dcp_i2_t: out = _m3d_addidx(out, 2, cmd->arg[k]); break;
+                        case m3dcp_i4_t: out = _m3d_addidx(out, 4, cmd->arg[k]); break;
+                        case m3dcp_va_t:
+                            out = _m3d_addidx(out, 4, cmd->arg[k]);
+                            n = k + 1;
+                            l += (cmd->arg[k] - 1) * (cd->p - k - 1);
+                            break;
                         }
                     }
                 }
@@ -5754,15 +5756,15 @@ unsigned char *m3d_save(m3d_t *model, int quality, int flags, unsigned int *size
                     out = _m3d_addidx(out, si_s, _m3d_stridx(str, numstr, model->label[l].lang));
                     idx = _m3d_cmapidx(cmap, numcmap, model->label[i].color);
                     switch (ci_s) {
-                        case 1: *out++ = (uint8_t)(idx); break;
-                        case 2:
-                            *((uint16_t *)out) = (uint16_t)(idx);
-                            out += 2;
-                            break;
-                        case 4:
-                            *((uint32_t *)out) = model->label[i].color;
-                            out += 4;
-                            break;
+                    case 1: *out++ = (uint8_t)(idx); break;
+                    case 2:
+                        *((uint16_t *)out) = (uint16_t)(idx);
+                        out += 2;
+                        break;
+                    case 4:
+                        *((uint32_t *)out) = model->label[i].color;
+                        out += 4;
+                        break;
                     }
                 }
                 out = _m3d_addidx(out, vi_s, vrtxidx[model->label[i].vertexid]);
@@ -5887,7 +5889,7 @@ unsigned char *m3d_save(m3d_t *model, int quality, int flags, unsigned int *size
 }
 #endif
 
-#endif
+#endif /* M3D_IMPLEMENTATION */
 
 #ifdef __cplusplus
 }
@@ -6145,11 +6147,11 @@ public:
 #endif /* impl */
 } // namespace M3D
 
-#ifdef _WIN32
-#    pragma warning(pop)
-#endif // _WIN32
+#endif /* M3D_CPPWRAPPER */
 
-#endif
+#if _MSC_VER > 1920 && !defined(__clang__)
+#    pragma warning(pop)
+#endif /* _MSC_VER */
 
 #endif /* __cplusplus */
 
diff --git a/code/AssetLib/MD2/MD2Loader.cpp b/code/AssetLib/MD2/MD2Loader.cpp
index abc5f06ff..87b7a5609 100644
--- a/code/AssetLib/MD2/MD2Loader.cpp
+++ b/code/AssetLib/MD2/MD2Loader.cpp
@@ -222,7 +222,7 @@ void MD2Importer::InternReadFile( const std::string& pFile,
 
     // Check whether we can read from the file
     if (file.get() == nullptr) {
-        throw DeadlyImportError("Failed to open MD2 file " + pFile + "");
+        throw DeadlyImportError("Failed to open MD2 file ", pFile, "");
     }
 
     // check whether the md3 file is large enough to contain
diff --git a/code/AssetLib/MD3/MD3Loader.cpp b/code/AssetLib/MD3/MD3Loader.cpp
index 92d567801..9c31a7b20 100644
--- a/code/AssetLib/MD3/MD3Loader.cpp
+++ b/code/AssetLib/MD3/MD3Loader.cpp
@@ -715,7 +715,7 @@ void MD3Importer::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
 
     // Check whether we can read from the file
     if (file.get() == nullptr) {
-        throw DeadlyImportError("Failed to open MD3 file " + pFile + ".");
+        throw DeadlyImportError("Failed to open MD3 file ", pFile, ".");
     }
 
     // Check whether the md3 file is large enough to contain the header
diff --git a/code/AssetLib/MD5/MD5Loader.cpp b/code/AssetLib/MD5/MD5Loader.cpp
index 5428a9c74..1741f4472 100644
--- a/code/AssetLib/MD5/MD5Loader.cpp
+++ b/code/AssetLib/MD5/MD5Loader.cpp
@@ -675,7 +675,7 @@ void MD5Importer::LoadMD5CameraFile() {
 
     // Check whether we can read from the file
     if (!file.get() || !file->FileSize()) {
-        throw DeadlyImportError("Failed to read MD5CAMERA file: " + pFile);
+        throw DeadlyImportError("Failed to read MD5CAMERA file: ", pFile);
     }
     mHadMD5Camera = true;
     LoadFileIntoMemory(file.get());
diff --git a/code/AssetLib/MDC/MDCLoader.cpp b/code/AssetLib/MDC/MDCLoader.cpp
index 5748fba0b..0e917171c 100644
--- a/code/AssetLib/MDC/MDCLoader.cpp
+++ b/code/AssetLib/MDC/MDCLoader.cpp
@@ -219,7 +219,7 @@ void MDCImporter::InternReadFile(
 
     // Check whether we can read from the file
     if (file.get() == nullptr) {
-        throw DeadlyImportError("Failed to open MDC file " + pFile + ".");
+        throw DeadlyImportError("Failed to open MDC file ", pFile, ".");
     }
 
     // check whether the mdc file is large enough to contain the file header
diff --git a/code/AssetLib/MDL/HalfLife/HL1MDLLoader.cpp b/code/AssetLib/MDL/HalfLife/HL1MDLLoader.cpp
index 261214dac..c57b43c11 100644
--- a/code/AssetLib/MDL/HalfLife/HL1MDLLoader.cpp
+++ b/code/AssetLib/MDL/HalfLife/HL1MDLLoader.cpp
@@ -68,9 +68,9 @@ namespace Assimp {
 namespace MDL {
 namespace HalfLife {
 
-#ifdef _WIN32
-#    pragma warning(disable : 4706) 
-#endif // _WIN32
+#ifdef _MSC_VER
+#    pragma warning(disable : 4706)
+#endif // _MSC_VER
 
 // ------------------------------------------------------------------------------------------------
 HL1MDLLoader::HL1MDLLoader(
@@ -829,7 +829,7 @@ void HL1MDLLoader::read_meshes() {
                         }
                     } else {
                         for (int faceIdx = 0; faceIdx < num_faces; ++faceIdx) {
-                            if (i & 1) {
+                            if (faceIdx & 1) {
                                 // Preserve winding order.
                                 mesh_faces.push_back(HL1MeshFace{
                                         tricmds[faceIdx + 1],
diff --git a/code/AssetLib/MDL/HalfLife/HL1MDLLoader.h b/code/AssetLib/MDL/HalfLife/HL1MDLLoader.h
index 2891ddb1e..2fa1fd0e4 100644
--- a/code/AssetLib/MDL/HalfLife/HL1MDLLoader.h
+++ b/code/AssetLib/MDL/HalfLife/HL1MDLLoader.h
@@ -218,12 +218,12 @@ private:
 template <typename MDLFileHeader>
 void HL1MDLLoader::load_file_into_buffer(const std::string &file_path, unsigned char *&buffer) {
     if (!io_->Exists(file_path))
-        throw DeadlyImportError("Missing file " + DefaultIOSystem::fileName(file_path) + ".");
+        throw DeadlyImportError("Missing file ", DefaultIOSystem::fileName(file_path), ".");
 
     std::unique_ptr<IOStream> file(io_->Open(file_path));
 
     if (file.get() == nullptr) {
-        throw DeadlyImportError("Failed to open MDL file " + DefaultIOSystem::fileName(file_path) + ".");
+        throw DeadlyImportError("Failed to open MDL file ", DefaultIOSystem::fileName(file_path), ".");
     }
 
     const size_t file_size = file->FileSize();
diff --git a/code/AssetLib/MDL/MDLLoader.cpp b/code/AssetLib/MDL/MDLLoader.cpp
index e917e3b5e..4e28f1a2f 100644
--- a/code/AssetLib/MDL/MDLLoader.cpp
+++ b/code/AssetLib/MDL/MDLLoader.cpp
@@ -167,7 +167,7 @@ void MDLImporter::InternReadFile(const std::string &pFile,
 
     // Check whether we can read from the file
     if (file.get() == nullptr) {
-        throw DeadlyImportError("Failed to open MDL file " + pFile + ".");
+        throw DeadlyImportError("Failed to open MDL file ", pFile, ".");
     }
 
     // This should work for all other types of MDL files, too ...
@@ -251,8 +251,8 @@ void MDLImporter::InternReadFile(const std::string &pFile,
             }
         } else {
             // print the magic word to the log file
-            throw DeadlyImportError("Unknown MDL subformat " + pFile +
-                                    ". Magic word (" + std::string((char *)&iMagicWord, 4) + ") is not known");
+            throw DeadlyImportError("Unknown MDL subformat ", pFile,
+                                    ". Magic word (", std::string((char *)&iMagicWord, 4), ") is not known");
         }
 
         // Now rotate the whole scene 90 degrees around the x axis to convert to internal coordinate system
diff --git a/code/AssetLib/MMD/MMDImporter.cpp b/code/AssetLib/MMD/MMDImporter.cpp
index 0814f4813..d1912d2fe 100644
--- a/code/AssetLib/MMD/MMDImporter.cpp
+++ b/code/AssetLib/MMD/MMDImporter.cpp
@@ -111,7 +111,7 @@ void MMDImporter::InternReadFile(const std::string &file, aiScene *pScene,
     // Read file by istream
     std::filebuf fb;
     if (!fb.open(file, std::ios::in | std::ios::binary)) {
-        throw DeadlyImportError("Failed to open file " + file + ".");
+        throw DeadlyImportError("Failed to open file ", file, ".");
     }
 
     std::istream fileStream(&fb);
@@ -122,7 +122,7 @@ void MMDImporter::InternReadFile(const std::string &file, aiScene *pScene,
     fileStream.seekg(0, fileStream.beg);
 
     if (fileSize < sizeof(pmx::PmxModel)) {
-        throw DeadlyImportError(file + " is too small.");
+        throw DeadlyImportError(file, " is too small.");
     }
 
     pmx::PmxModel model;
diff --git a/code/AssetLib/MMD/MMDPmxParser.cpp b/code/AssetLib/MMD/MMDPmxParser.cpp
index 6421f38cb..bbeeef4b8 100644
--- a/code/AssetLib/MMD/MMDPmxParser.cpp
+++ b/code/AssetLib/MMD/MMDPmxParser.cpp
@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "MMDPmxParser.h"
 #include <assimp/StringUtils.h>
 #ifdef ASSIMP_USE_HUNTER
-#  include <utf8/utf8.h>
+#  include <utf8.h>
 #else
 #  include "../contrib/utf8cpp/source/utf8.h"
 #endif
@@ -524,7 +524,7 @@ namespace pmx
 		if (version != 2.0f && version != 2.1f)
 		{
 			std::cerr << "this is not ver2.0 or ver2.1 but " << version << "." << std::endl;
-            throw DeadlyImportError("MMD: this is not ver2.0 or ver2.1 but " + to_string(version));
+            throw DeadlyImportError("MMD: this is not ver2.0 or ver2.1 but ", to_string(version));
     }
 		this->setting.Read(stream);
 
diff --git a/code/AssetLib/MS3D/MS3DLoader.cpp b/code/AssetLib/MS3D/MS3DLoader.cpp
index b5b6673f3..7edbd91f2 100644
--- a/code/AssetLib/MS3D/MS3DLoader.cpp
+++ b/code/AssetLib/MS3D/MS3DLoader.cpp
@@ -229,7 +229,7 @@ void MS3DImporter::InternReadFile( const std::string& pFile,
     stream.CopyAndAdvance(head,10);
     stream >> version;
     if (strncmp(head,"MS3D000000",10)) {
-        throw DeadlyImportError("Not a MS3D file, magic string MS3D000000 not found: "+pFile);
+        throw DeadlyImportError("Not a MS3D file, magic string MS3D000000 not found: ", pFile);
     }
 
     if (version != 4) {
diff --git a/code/AssetLib/NFF/NFFLoader.cpp b/code/AssetLib/NFF/NFFLoader.cpp
index 8d85b5acf..1a4a65982 100644
--- a/code/AssetLib/NFF/NFFLoader.cpp
+++ b/code/AssetLib/NFF/NFFLoader.cpp
@@ -96,7 +96,7 @@ const aiImporterDesc *NFFImporter::GetInfo() const {
 // ------------------------------------------------------------------------------------------------
 #define AI_NFF_PARSE_FLOAT(f) \
     SkipSpaces(&sz);          \
-    if (!::IsLineEnd(*sz)) sz = fast_atoreal_move<float>(sz, (float &)f);
+    if (!::IsLineEnd(*sz)) sz = fast_atoreal_move<ai_real>(sz, (ai_real &)f);
 
 // ------------------------------------------------------------------------------------------------
 #define AI_NFF_PARSE_TRIPLE(v) \
@@ -214,7 +214,7 @@ void NFFImporter::InternReadFile(const std::string &pFile,
 
     // Check whether we can read from the file
     if (!file.get())
-        throw DeadlyImportError("Failed to open NFF file " + pFile + ".");
+        throw DeadlyImportError("Failed to open NFF file ", pFile, ".");
 
     // allocate storage and copy the contents of the file to a memory buffer
     // (terminate it with zero)
@@ -233,7 +233,7 @@ void NFFImporter::InternReadFile(const std::string &pFile,
 
     // camera parameters
     aiVector3D camPos, camUp(0.f, 1.f, 0.f), camLookAt(0.f, 0.f, 1.f);
-    float angle = 45.f;
+    ai_real angle = 45.f;
     aiVector2D resolution;
 
     bool hasCam = false;
@@ -262,7 +262,7 @@ void NFFImporter::InternReadFile(const std::string &pFile,
 
     // check whether this is the NFF2 file format
     if (TokenMatch(buffer, "nff", 3)) {
-        const float qnan = get_qnan();
+        const ai_real qnan = get_qnan();
         const aiColor4D cQNAN = aiColor4D(qnan, 0.f, 0.f, 1.f);
         const aiVector3D vQNAN = aiVector3D(qnan, 0.f, 0.f);
 
@@ -706,7 +706,7 @@ void NFFImporter::InternReadFile(const std::string &pFile,
             }
             // 'f' - shading information block
             else if (TokenMatch(sz, "f", 1)) {
-                float d;
+                ai_real d;
 
                 // read the RGB colors
                 AI_NFF_PARSE_TRIPLE(s.color);
@@ -856,7 +856,7 @@ void NFFImporter::InternReadFile(const std::string &pFile,
 
                 // read the two center points and the respective radii
                 aiVector3D center1, center2;
-                float radius1 = 0.f, radius2 = 0.f;
+                ai_real radius1 = 0.f, radius2 = 0.f;
                 AI_NFF_PARSE_TRIPLE(center1);
                 AI_NFF_PARSE_FLOAT(radius1);
 
@@ -874,7 +874,7 @@ void NFFImporter::InternReadFile(const std::string &pFile,
                 curMesh.dir = center2 - center1;
                 curMesh.center = center1 + curMesh.dir / (ai_real)2.0;
 
-                float f;
+                ai_real f;
                 if ((f = curMesh.dir.Length()) < 10e-3f) {
                     ASSIMP_LOG_ERROR("NFF: Cone height is close to zero");
                     continue;
diff --git a/code/AssetLib/NFF/NFFLoader.h b/code/AssetLib/NFF/NFFLoader.h
index 524310b0e..84c4ed4e3 100644
--- a/code/AssetLib/NFF/NFFLoader.h
+++ b/code/AssetLib/NFF/NFFLoader.h
@@ -113,14 +113,14 @@ private:
         {}
 
         aiColor3D color,diffuse,specular,ambient,emissive;
-        float refracti;
+        ai_real refracti;
 
         std::string texFile;
 
         // For NFF2
         bool twoSided;
         bool shaded;
-        float opacity, shininess;
+        ai_real opacity, shininess;
 
         std::string name;
 
@@ -155,7 +155,7 @@ private:
         {}
 
         aiVector3D position;
-        float intensity;
+        ai_real intensity;
         aiColor3D color;
     };
 
diff --git a/code/AssetLib/OFF/OFFLoader.cpp b/code/AssetLib/OFF/OFFLoader.cpp
index 79f006fca..fa981e439 100644
--- a/code/AssetLib/OFF/OFFLoader.cpp
+++ b/code/AssetLib/OFF/OFFLoader.cpp
@@ -123,7 +123,7 @@ void OFFImporter::InternReadFile( const std::string& pFile, aiScene* pScene, IOS
 
     // Check whether we can read from the file
     if( file.get() == nullptr) {
-        throw DeadlyImportError( "Failed to open OFF file " + pFile + ".");
+        throw DeadlyImportError( "Failed to open OFF file ", pFile, ".");
     }
 
     // allocate storage and copy the contents of the file to a memory buffer
diff --git a/code/AssetLib/Obj/ObjFileImporter.cpp b/code/AssetLib/Obj/ObjFileImporter.cpp
index b6e1f9061..d6232be81 100644
--- a/code/AssetLib/Obj/ObjFileImporter.cpp
+++ b/code/AssetLib/Obj/ObjFileImporter.cpp
@@ -75,7 +75,9 @@ using namespace std;
 // ------------------------------------------------------------------------------------------------
 //  Default constructor
 ObjFileImporter::ObjFileImporter() :
-        m_Buffer(), m_pRootObject(nullptr), m_strAbsPath(std::string(1, DefaultIOSystem().getOsSeparator())) {}
+        m_Buffer(),
+        m_pRootObject(nullptr),
+        m_strAbsPath(std::string(1, DefaultIOSystem().getOsSeparator())) {}
 
 // ------------------------------------------------------------------------------------------------
 //  Destructor.
@@ -107,9 +109,12 @@ const aiImporterDesc *ObjFileImporter::GetInfo() const {
 void ObjFileImporter::InternReadFile(const std::string &file, aiScene *pScene, IOSystem *pIOHandler) {
     // Read file into memory
     static const std::string mode = "rb";
-    std::unique_ptr<IOStream> fileStream(pIOHandler->Open(file, mode));
+    auto streamCloser = [&](IOStream *pStream) {
+        pIOHandler->Close(pStream);
+    };
+    std::unique_ptr<IOStream, decltype(streamCloser)> fileStream(pIOHandler->Open(file, mode), streamCloser);
     if (!fileStream.get()) {
-        throw DeadlyImportError("Failed to open file " + file + ".");
+        throw DeadlyImportError("Failed to open file ", file, ".");
     }
 
     // Get the file-size and validate it, throwing an exception when fails
@@ -589,18 +594,18 @@ void ObjFileImporter::createMaterials(const ObjFile::Model *pModel, aiScene *pSc
         // convert illumination model
         int sm = 0;
         switch (pCurrentMaterial->illumination_model) {
-            case 0:
-                sm = aiShadingMode_NoShading;
-                break;
-            case 1:
-                sm = aiShadingMode_Gouraud;
-                break;
-            case 2:
-                sm = aiShadingMode_Phong;
-                break;
-            default:
-                sm = aiShadingMode_Gouraud;
-                ASSIMP_LOG_ERROR("OBJ: unexpected illumination model (0-2 recognized)");
+        case 0:
+            sm = aiShadingMode_NoShading;
+            break;
+        case 1:
+            sm = aiShadingMode_Gouraud;
+            break;
+        case 2:
+            sm = aiShadingMode_Phong;
+            break;
+        default:
+            sm = aiShadingMode_Gouraud;
+            ASSIMP_LOG_ERROR("OBJ: unexpected illumination model (0-2 recognized)");
         }
 
         mat->AddProperty<int>(&sm, 1, AI_MATKEY_SHADING_MODEL);
diff --git a/code/AssetLib/Obj/ObjFileMtlImporter.cpp b/code/AssetLib/Obj/ObjFileMtlImporter.cpp
index 6464a55e0..283735912 100644
--- a/code/AssetLib/Obj/ObjFileMtlImporter.cpp
+++ b/code/AssetLib/Obj/ObjFileMtlImporter.cpp
@@ -137,10 +137,14 @@ void ObjFileMtlImporter::load() {
             } break;
             case 'T': {
                 ++m_DataIt;
-                if (*m_DataIt == 'f') // Material transmission
-                {
+                // Material transmission color
+                if (*m_DataIt == 'f')  {
                     ++m_DataIt;
                     getColorRGBA(&m_pModel->m_pCurrentMaterial->transparent);
+                } else if (*m_DataIt == 'r')  {
+                    // Material transmission alpha value
+                    ++m_DataIt;
+                    getFloatValue(m_pModel->m_pCurrentMaterial->alpha);                    
                 }
                 m_DataIt = skipLine<DataArrayIt>(m_DataIt, m_DataItEnd, m_uiLine);
             } break;
diff --git a/code/AssetLib/Obj/ObjTools.h b/code/AssetLib/Obj/ObjTools.h
index 16bcee5c4..61efb98b2 100644
--- a/code/AssetLib/Obj/ObjTools.h
+++ b/code/AssetLib/Obj/ObjTools.h
@@ -234,35 +234,6 @@ inline char_t getFloat(char_t it, char_t end, ai_real &value) {
     return it;
 }
 
-/** @brief  Will perform a simple tokenize.
- *  @param  str         String to tokenize.
- *  @param  tokens      Array with tokens, will be empty if no token was found.
- *  @param  delimiters  Delimiter for tokenize.
- *  @return Number of found token.
- */
-template <class string_type>
-unsigned int tokenize(const string_type &str, std::vector<string_type> &tokens,
-        const string_type &delimiters) {
-    // Skip delimiters at beginning.
-    typename string_type::size_type lastPos = str.find_first_not_of(delimiters, 0);
-
-    // Find first "non-delimiter".
-    typename string_type::size_type pos = str.find_first_of(delimiters, lastPos);
-    while (string_type::npos != pos || string_type::npos != lastPos) {
-        // Found a token, add it to the vector.
-        string_type tmp = str.substr(lastPos, pos - lastPos);
-        if (!tmp.empty() && ' ' != tmp[0])
-            tokens.push_back(tmp);
-
-        // Skip delimiters.  Note the "not_of"
-        lastPos = str.find_first_not_of(delimiters, pos);
-
-        // Find next "non-delimiter"
-        pos = str.find_first_of(delimiters, lastPos);
-    }
-
-    return static_cast<unsigned int>(tokens.size());
-}
 
 template <class string_type>
 string_type trim_whitespaces(string_type str) {
diff --git a/code/AssetLib/Ogre/OgreBinarySerializer.cpp b/code/AssetLib/Ogre/OgreBinarySerializer.cpp
index 360da898f..6f6a19bd9 100644
--- a/code/AssetLib/Ogre/OgreBinarySerializer.cpp
+++ b/code/AssetLib/Ogre/OgreBinarySerializer.cpp
@@ -187,8 +187,8 @@ Mesh *OgreBinarySerializer::ImportMesh(MemoryStreamReader *stream) {
     /// @todo Check what we can actually support.
     std::string version = serializer.ReadLine();
     if (version != MESH_VERSION_1_8) {
-        throw DeadlyExportError(Formatter::format() << "Mesh version " << version << " not supported by this importer. Run OgreMeshUpgrader tool on the file and try again."
-                                                    << " Supported versions: " << MESH_VERSION_1_8);
+        throw DeadlyExportError("Mesh version ", version, " not supported by this importer. Run OgreMeshUpgrader tool on the file and try again.",
+                                                    " Supported versions: ", MESH_VERSION_1_8);
     }
 
     Mesh *mesh = new Mesh();
@@ -471,7 +471,7 @@ void OgreBinarySerializer::ReadSubMeshNames(Mesh *mesh) {
             uint16_t submeshIndex = Read<uint16_t>();
             SubMesh *submesh = mesh->GetSubMesh(submeshIndex);
             if (!submesh) {
-                throw DeadlyImportError(Formatter::format() << "Ogre Mesh does not include submesh " << submeshIndex << " referenced in M_SUBMESH_NAME_TABLE_ELEMENT. Invalid mesh file.");
+                throw DeadlyImportError("Ogre Mesh does not include submesh ", submeshIndex, " referenced in M_SUBMESH_NAME_TABLE_ELEMENT. Invalid mesh file.");
             }
 
             submesh->name = ReadLine();
@@ -788,7 +788,7 @@ MemoryStreamReaderPtr OgreBinarySerializer::OpenReader(Assimp::IOSystem *pIOHand
 
     IOStream *f = pIOHandler->Open(filename, "rb");
     if (!f) {
-        throw DeadlyImportError("Failed to open skeleton file " + filename);
+        throw DeadlyImportError("Failed to open skeleton file ", filename);
     }
 
     return MemoryStreamReaderPtr(new MemoryStreamReader(f));
@@ -803,8 +803,8 @@ void OgreBinarySerializer::ReadSkeleton(Skeleton *skeleton) {
     // This deserialization supports both versions of the skeleton spec
     std::string version = ReadLine();
     if (version != SKELETON_VERSION_1_8 && version != SKELETON_VERSION_1_1) {
-        throw DeadlyExportError(Formatter::format() << "Skeleton version " << version << " not supported by this importer."
-                                                    << " Supported versions: " << SKELETON_VERSION_1_8 << " and " << SKELETON_VERSION_1_1);
+        throw DeadlyExportError("Skeleton version ", version, " not supported by this importer.",
+                                                    " Supported versions: ", SKELETON_VERSION_1_8, " and ", SKELETON_VERSION_1_1);
     }
 
     ASSIMP_LOG_VERBOSE_DEBUG("Reading Skeleton");
@@ -871,7 +871,7 @@ void OgreBinarySerializer::ReadBone(Skeleton *skeleton) {
 
     // Bone indexes need to start from 0 and be contiguous
     if (bone->id != skeleton->bones.size()) {
-        throw DeadlyImportError(Formatter::format() << "Ogre Skeleton bone indexes not contiguous. Error at bone index " << bone->id);
+        throw DeadlyImportError("Ogre Skeleton bone indexes not contiguous. Error at bone index ", bone->id);
     }
 
     ASSIMP_LOG_VERBOSE_DEBUG_F("    ", bone->id, " ", bone->name);
@@ -889,7 +889,7 @@ void OgreBinarySerializer::ReadBoneParent(Skeleton *skeleton) {
     if (child && parent)
         parent->AddChild(child);
     else
-        throw DeadlyImportError(Formatter::format() << "Failed to find bones for parenting: Child id " << childId << " for parent id " << parentId);
+        throw DeadlyImportError("Failed to find bones for parenting: Child id ", childId, " for parent id ", parentId);
 }
 
 void OgreBinarySerializer::ReadSkeletonAnimation(Skeleton *skeleton) {
@@ -926,7 +926,7 @@ void OgreBinarySerializer::ReadSkeletonAnimationTrack(Skeleton * /*skeleton*/, A
     uint16_t boneId = Read<uint16_t>();
     Bone *bone = dest->parentSkeleton->BoneById(boneId);
     if (!bone) {
-        throw DeadlyImportError(Formatter::format() << "Cannot read animation track, target bone " << boneId << " not in target Skeleton");
+        throw DeadlyImportError("Cannot read animation track, target bone ", boneId, " not in target Skeleton");
     }
 
     VertexAnimationTrack track;
diff --git a/code/AssetLib/Ogre/OgreBinarySerializer.h b/code/AssetLib/Ogre/OgreBinarySerializer.h
index 0b88641aa..011c4775a 100644
--- a/code/AssetLib/Ogre/OgreBinarySerializer.h
+++ b/code/AssetLib/Ogre/OgreBinarySerializer.h
@@ -4,7 +4,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -48,16 +47,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "OgreStructs.h"
 #include <assimp/StreamReader.h>
 
-namespace Assimp
-{
-namespace Ogre
-{
+namespace Assimp {
+namespace Ogre {
 
 typedef Assimp::StreamReaderLE MemoryStreamReader;
 typedef std::shared_ptr<MemoryStreamReader> MemoryStreamReaderPtr;
 
-class OgreBinarySerializer
-{
+class OgreBinarySerializer {
 public:
     /// Imports mesh and returns the result.
     /** @note Fatal unrecoverable errors will throw a DeadlyImportError. */
@@ -71,17 +67,15 @@ public:
     static bool ImportSkeleton(Assimp::IOSystem *pIOHandler, MeshXml *mesh);
 
 private:
-    enum AssetMode
-    {
+    enum AssetMode {
         AM_Mesh,
         AM_Skeleton
     };
 
     OgreBinarySerializer(MemoryStreamReader *reader, AssetMode mode) :
-        m_currentLen(0),
-        m_reader(reader),
-        assetMode(mode)
-    {
+            m_currentLen(0),
+            m_reader(reader),
+            assetMode(mode) {
     }
 
     static MemoryStreamReaderPtr OpenReader(Assimp::IOSystem *pIOHandler, const std::string &filename);
@@ -136,7 +130,7 @@ private:
     // Reader utils
     bool AtEnd() const;
 
-    template<typename T>
+    template <typename T>
     inline T Read();
 
     void ReadBytes(char *dest, size_t numBytes);
@@ -158,155 +152,154 @@ private:
     AssetMode assetMode;
 };
 
-enum MeshChunkId
-{
+enum MeshChunkId {
     M_HEADER = 0x1000,
-        // char*          version          : Version number check
-    M_MESH   = 0x3000,
-        // bool skeletallyAnimated   // important flag which affects h/w buffer policies
-        // Optional M_GEOMETRY chunk
-        M_SUBMESH            = 0x4000,
-            // char* materialName
-            // bool useSharedVertices
-            // unsigned int indexCount
-            // bool indexes32Bit
-            // unsigned int* faceVertexIndices (indexCount)
-            // OR
-            // unsigned short* faceVertexIndices (indexCount)
-            // M_GEOMETRY chunk (Optional: present only if useSharedVertices = false)
-            M_SUBMESH_OPERATION = 0x4010, // optional, trilist assumed if missing
-                // unsigned short operationType
-            M_SUBMESH_BONE_ASSIGNMENT = 0x4100,
-                // Optional bone weights (repeating section)
-                // unsigned int vertexIndex;
-                // unsigned short boneIndex;
-                // float weight;
-            // Optional chunk that matches a texture name to an alias
-            // a texture alias is sent to the submesh material to use this texture name
-            // instead of the one in the texture unit with a matching alias name
-            M_SUBMESH_TEXTURE_ALIAS = 0x4200, // Repeating section
-                // char* aliasName;
-                // char* textureName;
+    // char*          version          : Version number check
+    M_MESH = 0x3000,
+    // bool skeletallyAnimated   // important flag which affects h/w buffer policies
+    // Optional M_GEOMETRY chunk
+    M_SUBMESH = 0x4000,
+    // char* materialName
+    // bool useSharedVertices
+    // unsigned int indexCount
+    // bool indexes32Bit
+    // unsigned int* faceVertexIndices (indexCount)
+    // OR
+    // unsigned short* faceVertexIndices (indexCount)
+    // M_GEOMETRY chunk (Optional: present only if useSharedVertices = false)
+    M_SUBMESH_OPERATION = 0x4010, // optional, trilist assumed if missing
+    // unsigned short operationType
+    M_SUBMESH_BONE_ASSIGNMENT = 0x4100,
+    // Optional bone weights (repeating section)
+    // unsigned int vertexIndex;
+    // unsigned short boneIndex;
+    // float weight;
+    // Optional chunk that matches a texture name to an alias
+    // a texture alias is sent to the submesh material to use this texture name
+    // instead of the one in the texture unit with a matching alias name
+    M_SUBMESH_TEXTURE_ALIAS = 0x4200, // Repeating section
+    // char* aliasName;
+    // char* textureName;
 
-        M_GEOMETRY        = 0x5000, // NB this chunk is embedded within M_MESH and M_SUBMESH
-            // unsigned int vertexCount
-            M_GEOMETRY_VERTEX_DECLARATION = 0x5100,
-                M_GEOMETRY_VERTEX_ELEMENT = 0x5110, // Repeating section
-                    // unsigned short source;   // buffer bind source
-                    // unsigned short type;     // VertexElementType
-                    // unsigned short semantic; // VertexElementSemantic
-                    // unsigned short offset;   // start offset in buffer in bytes
-                    // unsigned short index;    // index of the semantic (for colours and texture coords)
-            M_GEOMETRY_VERTEX_BUFFER = 0x5200, // Repeating section
-                // unsigned short bindIndex;    // Index to bind this buffer to
-                // unsigned short vertexSize;   // Per-vertex size, must agree with declaration at this index
-                M_GEOMETRY_VERTEX_BUFFER_DATA = 0x5210,
-                    // raw buffer data
-        M_MESH_SKELETON_LINK = 0x6000,
-            // Optional link to skeleton
-            // char* skeletonName          : name of .skeleton to use
-        M_MESH_BONE_ASSIGNMENT = 0x7000,
-            // Optional bone weights (repeating section)
-            // unsigned int vertexIndex;
-            // unsigned short boneIndex;
-            // float weight;
-        M_MESH_LOD = 0x8000,
-            // Optional LOD information
-            // string strategyName;
-            // unsigned short numLevels;
-            // bool manual;  (true for manual alternate meshes, false for generated)
-            M_MESH_LOD_USAGE = 0x8100,
-            // Repeating section, ordered in increasing depth
-            // NB LOD 0 (full detail from 0 depth) is omitted
-            // LOD value - this is a distance, a pixel count etc, based on strategy
-            // float lodValue;
-                M_MESH_LOD_MANUAL = 0x8110,
-                // Required if M_MESH_LOD section manual = true
-                // String manualMeshName;
-                M_MESH_LOD_GENERATED = 0x8120,
-                // Required if M_MESH_LOD section manual = false
-                // Repeating section (1 per submesh)
-                // unsigned int indexCount;
-                // bool indexes32Bit
-                // unsigned short* faceIndexes;  (indexCount)
-                // OR
-                // unsigned int* faceIndexes;  (indexCount)
-        M_MESH_BOUNDS = 0x9000,
-            // float minx, miny, minz
-            // float maxx, maxy, maxz
-            // float radius
+    M_GEOMETRY = 0x5000, // NB this chunk is embedded within M_MESH and M_SUBMESH
+    // unsigned int vertexCount
+    M_GEOMETRY_VERTEX_DECLARATION = 0x5100,
+    M_GEOMETRY_VERTEX_ELEMENT = 0x5110, // Repeating section
+    // unsigned short source;   // buffer bind source
+    // unsigned short type;     // VertexElementType
+    // unsigned short semantic; // VertexElementSemantic
+    // unsigned short offset;   // start offset in buffer in bytes
+    // unsigned short index;    // index of the semantic (for colours and texture coords)
+    M_GEOMETRY_VERTEX_BUFFER = 0x5200, // Repeating section
+    // unsigned short bindIndex;    // Index to bind this buffer to
+    // unsigned short vertexSize;   // Per-vertex size, must agree with declaration at this index
+    M_GEOMETRY_VERTEX_BUFFER_DATA = 0x5210,
+    // raw buffer data
+    M_MESH_SKELETON_LINK = 0x6000,
+    // Optional link to skeleton
+    // char* skeletonName          : name of .skeleton to use
+    M_MESH_BONE_ASSIGNMENT = 0x7000,
+    // Optional bone weights (repeating section)
+    // unsigned int vertexIndex;
+    // unsigned short boneIndex;
+    // float weight;
+    M_MESH_LOD = 0x8000,
+    // Optional LOD information
+    // string strategyName;
+    // unsigned short numLevels;
+    // bool manual;  (true for manual alternate meshes, false for generated)
+    M_MESH_LOD_USAGE = 0x8100,
+    // Repeating section, ordered in increasing depth
+    // NB LOD 0 (full detail from 0 depth) is omitted
+    // LOD value - this is a distance, a pixel count etc, based on strategy
+    // float lodValue;
+    M_MESH_LOD_MANUAL = 0x8110,
+    // Required if M_MESH_LOD section manual = true
+    // String manualMeshName;
+    M_MESH_LOD_GENERATED = 0x8120,
+    // Required if M_MESH_LOD section manual = false
+    // Repeating section (1 per submesh)
+    // unsigned int indexCount;
+    // bool indexes32Bit
+    // unsigned short* faceIndexes;  (indexCount)
+    // OR
+    // unsigned int* faceIndexes;  (indexCount)
+    M_MESH_BOUNDS = 0x9000,
+    // float minx, miny, minz
+    // float maxx, maxy, maxz
+    // float radius
 
-        // Added By DrEvil
-        // optional chunk that contains a table of submesh indexes and the names of
-        // the sub-meshes.
-        M_SUBMESH_NAME_TABLE = 0xA000,
-            // Subchunks of the name table. Each chunk contains an index & string
-            M_SUBMESH_NAME_TABLE_ELEMENT = 0xA100,
-                // short index
-                // char* name
-        // Optional chunk which stores precomputed edge data
-        M_EDGE_LISTS = 0xB000,
-            // Each LOD has a separate edge list
-            M_EDGE_LIST_LOD = 0xB100,
-                // unsigned short lodIndex
-                // bool isManual            // If manual, no edge data here, loaded from manual mesh
-                    // bool isClosed
-                    // unsigned long numTriangles
-                    // unsigned long numEdgeGroups
-                    // Triangle* triangleList
-                        // unsigned long indexSet
-                        // unsigned long vertexSet
-                        // unsigned long vertIndex[3]
-                        // unsigned long sharedVertIndex[3]
-                        // float normal[4]
+    // Added By DrEvil
+    // optional chunk that contains a table of submesh indexes and the names of
+    // the sub-meshes.
+    M_SUBMESH_NAME_TABLE = 0xA000,
+    // Subchunks of the name table. Each chunk contains an index & string
+    M_SUBMESH_NAME_TABLE_ELEMENT = 0xA100,
+    // short index
+    // char* name
+    // Optional chunk which stores precomputed edge data
+    M_EDGE_LISTS = 0xB000,
+    // Each LOD has a separate edge list
+    M_EDGE_LIST_LOD = 0xB100,
+    // unsigned short lodIndex
+    // bool isManual            // If manual, no edge data here, loaded from manual mesh
+    // bool isClosed
+    // unsigned long numTriangles
+    // unsigned long numEdgeGroups
+    // Triangle* triangleList
+    // unsigned long indexSet
+    // unsigned long vertexSet
+    // unsigned long vertIndex[3]
+    // unsigned long sharedVertIndex[3]
+    // float normal[4]
 
-                    M_EDGE_GROUP = 0xB110,
-                        // unsigned long vertexSet
-                        // unsigned long triStart
-                        // unsigned long triCount
-                        // unsigned long numEdges
-                        // Edge* edgeList
-                            // unsigned long  triIndex[2]
-                            // unsigned long  vertIndex[2]
-                            // unsigned long  sharedVertIndex[2]
-                            // bool degenerate
-        // Optional poses section, referred to by pose keyframes
-        M_POSES = 0xC000,
-            M_POSE = 0xC100,
-                // char* name (may be blank)
-                // unsigned short target    // 0 for shared geometry,
-                                            // 1+ for submesh index + 1
-                // bool includesNormals [1.8+]
-                M_POSE_VERTEX = 0xC111,
-                    // unsigned long vertexIndex
-                    // float xoffset, yoffset, zoffset
-                    // float xnormal, ynormal, znormal (optional, 1.8+)
-        // Optional vertex animation chunk
-        M_ANIMATIONS = 0xD000,
-            M_ANIMATION = 0xD100,
-            // char* name
-            // float length
-            M_ANIMATION_BASEINFO = 0xD105,
-            // [Optional] base keyframe information (pose animation only)
-            // char* baseAnimationName (blank for self)
-            // float baseKeyFrameTime
-            M_ANIMATION_TRACK = 0xD110,
-                // unsigned short type          // 1 == morph, 2 == pose
-                // unsigned short target        // 0 for shared geometry,
-                                                // 1+ for submesh index + 1
-                M_ANIMATION_MORPH_KEYFRAME = 0xD111,
-                    // float time
-                    // bool includesNormals [1.8+]
-                    // float x,y,z          // repeat by number of vertices in original geometry
-                M_ANIMATION_POSE_KEYFRAME = 0xD112,
-                    // float time
-                    M_ANIMATION_POSE_REF = 0xD113, // repeat for number of referenced poses
-                        // unsigned short poseIndex
-                        // float influence
-        // Optional submesh extreme vertex list chink
-        M_TABLE_EXTREMES = 0xE000
-        // unsigned short submesh_index;
-        // float extremes [n_extremes][3];
+    M_EDGE_GROUP = 0xB110,
+    // unsigned long vertexSet
+    // unsigned long triStart
+    // unsigned long triCount
+    // unsigned long numEdges
+    // Edge* edgeList
+    // unsigned long  triIndex[2]
+    // unsigned long  vertIndex[2]
+    // unsigned long  sharedVertIndex[2]
+    // bool degenerate
+    // Optional poses section, referred to by pose keyframes
+    M_POSES = 0xC000,
+    M_POSE = 0xC100,
+    // char* name (may be blank)
+    // unsigned short target    // 0 for shared geometry,
+    // 1+ for submesh index + 1
+    // bool includesNormals [1.8+]
+    M_POSE_VERTEX = 0xC111,
+    // unsigned long vertexIndex
+    // float xoffset, yoffset, zoffset
+    // float xnormal, ynormal, znormal (optional, 1.8+)
+    // Optional vertex animation chunk
+    M_ANIMATIONS = 0xD000,
+    M_ANIMATION = 0xD100,
+    // char* name
+    // float length
+    M_ANIMATION_BASEINFO = 0xD105,
+    // [Optional] base keyframe information (pose animation only)
+    // char* baseAnimationName (blank for self)
+    // float baseKeyFrameTime
+    M_ANIMATION_TRACK = 0xD110,
+    // unsigned short type          // 1 == morph, 2 == pose
+    // unsigned short target        // 0 for shared geometry,
+    // 1+ for submesh index + 1
+    M_ANIMATION_MORPH_KEYFRAME = 0xD111,
+    // float time
+    // bool includesNormals [1.8+]
+    // float x,y,z          // repeat by number of vertices in original geometry
+    M_ANIMATION_POSE_KEYFRAME = 0xD112,
+    // float time
+    M_ANIMATION_POSE_REF = 0xD113, // repeat for number of referenced poses
+    // unsigned short poseIndex
+    // float influence
+    // Optional submesh extreme vertex list chink
+    M_TABLE_EXTREMES = 0xE000
+    // unsigned short submesh_index;
+    // float extremes [n_extremes][3];
 };
 
 /*
@@ -353,49 +346,48 @@ static std::string MeshHeaderToString(MeshChunkId id)
 }
 */
 
-enum SkeletonChunkId
-{
-    SKELETON_HEADER             = 0x1000,
-        // char* version           : Version number check
-        SKELETON_BLENDMODE      = 0x1010, // optional
-            // unsigned short blendmode     : SkeletonAnimationBlendMode
-    SKELETON_BONE               = 0x2000,
+enum SkeletonChunkId {
+    SKELETON_HEADER = 0x1000,
+    // char* version           : Version number check
+    SKELETON_BLENDMODE = 0x1010, // optional
+    // unsigned short blendmode     : SkeletonAnimationBlendMode
+    SKELETON_BONE = 0x2000,
     // Repeating section defining each bone in the system.
     // Bones are assigned indexes automatically based on their order of declaration
     // starting with 0.
-        // char* name                      : name of the bone
-        // unsigned short handle            : handle of the bone, should be contiguous & start at 0
-        // Vector3 position              : position of this bone relative to parent
-        // Quaternion orientation          : orientation of this bone relative to parent
-        // Vector3 scale                    : scale of this bone relative to parent
-    SKELETON_BONE_PARENT        = 0x3000,
+    // char* name                      : name of the bone
+    // unsigned short handle            : handle of the bone, should be contiguous & start at 0
+    // Vector3 position              : position of this bone relative to parent
+    // Quaternion orientation          : orientation of this bone relative to parent
+    // Vector3 scale                    : scale of this bone relative to parent
+    SKELETON_BONE_PARENT = 0x3000,
     // Record of the parent of a single bone, used to build the node tree
     // Repeating section, listed in Bone Index order, one per Bone
-        // unsigned short handle             : child bone
-        // unsigned short parentHandle   : parent bone
-    SKELETON_ANIMATION          = 0x4000,
+    // unsigned short handle             : child bone
+    // unsigned short parentHandle   : parent bone
+    SKELETON_ANIMATION = 0x4000,
     // A single animation for this skeleton
-        // char* name                      : Name of the animation
-        // float length                   : Length of the animation in seconds
-        SKELETON_ANIMATION_BASEINFO = 0x4010,
-        // [Optional] base keyframe information
-        // char* baseAnimationName (blank for self)
-        // float baseKeyFrameTime
-        SKELETON_ANIMATION_TRACK    = 0x4100,
-        // A single animation track (relates to a single bone)
-        // Repeating section (within SKELETON_ANIMATION)
-            // unsigned short boneIndex  : Index of bone to apply to
-            SKELETON_ANIMATION_TRACK_KEYFRAME = 0x4110,
-            // A single keyframe within the track
-            // Repeating section
-                // float time                   : The time position (seconds)
-                // Quaternion rotate            : Rotation to apply at this keyframe
-                // Vector3 translate            : Translation to apply at this keyframe
-                // Vector3 scale                : Scale to apply at this keyframe
-    SKELETON_ANIMATION_LINK     = 0x5000
+    // char* name                      : Name of the animation
+    // float length                   : Length of the animation in seconds
+    SKELETON_ANIMATION_BASEINFO = 0x4010,
+    // [Optional] base keyframe information
+    // char* baseAnimationName (blank for self)
+    // float baseKeyFrameTime
+    SKELETON_ANIMATION_TRACK = 0x4100,
+    // A single animation track (relates to a single bone)
+    // Repeating section (within SKELETON_ANIMATION)
+    // unsigned short boneIndex  : Index of bone to apply to
+    SKELETON_ANIMATION_TRACK_KEYFRAME = 0x4110,
+    // A single keyframe within the track
+    // Repeating section
+    // float time                   : The time position (seconds)
+    // Quaternion rotate            : Rotation to apply at this keyframe
+    // Vector3 translate            : Translation to apply at this keyframe
+    // Vector3 scale                : Scale to apply at this keyframe
+    SKELETON_ANIMATION_LINK = 0x5000
     // Link to another skeleton, to re-use its animations
-        // char* skeletonName                   : name of skeleton to get animations from
-        // float scale                          : scale to apply to trans/scale keys
+    // char* skeletonName                   : name of skeleton to get animations from
+    // float scale                          : scale to apply to trans/scale keys
 };
 
 /*
@@ -416,8 +408,8 @@ static std::string SkeletonHeaderToString(SkeletonChunkId id)
     return "Unknown_SkeletonChunkId";
 }
 */
-} // Ogre
-} // Assimp
+} // namespace Ogre
+} // namespace Assimp
 
 #endif // ASSIMP_BUILD_NO_OGRE_IMPORTER
 #endif // AI_OGREBINARYSERIALIZER_H_INC
diff --git a/code/AssetLib/Ogre/OgreImporter.cpp b/code/AssetLib/Ogre/OgreImporter.cpp
index 9d85a0a96..25d4d1075 100644
--- a/code/AssetLib/Ogre/OgreImporter.cpp
+++ b/code/AssetLib/Ogre/OgreImporter.cpp
@@ -44,8 +44,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "OgreImporter.h"
 #include "OgreBinarySerializer.h"
 #include "OgreXmlSerializer.h"
-#include <assimp/Importer.hpp>
 #include <assimp/importerdesc.h>
+#include <assimp/Importer.hpp>
 #include <memory>
 
 static const aiImporterDesc desc = {
@@ -61,51 +61,41 @@ static const aiImporterDesc desc = {
     "mesh mesh.xml"
 };
 
-namespace Assimp
-{
-namespace Ogre
-{
+namespace Assimp {
+namespace Ogre {
 
-const aiImporterDesc* OgreImporter::GetInfo() const
-{
+const aiImporterDesc *OgreImporter::GetInfo() const {
     return &desc;
 }
 
-void OgreImporter::SetupProperties(const Importer* pImp)
-{
+void OgreImporter::SetupProperties(const Importer *pImp) {
     m_userDefinedMaterialLibFile = pImp->GetPropertyString(AI_CONFIG_IMPORT_OGRE_MATERIAL_FILE, "Scene.material");
     m_detectTextureTypeFromFilename = pImp->GetPropertyBool(AI_CONFIG_IMPORT_OGRE_TEXTURETYPE_FROM_FILENAME, false);
 }
 
-bool OgreImporter::CanRead(const std::string &pFile, Assimp::IOSystem *pIOHandler, bool checkSig) const
-{
+bool OgreImporter::CanRead(const std::string &pFile, Assimp::IOSystem *pIOHandler, bool checkSig) const {
     if (!checkSig) {
         return EndsWith(pFile, ".mesh.xml", false) || EndsWith(pFile, ".mesh", false);
     }
 
-    if (EndsWith(pFile, ".mesh.xml", false))
-    {
-        const char* tokens[] = { "<mesh>" };
+    if (EndsWith(pFile, ".mesh.xml", false)) {
+        const char *tokens[] = { "<mesh>" };
         return SearchFileHeaderForToken(pIOHandler, pFile, tokens, 1);
-    }
-    else
-    {
+    } else {
         /// @todo Read and validate first header chunk?
         return EndsWith(pFile, ".mesh", false);
     }
 }
 
-void OgreImporter::InternReadFile(const std::string &pFile, aiScene *pScene, Assimp::IOSystem *pIOHandler)
-{
+void OgreImporter::InternReadFile(const std::string &pFile, aiScene *pScene, Assimp::IOSystem *pIOHandler) {
     // Open source file
     IOStream *f = pIOHandler->Open(pFile, "rb");
     if (!f) {
-        throw DeadlyImportError("Failed to open file " + pFile);
+        throw DeadlyImportError("Failed to open file ", pFile);
     }
 
     // Binary .mesh import
-    if (EndsWith(pFile, ".mesh", false))
-    {
+    if (EndsWith(pFile, ".mesh", false)) {
         /// @note MemoryStreamReader takes ownership of f.
         MemoryStreamReader reader(f);
 
@@ -122,15 +112,16 @@ void OgreImporter::InternReadFile(const std::string &pFile, aiScene *pScene, Ass
         mesh->ConvertToAssimpScene(pScene);
     }
     // XML .mesh.xml import
-    else
-    {
+    else {
         /// @note XmlReader does not take ownership of f, hence the scoped ptr.
         std::unique_ptr<IOStream> scopedFile(f);
-        std::unique_ptr<CIrrXML_IOStreamReader> xmlStream(new CIrrXML_IOStreamReader(scopedFile.get()));
-        std::unique_ptr<XmlReader> reader(irr::io::createIrrXMLReader(xmlStream.get()));
+        XmlParser xmlParser;
 
+        //std::unique_ptr<CIrrXML_IOStreamReader> xmlStream(new CIrrXML_IOStreamReader(scopedFile.get()));
+        //std::unique_ptr<XmlReader> reader(irr::io::createIrrXMLReader(xmlStream.get()));
+        xmlParser.parse(scopedFile.get());
         // Import mesh
-        std::unique_ptr<MeshXml> mesh(OgreXmlSerializer::ImportMesh(reader.get()));
+        std::unique_ptr<MeshXml> mesh(OgreXmlSerializer::ImportMesh(&xmlParser));
 
         // Import skeleton
         OgreXmlSerializer::ImportSkeleton(pIOHandler, mesh.get());
@@ -143,7 +134,7 @@ void OgreImporter::InternReadFile(const std::string &pFile, aiScene *pScene, Ass
     }
 }
 
-} // Ogre
-} // Assimp
+} // namespace Ogre
+} // namespace Assimp
 
 #endif // ASSIMP_BUILD_NO_OGRE_IMPORTER
diff --git a/code/AssetLib/Ogre/OgreStructs.cpp b/code/AssetLib/Ogre/OgreStructs.cpp
index 4a4f9479e..b915c742f 100644
--- a/code/AssetLib/Ogre/OgreStructs.cpp
+++ b/code/AssetLib/Ogre/OgreStructs.cpp
@@ -476,7 +476,7 @@ void SubMesh::Reset(){
 
 aiMesh *SubMesh::ConvertToAssimpMesh(Mesh *parent) {
     if (operationType != OT_TRIANGLE_LIST) {
-        throw DeadlyImportError(Formatter::format() << "Only mesh operation type OT_TRIANGLE_LIST is supported. Found " << operationType);
+        throw DeadlyImportError("Only mesh operation type OT_TRIANGLE_LIST is supported. Found ", operationType);
     }
 
     aiMesh *dest = new aiMesh();
@@ -944,7 +944,7 @@ void Bone::AddChild(Bone *bone) {
     if (!bone)
         return;
     if (bone->IsParented())
-        throw DeadlyImportError("Attaching child Bone that is already parented: " + bone->name);
+        throw DeadlyImportError("Attaching child Bone that is already parented: ", bone->name);
 
     bone->parent = this;
     bone->parentId = id;
@@ -963,7 +963,7 @@ void Bone::CalculateWorldMatrixAndDefaultPose(Skeleton *skeleton) {
     for (auto boneId : children) {
         Bone *child = skeleton->BoneById(boneId);
         if (!child) {
-            throw DeadlyImportError(Formatter::format() << "CalculateWorldMatrixAndDefaultPose: Failed to find child bone " << boneId << " for parent " << id << " " << name);
+            throw DeadlyImportError("CalculateWorldMatrixAndDefaultPose: Failed to find child bone ", boneId, " for parent ", id, " ", name);
         }
         child->CalculateWorldMatrixAndDefaultPose(skeleton);
     }
@@ -983,7 +983,7 @@ aiNode *Bone::ConvertToAssimpNode(Skeleton *skeleton, aiNode *parentNode) {
         for (size_t i = 0, len = children.size(); i < len; ++i) {
             Bone *child = skeleton->BoneById(children[i]);
             if (!child) {
-                throw DeadlyImportError(Formatter::format() << "ConvertToAssimpNode: Failed to find child bone " << children[i] << " for parent " << id << " " << name);
+                throw DeadlyImportError("ConvertToAssimpNode: Failed to find child bone ", children[i], " for parent ", id, " ", name);
             }
             node->mChildren[i] = child->ConvertToAssimpNode(skeleton, node);
         }
@@ -1022,7 +1022,7 @@ aiNodeAnim *VertexAnimationTrack::ConvertToAssimpAnimationNode(Skeleton *skeleto
 
     Bone *bone = skeleton->BoneByName(boneName);
     if (!bone) {
-        throw DeadlyImportError("VertexAnimationTrack::ConvertToAssimpAnimationNode: Failed to find bone " + boneName + " from parent Skeleton");
+        throw DeadlyImportError("VertexAnimationTrack::ConvertToAssimpAnimationNode: Failed to find bone ", boneName, " from parent Skeleton");
     }
 
     // Keyframes
diff --git a/code/AssetLib/Ogre/OgreXmlSerializer.cpp b/code/AssetLib/Ogre/OgreXmlSerializer.cpp
index 31c2ee74e..bc9aeffd7 100644
--- a/code/AssetLib/Ogre/OgreXmlSerializer.cpp
+++ b/code/AssetLib/Ogre/OgreXmlSerializer.cpp
@@ -4,7 +4,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -46,6 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <assimp/TinyFormatter.h>
 #include <assimp/DefaultLogger.hpp>
+
 #include <memory>
 
 #ifndef ASSIMP_BUILD_NO_OGRE_IMPORTER
@@ -56,127 +56,79 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 namespace Assimp {
 namespace Ogre {
 
-AI_WONT_RETURN void ThrowAttibuteError(const XmlReader *reader, const std::string &name, const std::string &error = "") AI_WONT_RETURN_SUFFIX;
-AI_WONT_RETURN void ThrowAttibuteError(const XmlReader *reader, const std::string &name, const std::string &error) {
+//AI_WONT_RETURN void ThrowAttibuteError(const XmlParser *reader, const std::string &name, const std::string &error = "") AI_WONT_RETURN_SUFFIX;
+
+AI_WONT_RETURN void ThrowAttibuteError(const std::string &nodeName, const std::string &name, const std::string &error) {
     if (!error.empty()) {
-        throw DeadlyImportError(error + " in node '" + std::string(reader->getNodeName()) + "' and attribute '" + name + "'");
+        throw DeadlyImportError(error, " in node '", nodeName, "' and attribute '", name, "'");
     } else {
-        throw DeadlyImportError("Attribute '" + name + "' does not exist in node '" + std::string(reader->getNodeName()) + "'");
+        throw DeadlyImportError("Attribute '", name, "' does not exist in node '", nodeName, "'");
     }
 }
 
 template <>
-int32_t OgreXmlSerializer::ReadAttribute<int32_t>(const char *name) const {
-    if (!HasAttribute(name)) {
-        ThrowAttibuteError(m_reader, name);
+int32_t OgreXmlSerializer::ReadAttribute<int32_t>(XmlNode &xmlNode, const char *name) const {
+    if (!XmlParser::hasAttribute(xmlNode, name)) {
+        ThrowAttibuteError(xmlNode.name(), name, "Not found");
     }
-
-    return static_cast<int32_t>(m_reader->getAttributeValueAsInt(name));
+    pugi::xml_attribute attr = xmlNode.attribute(name);
+    return static_cast<int32_t>(attr.as_int());
 }
 
 template <>
-uint32_t OgreXmlSerializer::ReadAttribute<uint32_t>(const char *name) const {
-    if (!HasAttribute(name)) {
-        ThrowAttibuteError(m_reader, name);
+uint32_t OgreXmlSerializer::ReadAttribute<uint32_t>(XmlNode &xmlNode, const char *name) const {
+    if (!XmlParser::hasAttribute(xmlNode, name)) {
+        ThrowAttibuteError(xmlNode.name(), name, "Not found");
     }
+
     // @note This is hackish. But we are never expecting unsigned values that go outside the
     //       int32_t range. Just monitor for negative numbers and kill the import.
-    int32_t temp = ReadAttribute<int32_t>(name);
+    int32_t temp = ReadAttribute<int32_t>(xmlNode, name);
     if (temp < 0) {
-        ThrowAttibuteError(m_reader, name, "Found a negative number value where expecting a uint32_t value");
+        ThrowAttibuteError(xmlNode.name(), name, "Found a negative number value where expecting a uint32_t value");
     }
 
     return static_cast<uint32_t>(temp);
 }
 
 template <>
-uint16_t OgreXmlSerializer::ReadAttribute<uint16_t>(const char *name) const {
-    if (!HasAttribute(name)) {
-        ThrowAttibuteError(m_reader, name);
+uint16_t OgreXmlSerializer::ReadAttribute<uint16_t>(XmlNode &xmlNode, const char *name) const {
+    if (!XmlParser::hasAttribute(xmlNode, name)) {
+        ThrowAttibuteError(xmlNode.name(), name, "Not found");
     }
 
-    return static_cast<uint16_t>(ReadAttribute<uint32_t>(name));
+    return static_cast<uint16_t>(xmlNode.attribute(name).as_int());
 }
 
 template <>
-float OgreXmlSerializer::ReadAttribute<float>(const char *name) const {
-    if (!HasAttribute(name)) {
-        ThrowAttibuteError(m_reader, name);
+float OgreXmlSerializer::ReadAttribute<float>(XmlNode &xmlNode, const char *name) const {
+    if (!XmlParser::hasAttribute(xmlNode, name)) {
+        ThrowAttibuteError(xmlNode.name(), name, "Not found");
     }
 
-    return m_reader->getAttributeValueAsFloat(name);
+    return xmlNode.attribute(name).as_float();
 }
 
 template <>
-std::string OgreXmlSerializer::ReadAttribute<std::string>(const char *name) const {
-    const char *value = m_reader->getAttributeValue(name);
-    if (nullptr == value) {
-        ThrowAttibuteError(m_reader, name);
+std::string OgreXmlSerializer::ReadAttribute<std::string>(XmlNode &xmlNode, const char *name) const {
+    if (!XmlParser::hasAttribute(xmlNode, name)) {
+        ThrowAttibuteError(xmlNode.name(), name, "Not found");
     }
 
-    return std::string(value);
+    return xmlNode.attribute(name).as_string();
 }
 
 template <>
-bool OgreXmlSerializer::ReadAttribute<bool>(const char *name) const {
-    std::string value = Ogre::ToLower(ReadAttribute<std::string>(name));
+bool OgreXmlSerializer::ReadAttribute<bool>(XmlNode &xmlNode, const char *name) const {
+    std::string value = Ogre::ToLower(ReadAttribute<std::string>(xmlNode, name));
     if (ASSIMP_stricmp(value, "true") == 0) {
         return true;
     } else if (ASSIMP_stricmp(value, "false") == 0) {
         return false;
-    } else {
-        ThrowAttibuteError(m_reader, name, "Boolean value is expected to be 'true' or 'false', encountered '" + value + "'");
-        return false;
-    }
-}
-
-bool OgreXmlSerializer::HasAttribute(const char *name) const {
-    return (m_reader->getAttributeValue(name) != 0);
-}
-
-std::string &OgreXmlSerializer::NextNode() {
-    do {
-        if (!m_reader->read()) {
-            m_currentNodeName = "";
-            return m_currentNodeName;
-        }
-    } while (m_reader->getNodeType() != irr::io::EXN_ELEMENT);
-
-    CurrentNodeName(true);
-#if (OGRE_XML_SERIALIZER_DEBUG == 1)
-    ASSIMP_LOG_DEBUG"<" + m_currentNodeName + ">");
-#endif
-    return m_currentNodeName;
-}
-
-bool OgreXmlSerializer::CurrentNodeNameEquals(const std::string &name) const {
-    return (ASSIMP_stricmp(m_currentNodeName, name) == 0);
-}
-
-std::string OgreXmlSerializer::CurrentNodeName(bool forceRead) {
-    if (forceRead)
-        m_currentNodeName = std::string(m_reader->getNodeName());
-    return m_currentNodeName;
-}
-
-std::string &OgreXmlSerializer::SkipCurrentNode() {
-#if (OGRE_XML_SERIALIZER_DEBUG == 1)
-    ASSIMP_LOG_DEBUG("Skipping node <" + m_currentNodeName + ">");
-#endif
-
-    for (;;) {
-        if (!m_reader->read()) {
-            m_currentNodeName = "";
-            return m_currentNodeName;
-        }
-        if (m_reader->getNodeType() != irr::io::EXN_ELEMENT_END) {
-            continue;
-        } else if (std::string(m_reader->getNodeName()) == m_currentNodeName) {
-            break;
-        }
     }
 
-    return NextNode();
+    ThrowAttibuteError(xmlNode.name(), name, "Boolean value is expected to be 'true' or 'false', encountered '" + value + "'");
+    return false;
 }
 
 // Mesh XML constants
@@ -186,18 +138,18 @@ static const char *nnMesh = "mesh";
 static const char *nnSharedGeometry = "sharedgeometry";
 static const char *nnSubMeshes = "submeshes";
 static const char *nnSubMesh = "submesh";
-static const char *nnSubMeshNames = "submeshnames";
+//static const char *nnSubMeshNames = "submeshnames";
 static const char *nnSkeletonLink = "skeletonlink";
-static const char *nnLOD = "levelofdetail";
-static const char *nnExtremes = "extremes";
-static const char *nnPoses = "poses";
+//static const char *nnLOD = "levelofdetail";
+//static const char *nnExtremes = "extremes";
+//static const char *nnPoses = "poses";
 static const char *nnAnimations = "animations";
 
 // <submesh>
 static const char *nnFaces = "faces";
 static const char *nnFace = "face";
 static const char *nnGeometry = "geometry";
-static const char *nnTextures = "textures";
+//static const char *nnTextures = "textures";
 
 // <mesh/submesh>
 static const char *nnBoneAssignments = "boneassignments";
@@ -206,14 +158,14 @@ static const char *nnBoneAssignments = "boneassignments";
 static const char *nnVertexBuffer = "vertexbuffer";
 
 // <vertexbuffer>
-static const char *nnVertex = "vertex";
+//static const char *nnVertex = "vertex";
 static const char *nnPosition = "position";
 static const char *nnNormal = "normal";
 static const char *nnTangent = "tangent";
-static const char *nnBinormal = "binormal";
+//static const char *nnBinormal = "binormal";
 static const char *nnTexCoord = "texcoord";
-static const char *nnColorDiffuse = "colour_diffuse";
-static const char *nnColorSpecular = "colour_specular";
+//static const char *nnColorDiffuse = "colour_diffuse";
+//static const char *nnColorSpecular = "colour_specular";
 
 // <boneassignments>
 static const char *nnVertexBoneAssignment = "vertexboneassignment";
@@ -224,7 +176,7 @@ static const char *nnVertexBoneAssignment = "vertexboneassignment";
 static const char *nnSkeleton = "skeleton";
 static const char *nnBones = "bones";
 static const char *nnBoneHierarchy = "bonehierarchy";
-static const char *nnAnimationLinks = "animationlinks";
+//static const char *nnAnimationLinks = "animationlinks";
 
 // <bones>
 static const char *nnBone = "bone";
@@ -247,15 +199,23 @@ static const char *nnTranslate = "translate";
 static const char *nnRotate = "rotate";
 
 // Common XML constants
-
 static const char *anX = "x";
 static const char *anY = "y";
 static const char *anZ = "z";
 
 // Mesh
 
-MeshXml *OgreXmlSerializer::ImportMesh(XmlReader *reader) {
-    OgreXmlSerializer serializer(reader);
+OgreXmlSerializer::OgreXmlSerializer(XmlParser *parser) :
+        mParser(parser) {
+    // empty
+}
+
+MeshXml *OgreXmlSerializer::ImportMesh(XmlParser *parser) {
+    if (nullptr == parser) {
+        return nullptr;
+    }
+
+    OgreXmlSerializer serializer(parser);
 
     MeshXml *mesh = new MeshXml();
     serializer.ReadMesh(mesh);
@@ -264,60 +224,53 @@ MeshXml *OgreXmlSerializer::ImportMesh(XmlReader *reader) {
 }
 
 void OgreXmlSerializer::ReadMesh(MeshXml *mesh) {
-    if (NextNode() != nnMesh) {
-        throw DeadlyImportError("Root node is <" + m_currentNodeName + "> expecting <mesh>");
+    XmlNode root = mParser->getRootNode();
+    if (nullptr == root) {
+        throw DeadlyImportError("Root node is <" + std::string(root.name()) + "> expecting <mesh>");
+    }
+
+    XmlNode startNode = root.child(nnMesh);
+    if (startNode.empty()) {
+        throw DeadlyImportError("Root node is <" + std::string(root.name()) + "> expecting <mesh>");
+    }
+    for (XmlNode currentNode : startNode.children()) {
+        const std::string currentName = currentNode.name();
+        if (currentName == nnSharedGeometry) {
+            mesh->sharedVertexData = new VertexDataXml();
+            ReadGeometry(currentNode, mesh->sharedVertexData);
+        } else if (currentName == nnSubMeshes) {
+            for (XmlNode &subMeshesNode : currentNode.children()) {
+                const std::string &currentSMName = subMeshesNode.name();
+                if (currentSMName == nnSubMesh) {
+                    ReadSubMesh(subMeshesNode, mesh);
+                }
+            }
+        } else if (currentName == nnBoneAssignments) {
+            ReadBoneAssignments(currentNode, mesh->sharedVertexData);
+        } else if (currentName == nnSkeletonLink) {
+        }
     }
 
     ASSIMP_LOG_VERBOSE_DEBUG("Reading Mesh");
-
-    NextNode();
-
-    // Root level nodes
-    while (m_currentNodeName == nnSharedGeometry ||
-            m_currentNodeName == nnSubMeshes ||
-            m_currentNodeName == nnSkeletonLink ||
-            m_currentNodeName == nnBoneAssignments ||
-            m_currentNodeName == nnLOD ||
-            m_currentNodeName == nnSubMeshNames ||
-            m_currentNodeName == nnExtremes ||
-            m_currentNodeName == nnPoses ||
-            m_currentNodeName == nnAnimations) {
-        if (m_currentNodeName == nnSharedGeometry) {
-            mesh->sharedVertexData = new VertexDataXml();
-            ReadGeometry(mesh->sharedVertexData);
-        } else if (m_currentNodeName == nnSubMeshes) {
-            NextNode();
-            while (m_currentNodeName == nnSubMesh) {
-                ReadSubMesh(mesh);
-            }
-        } else if (m_currentNodeName == nnBoneAssignments) {
-            ReadBoneAssignments(mesh->sharedVertexData);
-        } else if (m_currentNodeName == nnSkeletonLink) {
-            mesh->skeletonRef = ReadAttribute<std::string>("name");
-            ASSIMP_LOG_VERBOSE_DEBUG_F("Read skeleton link ", mesh->skeletonRef);
-            NextNode();
-        }
-        // Assimp incompatible/ignored nodes
-        else
-            SkipCurrentNode();
-    }
 }
 
-void OgreXmlSerializer::ReadGeometry(VertexDataXml *dest) {
-    dest->count = ReadAttribute<uint32_t>("vertexcount");
+void OgreXmlSerializer::ReadGeometry(XmlNode &node, VertexDataXml *dest) {
+    dest->count = ReadAttribute<uint32_t>(node, "vertexcount");
     ASSIMP_LOG_VERBOSE_DEBUG_F("  - Reading geometry of ", dest->count, " vertices");
 
-    NextNode();
-    while (m_currentNodeName == nnVertexBuffer) {
-        ReadGeometryVertexBuffer(dest);
+    for (XmlNode currentNode : node.children()) {
+        const std::string &currentName = currentNode.name();
+        if (currentName == nnVertexBuffer) {
+            ReadGeometryVertexBuffer(currentNode, dest);
+        }
     }
 }
 
-void OgreXmlSerializer::ReadGeometryVertexBuffer(VertexDataXml *dest) {
-    bool positions = (HasAttribute("positions") && ReadAttribute<bool>("positions"));
-    bool normals = (HasAttribute("normals") && ReadAttribute<bool>("normals"));
-    bool tangents = (HasAttribute("tangents") && ReadAttribute<bool>("tangents"));
-    uint32_t uvs = (HasAttribute("texture_coords") ? ReadAttribute<uint32_t>("texture_coords") : 0);
+void OgreXmlSerializer::ReadGeometryVertexBuffer(XmlNode &node, VertexDataXml *dest) {
+    bool positions = (XmlParser::hasAttribute(node, "positions") && ReadAttribute<bool>(node, "positions"));
+    bool normals = (XmlParser::hasAttribute(node, "normals") && ReadAttribute<bool>(node, "normals"));
+    bool tangents = (XmlParser::hasAttribute(node, "tangents") && ReadAttribute<bool>(node, "tangents"));
+    uint32_t uvs = (XmlParser::hasAttribute(node, "texture_coords") ? ReadAttribute<uint32_t>(node, "texture_coords") : 0);
 
     // Not having positions is a error only if a previous vertex buffer did not have them.
     if (!positions && !dest->HasPositions()) {
@@ -344,109 +297,57 @@ void OgreXmlSerializer::ReadGeometryVertexBuffer(VertexDataXml *dest) {
         }
     }
 
-    bool warnBinormal = true;
-    bool warnColorDiffuse = true;
-    bool warnColorSpecular = true;
-
-    NextNode();
-
-    while (m_currentNodeName == nnVertex ||
-            m_currentNodeName == nnPosition ||
-            m_currentNodeName == nnNormal ||
-            m_currentNodeName == nnTangent ||
-            m_currentNodeName == nnBinormal ||
-            m_currentNodeName == nnTexCoord ||
-            m_currentNodeName == nnColorDiffuse ||
-            m_currentNodeName == nnColorSpecular) {
-        if (m_currentNodeName == nnVertex) {
-            NextNode();
-        }
-
-        /// @todo Implement nnBinormal, nnColorDiffuse and nnColorSpecular
-
-        if (positions && m_currentNodeName == nnPosition) {
-            aiVector3D pos;
-            pos.x = ReadAttribute<float>(anX);
-            pos.y = ReadAttribute<float>(anY);
-            pos.z = ReadAttribute<float>(anZ);
-            dest->positions.push_back(pos);
-        } else if (normals && m_currentNodeName == nnNormal) {
-            aiVector3D normal;
-            normal.x = ReadAttribute<float>(anX);
-            normal.y = ReadAttribute<float>(anY);
-            normal.z = ReadAttribute<float>(anZ);
-            dest->normals.push_back(normal);
-        } else if (tangents && m_currentNodeName == nnTangent) {
-            aiVector3D tangent;
-            tangent.x = ReadAttribute<float>(anX);
-            tangent.y = ReadAttribute<float>(anY);
-            tangent.z = ReadAttribute<float>(anZ);
-            dest->tangents.push_back(tangent);
-        } else if (uvs > 0 && m_currentNodeName == nnTexCoord) {
-            for (auto &curUvs : dest->uvs) {
-                if (m_currentNodeName != nnTexCoord) {
-                    throw DeadlyImportError("Vertex buffer declared more UVs than can be found in a vertex");
+    for (XmlNode currentNode : node.children("vertex")) {
+        for (XmlNode vertexNode : currentNode.children()) {
+            const std::string &currentName = vertexNode.name();
+            if (positions && currentName == nnPosition) {
+                aiVector3D pos;
+                pos.x = ReadAttribute<float>(vertexNode, anX);
+                pos.y = ReadAttribute<float>(vertexNode, anY);
+                pos.z = ReadAttribute<float>(vertexNode, anZ);
+                dest->positions.push_back(pos);
+            } else if (normals && currentName == nnNormal) {
+                aiVector3D normal;
+                normal.x = ReadAttribute<float>(vertexNode, anX);
+                normal.y = ReadAttribute<float>(vertexNode, anY);
+                normal.z = ReadAttribute<float>(vertexNode, anZ);
+                dest->normals.push_back(normal);
+            } else if (tangents && currentName == nnTangent) {
+                aiVector3D tangent;
+                tangent.x = ReadAttribute<float>(vertexNode, anX);
+                tangent.y = ReadAttribute<float>(vertexNode, anY);
+                tangent.z = ReadAttribute<float>(vertexNode, anZ);
+                dest->tangents.push_back(tangent);
+            } else if (uvs > 0 && currentName == nnTexCoord) {
+                for (auto &curUvs : dest->uvs) {
+                    aiVector3D uv;
+                    uv.x = ReadAttribute<float>(vertexNode, "u");
+                    uv.y = (ReadAttribute<float>(vertexNode, "v") * -1) + 1; // Flip UV from Ogre to Assimp form
+                    curUvs.push_back(uv);
                 }
-
-                aiVector3D uv;
-                uv.x = ReadAttribute<float>("u");
-                uv.y = (ReadAttribute<float>("v") * -1) + 1; // Flip UV from Ogre to Assimp form
-                curUvs.push_back(uv);
-
-                NextNode();
-            }
-            // Continue main loop as above already read next node
-            continue;
-        } else {
-            /// @todo Remove this stuff once implemented. We only want to log warnings once per element.
-            bool warn = true;
-            if (m_currentNodeName == nnBinormal) {
-                if (warnBinormal) {
-                    warnBinormal = false;
-                } else {
-                    warn = false;
-                }
-            } else if (m_currentNodeName == nnColorDiffuse) {
-                if (warnColorDiffuse) {
-                    warnColorDiffuse = false;
-                } else {
-                    warn = false;
-                }
-            } else if (m_currentNodeName == nnColorSpecular) {
-                if (warnColorSpecular) {
-                    warnColorSpecular = false;
-                } else {
-                    warn = false;
-                }
-            }
-            if (warn) {
-                ASSIMP_LOG_WARN_F("Vertex buffer attribute read not implemented for element: ", m_currentNodeName);
             }
         }
-
-        // Advance
-        NextNode();
     }
 
     // Sanity checks
     if (dest->positions.size() != dest->count) {
-        throw DeadlyImportError(Formatter::format() << "Read only " << dest->positions.size() << " positions when should have read " << dest->count);
+        throw DeadlyImportError("Read only ", dest->positions.size(), " positions when should have read ", dest->count);
     }
     if (normals && dest->normals.size() != dest->count) {
-        throw DeadlyImportError(Formatter::format() << "Read only " << dest->normals.size() << " normals when should have read " << dest->count);
+        throw DeadlyImportError("Read only ", dest->normals.size(), " normals when should have read ", dest->count);
     }
     if (tangents && dest->tangents.size() != dest->count) {
-        throw DeadlyImportError(Formatter::format() << "Read only " << dest->tangents.size() << " tangents when should have read " << dest->count);
+        throw DeadlyImportError("Read only ", dest->tangents.size(), " tangents when should have read ", dest->count);
     }
     for (unsigned int i = 0; i < dest->uvs.size(); ++i) {
         if (dest->uvs[i].size() != dest->count) {
-            throw DeadlyImportError(Formatter::format() << "Read only " << dest->uvs[i].size()
-                                                        << " uvs for uv index " << i << " when should have read " << dest->count);
+            throw DeadlyImportError("Read only ", dest->uvs[i].size(),
+                    " uvs for uv index ", i, " when should have read ", dest->count);
         }
     }
 }
 
-void OgreXmlSerializer::ReadSubMesh(MeshXml *mesh) {
+void OgreXmlSerializer::ReadSubMesh(XmlNode &node, MeshXml *mesh) {
     static const char *anMaterial = "material";
     static const char *anUseSharedVertices = "usesharedvertices";
     static const char *anCount = "count";
@@ -457,11 +358,11 @@ void OgreXmlSerializer::ReadSubMesh(MeshXml *mesh) {
 
     SubMeshXml *submesh = new SubMeshXml();
 
-    if (HasAttribute(anMaterial)) {
-        submesh->materialRef = ReadAttribute<std::string>(anMaterial);
+    if (XmlParser::hasAttribute(node, anMaterial)) {
+        submesh->materialRef = ReadAttribute<std::string>(node, anMaterial);
     }
-    if (HasAttribute(anUseSharedVertices)) {
-        submesh->usesSharedVertexData = ReadAttribute<bool>(anUseSharedVertices);
+    if (XmlParser::hasAttribute(node, anUseSharedVertices)) {
+        submesh->usesSharedVertexData = ReadAttribute<bool>(node, anUseSharedVertices);
     }
 
     ASSIMP_LOG_VERBOSE_DEBUG_F("Reading SubMesh ", mesh->subMeshes.size());
@@ -474,54 +375,42 @@ void OgreXmlSerializer::ReadSubMesh(MeshXml *mesh) {
 
     bool quadWarned = false;
 
-    NextNode();
-    while (m_currentNodeName == nnFaces ||
-            m_currentNodeName == nnGeometry ||
-            m_currentNodeName == nnTextures ||
-            m_currentNodeName == nnBoneAssignments) {
-        if (m_currentNodeName == nnFaces) {
-            submesh->indexData->faceCount = ReadAttribute<uint32_t>(anCount);
+    for (XmlNode &currentNode : node.children()) {
+        const std::string &currentName = currentNode.name();
+        if (currentName == nnFaces) {
+            submesh->indexData->faceCount = ReadAttribute<uint32_t>(currentNode, anCount);
             submesh->indexData->faces.reserve(submesh->indexData->faceCount);
-
-            NextNode();
-            while (m_currentNodeName == nnFace) {
-                aiFace face;
-                face.mNumIndices = 3;
-                face.mIndices = new unsigned int[3];
-                face.mIndices[0] = ReadAttribute<uint32_t>(anV1);
-                face.mIndices[1] = ReadAttribute<uint32_t>(anV2);
-                face.mIndices[2] = ReadAttribute<uint32_t>(anV3);
-
-                /// @todo Support quads if Ogre even supports them in XML (I'm not sure but I doubt it)
-                if (!quadWarned && HasAttribute(anV4)) {
-                    ASSIMP_LOG_WARN("Submesh <face> has quads with <v4>, only triangles are supported at the moment!");
-                    quadWarned = true;
+            for (XmlNode currentChildNode : currentNode.children()) {
+                const std::string &currentChildName = currentChildNode.name();
+                if (currentChildName == nnFace) {
+                    aiFace face;
+                    face.mNumIndices = 3;
+                    face.mIndices = new unsigned int[3];
+                    face.mIndices[0] = ReadAttribute<uint32_t>(currentChildNode, anV1);
+                    face.mIndices[1] = ReadAttribute<uint32_t>(currentChildNode, anV2);
+                    face.mIndices[2] = ReadAttribute<uint32_t>(currentChildNode, anV3);
+                    /// @todo Support quads if Ogre even supports them in XML (I'm not sure but I doubt it)
+                    if (!quadWarned && XmlParser::hasAttribute(currentChildNode, anV4)) {
+                        ASSIMP_LOG_WARN("Submesh <face> has quads with <v4>, only triangles are supported at the moment!");
+                        quadWarned = true;
+                    }
+                    submesh->indexData->faces.push_back(face);
                 }
-
-                submesh->indexData->faces.push_back(face);
-
-                // Advance
-                NextNode();
             }
-
             if (submesh->indexData->faces.size() == submesh->indexData->faceCount) {
                 ASSIMP_LOG_VERBOSE_DEBUG_F("  - Faces ", submesh->indexData->faceCount);
             } else {
-                throw DeadlyImportError(Formatter::format() << "Read only " << submesh->indexData->faces.size() << " faces when should have read " << submesh->indexData->faceCount);
+                throw DeadlyImportError("Read only ", submesh->indexData->faces.size(), " faces when should have read ", submesh->indexData->faceCount);
             }
-        } else if (m_currentNodeName == nnGeometry) {
+        } else if (currentName == nnGeometry) {
             if (submesh->usesSharedVertexData) {
                 throw DeadlyImportError("Found <geometry> in <submesh> when use shared geometry is true. Invalid mesh file.");
             }
 
             submesh->vertexData = new VertexDataXml();
-            ReadGeometry(submesh->vertexData);
-        } else if (m_currentNodeName == nnBoneAssignments) {
-            ReadBoneAssignments(submesh->vertexData);
-        }
-        // Assimp incompatible/ignored nodes
-        else {
-            SkipCurrentNode();
+            ReadGeometry(currentNode, submesh->vertexData);
+        } else if (currentName == nnBoneAssignments) {
+            ReadBoneAssignments(currentNode, submesh->vertexData);
         }
     }
 
@@ -529,7 +418,7 @@ void OgreXmlSerializer::ReadSubMesh(MeshXml *mesh) {
     mesh->subMeshes.push_back(submesh);
 }
 
-void OgreXmlSerializer::ReadBoneAssignments(VertexDataXml *dest) {
+void OgreXmlSerializer::ReadBoneAssignments(XmlNode &node, VertexDataXml *dest) {
     if (!dest) {
         throw DeadlyImportError("Cannot read bone assignments, vertex data is null.");
     }
@@ -539,18 +428,17 @@ void OgreXmlSerializer::ReadBoneAssignments(VertexDataXml *dest) {
     static const char *anWeight = "weight";
 
     std::set<uint32_t> influencedVertices;
+    for (XmlNode &currentNode : node.children()) {
+        const std::string &currentName = currentNode.name();
+        if (currentName == nnVertexBoneAssignment) {
+            VertexBoneAssignment ba;
+            ba.vertexIndex = ReadAttribute<uint32_t>(currentNode, anVertexIndex);
+            ba.boneIndex = ReadAttribute<uint16_t>(currentNode, anBoneIndex);
+            ba.weight = ReadAttribute<float>(currentNode, anWeight);
 
-    NextNode();
-    while (m_currentNodeName == nnVertexBoneAssignment) {
-        VertexBoneAssignment ba;
-        ba.vertexIndex = ReadAttribute<uint32_t>(anVertexIndex);
-        ba.boneIndex = ReadAttribute<uint16_t>(anBoneIndex);
-        ba.weight = ReadAttribute<float>(anWeight);
-
-        dest->boneAssignments.push_back(ba);
-        influencedVertices.insert(ba.vertexIndex);
-
-        NextNode();
+            dest->boneAssignments.push_back(ba);
+            influencedVertices.insert(ba.vertexIndex);
+        }
     }
 
     /** Normalize bone weights.
@@ -593,188 +481,193 @@ bool OgreXmlSerializer::ImportSkeleton(Assimp::IOSystem *pIOHandler, MeshXml *me
         mesh->skeletonRef = mesh->skeletonRef + ".xml";
     }
 
-    XmlReaderPtr reader = OpenReader(pIOHandler, mesh->skeletonRef);
-    if (!reader.get())
+    XmlParserPtr xmlParser = OpenXmlParser(pIOHandler, mesh->skeletonRef);
+    if (!xmlParser.get())
         return false;
 
     Skeleton *skeleton = new Skeleton();
-    OgreXmlSerializer serializer(reader.get());
-    serializer.ReadSkeleton(skeleton);
+    OgreXmlSerializer serializer(xmlParser.get());
+    XmlNode root = xmlParser->getRootNode();
+    serializer.ReadSkeleton(root, skeleton);
     mesh->skeleton = skeleton;
     return true;
 }
 
 bool OgreXmlSerializer::ImportSkeleton(Assimp::IOSystem *pIOHandler, Mesh *mesh) {
-    if (!mesh || mesh->skeletonRef.empty())
+    if (!mesh || mesh->skeletonRef.empty()) {
         return false;
+    }
 
-    XmlReaderPtr reader = OpenReader(pIOHandler, mesh->skeletonRef);
-    if (!reader.get())
+    XmlParserPtr xmlParser = OpenXmlParser(pIOHandler, mesh->skeletonRef);
+    if (!xmlParser.get()) {
         return false;
+    }
 
     Skeleton *skeleton = new Skeleton();
-    OgreXmlSerializer serializer(reader.get());
-    serializer.ReadSkeleton(skeleton);
+    OgreXmlSerializer serializer(xmlParser.get());
+    XmlNode root = xmlParser->getRootNode();
+
+    serializer.ReadSkeleton(root, skeleton);
     mesh->skeleton = skeleton;
+
     return true;
 }
 
-XmlReaderPtr OgreXmlSerializer::OpenReader(Assimp::IOSystem *pIOHandler, const std::string &filename) {
+XmlParserPtr OgreXmlSerializer::OpenXmlParser(Assimp::IOSystem *pIOHandler, const std::string &filename) {
     if (!EndsWith(filename, ".skeleton.xml", false)) {
         ASSIMP_LOG_ERROR_F("Imported Mesh is referencing to unsupported '", filename, "' skeleton file.");
-        return XmlReaderPtr();
+        return XmlParserPtr();
     }
 
     if (!pIOHandler->Exists(filename)) {
         ASSIMP_LOG_ERROR_F("Failed to find skeleton file '", filename, "' that is referenced by imported Mesh.");
-        return XmlReaderPtr();
+        return XmlParserPtr();
     }
 
     std::unique_ptr<IOStream> file(pIOHandler->Open(filename));
     if (!file.get()) {
-        throw DeadlyImportError("Failed to open skeleton file " + filename);
+        throw DeadlyImportError("Failed to open skeleton file ", filename);
     }
 
-    std::unique_ptr<CIrrXML_IOStreamReader> stream(new CIrrXML_IOStreamReader(file.get()));
-    XmlReaderPtr reader = XmlReaderPtr(irr::io::createIrrXMLReader(stream.get()));
-    if (!reader.get()) {
+    XmlParserPtr xmlParser = XmlParserPtr(new XmlParser);
+    if (!xmlParser->parse(file.get())) {
         throw DeadlyImportError("Failed to create XML reader for skeleton file " + filename);
     }
-    return reader;
+    return xmlParser;
 }
 
-void OgreXmlSerializer::ReadSkeleton(Skeleton *skeleton) {
-    if (NextNode() != nnSkeleton) {
-        throw DeadlyImportError("Root node is <" + m_currentNodeName + "> expecting <skeleton>");
+void OgreXmlSerializer::ReadSkeleton(XmlNode &node, Skeleton *skeleton) {
+    if (node.name() != nnSkeleton) {
+        throw DeadlyImportError("Root node is <" + std::string(node.name()) + "> expecting <skeleton>");
     }
 
     ASSIMP_LOG_VERBOSE_DEBUG("Reading Skeleton");
 
     // Optional blend mode from root node
-    if (HasAttribute("blendmode")) {
-        skeleton->blendMode = (ToLower(ReadAttribute<std::string>("blendmode")) == "cumulative" ? Skeleton::ANIMBLEND_CUMULATIVE : Skeleton::ANIMBLEND_AVERAGE);
+    if (XmlParser::hasAttribute(node, "blendmode")) {
+        skeleton->blendMode = (ToLower(ReadAttribute<std::string>(node, "blendmode")) == "cumulative" ? Skeleton::ANIMBLEND_CUMULATIVE : Skeleton::ANIMBLEND_AVERAGE);
     }
 
-    NextNode();
-
-    // Root level nodes
-    while (m_currentNodeName == nnBones ||
-            m_currentNodeName == nnBoneHierarchy ||
-            m_currentNodeName == nnAnimations ||
-            m_currentNodeName == nnAnimationLinks) {
-        if (m_currentNodeName == nnBones)
-            ReadBones(skeleton);
-        else if (m_currentNodeName == nnBoneHierarchy)
-            ReadBoneHierarchy(skeleton);
-        else if (m_currentNodeName == nnAnimations)
-            ReadAnimations(skeleton);
-        else
-            SkipCurrentNode();
+    for (XmlNode &currentNode : node.children()) {
+        const std::string currentName = currentNode.name();
+        if (currentName == nnBones) {
+            ReadBones(currentNode, skeleton);
+        } else if (currentName == nnBoneHierarchy) {
+            ReadBoneHierarchy(currentNode, skeleton);
+        } else if (currentName == nnAnimations) {
+            ReadAnimations(currentNode, skeleton);
+        }
     }
 }
 
-void OgreXmlSerializer::ReadAnimations(Skeleton *skeleton) {
+void OgreXmlSerializer::ReadAnimations(XmlNode &node, Skeleton *skeleton) {
     if (skeleton->bones.empty()) {
         throw DeadlyImportError("Cannot read <animations> for a Skeleton without bones");
     }
 
     ASSIMP_LOG_VERBOSE_DEBUG("  - Animations");
 
-    NextNode();
-    while (m_currentNodeName == nnAnimation) {
-        Animation *anim = new Animation(skeleton);
-        anim->name = ReadAttribute<std::string>("name");
-        anim->length = ReadAttribute<float>("length");
-
-        if (NextNode() != nnTracks) {
-            throw DeadlyImportError(Formatter::format() << "No <tracks> found in <animation> " << anim->name);
-        }
-
-        ReadAnimationTracks(anim);
-        skeleton->animations.push_back(anim);
-
-        ASSIMP_LOG_VERBOSE_DEBUG_F("    ", anim->name, " (", anim->length, " sec, ", anim->tracks.size(), " tracks)");
-    }
-}
-
-void OgreXmlSerializer::ReadAnimationTracks(Animation *dest) {
-    NextNode();
-    while (m_currentNodeName == nnTrack) {
-        VertexAnimationTrack track;
-        track.type = VertexAnimationTrack::VAT_TRANSFORM;
-        track.boneName = ReadAttribute<std::string>("bone");
-
-        if (NextNode() != nnKeyFrames) {
-            throw DeadlyImportError(Formatter::format() << "No <keyframes> found in <track> " << dest->name);
-        }
-
-        ReadAnimationKeyFrames(dest, &track);
-
-        dest->tracks.push_back(track);
-    }
-}
-
-void OgreXmlSerializer::ReadAnimationKeyFrames(Animation *anim, VertexAnimationTrack *dest) {
-    const aiVector3D zeroVec(0.f, 0.f, 0.f);
-
-    NextNode();
-    while (m_currentNodeName == nnKeyFrame) {
-        TransformKeyFrame keyframe;
-        keyframe.timePos = ReadAttribute<float>("time");
-
-        NextNode();
-        while (m_currentNodeName == nnTranslate || m_currentNodeName == nnRotate || m_currentNodeName == nnScale) {
-            if (m_currentNodeName == nnTranslate) {
-                keyframe.position.x = ReadAttribute<float>(anX);
-                keyframe.position.y = ReadAttribute<float>(anY);
-                keyframe.position.z = ReadAttribute<float>(anZ);
-            } else if (m_currentNodeName == nnRotate) {
-                float angle = ReadAttribute<float>("angle");
-
-                if (NextNode() != nnAxis) {
-                    throw DeadlyImportError("No axis specified for keyframe rotation in animation " + anim->name);
+    for (XmlNode &currentNode : node.children()) {
+        const std::string currentName = currentNode.name();
+        if (currentName == nnAnimation) {
+            Animation *anim = new Animation(skeleton);
+            anim->name = ReadAttribute<std::string>(currentNode, "name");
+            anim->length = ReadAttribute<float>(currentNode, "length");
+            for (XmlNode &currentChildNode : currentNode.children()) {
+                const std::string currentChildName = currentNode.name();
+                if (currentChildName == nnTracks) {
+                    ReadAnimationTracks(currentChildNode, anim);
+                    skeleton->animations.push_back(anim);
+                } else {
+                    throw DeadlyImportError("No <tracks> found in <animation> ", anim->name);
                 }
-
-                aiVector3D axis;
-                axis.x = ReadAttribute<float>(anX);
-                axis.y = ReadAttribute<float>(anY);
-                axis.z = ReadAttribute<float>(anZ);
-                if (axis.Equal(zeroVec)) {
-                    axis.x = 1.0f;
-                    if (angle != 0) {
-                        ASSIMP_LOG_WARN_F("Found invalid a key frame with a zero rotation axis in animation: ", anim->name);
-                    }
-                }
-                keyframe.rotation = aiQuaternion(axis, angle);
-            } else if (m_currentNodeName == nnScale) {
-                keyframe.scale.x = ReadAttribute<float>(anX);
-                keyframe.scale.y = ReadAttribute<float>(anY);
-                keyframe.scale.z = ReadAttribute<float>(anZ);
             }
-
-            NextNode();
         }
+    }
+}
 
+void OgreXmlSerializer::ReadAnimationTracks(XmlNode &node, Animation *dest) {
+    for (XmlNode &currentNode : node.children()) {
+        const std::string currentName = currentNode.name();
+        if (currentName == nnTrack) {
+            VertexAnimationTrack track;
+            track.type = VertexAnimationTrack::VAT_TRANSFORM;
+            track.boneName = ReadAttribute<std::string>(currentNode, "bone");
+            for (XmlNode &currentChildNode : currentNode.children()) {
+                const std::string currentChildName = currentNode.name();
+                if (currentChildName == nnKeyFrames) {
+                    ReadAnimationKeyFrames(currentChildNode, dest, &track);
+                    dest->tracks.push_back(track);
+                } else {
+                    throw DeadlyImportError("No <keyframes> found in <track> ", dest->name);
+                }
+            }
+        }
+    }
+}
+
+void OgreXmlSerializer::ReadAnimationKeyFrames(XmlNode &node, Animation *anim, VertexAnimationTrack *dest) {
+    const aiVector3D zeroVec(0.f, 0.f, 0.f);
+    for (XmlNode &currentNode : node.children()) {
+        TransformKeyFrame keyframe;
+        const std::string currentName = currentNode.name();
+        if (currentName == nnKeyFrame) {
+            keyframe.timePos = ReadAttribute<float>(currentNode, "time");
+            for (XmlNode &currentChildNode : currentNode.children()) {
+                const std::string currentChildName = currentNode.name();
+                if (currentChildName == nnTranslate) {
+                    keyframe.position.x = ReadAttribute<float>(currentChildNode, anX);
+                    keyframe.position.y = ReadAttribute<float>(currentChildNode, anY);
+                    keyframe.position.z = ReadAttribute<float>(currentChildNode, anZ);
+                } else if (currentChildName == nnRotate) {
+                    float angle = ReadAttribute<float>(currentChildNode, "angle");
+                    for (XmlNode &currentChildChildNode : currentNode.children()) {
+                        const std::string currentChildChildName = currentNode.name();
+                        if (currentChildChildName == nnAxis) {
+                            aiVector3D axis;
+                            axis.x = ReadAttribute<float>(currentChildChildNode, anX);
+                            axis.y = ReadAttribute<float>(currentChildChildNode, anY);
+                            axis.z = ReadAttribute<float>(currentChildChildNode, anZ);
+                            if (axis.Equal(zeroVec)) {
+                                axis.x = 1.0f;
+                                if (angle != 0) {
+                                    ASSIMP_LOG_WARN_F("Found invalid a key frame with a zero rotation axis in animation: ", anim->name);
+                                }
+                            }
+                            keyframe.rotation = aiQuaternion(axis, angle);
+                        }
+                    }
+                } else if (currentChildName == nnScale) {
+                    keyframe.scale.x = ReadAttribute<float>(currentChildNode, anX);
+                    keyframe.scale.y = ReadAttribute<float>(currentChildNode, anY);
+                    keyframe.scale.z = ReadAttribute<float>(currentChildNode, anZ);
+                }
+            }
+        }
         dest->transformKeyFrames.push_back(keyframe);
     }
 }
 
-void OgreXmlSerializer::ReadBoneHierarchy(Skeleton *skeleton) {
+void OgreXmlSerializer::ReadBoneHierarchy(XmlNode &node, Skeleton *skeleton) {
     if (skeleton->bones.empty()) {
         throw DeadlyImportError("Cannot read <bonehierarchy> for a Skeleton without bones");
     }
 
-    while (NextNode() == nnBoneParent) {
-        const std::string name = ReadAttribute<std::string>("bone");
-        const std::string parentName = ReadAttribute<std::string>("parent");
+    for (XmlNode &currentNode : node.children()) {
+        const std::string currentName = currentNode.name();
+        if (currentName == nnBoneParent) {
+            const std::string name = ReadAttribute<std::string>(currentNode, "bone");
+            const std::string parentName = ReadAttribute<std::string>(currentNode, "parent");
 
-        Bone *bone = skeleton->BoneByName(name);
-        Bone *parent = skeleton->BoneByName(parentName);
+            Bone *bone = skeleton->BoneByName(name);
+            Bone *parent = skeleton->BoneByName(parentName);
 
-        if (bone && parent)
-            parent->AddChild(bone);
-        else
-            throw DeadlyImportError("Failed to find bones for parenting: Child " + name + " for parent " + parentName);
+            if (bone && parent) {
+                parent->AddChild(bone);
+            } else {
+                throw DeadlyImportError("Failed to find bones for parenting: Child ", name, " for parent ", parentName);
+            }
+        }
     }
 
     // Calculate bone matrices for root bones. Recursively calculates their children.
@@ -792,55 +685,52 @@ static bool BoneCompare(Bone *a, Bone *b) {
     return (a->id < b->id);
 }
 
-void OgreXmlSerializer::ReadBones(Skeleton *skeleton) {
+void OgreXmlSerializer::ReadBones(XmlNode &node, Skeleton *skeleton) {
     ASSIMP_LOG_VERBOSE_DEBUG("  - Bones");
 
-    NextNode();
-    while (m_currentNodeName == nnBone) {
-        Bone *bone = new Bone();
-        bone->id = ReadAttribute<uint16_t>("id");
-        bone->name = ReadAttribute<std::string>("name");
+    for (XmlNode &currentNode : node.children()) {
+        const std::string currentName = currentNode.name();
+        if (currentName == nnBone) {
+            Bone *bone = new Bone();
+            bone->id = ReadAttribute<uint16_t>(currentNode, "id");
+            bone->name = ReadAttribute<std::string>(currentNode, "name");
+            for (XmlNode &currentChildNode : currentNode.children()) {
+                const std::string currentChildName = currentNode.name();
+                if (currentChildName == nnRotation) {
+                    bone->position.x = ReadAttribute<float>(currentChildNode, anX);
+                    bone->position.y = ReadAttribute<float>(currentChildNode, anY);
+                    bone->position.z = ReadAttribute<float>(currentChildNode, anZ);
+                } else if (currentChildName == nnScale) {
+                    float angle = ReadAttribute<float>(currentChildNode, "angle");
+                    for (XmlNode currentChildChildNode : currentChildNode.children()) {
+                        const std::string &currentChildChildName = currentChildChildNode.name();
+                        if (currentChildChildName == nnAxis) {
+                            aiVector3D axis;
+                            axis.x = ReadAttribute<float>(currentChildChildNode, anX);
+                            axis.y = ReadAttribute<float>(currentChildChildNode, anY);
+                            axis.z = ReadAttribute<float>(currentChildChildNode, anZ);
 
-        NextNode();
-        while (m_currentNodeName == nnPosition ||
-                m_currentNodeName == nnRotation ||
-                m_currentNodeName == nnScale) {
-            if (m_currentNodeName == nnPosition) {
-                bone->position.x = ReadAttribute<float>(anX);
-                bone->position.y = ReadAttribute<float>(anY);
-                bone->position.z = ReadAttribute<float>(anZ);
-            } else if (m_currentNodeName == nnRotation) {
-                float angle = ReadAttribute<float>("angle");
-
-                if (NextNode() != nnAxis) {
-                    throw DeadlyImportError(Formatter::format() << "No axis specified for bone rotation in bone " << bone->id);
-                }
-
-                aiVector3D axis;
-                axis.x = ReadAttribute<float>(anX);
-                axis.y = ReadAttribute<float>(anY);
-                axis.z = ReadAttribute<float>(anZ);
-
-                bone->rotation = aiQuaternion(axis, angle);
-            } else if (m_currentNodeName == nnScale) {
-                /// @todo Implement taking scale into account in matrix/pose calculations!
-                if (HasAttribute("factor")) {
-                    float factor = ReadAttribute<float>("factor");
-                    bone->scale.Set(factor, factor, factor);
-                } else {
-                    if (HasAttribute(anX))
-                        bone->scale.x = ReadAttribute<float>(anX);
-                    if (HasAttribute(anY))
-                        bone->scale.y = ReadAttribute<float>(anY);
-                    if (HasAttribute(anZ))
-                        bone->scale.z = ReadAttribute<float>(anZ);
+                            bone->rotation = aiQuaternion(axis, angle);
+                        } else {
+                            throw DeadlyImportError("No axis specified for bone rotation in bone ", bone->id);
+                        }
+                    }
+                } else if (currentChildName == nnScale) {
+                    if (XmlParser::hasAttribute(currentChildNode, "factor")) {
+                        float factor = ReadAttribute<float>(currentChildNode, "factor");
+                        bone->scale.Set(factor, factor, factor);
+                    } else {
+                        if (XmlParser::hasAttribute(currentChildNode, anX))
+                            bone->scale.x = ReadAttribute<float>(currentChildNode, anX);
+                        if (XmlParser::hasAttribute(currentChildNode, anY))
+                            bone->scale.y = ReadAttribute<float>(currentChildNode, anY);
+                        if (XmlParser::hasAttribute(currentChildNode, anZ))
+                            bone->scale.z = ReadAttribute<float>(currentChildNode, anZ);
+                    }
                 }
             }
-
-            NextNode();
+            skeleton->bones.push_back(bone);
         }
-
-        skeleton->bones.push_back(bone);
     }
 
     // Order bones by Id
@@ -854,7 +744,7 @@ void OgreXmlSerializer::ReadBones(Skeleton *skeleton) {
         ASSIMP_LOG_VERBOSE_DEBUG_F("    ", b->id, " ", b->name);
 
         if (b->id != static_cast<uint16_t>(i)) {
-            throw DeadlyImportError(Formatter::format() << "Bone ids are not in sequence starting from 0. Missing index " << i);
+            throw DeadlyImportError("Bone ids are not in sequence starting from 0. Missing index ", i);
         }
     }
 }
diff --git a/code/AssetLib/Ogre/OgreXmlSerializer.h b/code/AssetLib/Ogre/OgreXmlSerializer.h
index e81599f9c..a5a235a98 100644
--- a/code/AssetLib/Ogre/OgreXmlSerializer.h
+++ b/code/AssetLib/Ogre/OgreXmlSerializer.h
@@ -46,73 +46,57 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef ASSIMP_BUILD_NO_OGRE_IMPORTER
 
 #include "OgreStructs.h"
-#include <assimp/irrXMLWrapper.h>
+#include <assimp/XmlParser.h>
 
-namespace Assimp
-{
-namespace Ogre
-{
+namespace Assimp {
 
-typedef irr::io::IrrXMLReader XmlReader;
-typedef std::shared_ptr<XmlReader> XmlReaderPtr;
+namespace Ogre {
 
-class OgreXmlSerializer
-{
+using XmlParserPtr = std::shared_ptr<::Assimp::XmlParser> ;
+
+class OgreXmlSerializer {
 public:
     /// Imports mesh and returns the result.
-    /** @note Fatal unrecoverable errors will throw a DeadlyImportError. */
-    static MeshXml *ImportMesh(XmlReader *reader);
+    /// @note Fatal unrecoverable errors will throw a DeadlyImportError.
+    static MeshXml *ImportMesh(XmlParser *parser);
 
     /// Imports skeleton to @c mesh.
-    /** If mesh does not have a skeleton reference or the skeleton file
-        cannot be found it is not a fatal DeadlyImportError.
-        @return If skeleton import was successful. */
-    static bool ImportSkeleton(Assimp::IOSystem *pIOHandler, MeshXml *mesh);
-    static bool ImportSkeleton(Assimp::IOSystem *pIOHandler, Mesh *mesh);
+    /// If mesh does not have a skeleton reference or the skeleton file
+    /// cannot be found it is not a fatal DeadlyImportError.
+    /// @return If skeleton import was successful.
+    static bool ImportSkeleton(IOSystem *pIOHandler, MeshXml *mesh);
+    static bool ImportSkeleton(IOSystem *pIOHandler, Mesh *mesh);
 
 private:
-    explicit OgreXmlSerializer(XmlReader *reader) :
-        m_reader(reader)
-    {
-    }
+    explicit OgreXmlSerializer(XmlParser *xmlParser);
 
-    static XmlReaderPtr OpenReader(Assimp::IOSystem *pIOHandler, const std::string &filename);
+    static XmlParserPtr OpenXmlParser(Assimp::IOSystem *pIOHandler, const std::string &filename);
 
     // Mesh
     void ReadMesh(MeshXml *mesh);
-    void ReadSubMesh(MeshXml *mesh);
-
-    void ReadGeometry(VertexDataXml *dest);
-    void ReadGeometryVertexBuffer(VertexDataXml *dest);
-
-    void ReadBoneAssignments(VertexDataXml *dest);
+    void ReadSubMesh(XmlNode &node, MeshXml *mesh);
+    void ReadGeometry(XmlNode &node, VertexDataXml *dest);
+    void ReadGeometryVertexBuffer(XmlNode &node, VertexDataXml *dest);
+    void ReadBoneAssignments(XmlNode &node, VertexDataXml *dest);
 
     // Skeleton
-    void ReadSkeleton(Skeleton *skeleton);
+    void ReadSkeleton(XmlNode &node, Skeleton *skeleton);
+    void ReadBones(XmlNode &node, Skeleton *skeleton);
+    void ReadBoneHierarchy(XmlNode &node, Skeleton *skeleton);
+    void ReadAnimations(XmlNode &node, Skeleton *skeleton);
+    void ReadAnimationTracks(XmlNode &node, Animation *dest);
+    void ReadAnimationKeyFrames(XmlNode &node, Animation *anim, VertexAnimationTrack *dest);
 
-    void ReadBones(Skeleton *skeleton);
-    void ReadBoneHierarchy(Skeleton *skeleton);
+    template <typename T>
+    T ReadAttribute(XmlNode &xmlNode, const char *name) const;
 
-    void ReadAnimations(Skeleton *skeleton);
-    void ReadAnimationTracks(Animation *dest);
-    void ReadAnimationKeyFrames(Animation *anim, VertexAnimationTrack *dest);
-
-    template<typename T>
-    T ReadAttribute(const char *name) const;
-    bool HasAttribute(const char *name) const;
-
-    std::string &NextNode();
-    std::string &SkipCurrentNode();
-
-    bool CurrentNodeNameEquals(const std::string &name) const;
-    std::string CurrentNodeName(bool forceRead = false);
-
-    XmlReader *m_reader;
-    std::string m_currentNodeName;
+private:
+    XmlParser *mParser;
 };
 
-} // Ogre
-} // Assimp
+
+} // namespace Ogre
+} // namespace Assimp
 
 #endif // ASSIMP_BUILD_NO_OGRE_IMPORTER
 #endif // AI_OGREXMLSERIALIZER_H_INC
diff --git a/code/AssetLib/OpenGEX/OpenGEXImporter.cpp b/code/AssetLib/OpenGEX/OpenGEXImporter.cpp
index 880303065..a49dbed4e 100644
--- a/code/AssetLib/OpenGEX/OpenGEXImporter.cpp
+++ b/code/AssetLib/OpenGEX/OpenGEXImporter.cpp
@@ -4,7 +4,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -45,13 +44,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "PostProcessing/MakeVerboseFormat.h"
 
 #include <assimp/DefaultIOSystem.h>
-#include <assimp/DefaultLogger.hpp>
 #include <assimp/StringComparison.h>
+#include <assimp/DefaultLogger.hpp>
 
-#include <openddlparser/OpenDDLParser.h>
-#include <assimp/scene.h>
 #include <assimp/ai_assert.h>
 #include <assimp/importerdesc.h>
+#include <assimp/scene.h>
+#include <openddlparser/OpenDDLParser.h>
 
 #include <vector>
 
@@ -69,135 +68,135 @@ static const aiImporterDesc desc = {
 };
 
 namespace Grammar {
-    static const std::string MetricType          = "Metric";
-    static const std::string Metric_DistanceType = "distance";
-    static const std::string Metric_AngleType    = "angle";
-    static const std::string Metric_TimeType     = "time";
-    static const std::string Metric_UpType       = "up";
-    static const std::string NameType            = "Name";
-    static const std::string ObjectRefType       = "ObjectRef";
-    static const std::string MaterialRefType     = "MaterialRef";
-    static const std::string MetricKeyType       = "key";
-    static const std::string GeometryNodeType    = "GeometryNode";
-    static const std::string CameraNodeType      = "CameraNode";
-    static const std::string LightNodeType       = "LightNode";
-    static const std::string GeometryObjectType  = "GeometryObject";
-    static const std::string CameraObjectType    = "CameraObject";
-    static const std::string LightObjectType     = "LightObject";
-    static const std::string TransformType       = "Transform";
-    static const std::string MeshType            = "Mesh";
-    static const std::string VertexArrayType     = "VertexArray";
-    static const std::string IndexArrayType      = "IndexArray";
-    static const std::string MaterialType        = "Material";
-    static const std::string ColorType           = "Color";
-    static const std::string ParamType           = "Param";
-    static const std::string TextureType         = "Texture";
-    static const std::string AttenType           = "Atten";
+static const std::string MetricType = "Metric";
+static const std::string Metric_DistanceType = "distance";
+static const std::string Metric_AngleType = "angle";
+static const std::string Metric_TimeType = "time";
+static const std::string Metric_UpType = "up";
+static const std::string NameType = "Name";
+static const std::string ObjectRefType = "ObjectRef";
+static const std::string MaterialRefType = "MaterialRef";
+static const std::string MetricKeyType = "key";
+static const std::string GeometryNodeType = "GeometryNode";
+static const std::string CameraNodeType = "CameraNode";
+static const std::string LightNodeType = "LightNode";
+static const std::string GeometryObjectType = "GeometryObject";
+static const std::string CameraObjectType = "CameraObject";
+static const std::string LightObjectType = "LightObject";
+static const std::string TransformType = "Transform";
+static const std::string MeshType = "Mesh";
+static const std::string VertexArrayType = "VertexArray";
+static const std::string IndexArrayType = "IndexArray";
+static const std::string MaterialType = "Material";
+static const std::string ColorType = "Color";
+static const std::string ParamType = "Param";
+static const std::string TextureType = "Texture";
+static const std::string AttenType = "Atten";
 
-    static const std::string DiffuseColorToken  = "diffuse";
-    static const std::string SpecularColorToken = "specular";
-    static const std::string EmissionColorToken = "emission";
+static const std::string DiffuseColorToken = "diffuse";
+static const std::string SpecularColorToken = "specular";
+static const std::string EmissionColorToken = "emission";
 
-    static const std::string DiffuseTextureToken         = "diffuse";
-    static const std::string DiffuseSpecularTextureToken = "specular";
-    static const std::string SpecularPowerTextureToken   = "specular_power";
-    static const std::string EmissionTextureToken        = "emission";
-    static const std::string OpacyTextureToken           = "opacity";
-    static const std::string TransparencyTextureToken    = "transparency";
-    static const std::string NormalTextureToken          = "normal";
+static const std::string DiffuseTextureToken = "diffuse";
+static const std::string DiffuseSpecularTextureToken = "specular";
+static const std::string SpecularPowerTextureToken = "specular_power";
+static const std::string EmissionTextureToken = "emission";
+static const std::string OpacyTextureToken = "opacity";
+static const std::string TransparencyTextureToken = "transparency";
+static const std::string NormalTextureToken = "normal";
 
-    enum TokenType {
-        NoneType = -1,
-        MetricToken,
-        NameToken,
-        ObjectRefToken,
-        MaterialRefToken,
-        MetricKeyToken,
-        GeometryNodeToken,
-        CameraNodeToken,
-        LightNodeToken,
-        GeometryObjectToken,
-        CameraObjectToken,
-        LightObjectToken,
-        TransformToken,
-        MeshToken,
-        VertexArrayToken,
-        IndexArrayToken,
-        MaterialToken,
-        ColorToken,
-        ParamToken,
-        TextureToken,
-        AttenToken
-    };
+enum TokenType {
+    NoneType = -1,
+    MetricToken,
+    NameToken,
+    ObjectRefToken,
+    MaterialRefToken,
+    MetricKeyToken,
+    GeometryNodeToken,
+    CameraNodeToken,
+    LightNodeToken,
+    GeometryObjectToken,
+    CameraObjectToken,
+    LightObjectToken,
+    TransformToken,
+    MeshToken,
+    VertexArrayToken,
+    IndexArrayToken,
+    MaterialToken,
+    ColorToken,
+    ParamToken,
+    TextureToken,
+    AttenToken
+};
 
-    static const std::string ValidMetricToken[ 4 ] = {
-        Metric_DistanceType,
-        Metric_AngleType,
-        Metric_TimeType,
-        Metric_UpType
-    };
+static const std::string ValidMetricToken[4] = {
+    Metric_DistanceType,
+    Metric_AngleType,
+    Metric_TimeType,
+    Metric_UpType
+};
 
-    static int isValidMetricType( const char *token ) {
-        if( nullptr == token ) {
-            return false;
-        }
-
-        int idx( -1 );
-        for( size_t i = 0; i < 4; i++ ) {
-            if( ValidMetricToken[ i ] == token ) {
-                idx = (int) i;
-                break;
-            }
-        }
-
-        return idx;
+static int isValidMetricType(const char *token) {
+    if (nullptr == token) {
+        return false;
     }
 
-    static TokenType matchTokenType( const char *tokenType ) {
-        if( MetricType == tokenType ) {
-            return MetricToken;
-        } else if(  NameType == tokenType ) {
-            return NameToken;
-        } else if( ObjectRefType == tokenType ) {
-            return ObjectRefToken;
-        } else if( MaterialRefType == tokenType ) {
-            return MaterialRefToken;
-        } else if( MetricKeyType == tokenType ) {
-            return MetricKeyToken;
-        } else if ( GeometryNodeType == tokenType ) {
-            return GeometryNodeToken;
-        } else if ( CameraNodeType == tokenType ) {
-            return CameraNodeToken;
-        } else if ( LightNodeType == tokenType ) {
-            return LightNodeToken;
-        } else if ( GeometryObjectType == tokenType ) {
-            return GeometryObjectToken;
-        } else if ( CameraObjectType == tokenType ) {
-            return CameraObjectToken;
-        } else if ( LightObjectType == tokenType ) {
-            return LightObjectToken;
-        } else if( TransformType == tokenType ) {
-            return TransformToken;
-        } else if( MeshType == tokenType ) {
-            return MeshToken;
-        } else if( VertexArrayType == tokenType ) {
-            return VertexArrayToken;
-        } else if( IndexArrayType == tokenType ) {
-            return IndexArrayToken;
-        } else if(  MaterialType == tokenType ) {
-            return MaterialToken;
-        } else if ( ColorType == tokenType ) {
-            return ColorToken;
-        } else if ( ParamType == tokenType ) {
-            return ParamToken;
-        } else if(  TextureType == tokenType ) {
-            return TextureToken;
-        } else if ( AttenType == tokenType ) {
-            return AttenToken;
+    int idx(-1);
+    for (size_t i = 0; i < 4; i++) {
+        if (ValidMetricToken[i] == token) {
+            idx = (int)i;
+            break;
         }
-
-        return NoneType;
     }
+
+    return idx;
+}
+
+static TokenType matchTokenType(const char *tokenType) {
+    if (MetricType == tokenType) {
+        return MetricToken;
+    } else if (NameType == tokenType) {
+        return NameToken;
+    } else if (ObjectRefType == tokenType) {
+        return ObjectRefToken;
+    } else if (MaterialRefType == tokenType) {
+        return MaterialRefToken;
+    } else if (MetricKeyType == tokenType) {
+        return MetricKeyToken;
+    } else if (GeometryNodeType == tokenType) {
+        return GeometryNodeToken;
+    } else if (CameraNodeType == tokenType) {
+        return CameraNodeToken;
+    } else if (LightNodeType == tokenType) {
+        return LightNodeToken;
+    } else if (GeometryObjectType == tokenType) {
+        return GeometryObjectToken;
+    } else if (CameraObjectType == tokenType) {
+        return CameraObjectToken;
+    } else if (LightObjectType == tokenType) {
+        return LightObjectToken;
+    } else if (TransformType == tokenType) {
+        return TransformToken;
+    } else if (MeshType == tokenType) {
+        return MeshToken;
+    } else if (VertexArrayType == tokenType) {
+        return VertexArrayToken;
+    } else if (IndexArrayType == tokenType) {
+        return IndexArrayToken;
+    } else if (MaterialType == tokenType) {
+        return MaterialToken;
+    } else if (ColorType == tokenType) {
+        return ColorToken;
+    } else if (ParamType == tokenType) {
+        return ParamToken;
+    } else if (TextureType == tokenType) {
+        return TextureToken;
+    } else if (AttenType == tokenType) {
+        return AttenToken;
+    }
+
+    return NoneType;
+}
 } // Namespace Grammar
 
 namespace Assimp {
@@ -206,30 +205,27 @@ namespace OpenGEX {
 USE_ODDLPARSER_NS
 
 //------------------------------------------------------------------------------------------------
-static void propId2StdString( Property *prop, std::string &name, std::string &key ) {
+static void propId2StdString(Property *prop, std::string &name, std::string &key) {
     name = key = "";
-    if ( nullptr == prop ) {
+    if (nullptr == prop) {
         return;
     }
 
-    if ( nullptr != prop->m_key ) {
+    if (nullptr != prop->m_key) {
 #ifdef ASSIMP_USE_HUNTER
         name = prop->m_key->m_text.m_buffer;
 #else
         name = prop->m_key->m_buffer;
 #endif
-        if ( Value::ddl_string == prop->m_value->m_type ) {
+        if (Value::ValueType::ddl_string == prop->m_value->m_type) {
             key = prop->m_value->getString();
         }
     }
 }
 
 //------------------------------------------------------------------------------------------------
-OpenGEXImporter::VertexContainer::VertexContainer()
-: m_numColors( 0 )
-, m_colors( nullptr )
-, m_numUVComps()
-, m_textureCoords() {
+OpenGEXImporter::VertexContainer::VertexContainer() :
+        m_numColors(0), m_colors(nullptr), m_numUVComps(), m_textureCoords() {
     // empty
 }
 
@@ -237,16 +233,16 @@ OpenGEXImporter::VertexContainer::VertexContainer()
 OpenGEXImporter::VertexContainer::~VertexContainer() {
     delete[] m_colors;
 
-    for(auto &texcoords : m_textureCoords) {
-        delete [] texcoords;
+    for (auto &texcoords : m_textureCoords) {
+        delete[] texcoords;
     }
 }
 
 //------------------------------------------------------------------------------------------------
-OpenGEXImporter::RefInfo::RefInfo( aiNode *node, Type type, std::vector<std::string> &names )
-: m_node( node )
-, m_type( type )
-, m_Names( names ) {
+OpenGEXImporter::RefInfo::RefInfo(aiNode *node, Type type, std::vector<std::string> &names) :
+        m_node(node),
+        m_type(type),
+        m_Names(names) {
     // empty
 }
 
@@ -256,26 +252,26 @@ OpenGEXImporter::RefInfo::~RefInfo() {
 }
 
 //------------------------------------------------------------------------------------------------
-OpenGEXImporter::OpenGEXImporter()
-: m_root( nullptr )
-, m_nodeChildMap()
-, m_meshCache()
-, m_mesh2refMap()
-, m_material2refMap()
-, m_ctx( nullptr )
-, m_metrics()
-, m_currentNode( nullptr )
-, m_currentVertices()
-, m_currentMesh( nullptr )
-, m_currentMaterial( nullptr )
-, m_currentLight( nullptr )
-, m_currentCamera( nullptr )
-, m_tokenType( Grammar::NoneType )
-, m_materialCache()
-, m_cameraCache()
-, m_lightCache()
-, m_nodeStack()
-, m_unresolvedRefStack() {
+OpenGEXImporter::OpenGEXImporter() :
+        m_root(nullptr),
+        m_nodeChildMap(),
+        m_meshCache(),
+        m_mesh2refMap(),
+        m_material2refMap(),
+        m_ctx(nullptr),
+        m_metrics(),
+        m_currentNode(nullptr),
+        m_currentVertices(),
+        m_currentMesh(nullptr),
+        m_currentMaterial(nullptr),
+        m_currentLight(nullptr),
+        m_currentCamera(nullptr),
+        m_tokenType(Grammar::NoneType),
+        m_materialCache(),
+        m_cameraCache(),
+        m_lightCache(),
+        m_nodeStack(),
+        m_unresolvedRefStack() {
     // empty
 }
 
@@ -285,46 +281,46 @@ OpenGEXImporter::~OpenGEXImporter() {
 }
 
 //------------------------------------------------------------------------------------------------
-bool OpenGEXImporter::CanRead( const std::string &file, IOSystem *pIOHandler, bool checkSig ) const {
-    bool canRead( false );
-    if( !checkSig ) {
-        canRead = SimpleExtensionCheck( file, "ogex" );
+bool OpenGEXImporter::CanRead(const std::string &file, IOSystem *pIOHandler, bool checkSig) const {
+    bool canRead(false);
+    if (!checkSig) {
+        canRead = SimpleExtensionCheck(file, "ogex");
     } else {
         static const char *token[] = { "Metric", "GeometryNode", "VertexArray (attrib", "IndexArray" };
-        canRead = BaseImporter::SearchFileHeaderForToken( pIOHandler, file, token, 4 );
+        canRead = BaseImporter::SearchFileHeaderForToken(pIOHandler, file, token, 4);
     }
 
     return canRead;
 }
 
 //------------------------------------------------------------------------------------------------
-void OpenGEXImporter::InternReadFile( const std::string &filename, aiScene *pScene, IOSystem *pIOHandler ) {
+void OpenGEXImporter::InternReadFile(const std::string &filename, aiScene *pScene, IOSystem *pIOHandler) {
     // open source file
-    IOStream *file = pIOHandler->Open( filename, "rb" );
-    if( !file ) {
-        throw DeadlyImportError( "Failed to open file " + filename );
+    IOStream *file = pIOHandler->Open(filename, "rb");
+    if (!file) {
+        throw DeadlyImportError("Failed to open file ", filename);
     }
 
     std::vector<char> buffer;
-    TextFileToBuffer( file, buffer );
-    pIOHandler->Close( file );
+    TextFileToBuffer(file, buffer);
+    pIOHandler->Close(file);
 
     OpenDDLParser myParser;
-    myParser.setBuffer( &buffer[ 0 ], buffer.size() );
-    bool success( myParser.parse() );
-    if( success ) {
+    myParser.setBuffer(&buffer[0], buffer.size());
+    bool success(myParser.parse());
+    if (success) {
         m_ctx = myParser.getContext();
         pScene->mRootNode = new aiNode;
-        pScene->mRootNode->mName.Set( filename );
-        handleNodes( m_ctx->m_root, pScene );
+        pScene->mRootNode->mName.Set(filename);
+        handleNodes(m_ctx->m_root, pScene);
     }
 
-    copyMeshes( pScene );
-    copyCameras( pScene );
-    copyLights( pScene );
-    copyMaterials( pScene );
+    copyMeshes(pScene);
+    copyCameras(pScene);
+    copyLights(pScene);
+    copyMaterials(pScene);
     resolveReferences();
-    createNodeTree( pScene );
+    createNodeTree(pScene);
 }
 
 //------------------------------------------------------------------------------------------------
@@ -333,130 +329,130 @@ const aiImporterDesc *OpenGEXImporter::GetInfo() const {
 }
 
 //------------------------------------------------------------------------------------------------
-void OpenGEXImporter::SetupProperties( const Importer *pImp ) {
-    if( nullptr == pImp ) {
+void OpenGEXImporter::SetupProperties(const Importer *pImp) {
+    if (nullptr == pImp) {
         return;
     }
 }
 
 //------------------------------------------------------------------------------------------------
-void OpenGEXImporter::handleNodes( DDLNode *node, aiScene *pScene ) {
-    if( nullptr == node ) {
+void OpenGEXImporter::handleNodes(DDLNode *node, aiScene *pScene) {
+    if (nullptr == node) {
         return;
     }
 
     DDLNode::DllNodeList childs = node->getChildNodeList();
-    for( DDLNode::DllNodeList::iterator it = childs.begin(); it != childs.end(); ++it ) {
-        Grammar::TokenType tokenType( Grammar::matchTokenType( ( *it )->getType().c_str() ) );
-        switch( tokenType ) {
-            case Grammar::MetricToken:
-                handleMetricNode( *it, pScene );
-                break;
+    for (DDLNode::DllNodeList::iterator it = childs.begin(); it != childs.end(); ++it) {
+        Grammar::TokenType tokenType(Grammar::matchTokenType((*it)->getType().c_str()));
+        switch (tokenType) {
+        case Grammar::MetricToken:
+            handleMetricNode(*it, pScene);
+            break;
 
-            case Grammar::NameToken:
-                handleNameNode( *it, pScene );
-                break;
+        case Grammar::NameToken:
+            handleNameNode(*it, pScene);
+            break;
 
-            case Grammar::ObjectRefToken:
-                handleObjectRefNode( *it, pScene );
-                break;
+        case Grammar::ObjectRefToken:
+            handleObjectRefNode(*it, pScene);
+            break;
 
-            case Grammar::MaterialRefToken:
-                handleMaterialRefNode( *it, pScene );
-                break;
+        case Grammar::MaterialRefToken:
+            handleMaterialRefNode(*it, pScene);
+            break;
 
-            case Grammar::MetricKeyToken:
-                break;
+        case Grammar::MetricKeyToken:
+            break;
 
-            case Grammar::GeometryNodeToken:
-                handleGeometryNode( *it, pScene );
-                break;
+        case Grammar::GeometryNodeToken:
+            handleGeometryNode(*it, pScene);
+            break;
 
-            case Grammar::CameraNodeToken:
-                handleCameraNode( *it, pScene );
-                break;
+        case Grammar::CameraNodeToken:
+            handleCameraNode(*it, pScene);
+            break;
 
-            case Grammar::LightNodeToken:
-                handleLightNode( *it, pScene );
-                break;
+        case Grammar::LightNodeToken:
+            handleLightNode(*it, pScene);
+            break;
 
-            case Grammar::GeometryObjectToken:
-                handleGeometryObject( *it, pScene );
-                break;
+        case Grammar::GeometryObjectToken:
+            handleGeometryObject(*it, pScene);
+            break;
 
-            case Grammar::CameraObjectToken:
-                handleCameraObject( *it, pScene );
-                break;
+        case Grammar::CameraObjectToken:
+            handleCameraObject(*it, pScene);
+            break;
 
-            case Grammar::LightObjectToken:
-                handleLightObject( *it, pScene );
-                break;
+        case Grammar::LightObjectToken:
+            handleLightObject(*it, pScene);
+            break;
 
-            case Grammar::TransformToken:
-                handleTransformNode( *it, pScene );
-                break;
+        case Grammar::TransformToken:
+            handleTransformNode(*it, pScene);
+            break;
 
-            case Grammar::MeshToken:
-                handleMeshNode( *it, pScene );
-                break;
+        case Grammar::MeshToken:
+            handleMeshNode(*it, pScene);
+            break;
 
-            case Grammar::VertexArrayToken:
-                handleVertexArrayNode( *it, pScene );
-                break;
+        case Grammar::VertexArrayToken:
+            handleVertexArrayNode(*it, pScene);
+            break;
 
-            case Grammar::IndexArrayToken:
-                handleIndexArrayNode( *it, pScene );
-                break;
+        case Grammar::IndexArrayToken:
+            handleIndexArrayNode(*it, pScene);
+            break;
 
-            case Grammar::MaterialToken:
-                handleMaterialNode( *it, pScene );
-                break;
+        case Grammar::MaterialToken:
+            handleMaterialNode(*it, pScene);
+            break;
 
-            case Grammar::ColorToken:
-                handleColorNode( *it, pScene );
-                break;
+        case Grammar::ColorToken:
+            handleColorNode(*it, pScene);
+            break;
 
-            case Grammar::ParamToken:
-                handleParamNode( *it, pScene );
-                break;
+        case Grammar::ParamToken:
+            handleParamNode(*it, pScene);
+            break;
 
-            case Grammar::TextureToken:
-                handleTextureNode( *it, pScene );
-                break;
+        case Grammar::TextureToken:
+            handleTextureNode(*it, pScene);
+            break;
 
-            default:
-                break;
+        default:
+            break;
         }
     }
 }
 
 //------------------------------------------------------------------------------------------------
-void OpenGEXImporter::handleMetricNode( DDLNode *node, aiScene * /*pScene*/ ) {
-    if( nullptr == node || nullptr == m_ctx ) {
+void OpenGEXImporter::handleMetricNode(DDLNode *node, aiScene * /*pScene*/) {
+    if (nullptr == node || nullptr == m_ctx) {
         return;
     }
 
-    if( m_ctx->m_root != node->getParent() ) {
+    if (m_ctx->m_root != node->getParent()) {
         return;
     }
 
-    Property *prop( node->getProperties() );
-    while( nullptr != prop ) {
-        if( nullptr != prop->m_key ) {
-            if( Value::ddl_string == prop->m_value->m_type ) {
-                std::string valName( ( char* ) prop->m_value->m_data );
-                int type( Grammar::isValidMetricType( valName.c_str() ) );
-                if( Grammar::NoneType != type ) {
-                    Value *val( node->getValue() );
-                    if( nullptr != val ) {
-                        if( Value::ddl_float == val->m_type ) {
-                            m_metrics[ type ].m_floatValue = val->getFloat();
-                        } else if( Value::ddl_int32 == val->m_type ) {
-                            m_metrics[ type ].m_intValue = val->getInt32();
-                        } else if( Value::ddl_string == val->m_type ) {
-                            m_metrics[type].m_stringValue = std::string( val->getString() );
+    Property *prop(node->getProperties());
+    while (nullptr != prop) {
+        if (nullptr != prop->m_key) {
+            if (Value::ValueType::ddl_string == prop->m_value->m_type) {
+                std::string valName((char *)prop->m_value->m_data);
+                int type(Grammar::isValidMetricType(valName.c_str()));
+                if (Grammar::NoneType != type) {
+                    Value *val(node->getValue());
+                    if (nullptr != val) {
+                        if (Value::ValueType::ddl_float == val->m_type) {
+                            m_metrics[type].m_floatValue = val->getFloat();
+                        } else if (Value::ValueType::ddl_int32 == val->m_type) {
+                            m_metrics[type].m_intValue = val->getInt32();
+                        } else if (Value::ValueType::ddl_string == val->m_type) {
+                            m_metrics[type].m_stringValue = std::string(val->getString());
                         } else {
-                            throw DeadlyImportError( "OpenGEX: invalid data type for Metric node." );
+                            throw DeadlyImportError("OpenGEX: invalid data type for Metric node.");
                         }
                     }
                 }
@@ -467,48 +463,47 @@ void OpenGEXImporter::handleMetricNode( DDLNode *node, aiScene * /*pScene*/ ) {
 }
 
 //------------------------------------------------------------------------------------------------
-void OpenGEXImporter::handleNameNode( DDLNode *node, aiScene * /*pScene*/ ) {
-    if( nullptr == m_currentNode ) {
-        throw DeadlyImportError( "No current node for name." );
+void OpenGEXImporter::handleNameNode(DDLNode *node, aiScene * /*pScene*/) {
+    if (nullptr == m_currentNode) {
+        throw DeadlyImportError("No current node for name.");
         return;
     }
 
-    Value *val( node->getValue() );
-    if( nullptr != val ) {
-        if( Value::ddl_string != val->m_type ) {
-            throw DeadlyImportError( "OpenGEX: invalid data type for value in node name." );
+    Value *val(node->getValue());
+    if (nullptr != val) {
+        if (Value::ValueType::ddl_string != val->m_type) {
+            throw DeadlyImportError("OpenGEX: invalid data type for value in node name.");
             return;
         }
 
-        const std::string name( val->getString() );
-        if( m_tokenType == Grammar::GeometryNodeToken || m_tokenType == Grammar::LightNodeToken
-                || m_tokenType == Grammar::CameraNodeToken ) {
-            m_currentNode->mName.Set( name.c_str() );
-        } else if( m_tokenType == Grammar::MaterialToken ) {
+        const std::string name(val->getString());
+        if (m_tokenType == Grammar::GeometryNodeToken || m_tokenType == Grammar::LightNodeToken || m_tokenType == Grammar::CameraNodeToken) {
+            m_currentNode->mName.Set(name.c_str());
+        } else if (m_tokenType == Grammar::MaterialToken) {
             aiString aiName;
-            aiName.Set( name );
-            m_currentMaterial->AddProperty( &aiName, AI_MATKEY_NAME );
-            m_material2refMap[ name ] = m_materialCache.size() - 1;
+            aiName.Set(name);
+            m_currentMaterial->AddProperty(&aiName, AI_MATKEY_NAME);
+            m_material2refMap[name] = m_materialCache.size() - 1;
         }
     }
 }
 
 //------------------------------------------------------------------------------------------------
-static void getRefNames( DDLNode *node, std::vector<std::string> &names ) {
-    ai_assert( nullptr != node );
+static void getRefNames(DDLNode *node, std::vector<std::string> &names) {
+    ai_assert(nullptr != node);
 
     Reference *ref = node->getReferences();
-    if( nullptr != ref ) {
-        for( size_t i = 0; i < ref->m_numRefs; i++ )  {
-            Name *currentName( ref->m_referencedName[ i ] );
-            if( nullptr != currentName && nullptr != currentName->m_id ) {
+    if (nullptr != ref) {
+        for (size_t i = 0; i < ref->m_numRefs; i++) {
+            Name *currentName(ref->m_referencedName[i]);
+            if (nullptr != currentName && nullptr != currentName->m_id) {
 #ifdef ASSIMP_USE_HUNTER
-                const std::string name( currentName->m_id->m_text.m_buffer );
+                const std::string name(currentName->m_id->m_text.m_buffer);
 #else
-                const std::string name( currentName->m_id->m_buffer );
+                const std::string name(currentName->m_id->m_buffer);
 #endif
-                if( !name.empty() ) {
-                    names.push_back( name );
+                if (!name.empty()) {
+                    names.push_back(name);
                 }
             }
         }
@@ -516,218 +511,218 @@ static void getRefNames( DDLNode *node, std::vector<std::string> &names ) {
 }
 
 //------------------------------------------------------------------------------------------------
-void OpenGEXImporter::handleObjectRefNode( DDLNode *node, aiScene * /*pScene*/ ) {
-    if( nullptr == m_currentNode ) {
-        throw DeadlyImportError( "No parent node for name." );
+void OpenGEXImporter::handleObjectRefNode(DDLNode *node, aiScene * /*pScene*/) {
+    if (nullptr == m_currentNode) {
+        throw DeadlyImportError("No parent node for name.");
         return;
     }
 
     std::vector<std::string> objRefNames;
-    getRefNames( node, objRefNames );
+    getRefNames(node, objRefNames);
 
     // when we are dealing with a geometry node prepare the mesh cache
-    if ( m_tokenType == Grammar::GeometryNodeToken ) {
+    if (m_tokenType == Grammar::GeometryNodeToken) {
         m_currentNode->mNumMeshes = static_cast<unsigned int>(objRefNames.size());
-        m_currentNode->mMeshes = new unsigned int[ objRefNames.size() ];
-        if ( !objRefNames.empty() ) {
-            m_unresolvedRefStack.push_back( std::unique_ptr<RefInfo>( new RefInfo( m_currentNode, RefInfo::MeshRef, objRefNames ) ) );
+        m_currentNode->mMeshes = new unsigned int[objRefNames.size()];
+        if (!objRefNames.empty()) {
+            m_unresolvedRefStack.push_back(std::unique_ptr<RefInfo>(new RefInfo(m_currentNode, RefInfo::MeshRef, objRefNames)));
         }
-    } else if ( m_tokenType == Grammar::LightNodeToken ) {
+    } else if (m_tokenType == Grammar::LightNodeToken) {
         // TODO!
-    } else if ( m_tokenType == Grammar::CameraNodeToken ) {
+    } else if (m_tokenType == Grammar::CameraNodeToken) {
         // TODO!
     }
 }
 
 //------------------------------------------------------------------------------------------------
-void OpenGEXImporter::handleMaterialRefNode( ODDLParser::DDLNode *node, aiScene * /*pScene*/ ) {
-    if( nullptr == m_currentNode ) {
-        throw DeadlyImportError( "No parent node for name." );
+void OpenGEXImporter::handleMaterialRefNode(ODDLParser::DDLNode *node, aiScene * /*pScene*/) {
+    if (nullptr == m_currentNode) {
+        throw DeadlyImportError("No parent node for name.");
         return;
     }
 
     std::vector<std::string> matRefNames;
-    getRefNames( node, matRefNames );
-    if( !matRefNames.empty() ) {
-        m_unresolvedRefStack.push_back( std::unique_ptr<RefInfo>( new RefInfo( m_currentNode, RefInfo::MaterialRef, matRefNames ) ) );
+    getRefNames(node, matRefNames);
+    if (!matRefNames.empty()) {
+        m_unresolvedRefStack.push_back(std::unique_ptr<RefInfo>(new RefInfo(m_currentNode, RefInfo::MaterialRef, matRefNames)));
     }
 }
 
 //------------------------------------------------------------------------------------------------
-void OpenGEXImporter::handleGeometryNode( DDLNode *node, aiScene *pScene ) {
+void OpenGEXImporter::handleGeometryNode(DDLNode *node, aiScene *pScene) {
     aiNode *newNode = new aiNode;
-    pushNode( newNode, pScene );
+    pushNode(newNode, pScene);
     m_tokenType = Grammar::GeometryNodeToken;
     m_currentNode = newNode;
-    handleNodes( node, pScene );
+    handleNodes(node, pScene);
 
     popNode();
 }
 
 //------------------------------------------------------------------------------------------------
-void OpenGEXImporter::handleCameraNode( DDLNode *node, aiScene *pScene ) {
-    aiCamera *camera( new aiCamera );
-    m_cameraCache.push_back( camera );
+void OpenGEXImporter::handleCameraNode(DDLNode *node, aiScene *pScene) {
+    aiCamera *camera(new aiCamera);
+    m_cameraCache.push_back(camera);
     m_currentCamera = camera;
 
     aiNode *newNode = new aiNode;
-    pushNode( newNode, pScene );
+    pushNode(newNode, pScene);
     m_tokenType = Grammar::CameraNodeToken;
     m_currentNode = newNode;
 
-    handleNodes( node, pScene );
+    handleNodes(node, pScene);
 
     popNode();
 
-    m_currentCamera->mName.Set( newNode->mName.C_Str() );
+    m_currentCamera->mName.Set(newNode->mName.C_Str());
 }
 
 //------------------------------------------------------------------------------------------------
-void OpenGEXImporter::handleLightNode( ODDLParser::DDLNode *node, aiScene *pScene ) {
-    aiLight *light( new aiLight );
-    m_lightCache.push_back( light );
+void OpenGEXImporter::handleLightNode(ODDLParser::DDLNode *node, aiScene *pScene) {
+    aiLight *light(new aiLight);
+    m_lightCache.push_back(light);
     m_currentLight = light;
 
     aiNode *newNode = new aiNode;
     m_tokenType = Grammar::LightNodeToken;
     m_currentNode = newNode;
-    pushNode( newNode, pScene );
+    pushNode(newNode, pScene);
 
-    handleNodes( node, pScene );
+    handleNodes(node, pScene);
 
     popNode();
 
-    m_currentLight->mName.Set( newNode->mName.C_Str() );
+    m_currentLight->mName.Set(newNode->mName.C_Str());
 }
 
 //------------------------------------------------------------------------------------------------
-void OpenGEXImporter::handleGeometryObject( DDLNode *node, aiScene *pScene ) {
+void OpenGEXImporter::handleGeometryObject(DDLNode *node, aiScene *pScene) {
     // parameters will be parsed normally in the tree, so just go for it
-    handleNodes( node, pScene );
+    handleNodes(node, pScene);
 }
 
 //------------------------------------------------------------------------------------------------
-void OpenGEXImporter::handleCameraObject( ODDLParser::DDLNode *node, aiScene *pScene ) {
+void OpenGEXImporter::handleCameraObject(ODDLParser::DDLNode *node, aiScene *pScene) {
     // parameters will be parsed normally in the tree, so just go for it
 
-    handleNodes( node, pScene );
+    handleNodes(node, pScene);
 }
 
 //------------------------------------------------------------------------------------------------
-void OpenGEXImporter::handleLightObject( ODDLParser::DDLNode *node, aiScene *pScene ) {
-    aiLight *light( new aiLight );
-    m_lightCache.push_back( light );
+void OpenGEXImporter::handleLightObject(ODDLParser::DDLNode *node, aiScene *pScene) {
+    aiLight *light(new aiLight);
+    m_lightCache.push_back(light);
     std::string objName = node->getName();
-    if ( !objName.empty() ) {
-        light->mName.Set( objName );
+    if (!objName.empty()) {
+        light->mName.Set(objName);
     }
     m_currentLight = light;
 
-    Property *prop( node->findPropertyByName( "type" ) );
-    if ( nullptr != prop ) {
-        if ( nullptr != prop->m_value ) {
-            std::string typeStr( prop->m_value->getString() );
-            if ( "point" == typeStr ) {
+    Property *prop(node->findPropertyByName("type"));
+    if (nullptr != prop) {
+        if (nullptr != prop->m_value) {
+            std::string typeStr(prop->m_value->getString());
+            if ("point" == typeStr) {
                 m_currentLight->mType = aiLightSource_POINT;
-            } else if ( "spot" == typeStr ) {
+            } else if ("spot" == typeStr) {
                 m_currentLight->mType = aiLightSource_SPOT;
-            } else if ( "infinite" == typeStr ) {
+            } else if ("infinite" == typeStr) {
                 m_currentLight->mType = aiLightSource_DIRECTIONAL;
             }
         }
     }
 
     // parameters will be parsed normally in the tree, so just go for it
-    handleNodes( node, pScene );
+    handleNodes(node, pScene);
 }
 
 //------------------------------------------------------------------------------------------------
-static void setMatrix( aiNode *node, DataArrayList *transformData ) {
-    ai_assert( nullptr != node );
-    ai_assert( nullptr != transformData );
+static void setMatrix(aiNode *node, DataArrayList *transformData) {
+    ai_assert(nullptr != node);
+    ai_assert(nullptr != transformData);
 
-    float m[ 16 ];
-    size_t i( 1 );
-    Value *next( transformData->m_dataList->m_next );
-    m[ 0 ] = transformData->m_dataList->getFloat();
-    while(  next != nullptr ) {
-        m[ i ] = next->getFloat();
+    float m[16];
+    size_t i(1);
+    Value *next(transformData->m_dataList->m_next);
+    m[0] = transformData->m_dataList->getFloat();
+    while (next != nullptr) {
+        m[i] = next->getFloat();
         next = next->m_next;
         i++;
     }
 
     ai_assert(i == 16);
 
-    node->mTransformation.a1 = m[ 0 ];
-    node->mTransformation.a2 = m[ 4 ];
-    node->mTransformation.a3 = m[ 8 ];
-    node->mTransformation.a4 = m[ 12 ];
+    node->mTransformation.a1 = m[0];
+    node->mTransformation.a2 = m[4];
+    node->mTransformation.a3 = m[8];
+    node->mTransformation.a4 = m[12];
 
-    node->mTransformation.b1 = m[ 1 ];
-    node->mTransformation.b2 = m[ 5 ];
-    node->mTransformation.b3 = m[ 9 ];
-    node->mTransformation.b4 = m[ 13 ];
+    node->mTransformation.b1 = m[1];
+    node->mTransformation.b2 = m[5];
+    node->mTransformation.b3 = m[9];
+    node->mTransformation.b4 = m[13];
 
-    node->mTransformation.c1 = m[ 2 ];
-    node->mTransformation.c2 = m[ 6 ];
-    node->mTransformation.c3 = m[ 10 ];
-    node->mTransformation.c4 = m[ 14 ];
+    node->mTransformation.c1 = m[2];
+    node->mTransformation.c2 = m[6];
+    node->mTransformation.c3 = m[10];
+    node->mTransformation.c4 = m[14];
 
-    node->mTransformation.d1 = m[ 3 ];
-    node->mTransformation.d2 = m[ 7 ];
-    node->mTransformation.d3 = m[ 11 ];
-    node->mTransformation.d4 = m[ 15 ];
+    node->mTransformation.d1 = m[3];
+    node->mTransformation.d2 = m[7];
+    node->mTransformation.d3 = m[11];
+    node->mTransformation.d4 = m[15];
 }
 
 //------------------------------------------------------------------------------------------------
-void OpenGEXImporter::handleTransformNode( ODDLParser::DDLNode *node, aiScene * /*pScene*/ ) {
-    if( nullptr == m_currentNode ) {
-        throw DeadlyImportError( "No parent node for name." );
+void OpenGEXImporter::handleTransformNode(ODDLParser::DDLNode *node, aiScene * /*pScene*/) {
+    if (nullptr == m_currentNode) {
+        throw DeadlyImportError("No parent node for name.");
         return;
     }
 
-    DataArrayList *transformData( node->getDataArrayList() );
-    if( nullptr != transformData ) {
-        if( transformData->m_numItems != 16 ) {
-            throw DeadlyImportError( "Invalid number of data for transform matrix." );
+    DataArrayList *transformData(node->getDataArrayList());
+    if (nullptr != transformData) {
+        if (transformData->m_numItems != 16) {
+            throw DeadlyImportError("Invalid number of data for transform matrix.");
             return;
         }
-        setMatrix( m_currentNode, transformData );
+        setMatrix(m_currentNode, transformData);
     }
 }
 
 //------------------------------------------------------------------------------------------------
-void OpenGEXImporter::handleMeshNode( ODDLParser::DDLNode *node, aiScene *pScene ) {
+void OpenGEXImporter::handleMeshNode(ODDLParser::DDLNode *node, aiScene *pScene) {
     m_currentMesh = new aiMesh;
-    const size_t meshidx( m_meshCache.size() );
+    const size_t meshidx(m_meshCache.size());
     // ownership is transferred but a reference remains in m_currentMesh
-    m_meshCache.emplace_back( m_currentMesh );
+    m_meshCache.emplace_back(m_currentMesh);
 
     Property *prop = node->getProperties();
-    if( nullptr != prop ) {
+    if (nullptr != prop) {
         std::string propName, propKey;
-        propId2StdString( prop, propName, propKey );
-        if( "primitive" == propName ) {
-            if ( "points" == propKey ) {
+        propId2StdString(prop, propName, propKey);
+        if ("primitive" == propName) {
+            if ("points" == propKey) {
                 m_currentMesh->mPrimitiveTypes |= aiPrimitiveType_POINT;
-            } else if ( "lines" == propKey ) {
+            } else if ("lines" == propKey) {
                 m_currentMesh->mPrimitiveTypes |= aiPrimitiveType_LINE;
-            } else if( "triangles" == propKey ) {
+            } else if ("triangles" == propKey) {
                 m_currentMesh->mPrimitiveTypes |= aiPrimitiveType_TRIANGLE;
-            } else if ( "quads" == propKey ) {
+            } else if ("quads" == propKey) {
                 m_currentMesh->mPrimitiveTypes |= aiPrimitiveType_POLYGON;
             } else {
-                ASSIMP_LOG_WARN_F( propKey, " is not supported primitive type." );
+                ASSIMP_LOG_WARN_F(propKey, " is not supported primitive type.");
             }
         }
     }
 
-    handleNodes( node, pScene );
+    handleNodes(node, pScene);
 
-    DDLNode *parent( node->getParent() );
-    if( nullptr != parent ) {
+    DDLNode *parent(node->getParent());
+    if (nullptr != parent) {
         const std::string &name = parent->getName();
-        m_mesh2refMap[ name ] = meshidx;
+        m_mesh2refMap[name] = meshidx;
     }
 }
 
@@ -746,16 +741,16 @@ static const std::string NormalToken = "normal";
 static const std::string TexCoordToken = "texcoord";
 
 //------------------------------------------------------------------------------------------------
-static MeshAttribute getAttributeByName( const char *attribName ) {
-    ai_assert( nullptr != attribName  );
+static MeshAttribute getAttributeByName(const char *attribName) {
+    ai_assert(nullptr != attribName);
 
-    if ( 0 == strncmp( PosToken.c_str(), attribName, PosToken.size() ) ) {
+    if (0 == strncmp(PosToken.c_str(), attribName, PosToken.size())) {
         return Position;
-    } else if ( 0 == strncmp( ColToken.c_str(), attribName, ColToken.size() ) ) {
+    } else if (0 == strncmp(ColToken.c_str(), attribName, ColToken.size())) {
         return Color;
-    } else if( 0 == strncmp( NormalToken.c_str(), attribName, NormalToken.size() ) ) {
+    } else if (0 == strncmp(NormalToken.c_str(), attribName, NormalToken.size())) {
         return Normal;
-    } else if( 0 == strncmp( TexCoordToken.c_str(), attribName, TexCoordToken.size() ) ) {
+    } else if (0 == strncmp(TexCoordToken.c_str(), attribName, TexCoordToken.size())) {
         return TexCoord;
     }
 
@@ -763,60 +758,60 @@ static MeshAttribute getAttributeByName( const char *attribName ) {
 }
 
 //------------------------------------------------------------------------------------------------
-static void fillVector3( aiVector3D *vec3, Value *vals ) {
-    ai_assert( nullptr != vec3 );
-    ai_assert( nullptr != vals );
+static void fillVector3(aiVector3D *vec3, Value *vals) {
+    ai_assert(nullptr != vec3);
+    ai_assert(nullptr != vals);
 
-    float x( 0.0f ), y( 0.0f ), z( 0.0f );
-    Value *next( vals );
+    float x(0.0f), y(0.0f), z(0.0f);
+    Value *next(vals);
     x = next->getFloat();
     next = next->m_next;
     y = next->getFloat();
     next = next->m_next;
-    if( nullptr != next ) {
+    if (nullptr != next) {
         z = next->getFloat();
     }
 
-    vec3->Set( x, y, z );
+    vec3->Set(x, y, z);
 }
 
 //------------------------------------------------------------------------------------------------
-static void fillColor4( aiColor4D *col4, Value *vals ) {
-    ai_assert( nullptr != col4 );
-    ai_assert( nullptr != vals );
+static void fillColor4(aiColor4D *col4, Value *vals) {
+    ai_assert(nullptr != col4);
+    ai_assert(nullptr != vals);
 
-    Value *next( vals );
+    Value *next(vals);
     col4->r = next->getFloat();
     next = next->m_next;
     if (!next) {
-        throw DeadlyImportError( "OpenGEX: Not enough values to fill 4-element color, only 1" );
+        throw DeadlyImportError("OpenGEX: Not enough values to fill 4-element color, only 1");
     }
 
     col4->g = next->getFloat();
     next = next->m_next;
     if (!next) {
-        throw DeadlyImportError( "OpenGEX: Not enough values to fill 4-element color, only 2" );
+        throw DeadlyImportError("OpenGEX: Not enough values to fill 4-element color, only 2");
     }
 
     col4->b = next->getFloat();
     next = next->m_next;
     if (!next) {
-        throw DeadlyImportError( "OpenGEX: Not enough values to fill 4-element color, only 3" );
+        throw DeadlyImportError("OpenGEX: Not enough values to fill 4-element color, only 3");
     }
 
     col4->a = next->getFloat();
 }
 
 //------------------------------------------------------------------------------------------------
-static size_t countDataArrayListItems( DataArrayList *vaList ) {
-    size_t numItems( 0 );
-    if( nullptr == vaList ) {
+static size_t countDataArrayListItems(DataArrayList *vaList) {
+    size_t numItems(0);
+    if (nullptr == vaList) {
         return numItems;
     }
 
-    DataArrayList *next( vaList );
-    while( nullptr != next ) {
-        if( nullptr != vaList->m_dataList ) {
+    DataArrayList *next(vaList);
+    while (nullptr != next) {
+        if (nullptr != vaList->m_dataList) {
             numItems++;
         }
         next = next->m_next;
@@ -826,126 +821,126 @@ static size_t countDataArrayListItems( DataArrayList *vaList ) {
 }
 
 //------------------------------------------------------------------------------------------------
-static void copyVectorArray( size_t numItems, DataArrayList *vaList, aiVector3D *vectorArray ) {
-    for( size_t i = 0; i < numItems; i++ ) {
-        Value *next( vaList->m_dataList );
-        fillVector3( &vectorArray[ i ], next );
+static void copyVectorArray(size_t numItems, DataArrayList *vaList, aiVector3D *vectorArray) {
+    for (size_t i = 0; i < numItems; i++) {
+        Value *next(vaList->m_dataList);
+        fillVector3(&vectorArray[i], next);
         vaList = vaList->m_next;
     }
 }
 
 //------------------------------------------------------------------------------------------------
-static void copyColor4DArray( size_t numItems, DataArrayList *vaList, aiColor4D *colArray ) {
-    for ( size_t i = 0; i < numItems; i++ ) {
-        Value *next( vaList->m_dataList );
-        fillColor4( &colArray[ i ], next );
+static void copyColor4DArray(size_t numItems, DataArrayList *vaList, aiColor4D *colArray) {
+    for (size_t i = 0; i < numItems; i++) {
+        Value *next(vaList->m_dataList);
+        fillColor4(&colArray[i], next);
     }
 }
 
 //------------------------------------------------------------------------------------------------
-void OpenGEXImporter::handleVertexArrayNode( ODDLParser::DDLNode *node, aiScene * /*pScene*/ ) {
-    if( nullptr == node ) {
-        throw DeadlyImportError( "No parent node for name." );
+void OpenGEXImporter::handleVertexArrayNode(ODDLParser::DDLNode *node, aiScene * /*pScene*/) {
+    if (nullptr == node) {
+        throw DeadlyImportError("No parent node for name.");
         return;
     }
 
-    Property *prop( node->getProperties() );
-    if( nullptr != prop ) {
+    Property *prop(node->getProperties());
+    if (nullptr != prop) {
         std::string propName, propKey;
-        propId2StdString( prop, propName, propKey );
-        MeshAttribute attribType( getAttributeByName( propKey.c_str() ) );
-        if( None == attribType ) {
+        propId2StdString(prop, propName, propKey);
+        MeshAttribute attribType(getAttributeByName(propKey.c_str()));
+        if (None == attribType) {
             return;
         }
 
         DataArrayList *vaList = node->getDataArrayList();
-        if( nullptr == vaList ) {
+        if (nullptr == vaList) {
             return;
         }
 
-        const size_t numItems( countDataArrayListItems( vaList ) );
+        const size_t numItems(countDataArrayListItems(vaList));
 
-        if( Position == attribType ) {
-            m_currentVertices.m_vertices.resize( numItems );
-            copyVectorArray( numItems, vaList, m_currentVertices.m_vertices.data() );
-        } else if ( Color == attribType ) {
+        if (Position == attribType) {
+            m_currentVertices.m_vertices.resize(numItems);
+            copyVectorArray(numItems, vaList, m_currentVertices.m_vertices.data());
+        } else if (Color == attribType) {
             m_currentVertices.m_numColors = numItems;
-            m_currentVertices.m_colors = new aiColor4D[ numItems ];
-            copyColor4DArray( numItems, vaList, m_currentVertices.m_colors );
-        } else if( Normal == attribType ) {
-            m_currentVertices.m_normals.resize( numItems );
-            copyVectorArray( numItems, vaList, m_currentVertices.m_normals.data() );
-        } else if( TexCoord == attribType ) {
-            m_currentVertices.m_numUVComps[ 0 ] = numItems;
-            m_currentVertices.m_textureCoords[ 0 ] = new aiVector3D[ numItems ];
-            copyVectorArray( numItems, vaList, m_currentVertices.m_textureCoords[ 0 ] );
+            m_currentVertices.m_colors = new aiColor4D[numItems];
+            copyColor4DArray(numItems, vaList, m_currentVertices.m_colors);
+        } else if (Normal == attribType) {
+            m_currentVertices.m_normals.resize(numItems);
+            copyVectorArray(numItems, vaList, m_currentVertices.m_normals.data());
+        } else if (TexCoord == attribType) {
+            m_currentVertices.m_numUVComps[0] = numItems;
+            m_currentVertices.m_textureCoords[0] = new aiVector3D[numItems];
+            copyVectorArray(numItems, vaList, m_currentVertices.m_textureCoords[0]);
         }
     }
 }
 
 //------------------------------------------------------------------------------------------------
-void OpenGEXImporter::handleIndexArrayNode( ODDLParser::DDLNode *node, aiScene * /*pScene*/ ) {
-    if( nullptr == node ) {
-        throw DeadlyImportError( "No parent node for name." );
+void OpenGEXImporter::handleIndexArrayNode(ODDLParser::DDLNode *node, aiScene * /*pScene*/) {
+    if (nullptr == node) {
+        throw DeadlyImportError("No parent node for name.");
         return;
     }
 
-    if( nullptr == m_currentMesh ) {
-        throw DeadlyImportError( "No current mesh for index data found." );
+    if (nullptr == m_currentMesh) {
+        throw DeadlyImportError("No current mesh for index data found.");
         return;
     }
 
     DataArrayList *vaList = node->getDataArrayList();
-    if( nullptr == vaList ) {
+    if (nullptr == vaList) {
         return;
     }
 
-    const size_t numItems( countDataArrayListItems( vaList ) );
+    const size_t numItems(countDataArrayListItems(vaList));
     m_currentMesh->mNumFaces = static_cast<unsigned int>(numItems);
-    m_currentMesh->mFaces = new aiFace[ numItems ];
+    m_currentMesh->mFaces = new aiFace[numItems];
     m_currentMesh->mNumVertices = static_cast<unsigned int>(numItems * 3);
-    m_currentMesh->mVertices = new aiVector3D[ m_currentMesh->mNumVertices ];
-    bool hasColors( false );
-    if ( m_currentVertices.m_numColors > 0 ) {
-        m_currentMesh->mColors[0] = new aiColor4D[ m_currentVertices.m_numColors ];
+    m_currentMesh->mVertices = new aiVector3D[m_currentMesh->mNumVertices];
+    bool hasColors(false);
+    if (m_currentVertices.m_numColors > 0) {
+        m_currentMesh->mColors[0] = new aiColor4D[m_currentVertices.m_numColors];
         hasColors = true;
     }
-    bool hasNormalCoords( false );
-    if ( !m_currentVertices.m_normals.empty() ) {
-        m_currentMesh->mNormals = new aiVector3D[ m_currentMesh->mNumVertices ];
+    bool hasNormalCoords(false);
+    if (!m_currentVertices.m_normals.empty()) {
+        m_currentMesh->mNormals = new aiVector3D[m_currentMesh->mNumVertices];
         hasNormalCoords = true;
     }
-    bool hasTexCoords( false );
-    if ( m_currentVertices.m_numUVComps[ 0 ] > 0 ) {
-        m_currentMesh->mTextureCoords[ 0 ] = new aiVector3D[ m_currentMesh->mNumVertices ];
+    bool hasTexCoords(false);
+    if (m_currentVertices.m_numUVComps[0] > 0) {
+        m_currentMesh->mTextureCoords[0] = new aiVector3D[m_currentMesh->mNumVertices];
         hasTexCoords = true;
     }
 
-    unsigned int index( 0 );
-    for( size_t i = 0; i < m_currentMesh->mNumFaces; i++ ) {
-        aiFace &current(  m_currentMesh->mFaces[ i ] );
+    unsigned int index(0);
+    for (size_t i = 0; i < m_currentMesh->mNumFaces; i++) {
+        aiFace &current(m_currentMesh->mFaces[i]);
         current.mNumIndices = 3;
-        current.mIndices = new unsigned int[ current.mNumIndices ];
-        Value *next( vaList->m_dataList );
-        for( size_t indices = 0; indices < current.mNumIndices; indices++ ) {
-            const int idx( next->getUnsignedInt32() );
-            ai_assert( static_cast<size_t>( idx ) <= m_currentVertices.m_vertices.size() );
-            ai_assert( index < m_currentMesh->mNumVertices );
-            aiVector3D &pos = ( m_currentVertices.m_vertices[ idx ] );
-            m_currentMesh->mVertices[ index ].Set( pos.x, pos.y, pos.z );
-            if ( hasColors ) {
-                aiColor4D &col = m_currentVertices.m_colors[ idx ];
-                m_currentMesh->mColors[ 0 ][ index ] = col;
+        current.mIndices = new unsigned int[current.mNumIndices];
+        Value *next(vaList->m_dataList);
+        for (size_t indices = 0; indices < current.mNumIndices; indices++) {
+            const int idx(next->getUnsignedInt32());
+            ai_assert(static_cast<size_t>(idx) <= m_currentVertices.m_vertices.size());
+            ai_assert(index < m_currentMesh->mNumVertices);
+            aiVector3D &pos = (m_currentVertices.m_vertices[idx]);
+            m_currentMesh->mVertices[index].Set(pos.x, pos.y, pos.z);
+            if (hasColors) {
+                aiColor4D &col = m_currentVertices.m_colors[idx];
+                m_currentMesh->mColors[0][index] = col;
             }
-            if ( hasNormalCoords ) {
-                aiVector3D &normal = ( m_currentVertices.m_normals[ idx ] );
-                m_currentMesh->mNormals[ index ].Set( normal.x, normal.y, normal.z );
+            if (hasNormalCoords) {
+                aiVector3D &normal = (m_currentVertices.m_normals[idx]);
+                m_currentMesh->mNormals[index].Set(normal.x, normal.y, normal.z);
             }
-            if ( hasTexCoords ) {
-                aiVector3D &tex = ( m_currentVertices.m_textureCoords[ 0 ][ idx ] );
-                m_currentMesh->mTextureCoords[ 0 ][ index ].Set( tex.x, tex.y, tex.z );
+            if (hasTexCoords) {
+                aiVector3D &tex = (m_currentVertices.m_textureCoords[0][idx]);
+                m_currentMesh->mTextureCoords[0][index].Set(tex.x, tex.y, tex.z);
             }
-            current.mIndices[ indices ] = index;
+            current.mIndices[indices] = index;
             index++;
 
             next = next->m_next;
@@ -955,13 +950,13 @@ void OpenGEXImporter::handleIndexArrayNode( ODDLParser::DDLNode *node, aiScene *
 }
 
 //------------------------------------------------------------------------------------------------
-static void getColorRGB3( aiColor3D *pColor, DataArrayList *colList ) {
-    if( nullptr == pColor || nullptr == colList ) {
+static void getColorRGB3(aiColor3D *pColor, DataArrayList *colList) {
+    if (nullptr == pColor || nullptr == colList) {
         return;
     }
 
-    ai_assert( 3 == colList->m_numItems );
-    Value *val( colList->m_dataList );
+    ai_assert(3 == colList->m_numItems);
+    Value *val(colList->m_dataList);
     pColor->r = val->getFloat();
     val = val->getNext();
     pColor->g = val->getFloat();
@@ -970,13 +965,13 @@ static void getColorRGB3( aiColor3D *pColor, DataArrayList *colList ) {
 }
 
 //------------------------------------------------------------------------------------------------
-static void getColorRGB4( aiColor4D *pColor, DataArrayList *colList ) {
-    if ( nullptr == pColor || nullptr == colList ) {
+static void getColorRGB4(aiColor4D *pColor, DataArrayList *colList) {
+    if (nullptr == pColor || nullptr == colList) {
         return;
     }
 
-    ai_assert( 4 == colList->m_numItems );
-    Value *val( colList->m_dataList );
+    ai_assert(4 == colList->m_numItems);
+    Value *val(colList->m_dataList);
     pColor->r = val->getFloat();
     val = val->getNext();
     pColor->g = val->getFloat();
@@ -996,18 +991,18 @@ enum ColorType {
 };
 
 //------------------------------------------------------------------------------------------------
-static ColorType getColorType( Text *id ) {
-    if ( nullptr == id ) {
+static ColorType getColorType(Text *id) {
+    if (nullptr == id) {
         return NoneColor;
     }
 
-    if( *id == Grammar::DiffuseColorToken ) {
+    if (*id == Grammar::DiffuseColorToken) {
         return DiffuseColor;
-    } else if( *id == Grammar::SpecularColorToken ) {
+    } else if (*id == Grammar::SpecularColorToken) {
         return SpecularColor;
-    } else if( *id == Grammar::EmissionColorToken ) {
+    } else if (*id == Grammar::EmissionColorToken) {
         return EmissionColor;
-    } else if ( *id == "light" ) {
+    } else if (*id == "light") {
         return LightColor;
     }
 
@@ -1015,50 +1010,50 @@ static ColorType getColorType( Text *id ) {
 }
 
 //------------------------------------------------------------------------------------------------
-void OpenGEXImporter::handleMaterialNode( ODDLParser::DDLNode *node, aiScene *pScene ) {
+void OpenGEXImporter::handleMaterialNode(ODDLParser::DDLNode *node, aiScene *pScene) {
     m_currentMaterial = new aiMaterial;
-    m_materialCache.push_back( m_currentMaterial );
+    m_materialCache.push_back(m_currentMaterial);
     m_tokenType = Grammar::MaterialToken;
-    handleNodes( node, pScene );
+    handleNodes(node, pScene);
 }
 
 //------------------------------------------------------------------------------------------------
-void OpenGEXImporter::handleColorNode( ODDLParser::DDLNode *node, aiScene * /*pScene*/ ) {
-    if( nullptr == node ) {
+void OpenGEXImporter::handleColorNode(ODDLParser::DDLNode *node, aiScene * /*pScene*/) {
+    if (nullptr == node) {
         return;
     }
 
-    Property *prop = node->findPropertyByName( "attrib" );
-    if( nullptr != prop ) {
-        if( nullptr != prop->m_value ) {
-            DataArrayList *colList( node->getDataArrayList() );
-            if( nullptr == colList ) {
+    Property *prop = node->findPropertyByName("attrib");
+    if (nullptr != prop) {
+        if (nullptr != prop->m_value) {
+            DataArrayList *colList(node->getDataArrayList());
+            if (nullptr == colList) {
                 return;
             }
             aiColor3D col;
-            if ( 3 == colList->m_numItems ) {
+            if (3 == colList->m_numItems) {
                 aiColor3D col3;
-                getColorRGB3( &col3, colList );
+                getColorRGB3(&col3, colList);
                 col = col3;
             } else {
                 aiColor4D col4;
-                getColorRGB4( &col4, colList );
+                getColorRGB4(&col4, colList);
                 col.r = col4.r;
                 col.g = col4.g;
                 col.b = col4.b;
             }
 #ifdef ASSIMP_USE_HUNTER
-            const ColorType colType( getColorType( &prop->m_key->m_text ) );
+            const ColorType colType(getColorType(&prop->m_key->m_text));
 #else
-            const ColorType colType( getColorType( prop->m_key ) );
+            const ColorType colType(getColorType(prop->m_key));
 #endif
-            if( DiffuseColor == colType ) {
-                m_currentMaterial->AddProperty( &col, 1, AI_MATKEY_COLOR_DIFFUSE );
-            } else if( SpecularColor == colType ) {
-                m_currentMaterial->AddProperty( &col, 1, AI_MATKEY_COLOR_SPECULAR );
-            } else if( EmissionColor == colType ) {
-                m_currentMaterial->AddProperty( &col, 1, AI_MATKEY_COLOR_EMISSIVE );
-            } else if ( LightColor == colType ) {
+            if (DiffuseColor == colType) {
+                m_currentMaterial->AddProperty(&col, 1, AI_MATKEY_COLOR_DIFFUSE);
+            } else if (SpecularColor == colType) {
+                m_currentMaterial->AddProperty(&col, 1, AI_MATKEY_COLOR_SPECULAR);
+            } else if (EmissionColor == colType) {
+                m_currentMaterial->AddProperty(&col, 1, AI_MATKEY_COLOR_EMISSIVE);
+            } else if (LightColor == colType) {
                 m_currentLight->mColorDiffuse = col;
             }
         }
@@ -1066,33 +1061,33 @@ void OpenGEXImporter::handleColorNode( ODDLParser::DDLNode *node, aiScene * /*pS
 }
 
 //------------------------------------------------------------------------------------------------
-void OpenGEXImporter::handleTextureNode( ODDLParser::DDLNode *node, aiScene * /*pScene*/ ) {
-    if( nullptr == node ) {
+void OpenGEXImporter::handleTextureNode(ODDLParser::DDLNode *node, aiScene * /*pScene*/) {
+    if (nullptr == node) {
         return;
     }
 
-    Property *prop = node->findPropertyByName( "attrib" );
-    if( nullptr != prop ) {
-        if( nullptr != prop->m_value ) {
-            Value *val( node->getValue() );
-            if( nullptr != val ) {
+    Property *prop = node->findPropertyByName("attrib");
+    if (nullptr != prop) {
+        if (nullptr != prop->m_value) {
+            Value *val(node->getValue());
+            if (nullptr != val) {
                 aiString tex;
-                tex.Set( val->getString() );
-                if( prop->m_value->getString() == Grammar::DiffuseTextureToken ) {
-                    m_currentMaterial->AddProperty( &tex, AI_MATKEY_TEXTURE_DIFFUSE( 0 ) );
-                } else if( prop->m_value->getString() == Grammar::SpecularPowerTextureToken ) {
-                    m_currentMaterial->AddProperty( &tex, AI_MATKEY_TEXTURE_SPECULAR( 0 ) );
-                } else if( prop->m_value->getString() == Grammar::EmissionTextureToken ) {
-                    m_currentMaterial->AddProperty( &tex, AI_MATKEY_TEXTURE_EMISSIVE( 0 ) );
-                } else if( prop->m_value->getString() == Grammar::OpacyTextureToken ) {
-                    m_currentMaterial->AddProperty( &tex, AI_MATKEY_TEXTURE_OPACITY( 0 ) );
-                } else if( prop->m_value->getString() == Grammar::TransparencyTextureToken ) {
+                tex.Set(val->getString());
+                if (prop->m_value->getString() == Grammar::DiffuseTextureToken) {
+                    m_currentMaterial->AddProperty(&tex, AI_MATKEY_TEXTURE_DIFFUSE(0));
+                } else if (prop->m_value->getString() == Grammar::SpecularPowerTextureToken) {
+                    m_currentMaterial->AddProperty(&tex, AI_MATKEY_TEXTURE_SPECULAR(0));
+                } else if (prop->m_value->getString() == Grammar::EmissionTextureToken) {
+                    m_currentMaterial->AddProperty(&tex, AI_MATKEY_TEXTURE_EMISSIVE(0));
+                } else if (prop->m_value->getString() == Grammar::OpacyTextureToken) {
+                    m_currentMaterial->AddProperty(&tex, AI_MATKEY_TEXTURE_OPACITY(0));
+                } else if (prop->m_value->getString() == Grammar::TransparencyTextureToken) {
                     // ToDo!
                     // m_currentMaterial->AddProperty( &tex, AI_MATKEY_TEXTURE_DIFFUSE( 0 ) );
-                } else if( prop->m_value->getString() == Grammar::NormalTextureToken ) {
-                    m_currentMaterial->AddProperty( &tex, AI_MATKEY_TEXTURE_NORMALS( 0 ) );
+                } else if (prop->m_value->getString() == Grammar::NormalTextureToken) {
+                    m_currentMaterial->AddProperty(&tex, AI_MATKEY_TEXTURE_NORMALS(0));
                 } else {
-                    ai_assert( false );
+                    ai_assert(false);
                 }
             }
         }
@@ -1100,44 +1095,44 @@ void OpenGEXImporter::handleTextureNode( ODDLParser::DDLNode *node, aiScene * /*
 }
 
 //------------------------------------------------------------------------------------------------
-void OpenGEXImporter::handleParamNode( ODDLParser::DDLNode *node, aiScene * /*pScene*/ ) {
-    if ( nullptr == node ) {
+void OpenGEXImporter::handleParamNode(ODDLParser::DDLNode *node, aiScene * /*pScene*/) {
+    if (nullptr == node) {
         return;
     }
 
-    Property *prop = node->findPropertyByName( "attrib" );
-    if ( nullptr == prop ) {
+    Property *prop = node->findPropertyByName("attrib");
+    if (nullptr == prop) {
         return;
     }
 
-    if ( nullptr != prop->m_value ) {
-        Value *val( node->getValue() );
-        if ( nullptr == val ) {
+    if (nullptr != prop->m_value) {
+        Value *val(node->getValue());
+        if (nullptr == val) {
             return;
         }
-        const float floatVal( val->getFloat() );
-        if ( 0 == ASSIMP_strincmp( "fov", prop->m_value->getString(), 3 ) ) {
+        const float floatVal(val->getFloat());
+        if (0 == ASSIMP_strincmp("fov", prop->m_value->getString(), 3)) {
             m_currentCamera->mHorizontalFOV = floatVal;
-        } else if ( 0 == ASSIMP_strincmp( "near", prop->m_value->getString(), 4 ) ) {
+        } else if (0 == ASSIMP_strincmp("near", prop->m_value->getString(), 4)) {
             m_currentCamera->mClipPlaneNear = floatVal;
-        } else if ( 0 == ASSIMP_strincmp( "far", prop->m_value->getString(), 3 ) ) {
+        } else if (0 == ASSIMP_strincmp("far", prop->m_value->getString(), 3)) {
             m_currentCamera->mClipPlaneFar = floatVal;
         }
     }
 }
 
 //------------------------------------------------------------------------------------------------
-void OpenGEXImporter::handleAttenNode( ODDLParser::DDLNode *node, aiScene * /*pScene*/ ) {
-    if ( nullptr == node ) {
+void OpenGEXImporter::handleAttenNode(ODDLParser::DDLNode *node, aiScene * /*pScene*/) {
+    if (nullptr == node) {
         return;
     }
 
-    Property *prop = node->findPropertyByName( "curve" );
-    if ( nullptr != prop ) {
-        if ( nullptr != prop->m_value ) {
-            Value *val( node->getValue() );
-            const float floatVal( val->getFloat() );
-            if ( 0 == strncmp( "scale", prop->m_value->getString(), strlen( "scale" ) ) ) {
+    Property *prop = node->findPropertyByName("curve");
+    if (nullptr != prop) {
+        if (nullptr != prop->m_value) {
+            Value *val(node->getValue());
+            const float floatVal(val->getFloat());
+            if (0 == strncmp("scale", prop->m_value->getString(), strlen("scale"))) {
                 m_currentLight->mAttenuationQuadratic = floatVal;
             }
         }
@@ -1145,160 +1140,160 @@ void OpenGEXImporter::handleAttenNode( ODDLParser::DDLNode *node, aiScene * /*pS
 }
 
 //------------------------------------------------------------------------------------------------
-void OpenGEXImporter::copyMeshes( aiScene *pScene ) {
-    ai_assert( nullptr != pScene );
+void OpenGEXImporter::copyMeshes(aiScene *pScene) {
+    ai_assert(nullptr != pScene);
 
-    if( m_meshCache.empty() ) {
+    if (m_meshCache.empty()) {
         return;
     }
 
     pScene->mNumMeshes = static_cast<unsigned int>(m_meshCache.size());
-    pScene->mMeshes = new aiMesh*[ pScene->mNumMeshes ];
+    pScene->mMeshes = new aiMesh *[pScene->mNumMeshes];
     for (unsigned int i = 0; i < pScene->mNumMeshes; i++) {
         pScene->mMeshes[i] = m_meshCache[i].release();
     }
 }
 
 //------------------------------------------------------------------------------------------------
-void OpenGEXImporter::copyCameras( aiScene *pScene ) {
-    ai_assert( nullptr != pScene );
+void OpenGEXImporter::copyCameras(aiScene *pScene) {
+    ai_assert(nullptr != pScene);
 
-    if ( m_cameraCache.empty() ) {
+    if (m_cameraCache.empty()) {
         return;
     }
 
     pScene->mNumCameras = static_cast<unsigned int>(m_cameraCache.size());
-    pScene->mCameras = new aiCamera*[ pScene->mNumCameras ];
-    std::copy( m_cameraCache.begin(), m_cameraCache.end(), pScene->mCameras );
+    pScene->mCameras = new aiCamera *[pScene->mNumCameras];
+    std::copy(m_cameraCache.begin(), m_cameraCache.end(), pScene->mCameras);
 }
 
 //------------------------------------------------------------------------------------------------
-void OpenGEXImporter::copyLights( aiScene *pScene ) {
-    ai_assert( nullptr != pScene );
+void OpenGEXImporter::copyLights(aiScene *pScene) {
+    ai_assert(nullptr != pScene);
 
-    if ( m_lightCache.empty() ) {
+    if (m_lightCache.empty()) {
         return;
     }
 
     pScene->mNumLights = static_cast<unsigned int>(m_lightCache.size());
-    pScene->mLights = new aiLight*[ pScene->mNumLights ];
-    std::copy( m_lightCache.begin(), m_lightCache.end(), pScene->mLights );
+    pScene->mLights = new aiLight *[pScene->mNumLights];
+    std::copy(m_lightCache.begin(), m_lightCache.end(), pScene->mLights);
 }
 
 //------------------------------------------------------------------------------------------------
-void OpenGEXImporter::copyMaterials( aiScene *pScene ) {
-    ai_assert( nullptr != pScene );
+void OpenGEXImporter::copyMaterials(aiScene *pScene) {
+    ai_assert(nullptr != pScene);
 
-    if ( m_materialCache.empty() ) {
+    if (m_materialCache.empty()) {
         return;
     }
 
     pScene->mNumMaterials = static_cast<unsigned int>(m_materialCache.size());
-    pScene->mMaterials = new aiMaterial*[ pScene->mNumMaterials ];
-    std::copy( m_materialCache.begin(), m_materialCache.end(), pScene->mMaterials );
+    pScene->mMaterials = new aiMaterial *[pScene->mNumMaterials];
+    std::copy(m_materialCache.begin(), m_materialCache.end(), pScene->mMaterials);
 }
 
 //------------------------------------------------------------------------------------------------
 void OpenGEXImporter::resolveReferences() {
-    if( m_unresolvedRefStack.empty() ) {
+    if (m_unresolvedRefStack.empty()) {
         return;
     }
 
-    RefInfo *currentRefInfo( nullptr );
-    for( auto it = m_unresolvedRefStack.begin(); it != m_unresolvedRefStack.end(); ++it ) {
+    RefInfo *currentRefInfo(nullptr);
+    for (auto it = m_unresolvedRefStack.begin(); it != m_unresolvedRefStack.end(); ++it) {
         currentRefInfo = it->get();
-        if( nullptr != currentRefInfo ) {
-            aiNode *node( currentRefInfo->m_node );
-            if( RefInfo::MeshRef == currentRefInfo->m_type ) {
-                for( size_t i = 0; i < currentRefInfo->m_Names.size(); ++i ) {
-                    const std::string &name( currentRefInfo->m_Names[ i ] );
-                    ReferenceMap::const_iterator curIt( m_mesh2refMap.find( name ) );
+        if (nullptr != currentRefInfo) {
+            aiNode *node(currentRefInfo->m_node);
+            if (RefInfo::MeshRef == currentRefInfo->m_type) {
+                for (size_t i = 0; i < currentRefInfo->m_Names.size(); ++i) {
+                    const std::string &name(currentRefInfo->m_Names[i]);
+                    ReferenceMap::const_iterator curIt(m_mesh2refMap.find(name));
                     if (m_mesh2refMap.end() != curIt) {
-                        unsigned int meshIdx = static_cast<unsigned int>(m_mesh2refMap[ name ]);
-                        node->mMeshes[ i ] = meshIdx;
+                        unsigned int meshIdx = static_cast<unsigned int>(m_mesh2refMap[name]);
+                        node->mMeshes[i] = meshIdx;
                     }
                 }
-            } else if( RefInfo::MaterialRef == currentRefInfo->m_type ) {
-                for ( size_t i = 0; i < currentRefInfo->m_Names.size(); ++i ) {
-                    const std::string name( currentRefInfo->m_Names[ i ] );
+            } else if (RefInfo::MaterialRef == currentRefInfo->m_type) {
+                for (size_t i = 0; i < currentRefInfo->m_Names.size(); ++i) {
+                    const std::string name(currentRefInfo->m_Names[i]);
                     ReferenceMap::const_iterator curIt(m_material2refMap.find(name));
                     if (m_material2refMap.end() != curIt) {
-                        if ( nullptr != m_currentMesh ) {
-                            unsigned int matIdx = static_cast< unsigned int >( m_material2refMap[ name ] );
-                            if ( m_currentMesh->mMaterialIndex != 0 ) {
-                                ASSIMP_LOG_WARN( "Override of material reference in current mesh by material reference." );
+                        if (nullptr != m_currentMesh) {
+                            unsigned int matIdx = static_cast<unsigned int>(m_material2refMap[name]);
+                            if (m_currentMesh->mMaterialIndex != 0) {
+                                ASSIMP_LOG_WARN("Override of material reference in current mesh by material reference.");
                             }
                             m_currentMesh->mMaterialIndex = matIdx;
-                        }  else {
-                            ASSIMP_LOG_WARN( "Cannot resolve material reference, because no current mesh is there." );
+                        } else {
+                            ASSIMP_LOG_WARN("Cannot resolve material reference, because no current mesh is there.");
                         }
                     }
                 }
             } else {
-                throw DeadlyImportError( "Unknown reference info to resolve." );
+                throw DeadlyImportError("Unknown reference info to resolve.");
             }
         }
     }
 }
 
 //------------------------------------------------------------------------------------------------
-void OpenGEXImporter::createNodeTree( aiScene *pScene ) {
-    if( nullptr == m_root ) {
+void OpenGEXImporter::createNodeTree(aiScene *pScene) {
+    if (nullptr == m_root) {
         return;
     }
 
-    if( m_root->m_children.empty() ) {
+    if (m_root->m_children.empty()) {
         return;
     }
 
     pScene->mRootNode->mNumChildren = static_cast<unsigned int>(m_root->m_children.size());
-    pScene->mRootNode->mChildren = new aiNode*[ pScene->mRootNode->mNumChildren ];
-    std::copy( m_root->m_children.begin(), m_root->m_children.end(), pScene->mRootNode->mChildren );
+    pScene->mRootNode->mChildren = new aiNode *[pScene->mRootNode->mNumChildren];
+    std::copy(m_root->m_children.begin(), m_root->m_children.end(), pScene->mRootNode->mChildren);
 }
 
 //------------------------------------------------------------------------------------------------
-void OpenGEXImporter::pushNode( aiNode *node, aiScene *pScene ) {
-    ai_assert( nullptr != pScene );
+void OpenGEXImporter::pushNode(aiNode *node, aiScene *pScene) {
+    ai_assert(nullptr != pScene);
 
-    if ( nullptr == node ) {
+    if (nullptr == node) {
         return;
     }
 
-    ChildInfo *info( nullptr );
-    if( m_nodeStack.empty() ) {
+    ChildInfo *info(nullptr);
+    if (m_nodeStack.empty()) {
         node->mParent = pScene->mRootNode;
-        NodeChildMap::iterator it( m_nodeChildMap.find( node->mParent ) );
-        if( m_nodeChildMap.end() == it ) {
+        NodeChildMap::iterator it(m_nodeChildMap.find(node->mParent));
+        if (m_nodeChildMap.end() == it) {
             info = new ChildInfo;
             m_root = info;
-            m_nodeChildMap[ node->mParent ] = std::unique_ptr<ChildInfo>(info);
+            m_nodeChildMap[node->mParent] = std::unique_ptr<ChildInfo>(info);
         } else {
             info = it->second.get();
         }
-        info->m_children.push_back( node );
+        info->m_children.push_back(node);
     } else {
-        aiNode *parent( m_nodeStack.back() );
-        ai_assert( nullptr != parent );
+        aiNode *parent(m_nodeStack.back());
+        ai_assert(nullptr != parent);
         node->mParent = parent;
-        NodeChildMap::iterator it( m_nodeChildMap.find( node->mParent ) );
-        if( m_nodeChildMap.end() == it ) {
+        NodeChildMap::iterator it(m_nodeChildMap.find(node->mParent));
+        if (m_nodeChildMap.end() == it) {
             info = new ChildInfo;
-            m_nodeChildMap[ node->mParent ] = std::unique_ptr<ChildInfo>(info);
+            m_nodeChildMap[node->mParent] = std::unique_ptr<ChildInfo>(info);
         } else {
             info = it->second.get();
         }
-        info->m_children.push_back( node );
+        info->m_children.push_back(node);
     }
-    m_nodeStack.push_back( node );
+    m_nodeStack.push_back(node);
 }
 
 //------------------------------------------------------------------------------------------------
 aiNode *OpenGEXImporter::popNode() {
-    if( m_nodeStack.empty() ) {
+    if (m_nodeStack.empty()) {
         return nullptr;
     }
 
-    aiNode *node( top() );
+    aiNode *node(top());
     m_nodeStack.pop_back();
 
     return node;
@@ -1306,7 +1301,7 @@ aiNode *OpenGEXImporter::popNode() {
 
 //------------------------------------------------------------------------------------------------
 aiNode *OpenGEXImporter::top() const {
-    if( m_nodeStack.empty() ) {
+    if (m_nodeStack.empty()) {
         return nullptr;
     }
 
diff --git a/code/AssetLib/Ply/PlyLoader.cpp b/code/AssetLib/Ply/PlyLoader.cpp
index b8dbf2598..4a8aaf17b 100644
--- a/code/AssetLib/Ply/PlyLoader.cpp
+++ b/code/AssetLib/Ply/PlyLoader.cpp
@@ -151,13 +151,13 @@ void PLYImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
     const std::string mode = "rb";
     std::unique_ptr<IOStream> fileStream(pIOHandler->Open(pFile, mode));
     if (!fileStream.get()) {
-        throw DeadlyImportError("Failed to open file " + pFile + ".");
+        throw DeadlyImportError("Failed to open file ", pFile, ".");
     }
 
     // Get the file-size
     const size_t fileSize(fileStream->FileSize());
     if (0 == fileSize) {
-        throw DeadlyImportError("File " + pFile + " is empty.");
+        throw DeadlyImportError("File ", pFile, " is empty.");
     }
 
     IOStreamBuffer<char> streamedBuffer(1024 * 1024);
diff --git a/code/AssetLib/Q3BSP/Q3BSPFileImporter.cpp b/code/AssetLib/Q3BSP/Q3BSPFileImporter.cpp
index 52a2b7503..e9de3f5b3 100644
--- a/code/AssetLib/Q3BSP/Q3BSPFileImporter.cpp
+++ b/code/AssetLib/Q3BSP/Q3BSPFileImporter.cpp
@@ -180,7 +180,7 @@ const aiImporterDesc *Q3BSPFileImporter::GetInfo() const {
 void Q3BSPFileImporter::InternReadFile(const std::string &rFile, aiScene *scene, IOSystem *ioHandler) {
     ZipArchiveIOSystem Archive(ioHandler, rFile);
     if (!Archive.isOpen()) {
-        throw DeadlyImportError("Failed to open file " + rFile + ".");
+        throw DeadlyImportError("Failed to open file ", rFile, ".");
     }
 
     std::string archiveName(""), mapName("");
diff --git a/code/AssetLib/Q3D/Q3DLoader.cpp b/code/AssetLib/Q3D/Q3DLoader.cpp
index 717b5702e..786f96e8a 100644
--- a/code/AssetLib/Q3D/Q3DLoader.cpp
+++ b/code/AssetLib/Q3D/Q3DLoader.cpp
@@ -110,13 +110,12 @@ void Q3DImporter::InternReadFile(const std::string &pFile,
 
     // The header is 22 bytes large
     if (stream.GetRemainingSize() < 22)
-        throw DeadlyImportError("File is either empty or corrupt: " + pFile);
+        throw DeadlyImportError("File is either empty or corrupt: ", pFile);
 
     // Check the file's signature
     if (ASSIMP_strincmp((const char *)stream.GetPtr(), "quick3Do", 8) &&
             ASSIMP_strincmp((const char *)stream.GetPtr(), "quick3Ds", 8)) {
-        throw DeadlyImportError("Not a Quick3D file. Signature string is: " +
-                                std::string((const char *)stream.GetPtr(), 8));
+        throw DeadlyImportError("Not a Quick3D file. Signature string is: ", std::string((const char *)stream.GetPtr(), 8));
     }
 
     // Print the file format version
diff --git a/code/AssetLib/Raw/RawLoader.cpp b/code/AssetLib/Raw/RawLoader.cpp
index 1363e29c1..f9812bfe5 100644
--- a/code/AssetLib/Raw/RawLoader.cpp
+++ b/code/AssetLib/Raw/RawLoader.cpp
@@ -101,7 +101,7 @@ void RAWImporter::InternReadFile(const std::string &pFile,
 
     // Check whether we can read from the file
     if (file.get() == nullptr) {
-        throw DeadlyImportError("Failed to open RAW file " + pFile + ".");
+        throw DeadlyImportError("Failed to open RAW file ", pFile, ".");
     }
 
     // allocate storage and copy the contents of the file to a memory buffer
diff --git a/code/AssetLib/SIB/SIBImporter.cpp b/code/AssetLib/SIB/SIBImporter.cpp
index b36c6d9b1..8edcd50fa 100644
--- a/code/AssetLib/SIB/SIBImporter.cpp
+++ b/code/AssetLib/SIB/SIBImporter.cpp
@@ -59,7 +59,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/StreamReader.h>
 #include <assimp/TinyFormatter.h>
 #ifdef ASSIMP_USE_HUNTER
-#include <utf8/utf8.h>
+#include <utf8.h>
 #else
 //#  include "../contrib/ConvertUTF/ConvertUTF.h"
 #include "../contrib/utf8cpp/source/utf8.h"
@@ -808,7 +808,7 @@ void SIBImporter::InternReadFile(const std::string &pFile,
 
     // We should have at least one chunk
     if (stream.GetRemainingSize() < 16)
-        throw DeadlyImportError("SIB file is either empty or corrupt: " + pFile);
+        throw DeadlyImportError("SIB file is either empty or corrupt: ", pFile);
 
     SIB sib;
 
diff --git a/code/AssetLib/SMD/SMDLoader.cpp b/code/AssetLib/SMD/SMDLoader.cpp
index 8a7625f93..ea6135fd2 100644
--- a/code/AssetLib/SMD/SMDLoader.cpp
+++ b/code/AssetLib/SMD/SMDLoader.cpp
@@ -695,7 +695,7 @@ void SMDImporter::ReadSmd(const std::string &pFile, IOSystem* pIOHandler) {
 
     // Check whether we can read from the file
     if (file.get() == nullptr) {
-        throw DeadlyImportError("Failed to open SMD/VTA file " + pFile + ".");
+        throw DeadlyImportError("Failed to open SMD/VTA file ", pFile, ".");
     }
 
     iFileSize = (unsigned int)file->FileSize();
diff --git a/code/AssetLib/STEPParser/STEPFileEncoding.cpp b/code/AssetLib/STEPParser/STEPFileEncoding.cpp
index d917c28f3..1d1150c08 100644
--- a/code/AssetLib/STEPParser/STEPFileEncoding.cpp
+++ b/code/AssetLib/STEPParser/STEPFileEncoding.cpp
@@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "STEPFileEncoding.h"
 #include <assimp/fast_atof.h>
 #ifdef ASSIMP_USE_HUNTER
-#  include <utf8/utf8.h>
+#  include <utf8.h>
 #else
 #  include <contrib/utf8cpp/source/utf8.h>
 #endif
diff --git a/code/AssetLib/STL/STLLoader.cpp b/code/AssetLib/STL/STLLoader.cpp
index 2d710b084..592ec6b77 100644
--- a/code/AssetLib/STL/STLLoader.cpp
+++ b/code/AssetLib/STL/STLLoader.cpp
@@ -181,7 +181,7 @@ void STLImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
 
     // Check whether we can read from the file
     if (file.get() == nullptr) {
-        throw DeadlyImportError("Failed to open STL file " + pFile + ".");
+        throw DeadlyImportError("Failed to open STL file ", pFile, ".");
     }
 
     mFileSize = (unsigned int)file->FileSize();
@@ -207,7 +207,7 @@ void STLImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
     } else if (IsAsciiSTL(mBuffer, mFileSize)) {
         LoadASCIIFile(mScene->mRootNode);
     } else {
-        throw DeadlyImportError("Failed to determine STL storage representation for " + pFile + ".");
+        throw DeadlyImportError("Failed to determine STL storage representation for ", pFile, ".");
     }
 
     // create a single default material, using a white diffuse color for consistency with
diff --git a/code/AssetLib/Step/STEPFile.h b/code/AssetLib/Step/STEPFile.h
index 1448c107f..3f4fe942b 100644
--- a/code/AssetLib/Step/STEPFile.h
+++ b/code/AssetLib/Step/STEPFile.h
@@ -54,10 +54,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <assimp/DefaultLogger.hpp>
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 #    pragma warning(push)
 #    pragma warning(disable : 4127 4456 4245 4512 )
-#endif // _WIN32 
+#endif // _MSC_VER 
 
 //
 #if _MSC_VER > 1500 || (defined __GNUC___)
@@ -130,8 +130,8 @@ namespace STEP {
      *  coupled with a line number. */
 // -------------------------------------------------------------------------------
 struct SyntaxError : DeadlyImportError {
-    enum {
-        LINE_NOT_SPECIFIED = 0xffffffffffffffffLL
+    enum : uint64_t {
+        LINE_NOT_SPECIFIED = 0xfffffffffffffffLL
     };
 
     SyntaxError(const std::string &s, uint64_t line = LINE_NOT_SPECIFIED);
@@ -143,8 +143,8 @@ struct SyntaxError : DeadlyImportError {
      *  It is typically coupled with both an entity id and a line number.*/
 // -------------------------------------------------------------------------------
 struct TypeError : DeadlyImportError {
-    enum {
-        ENTITY_NOT_SPECIFIED = 0xffffffffffffffffLL,
+    enum : uint64_t {
+        ENTITY_NOT_SPECIFIED = 0xffffffffffffffffUL,
         ENTITY_NOT_SPECIFIED_32 = 0x00000000ffffffff
     };
 
@@ -727,7 +727,7 @@ struct InternGenericConvert<Maybe<T>> {
     }
 };
 
-#ifdef _WIN32
+#if _MSC_VER > 1920
 #pragma warning(push)
 #pragma warning(disable : 4127)
 #endif // _WIN32
@@ -960,9 +960,9 @@ private:
     const EXPRESS::ConversionSchema *schema;
 };
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 #pragma warning(pop)
-#endif // _WIN32
+#endif // _MSC_VER
 
 } // namespace STEP
 
diff --git a/code/AssetLib/Terragen/TerragenLoader.cpp b/code/AssetLib/Terragen/TerragenLoader.cpp
index 0d0a140c3..3c57de4fb 100644
--- a/code/AssetLib/Terragen/TerragenLoader.cpp
+++ b/code/AssetLib/Terragen/TerragenLoader.cpp
@@ -121,7 +121,7 @@ void TerragenImporter::InternReadFile(const std::string &pFile,
 
     // Check whether we can read from the file
     if (file == nullptr)
-        throw DeadlyImportError("Failed to open TERRAGEN TERRAIN file " + pFile + ".");
+        throw DeadlyImportError("Failed to open TERRAGEN TERRAIN file ", pFile, ".");
 
     // Construct a stream reader to read all data in the correct endianness
     StreamReaderLE reader(file);
diff --git a/code/AssetLib/X/XFileImporter.cpp b/code/AssetLib/X/XFileImporter.cpp
index 6c57c9dd2..44c3b375d 100644
--- a/code/AssetLib/X/XFileImporter.cpp
+++ b/code/AssetLib/X/XFileImporter.cpp
@@ -114,7 +114,7 @@ void XFileImporter::InternReadFile( const std::string& pFile, aiScene* pScene, I
     // read file into memory
     std::unique_ptr<IOStream> file( pIOHandler->Open( pFile));
     if ( file.get() == nullptr ) {
-        throw DeadlyImportError( "Failed to open file " + pFile + "." );
+        throw DeadlyImportError( "Failed to open file ", pFile, "." );
     }
 
     static const size_t MinSize = 16;
diff --git a/code/AssetLib/X/XFileParser.cpp b/code/AssetLib/X/XFileParser.cpp
index f0b751498..276d46b2e 100644
--- a/code/AssetLib/X/XFileParser.cpp
+++ b/code/AssetLib/X/XFileParser.cpp
@@ -82,6 +82,17 @@ static void dummy_free(void * /*opaque*/, void *address) {
 
 #endif // !! ASSIMP_BUILD_NO_COMPRESSED_X
 
+// ------------------------------------------------------------------------------------------------
+// Throws an exception with a line number and the given text.
+template<typename... T>
+AI_WONT_RETURN void XFileParser::ThrowException(T&&... args) {
+    if (mIsBinaryFormat) {
+        throw DeadlyImportError(args...);
+    } else {
+        throw DeadlyImportError("Line ", mLineNumber, ": ", args...);
+    }
+}
+
 // ------------------------------------------------------------------------------------------------
 // Constructor. Creates a data structure out of the XFile given in the memory block.
 XFileParser::XFileParser(const std::vector<char> &pBuffer) :
@@ -122,13 +133,13 @@ XFileParser::XFileParser(const std::vector<char> &pBuffer) :
         mIsBinaryFormat = true;
         compressed = true;
     } else
-        ThrowException(format() << "Unsupported xfile format '" << mP[8] << mP[9] << mP[10] << mP[11] << "'");
+        ThrowException("Unsupported xfile format '", mP[8], mP[9], mP[10], mP[11], "'");
 
     // float size
     mBinaryFloatSize = (unsigned int)(mP[12] - 48) * 1000 + (unsigned int)(mP[13] - 48) * 100 + (unsigned int)(mP[14] - 48) * 10 + (unsigned int)(mP[15] - 48);
 
     if (mBinaryFloatSize != 32 && mBinaryFloatSize != 64)
-        ThrowException(format() << "Unknown float size " << mBinaryFloatSize << " specified in xfile header.");
+        ThrowException("Unknown float size ", mBinaryFloatSize, " specified in xfile header.");
 
     // The x format specifies size in bits, but we work in bytes
     mBinaryFloatSize /= 8;
@@ -864,7 +875,7 @@ void XFileParser::ParseDataObjectAnimationKey(AnimBone *pAnimBone) {
         }
 
         default:
-            ThrowException(format() << "Unknown key type " << keyType << " in animation.");
+            ThrowException("Unknown key type ", keyType, " in animation.");
             break;
         } // end switch
 
@@ -1355,16 +1366,6 @@ aiColor3D XFileParser::ReadRGB() {
     return color;
 }
 
-// ------------------------------------------------------------------------------------------------
-// Throws an exception with a line number and the given text.
-AI_WONT_RETURN void XFileParser::ThrowException(const std::string &pText) {
-    if (mIsBinaryFormat) {
-        throw DeadlyImportError(pText);
-    } else {
-        throw DeadlyImportError(format() << "Line " << mLineNumber << ": " << pText);
-    }
-}
-
 // ------------------------------------------------------------------------------------------------
 // Filters the imported hierarchy for some degenerated cases that some exporters produce.
 void XFileParser::FilterHierarchy(XFile::Node *pNode) {
diff --git a/code/AssetLib/X/XFileParser.h b/code/AssetLib/X/XFileParser.h
index 41abe2286..bda904172 100644
--- a/code/AssetLib/X/XFileParser.h
+++ b/code/AssetLib/X/XFileParser.h
@@ -133,7 +133,8 @@ protected:
     aiColor4D ReadRGBA();
 
     /** Throws an exception with a line number and the given text. */
-    AI_WONT_RETURN void ThrowException( const std::string& pText) AI_WONT_RETURN_SUFFIX;
+    template<typename... T>
+    AI_WONT_RETURN void ThrowException(T&&... args) AI_WONT_RETURN_SUFFIX;
 
     /**
       * @brief  Filters the imported hierarchy for some degenerated cases that some exporters produce.
diff --git a/code/AssetLib/X3D/FIReader.cpp b/code/AssetLib/X3D/FIReader.cpp
deleted file mode 100644
index de9f035f2..000000000
--- a/code/AssetLib/X3D/FIReader.cpp
+++ /dev/null
@@ -1,1837 +0,0 @@
-/*
-Open Asset Import Library (assimp)
-----------------------------------------------------------------------
-
-Copyright (c) 2006-2020, assimp team
-
-
-All rights reserved.
-
-Redistribution and use of this software in source and binary forms,
-with or without modification, are permitted provided that the
-following conditions are met:
-
-* Redistributions of source code must retain the above
-copyright notice, this list of conditions and the
-following disclaimer.
-
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the
-following disclaimer in the documentation and/or other
-materials provided with the distribution.
-
-* Neither the name of the assimp team, nor the names of its
-contributors may be used to endorse or promote products
-derived from this software without specific prior
-written permission of the assimp team.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-----------------------------------------------------------------------
-*/
-/// \file   FIReader.cpp
-/// \brief  Reader for Fast Infoset encoded binary XML files.
-/// \date   2017
-/// \author Patrick Daehne
-
-#ifndef ASSIMP_BUILD_NO_X3D_IMPORTER
-
-#include "FIReader.hpp"
-#include <assimp/StringUtils.h>
-
-// Workaround for issue #1361
-// https://github.com/assimp/assimp/issues/1361
-#ifdef __ANDROID__
-#  define _GLIBCXX_USE_C99 1
-#endif
-
-#include <assimp/Exceptional.h>
-#include <assimp/IOStream.hpp>
-#include <assimp/types.h>
-#include <assimp/MemoryIOWrapper.h>
-#include <assimp/irrXMLWrapper.h>
-#ifdef ASSIMP_USE_HUNTER
-#  include <utf8/utf8.h>
-#else
-#  include "../contrib/utf8cpp/source/utf8.h"
-#endif
-#include <assimp/fast_atof.h>
-#include <stack>
-#include <map>
-#include <iostream>
-#include <sstream>
-#include <iomanip>
-
-namespace Assimp {
-
-static const std::string parseErrorMessage = "Fast Infoset parse error";
-
-static const char *xmlDeclarations[] = {
-    "<?xml encoding='finf'?>",
-    "<?xml encoding='finf' standalone='yes'?>",
-    "<?xml encoding='finf' standalone='no'?>",
-    "<?xml version='1.0' encoding='finf'?>",
-    "<?xml version='1.0' encoding='finf' standalone='yes'?>",
-    "<?xml version='1.0' encoding='finf' standalone='no'?>",
-    "<?xml version='1.1' encoding='finf'?>",
-    "<?xml version='1.1' encoding='finf' standalone='yes'?>",
-    "<?xml version='1.1' encoding='finf' standalone='no'?>"
-};
-
-static size_t parseMagic(const uint8_t *data, const uint8_t *dataEnd) {
-    if (dataEnd - data < 4) {
-        return 0;
-    }
-    uint32_t magic = (data[0] << 24) | (data[1] << 16) | (data[2] << 8) | data[3];
-    switch (magic) {
-    case 0xe0000001:
-        return 4;
-    case 0x3c3f786d: // "<?xm"
-        {
-            size_t xmlDeclarationsLength = sizeof(xmlDeclarations) / sizeof(xmlDeclarations[0]);
-            for (size_t i = 0; i < xmlDeclarationsLength; ++i) {
-                auto xmlDeclaration = xmlDeclarations[i];
-                ptrdiff_t xmlDeclarationLength = strlen(xmlDeclaration);
-                if ((dataEnd - data >= xmlDeclarationLength) && (memcmp(xmlDeclaration, data, xmlDeclarationLength) == 0)) {
-                    data += xmlDeclarationLength;
-                    if (dataEnd - data < 4) {
-                        return 0;
-                    }
-                    magic = (data[0] << 24) | (data[1] << 16) | (data[2] << 8) | data[3];
-                    return magic == 0xe0000001 ? xmlDeclarationLength + 4 : 0;
-                }
-            }
-            return 0;
-        }
-    default:
-        return 0;
-    }
-}
-
-static std::string parseUTF8String(const uint8_t *data, size_t len) {
-    return std::string((char*)data, len);
-}
-
-static std::string parseUTF16String(const uint8_t *data, size_t len) {
-    if (len & 1) {
-        throw DeadlyImportError(parseErrorMessage);
-    }
-    size_t numShorts = len / 2;
-    std::vector<short> utf16;
-    utf16.reserve(numShorts);
-    for (size_t i = 0; i < numShorts; ++i) {
-        short v = (data[0] << 8) | data[1];
-        utf16.push_back(v);
-        data += 2;
-    }
-    std::string result;
-    utf8::utf16to8(utf16.begin(), utf16.end(), back_inserter(result));
-    return result;
-}
-
-struct FIStringValueImpl: public FIStringValue {
-    inline FIStringValueImpl(std::string &&value_) { value = std::move(value_); }
-    virtual const std::string &toString() const /*override*/ { return value; }
-};
-
-std::shared_ptr<FIStringValue> FIStringValue::create(std::string &&value) {
-    return std::make_shared<FIStringValueImpl>(std::move(value));
-}
-
-struct FIHexValueImpl: public FIHexValue {
-    mutable std::string strValue;
-    mutable bool strValueValid;
-    inline FIHexValueImpl(std::vector<uint8_t> &&value_):  strValueValid(false) { value = std::move(value_); }
-    virtual const std::string &toString() const /*override*/ {
-        if (!strValueValid) {
-            strValueValid = true;
-            std::ostringstream os;
-            os << std::hex << std::uppercase << std::setfill('0');
-            std::for_each(value.begin(), value.end(), [&](uint8_t c) { os << std::setw(2) << static_cast<int>(c); });
-            strValue = os.str();
-        }
-        return strValue;
-    };
-};
-
-std::shared_ptr<FIHexValue> FIHexValue::create(std::vector<uint8_t> &&value) {
-    return std::make_shared<FIHexValueImpl>(std::move(value));
-}
-
-struct FIBase64ValueImpl: public FIBase64Value {
-    mutable std::string strValue;
-    mutable bool strValueValid;
-    inline FIBase64ValueImpl(std::vector<uint8_t> &&value_): strValueValid(false) { value = std::move(value_); }
-    virtual const std::string &toString() const /*override*/ {
-        if (!strValueValid) {
-            strValueValid = true;
-            std::ostringstream os;
-            uint8_t c1 = 0, c2;
-            int imod3 = 0;
-            std::vector<uint8_t>::size_type valueSize = value.size();
-            for (std::vector<uint8_t>::size_type i = 0; i < valueSize; ++i) {
-                c2 = value[i];
-                switch (imod3) {
-                case 0:
-                    os << basis_64[c2 >> 2];
-                    imod3 = 1;
-                    break;
-                case 1:
-                    os << basis_64[((c1 & 0x03) << 4) | ((c2 & 0xf0) >> 4)];
-                    imod3 = 2;
-                    break;
-                case 2:
-                    os << basis_64[((c1 & 0x0f) << 2) | ((c2 & 0xc0) >> 6)] << basis_64[c2 & 0x3f];
-                    imod3 = 0;
-                    break;
-                }
-                c1 = c2;
-            }
-            switch (imod3) {
-            case 1:
-                os << basis_64[(c1 & 0x03) << 4] << "==";
-                break;
-            case 2:
-                os << basis_64[(c1 & 0x0f) << 2] << '=';
-                break;
-            }
-            strValue = os.str();
-        }
-        return strValue;
-    };
-    static const char basis_64[];
-};
-
-const char FIBase64ValueImpl::basis_64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-std::shared_ptr<FIBase64Value> FIBase64Value::create(std::vector<uint8_t> &&value) {
-    return std::make_shared<FIBase64ValueImpl>(std::move(value));
-}
-
-struct FIShortValueImpl: public FIShortValue {
-    mutable std::string strValue;
-    mutable bool strValueValid;
-    inline FIShortValueImpl(std::vector<int16_t> &&value_): strValueValid(false) { value = std::move(value_); }
-    virtual const std::string &toString() const /*override*/ {
-        if (!strValueValid) {
-            strValueValid = true;
-            std::ostringstream os;
-            int n = 0;
-            std::for_each(value.begin(), value.end(), [&](int16_t s) { if (++n > 1) os << ' '; os << s; });
-            strValue = os.str();
-        }
-        return strValue;
-    }
-};
-
-std::shared_ptr<FIShortValue> FIShortValue::create(std::vector<int16_t> &&value) {
-    return std::make_shared<FIShortValueImpl>(std::move(value));
-}
-
-struct FIIntValueImpl: public FIIntValue {
-    mutable std::string strValue;
-    mutable bool strValueValid;
-    inline FIIntValueImpl(std::vector<int32_t> &&value_): strValueValid(false) { value = std::move(value_); }
-    virtual const std::string &toString() const /*override*/ {
-        if (!strValueValid) {
-            strValueValid = true;
-            std::ostringstream os;
-            int n = 0;
-            std::for_each(value.begin(), value.end(), [&](int32_t i) { if (++n > 1) os << ' '; os << i; });
-            strValue = os.str();
-        }
-        return strValue;
-    };
-};
-
-std::shared_ptr<FIIntValue> FIIntValue::create(std::vector<int32_t> &&value) {
-    return std::make_shared<FIIntValueImpl>(std::move(value));
-}
-
-struct FILongValueImpl: public FILongValue {
-    mutable std::string strValue;
-    mutable bool strValueValid;
-    inline FILongValueImpl(std::vector<int64_t> &&value_): strValueValid(false) { value = std::move(value_); }
-    virtual const std::string &toString() const /*override*/ {
-        if (!strValueValid) {
-            strValueValid = true;
-            std::ostringstream os;
-            int n = 0;
-            std::for_each(value.begin(), value.end(), [&](int64_t l) { if (++n > 1) os << ' '; os << l; });
-            strValue = os.str();
-        }
-        return strValue;
-    };
-};
-
-std::shared_ptr<FILongValue> FILongValue::create(std::vector<int64_t> &&value) {
-    return std::make_shared<FILongValueImpl>(std::move(value));
-}
-
-struct FIBoolValueImpl: public FIBoolValue {
-    mutable std::string strValue;
-    mutable bool strValueValid;
-    inline FIBoolValueImpl(std::vector<bool> &&value_): strValueValid(false) { value = std::move(value_); }
-    virtual const std::string &toString() const /*override*/ {
-        if (!strValueValid) {
-            strValueValid = true;
-            std::ostringstream os;
-            os << std::boolalpha;
-            int n = 0;
-            std::for_each(value.begin(), value.end(), [&](bool b) { if (++n > 1) os << ' '; os << b; });
-            strValue = os.str();
-        }
-        return strValue;
-    };
-};
-
-std::shared_ptr<FIBoolValue> FIBoolValue::create(std::vector<bool> &&value) {
-    return std::make_shared<FIBoolValueImpl>(std::move(value));
-}
-
-struct FIFloatValueImpl: public FIFloatValue {
-    mutable std::string strValue;
-    mutable bool strValueValid;
-    inline FIFloatValueImpl(std::vector<float> &&value_): strValueValid(false) { value = std::move(value_); }
-    virtual const std::string &toString() const /*override*/ {
-        if (!strValueValid) {
-            strValueValid = true;
-            std::ostringstream os;
-            int n = 0;
-            std::for_each(value.begin(), value.end(), [&](float f) { if (++n > 1) os << ' '; os << f; });
-            strValue = os.str();
-        }
-        return strValue;
-    }
-};
-
-std::shared_ptr<FIFloatValue> FIFloatValue::create(std::vector<float> &&value) {
-    return std::make_shared<FIFloatValueImpl>(std::move(value));
-}
-
-struct FIDoubleValueImpl: public FIDoubleValue {
-    mutable std::string strValue;
-    mutable bool strValueValid;
-    inline FIDoubleValueImpl(std::vector<double> &&value_): strValueValid(false) { value = std::move(value_); }
-    virtual const std::string &toString() const /*override*/ {
-        if (!strValueValid) {
-            strValueValid = true;
-            std::ostringstream os;
-            int n = 0;
-            std::for_each(value.begin(), value.end(), [&](double d) { if (++n > 1) os << ' '; os << d; });
-            strValue = os.str();
-        }
-        return strValue;
-    }
-};
-
-std::shared_ptr<FIDoubleValue> FIDoubleValue::create(std::vector<double> &&value) {
-    return std::make_shared<FIDoubleValueImpl>(std::move(value));
-}
-
-struct FIUUIDValueImpl: public FIUUIDValue {
-    mutable std::string strValue;
-    mutable bool strValueValid;
-    inline FIUUIDValueImpl(std::vector<uint8_t> &&value_): strValueValid(false) { value = std::move(value_); }
-    virtual const std::string &toString() const /*override*/ {
-        if (!strValueValid) {
-            strValueValid = true;
-            std::ostringstream os;
-            os << std::hex << std::uppercase << std::setfill('0');
-            std::vector<uint8_t>::size_type valueSize = value.size();
-            for (std::vector<uint8_t>::size_type i = 0; i < valueSize; ++i) {
-                switch (i & 15) {
-                case 0:
-                    if (i > 0) {
-                        os << ' ';
-                    }
-                    os << std::setw(2) << static_cast<int>(value[i]);
-                    break;
-                case 4:
-                case 6:
-                case 8:
-                case 10:
-                    os << '-';
-                    // intentionally fall through!
-                case 1:
-                case 2:
-                case 3:
-                case 5:
-                case 7:
-                case 9:
-                case 11:
-                case 12:
-                case 13:
-                case 14:
-                case 15:
-                    os << std::setw(2) << static_cast<int>(value[i]);
-                    break;
-                }
-            }
-            strValue = os.str();
-        }
-        return strValue;
-    };
-};
-
-std::shared_ptr<FIUUIDValue> FIUUIDValue::create(std::vector<uint8_t> &&value) {
-    return std::make_shared<FIUUIDValueImpl>(std::move(value));
-}
-
-struct FICDATAValueImpl: public FICDATAValue {
-    inline FICDATAValueImpl(std::string &&value_) { value = std::move(value_); }
-    virtual const std::string &toString() const /*override*/ { return value; }
-};
-
-std::shared_ptr<FICDATAValue> FICDATAValue::create(std::string &&value) {
-    return std::make_shared<FICDATAValueImpl>(std::move(value));
-}
-
-struct FIHexDecoder: public FIDecoder {
-    virtual std::shared_ptr<const FIValue> decode(const uint8_t *data, size_t len) /*override*/ {
-        return FIHexValue::create(std::vector<uint8_t>(data, data + len));
-    }
-};
-
-struct FIBase64Decoder: public FIDecoder {
-    virtual std::shared_ptr<const FIValue> decode(const uint8_t *data, size_t len) /*override*/ {
-        return FIBase64Value::create(std::vector<uint8_t>(data, data + len));
-    }
-};
-
-struct FIShortDecoder: public FIDecoder {
-    virtual std::shared_ptr<const FIValue> decode(const uint8_t *data, size_t len) /*override*/ {
-        if (len & 1) {
-            throw DeadlyImportError(parseErrorMessage);
-        }
-        std::vector<int16_t> value;
-        size_t numShorts = len / 2;
-        value.reserve(numShorts);
-        for (size_t i = 0; i < numShorts; ++i) {
-            int16_t v = (data[0] << 8) | data[1];
-            value.push_back(v);
-            data += 2;
-        }
-        return FIShortValue::create(std::move(value));
-    }
-};
-
-struct FIIntDecoder: public FIDecoder {
-    virtual std::shared_ptr<const FIValue> decode(const uint8_t *data, size_t len) /*override*/ {
-        if (len & 3) {
-            throw DeadlyImportError(parseErrorMessage);
-        }
-        std::vector<int32_t> value;
-        size_t numInts = len / 4;
-        value.reserve(numInts);
-        for (size_t i = 0; i < numInts; ++i) {
-            int32_t v = (data[0] << 24) | (data[1] << 16) | (data[2] << 8) | data[3];
-            value.push_back(v);
-            data += 4;
-        }
-        return FIIntValue::create(std::move(value));
-    }
-};
-
-struct FILongDecoder: public FIDecoder {
-    virtual std::shared_ptr<const FIValue> decode(const uint8_t *data, size_t len) /*override*/ {
-        if (len & 7) {
-            throw DeadlyImportError(parseErrorMessage);
-        }
-        std::vector<int64_t> value;
-        size_t numLongs = len / 8;
-        value.reserve(numLongs);
-        for (size_t i = 0; i < numLongs; ++i) {
-            int64_t b0 = data[0], b1 = data[1], b2 = data[2], b3 = data[3], b4 = data[4], b5 = data[5], b6 = data[6], b7 = data[7];
-            int64_t v = (b0 << 56) | (b1 << 48) | (b2 << 40) | (b3 << 32) | (b4 << 24) | (b5 << 16) | (b6 << 8) | b7;
-            value.push_back(v);
-            data += 8;
-        }
-        return FILongValue::create(std::move(value));
-    }
-};
-
-struct FIBoolDecoder: public FIDecoder {
-    virtual std::shared_ptr<const FIValue> decode(const uint8_t *data, size_t len) /*override*/ {
-        if (len < 1) {
-            throw DeadlyImportError(parseErrorMessage);
-        }
-        std::vector<bool> value;
-        uint8_t b = *data++;
-        size_t unusedBits = b >> 4;
-        size_t numBools = (len * 8) - 4 - unusedBits;
-        value.reserve(numBools);
-        uint8_t mask = 1 << 3;
-        for (size_t i = 0; i < numBools; ++i) {
-            if (!mask) {
-                mask = 1 << 7;
-                b = *data++;
-            }
-            value.push_back((b & mask) != 0);
-        }
-        return FIBoolValue::create(std::move(value));
-    }
-};
-
-struct FIFloatDecoder: public FIDecoder {
-    virtual std::shared_ptr<const FIValue> decode(const uint8_t *data, size_t len) /*override*/ {
-        if (len & 3) {
-            throw DeadlyImportError(parseErrorMessage);
-        }
-        std::vector<float> value;
-        size_t numFloats = len / 4;
-        value.reserve(numFloats);
-        for (size_t i = 0; i < numFloats; ++i) {
-            int v = (data[0] << 24) | (data[1] << 16) | (data[2] << 8) | data[3];
-            float f;
-            memcpy(&f, &v, 4);
-            value.push_back(f);
-            data += 4;
-        }
-        return FIFloatValue::create(std::move(value));
-    }
-};
-
-struct FIDoubleDecoder: public FIDecoder {
-    virtual std::shared_ptr<const FIValue> decode(const uint8_t *data, size_t len) /*override*/ {
-        if (len & 7) {
-            throw DeadlyImportError(parseErrorMessage);
-        }
-        std::vector<double> value;
-        size_t numDoubles = len / 8;
-        value.reserve(numDoubles);
-        for (size_t i = 0; i < numDoubles; ++i) {
-            long long b0 = data[0], b1 = data[1], b2 = data[2], b3 = data[3], b4 = data[4], b5 = data[5], b6 = data[6], b7 = data[7];
-            long long v = (b0 << 56) | (b1 << 48) | (b2 << 40) | (b3 << 32) | (b4 << 24) | (b5 << 16) | (b6 << 8) | b7;
-            double f;
-            memcpy(&f, &v, 8);
-            value.push_back(f);
-            data += 8;
-        }
-        return FIDoubleValue::create(std::move(value));
-    }
-};
-
-struct FIUUIDDecoder: public FIDecoder {
-    virtual std::shared_ptr<const FIValue> decode(const uint8_t *data, size_t len) /*override*/ {
-        if (len & 15) {
-            throw DeadlyImportError(parseErrorMessage);
-        }
-        return FIUUIDValue::create(std::vector<uint8_t>(data, data + len));
-    }
-};
-
-struct FICDATADecoder: public FIDecoder {
-    virtual std::shared_ptr<const FIValue> decode(const uint8_t *data, size_t len) /*override*/ {
-        return FICDATAValue::create(parseUTF8String(data, len));
-    }
-};
-
-class CFIReaderImpl: public FIReader {
-public:
-
-    CFIReaderImpl(std::unique_ptr<uint8_t[]> data_, size_t size):
-    data(std::move(data_)), dataP(data.get()), dataEnd(data.get() + size), currentNodeType(irr::io::EXN_NONE),
-    emptyElement(false), headerPending(true), terminatorPending(false)
-    {}
-
-    virtual ~CFIReaderImpl() {}
-
-    virtual bool read() /*override*/ {
-        if (headerPending) {
-            headerPending = false;
-            parseHeader();
-        }
-        if (terminatorPending) {
-            terminatorPending = false;
-            if (elementStack.empty()) {
-                return false;
-            }
-            else {
-                nodeName = elementStack.top();
-                elementStack.pop();
-                currentNodeType = nodeName.empty() ? irr::io::EXN_UNKNOWN : irr::io::EXN_ELEMENT_END;
-                return true;
-            }
-        }
-        if (dataP >= dataEnd) {
-            return false;
-        }
-        uint8_t b = *dataP;
-        if (b < 0x80) { // Element (C.2.11.2, C.3.7.2)
-            // C.3
-            parseElement();
-            return true;
-        }
-        else if (b < 0xc0) { // Characters (C.3.7.5)
-            // C.7
-            auto chars = parseNonIdentifyingStringOrIndex3(vocabulary.charactersTable);
-            nodeName = chars->toString();
-            currentNodeType = irr::io::EXN_TEXT;
-            return true;
-        }
-        else if (b < 0xe0) {
-            if ((b & 0xfc) == 0xc4) { // DTD (C.2.11.5)
-                // C.9
-                ++dataP;
-                if (b & 0x02) {
-                    /*const std::string &systemID =*/ parseIdentifyingStringOrIndex(vocabulary.otherURITable);
-                }
-                if (b & 0x01) {
-                    /*const std::string &publicID =*/ parseIdentifyingStringOrIndex(vocabulary.otherURITable);
-                }
-                elementStack.push(EmptyString);
-                currentNodeType = irr::io::EXN_UNKNOWN;
-                return true;
-            }
-            else if ((b & 0xfc) == 0xc8) { // Unexpanded entity reference (C.3.7.4)
-                // C.6
-                ++dataP;
-                /*const std::string &name =*/ parseIdentifyingStringOrIndex(vocabulary.otherNCNameTable);
-                if (b & 0x02) {
-                    /*const std::string &systemID =*/ parseIdentifyingStringOrIndex(vocabulary.otherURITable);
-                }
-                if (b & 0x01) {
-                    /*const std::string &publicID =*/ parseIdentifyingStringOrIndex(vocabulary.otherURITable);
-                }
-                currentNodeType = irr::io::EXN_UNKNOWN;
-                return true;
-            }
-        }
-        else if (b < 0xf0) {
-            if (b == 0xe1) { // Processing instruction (C.2.11.3, C.3.7.3)
-                // C.5
-                ++dataP;
-                /*const std::string &target =*/ parseIdentifyingStringOrIndex(vocabulary.otherNCNameTable);
-                if (dataEnd - dataP < 1) {
-                    throw DeadlyImportError(parseErrorMessage);
-                }
-                /*std::shared_ptr<const FIValue> data =*/ parseNonIdentifyingStringOrIndex1(vocabulary.otherStringTable);
-                currentNodeType = irr::io::EXN_UNKNOWN;
-                return true;
-            }
-            else if (b == 0xe2) { // Comment (C.2.11.4, C.3.7.6)
-                // C.8
-                ++dataP;
-                if (dataEnd - dataP < 1) {
-                    throw DeadlyImportError(parseErrorMessage);
-                }
-                std::shared_ptr<const FIValue> comment = parseNonIdentifyingStringOrIndex1(vocabulary.otherStringTable);
-                nodeName = comment->toString();
-                currentNodeType = irr::io::EXN_COMMENT;
-                return true;
-            }
-        }
-        else { // Terminator (C.2.12, C.3.8)
-            ++dataP;
-            if (b == 0xff) {
-                terminatorPending = true;
-            }
-            if (elementStack.empty()) {
-                return false;
-            }
-            else {
-                nodeName = elementStack.top();
-                elementStack.pop();
-                currentNodeType = nodeName.empty() ? irr::io::EXN_UNKNOWN : irr::io::EXN_ELEMENT_END;
-                return true;
-            }
-        }
-        throw DeadlyImportError(parseErrorMessage);
-    }
-
-    virtual irr::io::EXML_NODE getNodeType() const /*override*/ {
-        return currentNodeType;
-    }
-
-    virtual int getAttributeCount() const /*override*/ {
-        return static_cast<int>(attributes.size());
-    }
-
-    virtual const char* getAttributeName(int idx) const /*override*/ {
-        if (idx < 0 || idx >= (int)attributes.size()) {
-            return nullptr;
-        }
-        return attributes[idx].name.c_str();
-    }
-
-    virtual const char* getAttributeValue(int idx) const /*override*/ {
-        if (idx < 0 || idx >= (int)attributes.size()) {
-            return nullptr;
-        }
-        return attributes[idx].value->toString().c_str();
-    }
-
-    virtual const char* getAttributeValue(const char* name) const /*override*/ {
-        const Attribute* attr = getAttributeByName(name);
-        if (!attr) {
-            return nullptr;
-        }
-        return attr->value->toString().c_str();
-    }
-
-    virtual const char* getAttributeValueSafe(const char* name) const /*override*/ {
-        const Attribute* attr = getAttributeByName(name);
-        if (!attr) {
-            return EmptyString.c_str();
-        }
-        return attr->value->toString().c_str();
-    }
-
-    virtual int getAttributeValueAsInt(const char* name) const /*override*/ {
-        const Attribute* attr = getAttributeByName(name);
-        if (!attr) {
-            return 0;
-        }
-        std::shared_ptr<const FIIntValue> intValue = std::dynamic_pointer_cast<const FIIntValue>(attr->value);
-        if (intValue) {
-            return intValue->value.size() == 1 ? intValue->value.front() : 0;
-        }
-        return atoi(attr->value->toString().c_str());
-    }
-
-    virtual int getAttributeValueAsInt(int idx) const /*override*/ {
-        if (idx < 0 || idx >= (int)attributes.size()) {
-            return 0;
-        }
-        std::shared_ptr<const FIIntValue> intValue = std::dynamic_pointer_cast<const FIIntValue>(attributes[idx].value);
-        if (intValue) {
-            return intValue->value.size() == 1 ? intValue->value.front() : 0;
-        }
-        return atoi(attributes[idx].value->toString().c_str());
-    }
-
-    virtual float getAttributeValueAsFloat(const char* name) const /*override*/ {
-        const Attribute* attr = getAttributeByName(name);
-        if (!attr) {
-            return 0;
-        }
-        std::shared_ptr<const FIFloatValue> floatValue = std::dynamic_pointer_cast<const FIFloatValue>(attr->value);
-        if (floatValue) {
-            return floatValue->value.size() == 1 ? floatValue->value.front() : 0;
-        }
-
-        return fast_atof(attr->value->toString().c_str());
-    }
-
-    virtual float getAttributeValueAsFloat(int idx) const /*override*/ {
-        if (idx < 0 || idx >= (int)attributes.size()) {
-            return 0;
-        }
-        std::shared_ptr<const FIFloatValue> floatValue = std::dynamic_pointer_cast<const FIFloatValue>(attributes[idx].value);
-        if (floatValue) {
-            return floatValue->value.size() == 1 ? floatValue->value.front() : 0;
-        }
-        return fast_atof(attributes[idx].value->toString().c_str());
-    }
-
-    virtual const char* getNodeName() const /*override*/ {
-        return nodeName.c_str();
-    }
-
-    virtual const char* getNodeData() const /*override*/ {
-        return nodeName.c_str();
-    }
-
-    virtual bool isEmptyElement() const /*override*/ {
-        return emptyElement;
-    }
-
-    virtual irr::io::ETEXT_FORMAT getSourceFormat() const /*override*/ {
-        return irr::io::ETF_UTF8;
-    }
-
-    virtual irr::io::ETEXT_FORMAT getParserFormat() const /*override*/ {
-        return irr::io::ETF_UTF8;
-    }
-
-    virtual std::shared_ptr<const FIValue> getAttributeEncodedValue(int idx) const /*override*/ {
-        if (idx < 0 || idx >= (int)attributes.size()) {
-            return nullptr;
-        }
-        return attributes[idx].value;
-    }
-
-    virtual std::shared_ptr<const FIValue> getAttributeEncodedValue(const char* name) const /*override*/ {
-        const Attribute* attr = getAttributeByName(name);
-        if (!attr) {
-            return nullptr;
-        }
-        return attr->value;
-    }
-
-    virtual void registerDecoder(const std::string &algorithmUri, std::unique_ptr<FIDecoder> decoder) /*override*/ {
-        decoderMap[algorithmUri] = std::move(decoder);
-    }
-
-    virtual void registerVocabulary(const std::string &vocabularyUri, const FIVocabulary *_vocabulary) /*override*/ {
-        vocabularyMap[vocabularyUri] = _vocabulary;
-    }
-
-private:
-
-    struct QName {
-        std::string prefix;
-        std::string uri;
-        std::string name;
-        inline QName() {}
-        inline QName(const FIQName &qname): prefix(qname.prefix ? qname.prefix : ""), uri(qname.uri ? qname.uri : ""), name(qname.name) {}
-    };
-
-    struct Attribute {
-        QName qname;
-        std::string name;
-        std::shared_ptr<const FIValue> value;
-    };
-
-    struct Vocabulary {
-        std::vector<std::string> restrictedAlphabetTable;
-        std::vector<std::string> encodingAlgorithmTable;
-        std::vector<std::string> prefixTable;
-        std::vector<std::string> namespaceNameTable;
-        std::vector<std::string> localNameTable;
-        std::vector<std::string> otherNCNameTable;
-        std::vector<std::string> otherURITable;
-        std::vector<std::shared_ptr<const FIValue>> attributeValueTable;
-        std::vector<std::shared_ptr<const FIValue>> charactersTable;
-        std::vector<std::shared_ptr<const FIValue>> otherStringTable;
-        std::vector<QName> elementNameTable;
-        std::vector<QName> attributeNameTable;
-        Vocabulary() {
-            prefixTable.push_back("xml");
-            namespaceNameTable.push_back("http://www.w3.org/XML/1998/namespace");
-        }
-    };
-
-    const Attribute* getAttributeByName(const char* name) const {
-        if (!name) {
-            return 0;
-        }
-        std::string n = name;
-        for (int i=0; i<(int)attributes.size(); ++i) {
-            if (attributes[i].name == n) {
-                return &attributes[i];
-            }
-        }
-        return 0;
-    }
-
-    size_t parseInt2() { // C.25
-        uint8_t b = *dataP++;
-        if (!(b & 0x40)) { // x0...... (C.25.2)
-            return b & 0x3f;
-        }
-        else if ((b & 0x60) == 0x40) { // x10..... ........ (C.25.3)
-            if (dataEnd - dataP > 0) {
-                return (((b & 0x1f) << 8) | *dataP++) + 0x40;
-            }
-        }
-        else if ((b & 0x70) == 0x60) { // x110.... ........ ........ (C.25.4)
-            if (dataEnd - dataP > 1) {
-                size_t result = (((b & 0x0f) << 16) | (dataP[0] << 8) | dataP[1]) + 0x2040;
-                dataP += 2;
-                return result;
-            }
-        }
-        throw DeadlyImportError(parseErrorMessage);
-    }
-
-    size_t parseInt3() { // C.27
-        uint8_t b = *dataP++;
-        if (!(b & 0x20)) { // xx0..... (C.27.2)
-            return b & 0x1f;
-        }
-        else if ((b & 0x38) == 0x20) { // xx100... ........ (C.27.3)
-            if (dataEnd - dataP > 0) {
-                return (((b & 0x07) << 8) | *dataP++) + 0x20;
-            }
-        }
-        else if ((b & 0x38) == 0x28) { // xx101... ........ ........ (C.27.4)
-            if (dataEnd - dataP > 1) {
-                size_t result = (((b & 0x07) << 16) | (dataP[0] << 8) | dataP[1]) + 0x820;
-                dataP += 2;
-                return result;
-            }
-        }
-        else if ((b & 0x3f) == 0x30) { // xx110000 0000.... ........ ........ (C.27.5)
-            if ((dataEnd - dataP > 2) && !(dataP[0] & 0xf0)) {
-                size_t result = (((dataP[0] & 0x0f) << 16) | (dataP[1] << 8) | dataP[2]) + 0x80820;
-                dataP += 3;
-                return result;
-            }
-        }
-        throw DeadlyImportError(parseErrorMessage);
-    }
-
-    size_t parseInt4() { // C.28
-        uint8_t b = *dataP++;
-        if (!(b & 0x10)) { // xxx0.... (C.28.2)
-            return b & 0x0f;
-        }
-        else if ((b & 0x1c) == 0x10) { // xxx100.. ........ (C.28.3)
-            if (dataEnd - dataP > 0) {
-                return (((b & 0x03) << 8) | *dataP++) + 0x10;
-            }
-        }
-        else if ((b & 0x1c) == 0x14) { // xxx101.. ........ ........ (C.28.4)
-            if (dataEnd - dataP > 1) {
-                size_t result = (((b & 0x03) << 16) | (dataP[0] << 8) | dataP[1]) + 0x410;
-                dataP += 2;
-                return result;
-            }
-        }
-        else if ((b & 0x1f) == 0x18) { // xxx11000 0000.... ........ ........ (C.28.5)
-            if ((dataEnd - dataP > 2) && !(dataP[0] & 0xf0)) {
-                size_t result = (((dataP[0] & 0x0f) << 16) | (dataP[1] << 8) | dataP[2]) + 0x40410;
-                dataP += 3;
-                return result;
-            }
-        }
-        throw DeadlyImportError(parseErrorMessage);
-    }
-
-    size_t parseSequenceLen() { // C.21
-        if (dataEnd - dataP > 0) {
-            uint8_t b = *dataP++;
-            if (b < 0x80) { // 0....... (C.21.2)
-                return b;
-            }
-            else if ((b & 0xf0) == 0x80) { // 1000.... ........ ........ (C.21.3)
-                if (dataEnd - dataP > 1) {
-                    size_t result = (((b & 0x0f) << 16) | (dataP[0] << 8) | dataP[1]) + 0x80;
-                    dataP += 2;
-                    return result;
-                }
-            }
-        }
-        throw DeadlyImportError(parseErrorMessage);
-    }
-
-    std::string parseNonEmptyOctetString2() { // C.22
-        // Parse the length of the string
-        uint8_t b = *dataP++ & 0x7f;
-        size_t len;
-        if (!(b & 0x40)) { // x0...... (C.22.3.1)
-            len = b + 1;
-        }
-        else if (b == 0x40) { // x1000000 ........ (C.22.3.2)
-            if (dataEnd - dataP < 1) {
-                throw DeadlyImportError(parseErrorMessage);
-            }
-            len = *dataP++ + 0x41;
-        }
-        else if (b == 0x60) { // x1100000 ........ ........ ........ ........ (C.22.3.3)
-            if (dataEnd - dataP < 4) {
-                throw DeadlyImportError(parseErrorMessage);
-            }
-            len = ((dataP[0] << 24) | (dataP[1] << 16) | (dataP[2] << 8) | dataP[3]) + 0x141;
-            dataP += 4;
-        }
-        else {
-            throw DeadlyImportError(parseErrorMessage);
-        }
-
-        // Parse the string (C.22.4)
-        if (dataEnd - dataP < static_cast<ptrdiff_t>(len)) {
-            throw DeadlyImportError(parseErrorMessage);
-        }
-        std::string s = parseUTF8String(dataP, len);
-        dataP += len;
-
-        return s;
-    }
-
-    size_t parseNonEmptyOctetString5Length() { // C.23
-        // Parse the length of the string
-        size_t b = *dataP++ & 0x0f;
-        if (!(b & 0x08)) { // xxxx0... (C.23.3.1)
-            return b + 1;
-        }
-        else if (b == 0x08) { // xxxx1000 ........ (C.23.3.2)
-            if (dataEnd - dataP > 0) {
-                return *dataP++ + 0x09;
-            }
-        }
-        else if (b == 0x0c) { // xxxx1100 ........ ........ ........ ........ (C.23.3.3)
-            if (dataEnd - dataP > 3) {
-                size_t result = ((dataP[0] << 24) | (dataP[1] << 16) | (dataP[2] << 8) | dataP[3]) + 0x109;
-                dataP += 4;
-                return result;
-            }
-        }
-        throw DeadlyImportError(parseErrorMessage);
-    }
-
-    size_t parseNonEmptyOctetString7Length() { // C.24
-        // Parse the length of the string
-        size_t b = *dataP++ & 0x03;
-        if (!(b & 0x02)) { // xxxxxx0. (C.24.3.1)
-            return b + 1;
-        }
-        else if (b == 0x02) { // xxxxxx10 ........ (C.24.3.2)
-            if (dataEnd - dataP > 0) {
-                return *dataP++ + 0x3;
-            }
-        }
-        else if (b == 0x03) { // xxxxxx11 ........ ........ ........ ........ (C.24.3.3)
-            if (dataEnd - dataP > 3) {
-                size_t result = ((dataP[0] << 24) | (dataP[1] << 16) | (dataP[2] << 8) | dataP[3]) + 0x103;
-                dataP += 4;
-                return result;
-            }
-        }
-        throw DeadlyImportError(parseErrorMessage);
-    }
-
-    std::shared_ptr<const FIValue> parseEncodedData(size_t index, size_t len) {
-        if (index < 32) {
-            FIDecoder *decoder = defaultDecoder[index];
-            if (!decoder) {
-                throw DeadlyImportError("Invalid encoding algorithm index " + to_string(index));
-            }
-            return decoder->decode(dataP, len);
-        }
-        else {
-            if (index - 32 >= vocabulary.encodingAlgorithmTable.size()) {
-                throw DeadlyImportError("Invalid encoding algorithm index " + to_string(index));
-            }
-            std::string uri = vocabulary.encodingAlgorithmTable[index - 32];
-            auto it = decoderMap.find(uri);
-            if (it == decoderMap.end()) {
-                throw DeadlyImportError("Unsupported encoding algorithm " + uri);
-            }
-            else {
-                return it->second->decode(dataP, len);
-            }
-        }
-    }
-
-    std::shared_ptr<const FIValue> parseRestrictedAlphabet(size_t index, size_t len) {
-        std::string alphabet;
-        if (index < 16) {
-            switch (index) {
-            case 0: // numeric
-                alphabet = "0123456789-+.e ";
-                break;
-            case 1: // date and time
-                alphabet = "0123456789-:TZ ";
-                break;
-            default:
-                throw DeadlyImportError("Invalid restricted alphabet index " + to_string(index));
-            }
-        }
-        else {
-            if (index - 16 >= vocabulary.restrictedAlphabetTable.size()) {
-                throw DeadlyImportError("Invalid restricted alphabet index " + to_string(index));
-            }
-            alphabet = vocabulary.restrictedAlphabetTable[index - 16];
-        }
-        std::vector<uint32_t> alphabetUTF32;
-        utf8::utf8to32(alphabet.begin(), alphabet.end(), back_inserter(alphabetUTF32));
-        std::string::size_type alphabetLength = alphabetUTF32.size();
-        if (alphabetLength < 2) {
-            throw DeadlyImportError("Invalid restricted alphabet length " + to_string(alphabetLength));
-        }
-        std::string::size_type bitsPerCharacter = 1;
-        while ((1ull << bitsPerCharacter) <= alphabetLength) {
-            ++bitsPerCharacter;
-        }
-        size_t bitsAvail = 0;
-        uint8_t mask = (1 << bitsPerCharacter) - 1;
-        uint32_t bits = 0;
-        std::string s;
-        for (size_t i = 0; i < len; ++i) {
-            bits = (bits << 8) | dataP[i];
-            bitsAvail += 8;
-            while (bitsAvail >= bitsPerCharacter) {
-                bitsAvail -= bitsPerCharacter;
-                const size_t charIndex = (bits >> bitsAvail) & mask;
-                if (charIndex < alphabetLength) {
-                    s += (char) alphabetUTF32[charIndex];
-                } else if (charIndex != mask) {
-                    throw DeadlyImportError(parseErrorMessage);
-                }
-            }
-        }
-        return FIStringValue::create(std::move(s));
-    }
-
-    std::shared_ptr<const FIValue> parseEncodedCharacterString3() { // C.19
-        std::shared_ptr<const FIValue> result;
-        size_t len;
-        uint8_t b = *dataP;
-        if (b & 0x20) {
-            ++dataP;
-            if (dataEnd - dataP < 1) {
-                throw DeadlyImportError(parseErrorMessage);
-            }
-            size_t index = ((b & 0x0f) << 4) | ((*dataP & 0xf0) >> 4); // C.29
-            len = parseNonEmptyOctetString5Length();
-            if (dataEnd - dataP < static_cast<ptrdiff_t>(len)) {
-                throw DeadlyImportError(parseErrorMessage);
-            }
-            if (b & 0x10) {
-                // encoding algorithm (C.19.3.4)
-                result = parseEncodedData(index, len);
-            }
-            else {
-                // Restricted alphabet (C.19.3.3)
-                result = parseRestrictedAlphabet(index, len);
-            }
-        }
-        else {
-            len = parseNonEmptyOctetString5Length();
-            if (dataEnd - dataP < static_cast<ptrdiff_t>(len)) {
-                throw DeadlyImportError(parseErrorMessage);
-            }
-            if (b & 0x10) {
-                // UTF-16 (C.19.3.2)
-                if (len & 1) {
-                    throw DeadlyImportError(parseErrorMessage);
-                }
-                result = FIStringValue::create(parseUTF16String(dataP, len));
-            }
-            else {
-                // UTF-8 (C.19.3.1)
-                result = FIStringValue::create(parseUTF8String(dataP, len));
-            }
-        }
-        dataP += len;
-        return result;
-    }
-
-    std::shared_ptr<const FIValue> parseEncodedCharacterString5() { // C.20
-        std::shared_ptr<const FIValue> result;
-        size_t len;
-        uint8_t b = *dataP;
-        if (b & 0x08) {
-            ++dataP;
-            if (dataEnd - dataP < 1) {
-                throw DeadlyImportError(parseErrorMessage);
-            }
-            size_t index = ((b & 0x03) << 6) | ((*dataP & 0xfc) >> 2); /* C.29 */
-            len = parseNonEmptyOctetString7Length();
-            if (dataEnd - dataP < static_cast<ptrdiff_t>(len)) {
-                throw DeadlyImportError(parseErrorMessage);
-            }
-            if (b & 0x04) {
-                // encoding algorithm (C.20.3.4)
-                result = parseEncodedData(index, len);
-            }
-            else {
-                // Restricted alphabet (C.20.3.3)
-                result = parseRestrictedAlphabet(index, len);
-            }
-        }
-        else {
-            len = parseNonEmptyOctetString7Length();
-            if (dataEnd - dataP < static_cast<ptrdiff_t>(len)) {
-                throw DeadlyImportError(parseErrorMessage);
-            }
-            if (b & 0x04) {
-                // UTF-16 (C.20.3.2)
-                if (len & 1) {
-                    throw DeadlyImportError(parseErrorMessage);
-                }
-                result = FIStringValue::create(parseUTF16String(dataP, len));
-            }
-            else {
-                // UTF-8 (C.20.3.1)
-                result = FIStringValue::create(parseUTF8String(dataP, len));
-            }
-        }
-        dataP += len;
-        return result;
-    }
-
-    const std::string &parseIdentifyingStringOrIndex(std::vector<std::string> &stringTable) { // C.13
-        if (dataEnd - dataP < 1) {
-            throw DeadlyImportError(parseErrorMessage);
-        }
-        uint8_t b = *dataP;
-        if (b & 0x80) {
-            // We have an index (C.13.4)
-            size_t index = parseInt2();
-            if (index >= stringTable.size()) {
-                throw DeadlyImportError(parseErrorMessage);
-            }
-            return stringTable[index];
-        }
-        else {
-            // We have a string (C.13.3)
-            stringTable.push_back(parseNonEmptyOctetString2());
-            return stringTable.back();
-        }
-    }
-
-    QName parseNameSurrogate() { // C.16
-        if (dataEnd - dataP < 1) {
-            throw DeadlyImportError(parseErrorMessage);
-        }
-        uint8_t b = *dataP++;
-        if (b & 0xfc) { // Padding '000000' C.2.5.5
-            throw DeadlyImportError(parseErrorMessage);
-        }
-        QName result;
-        size_t index;
-        if (b & 0x02) { // prefix (C.16.3)
-            if ((dataEnd - dataP < 1) || (*dataP & 0x80)) {
-                throw DeadlyImportError(parseErrorMessage);
-            }
-            index = parseInt2();
-            if (index >= vocabulary.prefixTable.size()) {
-                throw DeadlyImportError(parseErrorMessage);
-            }
-            result.prefix = vocabulary.prefixTable[index];
-        }
-        if (b & 0x01) { // namespace-name (C.16.4)
-            if ((dataEnd - dataP < 1) || (*dataP & 0x80)) {
-                throw DeadlyImportError(parseErrorMessage);
-            }
-            index = parseInt2();
-            if (index >= vocabulary.namespaceNameTable.size()) {
-                throw DeadlyImportError(parseErrorMessage);
-            }
-            result.uri = vocabulary.namespaceNameTable[index];
-        }
-        // local-name
-        if ((dataEnd - dataP < 1) || (*dataP & 0x80)) {
-            throw DeadlyImportError(parseErrorMessage);
-        }
-        index = parseInt2();
-        if (index >= vocabulary.localNameTable.size()) {
-            throw DeadlyImportError(parseErrorMessage);
-        }
-        result.name = vocabulary.localNameTable[index];
-        return result;
-    }
-
-    const QName &parseQualifiedNameOrIndex2(std::vector<QName> &qNameTable) { // C.17
-        uint8_t b = *dataP;
-        if ((b & 0x7c) == 0x78) { // x11110..
-            // We have a literal (C.17.3)
-            ++dataP;
-            QName result;
-            // prefix (C.17.3.1)
-            result.prefix = b & 0x02 ? parseIdentifyingStringOrIndex(vocabulary.prefixTable) : std::string();
-            // namespace-name (C.17.3.1)
-            result.uri = b & 0x01 ? parseIdentifyingStringOrIndex(vocabulary.namespaceNameTable) : std::string();
-            // local-name
-            result.name = parseIdentifyingStringOrIndex(vocabulary.localNameTable);
-            qNameTable.push_back(result);
-            return qNameTable.back();
-        }
-        else {
-            // We have an index (C.17.4)
-            size_t index = parseInt2();
-            if (index >= qNameTable.size()) {
-                throw DeadlyImportError(parseErrorMessage);
-            }
-            return qNameTable[index];
-        }
-    }
-
-    const QName &parseQualifiedNameOrIndex3(std::vector<QName> &qNameTable) { // C.18
-        uint8_t b = *dataP;
-        if ((b & 0x3c) == 0x3c) { // xx1111..
-            // We have a literal (C.18.3)
-            ++dataP;
-            QName result;
-            // prefix (C.18.3.1)
-            result.prefix = b & 0x02 ? parseIdentifyingStringOrIndex(vocabulary.prefixTable) : std::string();
-            // namespace-name (C.18.3.1)
-            result.uri = b & 0x01 ? parseIdentifyingStringOrIndex(vocabulary.namespaceNameTable) : std::string();
-            // local-name
-            result.name = parseIdentifyingStringOrIndex(vocabulary.localNameTable);
-            qNameTable.push_back(result);
-            return qNameTable.back();
-        }
-        else {
-            // We have an index (C.18.4)
-            size_t index = parseInt3();
-            if (index >= qNameTable.size()) {
-                throw DeadlyImportError(parseErrorMessage);
-            }
-            return qNameTable[index];
-        }
-    }
-
-    std::shared_ptr<const FIValue> parseNonIdentifyingStringOrIndex1(std::vector<std::shared_ptr<const FIValue>> &valueTable) { // C.14
-        uint8_t b = *dataP;
-        if (b == 0xff) { // C.26.2
-            // empty string
-            ++dataP;
-            return EmptyFIString;
-        }
-        else if (b & 0x80) { // C.14.4
-            // We have an index
-            size_t index = parseInt2();
-            if (index >= valueTable.size()) {
-                throw DeadlyImportError(parseErrorMessage);
-            }
-            return valueTable[index];
-        }
-        else { // C.14.3
-            // We have a literal
-            std::shared_ptr<const FIValue> result = parseEncodedCharacterString3();
-            if (b & 0x40) { // C.14.3.1
-                valueTable.push_back(result);
-            }
-            return result;
-        }
-    }
-
-    std::shared_ptr<const FIValue> parseNonIdentifyingStringOrIndex3(std::vector<std::shared_ptr<const FIValue>> &valueTable) { // C.15
-        uint8_t b = *dataP;
-        if (b & 0x20) { // C.15.4
-            // We have an index
-            size_t index = parseInt4();
-            if (index >= valueTable.size()) {
-                throw DeadlyImportError(parseErrorMessage);
-            }
-            return valueTable[index];
-        }
-        else { // C.15.3
-            // We have a literal
-            std::shared_ptr<const FIValue> result = parseEncodedCharacterString5();
-            if (b & 0x10) { // C.15.3.1
-                valueTable.push_back(result);
-            }
-            return result;
-        }
-    }
-
-    void parseElement() {
-        // C.3
-
-        attributes.clear();
-
-        uint8_t b = *dataP;
-        bool hasAttributes = (b & 0x40) != 0; // C.3.3
-        if ((b & 0x3f) == 0x38) { // C.3.4.1
-            // Parse namespaces
-            ++dataP;
-            for (;;) {
-                if (dataEnd - dataP < 1) {
-                    throw DeadlyImportError(parseErrorMessage);
-                }
-                b = *dataP++;
-                if (b == 0xf0) { // C.3.4.3
-                    break;
-                }
-                if ((b & 0xfc) != 0xcc) { // C.3.4.2
-                    throw DeadlyImportError(parseErrorMessage);
-                }
-                // C.12
-                Attribute attr;
-                attr.qname.prefix = "xmlns";
-                attr.qname.name = b & 0x02 ? parseIdentifyingStringOrIndex(vocabulary.prefixTable) : std::string();
-                attr.qname.uri = b & 0x01 ? parseIdentifyingStringOrIndex(vocabulary.namespaceNameTable) : std::string();
-                attr.name = attr.qname.name.empty() ? "xmlns" : "xmlns:" + attr.qname.name;
-                attr.value = FIStringValue::create(std::string(attr.qname.uri));
-                attributes.push_back(attr);
-            }
-            if ((dataEnd - dataP < 1) || (*dataP & 0xc0)) {
-                throw DeadlyImportError(parseErrorMessage);
-            }
-        }
-
-        // Parse Element name (C.3.5)
-        const QName &elemName = parseQualifiedNameOrIndex3(vocabulary.elementNameTable);
-        nodeName = elemName.prefix.empty() ? elemName.name : elemName.prefix + ':' + elemName.name;
-
-        if (hasAttributes) {
-            for (;;) {
-                if (dataEnd - dataP < 1) {
-                    throw DeadlyImportError(parseErrorMessage);
-                }
-                b = *dataP;
-                if (b < 0x80) { // C.3.6.1
-                    // C.4
-                    Attribute attr;
-                    attr.qname = parseQualifiedNameOrIndex2(vocabulary.attributeNameTable);
-                    attr.name = attr.qname.prefix.empty() ? attr.qname.name : attr.qname.prefix + ':' + attr.qname.name;
-                    if (dataEnd - dataP < 1) {
-                        throw DeadlyImportError(parseErrorMessage);
-                    }
-                    attr.value = parseNonIdentifyingStringOrIndex1(vocabulary.attributeValueTable);
-                    attributes.push_back(attr);
-                }
-                else {
-                    if ((b & 0xf0) != 0xf0) { // C.3.6.2
-                        throw DeadlyImportError(parseErrorMessage);
-                    }
-                    emptyElement = b == 0xff; // C.3.6.2, C.3.8
-                    ++dataP;
-                    break;
-                }
-            }
-        }
-        else {
-            if (dataEnd - dataP < 1) {
-                throw DeadlyImportError(parseErrorMessage);
-            }
-            b = *dataP;
-            switch (b) {
-            case 0xff:
-                terminatorPending = true;
-                // Intentionally fall through
-            case 0xf0:
-                emptyElement = true;
-                ++dataP;
-                break;
-            default:
-                emptyElement = false;
-            }
-        }
-        if (!emptyElement) {
-            elementStack.push(nodeName);
-        }
-
-        currentNodeType = irr::io::EXN_ELEMENT;
-    }
-
-    void parseHeader() {
-        // Parse header (C.1.3)
-        size_t magicSize = parseMagic(dataP, dataEnd);
-        if (!magicSize) {
-            throw DeadlyImportError(parseErrorMessage);
-        }
-        dataP += magicSize;
-        // C.2.3
-        if (dataEnd - dataP < 1) {
-            throw DeadlyImportError(parseErrorMessage);
-        }
-        uint8_t b = *dataP++;
-        if (b & 0x40) {
-            // Parse additional data (C.2.4)
-            size_t len = parseSequenceLen();
-            for (size_t i = 0; i < len; ++i) {
-                if (dataEnd - dataP < 1) {
-                    throw DeadlyImportError(parseErrorMessage);
-                }
-                /*std::string id =*/ parseNonEmptyOctetString2();
-                if (dataEnd - dataP < 1) {
-                    throw DeadlyImportError(parseErrorMessage);
-                }
-                /*std::string data =*/ parseNonEmptyOctetString2();
-            }
-        }
-        if (b & 0x20) {
-            // Parse initial vocabulary (C.2.5)
-            if (dataEnd - dataP < 2) {
-                throw DeadlyImportError(parseErrorMessage);
-            }
-            uint16_t b1 = (dataP[0] << 8) | dataP[1];
-            dataP += 2;
-            if (b1 & 0x1000) {
-                // External vocabulary (C.2.5.2)
-                if (dataEnd - dataP < 1) {
-                    throw DeadlyImportError(parseErrorMessage);
-                }
-                std::string uri = parseNonEmptyOctetString2();
-                auto it = vocabularyMap.find(uri);
-                if (it == vocabularyMap.end()) {
-                    throw DeadlyImportError("Unknown vocabulary " + uri);
-                }
-                const FIVocabulary *externalVocabulary = it->second;
-                if (externalVocabulary->restrictedAlphabetTable) {
-                    std::copy(externalVocabulary->restrictedAlphabetTable, externalVocabulary->restrictedAlphabetTable + externalVocabulary->restrictedAlphabetTableSize, std::back_inserter(vocabulary.restrictedAlphabetTable));
-                }
-                if (externalVocabulary->encodingAlgorithmTable) {
-                    std::copy(externalVocabulary->encodingAlgorithmTable, externalVocabulary->encodingAlgorithmTable + externalVocabulary->encodingAlgorithmTableSize, std::back_inserter(vocabulary.encodingAlgorithmTable));
-                }
-                if (externalVocabulary->prefixTable) {
-                    std::copy(externalVocabulary->prefixTable, externalVocabulary->prefixTable + externalVocabulary->prefixTableSize, std::back_inserter(vocabulary.prefixTable));
-                }
-                if (externalVocabulary->namespaceNameTable) {
-                    std::copy(externalVocabulary->namespaceNameTable, externalVocabulary->namespaceNameTable + externalVocabulary->namespaceNameTableSize, std::back_inserter(vocabulary.namespaceNameTable));
-                }
-                if (externalVocabulary->localNameTable) {
-                    std::copy(externalVocabulary->localNameTable, externalVocabulary->localNameTable + externalVocabulary->localNameTableSize, std::back_inserter(vocabulary.localNameTable));
-                }
-                if (externalVocabulary->otherNCNameTable) {
-                    std::copy(externalVocabulary->otherNCNameTable, externalVocabulary->otherNCNameTable + externalVocabulary->otherNCNameTableSize, std::back_inserter(vocabulary.otherNCNameTable));
-                }
-                if (externalVocabulary->otherURITable) {
-                    std::copy(externalVocabulary->otherURITable, externalVocabulary->otherURITable + externalVocabulary->otherURITableSize, std::back_inserter(vocabulary.otherURITable));
-                }
-                if (externalVocabulary->attributeValueTable) {
-                    std::copy(externalVocabulary->attributeValueTable, externalVocabulary->attributeValueTable + externalVocabulary->attributeValueTableSize, std::back_inserter(vocabulary.attributeValueTable));
-                }
-                if (externalVocabulary->charactersTable) {
-                    std::copy(externalVocabulary->charactersTable, externalVocabulary->charactersTable + externalVocabulary->charactersTableSize, std::back_inserter(vocabulary.charactersTable));
-                }
-                if (externalVocabulary->otherStringTable) {
-                    std::copy(externalVocabulary->otherStringTable, externalVocabulary->otherStringTable + externalVocabulary->otherStringTableSize, std::back_inserter(vocabulary.otherStringTable));
-                }
-                if (externalVocabulary->elementNameTable) {
-                    std::copy(externalVocabulary->elementNameTable, externalVocabulary->elementNameTable + externalVocabulary->elementNameTableSize, std::back_inserter(vocabulary.elementNameTable));
-                }
-                if (externalVocabulary->attributeNameTable) {
-                    std::copy(externalVocabulary->attributeNameTable, externalVocabulary->attributeNameTable + externalVocabulary->attributeNameTableSize, std::back_inserter(vocabulary.attributeNameTable));
-                }
-            }
-            if (b1 & 0x0800) {
-                // Parse restricted alphabets (C.2.5.3)
-                for (size_t len = parseSequenceLen(); len > 0; --len) {
-                    if (dataEnd - dataP < 1) {
-                        throw DeadlyImportError(parseErrorMessage);
-                    }
-                    vocabulary.restrictedAlphabetTable.push_back(parseNonEmptyOctetString2());
-                }
-            }
-            if (b1 & 0x0400) {
-                // Parse encoding algorithms (C.2.5.3)
-                for (size_t len = parseSequenceLen(); len > 0; --len) {
-                    if (dataEnd - dataP < 1) {
-                        throw DeadlyImportError(parseErrorMessage);
-                    }
-                    vocabulary.encodingAlgorithmTable.push_back(parseNonEmptyOctetString2());
-                }
-            }
-            if (b1 & 0x0200) {
-                // Parse prefixes (C.2.5.3)
-                for (size_t len = parseSequenceLen(); len > 0; --len) {
-                    if (dataEnd - dataP < 1) {
-                        throw DeadlyImportError(parseErrorMessage);
-                    }
-                    vocabulary.prefixTable.push_back(parseNonEmptyOctetString2());
-                }
-            }
-            if (b1 & 0x0100) {
-                // Parse namespace names (C.2.5.3)
-                for (size_t len = parseSequenceLen(); len > 0; --len) {
-                    if (dataEnd - dataP < 1) {
-                        throw DeadlyImportError(parseErrorMessage);
-                    }
-                    vocabulary.namespaceNameTable.push_back(parseNonEmptyOctetString2());
-                }
-            }
-            if (b1 & 0x0080) {
-                // Parse local names (C.2.5.3)
-                for (size_t len = parseSequenceLen(); len > 0; --len) {
-                    if (dataEnd - dataP < 1) {
-                        throw DeadlyImportError(parseErrorMessage);
-                    }
-                    vocabulary.localNameTable.push_back(parseNonEmptyOctetString2());
-                }
-            }
-            if (b1 & 0x0040) {
-                // Parse other ncnames (C.2.5.3)
-                for (size_t len = parseSequenceLen(); len > 0; --len) {
-                    if (dataEnd - dataP < 1) {
-                        throw DeadlyImportError(parseErrorMessage);
-                    }
-                    vocabulary.otherNCNameTable.push_back(parseNonEmptyOctetString2());
-                }
-            }
-            if (b1 & 0x0020) {
-                // Parse other uris (C.2.5.3)
-                for (size_t len = parseSequenceLen(); len > 0; --len) {
-                    if (dataEnd - dataP < 1) {
-                        throw DeadlyImportError(parseErrorMessage);
-                    }
-                    vocabulary.otherURITable.push_back(parseNonEmptyOctetString2());
-                }
-            }
-            if (b1 & 0x0010) {
-                // Parse attribute values (C.2.5.4)
-                for (size_t len = parseSequenceLen(); len > 0; --len) {
-                    if (dataEnd - dataP < 1) {
-                        throw DeadlyImportError(parseErrorMessage);
-                    }
-                    vocabulary.attributeValueTable.push_back(parseEncodedCharacterString3());
-                }
-            }
-            if (b1 & 0x0008) {
-                // Parse content character chunks (C.2.5.4)
-                for (size_t len = parseSequenceLen(); len > 0; --len) {
-                    if (dataEnd - dataP < 1) {
-                        throw DeadlyImportError(parseErrorMessage);
-                    }
-                    vocabulary.charactersTable.push_back(parseEncodedCharacterString3());
-                }
-            }
-            if (b1 & 0x0004) {
-                // Parse other strings (C.2.5.4)
-                for (size_t len = parseSequenceLen(); len > 0; --len) {
-                    if (dataEnd - dataP < 1) {
-                        throw DeadlyImportError(parseErrorMessage);
-                    }
-                    vocabulary.otherStringTable.push_back(parseEncodedCharacterString3());
-                }
-            }
-            if (b1 & 0x0002) {
-                // Parse element name surrogates (C.2.5.5)
-                for (size_t len = parseSequenceLen(); len > 0; --len) {
-                    vocabulary.elementNameTable.push_back(parseNameSurrogate());
-                }
-            }
-            if (b1 & 0x0001) {
-                // Parse attribute name surrogates (C.2.5.5)
-                for (size_t len = parseSequenceLen(); len > 0; --len) {
-                    vocabulary.attributeNameTable.push_back(parseNameSurrogate());
-                }
-            }
-        }
-        if (b & 0x10) {
-            // Parse notations (C.2.6)
-            for (;;) {
-                if (dataEnd - dataP < 1) {
-                    throw DeadlyImportError(parseErrorMessage);
-                }
-                uint8_t b1 = *dataP++;
-                if (b1 == 0xf0) {
-                    break;
-                }
-                if ((b1 & 0xfc) != 0xc0) {
-                    throw DeadlyImportError(parseErrorMessage);
-                }
-                /* C.11 */
-                /*const std::string &name =*/ parseIdentifyingStringOrIndex(vocabulary.otherNCNameTable);
-                if (b1 & 0x02) {
-                    /*const std::string &systemId =*/ parseIdentifyingStringOrIndex(vocabulary.otherURITable);
-                }
-                if (b1 & 0x01) {
-                    /*const std::string &publicId =*/ parseIdentifyingStringOrIndex(vocabulary.otherURITable);
-                }
-            }
-        }
-        if (b & 0x08) {
-            // Parse unparsed entities (C.2.7)
-            for (;;) {
-                if (dataEnd - dataP < 1) {
-                    throw DeadlyImportError(parseErrorMessage);
-                }
-                uint8_t b1 = *dataP++;
-                if (b1 == 0xf0) {
-                    break;
-                }
-                if ((b1 & 0xfe) != 0xd0) {
-                    throw DeadlyImportError(parseErrorMessage);
-                }
-                /* C.10 */
-                /*const std::string &name =*/ parseIdentifyingStringOrIndex(vocabulary.otherNCNameTable);
-                /*const std::string &systemId =*/ parseIdentifyingStringOrIndex(vocabulary.otherURITable);
-                if (b1 & 0x01) {
-                    /*const std::string &publicId =*/ parseIdentifyingStringOrIndex(vocabulary.otherURITable);
-                }
-                /*const std::string &notationName =*/ parseIdentifyingStringOrIndex(vocabulary.otherNCNameTable);
-            }
-        }
-        if (b & 0x04) {
-            // Parse character encoding scheme (C.2.8)
-            if (dataEnd - dataP < 1) {
-                throw DeadlyImportError(parseErrorMessage);
-            }
-            /*std::string characterEncodingScheme =*/ parseNonEmptyOctetString2();
-        }
-        if (b & 0x02) {
-            // Parse standalone flag (C.2.9)
-            if (dataEnd - dataP < 1) {
-                throw DeadlyImportError(parseErrorMessage);
-            }
-            uint8_t b1 = *dataP++;
-            if (b1 & 0xfe) {
-                throw DeadlyImportError(parseErrorMessage);
-            }
-            //bool standalone = b1 & 0x01;
-        }
-        if (b & 0x01) {
-            // Parse version (C.2.10)
-            if (dataEnd - dataP < 1) {
-                throw DeadlyImportError(parseErrorMessage);
-            }
-            /*std::shared_ptr<const FIValue> version =*/ parseNonIdentifyingStringOrIndex1(vocabulary.otherStringTable);
-        }
-    }
-
-    std::unique_ptr<uint8_t[]> data;
-    uint8_t *dataP, *dataEnd;
-    irr::io::EXML_NODE currentNodeType;
-    bool emptyElement;
-    bool headerPending;
-    bool terminatorPending;
-    Vocabulary vocabulary;
-    std::vector<Attribute> attributes;
-    std::stack<std::string> elementStack;
-    std::string nodeName;
-    std::map<std::string, std::unique_ptr<FIDecoder>> decoderMap;
-    std::map<std::string, const FIVocabulary*> vocabularyMap;
-
-    static const std::string EmptyString;
-    static std::shared_ptr<const FIValue> EmptyFIString;
-
-    static FIHexDecoder hexDecoder;
-    static FIBase64Decoder base64Decoder;
-    static FIShortDecoder shortDecoder;
-    static FIIntDecoder intDecoder;
-    static FILongDecoder longDecoder;
-    static FIBoolDecoder boolDecoder;
-    static FIFloatDecoder floatDecoder;
-    static FIDoubleDecoder doubleDecoder;
-    static FIUUIDDecoder uuidDecoder;
-    static FICDATADecoder cdataDecoder;
-    static FIDecoder *defaultDecoder[32];
-};
-
-const std::string CFIReaderImpl::EmptyString;
-std::shared_ptr<const FIValue> CFIReaderImpl::EmptyFIString = FIStringValue::create(std::string());
-
-FIHexDecoder CFIReaderImpl::hexDecoder;
-FIBase64Decoder CFIReaderImpl::base64Decoder;
-FIShortDecoder CFIReaderImpl::shortDecoder;
-FIIntDecoder CFIReaderImpl::intDecoder;
-FILongDecoder CFIReaderImpl::longDecoder;
-FIBoolDecoder CFIReaderImpl::boolDecoder;
-FIFloatDecoder CFIReaderImpl::floatDecoder;
-FIDoubleDecoder CFIReaderImpl::doubleDecoder;
-FIUUIDDecoder CFIReaderImpl::uuidDecoder;
-FICDATADecoder CFIReaderImpl::cdataDecoder;
-
-FIDecoder *CFIReaderImpl::defaultDecoder[32] = {
-    &hexDecoder,
-    &base64Decoder,
-    &shortDecoder,
-    &intDecoder,
-    &longDecoder,
-    &boolDecoder,
-    &floatDecoder,
-    &doubleDecoder,
-    &uuidDecoder,
-    &cdataDecoder
-};
-
-class CXMLReaderImpl : public FIReader
-{
-public:
-
-    //! Constructor
-    CXMLReaderImpl(std::unique_ptr<irr::io::IIrrXMLReader<char, irr::io::IXMLBase>> reader_)
-    : reader(std::move(reader_))
-    {}
-
-    virtual ~CXMLReaderImpl() {}
-
-    virtual bool read() /*override*/ {
-        return reader->read();
-    }
-
-    virtual irr::io::EXML_NODE getNodeType() const /*override*/ {
-        return reader->getNodeType();
-    }
-
-    virtual int getAttributeCount() const /*override*/ {
-        return reader->getAttributeCount();
-    }
-
-    virtual const char* getAttributeName(int idx) const /*override*/ {
-        return reader->getAttributeName(idx);
-    }
-
-    virtual const char* getAttributeValue(int idx) const /*override*/ {
-        return reader->getAttributeValue(idx);
-    }
-
-    virtual const char* getAttributeValue(const char* name) const /*override*/ {
-        return reader->getAttributeValue(name);
-    }
-
-    virtual const char* getAttributeValueSafe(const char* name) const /*override*/ {
-        return reader->getAttributeValueSafe(name);
-    }
-
-    virtual int getAttributeValueAsInt(const char* name) const /*override*/ {
-        return reader->getAttributeValueAsInt(name);
-    }
-
-    virtual int getAttributeValueAsInt(int idx) const /*override*/ {
-        return reader->getAttributeValueAsInt(idx);
-    }
-
-    virtual float getAttributeValueAsFloat(const char* name) const /*override*/ {
-        return reader->getAttributeValueAsFloat(name);
-    }
-
-    virtual float getAttributeValueAsFloat(int idx) const /*override*/ {
-        return reader->getAttributeValueAsFloat(idx);
-    }
-
-    virtual const char* getNodeName() const /*override*/ {
-        return reader->getNodeName();
-    }
-
-    virtual const char* getNodeData() const /*override*/ {
-        return reader->getNodeData();
-    }
-
-    virtual bool isEmptyElement() const /*override*/ {
-        return reader->isEmptyElement();
-    }
-
-    virtual irr::io::ETEXT_FORMAT getSourceFormat() const /*override*/ {
-        return reader->getSourceFormat();
-    }
-
-    virtual irr::io::ETEXT_FORMAT getParserFormat() const /*override*/ {
-        return reader->getParserFormat();
-    }
-
-    virtual std::shared_ptr<const FIValue> getAttributeEncodedValue(int /*idx*/) const /*override*/ {
-        return nullptr;
-    }
-
-    virtual std::shared_ptr<const FIValue> getAttributeEncodedValue(const char* /*name*/) const /*override*/ {
-        return nullptr;
-    }
-
-    virtual void registerDecoder(const std::string & /*algorithmUri*/, std::unique_ptr<FIDecoder> /*decoder*/) /*override*/ {}
-
-
-    virtual void registerVocabulary(const std::string &/*vocabularyUri*/, const FIVocabulary * /*vocabulary*/) /*override*/ {}
-
-private:
-
-    std::unique_ptr<irr::io::IIrrXMLReader<char, irr::io::IXMLBase>> reader;
-};
-
-static std::unique_ptr<uint8_t[]> readFile(IOStream *stream, size_t &size, bool &isFI) {
-    size = stream->FileSize();
-    std::unique_ptr<uint8_t[]> data = std::unique_ptr<uint8_t[]>(new uint8_t[size]);
-    if (stream->Read(data.get(), size, 1) != 1) {
-        size = 0;
-        data.reset();
-    }
-    isFI = parseMagic(data.get(), data.get() + size) > 0;
-    return data;
-}
-
-std::unique_ptr<FIReader> FIReader::create(IOStream *stream)
-{
-    size_t size;
-    bool isFI;
-    auto data = readFile(stream, size, isFI);
-    if (isFI) {
-        return std::unique_ptr<FIReader>(new CFIReaderImpl(std::move(data), size));
-    }
-    else {
-        auto memios = std::unique_ptr<MemoryIOStream>(new MemoryIOStream(data.release(), size, true));
-        auto callback = std::unique_ptr<CIrrXML_IOStreamReader>(new CIrrXML_IOStreamReader(memios.get()));
-        return std::unique_ptr<FIReader>(new CXMLReaderImpl(std::unique_ptr<irr::io::IIrrXMLReader<char, irr::io::IXMLBase>>(createIrrXMLReader(callback.get()))));
-    }
-}
-
-}// namespace Assimp
-
-#endif // !ASSIMP_BUILD_NO_X3D_IMPORTER
diff --git a/code/AssetLib/X3D/FIReader.hpp b/code/AssetLib/X3D/FIReader.hpp
deleted file mode 100644
index e8b6c2f3a..000000000
--- a/code/AssetLib/X3D/FIReader.hpp
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
-Open Asset Import Library (assimp)
-----------------------------------------------------------------------
-
-Copyright (c) 2006-2020, assimp team
-
-
-All rights reserved.
-
-Redistribution and use of this software in source and binary forms,
-with or without modification, are permitted provided that the
-following conditions are met:
-
-* Redistributions of source code must retain the above
-copyright notice, this list of conditions and the
-following disclaimer.
-
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the
-following disclaimer in the documentation and/or other
-materials provided with the distribution.
-
-* Neither the name of the assimp team, nor the names of its
-contributors may be used to endorse or promote products
-derived from this software without specific prior
-written permission of the assimp team.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-----------------------------------------------------------------------
-*/
-/// \file   FIReader.hpp
-/// \brief  Reader for Fast Infoset encoded binary XML files.
-/// \date   2017
-/// \author Patrick Daehne
-
-#ifndef INCLUDED_AI_FI_READER_H
-#define INCLUDED_AI_FI_READER_H
-
-#ifndef ASSIMP_BUILD_NO_X3D_IMPORTER
-
-//#include <wchar.h>
-#include <string>
-#include <memory>
-#include <cerrno>
-#include <cwchar>
-#include <vector>
-//#include <stdio.h>
-//#include <cstdint>
-#ifdef ASSIMP_USE_HUNTER
-#  include <irrXML/irrXML.h>
-#else
-#  include <irrXML.h>
-#endif
-
-namespace Assimp {
-
-struct FIValue {
-    virtual const std::string &toString() const = 0;
-    virtual ~FIValue() {}
-};
-
-struct FIStringValue: public FIValue {
-    std::string value;
-    static std::shared_ptr<FIStringValue> create(std::string &&value);
-};
-
-struct FIByteValue: public FIValue {
-    std::vector<uint8_t> value;
-};
-
-struct FIHexValue: public FIByteValue {
-    static std::shared_ptr<FIHexValue> create(std::vector<uint8_t> &&value);
-};
-
-struct FIBase64Value: public FIByteValue {
-    static std::shared_ptr<FIBase64Value> create(std::vector<uint8_t> &&value);
-};
-
-struct FIShortValue: public FIValue {
-    std::vector<int16_t> value;
-    static std::shared_ptr<FIShortValue> create(std::vector<int16_t> &&value);
-};
-
-struct FIIntValue: public FIValue {
-    std::vector<int32_t> value;
-    static std::shared_ptr<FIIntValue> create(std::vector<int32_t> &&value);
-};
-
-struct FILongValue: public FIValue {
-    std::vector<int64_t> value;
-    static std::shared_ptr<FILongValue> create(std::vector<int64_t> &&value);
-};
-
-struct FIBoolValue: public FIValue {
-    std::vector<bool> value;
-    static std::shared_ptr<FIBoolValue> create(std::vector<bool> &&value);
-};
-
-struct FIFloatValue: public FIValue {
-    std::vector<float> value;
-    static std::shared_ptr<FIFloatValue> create(std::vector<float> &&value);
-};
-
-struct FIDoubleValue: public FIValue {
-    std::vector<double> value;
-    static std::shared_ptr<FIDoubleValue> create(std::vector<double> &&value);
-};
-
-struct FIUUIDValue: public FIByteValue {
-    static std::shared_ptr<FIUUIDValue> create(std::vector<uint8_t> &&value);
-};
-
-struct FICDATAValue: public FIStringValue {
-    static std::shared_ptr<FICDATAValue> create(std::string &&value);
-};
-
-struct FIDecoder {
-    virtual std::shared_ptr<const FIValue> decode(const uint8_t *data, size_t len) = 0;
-    virtual ~FIDecoder() {}
-};
-
-struct FIQName {
-    const char *name;
-    const char *prefix;
-    const char *uri;
-};
-
-struct FIVocabulary {
-    const char **restrictedAlphabetTable;
-    size_t restrictedAlphabetTableSize;
-    const char **encodingAlgorithmTable;
-    size_t encodingAlgorithmTableSize;
-    const char **prefixTable;
-    size_t prefixTableSize;
-    const char **namespaceNameTable;
-    size_t namespaceNameTableSize;
-    const char **localNameTable;
-    size_t localNameTableSize;
-    const char **otherNCNameTable;
-    size_t otherNCNameTableSize;
-    const char **otherURITable;
-    size_t otherURITableSize;
-    const std::shared_ptr<const FIValue> *attributeValueTable;
-    size_t attributeValueTableSize;
-    const std::shared_ptr<const FIValue> *charactersTable;
-    size_t charactersTableSize;
-    const std::shared_ptr<const FIValue> *otherStringTable;
-    size_t otherStringTableSize;
-    const FIQName *elementNameTable;
-    size_t elementNameTableSize;
-    const FIQName *attributeNameTable;
-    size_t attributeNameTableSize;
-};
-
-class IOStream;
-
-class FIReader: public irr::io::IIrrXMLReader<char, irr::io::IXMLBase> {
-public:
-	virtual ~FIReader();
-    virtual std::shared_ptr<const FIValue> getAttributeEncodedValue(int idx) const = 0;
-
-    virtual std::shared_ptr<const FIValue> getAttributeEncodedValue(const char *name) const = 0;
-
-    virtual void registerDecoder(const std::string &algorithmUri, std::unique_ptr<FIDecoder> decoder) = 0;
-
-    virtual void registerVocabulary(const std::string &vocabularyUri, const FIVocabulary *vocabulary) = 0;
-
-    static std::unique_ptr<FIReader> create(IOStream *stream);
-
-};// class IFIReader
-
-inline
-FIReader::~FIReader() {
-	// empty
-}
-
-}// namespace Assimp
-
-#endif // #ifndef ASSIMP_BUILD_NO_X3D_IMPORTER
-
-#endif // INCLUDED_AI_FI_READER_H
diff --git a/code/AssetLib/X3D/X3DImporter.cpp b/code/AssetLib/X3D/X3DImporter.cpp
index c9f9a6b6d..ff6e4f40e 100644
--- a/code/AssetLib/X3D/X3DImporter.cpp
+++ b/code/AssetLib/X3D/X3DImporter.cpp
@@ -4,7 +4,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -47,68 +46,72 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef ASSIMP_BUILD_NO_X3D_IMPORTER
 
 #include "X3DImporter.hpp"
-#include "X3DImporter_Macro.hpp"
 #include <assimp/StringUtils.h>
 
 // Header files, Assimp.
 #include <assimp/DefaultIOSystem.h>
 #include <assimp/fast_atof.h>
-#include "FIReader.hpp"
 
 // Header files, stdlib.
+#include <iterator>
 #include <memory>
 #include <string>
-#include <iterator>
 
 namespace Assimp {
 
-/// \var aiImporterDesc X3DImporter::Description
 /// Constant which holds the importer description
 const aiImporterDesc X3DImporter::Description = {
-	"Extensible 3D(X3D) Importer",
-	"smalcom",
-	"",
-	"See documentation in source code. Chapter: Limitations.",
-	aiImporterFlags_SupportTextFlavour | aiImporterFlags_SupportBinaryFlavour | aiImporterFlags_LimitedSupport | aiImporterFlags_Experimental,
-	0,
-	0,
-	0,
-	0,
-	"x3d x3db"
+    "Extensible 3D(X3D) Importer",
+    "smalcom",
+    "",
+    "See documentation in source code. Chapter: Limitations.",
+    aiImporterFlags_SupportTextFlavour | aiImporterFlags_SupportBinaryFlavour | aiImporterFlags_LimitedSupport | aiImporterFlags_Experimental,
+    0,
+    0,
+    0,
+    0,
+    "x3d x3db"
 };
 
-//const std::regex X3DImporter::pattern_nws(R"([^, \t\r\n]+)");
-//const std::regex X3DImporter::pattern_true(R"(^\s*(?:true|1)\s*$)", std::regex::icase);
-
 struct WordIterator {
     using iterator_category = std::input_iterator_tag;
-    using value_type = const char*;
+    using value_type = const char *;
     using difference_type = ptrdiff_t;
-    using pointer = value_type*;
-    using reference = value_type&;
+    using pointer = value_type *;
+    using reference = value_type &;
 
     static const char *whitespace;
-    const char *start_, *end_;
-    WordIterator(const char *start, const char *end): start_(start), end_(end) {
-        start_ = start + strspn(start, whitespace);
-        if (start_ >= end_) {
-            start_ = 0;
+    const char *mStart, *mEnd;
+
+    WordIterator(const char *start, const char *end) :
+            mStart(start),
+            mEnd(end) {
+        mStart = start + ::strspn(start, whitespace);
+        if (mStart >= mEnd) {
+            mStart = 0;
         }
     }
-    WordIterator(): start_(0), end_(0) {}
-    WordIterator(const WordIterator &other): start_(other.start_), end_(other.end_) {}
+    WordIterator() :
+            mStart(0),
+            mEnd(0) {}
+    WordIterator(const WordIterator &other) :
+            mStart(other.mStart),
+            mEnd(other.mEnd) {}
     WordIterator &operator=(const WordIterator &other) {
-        start_ = other.start_;
-        end_ = other.end_;
+        mStart = other.mStart;
+        mEnd = other.mEnd;
         return *this;
     }
-    bool operator==(const WordIterator &other) const { return start_ == other.start_; }
-    bool operator!=(const WordIterator &other) const { return start_ != other.start_; }
+
+    bool operator==(const WordIterator &other) const { return mStart == other.mStart; }
+
+    bool operator!=(const WordIterator &other) const { return mStart != other.mStart; }
+
     WordIterator &operator++() {
-        start_ += strcspn(start_, whitespace);
-        start_ += strspn(start_, whitespace);
-        if (start_ >= end_) {
-            start_ = 0;
+        mStart += strcspn(mStart, whitespace);
+        mStart += strspn(mStart, whitespace);
+        if (mStart >= mEnd) {
+            mStart = 0;
         }
         return *this;
     }
@@ -117,14 +120,13 @@ struct WordIterator {
         ++(*this);
         return result;
     }
-    const char *operator*() const { return start_; }
+    const char *operator*() const { return mStart; }
 };
 
 const char *WordIterator::whitespace = ", \t\r\n";
 
-X3DImporter::X3DImporter()
-: NodeElement_Cur( nullptr )
-, mReader( nullptr ) {
+X3DImporter::X3DImporter() :
+        mNodeElementCur(nullptr) {
     // empty
 }
 
@@ -134,1602 +136,54 @@ X3DImporter::~X3DImporter() {
 }
 
 void X3DImporter::Clear() {
-	NodeElement_Cur = nullptr;
-	// Delete all elements
-	if(!NodeElement_List.empty()) {
-        for ( std::list<CX3DImporter_NodeElement*>::iterator it = NodeElement_List.begin(); it != NodeElement_List.end(); ++it ) {
+    mNodeElementCur = nullptr;
+    // Delete all elements
+    if (!NodeElement_List.empty()) {
+        for (std::list<X3DNodeElementBase *>::iterator it = NodeElement_List.begin(); it != NodeElement_List.end(); ++it) {
             delete *it;
         }
-		NodeElement_List.clear();
-	}
-}
-
-
-/*********************************************************************************************************************************************/
-/************************************************************ Functions: find set ************************************************************/
-/*********************************************************************************************************************************************/
-
-bool X3DImporter::FindNodeElement_FromRoot(const std::string& pID, const CX3DImporter_NodeElement::EType pType, CX3DImporter_NodeElement** pElement)
-{
-	for(std::list<CX3DImporter_NodeElement*>::iterator it = NodeElement_List.begin(); it != NodeElement_List.end(); ++it)
-	{
-		if(((*it)->Type == pType) && ((*it)->ID == pID))
-		{
-			if(pElement != nullptr) *pElement = *it;
-
-			return true;
-		}
-	}// for(std::list<CX3DImporter_NodeElement*>::iterator it = NodeElement_List.begin(); it != NodeElement_List.end(); it++)
-
-	return false;
-}
-
-bool X3DImporter::FindNodeElement_FromNode(CX3DImporter_NodeElement* pStartNode, const std::string& pID,
-													const CX3DImporter_NodeElement::EType pType, CX3DImporter_NodeElement** pElement)
-{
-    bool found = false;// flag: true - if requested element is found.
-
-	// Check if pStartNode - this is the element, we are looking for.
-	if((pStartNode->Type == pType) && (pStartNode->ID == pID))
-	{
-		found = true;
-        if ( pElement != nullptr )
-        {
-            *pElement = pStartNode;
-        }
-
-		goto fne_fn_end;
-	}// if((pStartNode->Type() == pType) && (pStartNode->ID() == pID))
-
-	// Check childs of pStartNode.
-	for(std::list<CX3DImporter_NodeElement*>::iterator ch_it = pStartNode->Child.begin(); ch_it != pStartNode->Child.end(); ++ch_it)
-	{
-		found = FindNodeElement_FromNode(*ch_it, pID, pType, pElement);
-        if ( found )
-        {
-            break;
-        }
-	}// for(std::list<CX3DImporter_NodeElement*>::iterator ch_it = it->Child.begin(); ch_it != it->Child.end(); ch_it++)
-
-fne_fn_end:
-
-	return found;
-}
-
-bool X3DImporter::FindNodeElement(const std::string& pID, const CX3DImporter_NodeElement::EType pType, CX3DImporter_NodeElement** pElement)
-{
-    CX3DImporter_NodeElement* tnd = NodeElement_Cur;// temporary pointer to node.
-    bool static_search = false;// flag: true if searching in static node.
-
-    // At first check if we have deal with static node. Go up through parent nodes and check flag.
-    while(tnd != nullptr)
-    {
-		if(tnd->Type == CX3DImporter_NodeElement::ENET_Group)
-		{
-			if(((CX3DImporter_NodeElement_Group*)tnd)->Static)
-			{
-				static_search = true;// Flag found, stop walking up. Node with static flag will holded in tnd variable.
-				break;
-			}
-		}
-
-		tnd = tnd->Parent;// go up in graph.
-    }// while(tnd != nullptr)
-
-    // at now call appropriate search function.
-    if ( static_search )
-    {
-        return FindNodeElement_FromNode( tnd, pID, pType, pElement );
-    }
-    else
-    {
-        return FindNodeElement_FromRoot( pID, pType, pElement );
+        NodeElement_List.clear();
     }
 }
 
-/*********************************************************************************************************************************************/
-/************************************************************ Functions: throw set ***********************************************************/
-/*********************************************************************************************************************************************/
+void X3DImporter::ParseFile(const std::string &file, IOSystem *pIOHandler) {
+    ai_assert(nullptr != pIOHandler);
 
-void X3DImporter::Throw_ArgOutOfRange(const std::string& pArgument)
-{
-	throw DeadlyImportError("Argument value is out of range for: \"" + pArgument + "\".");
-}
-
-void X3DImporter::Throw_CloseNotFound(const std::string& pNode)
-{
-	throw DeadlyImportError("Close tag for node <" + pNode + "> not found. Seems file is corrupt.");
-}
-
-void X3DImporter::Throw_ConvertFail_Str2ArrF(const std::string& pAttrValue)
-{
-	throw DeadlyImportError("In <" + std::string(mReader->getNodeName()) + "> failed to convert attribute value \"" + pAttrValue +
-							"\" from string to array of floats.");
-}
-
-void X3DImporter::Throw_DEF_And_USE()
-{
-	throw DeadlyImportError("\"DEF\" and \"USE\" can not be defined both in <" + std::string(mReader->getNodeName()) + ">.");
-}
-
-void X3DImporter::Throw_IncorrectAttr(const std::string& pAttrName)
-{
-	throw DeadlyImportError("Node <" + std::string(mReader->getNodeName()) + "> has incorrect attribute \"" + pAttrName + "\".");
-}
-
-void X3DImporter::Throw_IncorrectAttrValue(const std::string& pAttrName)
-{
-	throw DeadlyImportError("Attribute \"" + pAttrName + "\" in node <" + std::string(mReader->getNodeName()) + "> has incorrect value.");
-}
-
-void X3DImporter::Throw_MoreThanOnceDefined(const std::string& pNodeType, const std::string& pDescription)
-{
-	throw DeadlyImportError("\"" + pNodeType + "\" node can be used only once in " + mReader->getNodeName() + ". Description: " + pDescription);
-}
-
-void X3DImporter::Throw_TagCountIncorrect(const std::string& pNode)
-{
-	throw DeadlyImportError("Count of open and close tags for node <" + pNode + "> are not equivalent. Seems file is corrupt.");
-}
-
-void X3DImporter::Throw_USE_NotFound(const std::string& pAttrValue)
-{
-	throw DeadlyImportError("Not found node with name \"" + pAttrValue + "\" in <" + std::string(mReader->getNodeName()) + ">.");
-}
-
-/*********************************************************************************************************************************************/
-/************************************************************* Functions: XML set ************************************************************/
-/*********************************************************************************************************************************************/
-
-void X3DImporter::XML_CheckNode_MustBeEmpty()
-{
-	if(!mReader->isEmptyElement()) throw DeadlyImportError(std::string("Node <") + mReader->getNodeName() + "> must be empty.");
-}
-
-void X3DImporter::XML_CheckNode_SkipUnsupported(const std::string& pParentNodeName)
-{
-    static const size_t Uns_Skip_Len = 192;
-    const char* Uns_Skip[ Uns_Skip_Len ] = {
-	    // CAD geometry component
-	    "CADAssembly", "CADFace", "CADLayer", "CADPart", "IndexedQuadSet", "QuadSet",
-	    // Core
-	    "ROUTE", "ExternProtoDeclare", "ProtoDeclare", "ProtoInstance", "ProtoInterface", "WorldInfo",
-	    // Distributed interactive simulation (DIS) component
-	    "DISEntityManager", "DISEntityTypeMapping", "EspduTransform", "ReceiverPdu", "SignalPdu", "TransmitterPdu",
-	    // Cube map environmental texturing component
-	    "ComposedCubeMapTexture", "GeneratedCubeMapTexture", "ImageCubeMapTexture",
-	    // Environmental effects component
-	    "Background", "Fog", "FogCoordinate", "LocalFog", "TextureBackground",
-	    // Environmental sensor component
-	    "ProximitySensor", "TransformSensor", "VisibilitySensor",
-	    // Followers component
-	    "ColorChaser", "ColorDamper", "CoordinateChaser", "CoordinateDamper", "OrientationChaser", "OrientationDamper", "PositionChaser", "PositionChaser2D",
-	    "PositionDamper", "PositionDamper2D", "ScalarChaser", "ScalarDamper", "TexCoordChaser2D", "TexCoordDamper2D",
-	    // Geospatial component
-	    "GeoCoordinate", "GeoElevationGrid", "GeoLocation", "GeoLOD", "GeoMetadata", "GeoOrigin", "GeoPositionInterpolator", "GeoProximitySensor",
-	    "GeoTouchSensor", "GeoTransform", "GeoViewpoint",
-	    // Humanoid Animation (H-Anim) component
-	    "HAnimDisplacer", "HAnimHumanoid", "HAnimJoint", "HAnimSegment", "HAnimSite",
-	    // Interpolation component
-	    "ColorInterpolator", "CoordinateInterpolator", "CoordinateInterpolator2D", "EaseInEaseOut", "NormalInterpolator", "OrientationInterpolator",
-	    "PositionInterpolator", "PositionInterpolator2D", "ScalarInterpolator", "SplinePositionInterpolator", "SplinePositionInterpolator2D",
-	    "SplineScalarInterpolator", "SquadOrientationInterpolator",
-	    // Key device sensor component
-	    "KeySensor", "StringSensor",
-	    // Layering component
-	    "Layer", "LayerSet", "Viewport",
-	    // Layout component
-	    "Layout", "LayoutGroup", "LayoutLayer", "ScreenFontStyle", "ScreenGroup",
-	    // Navigation component
-	    "Billboard", "Collision", "LOD", "NavigationInfo", "OrthoViewpoint", "Viewpoint", "ViewpointGroup",
-	    // Networking component
-	    "EXPORT", "IMPORT", "Anchor", "LoadSensor",
-	    // NURBS component
-	    "Contour2D", "ContourPolyline2D", "CoordinateDouble", "NurbsCurve", "NurbsCurve2D", "NurbsOrientationInterpolator", "NurbsPatchSurface",
-	    "NurbsPositionInterpolator", "NurbsSet", "NurbsSurfaceInterpolator", "NurbsSweptSurface", "NurbsSwungSurface", "NurbsTextureCoordinate",
-	    "NurbsTrimmedSurface",
-	    // Particle systems component
-	    "BoundedPhysicsModel", "ConeEmitter", "ExplosionEmitter", "ForcePhysicsModel", "ParticleSystem", "PointEmitter", "PolylineEmitter", "SurfaceEmitter",
-	    "VolumeEmitter", "WindPhysicsModel",
-	    // Picking component
-	    "LinePickSensor", "PickableGroup", "PointPickSensor", "PrimitivePickSensor", "VolumePickSensor",
-	    // Pointing device sensor component
-	    "CylinderSensor", "PlaneSensor", "SphereSensor", "TouchSensor",
-	    // Rendering component
-	    "ClipPlane",
-	    // Rigid body physics
-	    "BallJoint", "CollidableOffset", "CollidableShape", "CollisionCollection", "CollisionSensor", "CollisionSpace", "Contact", "DoubleAxisHingeJoint",
-	    "MotorJoint", "RigidBody", "RigidBodyCollection", "SingleAxisHingeJoint", "SliderJoint", "UniversalJoint",
-	    // Scripting component
-	    "Script",
-	    // Programmable shaders component
-	    "ComposedShader", "FloatVertexAttribute", "Matrix3VertexAttribute", "Matrix4VertexAttribute", "PackagedShader", "ProgramShader", "ShaderPart",
-	    "ShaderProgram",
-	    // Shape component
-	    "FillProperties", "LineProperties", "TwoSidedMaterial",
-	    // Sound component
-	    "AudioClip", "Sound",
-	    // Text component
-	    "FontStyle", "Text",
-	    // Texturing3D Component
-	    "ComposedTexture3D", "ImageTexture3D", "PixelTexture3D", "TextureCoordinate3D", "TextureCoordinate4D", "TextureTransformMatrix3D", "TextureTransform3D",
-	    // Texturing component
-	    "MovieTexture", "MultiTexture", "MultiTextureCoordinate", "MultiTextureTransform", "PixelTexture", "TextureCoordinateGenerator", "TextureProperties",
-	    // Time component
-	    "TimeSensor",
-	    // Event Utilities component
-	    "BooleanFilter", "BooleanSequencer", "BooleanToggle", "BooleanTrigger", "IntegerSequencer", "IntegerTrigger", "TimeTrigger",
-	    // Volume rendering component
-	    "BlendedVolumeStyle", "BoundaryEnhancementVolumeStyle", "CartoonVolumeStyle", "ComposedVolumeStyle", "EdgeEnhancementVolumeStyle", "IsoSurfaceVolumeData",
-	    "OpacityMapVolumeStyle", "ProjectionVolumeStyle", "SegmentedVolumeData", "ShadedVolumeStyle", "SilhouetteEnhancementVolumeStyle", "ToneMappedVolumeStyle",
-	    "VolumeData"
-    };
-
-    const std::string nn( mReader->getNodeName() );
-    bool found = false;
-    bool close_found = false;
-
-	for(size_t i = 0; i < Uns_Skip_Len; i++)
-	{
-		if(nn == Uns_Skip[i])
-		{
-			found = true;
-			if(mReader->isEmptyElement())
-			{
-				close_found = true;
-
-				goto casu_cres;
-			}
-
-			while(mReader->read())
-			{
-				if((mReader->getNodeType() == irr::io::EXN_ELEMENT_END) && (nn == mReader->getNodeName()))
-				{
-					close_found = true;
-
-					goto casu_cres;
-				}
-			}
-		}
+    static const std::string mode = "rb";
+    std::unique_ptr<IOStream> fileStream(pIOHandler->Open(file, mode));
+    if (!fileStream.get()) {
+        throw DeadlyImportError("Failed to open file " + file + ".");
 	}
-
-casu_cres:
-
-	if(!found) throw DeadlyImportError("Unknown node \"" + nn + "\" in " + pParentNodeName + ".");
-
-	if(close_found)
-		LogInfo("Skipping node \"" + nn + "\" in " + pParentNodeName + ".");
-	else
-		Throw_CloseNotFound(nn);
 }
 
-bool X3DImporter::XML_SearchNode(const std::string& pNodeName)
-{
-	while(mReader->read())
-	{
-		if((mReader->getNodeType() == irr::io::EXN_ELEMENT) && XML_CheckNode_NameEqual(pNodeName)) return true;
-	}
-
-	return false;
-}
-
-bool X3DImporter::XML_ReadNode_GetAttrVal_AsBool(const int pAttrIdx)
-{
-    auto boolValue = std::dynamic_pointer_cast<const FIBoolValue>(mReader->getAttributeEncodedValue(pAttrIdx));
-    if (boolValue) {
-        if (boolValue->value.size() == 1) {
-            return boolValue->value.front();
-        }
-        throw DeadlyImportError("Invalid bool value");
-    }
-    else {
-        std::string val(mReader->getAttributeValue(pAttrIdx));
-
-        if(val == "false")
-            return false;
-        else if(val == "true")
+bool X3DImporter::CanRead( const std::string &pFile, IOSystem * /*pIOHandler*/, bool checkSig ) const {
+    if (checkSig) {
+        std::string::size_type pos = pFile.find_last_of(".x3d");
+        if (pos != std::string::npos) {
             return true;
-        else
-            throw DeadlyImportError("Bool attribute value can contain \"false\" or \"true\" not the \"" + val + "\"");
-    }
-}
-
-float X3DImporter::XML_ReadNode_GetAttrVal_AsFloat(const int pAttrIdx)
-{
-    auto floatValue = std::dynamic_pointer_cast<const FIFloatValue>(mReader->getAttributeEncodedValue(pAttrIdx));
-    if (floatValue) {
-        if (floatValue->value.size() == 1) {
-            return floatValue->value.front();
         }
-        throw DeadlyImportError("Invalid float value");
-    }
-    else {
-        std::string val;
-        float tvalf;
-
-        ParseHelper_FixTruncatedFloatString(mReader->getAttributeValue(pAttrIdx), val);
-        fast_atoreal_move(val.c_str(), tvalf, false);
-
-        return tvalf;
-    }
-}
-
-int32_t X3DImporter::XML_ReadNode_GetAttrVal_AsI32(const int pAttrIdx)
-{
-    auto intValue = std::dynamic_pointer_cast<const FIIntValue>(mReader->getAttributeEncodedValue(pAttrIdx));
-    if (intValue) {
-        if (intValue->value.size() == 1) {
-            return intValue->value.front();
-        }
-        throw DeadlyImportError("Invalid int value");
-    }
-    else {
-        return strtol10(mReader->getAttributeValue(pAttrIdx));
-    }
-}
-
-void X3DImporter::XML_ReadNode_GetAttrVal_AsCol3f(const int pAttrIdx, aiColor3D& pValue)
-{
-    std::vector<float> tlist;
-    std::vector<float>::iterator it;
-
-	XML_ReadNode_GetAttrVal_AsArrF(pAttrIdx, tlist);
-	if(tlist.size() != 3) Throw_ConvertFail_Str2ArrF(mReader->getAttributeValue(pAttrIdx));
-
-	it = tlist.begin();
-	pValue.r = *it++;
-	pValue.g = *it++;
-	pValue.b = *it;
-}
-
-void X3DImporter::XML_ReadNode_GetAttrVal_AsVec2f(const int pAttrIdx, aiVector2D& pValue)
-{
-    std::vector<float> tlist;
-    std::vector<float>::iterator it;
-
-	XML_ReadNode_GetAttrVal_AsArrF(pAttrIdx, tlist);
-	if(tlist.size() != 2) Throw_ConvertFail_Str2ArrF(mReader->getAttributeValue(pAttrIdx));
-
-	it = tlist.begin();
-	pValue.x = *it++;
-	pValue.y = *it;
-}
-
-void X3DImporter::XML_ReadNode_GetAttrVal_AsVec3f(const int pAttrIdx, aiVector3D& pValue)
-{
-    std::vector<float> tlist;
-    std::vector<float>::iterator it;
-
-	XML_ReadNode_GetAttrVal_AsArrF(pAttrIdx, tlist);
-	if(tlist.size() != 3) Throw_ConvertFail_Str2ArrF(mReader->getAttributeValue(pAttrIdx));
-
-	it = tlist.begin();
-	pValue.x = *it++;
-	pValue.y = *it++;
-	pValue.z = *it;
-}
-
-void X3DImporter::XML_ReadNode_GetAttrVal_AsArrB(const int pAttrIdx, std::vector<bool>& pValue)
-{
-    auto boolValue = std::dynamic_pointer_cast<const FIBoolValue>(mReader->getAttributeEncodedValue(pAttrIdx));
-    if (boolValue) {
-        pValue = boolValue->value;
-    }
-    else {
-        const char *val = mReader->getAttributeValue(pAttrIdx);
-        pValue.clear();
-
-        //std::cregex_iterator wordItBegin(val, val + strlen(val), pattern_nws);
-        //const std::cregex_iterator wordItEnd;
-        //std::transform(wordItBegin, wordItEnd, std::back_inserter(pValue), [](const std::cmatch &match) { return std::regex_match(match.str(), pattern_true); });
-
-        WordIterator wordItBegin(val, val + strlen(val));
-        WordIterator wordItEnd;
-        std::transform(wordItBegin, wordItEnd, std::back_inserter(pValue), [](const char *match) { return (::tolower(match[0]) == 't') || (match[0] == '1'); });
-    }
-}
-
-void X3DImporter::XML_ReadNode_GetAttrVal_AsArrI32(const int pAttrIdx, std::vector<int32_t>& pValue)
-{
-    auto intValue = std::dynamic_pointer_cast<const FIIntValue>(mReader->getAttributeEncodedValue(pAttrIdx));
-    if (intValue) {
-        pValue = intValue->value;
-    }
-    else {
-        const char *val = mReader->getAttributeValue(pAttrIdx);
-        pValue.clear();
-
-        //std::cregex_iterator wordItBegin(val, val + strlen(val), pattern_nws);
-        //const std::cregex_iterator wordItEnd;
-        //std::transform(wordItBegin, wordItEnd, std::back_inserter(pValue), [](const std::cmatch &match) { return std::stoi(match.str()); });
-
-        WordIterator wordItBegin(val, val + strlen(val));
-        WordIterator wordItEnd;
-        std::transform(wordItBegin, wordItEnd, std::back_inserter(pValue), [](const char *match) { return atoi(match); });
-    }
-}
-
-void X3DImporter::XML_ReadNode_GetAttrVal_AsArrF(const int pAttrIdx, std::vector<float>& pValue)
-{
-    auto floatValue = std::dynamic_pointer_cast<const FIFloatValue>(mReader->getAttributeEncodedValue(pAttrIdx));
-    if (floatValue) {
-        pValue = floatValue->value;
-    }
-    else {
-        const char *val = mReader->getAttributeValue(pAttrIdx);
-        pValue.clear();
-
-        //std::cregex_iterator wordItBegin(val, val + strlen(val), pattern_nws);
-        //const std::cregex_iterator wordItEnd;
-        //std::transform(wordItBegin, wordItEnd, std::back_inserter(pValue), [](const std::cmatch &match) { return std::stof(match.str()); });
-
-        WordIterator wordItBegin(val, val + strlen(val));
-        WordIterator wordItEnd;
-        std::transform(wordItBegin, wordItEnd, std::back_inserter(pValue), [](const char *match) { return static_cast<float>(atof(match)); });
-    }
-}
-
-void X3DImporter::XML_ReadNode_GetAttrVal_AsArrD(const int pAttrIdx, std::vector<double>& pValue)
-{
-    auto doubleValue = std::dynamic_pointer_cast<const FIDoubleValue>(mReader->getAttributeEncodedValue(pAttrIdx));
-    if (doubleValue) {
-        pValue = doubleValue->value;
-    }
-    else {
-        const char *val = mReader->getAttributeValue(pAttrIdx);
-        pValue.clear();
-
-        //std::cregex_iterator wordItBegin(val, val + strlen(val), pattern_nws);
-        //const std::cregex_iterator wordItEnd;
-        //std::transform(wordItBegin, wordItEnd, std::back_inserter(pValue), [](const std::cmatch &match) { return std::stod(match.str()); });
-
-        WordIterator wordItBegin(val, val + strlen(val));
-        WordIterator wordItEnd;
-        std::transform(wordItBegin, wordItEnd, std::back_inserter(pValue), [](const char *match) { return atof(match); });
-    }
-}
-
-void X3DImporter::XML_ReadNode_GetAttrVal_AsListCol3f(const int pAttrIdx, std::list<aiColor3D>& pValue)
-{
-    std::vector<float> tlist;
-
-	XML_ReadNode_GetAttrVal_AsArrF(pAttrIdx, tlist);// read as list
-	if(tlist.size() % 3) Throw_ConvertFail_Str2ArrF(mReader->getAttributeValue(pAttrIdx));
-
-	// copy data to array
-	for(std::vector<float>::iterator it = tlist.begin(); it != tlist.end();)
-	{
-		aiColor3D tcol;
-
-		tcol.r = *it++;
-		tcol.g = *it++;
-		tcol.b = *it++;
-		pValue.push_back(tcol);
-	}
-}
-
-void X3DImporter::XML_ReadNode_GetAttrVal_AsArrCol3f(const int pAttrIdx, std::vector<aiColor3D>& pValue)
-{
-    std::list<aiColor3D> tlist;
-
-	XML_ReadNode_GetAttrVal_AsListCol3f(pAttrIdx, tlist);// read as list
-	// and copy to array
-	if(!tlist.empty())
-	{
-		pValue.reserve(tlist.size());
-		for(std::list<aiColor3D>::iterator it = tlist.begin(); it != tlist.end(); ++it) pValue.push_back(*it);
-	}
-}
-
-void X3DImporter::XML_ReadNode_GetAttrVal_AsListCol4f(const int pAttrIdx, std::list<aiColor4D>& pValue)
-{
-    std::vector<float> tlist;
-
-	XML_ReadNode_GetAttrVal_AsArrF(pAttrIdx, tlist);// read as list
-	if(tlist.size() % 4) Throw_ConvertFail_Str2ArrF(mReader->getAttributeValue(pAttrIdx));
-
-	// copy data to array
-	for(std::vector<float>::iterator it = tlist.begin(); it != tlist.end();)
-	{
-		aiColor4D tcol;
-
-		tcol.r = *it++;
-		tcol.g = *it++;
-		tcol.b = *it++;
-		tcol.a = *it++;
-		pValue.push_back(tcol);
-	}
-}
-
-void X3DImporter::XML_ReadNode_GetAttrVal_AsArrCol4f(const int pAttrIdx, std::vector<aiColor4D>& pValue)
-{
-    std::list<aiColor4D> tlist;
-
-	XML_ReadNode_GetAttrVal_AsListCol4f(pAttrIdx, tlist);// read as list
-	// and copy to array
-	if(!tlist.empty())
-	{
-		pValue.reserve(tlist.size());
-        for ( std::list<aiColor4D>::iterator it = tlist.begin(); it != tlist.end(); ++it )
-        {
-            pValue.push_back( *it );
-        }
-	}
-}
-
-void X3DImporter::XML_ReadNode_GetAttrVal_AsListVec2f(const int pAttrIdx, std::list<aiVector2D>& pValue)
-{
-    std::vector<float> tlist;
-
-	XML_ReadNode_GetAttrVal_AsArrF(pAttrIdx, tlist);// read as list
-    if ( tlist.size() % 2 )
-    {
-        Throw_ConvertFail_Str2ArrF( mReader->getAttributeValue( pAttrIdx ) );
     }
 
-	// copy data to array
-	for(std::vector<float>::iterator it = tlist.begin(); it != tlist.end();)
-	{
-		aiVector2D tvec;
-
-		tvec.x = *it++;
-		tvec.y = *it++;
-		pValue.push_back(tvec);
-	}
+    return false;
 }
 
-void X3DImporter::XML_ReadNode_GetAttrVal_AsArrVec2f(const int pAttrIdx, std::vector<aiVector2D>& pValue)
-{
-    std::list<aiVector2D> tlist;
-
-	XML_ReadNode_GetAttrVal_AsListVec2f(pAttrIdx, tlist);// read as list
-	// and copy to array
-	if(!tlist.empty())
-	{
-		pValue.reserve(tlist.size());
-        for ( std::list<aiVector2D>::iterator it = tlist.begin(); it != tlist.end(); ++it )
-        {
-            pValue.push_back( *it );
-        }
-	}
+void X3DImporter::GetExtensionList( std::set<std::string> &extensionList ) {
+    extensionList.insert("x3d");
 }
 
-void X3DImporter::XML_ReadNode_GetAttrVal_AsListVec3f(const int pAttrIdx, std::list<aiVector3D>& pValue)
-{
-    std::vector<float> tlist;
-
-	XML_ReadNode_GetAttrVal_AsArrF(pAttrIdx, tlist);// read as list
-    if ( tlist.size() % 3 )
-    {
-        Throw_ConvertFail_Str2ArrF( mReader->getAttributeValue( pAttrIdx ) );
+void X3DImporter::InternReadFile( const std::string &pFile, aiScene *pScene, IOSystem *pIOHandler ) {
+    std::shared_ptr<IOStream> stream(pIOHandler->Open(pFile, "rb"));
+    if (!stream) {
+        throw DeadlyImportError("Could not open file for reading");
     }
 
-	// copy data to array
-	for(std::vector<float>::iterator it = tlist.begin(); it != tlist.end();)
-	{
-		aiVector3D tvec;
-
-		tvec.x = *it++;
-		tvec.y = *it++;
-		tvec.z = *it++;
-		pValue.push_back(tvec);
-	}
+    pScene->mRootNode = new aiNode(pFile);
 }
 
-void X3DImporter::XML_ReadNode_GetAttrVal_AsArrVec3f(const int pAttrIdx, std::vector<aiVector3D>& pValue)
-{
-    std::list<aiVector3D> tlist;
-
-	XML_ReadNode_GetAttrVal_AsListVec3f(pAttrIdx, tlist);// read as list
-	// and copy to array
-	if(!tlist.empty())
-	{
-		pValue.reserve(tlist.size());
-        for ( std::list<aiVector3D>::iterator it = tlist.begin(); it != tlist.end(); ++it )
-        {
-            pValue.push_back( *it );
-        }
-	}
+const aiImporterDesc *X3DImporter::GetInfo() const {
+    return &Description;
 }
 
-void X3DImporter::XML_ReadNode_GetAttrVal_AsListS(const int pAttrIdx, std::list<std::string>& pValue)
-{
-	// make copy of attribute value - strings list.
-	const size_t tok_str_len = strlen(mReader->getAttributeValue(pAttrIdx));
-    if ( 0 == tok_str_len )
-    {
-        Throw_IncorrectAttrValue( mReader->getAttributeName( pAttrIdx ) );
-    }
-
-	// get pointer to begin of value.
-    char *tok_str = const_cast<char*>(mReader->getAttributeValue(pAttrIdx));
-    char *tok_str_end = tok_str + tok_str_len;
-	// string list has following format: attr_name='"s1" "s2" "sn"'.
-	do
-	{
-		char* tbeg;
-		char* tend;
-		size_t tlen;
-		std::string tstr;
-
-		// find begin of string(element of string list): "sn".
-		tbeg = strstr(tok_str, "\"");
-		if(tbeg == nullptr) Throw_IncorrectAttrValue(mReader->getAttributeName(pAttrIdx));
-
-		tbeg++;// forward pointer from '\"' symbol to next after it.
-		tok_str = tbeg;
-		// find end of string(element of string list): "sn".
-		tend = strstr(tok_str, "\"");
-		if(tend == nullptr) Throw_IncorrectAttrValue(mReader->getAttributeName(pAttrIdx));
-
-		tok_str = tend + 1;
-		// create storage for new string
-		tlen = tend - tbeg;
-		tstr.resize(tlen);// reserve enough space and copy data
-		memcpy((void*)tstr.data(), tbeg, tlen);// not strcpy because end of copied string from tok_str has no terminator.
-		// and store string in output list.
-		pValue.push_back(tstr);
-	} while(tok_str < tok_str_end);
-}
-
-/*********************************************************************************************************************************************/
-/****************************************************** Functions: geometry helper set  ******************************************************/
-/*********************************************************************************************************************************************/
-
-aiVector3D X3DImporter::GeometryHelper_Make_Point2D(const float pAngle, const float pRadius)
-{
-	return aiVector3D(pRadius * std::cos(pAngle), pRadius * std::sin(pAngle), 0);
-}
-
-void X3DImporter::GeometryHelper_Make_Arc2D(const float pStartAngle, const float pEndAngle, const float pRadius, size_t pNumSegments,
-												std::list<aiVector3D>& pVertices)
-{
-	// check argument values ranges.
-    if ( ( pStartAngle < -AI_MATH_TWO_PI_F ) || ( pStartAngle > AI_MATH_TWO_PI_F ) )
-    {
-        Throw_ArgOutOfRange( "GeometryHelper_Make_Arc2D.pStartAngle" );
-    }
-    if ( ( pEndAngle < -AI_MATH_TWO_PI_F ) || ( pEndAngle > AI_MATH_TWO_PI_F ) )
-    {
-        Throw_ArgOutOfRange( "GeometryHelper_Make_Arc2D.pEndAngle" );
-    }
-    if ( pRadius <= 0 )
-    {
-        Throw_ArgOutOfRange( "GeometryHelper_Make_Arc2D.pRadius" );
-    }
-
-	// calculate arc angle and check type of arc
-	float angle_full = std::fabs(pEndAngle - pStartAngle);
-    if ( ( angle_full > AI_MATH_TWO_PI_F ) || ( angle_full == 0.0f ) )
-    {
-        angle_full = AI_MATH_TWO_PI_F;
-    }
-
-	// calculate angle for one step - angle to next point of line.
-	float angle_step = angle_full / (float)pNumSegments;
-	// make points
-	for(size_t pi = 0; pi <= pNumSegments; pi++)
-	{
-		float tangle = pStartAngle + pi * angle_step;
-		pVertices.push_back(GeometryHelper_Make_Point2D(tangle, pRadius));
-	}// for(size_t pi = 0; pi <= pNumSegments; pi++)
-
-	// if we making full circle then add last vertex equal to first vertex
-	if(angle_full == AI_MATH_TWO_PI_F) pVertices.push_back(*pVertices.begin());
-}
-
-void X3DImporter::GeometryHelper_Extend_PointToLine(const std::list<aiVector3D>& pPoint, std::list<aiVector3D>& pLine)
-{
-    std::list<aiVector3D>::const_iterator pit = pPoint.begin();
-    std::list<aiVector3D>::const_iterator pit_last = pPoint.end();
-
-	--pit_last;
-
-    if ( pPoint.size() < 2 )
-    {
-        Throw_ArgOutOfRange( "GeometryHelper_Extend_PointToLine.pPoint.size() can not be less than 2." );
-    }
-
-	// add first point of first line.
-	pLine.push_back(*pit++);
-	// add internal points
-	while(pit != pit_last)
-	{
-		pLine.push_back(*pit);// second point of previous line
-		pLine.push_back(*pit);// first point of next line
-		++pit;
-	}
-	// add last point of last line
-	pLine.push_back(*pit);
-}
-
-void X3DImporter::GeometryHelper_Extend_PolylineIdxToLineIdx(const std::list<int32_t>& pPolylineCoordIdx, std::list<int32_t>& pLineCoordIdx)
-{
-    std::list<int32_t>::const_iterator plit = pPolylineCoordIdx.begin();
-
-	while(plit != pPolylineCoordIdx.end())
-	{
-		// add first point of polyline
-		pLineCoordIdx.push_back(*plit++);
-		while((*plit != (-1)) && (plit != pPolylineCoordIdx.end()))
-		{
-			std::list<int32_t>::const_iterator plit_next;
-
-			plit_next = plit, ++plit_next;
-			pLineCoordIdx.push_back(*plit);// second point of previous line.
-			pLineCoordIdx.push_back(-1);// delimiter
-			if((*plit_next == (-1)) || (plit_next == pPolylineCoordIdx.end())) break;// current polyline is finished
-
-			pLineCoordIdx.push_back(*plit);// first point of next line.
-			plit = plit_next;
-		}// while((*plit != (-1)) && (plit != pPolylineCoordIdx.end()))
-	}// while(plit != pPolylineCoordIdx.end())
-}
-
-#define MESH_RectParallelepiped_CREATE_VERT \
-aiVector3D vert_set[8]; \
-float x1, x2, y1, y2, z1, z2, hs; \
- \
-	hs = pSize.x / 2, x1 = -hs, x2 = hs; \
-	hs = pSize.y / 2, y1 = -hs, y2 = hs; \
-	hs = pSize.z / 2, z1 = -hs, z2 = hs; \
-	vert_set[0].Set(x2, y1, z2); \
-	vert_set[1].Set(x2, y2, z2); \
-	vert_set[2].Set(x2, y2, z1); \
-	vert_set[3].Set(x2, y1, z1); \
-	vert_set[4].Set(x1, y1, z2); \
-	vert_set[5].Set(x1, y2, z2); \
-	vert_set[6].Set(x1, y2, z1); \
-	vert_set[7].Set(x1, y1, z1)
-
-void X3DImporter::GeometryHelper_MakeQL_RectParallelepiped(const aiVector3D& pSize, std::list<aiVector3D>& pVertices)
-{
-	MESH_RectParallelepiped_CREATE_VERT;
-	MACRO_FACE_ADD_QUAD_FA(true, pVertices, vert_set, 3, 2, 1, 0);// front
-	MACRO_FACE_ADD_QUAD_FA(true, pVertices, vert_set, 6, 7, 4, 5);// back
-	MACRO_FACE_ADD_QUAD_FA(true, pVertices, vert_set, 7, 3, 0, 4);// left
-	MACRO_FACE_ADD_QUAD_FA(true, pVertices, vert_set, 2, 6, 5, 1);// right
-	MACRO_FACE_ADD_QUAD_FA(true, pVertices, vert_set, 0, 1, 5, 4);// top
-	MACRO_FACE_ADD_QUAD_FA(true, pVertices, vert_set, 7, 6, 2, 3);// bottom
-}
-
-#undef MESH_RectParallelepiped_CREATE_VERT
-
-void X3DImporter::GeometryHelper_CoordIdxStr2FacesArr(const std::vector<int32_t>& pCoordIdx, std::vector<aiFace>& pFaces, unsigned int& pPrimitiveTypes) const
-{
-    std::vector<int32_t> f_data(pCoordIdx);
-    std::vector<unsigned int> inds;
-    unsigned int prim_type = 0;
-
-    if ( f_data.back() != ( -1 ) )
-    {
-        f_data.push_back( -1 );
-    }
-
-	// reserve average size.
-	pFaces.reserve(f_data.size() / 3);
-	inds.reserve(4);
-    //PrintVectorSet("build. ci", pCoordIdx);
-	for(std::vector<int32_t>::iterator it = f_data.begin(); it != f_data.end(); ++it)
-	{
-		// when face is got count how many indices in it.
-		if(*it == (-1))
-		{
-			aiFace tface;
-			size_t ts;
-
-			ts = inds.size();
-			switch(ts)
-			{
-				case 0: goto mg_m_err;
-				case 1: prim_type |= aiPrimitiveType_POINT; break;
-				case 2: prim_type |= aiPrimitiveType_LINE; break;
-				case 3: prim_type |= aiPrimitiveType_TRIANGLE; break;
-				default: prim_type |= aiPrimitiveType_POLYGON; break;
-			}
-
-			tface.mNumIndices = static_cast<unsigned int>(ts);
-			tface.mIndices = new unsigned int[ts];
-			memcpy(tface.mIndices, inds.data(), ts * sizeof(unsigned int));
-			pFaces.push_back(tface);
-			inds.clear();
-		}// if(*it == (-1))
-		else
-		{
-			inds.push_back(*it);
-		}// if(*it == (-1)) else
-	}// for(std::list<int32_t>::iterator it = f_data.begin(); it != f_data.end(); it++)
-//PrintVectorSet("build. faces", pCoordIdx);
-
-	pPrimitiveTypes = prim_type;
-
-	return;
-
-mg_m_err:
-
-	for(size_t i = 0, i_e = pFaces.size(); i < i_e; i++) delete [] pFaces.at(i).mIndices;
-
-	pFaces.clear();
-}
-
-void X3DImporter::MeshGeometry_AddColor(aiMesh& pMesh, const std::list<aiColor3D>& pColors, const bool pColorPerVertex) const
-{
-std::list<aiColor4D> tcol;
-
-	// create RGBA array from RGB.
-	for(std::list<aiColor3D>::const_iterator it = pColors.begin(); it != pColors.end(); ++it) tcol.push_back(aiColor4D((*it).r, (*it).g, (*it).b, 1));
-
-	// call existing function for adding RGBA colors
-	MeshGeometry_AddColor(pMesh, tcol, pColorPerVertex);
-}
-
-void X3DImporter::MeshGeometry_AddColor(aiMesh& pMesh, const std::list<aiColor4D>& pColors, const bool pColorPerVertex) const
-{
-    std::list<aiColor4D>::const_iterator col_it = pColors.begin();
-
-	if(pColorPerVertex)
-	{
-		if(pColors.size() < pMesh.mNumVertices)
-		{
-			throw DeadlyImportError("MeshGeometry_AddColor1. Colors count(" + to_string(pColors.size()) + ") can not be less than Vertices count(" +
-									to_string(pMesh.mNumVertices) +  ").");
-		}
-
-		// copy colors to mesh
-		pMesh.mColors[0] = new aiColor4D[pMesh.mNumVertices];
-		for(size_t i = 0; i < pMesh.mNumVertices; i++) pMesh.mColors[0][i] = *col_it++;
-	}// if(pColorPerVertex)
-	else
-	{
-		if(pColors.size() < pMesh.mNumFaces)
-		{
-			throw DeadlyImportError("MeshGeometry_AddColor1. Colors count(" + to_string(pColors.size()) + ") can not be less than Faces count(" +
-									to_string(pMesh.mNumFaces) +  ").");
-		}
-
-		// copy colors to mesh
-		pMesh.mColors[0] = new aiColor4D[pMesh.mNumVertices];
-		for(size_t fi = 0; fi < pMesh.mNumFaces; fi++)
-		{
-			// apply color to all vertices of face
-            for ( size_t vi = 0, vi_e = pMesh.mFaces[ fi ].mNumIndices; vi < vi_e; vi++ )
-            {
-                pMesh.mColors[ 0 ][ pMesh.mFaces[ fi ].mIndices[ vi ] ] = *col_it;
-            }
-
-			++col_it;
-		}
-	}// if(pColorPerVertex) else
-}
-
-void X3DImporter::MeshGeometry_AddColor(aiMesh& pMesh, const std::vector<int32_t>& pCoordIdx, const std::vector<int32_t>& pColorIdx,
-										const std::list<aiColor3D>& pColors, const bool pColorPerVertex) const
-{
-    std::list<aiColor4D> tcol;
-
-	// create RGBA array from RGB.
-    for ( std::list<aiColor3D>::const_iterator it = pColors.begin(); it != pColors.end(); ++it )
-    {
-        tcol.push_back( aiColor4D( ( *it ).r, ( *it ).g, ( *it ).b, 1 ) );
-    }
-
-	// call existing function for adding RGBA colors
-	MeshGeometry_AddColor(pMesh, pCoordIdx, pColorIdx, tcol, pColorPerVertex);
-}
-
-void X3DImporter::MeshGeometry_AddColor(aiMesh& pMesh, const std::vector<int32_t>& pCoordIdx, const std::vector<int32_t>& pColorIdx,
-										const std::list<aiColor4D>& pColors, const bool pColorPerVertex) const
-{
-    std::vector<aiColor4D> col_tgt_arr;
-    std::list<aiColor4D> col_tgt_list;
-    std::vector<aiColor4D> col_arr_copy;
-
-    if ( pCoordIdx.size() == 0 )
-    {
-        throw DeadlyImportError( "MeshGeometry_AddColor2. pCoordIdx can not be empty." );
-    }
-
-	// copy list to array because we are need indexed access to colors.
-	col_arr_copy.reserve(pColors.size());
-    for ( std::list<aiColor4D>::const_iterator it = pColors.begin(); it != pColors.end(); ++it )
-    {
-        col_arr_copy.push_back( *it );
-    }
-
-	if(pColorPerVertex)
-	{
-		if(pColorIdx.size() > 0)
-		{
-			// check indices array count.
-			if(pColorIdx.size() < pCoordIdx.size())
-			{
-				throw DeadlyImportError("MeshGeometry_AddColor2. Colors indices count(" + to_string(pColorIdx.size()) +
-										") can not be less than Coords inidces count(" + to_string(pCoordIdx.size()) +  ").");
-			}
-			// create list with colors for every vertex.
-			col_tgt_arr.resize(pMesh.mNumVertices);
-			for(std::vector<int32_t>::const_iterator colidx_it = pColorIdx.begin(), coordidx_it = pCoordIdx.begin(); colidx_it != pColorIdx.end(); ++colidx_it, ++coordidx_it)
-			{
-                if ( *colidx_it == ( -1 ) )
-                {
-                    continue;// skip faces delimiter
-                }
-                if ( ( unsigned int ) ( *coordidx_it ) > pMesh.mNumVertices )
-                {
-                    throw DeadlyImportError( "MeshGeometry_AddColor2. Coordinate idx is out of range." );
-                }
-                if ( ( unsigned int ) *colidx_it > pMesh.mNumVertices )
-                {
-                    throw DeadlyImportError( "MeshGeometry_AddColor2. Color idx is out of range." );
-                }
-
-				col_tgt_arr[*coordidx_it] = col_arr_copy[*colidx_it];
-			}
-		}// if(pColorIdx.size() > 0)
-		else
-		{
-			// when color indices list is absent use CoordIdx.
-			// check indices array count.
-			if(pColors.size() < pMesh.mNumVertices)
-			{
-				throw DeadlyImportError("MeshGeometry_AddColor2. Colors count(" + to_string(pColors.size()) + ") can not be less than Vertices count(" +
-										to_string(pMesh.mNumVertices) +  ").");
-			}
-			// create list with colors for every vertex.
-			col_tgt_arr.resize(pMesh.mNumVertices);
-            for ( size_t i = 0; i < pMesh.mNumVertices; i++ )
-            {
-                col_tgt_arr[ i ] = col_arr_copy[ i ];
-            }
-		}// if(pColorIdx.size() > 0) else
-	}// if(pColorPerVertex)
-	else
-	{
-		if(pColorIdx.size() > 0)
-		{
-			// check indices array count.
-			if(pColorIdx.size() < pMesh.mNumFaces)
-			{
-				throw DeadlyImportError("MeshGeometry_AddColor2. Colors indices count(" + to_string(pColorIdx.size()) +
-										") can not be less than Faces count(" + to_string(pMesh.mNumFaces) +  ").");
-			}
-			// create list with colors for every vertex using faces indices.
-			col_tgt_arr.resize(pMesh.mNumFaces);
-
-			std::vector<int32_t>::const_iterator colidx_it = pColorIdx.begin();
-			for(size_t fi = 0; fi < pMesh.mNumFaces; fi++)
-			{
-				if((unsigned int)*colidx_it > pMesh.mNumFaces) throw DeadlyImportError("MeshGeometry_AddColor2. Face idx is out of range.");
-
-				col_tgt_arr[fi] = col_arr_copy[*colidx_it++];
-			}
-		}// if(pColorIdx.size() > 0)
-		else
-		{
-			// when color indices list is absent use CoordIdx.
-			// check indices array count.
-			if(pColors.size() < pMesh.mNumFaces)
-			{
-				throw DeadlyImportError("MeshGeometry_AddColor2. Colors count(" + to_string(pColors.size()) + ") can not be less than Faces count(" +
-										to_string(pMesh.mNumFaces) +  ").");
-			}
-			// create list with colors for every vertex using faces indices.
-			col_tgt_arr.resize(pMesh.mNumFaces);
-			for(size_t fi = 0; fi < pMesh.mNumFaces; fi++) col_tgt_arr[fi] = col_arr_copy[fi];
-
-		}// if(pColorIdx.size() > 0) else
-	}// if(pColorPerVertex) else
-
-	// copy array to list for calling function that add colors.
-	for(std::vector<aiColor4D>::const_iterator it = col_tgt_arr.begin(); it != col_tgt_arr.end(); ++it) col_tgt_list.push_back(*it);
-	// add prepared colors list to mesh.
-	MeshGeometry_AddColor(pMesh, col_tgt_list, pColorPerVertex);
-}
-
-void X3DImporter::MeshGeometry_AddNormal(aiMesh& pMesh, const std::vector<int32_t>& pCoordIdx, const std::vector<int32_t>& pNormalIdx,
-								const std::list<aiVector3D>& pNormals, const bool pNormalPerVertex) const
-{
-    std::vector<size_t> tind;
-    std::vector<aiVector3D> norm_arr_copy;
-
-	// copy list to array because we are need indexed access to normals.
-	norm_arr_copy.reserve(pNormals.size());
-    for ( std::list<aiVector3D>::const_iterator it = pNormals.begin(); it != pNormals.end(); ++it )
-    {
-        norm_arr_copy.push_back( *it );
-    }
-
-	if(pNormalPerVertex)
-	{
-		if(pNormalIdx.size() > 0)
-		{
-			// check indices array count.
-			if(pNormalIdx.size() != pCoordIdx.size()) throw DeadlyImportError("Normals and Coords inidces count must be equal.");
-
-			tind.reserve(pNormalIdx.size());
-			for(std::vector<int32_t>::const_iterator it = pNormalIdx.begin(); it != pNormalIdx.end(); ++it)
-			{
-				if(*it != (-1)) tind.push_back(*it);
-			}
-
-			// copy normals to mesh
-			pMesh.mNormals = new aiVector3D[pMesh.mNumVertices];
-			for(size_t i = 0; (i < pMesh.mNumVertices) && (i < tind.size()); i++)
-			{
-				if(tind[i] >= norm_arr_copy.size())
-					throw DeadlyImportError("MeshGeometry_AddNormal. Normal index(" + to_string(tind[i]) +
-											") is out of range. Normals count: " + to_string(norm_arr_copy.size()) + ".");
-
-				pMesh.mNormals[i] = norm_arr_copy[tind[i]];
-			}
-		}
-		else
-		{
-			if(pNormals.size() != pMesh.mNumVertices) throw DeadlyImportError("MeshGeometry_AddNormal. Normals and vertices count must be equal.");
-
-			// copy normals to mesh
-			pMesh.mNormals = new aiVector3D[pMesh.mNumVertices];
-			std::list<aiVector3D>::const_iterator norm_it = pNormals.begin();
-			for(size_t i = 0; i < pMesh.mNumVertices; i++) pMesh.mNormals[i] = *norm_it++;
-		}
-	}// if(pNormalPerVertex)
-	else
-	{
-		if(pNormalIdx.size() > 0)
-		{
-			if(pMesh.mNumFaces != pNormalIdx.size()) throw DeadlyImportError("Normals faces count must be equal to mesh faces count.");
-
-			std::vector<int32_t>::const_iterator normidx_it = pNormalIdx.begin();
-
-			tind.reserve(pNormalIdx.size());
-			for(size_t i = 0, i_e = pNormalIdx.size(); i < i_e; i++) tind.push_back(*normidx_it++);
-
-		}
-		else
-		{
-			tind.reserve(pMesh.mNumFaces);
-			for(size_t i = 0; i < pMesh.mNumFaces; i++) tind.push_back(i);
-
-		}
-
-		// copy normals to mesh
-		pMesh.mNormals = new aiVector3D[pMesh.mNumVertices];
-		for(size_t fi = 0; fi < pMesh.mNumFaces; fi++)
-		{
-			aiVector3D tnorm;
-
-			tnorm = norm_arr_copy[tind[fi]];
-			for(size_t vi = 0, vi_e = pMesh.mFaces[fi].mNumIndices; vi < vi_e; vi++) pMesh.mNormals[pMesh.mFaces[fi].mIndices[vi]] = tnorm;
-		}
-	}// if(pNormalPerVertex) else
-}
-
-void X3DImporter::MeshGeometry_AddNormal(aiMesh& pMesh, const std::list<aiVector3D>& pNormals, const bool pNormalPerVertex) const
-{
-    std::list<aiVector3D>::const_iterator norm_it = pNormals.begin();
-
-	if(pNormalPerVertex)
-	{
-		if(pNormals.size() != pMesh.mNumVertices) throw DeadlyImportError("MeshGeometry_AddNormal. Normals and vertices count must be equal.");
-
-		// copy normals to mesh
-		pMesh.mNormals = new aiVector3D[pMesh.mNumVertices];
-		for(size_t i = 0; i < pMesh.mNumVertices; i++) pMesh.mNormals[i] = *norm_it++;
-	}// if(pNormalPerVertex)
-	else
-	{
-		if(pNormals.size() != pMesh.mNumFaces) throw DeadlyImportError("MeshGeometry_AddNormal. Normals and faces count must be equal.");
-
-		// copy normals to mesh
-		pMesh.mNormals = new aiVector3D[pMesh.mNumVertices];
-		for(size_t fi = 0; fi < pMesh.mNumFaces; fi++)
-		{
-			// apply color to all vertices of face
-			for(size_t vi = 0, vi_e = pMesh.mFaces[fi].mNumIndices; vi < vi_e; vi++) pMesh.mNormals[pMesh.mFaces[fi].mIndices[vi]] = *norm_it;
-
-			++norm_it;
-		}
-	}// if(pNormalPerVertex) else
-}
-
-void X3DImporter::MeshGeometry_AddTexCoord(aiMesh& pMesh, const std::vector<int32_t>& pCoordIdx, const std::vector<int32_t>& pTexCoordIdx,
-								const std::list<aiVector2D>& pTexCoords) const
-{
-    std::vector<aiVector3D> texcoord_arr_copy;
-    std::vector<aiFace> faces;
-    unsigned int prim_type;
-
-	// copy list to array because we are need indexed access to normals.
-	texcoord_arr_copy.reserve(pTexCoords.size());
-	for(std::list<aiVector2D>::const_iterator it = pTexCoords.begin(); it != pTexCoords.end(); ++it)
-	{
-		texcoord_arr_copy.push_back(aiVector3D((*it).x, (*it).y, 0));
-	}
-
-	if(pTexCoordIdx.size() > 0)
-	{
-		GeometryHelper_CoordIdxStr2FacesArr(pTexCoordIdx, faces, prim_type);
-        if ( faces.empty() )
-        {
-            throw DeadlyImportError( "Failed to add texture coordinates to mesh, faces list is empty." );
-        }
-        if ( faces.size() != pMesh.mNumFaces )
-        {
-            throw DeadlyImportError( "Texture coordinates faces count must be equal to mesh faces count." );
-        }
-	}
-	else
-	{
-		GeometryHelper_CoordIdxStr2FacesArr(pCoordIdx, faces, prim_type);
-	}
-
-	pMesh.mTextureCoords[0] = new aiVector3D[pMesh.mNumVertices];
-	pMesh.mNumUVComponents[0] = 2;
-	for(size_t fi = 0, fi_e = faces.size(); fi < fi_e; fi++)
-	{
-		if(pMesh.mFaces[fi].mNumIndices != faces.at(fi).mNumIndices)
-			throw DeadlyImportError("Number of indices in texture face and mesh face must be equal. Invalid face index: " + to_string(fi) + ".");
-
-		for(size_t ii = 0; ii < pMesh.mFaces[fi].mNumIndices; ii++)
-		{
-			size_t vert_idx = pMesh.mFaces[fi].mIndices[ii];
-			size_t tc_idx = faces.at(fi).mIndices[ii];
-
-			pMesh.mTextureCoords[0][vert_idx] = texcoord_arr_copy.at(tc_idx);
-		}
-	}// for(size_t fi = 0, fi_e = faces.size(); fi < fi_e; fi++)
-}
-
-void X3DImporter::MeshGeometry_AddTexCoord(aiMesh& pMesh, const std::list<aiVector2D>& pTexCoords) const
-{
-    std::vector<aiVector3D> tc_arr_copy;
-
-    if ( pTexCoords.size() != pMesh.mNumVertices )
-    {
-        throw DeadlyImportError( "MeshGeometry_AddTexCoord. Texture coordinates and vertices count must be equal." );
-    }
-
-	// copy list to array because we are need convert aiVector2D to aiVector3D and also get indexed access as a bonus.
-	tc_arr_copy.reserve(pTexCoords.size());
-    for ( std::list<aiVector2D>::const_iterator it = pTexCoords.begin(); it != pTexCoords.end(); ++it )
-    {
-        tc_arr_copy.push_back( aiVector3D( ( *it ).x, ( *it ).y, 0 ) );
-    }
-
-	// copy texture coordinates to mesh
-	pMesh.mTextureCoords[0] = new aiVector3D[pMesh.mNumVertices];
-	pMesh.mNumUVComponents[0] = 2;
-    for ( size_t i = 0; i < pMesh.mNumVertices; i++ )
-    {
-        pMesh.mTextureCoords[ 0 ][ i ] = tc_arr_copy[ i ];
-    }
-}
-
-aiMesh* X3DImporter::GeometryHelper_MakeMesh(const std::vector<int32_t>& pCoordIdx, const std::list<aiVector3D>& pVertices) const
-{
-    std::vector<aiFace> faces;
-    unsigned int prim_type = 0;
-
-	// create faces array from input string with vertices indices.
-	GeometryHelper_CoordIdxStr2FacesArr(pCoordIdx, faces, prim_type);
-    if ( !faces.size() )
-    {
-        throw DeadlyImportError( "Failed to create mesh, faces list is empty." );
-    }
-
-	//
-	// Create new mesh and copy geometry data.
-	//
-    aiMesh *tmesh = new aiMesh;
-    size_t ts = faces.size();
-	// faces
-	tmesh->mFaces = new aiFace[ts];
-	tmesh->mNumFaces = static_cast<unsigned int>(ts);
-	for(size_t i = 0; i < ts; i++) tmesh->mFaces[i] = faces.at(i);
-
-	// vertices
-	std::list<aiVector3D>::const_iterator vit = pVertices.begin();
-
-	ts = pVertices.size();
-	tmesh->mVertices = new aiVector3D[ts];
-	tmesh->mNumVertices = static_cast<unsigned int>(ts);
-    for ( size_t i = 0; i < ts; i++ )
-    {
-        tmesh->mVertices[ i ] = *vit++;
-    }
-
-	// set primitives type and return result.
-	tmesh->mPrimitiveTypes = prim_type;
-
-	return tmesh;
-}
-
-/*********************************************************************************************************************************************/
-/************************************************************ Functions: parse set ***********************************************************/
-/*********************************************************************************************************************************************/
-
-void X3DImporter::ParseHelper_Group_Begin(const bool pStatic)
-{
-    CX3DImporter_NodeElement_Group* new_group = new CX3DImporter_NodeElement_Group(NodeElement_Cur, pStatic);// create new node with current node as parent.
-
-	// if we are adding not the root element then add new element to current element child list.
-    if ( NodeElement_Cur != nullptr )
-    {
-        NodeElement_Cur->Child.push_back( new_group );
-    }
-
-	NodeElement_List.push_back(new_group);// it's a new element - add it to list.
-	NodeElement_Cur = new_group;// switch current element to new one.
-}
-
-void X3DImporter::ParseHelper_Node_Enter(CX3DImporter_NodeElement* pNode)
-{
-	NodeElement_Cur->Child.push_back(pNode);// add new element to current element child list.
-	NodeElement_Cur = pNode;// switch current element to new one.
-}
-
-void X3DImporter::ParseHelper_Node_Exit()
-{
-	// check if we can walk up.
-    if ( NodeElement_Cur != nullptr )
-    {
-        NodeElement_Cur = NodeElement_Cur->Parent;
-    }
-}
-
-void X3DImporter::ParseHelper_FixTruncatedFloatString(const char* pInStr, std::string& pOutString)
-{
-	pOutString.clear();
-    const size_t instr_len = strlen(pInStr);
-    if ( 0 == instr_len )
-    {
-        return;
-    }
-
-	pOutString.reserve(instr_len * 3 / 2);
-	// check and correct floats in format ".x". Must be "x.y".
-    if ( pInStr[ 0 ] == '.' )
-    {
-        pOutString.push_back( '0' );
-    }
-
-	pOutString.push_back(pInStr[0]);
-	for(size_t ci = 1; ci < instr_len; ci++)
-	{
-		if((pInStr[ci] == '.') && ((pInStr[ci - 1] == ' ') || (pInStr[ci - 1] == '-') || (pInStr[ci - 1] == '+') || (pInStr[ci - 1] == '\t')))
-		{
-			pOutString.push_back('0');
-			pOutString.push_back('.');
-		}
-		else
-		{
-			pOutString.push_back(pInStr[ci]);
-		}
-	}
-}
-
-extern FIVocabulary X3D_vocabulary_3_2;
-extern FIVocabulary X3D_vocabulary_3_3;
-
-void X3DImporter::ParseFile(const std::string& pFile, IOSystem* pIOHandler)
-{
-    std::unique_ptr<FIReader> OldReader = std::move(mReader);// store current XMLreader.
-    std::unique_ptr<IOStream> file(pIOHandler->Open(pFile, "rb"));
-
-	// Check whether we can read from the file
-    if ( file.get() == nullptr )
-    {
-        throw DeadlyImportError( "Failed to open X3D file " + pFile + "." );
-    }
-	mReader = FIReader::create(file.get());
-    if ( !mReader )
-    {
-        throw DeadlyImportError( "Failed to create XML reader for file" + pFile + "." );
-    }
-    mReader->registerVocabulary("urn:web3d:x3d:fi-vocabulary-3.2", &X3D_vocabulary_3_2);
-    mReader->registerVocabulary("urn:web3d:x3d:fi-vocabulary-3.3", &X3D_vocabulary_3_3);
-	// start reading
-	ParseNode_Root();
-
-	// restore old XMLreader
-	mReader = std::move(OldReader);
-}
-
-void X3DImporter::ParseNode_Root()
-{
-	// search for root tag <X3D>
-    if ( !XML_SearchNode( "X3D" ) )
-    {
-        throw DeadlyImportError( "Root node \"X3D\" not found." );
-    }
-
-	ParseHelper_Group_Begin();// create root node element.
-	// parse other contents
-	while(mReader->read())
-	{
-        if ( mReader->getNodeType() != irr::io::EXN_ELEMENT )
-        {
-            continue;
-        }
-
-		if(XML_CheckNode_NameEqual("head"))
-			ParseNode_Head();
-		else if(XML_CheckNode_NameEqual("Scene"))
-			ParseNode_Scene();
-		else
-			XML_CheckNode_SkipUnsupported("Root");
-	}
-
-	// exit from root node element.
-	ParseHelper_Node_Exit();
-}
-
-void X3DImporter::ParseNode_Head()
-{
-    bool close_found = false;// flag: true if close tag of node are found.
-
-	while(mReader->read())
-	{
-		if(mReader->getNodeType() == irr::io::EXN_ELEMENT)
-		{
-			if(XML_CheckNode_NameEqual("meta"))
-			{
-				XML_CheckNode_MustBeEmpty();
-
-				// adding metadata from <head> as MetaString from <Scene>
-                bool added( false );
-                CX3DImporter_NodeElement_MetaString* ms = new CX3DImporter_NodeElement_MetaString(NodeElement_Cur);
-
-				ms->Name = mReader->getAttributeValueSafe("name");
-				// name must not be empty
-				if(!ms->Name.empty())
-				{
-					ms->Value.push_back(mReader->getAttributeValueSafe("content"));
-					NodeElement_List.push_back(ms);
-                    if ( NodeElement_Cur != nullptr )
-                    {
-                        NodeElement_Cur->Child.push_back( ms );
-                        added = true;
-                    }
-				}
-                // if an error has occurred, release instance
-                if ( !added ) {
-                    delete ms;
-                }
-			}// if(XML_CheckNode_NameEqual("meta"))
-		}// if(mReader->getNodeType() == irr::io::EXN_ELEMENT)
-		else if(mReader->getNodeType() == irr::io::EXN_ELEMENT_END)
-		{
-			if(XML_CheckNode_NameEqual("head"))
-			{
-				close_found = true;
-				break;
-			}
-		}// if(mReader->getNodeType() == irr::io::EXN_ELEMENT) else
-	}// while(mReader->read())
-
-    if ( !close_found )
-    {
-        Throw_CloseNotFound( "head" );
-    }
-}
-
-void X3DImporter::ParseNode_Scene()
-{
-    auto GroupCounter_Increase = [](size_t& pCounter, const char* pGroupName) -> void
-    {
-	    pCounter++;
-	    if(pCounter == 0) throw DeadlyImportError("Group counter overflow. Too much groups with type: " + std::string(pGroupName) + ".");
-};
-
-auto GroupCounter_Decrease = [&](size_t& pCounter, const char* pGroupName) -> void
-{
-	if(pCounter == 0) Throw_TagCountIncorrect(pGroupName);
-
-	pCounter--;
-};
-
-static const char* GroupName_Group = "Group";
-static const char* GroupName_StaticGroup = "StaticGroup";
-static const char* GroupName_Transform = "Transform";
-static const char* GroupName_Switch = "Switch";
-
-bool close_found = false;
-size_t counter_group = 0;
-size_t counter_transform = 0;
-size_t counter_switch = 0;
-
-	// while create static node? Because objects name used deeper in "USE" attribute can be equal to some meta in <head> node.
-	ParseHelper_Group_Begin(true);
-	while(mReader->read())
-	{
-		if(mReader->getNodeType() == irr::io::EXN_ELEMENT)
-		{
-			if(XML_CheckNode_NameEqual("Shape"))
-			{
-				ParseNode_Shape_Shape();
-			}
-			else if(XML_CheckNode_NameEqual(GroupName_Group))
-			{
-				GroupCounter_Increase(counter_group, GroupName_Group);
-				ParseNode_Grouping_Group();
-				// if node is empty then decrease group counter at this place.
-				if(mReader->isEmptyElement()) GroupCounter_Decrease(counter_group, GroupName_Group);
-			}
-			else if(XML_CheckNode_NameEqual(GroupName_StaticGroup))
-			{
-				GroupCounter_Increase(counter_group, GroupName_StaticGroup);
-				ParseNode_Grouping_StaticGroup();
-				// if node is empty then decrease group counter at this place.
-				if(mReader->isEmptyElement()) GroupCounter_Decrease(counter_group, GroupName_StaticGroup);
-			}
-			else if(XML_CheckNode_NameEqual(GroupName_Transform))
-			{
-				GroupCounter_Increase(counter_transform, GroupName_Transform);
-				ParseNode_Grouping_Transform();
-				// if node is empty then decrease group counter at this place.
-				if(mReader->isEmptyElement()) GroupCounter_Decrease(counter_transform, GroupName_Transform);
-			}
-			else if(XML_CheckNode_NameEqual(GroupName_Switch))
-			{
-				GroupCounter_Increase(counter_switch, GroupName_Switch);
-				ParseNode_Grouping_Switch();
-				// if node is empty then decrease group counter at this place.
-				if(mReader->isEmptyElement()) GroupCounter_Decrease(counter_switch, GroupName_Switch);
-			}
-			else if(XML_CheckNode_NameEqual("DirectionalLight"))
-		{
-				ParseNode_Lighting_DirectionalLight();
-			}
-			else if(XML_CheckNode_NameEqual("PointLight"))
-			{
-				ParseNode_Lighting_PointLight();
-			}
-			else if(XML_CheckNode_NameEqual("SpotLight"))
-			{
-				ParseNode_Lighting_SpotLight();
-			}
-			else if(XML_CheckNode_NameEqual("Inline"))
-			{
-				ParseNode_Networking_Inline();
-			}
-			else if(!ParseHelper_CheckRead_X3DMetadataObject())
-			{
-				XML_CheckNode_SkipUnsupported("Scene");
-			}
-		}// if(mReader->getNodeType() == irr::io::EXN_ELEMENT)
-		else if(mReader->getNodeType() == irr::io::EXN_ELEMENT_END)
-		{
-			if(XML_CheckNode_NameEqual("Scene"))
-			{
-				close_found = true;
-
-				break;
-			}
-			else if(XML_CheckNode_NameEqual(GroupName_Group))
-			{
-				GroupCounter_Decrease(counter_group, GroupName_Group);
-				ParseNode_Grouping_GroupEnd();
-			}
-			else if(XML_CheckNode_NameEqual(GroupName_StaticGroup))
-			{
-				GroupCounter_Decrease(counter_group, GroupName_StaticGroup);
-				ParseNode_Grouping_StaticGroupEnd();
-			}
-			else if(XML_CheckNode_NameEqual(GroupName_Transform))
-			{
-				GroupCounter_Decrease(counter_transform, GroupName_Transform);
-				ParseNode_Grouping_TransformEnd();
-			}
-			else if(XML_CheckNode_NameEqual(GroupName_Switch))
-			{
-				GroupCounter_Decrease(counter_switch, GroupName_Switch);
-				ParseNode_Grouping_SwitchEnd();
-			}
-		}// if(mReader->getNodeType() == irr::io::EXN_ELEMENT) else
-	}// while(mReader->read())
-
-	ParseHelper_Node_Exit();
-
-	if(counter_group) Throw_TagCountIncorrect("Group");
-	if(counter_transform) Throw_TagCountIncorrect("Transform");
-	if(counter_switch) Throw_TagCountIncorrect("Switch");
-	if(!close_found) Throw_CloseNotFound("Scene");
-
-}
-
-/*********************************************************************************************************************************************/
-/******************************************************** Functions: BaseImporter set ********************************************************/
-/*********************************************************************************************************************************************/
-
-bool X3DImporter::CanRead(const std::string& pFile, IOSystem* pIOHandler, bool pCheckSig) const
-{
-    const std::string extension = GetExtension(pFile);
-
-	if((extension == "x3d") || (extension == "x3db")) return true;
-
-	if(!extension.length() || pCheckSig)
-	{
-		const char* tokens[] = { "DOCTYPE X3D PUBLIC", "http://www.web3d.org/specifications/x3d" };
-
-		return SearchFileHeaderForToken(pIOHandler, pFile, tokens, 2);
-	}
-
-	return false;
-}
-
-void X3DImporter::GetExtensionList(std::set<std::string>& pExtensionList)
-{
-	pExtensionList.insert("x3d");
-	pExtensionList.insert("x3db");
-}
-
-const aiImporterDesc* X3DImporter::GetInfo () const
-{
-	return &Description;
-}
-
-void X3DImporter::InternReadFile(const std::string& pFile, aiScene* pScene, IOSystem* pIOHandler)
-{
-	mpIOHandler = pIOHandler;
-
-	Clear();// delete old graph.
-	std::string::size_type slashPos = pFile.find_last_of("\\/");
-	pIOHandler->PushDirectory(slashPos == std::string::npos ? std::string() : pFile.substr(0, slashPos + 1));
-	ParseFile(pFile, pIOHandler);
-	pIOHandler->PopDirectory();
-	//
-	// Assimp use static arrays of objects for fast speed of rendering. That's good, but need some additional operations/
-	// We know that geometry objects(meshes) are stored in <Shape>, also in <Shape>-><Appearance> materials(in Assimp logical view)
-	// are stored. So at first we need to count how meshes and materials are stored in scene graph.
-	//
-	// at first creating root node for aiScene.
-	pScene->mRootNode = new aiNode;
-	pScene->mRootNode->mParent = nullptr;
-	pScene->mFlags |= AI_SCENE_FLAGS_ALLOW_SHARED;
-	//search for root node element
-	NodeElement_Cur = NodeElement_List.front();
-	while(NodeElement_Cur->Parent != nullptr) NodeElement_Cur = NodeElement_Cur->Parent;
-
-	{// fill aiScene with objects.
-		std::list<aiMesh*> mesh_list;
-		std::list<aiMaterial*> mat_list;
-		std::list<aiLight*> light_list;
-
-		// create nodes tree
-		Postprocess_BuildNode(*NodeElement_Cur, *pScene->mRootNode, mesh_list, mat_list, light_list);
-		// copy needed data to scene
-		if(!mesh_list.empty())
-		{
-			std::list<aiMesh*>::const_iterator it = mesh_list.begin();
-
-			pScene->mNumMeshes = static_cast<unsigned int>(mesh_list.size());
-			pScene->mMeshes = new aiMesh*[pScene->mNumMeshes];
-			for(size_t i = 0; i < pScene->mNumMeshes; i++) pScene->mMeshes[i] = *it++;
-		}
-
-		if(!mat_list.empty())
-		{
-			std::list<aiMaterial*>::const_iterator it = mat_list.begin();
-
-			pScene->mNumMaterials = static_cast<unsigned int>(mat_list.size());
-			pScene->mMaterials = new aiMaterial*[pScene->mNumMaterials];
-			for(size_t i = 0; i < pScene->mNumMaterials; i++) pScene->mMaterials[i] = *it++;
-		}
-
-		if(!light_list.empty())
-		{
-			std::list<aiLight*>::const_iterator it = light_list.begin();
-
-			pScene->mNumLights = static_cast<unsigned int>(light_list.size());
-			pScene->mLights = new aiLight*[pScene->mNumLights];
-			for(size_t i = 0; i < pScene->mNumLights; i++) pScene->mLights[i] = *it++;
-		}
-	}// END: fill aiScene with objects.
-
-	///TODO: IME optimize tree
-}
-
-}// namespace Assimp
+} 
 
 #endif // !ASSIMP_BUILD_NO_X3D_IMPORTER
diff --git a/code/AssetLib/X3D/X3DImporter.hpp b/code/AssetLib/X3D/X3DImporter.hpp
index 737a7f160..4444bacd0 100644
--- a/code/AssetLib/X3D/X3DImporter.hpp
+++ b/code/AssetLib/X3D/X3DImporter.hpp
@@ -4,7 +4,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -48,20 +47,60 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef INCLUDED_AI_X3D_IMPORTER_H
 #define INCLUDED_AI_X3D_IMPORTER_H
 
-#include "X3DImporter_Node.hpp"
-
 // Header files, Assimp.
-#include <assimp/DefaultLogger.hpp>
-#include <assimp/importerdesc.h>
-#include <assimp/ProgressHandler.hpp>
-#include <assimp/types.h>
 #include <assimp/BaseImporter.h>
-#include <assimp/irrXMLWrapper.h>
-#include "FIReader.hpp"
-//#include <regex>
+#include <assimp/XmlParser.h>
+#include <assimp/importerdesc.h>
+#include <assimp/scene.h>
+#include <assimp/types.h>
+#include <assimp/DefaultLogger.hpp>
+#include <assimp/ProgressHandler.hpp>
+
+#include <list>
 
 namespace Assimp {
 
+inline void Throw_ArgOutOfRange(const std::string &argument) {
+    throw DeadlyImportError("Argument value is out of range for: \"" + argument + "\".");
+}
+
+inline void Throw_CloseNotFound(const std::string &node) {
+    throw DeadlyImportError("Close tag for node <" + node + "> not found. Seems file is corrupt.");
+}
+
+inline void Throw_ConvertFail_Str2ArrF(const std::string &nodeName, const std::string &pAttrValue) {
+    throw DeadlyImportError("In <" + nodeName + "> failed to convert attribute value \"" + pAttrValue +
+                            "\" from string to array of floats.");
+}
+
+inline void Throw_DEF_And_USE(const std::string &nodeName) {
+    throw DeadlyImportError("\"DEF\" and \"USE\" can not be defined both in <" + nodeName + ">.");
+}
+
+inline void Throw_IncorrectAttr(const std::string &nodeName, const std::string &pAttrName) {
+    throw DeadlyImportError("Node <" + nodeName + "> has incorrect attribute \"" + pAttrName + "\".");
+}
+
+inline void Throw_IncorrectAttrValue(const std::string &nodeName, const std::string &pAttrName) {
+    throw DeadlyImportError("Attribute \"" + pAttrName + "\" in node <" + nodeName + "> has incorrect value.");
+}
+
+inline void Throw_MoreThanOnceDefined(const std::string &nodeName, const std::string &pNodeType, const std::string &pDescription) {
+    throw DeadlyImportError("\"" + pNodeType + "\" node can be used only once in " + nodeName + ". Description: " + pDescription);
+}
+
+inline void Throw_TagCountIncorrect(const std::string &pNode) {
+    throw DeadlyImportError("Count of open and close tags for node <" + pNode + "> are not equivalent. Seems file is corrupt.");
+}
+
+inline void Throw_USE_NotFound(const std::string &nodeName, const std::string &pAttrValue) {
+    throw DeadlyImportError("Not found node with name \"" + pAttrValue + "\" in <" + nodeName + ">.");
+}
+
+inline void LogInfo(const std::string &message) {
+    DefaultLogger::get()->info(message);
+}
+
 /// \class X3DImporter
 /// Class that holding scene graph which include: groups, geometry, metadata etc.
 ///
@@ -191,16 +230,67 @@ namespace Assimp {
 ///
 ///	That's all for now. Enjoy
 ///
-class X3DImporter : public BaseImporter
-{
+enum class X3DElemType {
+    ENET_Group, ///< Element has type "Group".
+    ENET_MetaBoolean, ///< Element has type "Metadata boolean".
+    ENET_MetaDouble, ///< Element has type "Metadata double".
+    ENET_MetaFloat, ///< Element has type "Metadata float".
+    ENET_MetaInteger, ///< Element has type "Metadata integer".
+    ENET_MetaSet, ///< Element has type "Metadata set".
+    ENET_MetaString, ///< Element has type "Metadata string".
+    ENET_Arc2D, ///< Element has type "Arc2D".
+    ENET_ArcClose2D, ///< Element has type "ArcClose2D".
+    ENET_Circle2D, ///< Element has type "Circle2D".
+    ENET_Disk2D, ///< Element has type "Disk2D".
+    ENET_Polyline2D, ///< Element has type "Polyline2D".
+    ENET_Polypoint2D, ///< Element has type "Polypoint2D".
+    ENET_Rectangle2D, ///< Element has type "Rectangle2D".
+    ENET_TriangleSet2D, ///< Element has type "TriangleSet2D".
+    ENET_Box, ///< Element has type "Box".
+    ENET_Cone, ///< Element has type "Cone".
+    ENET_Cylinder, ///< Element has type "Cylinder".
+    ENET_Sphere, ///< Element has type "Sphere".
+    ENET_ElevationGrid, ///< Element has type "ElevationGrid".
+    ENET_Extrusion, ///< Element has type "Extrusion".
+    ENET_Coordinate, ///< Element has type "Coordinate".
+    ENET_Normal, ///< Element has type "Normal".
+    ENET_TextureCoordinate, ///< Element has type "TextureCoordinate".
+    ENET_IndexedFaceSet, ///< Element has type "IndexedFaceSet".
+    ENET_IndexedLineSet, ///< Element has type "IndexedLineSet".
+    ENET_IndexedTriangleSet, ///< Element has type "IndexedTriangleSet".
+    ENET_IndexedTriangleFanSet, ///< Element has type "IndexedTriangleFanSet".
+    ENET_IndexedTriangleStripSet, ///< Element has type "IndexedTriangleStripSet".
+    ENET_LineSet, ///< Element has type "LineSet".
+    ENET_PointSet, ///< Element has type "PointSet".
+    ENET_TriangleSet, ///< Element has type "TriangleSet".
+    ENET_TriangleFanSet, ///< Element has type "TriangleFanSet".
+    ENET_TriangleStripSet, ///< Element has type "TriangleStripSet".
+    ENET_Color, ///< Element has type "Color".
+    ENET_ColorRGBA, ///< Element has type "ColorRGBA".
+    ENET_Shape, ///< Element has type "Shape".
+    ENET_Appearance, ///< Element has type "Appearance".
+    ENET_Material, ///< Element has type "Material".
+    ENET_ImageTexture, ///< Element has type "ImageTexture".
+    ENET_TextureTransform, ///< Element has type "TextureTransform".
+    ENET_DirectionalLight, ///< Element has type "DirectionalLight".
+    ENET_PointLight, ///< Element has type "PointLight".
+    ENET_SpotLight, ///< Element has type "SpotLight".
+
+    ENET_Invalid ///< Element has invalid type and possible contain invalid data.
+};
+
+struct X3DNodeElementBase {
+    X3DNodeElementBase *Parent;
+    std::string ID;
+    std::list<X3DNodeElementBase *> Child;
+    X3DElemType Type;
+};
+
+class X3DImporter : public BaseImporter {
 public:
-    std::list<CX3DImporter_NodeElement*> NodeElement_List;///< All elements of scene graph.
+    std::list<X3DNodeElementBase *> NodeElement_List; ///< All elements of scene graph.
 
 public:
-    /***********************************************/
-    /****************** Functions ******************/
-    /***********************************************/
-
     /// Default constructor.
     X3DImporter();
 
@@ -215,620 +305,18 @@ public:
     /// Also exception can be thrown if trouble will found.
     /// \param [in] pFile - name of file to be parsed.
     /// \param [in] pIOHandler - pointer to IO helper object.
-    void ParseFile( const std::string& pFile, IOSystem* pIOHandler );
-
-    /***********************************************/
-    /********* Functions: BaseImporter set *********/
-    /***********************************************/
-
-    bool CanRead( const std::string& pFile, IOSystem* pIOHandler, bool pCheckSig ) const;
-    void GetExtensionList( std::set<std::string>& pExtensionList );
-    void InternReadFile( const std::string& pFile, aiScene* pScene, IOSystem* pIOHandler );
-    const aiImporterDesc* GetInfo()const;
-
+    void ParseFile(const std::string &pFile, IOSystem *pIOHandler);
+    bool CanRead(const std::string &pFile, IOSystem *pIOHandler, bool pCheckSig) const;
+    void GetExtensionList(std::set<std::string> &pExtensionList);
+    void InternReadFile(const std::string &pFile, aiScene *pScene, IOSystem *pIOHandler);
+    const aiImporterDesc *GetInfo() const;
+    void Clear();
 
 private:
-	/// Disabled copy constructor.
-	X3DImporter(const X3DImporter& pScene);
-
-	/// Disabled assign operator.
-	X3DImporter& operator=(const X3DImporter& pScene);
-
-	/// Clear all temporary data.
-	void Clear();
-
-	/***********************************************/
-	/************* Functions: find set *************/
-	/***********************************************/
-
-	/// Find requested node element. Search will be made in all existing nodes.
-	/// \param [in] pID - ID of requested element.
-	/// \param [in] pType - type of requested element.
-	/// \param [out] pElement - pointer to pointer to item found.
-	/// \return true - if the element is found, else - false.
-	bool FindNodeElement_FromRoot(const std::string& pID, const CX3DImporter_NodeElement::EType pType, CX3DImporter_NodeElement** pElement);
-
-	/// Find requested node element. Search will be made from pointed node down to childs.
-	/// \param [in] pStartNode - pointer to start node.
-	/// \param [in] pID - ID of requested element.
-	/// \param [in] pType - type of requested element.
-	/// \param [out] pElement - pointer to pointer to item found.
-	/// \return true - if the element is found, else - false.
-	bool FindNodeElement_FromNode(CX3DImporter_NodeElement* pStartNode, const std::string& pID, const CX3DImporter_NodeElement::EType pType,
-									CX3DImporter_NodeElement** pElement);
-
-	/// Find requested node element. For "Node"'s accounting flag "Static".
-	/// \param [in] pName - name of requested element.
-	/// \param [in] pType - type of requested element.
-	/// \param [out] pElement - pointer to pointer to item found.
-	/// \return true - if the element is found, else - false.
-	bool FindNodeElement(const std::string& pName, const CX3DImporter_NodeElement::EType pType, CX3DImporter_NodeElement** pElement);
-
-	/***********************************************/
-	/********* Functions: postprocess set **********/
-	/***********************************************/
-
-	/// \return transformation matrix from global coordinate system to local.
-	aiMatrix4x4 PostprocessHelper_Matrix_GlobalToCurrent() const;
-
-	/// Check if child elements of node element is metadata and add it to temporary list.
-	/// \param [in] pNodeElement - node element where metadata is searching.
-	/// \param [out] pList - temporary list for collected metadata.
-	void PostprocessHelper_CollectMetadata(const CX3DImporter_NodeElement& pNodeElement, std::list<CX3DImporter_NodeElement*>& pList) const;
-
-	/// Check if type of node element is metadata. E.g. <MetadataSet>, <MetadataString>.
-	/// \param [in] pType - checked type.
-	/// \return true - if the type corresponds to the metadata.
-	bool PostprocessHelper_ElementIsMetadata(const CX3DImporter_NodeElement::EType pType) const;
-
-	/// Check if type of node element is geometry object and can be used to build mesh. E.g. <Box>, <Arc2D>.
-	/// \param [in] pType - checked type.
-	/// \return true - if the type corresponds to the mesh.
-	bool PostprocessHelper_ElementIsMesh(const CX3DImporter_NodeElement::EType pType) const;
-
-	/// Read CX3DImporter_NodeElement_Light, create aiLight and add it to list of the lights.
-	/// \param [in] pNodeElement - reference to lisght element(<DirectionalLight>, <PointLight>, <SpotLight>).
-	/// \param [out] pSceneLightList - reference to list of the lights.
-	void Postprocess_BuildLight(const CX3DImporter_NodeElement& pNodeElement, std::list<aiLight*>& pSceneLightList) const;
-
-	/// Create filled structure with type \ref aiMaterial from \ref CX3DImporter_NodeElement. This function itseld extract
-	/// all needed data from scene graph.
-	/// \param [in] pNodeElement - reference to material element(<Appearance>).
-	/// \param [out] pMaterial - pointer to pointer to created material. *pMaterial must be nullptr.
-	void Postprocess_BuildMaterial(const CX3DImporter_NodeElement& pNodeElement, aiMaterial** pMaterial) const;
-
-	/// Create filled structure with type \ref aiMaterial from \ref CX3DImporter_NodeElement. This function itseld extract
-	/// all needed data from scene graph.
-	/// \param [in] pNodeElement - reference to geometry object.
-	/// \param [out] pMesh - pointer to pointer to created mesh. *pMesh must be nullptr.
-	void Postprocess_BuildMesh(const CX3DImporter_NodeElement& pNodeElement, aiMesh** pMesh) const;
-
-	/// Create aiNode from CX3DImporter_NodeElement. Also function check children and make recursive call.
-	/// \param [out] pNode - pointer to pointer to created node. *pNode must be nullptr.
-	/// \param [in] pNodeElement - CX3DImporter_NodeElement which read.
-	/// \param [out] pSceneNode - aiNode for filling.
-	/// \param [out] pSceneMeshList - list with aiMesh which belong to scene.
-	/// \param [out] pSceneMaterialList - list with aiMaterial which belong to scene.
-	/// \param [out] pSceneLightList - list with aiLight which belong to scene.
-	void Postprocess_BuildNode(const CX3DImporter_NodeElement& pNodeElement, aiNode& pSceneNode, std::list<aiMesh*>& pSceneMeshList,
-								std::list<aiMaterial*>& pSceneMaterialList, std::list<aiLight*>& pSceneLightList) const;
-
-	/// To create mesh and material kept in <Schape>.
-	/// \param pShapeNodeElement - reference to node element which kept <Shape> data.
-	/// \param pNodeMeshInd - reference to list with mesh indices. When pShapeNodeElement will read new mesh index will be added to this list.
-	/// \param pSceneMeshList - reference to list with meshes. When pShapeNodeElement will read new mesh will be added to this list.
-	/// \param pSceneMaterialList - reference to list with materials. When pShapeNodeElement will read new material will be added to this list.
-	void Postprocess_BuildShape(const CX3DImporter_NodeElement_Shape& pShapeNodeElement, std::list<unsigned int>& pNodeMeshInd,
-								std::list<aiMesh*>& pSceneMeshList, std::list<aiMaterial*>& pSceneMaterialList) const;
-
-	/// Check if child elements of node element is metadata and add it to scene node.
-	/// \param [in] pNodeElement - node element where metadata is searching.
-	/// \param [out] pSceneNode - scene node in which metadata will be added.
-	void Postprocess_CollectMetadata(const CX3DImporter_NodeElement& pNodeElement, aiNode& pSceneNode) const;
-
-	/***********************************************/
-	/************* Functions: throw set ************/
-	/***********************************************/
-
-	/// Call that function when argument is out of range and exception must be raised.
-	/// \throw DeadlyImportError.
-	/// \param [in] pArgument - argument name.
-	void Throw_ArgOutOfRange(const std::string& pArgument);
-
-	/// Call that function when close tag of node not found and exception must be raised.
-	/// E.g.:
-	/// <Scene>
-	///     <Shape>
-	/// </Scene> <!--- shape not closed --->
-	/// \throw DeadlyImportError.
-	/// \param [in] pNode - node name in which exception happened.
-	void Throw_CloseNotFound(const std::string& pNode);
-
-	/// Call that function when string value can not be converted to floating point value and exception must be raised.
-	/// \param [in] pAttrValue - attribute value.
-	/// \throw DeadlyImportError.
-	void Throw_ConvertFail_Str2ArrF(const std::string& pAttrValue);
-
-	/// Call that function when in node defined attributes "DEF" and "USE" and exception must be raised.
-	/// E.g.: <Box DEF="BigBox" USE="MegaBox">
-	/// \throw DeadlyImportError.
-	void Throw_DEF_And_USE();
-
-	/// Call that function when attribute name is incorrect and exception must be raised.
-	/// \param [in] pAttrName - attribute name.
-	/// \throw DeadlyImportError.
-	void Throw_IncorrectAttr(const std::string& pAttrName);
-
-	/// Call that function when attribute value is incorrect and exception must be raised.
-	/// \param [in] pAttrName - attribute name.
-	/// \throw DeadlyImportError.
-	void Throw_IncorrectAttrValue(const std::string& pAttrName);
-
-	/// Call that function when some type of nodes are defined twice or more when must be used only once and exception must be raised.
-	/// E.g.:
-	/// <Shape>
-	///     <Box/>    <!--- first geometry node --->
-	///     <Sphere/> <!--- second geometry node. raise exception --->
-	/// </Shape>
-	/// \throw DeadlyImportError.
-	/// \param [in] pNodeType - type of node which defined one more time.
-	/// \param [in] pDescription - message about error. E.g. what the node defined while exception raised.
-	void Throw_MoreThanOnceDefined(const std::string& pNodeType, const std::string& pDescription);
-
-	/// Call that function when count of opening and closing tags which create group(e.g. <Group>) are not equal and exception must be raised.
-	/// E.g.:
-	/// <Scene>
-	///     <Transform>  <!--- first grouping node begin --->
-	///         <Group>  <!--- second grouping node begin --->
-	///     </Transform> <!--- first grouping node end --->
-	/// </Scene> <!--- one grouping node still not closed --->
-	/// \throw DeadlyImportError.
-	/// \param [in] pNode - node name in which exception happened.
-	void Throw_TagCountIncorrect(const std::string& pNode);
-
-	/// Call that function when defined in "USE" element are not found in graph and exception must be raised.
-	/// \param [in] pAttrValue - "USE" attribute value.
-	/// \throw DeadlyImportError.
-	void Throw_USE_NotFound(const std::string& pAttrValue);
-
-	/***********************************************/
-	/************** Functions: LOG set *************/
-	/***********************************************/
-
-	/// Short variant for calling \ref DefaultLogger::get()->info()
-	void LogInfo(const std::string& pMessage) { DefaultLogger::get()->info(pMessage); }
-
-	/***********************************************/
-	/************** Functions: XML set *************/
-	/***********************************************/
-
-	/// Check if current node is empty: <node />. If not then exception will throwed.
-	void XML_CheckNode_MustBeEmpty();
-
-	/// Check if current node name is equal to pNodeName.
-	/// \param [in] pNodeName - name for checking.
-	/// return true if current node name is equal to pNodeName, else - false.
-	bool XML_CheckNode_NameEqual(const std::string& pNodeName) { return mReader->getNodeName() == pNodeName; }
-
-	/// Skip unsupported node and report about that. Depend on node name can be skipped begin tag of node all whole node.
-	/// \param [in] pParentNodeName - parent node name. Used for reporting.
-	void XML_CheckNode_SkipUnsupported(const std::string& pParentNodeName);
-
-	/// Search for specified node in file. XML file read pointer(mReader) will point to found node or file end after search is end.
-	/// \param [in] pNodeName - requested node name.
-	/// return true - if node is found, else - false.
-	bool XML_SearchNode(const std::string& pNodeName);
-
-	/// Read attribute value.
-	/// \param [in] pAttrIdx - attribute index (\ref mReader->getAttribute* set).
-	/// \return read data.
-	bool XML_ReadNode_GetAttrVal_AsBool(const int pAttrIdx);
-
-	/// Read attribute value.
-	/// \param [in] pAttrIdx - attribute index (\ref mReader->getAttribute* set).
-	/// \return read data.
-	float XML_ReadNode_GetAttrVal_AsFloat(const int pAttrIdx);
-
-	/// Read attribute value.
-	/// \param [in] pAttrIdx - attribute index (\ref mReader->getAttribute* set).
-	/// \return read data.
-	int32_t XML_ReadNode_GetAttrVal_AsI32(const int pAttrIdx);
-
-	/// Read attribute value.
-	/// \param [in] pAttrIdx - attribute index (\ref mReader->getAttribute* set).
-	/// \param [out] pValue - read data.
-	void XML_ReadNode_GetAttrVal_AsCol3f(const int pAttrIdx, aiColor3D& pValue);
-
-	/// Read attribute value.
-	/// \param [in] pAttrIdx - attribute index (\ref mReader->getAttribute* set).
-	/// \param [out] pValue - read data.
-	void XML_ReadNode_GetAttrVal_AsVec2f(const int pAttrIdx, aiVector2D& pValue);
-
-	/// Read attribute value.
-	/// \param [in] pAttrIdx - attribute index (\ref mReader->getAttribute* set).
-	/// \param [out] pValue - read data.
-	void XML_ReadNode_GetAttrVal_AsVec3f(const int pAttrIdx, aiVector3D& pValue);
-
-	/// Read attribute value.
-	/// \param [in] pAttrIdx - attribute index (\ref mReader->getAttribute* set).
-	/// \param [out] pValue - read data.
-	void XML_ReadNode_GetAttrVal_AsArrB(const int pAttrIdx, std::vector<bool>& pValue);
-
-	/// Read attribute value.
-	/// \param [in] pAttrIdx - attribute index (\ref mReader->getAttribute* set).
-	/// \param [out] pValue - read data.
-	void XML_ReadNode_GetAttrVal_AsArrI32(const int pAttrIdx, std::vector<int32_t>& pValue);
-
-	/// Read attribute value.
-	/// \param [in] pAttrIdx - attribute index (\ref mReader->getAttribute* set).
-	/// \param [out] pValue - read data.
-	void XML_ReadNode_GetAttrVal_AsArrF(const int pAttrIdx, std::vector<float>& pValue);
-
-    /// Read attribute value.
-	/// \param [in] pAttrIdx - attribute index (\ref mReader->getAttribute* set).
-	/// \param [out] pValue - read data.
-	void XML_ReadNode_GetAttrVal_AsArrD(const int pAttrIdx, std::vector<double>& pValue);
-
-	/// Read attribute value.
-	/// \param [in] pAttrIdx - attribute index (\ref mReader->getAttribute* set).
-	/// \param [out] pValue - read data.
-	void XML_ReadNode_GetAttrVal_AsListCol3f(const int pAttrIdx, std::list<aiColor3D>& pValue);
-
-	/// \overload void XML_ReadNode_GetAttrVal_AsListCol3f(const int pAttrIdx, std::vector<aiColor3D>& pValue)
-	void XML_ReadNode_GetAttrVal_AsArrCol3f(const int pAttrIdx, std::vector<aiColor3D>& pValue);
-
-	/// Read attribute value.
-	/// \param [in] pAttrIdx - attribute index (\ref mReader->getAttribute* set).
-	/// \param [out] pValue - read data.
-	void XML_ReadNode_GetAttrVal_AsListCol4f(const int pAttrIdx, std::list<aiColor4D>& pValue);
-
-	/// \overload void XML_ReadNode_GetAttrVal_AsListCol4f(const int pAttrIdx, std::list<aiColor4D>& pValue)
-	void XML_ReadNode_GetAttrVal_AsArrCol4f(const int pAttrIdx, std::vector<aiColor4D>& pValue);
-
-	/// Read attribute value.
-	/// \param [in] pAttrIdx - attribute index (\ref mReader->getAttribute* set).
-	/// \param [out] pValue - read data.
-	void XML_ReadNode_GetAttrVal_AsListVec2f(const int pAttrIdx, std::list<aiVector2D>& pValue);
-
-	/// \overload void XML_ReadNode_GetAttrVal_AsListVec2f(const int pAttrIdx, std::list<aiVector2D>& pValue)
-	void XML_ReadNode_GetAttrVal_AsArrVec2f(const int pAttrIdx, std::vector<aiVector2D>& pValue);
-
-	/// Read attribute value.
-	/// \param [in] pAttrIdx - attribute index (\ref mReader->getAttribute* set).
-	/// \param [out] pValue - read data.
-	void XML_ReadNode_GetAttrVal_AsListVec3f(const int pAttrIdx, std::list<aiVector3D>& pValue);
-
-	/// \overload void XML_ReadNode_GetAttrVal_AsListVec3f(const int pAttrIdx, std::list<aiVector3D>& pValue)
-	void XML_ReadNode_GetAttrVal_AsArrVec3f(const int pAttrIdx, std::vector<aiVector3D>& pValue);
-
-	/// Read attribute value.
-	/// \param [in] pAttrIdx - attribute index (\ref mReader->getAttribute* set).
-	/// \param [out] pValue - read data.
-	void XML_ReadNode_GetAttrVal_AsListS(const int pAttrIdx, std::list<std::string>& pValue);
-
-	/***********************************************/
-	/******* Functions: geometry helper set  *******/
-	/***********************************************/
-
-	/// Make point on surface oXY.
-	/// \param [in] pAngle - angle in radians between radius-vector of point and oX axis. Angle extends from the oX axis counterclockwise to the radius-vector.
-	/// \param [in] pRadius - length of radius-vector.
-	/// \return made point coordinates.
-	aiVector3D GeometryHelper_Make_Point2D(const float pAngle, const float pRadius);
-
-	/// Make 2D figure - linear circular arc with center in (0, 0). The z-coordinate is 0. The arc extends from the pStartAngle counterclockwise
-	/// to the pEndAngle. If pStartAngle and pEndAngle have the same value, a circle is specified. If the absolute difference between pStartAngle
-	/// and pEndAngle is greater than or equal to 2pi, a circle is specified.
-	/// \param [in] pStartAngle - angle in radians of start of the arc.
-	/// \param [in] pEndAngle - angle in radians of end of the arc.
-	/// \param [in] pRadius - radius of the arc.
-	/// \param [out] pNumSegments - number of segments in arc. In other words - tessellation factor.
-	/// \param [out] pVertices - generated vertices.
-	void GeometryHelper_Make_Arc2D(const float pStartAngle, const float pEndAngle, const float pRadius, size_t pNumSegments, std::list<aiVector3D>& pVertices);
-
-	/// Create line set from point set.
-	/// \param [in] pPoint - input points list.
-	/// \param [out] pLine - made lines list.
-	void GeometryHelper_Extend_PointToLine(const std::list<aiVector3D>& pPoint, std::list<aiVector3D>& pLine);
-
-	/// Create CoordIdx of line set from CoordIdx of polyline set.
-	/// \param [in] pPolylineCoordIdx - vertices indices divided by delimiter "-1". Must contain faces with two or more indices.
-	/// \param [out] pLineCoordIdx - made CoordIdx of line set.
-	void GeometryHelper_Extend_PolylineIdxToLineIdx(const std::list<int32_t>& pPolylineCoordIdx, std::list<int32_t>& pLineCoordIdx);
-
-	/// Make 3D body - rectangular parallelepiped with center in (0, 0). QL mean quadlist (\sa pVertices).
-	/// \param [in] pSize - scale factor for body for every axis. E.g. (1, 2, 1) mean: X-size and Z-size - 1, Y-size - 2.
-	/// \param [out] pVertices - generated vertices. The list of vertices is grouped in quads.
-	void GeometryHelper_MakeQL_RectParallelepiped(const aiVector3D& pSize, std::list<aiVector3D>& pVertices);
-
-	/// Create faces array from vertices indices array.
-	/// \param [in] pCoordIdx - vertices indices divided by delimiter "-1".
-	/// \param [in] pFaces - created faces array.
-	/// \param [in] pPrimitiveTypes - type of primitives in faces.
-	void GeometryHelper_CoordIdxStr2FacesArr(const std::vector<int32_t>& pCoordIdx, std::vector<aiFace>& pFaces, unsigned int& pPrimitiveTypes) const;
-
-	/// Add colors to mesh.
-	/// a. If colorPerVertex is FALSE, colours are applied to each face, as follows:
-	///		If the colorIndex field is not empty, one colour is used for each face of the mesh. There shall be at least as many indices in the
-	///			colorIndex field as there are faces in the mesh. The colorIndex field shall not contain any negative entries.
-	///		If the colorIndex field is empty, the colours in the X3DColorNode node are applied to each face of the mesh in order.
-	///			There shall be at least as many colours in the X3DColorNode node as there are faces.
-	/// b. If colorPerVertex is TRUE, colours are applied to each vertex, as follows:
-	///		If the colorIndex field is not empty, colours are applied to each vertex of the mesh in exactly the same manner that the coordIndex
-	///			field is used to choose coordinates for each vertex from the <Coordinate> node. The colorIndex field shall contain end-of-face markers (-1)
-	///			in exactly the same places as the coordIndex field.
-	///		If the colorIndex field is empty, the coordIndex field is used to choose colours from the X3DColorNode node.
-	/// \param [in] pMesh - mesh for adding data.
-	/// \param [in] pCoordIdx - vertices indices divided by delimiter "-1".
-	/// \param [in] pColorIdx - color indices for every vertex divided by delimiter "-1" if \ref pColorPerVertex is true. if \ref pColorPerVertex is false
-	/// then pColorIdx contain color indices for every faces and must not contain delimiter "-1".
-	/// \param [in] pColors - defined colors.
-	/// \param [in] pColorPerVertex - if \ref pColorPerVertex is true then color in \ref pColors defined for every vertex, if false - for every face.
-	void MeshGeometry_AddColor(aiMesh& pMesh, const std::vector<int32_t>& pCoordIdx, const std::vector<int32_t>& pColorIdx,
-								const std::list<aiColor4D>& pColors, const bool pColorPerVertex) const;
-
-	/// \overload void MeshGeometry_AddColor(aiMesh& pMesh, const std::list<int32_t>& pCoordIdx, const std::list<int32_t>& pColorIdx, const std::list<aiColor4D>& pColors, const bool pColorPerVertex) const;
-	void MeshGeometry_AddColor(aiMesh& pMesh, const std::vector<int32_t>& pCoordIdx, const std::vector<int32_t>& pColorIdx,
-								const std::list<aiColor3D>& pColors, const bool pColorPerVertex) const;
-
-	/// Add colors to mesh.
-	/// \param [in] pMesh - mesh for adding data.
-	/// \param [in] pColors - defined colors.
-	/// \param [in] pColorPerVertex - if \ref pColorPerVertex is true then color in \ref pColors defined for every vertex, if false - for every face.
-	void MeshGeometry_AddColor(aiMesh& pMesh, const std::list<aiColor4D>& pColors, const bool pColorPerVertex) const;
-
-	/// \overload void MeshGeometry_AddColor(aiMesh& pMesh, const std::list<aiColor4D>& pColors, const bool pColorPerVertex) const
-	void MeshGeometry_AddColor(aiMesh& pMesh, const std::list<aiColor3D>& pColors, const bool pColorPerVertex) const;
-
-	/// Add normals to mesh. Function work similar to \ref MeshGeometry_AddColor;
-	void MeshGeometry_AddNormal(aiMesh& pMesh, const std::vector<int32_t>& pCoordIdx, const std::vector<int32_t>& pNormalIdx,
-								const std::list<aiVector3D>& pNormals, const bool pNormalPerVertex) const;
-
-	/// Add normals to mesh. Function work similar to \ref MeshGeometry_AddColor;
-	void MeshGeometry_AddNormal(aiMesh& pMesh, const std::list<aiVector3D>& pNormals, const bool pNormalPerVertex) const;
-
-    /// Add texture coordinates to mesh. Function work similar to \ref MeshGeometry_AddColor;
-	void MeshGeometry_AddTexCoord(aiMesh& pMesh, const std::vector<int32_t>& pCoordIdx, const std::vector<int32_t>& pTexCoordIdx,
-								const std::list<aiVector2D>& pTexCoords) const;
-
-    /// Add texture coordinates to mesh. Function work similar to \ref MeshGeometry_AddColor;
-	void MeshGeometry_AddTexCoord(aiMesh& pMesh, const std::list<aiVector2D>& pTexCoords) const;
-
-	/// Create mesh.
-	/// \param [in] pCoordIdx - vertices indices divided by delimiter "-1".
-	/// \param [in] pVertices - vertices of mesh.
-	/// \return created mesh.
-	aiMesh* GeometryHelper_MakeMesh(const std::vector<int32_t>& pCoordIdx, const std::list<aiVector3D>& pVertices) const;
-
-	/***********************************************/
-	/******** Functions: parse set private *********/
-	/***********************************************/
-
-	/// Create node element with type "Node" in scene graph. That operation is needed when you enter to X3D group node
-	/// like <Group>, <Transform> etc. When exiting from X3D group node(e.g. </Group>) \ref ParseHelper_Node_Exit must
-	/// be called.
-	/// \param [in] pStatic - flag: if true then static node is created(e.g. <StaticGroup>).
-	void ParseHelper_Group_Begin(const bool pStatic = false);
-
-	/// Make pNode as current and enter deeper for parsing child nodes. At end \ref ParseHelper_Node_Exit must be called.
-	/// \param [in] pNode - new current node.
-	void ParseHelper_Node_Enter(CX3DImporter_NodeElement* pNode);
-
-	/// This function must be called when exiting from X3D group node(e.g. </Group>). \ref ParseHelper_Group_Begin.
-	void ParseHelper_Node_Exit();
-
-	/// Attribute values of floating point types can take form ".x"(without leading zero). irrXMLReader can not read this form of values and it
-	/// must be converted to right form - "0.xxx".
-	/// \param [in] pInStr - pointer to input string which can contain incorrect form of values.
-	/// \param [out[ pOutString - output string with right form of values.
-	void ParseHelper_FixTruncatedFloatString(const char* pInStr, std::string& pOutString);
-
-	/// Check if current node has nodes of type X3DMetadataObject. Why we must do it? Because X3DMetadataObject can be in any non-empty X3DNode.
-	/// Meaning that X3DMetadataObject can be in any non-empty node in <Scene>.
-	/// \return true - if metadata node are found and parsed, false - metadata not found.
-	bool ParseHelper_CheckRead_X3DMetadataObject();
-
-	/// Check if current node has nodes of type X3DGeometricPropertyNode. X3DGeometricPropertyNode
-	/// X3DGeometricPropertyNode inheritors:
-	/// <FogCoordinate>, <HAnimDisplacer>, <Color>, <ColorRGBA>, <Coordinate>, <CoordinateDouble>, <GeoCoordinate>, <Normal>,
-	/// <MultiTextureCoordinate>, <TextureCoordinate>, <TextureCoordinate3D>, <TextureCoordinate4D>, <TextureCoordinateGenerator>,
-	/// <FloatVertexAttribute>, <Matrix3VertexAttribute>, <Matrix4VertexAttribute>.
-	/// \return true - if nodes are found and parsed, false - nodes not found.
-	bool ParseHelper_CheckRead_X3DGeometricPropertyNode();
-
-	/// Parse <X3D> node of the file.
-	void ParseNode_Root();
-
-	/// Parse <head> node of the file.
-	void ParseNode_Head();
-
-	/// Parse <Scene> node of the file.
-	void ParseNode_Scene();
-
-	/// Parse child nodes of <Metadata*> node.
-	/// \param [in] pNodeName - parsed node name. Must be set because that function is general and name needed for checking the end
-	/// and error reporing.
-	/// \param [in] pParentElement - parent metadata element.
-	void ParseNode_Metadata(CX3DImporter_NodeElement* pParentElement, const std::string& pNodeName);
-
-	/// Parse <MetadataBoolean> node of the file.
-	void ParseNode_MetadataBoolean();
-
-	/// Parse <MetadataDouble> node of the file.
-	void ParseNode_MetadataDouble();
-
-	/// Parse <MetadataFloat> node of the file.
-	void ParseNode_MetadataFloat();
-
-	/// Parse <MetadataInteger> node of the file.
-	void ParseNode_MetadataInteger();
-
-	/// Parse <MetadataSet> node of the file.
-	void ParseNode_MetadataSet();
-
-	/// \fn void ParseNode_MetadataString()
-	/// Parse <MetadataString> node of the file.
-	void ParseNode_MetadataString();
-
-	/// Parse <Arc2D> node of the file.
-	void ParseNode_Geometry2D_Arc2D();
-
-	/// Parse <ArcClose2D> node of the file.
-	void ParseNode_Geometry2D_ArcClose2D();
-
-	/// Parse <Circle2D> node of the file.
-	void ParseNode_Geometry2D_Circle2D();
-
-	/// Parse <Disk2D> node of the file.
-	void ParseNode_Geometry2D_Disk2D();
-
-	/// Parse <Polyline2D> node of the file.
-	void ParseNode_Geometry2D_Polyline2D();
-
-	/// Parse <Polypoint2D> node of the file.
-	void ParseNode_Geometry2D_Polypoint2D();
-
-	/// Parse <Rectangle2D> node of the file.
-	void ParseNode_Geometry2D_Rectangle2D();
-
-	/// Parse <TriangleSet2D> node of the file.
-	void ParseNode_Geometry2D_TriangleSet2D();
-
-	/// Parse <Box> node of the file.
-	void ParseNode_Geometry3D_Box();
-
-	/// Parse <Cone> node of the file.
-	void ParseNode_Geometry3D_Cone();
-
-	/// Parse <Cylinder> node of the file.
-	void ParseNode_Geometry3D_Cylinder();
-
-	/// Parse <ElevationGrid> node of the file.
-	void ParseNode_Geometry3D_ElevationGrid();
-
-	/// Parse <Extrusion> node of the file.
-	void ParseNode_Geometry3D_Extrusion();
-
-	/// Parse <IndexedFaceSet> node of the file.
-	void ParseNode_Geometry3D_IndexedFaceSet();
-
-	/// Parse <Sphere> node of the file.
-	void ParseNode_Geometry3D_Sphere();
-
-	/// Parse <Group> node of the file. And create new node in scene graph.
-	void ParseNode_Grouping_Group();
-
-	/// Doing actions at an exit from <Group>. Walk up in scene graph.
-	void ParseNode_Grouping_GroupEnd();
-
-	/// Parse <StaticGroup> node of the file. And create new node in scene graph.
-	void ParseNode_Grouping_StaticGroup();
-
-	/// Doing actions at an exit from <StaticGroup>. Walk up in scene graph.
-	void ParseNode_Grouping_StaticGroupEnd();
-
-	/// Parse <Switch> node of the file. And create new node in scene graph.
-	void ParseNode_Grouping_Switch();
-
-	/// Doing actions at an exit from <Switch>. Walk up in scene graph.
-	void ParseNode_Grouping_SwitchEnd();
-
-	/// Parse <Transform> node of the file. And create new node in scene graph.
-	void ParseNode_Grouping_Transform();
-
-	/// Doing actions at an exit from <Transform>. Walk up in scene graph.
-	void ParseNode_Grouping_TransformEnd();
-
-	/// Parse <Color> node of the file.
-	void ParseNode_Rendering_Color();
-
-	/// Parse <ColorRGBA> node of the file.
-	void ParseNode_Rendering_ColorRGBA();
-
-	/// Parse <Coordinate> node of the file.
-	void ParseNode_Rendering_Coordinate();
-
-	/// Parse <Normal> node of the file.
-	void ParseNode_Rendering_Normal();
-
-	/// Parse <IndexedLineSet> node of the file.
-	void ParseNode_Rendering_IndexedLineSet();
-
-	/// Parse <IndexedTriangleFanSet> node of the file.
-	void ParseNode_Rendering_IndexedTriangleFanSet();
-
-	/// Parse <IndexedTriangleSet> node of the file.
-	void ParseNode_Rendering_IndexedTriangleSet();
-
-	/// Parse <IndexedTriangleStripSet> node of the file.
-	void ParseNode_Rendering_IndexedTriangleStripSet();
-
-	/// Parse <LineSet> node of the file.
-	void ParseNode_Rendering_LineSet();
-
-	/// Parse <PointSet> node of the file.
-	void ParseNode_Rendering_PointSet();
-
-	/// Parse <TriangleFanSet> node of the file.
-	void ParseNode_Rendering_TriangleFanSet();
-
-	/// Parse <TriangleSet> node of the file.
-	void ParseNode_Rendering_TriangleSet();
-
-	/// Parse <TriangleStripSet> node of the file.
-	void ParseNode_Rendering_TriangleStripSet();
-
-	/// Parse <ImageTexture> node of the file.
-	void ParseNode_Texturing_ImageTexture();
-
-	/// Parse <TextureCoordinate> node of the file.
-	void ParseNode_Texturing_TextureCoordinate();
-
-	/// Parse <TextureTransform> node of the file.
-	void ParseNode_Texturing_TextureTransform();
-
-	/// Parse <Shape> node of the file.
-	void ParseNode_Shape_Shape();
-
-	/// Parse <Appearance> node of the file.
-	void ParseNode_Shape_Appearance();
-
-	/// Parse <Material> node of the file.
-	void ParseNode_Shape_Material();
-
-	/// Parse <Inline> node of the file.
-	void ParseNode_Networking_Inline();
-
-	/// Parse <DirectionalLight> node of the file.
-	void ParseNode_Lighting_DirectionalLight();
-
-	/// Parse <PointLight> node of the file.
-	void ParseNode_Lighting_PointLight();
-
-	/// Parse <SpotLight> node of the file.
-	void ParseNode_Lighting_SpotLight();
-
-private:
-    /***********************************************/
-    /******************** Types ********************/
-    /***********************************************/
-
-    /***********************************************/
-    /****************** Constants ******************/
-    /***********************************************/
     static const aiImporterDesc Description;
-    //static const std::regex pattern_nws;
-    //static const std::regex pattern_true;
+    X3DNodeElementBase *mNodeElementCur; ///< Current element.
+}; // class X3DImporter
 
-
-    /***********************************************/
-    /****************** Variables ******************/
-    /***********************************************/
-    CX3DImporter_NodeElement* NodeElement_Cur;///< Current element.
-    std::unique_ptr<FIReader> mReader;///< Pointer to XML-reader object
-    IOSystem *mpIOHandler;
-};// class X3DImporter
-
-}// namespace Assimp
+} // namespace Assimp
 
 #endif // INCLUDED_AI_X3D_IMPORTER_H
diff --git a/code/AssetLib/X3D/X3DImporter_Geometry2D.cpp b/code/AssetLib/X3D/X3DImporter_Geometry2D.cpp
deleted file mode 100644
index 5879c3d50..000000000
--- a/code/AssetLib/X3D/X3DImporter_Geometry2D.cpp
+++ /dev/null
@@ -1,522 +0,0 @@
-/*
-Open Asset Import Library (assimp)
-----------------------------------------------------------------------
-
-Copyright (c) 2006-2020, assimp team
-
-
-All rights reserved.
-
-Redistribution and use of this software in source and binary forms,
-with or without modification, are permitted provided that the
-following conditions are met:
-
-* Redistributions of source code must retain the above
-copyright notice, this list of conditions and the
-following disclaimer.
-
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the
-following disclaimer in the documentation and/or other
-materials provided with the distribution.
-
-* Neither the name of the assimp team, nor the names of its
-contributors may be used to endorse or promote products
-derived from this software without specific prior
-written permission of the assimp team.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-----------------------------------------------------------------------
-*/
-/// \file   X3DImporter_Geometry2D.cpp
-/// \brief  Parsing data from nodes of "Geometry2D" set of X3D.
-/// \date   2015-2016
-/// \author smal.root@gmail.com
-
-#ifndef ASSIMP_BUILD_NO_X3D_IMPORTER
-
-#include "X3DImporter.hpp"
-#include "X3DImporter_Node.hpp"
-#include "X3DImporter_Macro.hpp"
-
-namespace Assimp
-{
-
-// <Arc2D
-// DEF=""              ID
-// USE=""              IDREF
-// endAngle="1.570796" SFFloat [initializeOnly]
-// radius="1"          SFFloat [initializeOnly]
-// startAngle="0"      SFFloat [initializeOnly]
-// />
-// The Arc2D node specifies a linear circular arc whose center is at (0,0) and whose angles are measured starting at the positive x-axis and sweeping
-// towards the positive y-axis. The radius field specifies the radius of the circle of which the arc is a portion. The arc extends from the startAngle
-// counterclockwise to the endAngle. The values of startAngle and endAngle shall be in the range [-2pi, 2pi] radians (or the equivalent if a different
-// angle base unit has been specified). If startAngle and endAngle have the same value, a circle is specified.
-void X3DImporter::ParseNode_Geometry2D_Arc2D()
-{
-    std::string def, use;
-    float endAngle = AI_MATH_HALF_PI_F;
-    float radius = 1;
-    float startAngle = 0;
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_RET("endAngle", endAngle, XML_ReadNode_GetAttrVal_AsFloat);
-		MACRO_ATTRREAD_CHECK_RET("radius", radius, XML_ReadNode_GetAttrVal_AsFloat);
-		MACRO_ATTRREAD_CHECK_RET("startAngle", startAngle, XML_ReadNode_GetAttrVal_AsFloat);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_Arc2D, ne);
-	}
-	else
-	{
-		// create and if needed - define new geometry object.
-		ne = new CX3DImporter_NodeElement_Geometry2D(CX3DImporter_NodeElement::ENET_Arc2D, NodeElement_Cur);
-		if(!def.empty()) ne->ID = def;
-
-		// create point list of geometry object and convert it to line set.
-		std::list<aiVector3D> tlist;
-
-		GeometryHelper_Make_Arc2D(startAngle, endAngle, radius, 10, tlist);///TODO: IME - AI_CONFIG for NumSeg
-		GeometryHelper_Extend_PointToLine(tlist, ((CX3DImporter_NodeElement_Geometry2D*)ne)->Vertices);
-		((CX3DImporter_NodeElement_Geometry2D*)ne)->NumIndices = 2;
-		// check for X3DMetadataObject childs.
-		if(!mReader->isEmptyElement())
-			ParseNode_Metadata(ne, "Arc2D");
-		else
-			NodeElement_Cur->Child.push_back(ne);// add made object as child to current element
-
-		NodeElement_List.push_back(ne);// add element to node element list because its a new object in graph
-	}// if(!use.empty()) else
-}
-
-// <ArcClose2D
-// DEF=""              ID
-// USE=""              IDREF
-// closureType="PIE"   SFString [initializeOnly], {"PIE", "CHORD"}
-// endAngle="1.570796" SFFloat  [initializeOnly]
-// radius="1"          SFFloat  [initializeOnly]
-// solid="false"       SFBool   [initializeOnly]
-// startAngle="0"      SFFloat  [initializeOnly]
-// />
-// The ArcClose node specifies a portion of a circle whose center is at (0,0) and whose angles are measured starting at the positive x-axis and sweeping
-// towards the positive y-axis. The end points of the arc specified are connected as defined by the closureType field. The radius field specifies the radius
-// of the circle of which the arc is a portion. The arc extends from the startAngle counterclockwise to the endAngle. The value of radius shall be greater
-// than zero. The values of startAngle and endAngle shall be in the range [-2pi, 2pi] radians (or the equivalent if a different default angle base unit has
-// been specified). If startAngle and endAngle have the same value, a circle is specified and closureType is ignored. If the absolute difference between
-// startAngle and endAngle is greater than or equal to 2pi, a complete circle is produced with no chord or radial line(s) drawn from the center.
-// A closureType of "PIE" connects the end point to the start point by defining two straight line segments first from the end point to the center and then
-// the center to the start point. A closureType of "CHORD" connects the end point to the start point by defining a straight line segment from the end point
-// to the start point. Textures are applied individually to each face of the ArcClose2D. On the front (+Z) and back (-Z) faces of the ArcClose2D, when
-// viewed from the +Z-axis, the texture is mapped onto each face with the same orientation as if the image were displayed normally in 2D.
-void X3DImporter::ParseNode_Geometry2D_ArcClose2D()
-{
-    std::string def, use;
-    std::string closureType("PIE");
-    float endAngle = AI_MATH_HALF_PI_F;
-    float radius = 1;
-    bool solid = false;
-    float startAngle = 0;
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_RET("closureType", closureType, mReader->getAttributeValue);
-		MACRO_ATTRREAD_CHECK_RET("endAngle", endAngle, XML_ReadNode_GetAttrVal_AsFloat);
-		MACRO_ATTRREAD_CHECK_RET("radius", radius, XML_ReadNode_GetAttrVal_AsFloat);
-		MACRO_ATTRREAD_CHECK_RET("solid", solid, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_RET("startAngle", startAngle, XML_ReadNode_GetAttrVal_AsFloat);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_ArcClose2D, ne);
-	}
-	else
-	{
-		// create and if needed - define new geometry object.
-		ne = new CX3DImporter_NodeElement_Geometry2D(CX3DImporter_NodeElement::ENET_ArcClose2D, NodeElement_Cur);
-		if(!def.empty()) ne->ID = def;
-
-		((CX3DImporter_NodeElement_Geometry2D*)ne)->Solid = solid;
-		// create point list of geometry object.
-		GeometryHelper_Make_Arc2D(startAngle, endAngle, radius, 10, ((CX3DImporter_NodeElement_Geometry2D*)ne)->Vertices);///TODO: IME - AI_CONFIG for NumSeg
-		// add chord or two radiuses only if not a circle was defined
-		if(!((std::fabs(endAngle - startAngle) >= AI_MATH_TWO_PI_F) || (endAngle == startAngle)))
-		{
-			std::list<aiVector3D>& vlist = ((CX3DImporter_NodeElement_Geometry2D*)ne)->Vertices;// just short alias.
-
-			if((closureType == "PIE") || (closureType == "\"PIE\""))
-				vlist.push_back(aiVector3D(0, 0, 0));// center point - first radial line
-			else if((closureType != "CHORD") && (closureType != "\"CHORD\""))
-				Throw_IncorrectAttrValue("closureType");
-
-			vlist.push_back(*vlist.begin());// arc first point - chord from first to last point of arc(if CHORD) or second radial line(if PIE).
-		}
-
-		((CX3DImporter_NodeElement_Geometry2D*)ne)->NumIndices = ((CX3DImporter_NodeElement_Geometry2D*)ne)->Vertices.size();
-		// check for X3DMetadataObject childs.
-		if(!mReader->isEmptyElement())
-			ParseNode_Metadata(ne, "ArcClose2D");
-		else
-			NodeElement_Cur->Child.push_back(ne);// add made object as child to current element
-
-		NodeElement_List.push_back(ne);// add element to node element list because its a new object in graph
-	}// if(!use.empty()) else
-}
-
-// <Circle2D
-// DEF=""     ID
-// USE=""     IDREF
-// radius="1" SFFloat  [initializeOnly]
-// />
-void X3DImporter::ParseNode_Geometry2D_Circle2D()
-{
-    std::string def, use;
-    float radius = 1;
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_RET("radius", radius, XML_ReadNode_GetAttrVal_AsFloat);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_Circle2D, ne);
-	}
-	else
-	{
-		// create and if needed - define new geometry object.
-		ne = new CX3DImporter_NodeElement_Geometry2D(CX3DImporter_NodeElement::ENET_Circle2D, NodeElement_Cur);
-		if(!def.empty()) ne->ID = def;
-
-		// create point list of geometry object and convert it to line set.
-		std::list<aiVector3D> tlist;
-
-		GeometryHelper_Make_Arc2D(0, 0, radius, 10, tlist);///TODO: IME - AI_CONFIG for NumSeg
-		GeometryHelper_Extend_PointToLine(tlist, ((CX3DImporter_NodeElement_Geometry2D*)ne)->Vertices);
-		((CX3DImporter_NodeElement_Geometry2D*)ne)->NumIndices = 2;
-		// check for X3DMetadataObject childs.
-		if(!mReader->isEmptyElement())
-			ParseNode_Metadata(ne, "Circle2D");
-		else
-			NodeElement_Cur->Child.push_back(ne);// add made object as child to current element
-
-		NodeElement_List.push_back(ne);// add element to node element list because its a new object in graph
-	}// if(!use.empty()) else
-}
-
-// <Disk2D
-// DEF=""          ID
-// USE=""          IDREF
-// innerRadius="0" SFFloat  [initializeOnly]
-// outerRadius="1" SFFloat  [initializeOnly]
-// solid="false"   SFBool   [initializeOnly]
-// />
-// The Disk2D node specifies a circular disk which is centred at (0, 0) in the local coordinate system. The outerRadius field specifies the radius of the
-// outer dimension of the Disk2D. The innerRadius field specifies the inner dimension of the Disk2D. The value of outerRadius shall be greater than zero.
-// The value of innerRadius shall be greater than or equal to zero and less than or equal to outerRadius. If innerRadius is zero, the Disk2D is completely
-// filled. Otherwise, the area within the innerRadius forms a hole in the Disk2D. If innerRadius is equal to outerRadius, a solid circular line shall
-// be drawn using the current line properties. Textures are applied individually to each face of the Disk2D. On the front (+Z) and back (-Z) faces of
-// the Disk2D, when viewed from the +Z-axis, the texture is mapped onto each face with the same orientation as if the image were displayed normally in 2D.
-void X3DImporter::ParseNode_Geometry2D_Disk2D()
-{
-    std::string def, use;
-    float innerRadius = 0;
-    float outerRadius = 1;
-    bool solid = false;
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_RET("innerRadius", innerRadius, XML_ReadNode_GetAttrVal_AsFloat);
-		MACRO_ATTRREAD_CHECK_RET("outerRadius", outerRadius, XML_ReadNode_GetAttrVal_AsFloat);
-		MACRO_ATTRREAD_CHECK_RET("solid", solid, XML_ReadNode_GetAttrVal_AsBool);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_Disk2D, ne);
-	}
-	else
-	{
-		std::list<aiVector3D> tlist_o, tlist_i;
-
-		if(innerRadius > outerRadius) Throw_IncorrectAttrValue("innerRadius");
-
-		// create and if needed - define new geometry object.
-		ne = new CX3DImporter_NodeElement_Geometry2D(CX3DImporter_NodeElement::ENET_Disk2D, NodeElement_Cur);
-		if(!def.empty()) ne->ID = def;
-
-		// create point list of geometry object.
-		///TODO: IME - AI_CONFIG for NumSeg
-		GeometryHelper_Make_Arc2D(0, 0, outerRadius, 10, tlist_o);// outer circle
-		if(innerRadius == 0.0f)
-		{// make filled disk
-			// in tlist_o we already have points of circle. just copy it and sign as polygon.
-			((CX3DImporter_NodeElement_Geometry2D*)ne)->Vertices = tlist_o;
-			((CX3DImporter_NodeElement_Geometry2D*)ne)->NumIndices = tlist_o.size();
-		}
-		else if(innerRadius == outerRadius)
-		{// make circle
-			// in tlist_o we already have points of circle. convert it to line set.
-			GeometryHelper_Extend_PointToLine(tlist_o, ((CX3DImporter_NodeElement_Geometry2D*)ne)->Vertices);
-			((CX3DImporter_NodeElement_Geometry2D*)ne)->NumIndices = 2;
-		}
-		else
-		{// make disk
-			std::list<aiVector3D>& vlist = ((CX3DImporter_NodeElement_Geometry2D*)ne)->Vertices;// just short alias.
-
-			GeometryHelper_Make_Arc2D(0, 0, innerRadius, 10, tlist_i);// inner circle
-			//
-			// create quad list from two point lists
-			//
-			if(tlist_i.size() < 2) throw DeadlyImportError("Disk2D. Not enough points for creating quad list.");// tlist_i and tlist_o has equal size.
-
-			// add all quads except last
-			for(std::list<aiVector3D>::iterator it_i = tlist_i.begin(), it_o = tlist_o.begin(); it_i != tlist_i.end();)
-			{
-				// do not forget - CCW direction
-				vlist.push_back(*it_i++);// 1st point
-				vlist.push_back(*it_o++);// 2nd point
-				vlist.push_back(*it_o);// 3rd point
-				vlist.push_back(*it_i);// 4th point
-			}
-
-			// add last quad
-			vlist.push_back(*tlist_i.end());// 1st point
-			vlist.push_back(*tlist_o.end());// 2nd point
-			vlist.push_back(*tlist_o.begin());// 3rd point
-			vlist.push_back(*tlist_o.begin());// 4th point
-
-			((CX3DImporter_NodeElement_Geometry2D*)ne)->NumIndices = 4;
-		}
-
-		((CX3DImporter_NodeElement_Geometry2D*)ne)->Solid = solid;
-		// check for X3DMetadataObject childs.
-		if(!mReader->isEmptyElement())
-			ParseNode_Metadata(ne, "Disk2D");
-		else
-			NodeElement_Cur->Child.push_back(ne);// add made object as child to current element
-
-		NodeElement_List.push_back(ne);// add element to node element list because its a new object in graph
-	}// if(!use.empty()) else
-}
-
-// <Polyline2D
-// DEF=""          ID
-// USE=""          IDREF
-// lineSegments="" MFVec2F [intializeOnly]
-// />
-void X3DImporter::ParseNode_Geometry2D_Polyline2D()
-{
-    std::string def, use;
-    std::list<aiVector2D> lineSegments;
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_REF("lineSegments", lineSegments, XML_ReadNode_GetAttrVal_AsListVec2f);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_Polyline2D, ne);
-	}
-	else
-	{
-		// create and if needed - define new geometry object.
-		ne = new CX3DImporter_NodeElement_Geometry2D(CX3DImporter_NodeElement::ENET_Polyline2D, NodeElement_Cur);
-		if(!def.empty()) ne->ID = def;
-
-		//
-		// convert read point list of geometry object to line set.
-		//
-		std::list<aiVector3D> tlist;
-
-		// convert vec2 to vec3
-		for(std::list<aiVector2D>::iterator it2 = lineSegments.begin(); it2 != lineSegments.end(); ++it2) tlist.push_back(aiVector3D(it2->x, it2->y, 0));
-
-		// convert point set to line set
-		GeometryHelper_Extend_PointToLine(tlist, ((CX3DImporter_NodeElement_Geometry2D*)ne)->Vertices);
-		((CX3DImporter_NodeElement_Geometry2D*)ne)->NumIndices = 2;
-		// check for X3DMetadataObject childs.
-		if(!mReader->isEmptyElement())
-			ParseNode_Metadata(ne, "Polyline2D");
-		else
-			NodeElement_Cur->Child.push_back(ne);// add made object as child to current element
-
-		NodeElement_List.push_back(ne);// add element to node element list because its a new object in graph
-	}// if(!use.empty()) else
-}
-
-// <Polypoint2D
-// DEF=""   ID
-// USE=""   IDREF
-// point="" MFVec2F [inputOutput]
-// />
-void X3DImporter::ParseNode_Geometry2D_Polypoint2D()
-{
-    std::string def, use;
-    std::list<aiVector2D> point;
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_REF("point", point, XML_ReadNode_GetAttrVal_AsListVec2f);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_Polypoint2D, ne);
-	}
-	else
-	{
-		// create and if needed - define new geometry object.
-		ne = new CX3DImporter_NodeElement_Geometry2D(CX3DImporter_NodeElement::ENET_Polypoint2D, NodeElement_Cur);
-		if(!def.empty()) ne->ID = def;
-
-		// convert vec2 to vec3
-		for(std::list<aiVector2D>::iterator it2 = point.begin(); it2 != point.end(); ++it2)
-		{
-			((CX3DImporter_NodeElement_Geometry2D*)ne)->Vertices.push_back(aiVector3D(it2->x, it2->y, 0));
-		}
-
-		((CX3DImporter_NodeElement_Geometry2D*)ne)->NumIndices = 1;
-		// check for X3DMetadataObject childs.
-		if(!mReader->isEmptyElement())
-			ParseNode_Metadata(ne, "Polypoint2D");
-		else
-			NodeElement_Cur->Child.push_back(ne);// add made object as child to current element
-
-		NodeElement_List.push_back(ne);// add element to node element list because its a new object in graph
-	}// if(!use.empty()) else
-}
-
-// <Rectangle2D
-// DEF=""        ID
-// USE=""        IDREF
-// size="2 2"    SFVec2f [initializeOnly]
-// solid="false" SFBool  [initializeOnly]
-// />
-void X3DImporter::ParseNode_Geometry2D_Rectangle2D()
-{
-    std::string def, use;
-    aiVector2D size(2, 2);
-    bool solid = false;
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_REF("size", size, XML_ReadNode_GetAttrVal_AsVec2f);
-		MACRO_ATTRREAD_CHECK_RET("solid", solid, XML_ReadNode_GetAttrVal_AsBool);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_Rectangle2D, ne);
-	}
-	else
-	{
-		// create and if needed - define new geometry object.
-		ne = new CX3DImporter_NodeElement_Geometry2D(CX3DImporter_NodeElement::ENET_Rectangle2D, NodeElement_Cur);
-		if(!def.empty()) ne->ID = def;
-
-		float x1 = -size.x / 2.0f;
-		float x2 = size.x / 2.0f;
-		float y1 = -size.y / 2.0f;
-		float y2 = size.y / 2.0f;
-		std::list<aiVector3D>& vlist = ((CX3DImporter_NodeElement_Geometry2D*)ne)->Vertices;// just short alias.
-
-		vlist.push_back(aiVector3D(x2, y1, 0));// 1st point
-		vlist.push_back(aiVector3D(x2, y2, 0));// 2nd point
-		vlist.push_back(aiVector3D(x1, y2, 0));// 3rd point
-		vlist.push_back(aiVector3D(x1, y1, 0));// 4th point
-		((CX3DImporter_NodeElement_Geometry2D*)ne)->Solid = solid;
-		((CX3DImporter_NodeElement_Geometry2D*)ne)->NumIndices = 4;
-		// check for X3DMetadataObject childs.
-		if(!mReader->isEmptyElement())
-			ParseNode_Metadata(ne, "Rectangle2D");
-		else
-			NodeElement_Cur->Child.push_back(ne);// add made object as child to current element
-
-		NodeElement_List.push_back(ne);// add element to node element list because its a new object in graph
-	}// if(!use.empty()) else
-}
-
-// <TriangleSet2D
-// DEF=""        ID
-// USE=""        IDREF
-// solid="false" SFBool  [initializeOnly]
-// vertices=""   MFVec2F [inputOutput]
-// />
-void X3DImporter::ParseNode_Geometry2D_TriangleSet2D()
-{
-    std::string def, use;
-    bool solid = false;
-    std::list<aiVector2D> vertices;
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_REF("vertices", vertices, XML_ReadNode_GetAttrVal_AsListVec2f);
-		MACRO_ATTRREAD_CHECK_RET("solid", solid, XML_ReadNode_GetAttrVal_AsBool);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_TriangleSet2D, ne);
-	}
-	else
-	{
-		if(vertices.size() % 3) throw DeadlyImportError("TriangleSet2D. Not enough points for defining triangle.");
-
-		// create and if needed - define new geometry object.
-		ne = new CX3DImporter_NodeElement_Geometry2D(CX3DImporter_NodeElement::ENET_TriangleSet2D, NodeElement_Cur);
-		if(!def.empty()) ne->ID = def;
-
-		// convert vec2 to vec3
-		for(std::list<aiVector2D>::iterator it2 = vertices.begin(); it2 != vertices.end(); ++it2)
-		{
-			((CX3DImporter_NodeElement_Geometry2D*)ne)->Vertices.push_back(aiVector3D(it2->x, it2->y, 0));
-		}
-
-		((CX3DImporter_NodeElement_Geometry2D*)ne)->Solid = solid;
-		((CX3DImporter_NodeElement_Geometry2D*)ne)->NumIndices = 3;
-		// check for X3DMetadataObject childs.
-		if(!mReader->isEmptyElement())
-			ParseNode_Metadata(ne, "TriangleSet2D");
-		else
-			NodeElement_Cur->Child.push_back(ne);// add made object as child to current element
-
-		NodeElement_List.push_back(ne);// add element to node element list because its a new object in graph
-	}// if(!use.empty()) else
-}
-
-}// namespace Assimp
-
-#endif // !ASSIMP_BUILD_NO_X3D_IMPORTER
diff --git a/code/AssetLib/X3D/X3DImporter_Geometry3D.cpp b/code/AssetLib/X3D/X3DImporter_Geometry3D.cpp
deleted file mode 100644
index a6bad981a..000000000
--- a/code/AssetLib/X3D/X3DImporter_Geometry3D.cpp
+++ /dev/null
@@ -1,999 +0,0 @@
-/*
-Open Asset Import Library (assimp)
-----------------------------------------------------------------------
-
-Copyright (c) 2006-2020, assimp team
-
-
-All rights reserved.
-
-Redistribution and use of this software in source and binary forms,
-with or without modification, are permitted provided that the
-following conditions are met:
-
-* Redistributions of source code must retain the above
-copyright notice, this list of conditions and the
-following disclaimer.
-
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the
-following disclaimer in the documentation and/or other
-materials provided with the distribution.
-
-* Neither the name of the assimp team, nor the names of its
-contributors may be used to endorse or promote products
-derived from this software without specific prior
-written permission of the assimp team.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-----------------------------------------------------------------------
-*/
-/// \file   X3DImporter_Geometry3D.cpp
-/// \brief  Parsing data from nodes of "Geometry3D" set of X3D.
-/// \date   2015-2016
-/// \author smal.root@gmail.com
-
-#ifndef ASSIMP_BUILD_NO_X3D_IMPORTER
-
-#include "X3DImporter.hpp"
-#include "X3DImporter_Macro.hpp"
-
-// Header files, Assimp.
-#include <assimp/StandardShapes.h>
-
-namespace Assimp
-{
-
-// <Box
-// DEF=""       ID
-// USE=""       IDREF
-// size="2 2 2" SFVec3f [initializeOnly]
-// solid="true" SFBool  [initializeOnly]
-// />
-// The Box node specifies a rectangular parallelepiped box centred at (0, 0, 0) in the local coordinate system and aligned with the local coordinate axes.
-// By default, the box measures 2 units in each dimension, from -1 to +1. The size field specifies the extents of the box along the X-, Y-, and Z-axes
-// respectively and each component value shall be greater than zero.
-void X3DImporter::ParseNode_Geometry3D_Box()
-{
-    std::string def, use;
-    bool solid = true;
-    aiVector3D size(2, 2, 2);
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_REF("size", size, XML_ReadNode_GetAttrVal_AsVec3f);
-		MACRO_ATTRREAD_CHECK_RET("solid", solid, XML_ReadNode_GetAttrVal_AsBool);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_Box, ne);
-	}
-	else
-	{
-		// create and if needed - define new geometry object.
-		ne = new CX3DImporter_NodeElement_Geometry3D(CX3DImporter_NodeElement::ENET_Box, NodeElement_Cur);
-		if(!def.empty()) ne->ID = def;
-
-		GeometryHelper_MakeQL_RectParallelepiped(size, ((CX3DImporter_NodeElement_Geometry3D*)ne)->Vertices);// get quad list
-		((CX3DImporter_NodeElement_Geometry3D*)ne)->Solid = solid;
-		((CX3DImporter_NodeElement_Geometry3D*)ne)->NumIndices = 4;
-		// check for X3DMetadataObject childs.
-		if(!mReader->isEmptyElement())
-			ParseNode_Metadata(ne, "Box");
-		else
-			NodeElement_Cur->Child.push_back(ne);// add made object as child to current element
-
-		NodeElement_List.push_back(ne);// add element to node element list because its a new object in graph
-	}// if(!use.empty()) else
-}
-
-// <Cone
-// DEF=""           ID
-// USE=""           IDREF
-// bottom="true"    SFBool [initializeOnly]
-// bottomRadius="1" SFloat [initializeOnly]
-// height="2"       SFloat [initializeOnly]
-// side="true"      SFBool [initializeOnly]
-// solid="true"     SFBool [initializeOnly]
-// />
-void X3DImporter::ParseNode_Geometry3D_Cone()
-{
-    std::string use, def;
-    bool bottom = true;
-    float bottomRadius = 1;
-    float height = 2;
-    bool side = true;
-    bool solid = true;
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_RET("solid", solid, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_RET("side", side, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_RET("bottom", bottom, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_RET("height", height, XML_ReadNode_GetAttrVal_AsFloat);
-		MACRO_ATTRREAD_CHECK_RET("bottomRadius", bottomRadius, XML_ReadNode_GetAttrVal_AsFloat);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_Cone, ne);
-	}
-	else
-	{
-		const unsigned int tess = 30;///TODO: IME tessellation factor through ai_property
-
-		std::vector<aiVector3D> tvec;// temp array for vertices.
-
-		// create and if needed - define new geometry object.
-		ne = new CX3DImporter_NodeElement_Geometry3D(CX3DImporter_NodeElement::ENET_Cone, NodeElement_Cur);
-		if(!def.empty()) ne->ID = def;
-
-		// make cone or parts according to flags.
-		if(side)
-		{
-			StandardShapes::MakeCone(height, 0, bottomRadius, tess, tvec, !bottom);
-		}
-		else if(bottom)
-		{
-			StandardShapes::MakeCircle(bottomRadius, tess, tvec);
-			height = -(height / 2);
-			for(std::vector<aiVector3D>::iterator it = tvec.begin(); it != tvec.end(); ++it) it->y = height;// y - because circle made in oXZ.
-		}
-
-		// copy data from temp array
-		for(std::vector<aiVector3D>::iterator it = tvec.begin(); it != tvec.end(); ++it) ((CX3DImporter_NodeElement_Geometry3D*)ne)->Vertices.push_back(*it);
-
-		((CX3DImporter_NodeElement_Geometry3D*)ne)->Solid = solid;
-		((CX3DImporter_NodeElement_Geometry3D*)ne)->NumIndices = 3;
-		// check for X3DMetadataObject childs.
-		if(!mReader->isEmptyElement())
-			ParseNode_Metadata(ne, "Cone");
-		else
-			NodeElement_Cur->Child.push_back(ne);// add made object as child to current element
-
-		NodeElement_List.push_back(ne);// add element to node element list because its a new object in graph
-	}// if(!use.empty()) else
-}
-
-// <Cylinder
-// DEF=""        ID
-// USE=""        IDREF
-// bottom="true" SFBool [initializeOnly]
-// height="2"    SFloat [initializeOnly]
-// radius="1"    SFloat [initializeOnly]
-// side="true"   SFBool [initializeOnly]
-// solid="true"  SFBool [initializeOnly]
-// top="true"    SFBool [initializeOnly]
-// />
-void X3DImporter::ParseNode_Geometry3D_Cylinder()
-{
-    std::string use, def;
-    bool bottom = true;
-    float height = 2;
-    float radius = 1;
-    bool side = true;
-    bool solid = true;
-    bool top = true;
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_RET("radius", radius, XML_ReadNode_GetAttrVal_AsFloat);
-		MACRO_ATTRREAD_CHECK_RET("solid", solid, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_RET("bottom", bottom, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_RET("top", top, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_RET("side", side, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_RET("height", height, XML_ReadNode_GetAttrVal_AsFloat);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_Cylinder, ne);
-	}
-	else
-	{
-		const unsigned int tess = 30;///TODO: IME tessellation factor through ai_property
-
-		std::vector<aiVector3D> tside;// temp array for vertices of side.
-		std::vector<aiVector3D> tcir;// temp array for vertices of circle.
-
-		// create and if needed - define new geometry object.
-		ne = new CX3DImporter_NodeElement_Geometry3D(CX3DImporter_NodeElement::ENET_Cylinder, NodeElement_Cur);
-		if(!def.empty()) ne->ID = def;
-
-		// make cilynder or parts according to flags.
-		if(side) StandardShapes::MakeCone(height, radius, radius, tess, tside, true);
-
-		height /= 2;// height defined for whole cylinder, when creating top and bottom circle we are using just half of height.
-		if(top || bottom) StandardShapes::MakeCircle(radius, tess, tcir);
-		// copy data from temp arrays
-		std::list<aiVector3D>& vlist = ((CX3DImporter_NodeElement_Geometry3D*)ne)->Vertices;// just short alias.
-
-		for(std::vector<aiVector3D>::iterator it = tside.begin(); it != tside.end(); ++it) vlist.push_back(*it);
-
-		if(top)
-		{
-			for(std::vector<aiVector3D>::iterator it = tcir.begin(); it != tcir.end(); ++it)
-			{
-				(*it).y = height;// y - because circle made in oXZ.
-				vlist.push_back(*it);
-			}
-		}// if(top)
-
-		if(bottom)
-		{
-			for(std::vector<aiVector3D>::iterator it = tcir.begin(); it != tcir.end(); ++it)
-			{
-				(*it).y = -height;// y - because circle made in oXZ.
-				vlist.push_back(*it);
-			}
-		}// if(top)
-
-		((CX3DImporter_NodeElement_Geometry3D*)ne)->Solid = solid;
-		((CX3DImporter_NodeElement_Geometry3D*)ne)->NumIndices = 3;
-		// check for X3DMetadataObject childs.
-		if(!mReader->isEmptyElement())
-			ParseNode_Metadata(ne, "Cylinder");
-		else
-			NodeElement_Cur->Child.push_back(ne);// add made object as child to current element
-
-		NodeElement_List.push_back(ne);// add element to node element list because its a new object in graph
-	}// if(!use.empty()) else
-}
-
-// <ElevationGrid
-// DEF=""                 ID
-// USE=""                 IDREF
-// ccw="true"             SFBool  [initializeOnly]
-// colorPerVertex="true"  SFBool  [initializeOnly]
-// creaseAngle="0"        SFloat  [initializeOnly]
-// height=""              MFloat  [initializeOnly]
-// normalPerVertex="true" SFBool  [initializeOnly]
-// solid="true"           SFBool  [initializeOnly]
-// xDimension="0"         SFInt32 [initializeOnly]
-// xSpacing="1.0"         SFloat  [initializeOnly]
-// zDimension="0"         SFInt32 [initializeOnly]
-// zSpacing="1.0"         SFloat  [initializeOnly]
-// >
-//   <!-- ColorNormalTexCoordContentModel -->
-// ColorNormalTexCoordContentModel can contain Color (or ColorRGBA), Normal and TextureCoordinate, in any order. No more than one instance of any single
-// node type is allowed. A ProtoInstance node (with the proper node type) can be substituted for any node in this content model.
-// </ElevationGrid>
-// The ElevationGrid node specifies a uniform rectangular grid of varying height in the Y=0 plane of the local coordinate system. The geometry is described
-// by a scalar array of height values that specify the height of a surface above each point of the grid. The xDimension and zDimension fields indicate
-// the number of elements of the grid height array in the X and Z directions. Both xDimension and zDimension shall be greater than or equal to zero.
-// If either the xDimension or the zDimension is less than two, the ElevationGrid contains no quadrilaterals.
-void X3DImporter::ParseNode_Geometry3D_ElevationGrid()
-{
-    std::string use, def;
-    bool ccw = true;
-    bool colorPerVertex = true;
-    float creaseAngle = 0;
-    std::vector<float> height;
-    bool normalPerVertex = true;
-    bool solid = true;
-    int32_t xDimension = 0;
-    float xSpacing = 1;
-    int32_t zDimension = 0;
-    float zSpacing = 1;
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_RET("solid", solid, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_RET("ccw", ccw, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_RET("colorPerVertex", colorPerVertex, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_RET("normalPerVertex", normalPerVertex, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_RET("creaseAngle", creaseAngle, XML_ReadNode_GetAttrVal_AsFloat);
-		MACRO_ATTRREAD_CHECK_REF("height", height, XML_ReadNode_GetAttrVal_AsArrF);
-		MACRO_ATTRREAD_CHECK_RET("xDimension", xDimension, XML_ReadNode_GetAttrVal_AsI32);
-		MACRO_ATTRREAD_CHECK_RET("xSpacing", xSpacing, XML_ReadNode_GetAttrVal_AsFloat);
-		MACRO_ATTRREAD_CHECK_RET("zDimension", zDimension, XML_ReadNode_GetAttrVal_AsI32);
-		MACRO_ATTRREAD_CHECK_RET("zSpacing", zSpacing, XML_ReadNode_GetAttrVal_AsFloat);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_ElevationGrid, ne);
-	}
-	else
-	{
-		if((xSpacing == 0.0f) || (zSpacing == 0.0f)) throw DeadlyImportError("Spacing in <ElevationGrid> must be grater than zero.");
-		if((xDimension <= 0) || (zDimension <= 0)) throw DeadlyImportError("Dimension in <ElevationGrid> must be grater than zero.");
-		if((size_t)(xDimension * zDimension) != height.size()) Throw_IncorrectAttrValue("Heights count must be equal to \"xDimension * zDimension\"");
-
-		// create and if needed - define new geometry object.
-		ne = new CX3DImporter_NodeElement_ElevationGrid(CX3DImporter_NodeElement::ENET_ElevationGrid, NodeElement_Cur);
-		if(!def.empty()) ne->ID = def;
-
-		CX3DImporter_NodeElement_ElevationGrid& grid_alias = *((CX3DImporter_NodeElement_ElevationGrid*)ne);// create alias for conveience
-
-		{// create grid vertices list
-			std::vector<float>::const_iterator he_it = height.begin();
-
-			for(int32_t zi = 0; zi < zDimension; zi++)// rows
-			{
-				for(int32_t xi = 0; xi < xDimension; xi++)// columns
-				{
-					aiVector3D tvec(xSpacing * xi, *he_it, zSpacing * zi);
-
-					grid_alias.Vertices.push_back(tvec);
-					++he_it;
-				}
-			}
-		}// END: create grid vertices list
-		//
-		// create faces list. In "coordIdx" format
-		//
-		// check if we have quads
-		if((xDimension < 2) || (zDimension < 2))// only one element in dimension is set, create line set.
-		{
-			((CX3DImporter_NodeElement_ElevationGrid*)ne)->NumIndices = 2;// will be holded as line set.
-			for(size_t i = 0, i_e = (grid_alias.Vertices.size() - 1); i < i_e; i++)
-			{
-				grid_alias.CoordIdx.push_back(static_cast<int32_t>(i));
-				grid_alias.CoordIdx.push_back(static_cast<int32_t>(i + 1));
-				grid_alias.CoordIdx.push_back(-1);
-			}
-		}
-		else// two or more elements in every dimension is set. create quad set.
-		{
-			((CX3DImporter_NodeElement_ElevationGrid*)ne)->NumIndices = 4;
-			for(int32_t fzi = 0, fzi_e = (zDimension - 1); fzi < fzi_e; fzi++)// rows
-			{
-				for(int32_t fxi = 0, fxi_e = (xDimension - 1); fxi < fxi_e; fxi++)// columns
-				{
-					// points direction in face.
-					if(ccw)
-					{
-						// CCW:
-						//	3 2
-						//	0 1
-						grid_alias.CoordIdx.push_back((fzi + 1) * xDimension + fxi);
-						grid_alias.CoordIdx.push_back((fzi + 1) * xDimension + (fxi + 1));
-						grid_alias.CoordIdx.push_back(fzi * xDimension + (fxi + 1));
-						grid_alias.CoordIdx.push_back(fzi * xDimension + fxi);
-					}
-					else
-					{
-						// CW:
-						//	0 1
-						//	3 2
-						grid_alias.CoordIdx.push_back(fzi * xDimension + fxi);
-						grid_alias.CoordIdx.push_back(fzi * xDimension + (fxi + 1));
-						grid_alias.CoordIdx.push_back((fzi + 1) * xDimension + (fxi + 1));
-						grid_alias.CoordIdx.push_back((fzi + 1) * xDimension + fxi);
-					}// if(ccw) else
-
-					grid_alias.CoordIdx.push_back(-1);
-				}// for(int32_t fxi = 0, fxi_e = (xDimension - 1); fxi < fxi_e; fxi++)
-			}// for(int32_t fzi = 0, fzi_e = (zDimension - 1); fzi < fzi_e; fzi++)
-		}// if((xDimension < 2) || (zDimension < 2)) else
-
-		grid_alias.ColorPerVertex = colorPerVertex;
-		grid_alias.NormalPerVertex = normalPerVertex;
-		grid_alias.CreaseAngle = creaseAngle;
-		grid_alias.Solid = solid;
-        // check for child nodes
-        if(!mReader->isEmptyElement())
-        {
-			ParseHelper_Node_Enter(ne);
-			MACRO_NODECHECK_LOOPBEGIN("ElevationGrid");
-				// check for X3DComposedGeometryNodes
-				if(XML_CheckNode_NameEqual("Color")) { ParseNode_Rendering_Color(); continue; }
-				if(XML_CheckNode_NameEqual("ColorRGBA")) { ParseNode_Rendering_ColorRGBA(); continue; }
-				if(XML_CheckNode_NameEqual("Normal")) { ParseNode_Rendering_Normal(); continue; }
-				if(XML_CheckNode_NameEqual("TextureCoordinate")) { ParseNode_Texturing_TextureCoordinate(); continue; }
-				// check for X3DMetadataObject
-				if(!ParseHelper_CheckRead_X3DMetadataObject()) XML_CheckNode_SkipUnsupported("ElevationGrid");
-
-			MACRO_NODECHECK_LOOPEND("ElevationGrid");
-			ParseHelper_Node_Exit();
-		}// if(!mReader->isEmptyElement())
-		else
-		{
-			NodeElement_Cur->Child.push_back(ne);// add made object as child to current element
-		}// if(!mReader->isEmptyElement()) else
-
-		NodeElement_List.push_back(ne);// add element to node element list because its a new object in graph
-	}// if(!use.empty()) else
-}
-
-template<typename TVector>
-static void GeometryHelper_Extrusion_CurveIsClosed(std::vector<TVector>& pCurve, const bool pDropTail, const bool pRemoveLastPoint, bool& pCurveIsClosed)
-{
-    size_t cur_sz = pCurve.size();
-
-	pCurveIsClosed = false;
-	// for curve with less than four points checking is have no sense,
-	if(cur_sz < 4) return;
-
-	for(size_t s = 3, s_e = cur_sz; s < s_e; s++)
-	{
-		// search for first point of duplicated part.
-		if(pCurve[0] == pCurve[s])
-		{
-			bool found = true;
-
-			// check if tail(indexed by b2) is duplicate of head(indexed by b1).
-			for(size_t b1 = 1, b2 = (s + 1); b2 < cur_sz; b1++, b2++)
-			{
-				if(pCurve[b1] != pCurve[b2])
-				{// points not match: clear flag and break loop.
-					found = false;
-
-					break;
-				}
-			}// for(size_t b1 = 1, b2 = (s + 1); b2 < cur_sz; b1++, b2++)
-
-			// if duplicate tail is found then drop or not it depending on flags.
-			if(found)
-			{
-				pCurveIsClosed = true;
-				if(pDropTail)
-				{
-					if(!pRemoveLastPoint) s++;// prepare value for iterator's arithmetics.
-
-					pCurve.erase(pCurve.begin() + s, pCurve.end());// remove tail
-				}
-
-				break;
-			}// if(found)
-		}// if(pCurve[0] == pCurve[s])
-	}// for(size_t s = 3, s_e = (cur_sz - 1); s < s_e; s++)
-}
-
-static aiVector3D GeometryHelper_Extrusion_GetNextY(const size_t pSpine_PointIdx, const std::vector<aiVector3D>& pSpine, const bool pSpine_Closed)
-{
-    const size_t spine_idx_last = pSpine.size() - 1;
-    aiVector3D tvec;
-
-	if((pSpine_PointIdx == 0) || (pSpine_PointIdx == spine_idx_last))// at first special cases
-	{
-		if(pSpine_Closed)
-		{// If the spine curve is closed: The SCP for the first and last points is the same and is found using (spine[1] - spine[n - 2]) to compute the Y-axis.
-			// As we even for closed spine curve last and first point in pSpine are not the same: duplicates(spine[n - 1] which are equivalent to spine[0])
-			// in tail are removed.
-			// So, last point in pSpine is a spine[n - 2]
-			tvec = pSpine[1] - pSpine[spine_idx_last];
-		}
-		else if(pSpine_PointIdx == 0)
-		{// The Y-axis used for the first point is the vector from spine[0] to spine[1]
-			tvec = pSpine[1] - pSpine[0];
-		}
-		else
-		{// The Y-axis used for the last point it is the vector from spine[n-2] to spine[n-1]. In our case(see above about dropping tail) spine[n - 1] is
-			// the spine[0].
-			tvec = pSpine[spine_idx_last] - pSpine[spine_idx_last - 1];
-		}
-	}// if((pSpine_PointIdx == 0) || (pSpine_PointIdx == spine_idx_last))
-	else
-	{// For all points other than the first or last: The Y-axis for spine[i] is found by normalizing the vector defined by (spine[i+1] - spine[i-1]).
-		tvec = pSpine[pSpine_PointIdx + 1] - pSpine[pSpine_PointIdx - 1];
-	}// if((pSpine_PointIdx == 0) || (pSpine_PointIdx == spine_idx_last)) else
-
-	return tvec.Normalize();
-}
-
-static aiVector3D GeometryHelper_Extrusion_GetNextZ(const size_t pSpine_PointIdx, const std::vector<aiVector3D>& pSpine, const bool pSpine_Closed,
-													const aiVector3D pVecZ_Prev)
-{
-    const aiVector3D zero_vec(0);
-    const size_t spine_idx_last = pSpine.size() - 1;
-
-    aiVector3D tvec;
-
-	// at first special cases
-	if(pSpine.size() < 3)// spine have not enough points for vector calculations.
-	{
-		tvec.Set(0, 0, 1);
-	}
-	else if(pSpine_PointIdx == 0)// special case: first point
-	{
-		if(pSpine_Closed)// for calculating use previous point in curve s[n - 2]. In list it's a last point, because point s[n - 1] was removed as duplicate.
-		{
-			tvec = (pSpine[1] - pSpine[0]) ^ (pSpine[spine_idx_last] - pSpine[0]);
-		}
-		else // for not closed curve first and next point(s[0] and s[1]) has the same vector Z.
-		{
-			bool found = false;
-
-			// As said: "If the Z-axis of the first point is undefined (because the spine is not closed and the first two spine segments are collinear)
-			// then the Z-axis for the first spine point with a defined Z-axis is used."
-			// Walk through spine and find Z.
-			for(size_t next_point = 2; (next_point <= spine_idx_last) && !found; next_point++)
-			{
-				// (pSpine[2] - pSpine[1]) ^ (pSpine[0] - pSpine[1])
-				tvec = (pSpine[next_point] - pSpine[next_point - 1]) ^ (pSpine[next_point - 2] - pSpine[next_point - 1]);
-				found = !tvec.Equal(zero_vec);
-			}
-
-			// if entire spine are collinear then use OZ axis.
-			if(!found) tvec.Set(0, 0, 1);
-		}// if(pSpine_Closed) else
-	}// else if(pSpine_PointIdx == 0)
-	else if(pSpine_PointIdx == spine_idx_last)// special case: last point
-	{
-		if(pSpine_Closed)
-		{// do not forget that real last point s[n - 1] is removed as duplicated. And in this case we are calculating vector Z for point s[n - 2].
-			tvec = (pSpine[0] - pSpine[pSpine_PointIdx]) ^ (pSpine[pSpine_PointIdx - 1] - pSpine[pSpine_PointIdx]);
-			// if taken spine vectors are collinear then use previous vector Z.
-			if(tvec.Equal(zero_vec)) tvec = pVecZ_Prev;
-		}
-		else
-		{// vector Z for last point of not closed curve is previous vector Z.
-			tvec = pVecZ_Prev;
-		}
-	}
-	else// regular point
-	{
-		tvec = (pSpine[pSpine_PointIdx + 1] - pSpine[pSpine_PointIdx]) ^ (pSpine[pSpine_PointIdx - 1] - pSpine[pSpine_PointIdx]);
-		// if taken spine vectors are collinear then use previous vector Z.
-		if(tvec.Equal(zero_vec)) tvec = pVecZ_Prev;
-	}
-
-	// After determining the Z-axis, its dot product with the Z-axis of the previous spine point is computed. If this value is negative, the Z-axis
-	// is flipped (multiplied by -1).
-	if((tvec * pVecZ_Prev) < 0) tvec = -tvec;
-
-	return tvec.Normalize();
-}
-
-// <Extrusion
-// DEF=""                                 ID
-// USE=""                                 IDREF
-// beginCap="true"                        SFBool     [initializeOnly]
-// ccw="true"                             SFBool     [initializeOnly]
-// convex="true"                          SFBool     [initializeOnly]
-// creaseAngle="0.0"                      SFloat     [initializeOnly]
-// crossSection="1 1 1 -1 -1 -1 -1 1 1 1" MFVec2f    [initializeOnly]
-// endCap="true"                          SFBool     [initializeOnly]
-// orientation="0 0 1 0"                  MFRotation [initializeOnly]
-// scale="1 1"                            MFVec2f    [initializeOnly]
-// solid="true"                           SFBool     [initializeOnly]
-// spine="0 0 0 0 1 0"                    MFVec3f    [initializeOnly]
-// />
-void X3DImporter::ParseNode_Geometry3D_Extrusion()
-{
-    std::string use, def;
-    bool beginCap = true;
-    bool ccw = true;
-    bool convex = true;
-    float creaseAngle = 0;
-    std::vector<aiVector2D> crossSection;
-    bool endCap = true;
-    std::vector<float> orientation;
-    std::vector<aiVector2D> scale;
-    bool solid = true;
-    std::vector<aiVector3D> spine;
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_RET("beginCap", beginCap, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_RET("ccw", ccw, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_RET("convex", convex, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_RET("creaseAngle", creaseAngle, XML_ReadNode_GetAttrVal_AsFloat);
-		MACRO_ATTRREAD_CHECK_REF("crossSection", crossSection, XML_ReadNode_GetAttrVal_AsArrVec2f);
-		MACRO_ATTRREAD_CHECK_RET("endCap", endCap, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_REF("orientation", orientation, XML_ReadNode_GetAttrVal_AsArrF);
-		MACRO_ATTRREAD_CHECK_REF("scale", scale, XML_ReadNode_GetAttrVal_AsArrVec2f);
-		MACRO_ATTRREAD_CHECK_RET("solid", solid, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_REF("spine", spine, XML_ReadNode_GetAttrVal_AsArrVec3f);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_Extrusion, ne);
-	}
-	else
-	{
-		//
-		// check if default values must be assigned
-		//
-		if(spine.size() == 0)
-		{
-			spine.resize(2);
-			spine[0].Set(0, 0, 0), spine[1].Set(0, 1, 0);
-		}
-		else if(spine.size() == 1)
-		{
-			throw DeadlyImportError("ParseNode_Geometry3D_Extrusion. Spine must have at least two points.");
-		}
-
-		if(crossSection.size() == 0)
-		{
-			crossSection.resize(5);
-			crossSection[0].Set(1, 1), crossSection[1].Set(1, -1), crossSection[2].Set(-1, -1), crossSection[3].Set(-1, 1), crossSection[4].Set(1, 1);
-		}
-
-		{// orientation
-			size_t ori_size = orientation.size() / 4;
-
-			if(ori_size < spine.size())
-			{
-				float add_ori[4];// values that will be added
-
-				if(ori_size == 1)// if "orientation" has one element(means one MFRotation with four components) then use it value for all spine points.
-				{
-					add_ori[0] = orientation[0], add_ori[1] = orientation[1], add_ori[2] = orientation[2], add_ori[3] = orientation[3];
-				}
-				else// else - use default values
-				{
-					add_ori[0] = 0, add_ori[1] = 0, add_ori[2] = 1, add_ori[3] = 0;
-				}
-
-				orientation.reserve(spine.size() * 4);
-				for(size_t i = 0, i_e = (spine.size() - ori_size); i < i_e; i++)
-					orientation.push_back(add_ori[0]), orientation.push_back(add_ori[1]), orientation.push_back(add_ori[2]), orientation.push_back(add_ori[3]);
-			}
-
-			if(orientation.size() % 4) throw DeadlyImportError("Attribute \"orientation\" in <Extrusion> must has multiple four quantity of numbers.");
-		}// END: orientation
-
-		{// scale
-			if(scale.size() < spine.size())
-			{
-				aiVector2D add_sc;
-
-				if(scale.size() == 1)// if "scale" has one element then use it value for all spine points.
-					add_sc = scale[0];
-				else// else - use default values
-					add_sc.Set(1, 1);
-
-				scale.reserve(spine.size());
-				for(size_t i = 0, i_e = (spine.size() - scale.size()); i < i_e; i++) scale.push_back(add_sc);
-			}
-		}// END: scale
-		//
-		// create and if needed - define new geometry object.
-		//
-		ne = new CX3DImporter_NodeElement_IndexedSet(CX3DImporter_NodeElement::ENET_Extrusion, NodeElement_Cur);
-		if(!def.empty()) ne->ID = def;
-
-		CX3DImporter_NodeElement_IndexedSet& ext_alias = *((CX3DImporter_NodeElement_IndexedSet*)ne);// create alias for conveience
-		// assign part of input data
-		ext_alias.CCW = ccw;
-		ext_alias.Convex = convex;
-		ext_alias.CreaseAngle = creaseAngle;
-		ext_alias.Solid = solid;
-
-		//
-		// How we done it at all?
-		// 1. At first we will calculate array of basises for every point in spine(look SCP in ISO-dic). Also "orientation" vector
-		// are applied vor every basis.
-		// 2. After that we can create array of point sets: which are scaled, transferred to basis of relative basis and at final translated to real position
-		// using relative spine point.
-		// 3. Next step is creating CoordIdx array(do not forget "-1" delimiter). While creating CoordIdx also created faces for begin and end caps, if
-		// needed. While createing CootdIdx is taking in account CCW flag.
-		// 4. The last step: create Vertices list.
-		//
-        bool spine_closed;// flag: true if spine curve is closed.
-        bool cross_closed;// flag: true if cross curve is closed.
-        std::vector<aiMatrix3x3> basis_arr;// array of basises. ROW_a - X, ROW_b - Y, ROW_c - Z.
-        std::vector<std::vector<aiVector3D> > pointset_arr;// array of point sets: cross curves.
-
-        // detect closed curves
-        GeometryHelper_Extrusion_CurveIsClosed(crossSection, true, true, cross_closed);// true - drop tail, true - remove duplicate end.
-        GeometryHelper_Extrusion_CurveIsClosed(spine, true, true, spine_closed);// true - drop tail, true - remove duplicate end.
-        // If both cap are requested and spine curve is closed then we can make only one cap. Because second cap will be the same surface.
-        if(spine_closed)
-        {
-			beginCap |= endCap;
-			endCap = false;
-		}
-
-        {// 1. Calculate array of basises.
-			aiMatrix4x4 rotmat;
-			aiVector3D vecX(0), vecY(0), vecZ(0);
-
-			basis_arr.resize(spine.size());
-			for(size_t i = 0, i_e = spine.size(); i < i_e; i++)
-			{
-				aiVector3D tvec;
-
-				// get axises of basis.
-				vecY = GeometryHelper_Extrusion_GetNextY(i, spine, spine_closed);
-				vecZ = GeometryHelper_Extrusion_GetNextZ(i, spine, spine_closed, vecZ);
-				vecX = (vecY ^ vecZ).Normalize();
-				// get rotation matrix and apply "orientation" to basis
-				aiMatrix4x4::Rotation(orientation[i * 4 + 3], aiVector3D(orientation[i * 4], orientation[i * 4 + 1], orientation[i * 4 + 2]), rotmat);
-				tvec = vecX, tvec *= rotmat, basis_arr[i].a1 = tvec.x, basis_arr[i].a2 = tvec.y, basis_arr[i].a3 = tvec.z;
-				tvec = vecY, tvec *= rotmat, basis_arr[i].b1 = tvec.x, basis_arr[i].b2 = tvec.y, basis_arr[i].b3 = tvec.z;
-				tvec = vecZ, tvec *= rotmat, basis_arr[i].c1 = tvec.x, basis_arr[i].c2 = tvec.y, basis_arr[i].c3 = tvec.z;
-			}// for(size_t i = 0, i_e = spine.size(); i < i_e; i++)
-		}// END: 1. Calculate array of basises
-
-		{// 2. Create array of point sets.
-			aiMatrix4x4 scmat;
-			std::vector<aiVector3D> tcross(crossSection.size());
-
-			pointset_arr.resize(spine.size());
-			for(size_t spi = 0, spi_e = spine.size(); spi < spi_e; spi++)
-			{
-				aiVector3D tc23vec;
-
-				tc23vec.Set(scale[spi].x, 0, scale[spi].y);
-				aiMatrix4x4::Scaling(tc23vec, scmat);
-				for(size_t cri = 0, cri_e = crossSection.size(); cri < cri_e; cri++)
-				{
-					aiVector3D tvecX, tvecY, tvecZ;
-
-					tc23vec.Set(crossSection[cri].x, 0, crossSection[cri].y);
-					// apply scaling to point
-					tcross[cri] = scmat * tc23vec;
-					//
-					// transfer point to new basis
-					// calculate coordinate in new basis
-					tvecX.Set(basis_arr[spi].a1, basis_arr[spi].a2, basis_arr[spi].a3), tvecX *= tcross[cri].x;
-					tvecY.Set(basis_arr[spi].b1, basis_arr[spi].b2, basis_arr[spi].b3), tvecY *= tcross[cri].y;
-					tvecZ.Set(basis_arr[spi].c1, basis_arr[spi].c2, basis_arr[spi].c3), tvecZ *= tcross[cri].z;
-					// apply new coordinates and translate it to spine point.
-					tcross[cri] = tvecX + tvecY + tvecZ + spine[spi];
-				}// for(size_t cri = 0, cri_e = crossSection.size(); cri < cri_e; i++)
-
-				pointset_arr[spi] = tcross;// store transferred point set
-			}// for(size_t spi = 0, spi_e = spine.size(); spi < spi_e; i++)
-		}// END: 2. Create array of point sets.
-
-		{// 3. Create CoordIdx.
-			// add caps if needed
-			if(beginCap)
-			{
-				// add cap as polygon. vertices of cap are places at begin, so just add numbers from zero.
-				for(size_t i = 0, i_e = crossSection.size(); i < i_e; i++) ext_alias.CoordIndex.push_back(static_cast<int32_t>(i));
-
-				// add delimiter
-				ext_alias.CoordIndex.push_back(-1);
-			}// if(beginCap)
-
-			if(endCap)
-			{
-				// add cap as polygon. vertices of cap are places at end, as for beginCap use just sequence of numbers but with offset.
-				size_t beg = (pointset_arr.size() - 1) * crossSection.size();
-
-				for(size_t i = beg, i_e = (beg + crossSection.size()); i < i_e; i++) ext_alias.CoordIndex.push_back(static_cast<int32_t>(i));
-
-				// add delimiter
-				ext_alias.CoordIndex.push_back(-1);
-			}// if(beginCap)
-
-			// add quads
-			for(size_t spi = 0, spi_e = (spine.size() - 1); spi <= spi_e; spi++)
-			{
-				const size_t cr_sz = crossSection.size();
-				const size_t cr_last = crossSection.size() - 1;
-
-				size_t right_col;// hold index basis for points of quad placed in right column;
-
-				if(spi != spi_e)
-					right_col = spi + 1;
-				else if(spine_closed)// if spine curve is closed then one more quad is needed: between first and last points of curve.
-					right_col = 0;
-				else
-					break;// if spine curve is not closed then break the loop, because spi is out of range for that type of spine.
-
-				for(size_t cri = 0; cri < cr_sz; cri++)
-				{
-					if(cri != cr_last)
-					{
-						MACRO_FACE_ADD_QUAD(ccw, ext_alias.CoordIndex,
-											static_cast<int32_t>(spi * cr_sz + cri), 
-                                            static_cast<int32_t>(right_col * cr_sz + cri), 
-                                            static_cast<int32_t>(right_col * cr_sz + cri + 1), 
-                                            static_cast<int32_t>(spi * cr_sz + cri + 1));
-						// add delimiter
-						ext_alias.CoordIndex.push_back(-1);
-					}
-					else if(cross_closed)// if cross curve is closed then one more quad is needed: between first and last points of curve.
-					{
-						MACRO_FACE_ADD_QUAD(ccw, ext_alias.CoordIndex,
-                                            static_cast<int32_t>(spi * cr_sz + cri), 
-                                            static_cast<int32_t>(right_col * cr_sz + cri), 
-                                            static_cast<int32_t>(right_col * cr_sz + 0), 
-                                            static_cast<int32_t>(spi * cr_sz + 0));
-						// add delimiter
-						ext_alias.CoordIndex.push_back(-1);
-					}
-				}// for(size_t cri = 0; cri < cr_sz; cri++)
-			}// for(size_t spi = 0, spi_e = (spine.size() - 2); spi < spi_e; spi++)
-		}// END: 3. Create CoordIdx.
-
-		{// 4. Create vertices list.
-			// just copy all vertices
-			for(size_t spi = 0, spi_e = spine.size(); spi < spi_e; spi++)
-			{
-				for(size_t cri = 0, cri_e = crossSection.size(); cri < cri_e; cri++)
-				{
-					ext_alias.Vertices.push_back(pointset_arr[spi][cri]);
-				}
-			}
-		}// END: 4. Create vertices list.
-//PrintVectorSet("Ext. CoordIdx", ext_alias.CoordIndex);
-//PrintVectorSet("Ext. Vertices", ext_alias.Vertices);
-		// check for child nodes
-		if(!mReader->isEmptyElement())
-			ParseNode_Metadata(ne, "Extrusion");
-		else
-			NodeElement_Cur->Child.push_back(ne);// add made object as child to current element
-
-		NodeElement_List.push_back(ne);// add element to node element list because its a new object in graph
-	}// if(!use.empty()) else
-}
-
-// <IndexedFaceSet
-// DEF=""                         ID
-// USE=""                         IDREF
-// ccw="true"             SFBool  [initializeOnly]
-// colorIndex=""          MFInt32 [initializeOnly]
-// colorPerVertex="true"  SFBool  [initializeOnly]
-// convex="true"          SFBool  [initializeOnly]
-// coordIndex=""          MFInt32 [initializeOnly]
-// creaseAngle="0"        SFFloat [initializeOnly]
-// normalIndex=""         MFInt32 [initializeOnly]
-// normalPerVertex="true" SFBool  [initializeOnly]
-// solid="true"           SFBool  [initializeOnly]
-// texCoordIndex=""       MFInt32 [initializeOnly]
-// >
-//    <!-- ComposedGeometryContentModel -->
-// ComposedGeometryContentModel is the child-node content model corresponding to X3DComposedGeometryNodes. It can contain Color (or ColorRGBA), Coordinate,
-// Normal and TextureCoordinate, in any order. No more than one instance of these nodes is allowed. Multiple VertexAttribute (FloatVertexAttribute,
-// Matrix3VertexAttribute, Matrix4VertexAttribute) nodes can also be contained.
-// A ProtoInstance node (with the proper node type) can be substituted for any node in this content model.
-// </IndexedFaceSet>
-void X3DImporter::ParseNode_Geometry3D_IndexedFaceSet()
-{
-    std::string use, def;
-    bool ccw = true;
-    std::vector<int32_t> colorIndex;
-    bool colorPerVertex = true;
-    bool convex = true;
-    std::vector<int32_t> coordIndex;
-    float creaseAngle = 0;
-    std::vector<int32_t> normalIndex;
-    bool normalPerVertex = true;
-    bool solid = true;
-    std::vector<int32_t> texCoordIndex;
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_RET("ccw", ccw, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_REF("colorIndex", colorIndex, XML_ReadNode_GetAttrVal_AsArrI32);
-		MACRO_ATTRREAD_CHECK_RET("colorPerVertex", colorPerVertex, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_RET("convex", convex, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_REF("coordIndex", coordIndex, XML_ReadNode_GetAttrVal_AsArrI32);
-		MACRO_ATTRREAD_CHECK_RET("creaseAngle", creaseAngle, XML_ReadNode_GetAttrVal_AsFloat);
-		MACRO_ATTRREAD_CHECK_REF("normalIndex", normalIndex, XML_ReadNode_GetAttrVal_AsArrI32);
-		MACRO_ATTRREAD_CHECK_RET("normalPerVertex", normalPerVertex, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_RET("solid", solid, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_REF("texCoordIndex", texCoordIndex, XML_ReadNode_GetAttrVal_AsArrI32);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_IndexedFaceSet, ne);
-	}
-	else
-	{
-		// check data
-		if(coordIndex.size() == 0) throw DeadlyImportError("IndexedFaceSet must contain not empty \"coordIndex\" attribute.");
-
-		// create and if needed - define new geometry object.
-		ne = new CX3DImporter_NodeElement_IndexedSet(CX3DImporter_NodeElement::ENET_IndexedFaceSet, NodeElement_Cur);
-		if(!def.empty()) ne->ID = def;
-
-		CX3DImporter_NodeElement_IndexedSet& ne_alias = *((CX3DImporter_NodeElement_IndexedSet*)ne);
-
-		ne_alias.CCW = ccw;
-		ne_alias.ColorIndex = colorIndex;
-		ne_alias.ColorPerVertex = colorPerVertex;
-		ne_alias.Convex = convex;
-		ne_alias.CoordIndex = coordIndex;
-		ne_alias.CreaseAngle = creaseAngle;
-		ne_alias.NormalIndex = normalIndex;
-		ne_alias.NormalPerVertex = normalPerVertex;
-		ne_alias.Solid = solid;
-		ne_alias.TexCoordIndex = texCoordIndex;
-        // check for child nodes
-        if(!mReader->isEmptyElement())
-        {
-			ParseHelper_Node_Enter(ne);
-			MACRO_NODECHECK_LOOPBEGIN("IndexedFaceSet");
-				// check for X3DComposedGeometryNodes
-				if(XML_CheckNode_NameEqual("Color")) { ParseNode_Rendering_Color(); continue; }
-				if(XML_CheckNode_NameEqual("ColorRGBA")) { ParseNode_Rendering_ColorRGBA(); continue; }
-				if(XML_CheckNode_NameEqual("Coordinate")) { ParseNode_Rendering_Coordinate(); continue; }
-				if(XML_CheckNode_NameEqual("Normal")) { ParseNode_Rendering_Normal(); continue; }
-				if(XML_CheckNode_NameEqual("TextureCoordinate")) { ParseNode_Texturing_TextureCoordinate(); continue; }
-				// check for X3DMetadataObject
-				if(!ParseHelper_CheckRead_X3DMetadataObject()) XML_CheckNode_SkipUnsupported("IndexedFaceSet");
-
-			MACRO_NODECHECK_LOOPEND("IndexedFaceSet");
-			ParseHelper_Node_Exit();
-		}// if(!mReader->isEmptyElement())
-		else
-		{
-			NodeElement_Cur->Child.push_back(ne);// add made object as child to current element
-		}
-
-		NodeElement_List.push_back(ne);// add element to node element list because its a new object in graph
-	}// if(!use.empty()) else
-}
-
-// <Sphere
-// DEF=""       ID
-// USE=""       IDREF
-// radius="1"   SFloat [initializeOnly]
-// solid="true" SFBool [initializeOnly]
-// />
-void X3DImporter::ParseNode_Geometry3D_Sphere()
-{
-    std::string use, def;
-    ai_real radius = 1;
-    bool solid = true;
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_RET("radius", radius, XML_ReadNode_GetAttrVal_AsFloat);
-		MACRO_ATTRREAD_CHECK_RET("solid", solid, XML_ReadNode_GetAttrVal_AsBool);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_Sphere, ne);
-	}
-	else
-	{
-		const unsigned int tess = 3;///TODO: IME tessellation factor through ai_property
-
-		std::vector<aiVector3D> tlist;
-
-		// create and if needed - define new geometry object.
-		ne = new CX3DImporter_NodeElement_Geometry3D(CX3DImporter_NodeElement::ENET_Sphere, NodeElement_Cur);
-		if(!def.empty()) ne->ID = def;
-
-		StandardShapes::MakeSphere(tess, tlist);
-		// copy data from temp array and apply scale
-		for(std::vector<aiVector3D>::iterator it = tlist.begin(); it != tlist.end(); ++it)
-		{
-			((CX3DImporter_NodeElement_Geometry3D*)ne)->Vertices.push_back(*it * radius);
-		}
-
-		((CX3DImporter_NodeElement_Geometry3D*)ne)->Solid = solid;
-		((CX3DImporter_NodeElement_Geometry3D*)ne)->NumIndices = 3;
-		// check for X3DMetadataObject childs.
-		if(!mReader->isEmptyElement())
-			ParseNode_Metadata(ne, "Sphere");
-		else
-			NodeElement_Cur->Child.push_back(ne);// add made object as child to current element
-
-		NodeElement_List.push_back(ne);// add element to node element list because its a new object in graph
-	}// if(!use.empty()) else
-}
-
-}// namespace Assimp
-
-#endif // !ASSIMP_BUILD_NO_X3D_IMPORTER
diff --git a/code/AssetLib/X3D/X3DImporter_Group.cpp b/code/AssetLib/X3D/X3DImporter_Group.cpp
deleted file mode 100644
index d78778928..000000000
--- a/code/AssetLib/X3D/X3DImporter_Group.cpp
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
-Open Asset Import Library (assimp)
-----------------------------------------------------------------------
-
-Copyright (c) 2006-2020, assimp team
-
-
-All rights reserved.
-
-Redistribution and use of this software in source and binary forms,
-with or without modification, are permitted provided that the
-following conditions are met:
-
-* Redistributions of source code must retain the above
-copyright notice, this list of conditions and the
-following disclaimer.
-
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the
-following disclaimer in the documentation and/or other
-materials provided with the distribution.
-
-* Neither the name of the assimp team, nor the names of its
-contributors may be used to endorse or promote products
-derived from this software without specific prior
-written permission of the assimp team.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-----------------------------------------------------------------------
-*/
-/// \file   X3DImporter_Group.cpp
-/// \brief  Parsing data from nodes of "Grouping" set of X3D.
-/// \date   2015-2016
-/// \author smal.root@gmail.com
-
-#ifndef ASSIMP_BUILD_NO_X3D_IMPORTER
-
-#include "X3DImporter.hpp"
-#include "X3DImporter_Macro.hpp"
-
-namespace Assimp
-{
-
-// <Group
-// DEF=""              ID
-// USE=""              IDREF
-// bboxCenter="0 0 0"  SFVec3f [initializeOnly]
-// bboxSize="-1 -1 -1" SFVec3f [initializeOnly]
-// >
-//    <!-- ChildContentModel -->
-// ChildContentModel is the child-node content model corresponding to X3DChildNode, combining all profiles. ChildContentModel can contain most nodes,
-// other Grouping nodes, Prototype declarations and ProtoInstances in any order and any combination. When the assigned profile is less than Full, the
-// precise palette of legal nodes that are available depends on assigned profile and components.
-// A ProtoInstance node (with the proper node type) can be substituted for any node in this content model.
-// </Group>
-// A Group node contains children nodes without introducing a new transformation. It is equivalent to a Transform node containing an identity transform.
-void X3DImporter::ParseNode_Grouping_Group()
-{
-    std::string def, use;
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		CX3DImporter_NodeElement* ne;
-
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_Group, ne);
-	}
-	else
-	{
-		ParseHelper_Group_Begin();// create new grouping element and go deeper if node has children.
-		// at this place new group mode created and made current, so we can name it.
-		if(!def.empty()) NodeElement_Cur->ID = def;
-		// in grouping set of nodes check X3DMetadataObject is not needed, because it is done in <Scene> parser function.
-
-		// for empty element exit from node in that place
-		if(mReader->isEmptyElement()) ParseHelper_Node_Exit();
-	}// if(!use.empty()) else
-}
-
-void X3DImporter::ParseNode_Grouping_GroupEnd()
-{
-	ParseHelper_Node_Exit();// go up in scene graph
-}
-
-// <StaticGroup
-// DEF=""              ID
-// USE=""              IDREF
-// bboxCenter="0 0 0"  SFVec3f [initializeOnly]
-// bboxSize="-1 -1 -1" SFVec3f [initializeOnly]
-// >
-//    <!-- ChildContentModel -->
-// ChildContentModel is the child-node content model corresponding to X3DChildNode, combining all profiles. ChildContentModel can contain most nodes,
-// other Grouping nodes, Prototype declarations and ProtoInstances in any order and any combination. When the assigned profile is less than Full, the
-// precise palette of legal nodes that are available depends on assigned profile and components.
-// A ProtoInstance node (with the proper node type) can be substituted for any node in this content model.
-// </StaticGroup>
-// The StaticGroup node contains children nodes which cannot be modified. StaticGroup children are guaranteed to not change, send events, receive events or
-// contain any USE references outside the StaticGroup.
-void X3DImporter::ParseNode_Grouping_StaticGroup()
-{
-    std::string def, use;
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		CX3DImporter_NodeElement* ne;
-
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_Group, ne);
-	}
-	else
-	{
-		ParseHelper_Group_Begin(true);// create new grouping element and go deeper if node has children.
-		// at this place new group mode created and made current, so we can name it.
-		if(!def.empty()) NodeElement_Cur->ID = def;
-		// in grouping set of nodes check X3DMetadataObject is not needed, because it is done in <Scene> parser function.
-
-		// for empty element exit from node in that place
-		if(mReader->isEmptyElement()) ParseHelper_Node_Exit();
-	}// if(!use.empty()) else
-}
-
-void X3DImporter::ParseNode_Grouping_StaticGroupEnd()
-{
-	ParseHelper_Node_Exit();// go up in scene graph
-}
-
-// <Switch
-// DEF=""              ID
-// USE=""              IDREF
-// bboxCenter="0 0 0"  SFVec3f [initializeOnly]
-// bboxSize="-1 -1 -1" SFVec3f [initializeOnly]
-// whichChoice="-1"    SFInt32 [inputOutput]
-// >
-//    <!-- ChildContentModel -->
-// ChildContentModel is the child-node content model corresponding to X3DChildNode, combining all profiles. ChildContentModel can contain most nodes,
-// other Grouping nodes, Prototype declarations and ProtoInstances in any order and any combination. When the assigned profile is less than Full, the
-// precise palette of legal nodes that are available depends on assigned profile and components.
-// A ProtoInstance node (with the proper node type) can be substituted for any node in this content model.
-// </Switch>
-// The Switch grouping node traverses zero or one of the nodes specified in the children field. The whichChoice field specifies the index of the child
-// to traverse, with the first child having index 0. If whichChoice is less than zero or greater than the number of nodes in the children field, nothing
-// is chosen.
-void X3DImporter::ParseNode_Grouping_Switch()
-{
-    std::string def, use;
-    int32_t whichChoice = -1;
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_RET("whichChoice", whichChoice, XML_ReadNode_GetAttrVal_AsI32);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		CX3DImporter_NodeElement* ne;
-
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_Group, ne);
-	}
-	else
-	{
-		ParseHelper_Group_Begin();// create new grouping element and go deeper if node has children.
-		// at this place new group mode created and made current, so we can name it.
-		if(!def.empty()) NodeElement_Cur->ID = def;
-
-		// also set values specific to this type of group
-		((CX3DImporter_NodeElement_Group*)NodeElement_Cur)->UseChoice = true;
-		((CX3DImporter_NodeElement_Group*)NodeElement_Cur)->Choice = whichChoice;
-		// in grouping set of nodes check X3DMetadataObject is not needed, because it is done in <Scene> parser function.
-
-		// for empty element exit from node in that place
-		if(mReader->isEmptyElement()) ParseHelper_Node_Exit();
-	}// if(!use.empty()) else
-}
-
-void X3DImporter::ParseNode_Grouping_SwitchEnd()
-{
-	// just exit from node. Defined choice will be accepted at postprocessing stage.
-	ParseHelper_Node_Exit();// go up in scene graph
-}
-
-// <Transform
-// DEF=""                     ID
-// USE=""                     IDREF
-// bboxCenter="0 0 0"         SFVec3f    [initializeOnly]
-// bboxSize="-1 -1 -1"        SFVec3f    [initializeOnly]
-// center="0 0 0"             SFVec3f    [inputOutput]
-// rotation="0 0 1 0"         SFRotation [inputOutput]
-// scale="1 1 1"              SFVec3f    [inputOutput]
-// scaleOrientation="0 0 1 0" SFRotation [inputOutput]
-// translation="0 0 0"        SFVec3f    [inputOutput]
-// >
-//    <!-- ChildContentModel -->
-// ChildContentModel is the child-node content model corresponding to X3DChildNode, combining all profiles. ChildContentModel can contain most nodes,
-// other Grouping nodes, Prototype declarations and ProtoInstances in any order and any combination. When the assigned profile is less than Full, the
-// precise palette of legal nodes that are available depends on assigned profile and components.
-// A ProtoInstance node (with the proper node type) can be substituted for any node in this content model.
-// </Transform>
-// The Transform node is a grouping node that defines a coordinate system for its children that is relative to the coordinate systems of its ancestors.
-// Given a 3-dimensional point P and Transform node, P is transformed into point P' in its parent's coordinate system by a series of intermediate
-// transformations. In matrix transformation notation, where C (center), SR (scaleOrientation), T (translation), R (rotation), and S (scale) are the
-// equivalent transformation matrices,
-//   P' = T * C * R * SR * S * -SR * -C * P
-void X3DImporter::ParseNode_Grouping_Transform()
-{
-    aiVector3D center(0, 0, 0);
-    float rotation[4] = {0, 0, 1, 0};
-    aiVector3D scale(1, 1, 1);// A value of zero indicates that any child geometry shall not be displayed
-    float scale_orientation[4] = {0, 0, 1, 0};
-    aiVector3D translation(0, 0, 0);
-    aiMatrix4x4 matr, tmatr;
-    std::string use, def;
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_REF("center", center, XML_ReadNode_GetAttrVal_AsVec3f);
-		MACRO_ATTRREAD_CHECK_REF("scale", scale, XML_ReadNode_GetAttrVal_AsVec3f);
-		MACRO_ATTRREAD_CHECK_REF("translation", translation, XML_ReadNode_GetAttrVal_AsVec3f);
-		if(an == "rotation")
-		{
-			std::vector<float> tvec;
-
-			XML_ReadNode_GetAttrVal_AsArrF(idx, tvec);
-			if(tvec.size() != 4) throw DeadlyImportError("<Transform>: rotation vector must have 4 elements.");
-
-			memcpy(rotation, tvec.data(), sizeof(rotation));
-
-			continue;
-		}
-
-		if(an == "scaleOrientation")
-		{
-			std::vector<float> tvec;
-			XML_ReadNode_GetAttrVal_AsArrF(idx, tvec);
-            if ( tvec.size() != 4 )
-            {
-                throw DeadlyImportError( "<Transform>: scaleOrientation vector must have 4 elements." );
-            }
-
-			::memcpy(scale_orientation, tvec.data(), sizeof(scale_orientation) );
-
-			continue;
-		}
-
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		CX3DImporter_NodeElement* ne( nullptr );
-
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_Group, ne);
-	}
-	else
-	{
-		ParseHelper_Group_Begin();// create new grouping element and go deeper if node has children.
-		// at this place new group mode created and made current, so we can name it.
-        if ( !def.empty() )
-        {
-            NodeElement_Cur->ID = def;
-        }
-
-		//
-		// also set values specific to this type of group
-		//
-		// calculate transformation matrix
-		aiMatrix4x4::Translation(translation, matr);// T
-		aiMatrix4x4::Translation(center, tmatr);// C
-		matr *= tmatr;
-		aiMatrix4x4::Rotation(rotation[3], aiVector3D(rotation[0], rotation[1], rotation[2]), tmatr);// R
-		matr *= tmatr;
-		aiMatrix4x4::Rotation(scale_orientation[3], aiVector3D(scale_orientation[0], scale_orientation[1], scale_orientation[2]), tmatr);// SR
-		matr *= tmatr;
-		aiMatrix4x4::Scaling(scale, tmatr);// S
-		matr *= tmatr;
-		aiMatrix4x4::Rotation(-scale_orientation[3], aiVector3D(scale_orientation[0], scale_orientation[1], scale_orientation[2]), tmatr);// -SR
-		matr *= tmatr;
-		aiMatrix4x4::Translation(-center, tmatr);// -C
-		matr *= tmatr;
-		// and assign it
-		((CX3DImporter_NodeElement_Group*)NodeElement_Cur)->Transformation = matr;
-		// in grouping set of nodes check X3DMetadataObject is not needed, because it is done in <Scene> parser function.
-
-		// for empty element exit from node in that place
-        if ( mReader->isEmptyElement() )
-        {
-            ParseHelper_Node_Exit();
-        }
-	}// if(!use.empty()) else
-}
-
-void X3DImporter::ParseNode_Grouping_TransformEnd()
-{
-	ParseHelper_Node_Exit();// go up in scene graph
-}
-
-}// namespace Assimp
-
-#endif // !ASSIMP_BUILD_NO_X3D_IMPORTER
diff --git a/code/AssetLib/X3D/X3DImporter_Light.cpp b/code/AssetLib/X3D/X3DImporter_Light.cpp
deleted file mode 100644
index 5a482adcd..000000000
--- a/code/AssetLib/X3D/X3DImporter_Light.cpp
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
-Open Asset Import Library (assimp)
-----------------------------------------------------------------------
-
-Copyright (c) 2006-2020, assimp team
-
-
-All rights reserved.
-
-Redistribution and use of this software in source and binary forms,
-with or without modification, are permitted provided that the
-following conditions are met:
-
-* Redistributions of source code must retain the above
-copyright notice, this list of conditions and the
-following disclaimer.
-
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the
-following disclaimer in the documentation and/or other
-materials provided with the distribution.
-
-* Neither the name of the assimp team, nor the names of its
-contributors may be used to endorse or promote products
-derived from this software without specific prior
-written permission of the assimp team.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-----------------------------------------------------------------------
-*/
-/// \file   X3DImporter_Light.cpp
-/// \brief  Parsing data from nodes of "Lighting" set of X3D.
-/// \date   2015-2016
-/// \author smal.root@gmail.com
-
-#ifndef ASSIMP_BUILD_NO_X3D_IMPORTER
-
-#include "X3DImporter.hpp"
-#include "X3DImporter_Macro.hpp"
-#include <assimp/StringUtils.h>
-
-namespace Assimp {
-
-// <DirectionalLight
-// DEF=""               ID
-// USE=""               IDREF
-// ambientIntensity="0" SFFloat [inputOutput]
-// color="1 1 1"        SFColor [inputOutput]
-// direction="0 0 -1"   SFVec3f [inputOutput]
-// global="false"       SFBool  [inputOutput]
-// intensity="1"        SFFloat [inputOutput]
-// on="true"            SFBool  [inputOutput]
-// />
-void X3DImporter::ParseNode_Lighting_DirectionalLight()
-{
-    std::string def, use;
-    float ambientIntensity = 0;
-    aiColor3D color(1, 1, 1);
-    aiVector3D direction(0, 0, -1);
-    bool global = false;
-    float intensity = 1;
-    bool on = true;
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_RET("ambientIntensity", ambientIntensity, XML_ReadNode_GetAttrVal_AsFloat);
-		MACRO_ATTRREAD_CHECK_REF("color", color, XML_ReadNode_GetAttrVal_AsCol3f);
-		MACRO_ATTRREAD_CHECK_REF("direction", direction, XML_ReadNode_GetAttrVal_AsVec3f);
-		MACRO_ATTRREAD_CHECK_RET("global", global, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_RET("intensity", intensity, XML_ReadNode_GetAttrVal_AsFloat);
-		MACRO_ATTRREAD_CHECK_RET("on", on, XML_ReadNode_GetAttrVal_AsBool);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_DirectionalLight, ne);
-	}
-	else
-	{
-		if(on)
-		{
-			// create and if needed - define new geometry object.
-			ne = new CX3DImporter_NodeElement_Light(CX3DImporter_NodeElement::ENET_DirectionalLight, NodeElement_Cur);
-			if(!def.empty())
-				ne->ID = def;
-			else
-				ne->ID = "DirectionalLight_" + to_string((size_t)ne);// make random name
-
-			((CX3DImporter_NodeElement_Light*)ne)->AmbientIntensity = ambientIntensity;
-			((CX3DImporter_NodeElement_Light*)ne)->Color = color;
-			((CX3DImporter_NodeElement_Light*)ne)->Direction = direction;
-			((CX3DImporter_NodeElement_Light*)ne)->Global = global;
-			((CX3DImporter_NodeElement_Light*)ne)->Intensity = intensity;
-			// Assimp want a node with name similar to a light. "Why? I don't no." )
-			ParseHelper_Group_Begin(false);
-
-			NodeElement_Cur->ID = ne->ID;// assign name to node and return to light element.
-			ParseHelper_Node_Exit();
-			// check for child nodes
-			if(!mReader->isEmptyElement())
-				ParseNode_Metadata(ne, "DirectionalLight");
-			else
-				NodeElement_Cur->Child.push_back(ne);// add made object as child to current element
-
-			NodeElement_List.push_back(ne);// add element to node element list because its a new object in graph
-		}// if(on)
-	}// if(!use.empty()) else
-}
-
-// <PointLight
-// DEF=""               ID
-// USE=""               IDREF
-// ambientIntensity="0" SFFloat [inputOutput]
-// attenuation="1 0 0"  SFVec3f [inputOutput]
-// color="1 1 1"        SFColor [inputOutput]
-// global="true"        SFBool  [inputOutput]
-// intensity="1"        SFFloat [inputOutput]
-// location="0 0 0"     SFVec3f [inputOutput]
-// on="true"            SFBool  [inputOutput]
-// radius="100"         SFFloat [inputOutput]
-// />
-void X3DImporter::ParseNode_Lighting_PointLight()
-{
-    std::string def, use;
-    float ambientIntensity = 0;
-    aiVector3D attenuation( 1, 0, 0 );
-    aiColor3D color( 1, 1, 1 );
-    bool global = true;
-    float intensity = 1;
-    aiVector3D location( 0, 0, 0 );
-    bool on = true;
-    float radius = 100;
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_RET("ambientIntensity", ambientIntensity, XML_ReadNode_GetAttrVal_AsFloat);
-		MACRO_ATTRREAD_CHECK_REF("attenuation", attenuation, XML_ReadNode_GetAttrVal_AsVec3f);
-		MACRO_ATTRREAD_CHECK_REF("color", color, XML_ReadNode_GetAttrVal_AsCol3f);
-		MACRO_ATTRREAD_CHECK_RET("global", global, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_RET("intensity", intensity, XML_ReadNode_GetAttrVal_AsFloat);
-		MACRO_ATTRREAD_CHECK_REF("location", location, XML_ReadNode_GetAttrVal_AsVec3f);
-		MACRO_ATTRREAD_CHECK_RET("on", on, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_RET("radius", radius, XML_ReadNode_GetAttrVal_AsFloat);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_PointLight, ne);
-	}
-	else
-	{
-		if(on)
-		{
-			// create and if needed - define new geometry object.
-			ne = new CX3DImporter_NodeElement_Light(CX3DImporter_NodeElement::ENET_PointLight, NodeElement_Cur);
-			if(!def.empty()) ne->ID = def;
-
-			((CX3DImporter_NodeElement_Light*)ne)->AmbientIntensity = ambientIntensity;
-			((CX3DImporter_NodeElement_Light*)ne)->Attenuation = attenuation;
-			((CX3DImporter_NodeElement_Light*)ne)->Color = color;
-			((CX3DImporter_NodeElement_Light*)ne)->Global = global;
-			((CX3DImporter_NodeElement_Light*)ne)->Intensity = intensity;
-			((CX3DImporter_NodeElement_Light*)ne)->Location = location;
-			((CX3DImporter_NodeElement_Light*)ne)->Radius = radius;
-			// Assimp want a node with name similar to a light. "Why? I don't no." )
-			ParseHelper_Group_Begin(false);
-			// make random name
-			if(ne->ID.empty()) ne->ID = "PointLight_" + to_string((size_t)ne);
-
-			NodeElement_Cur->ID = ne->ID;// assign name to node and return to light element.
-			ParseHelper_Node_Exit();
-			// check for child nodes
-			if(!mReader->isEmptyElement())
-				ParseNode_Metadata(ne, "PointLight");
-			else
-				NodeElement_Cur->Child.push_back(ne);// add made object as child to current element
-
-			NodeElement_List.push_back(ne);// add element to node element list because its a new object in graph
-		}// if(on)
-	}// if(!use.empty()) else
-}
-
-// <SpotLight
-// DEF=""                 ID
-// USE=""                 IDREF
-// ambientIntensity="0"   SFFloat [inputOutput]
-// attenuation="1 0 0"    SFVec3f [inputOutput]
-// beamWidth="0.7854"     SFFloat [inputOutput]
-// color="1 1 1"          SFColor [inputOutput]
-// cutOffAngle="1.570796" SFFloat [inputOutput]
-// direction="0 0 -1"     SFVec3f [inputOutput]
-// global="true"          SFBool  [inputOutput]
-// intensity="1"          SFFloat [inputOutput]
-// location="0 0 0"       SFVec3f [inputOutput]
-// on="true"              SFBool  [inputOutput]
-// radius="100"           SFFloat [inputOutput]
-// />
-void X3DImporter::ParseNode_Lighting_SpotLight()
-{
-    std::string def, use;
-    float ambientIntensity = 0;
-    aiVector3D attenuation( 1, 0, 0 );
-    float beamWidth = 0.7854f;
-    aiColor3D color( 1, 1, 1 );
-    float cutOffAngle = 1.570796f;
-    aiVector3D direction( 0, 0, -1 );
-    bool global = true;
-    float intensity = 1;
-    aiVector3D location( 0, 0, 0 );
-    bool on = true;
-    float radius = 100;
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_RET("ambientIntensity", ambientIntensity, XML_ReadNode_GetAttrVal_AsFloat);
-		MACRO_ATTRREAD_CHECK_REF("attenuation", attenuation, XML_ReadNode_GetAttrVal_AsVec3f);
-		MACRO_ATTRREAD_CHECK_RET("beamWidth", beamWidth, XML_ReadNode_GetAttrVal_AsFloat);
-		MACRO_ATTRREAD_CHECK_REF("color", color, XML_ReadNode_GetAttrVal_AsCol3f);
-		MACRO_ATTRREAD_CHECK_RET("cutOffAngle", cutOffAngle, XML_ReadNode_GetAttrVal_AsFloat);
-		MACRO_ATTRREAD_CHECK_REF("direction", direction, XML_ReadNode_GetAttrVal_AsVec3f);
-		MACRO_ATTRREAD_CHECK_RET("global", global, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_RET("intensity", intensity, XML_ReadNode_GetAttrVal_AsFloat);
-		MACRO_ATTRREAD_CHECK_REF("location", location, XML_ReadNode_GetAttrVal_AsVec3f);
-		MACRO_ATTRREAD_CHECK_RET("on", on, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_RET("radius", radius, XML_ReadNode_GetAttrVal_AsFloat);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_SpotLight, ne);
-	}
-	else
-	{
-		if(on)
-		{
-			// create and if needed - define new geometry object.
-			ne = new CX3DImporter_NodeElement_Light(CX3DImporter_NodeElement::ENET_SpotLight, NodeElement_Cur);
-			if(!def.empty()) ne->ID = def;
-
-			if(beamWidth > cutOffAngle) beamWidth = cutOffAngle;
-
-			((CX3DImporter_NodeElement_Light*)ne)->AmbientIntensity = ambientIntensity;
-			((CX3DImporter_NodeElement_Light*)ne)->Attenuation = attenuation;
-			((CX3DImporter_NodeElement_Light*)ne)->BeamWidth = beamWidth;
-			((CX3DImporter_NodeElement_Light*)ne)->Color = color;
-			((CX3DImporter_NodeElement_Light*)ne)->CutOffAngle = cutOffAngle;
-			((CX3DImporter_NodeElement_Light*)ne)->Direction = direction;
-			((CX3DImporter_NodeElement_Light*)ne)->Global = global;
-			((CX3DImporter_NodeElement_Light*)ne)->Intensity = intensity;
-			((CX3DImporter_NodeElement_Light*)ne)->Location = location;
-			((CX3DImporter_NodeElement_Light*)ne)->Radius = radius;
-
-			// Assimp want a node with name similar to a light. "Why? I don't no." )
-			ParseHelper_Group_Begin(false);
-			// make random name
-			if(ne->ID.empty()) ne->ID = "SpotLight_" + to_string((size_t)ne);
-
-			NodeElement_Cur->ID = ne->ID;// assign name to node and return to light element.
-			ParseHelper_Node_Exit();
-			// check for child nodes
-			if(!mReader->isEmptyElement())
-				ParseNode_Metadata(ne, "SpotLight");
-			else
-				NodeElement_Cur->Child.push_back(ne);// add made object as child to current element
-
-			NodeElement_List.push_back(ne);// add element to node element list because its a new object in graph
-		}// if(on)
-	}// if(!use.empty()) else
-}
-
-}// namespace Assimp
-
-#endif // !ASSIMP_BUILD_NO_X3D_IMPORTER
diff --git a/code/AssetLib/X3D/X3DImporter_Macro.hpp b/code/AssetLib/X3D/X3DImporter_Macro.hpp
deleted file mode 100644
index 2463c7762..000000000
--- a/code/AssetLib/X3D/X3DImporter_Macro.hpp
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
-Open Asset Import Library (assimp)
-----------------------------------------------------------------------
-
-Copyright (c) 2006-2020, assimp team
-
-
-All rights reserved.
-
-Redistribution and use of this software in source and binary forms,
-with or without modification, are permitted provided that the
-following conditions are met:
-
-* Redistributions of source code must retain the above
-copyright notice, this list of conditions and the
-following disclaimer.
-
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the
-following disclaimer in the documentation and/or other
-materials provided with the distribution.
-
-* Neither the name of the assimp team, nor the names of its
-contributors may be used to endorse or promote products
-derived from this software without specific prior
-written permission of the assimp team.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-----------------------------------------------------------------------
-*/
-/// \file X3DImporter_Macro.hpp
-/// \brief Useful macrodefines.
-/// \date 2015-2016
-/// \author smal.root@gmail.com
-
-#ifndef X3DIMPORTER_MACRO_HPP_INCLUDED
-#define X3DIMPORTER_MACRO_HPP_INCLUDED
-
-/// \def MACRO_USE_CHECKANDAPPLY(pDEF, pUSE, pNE)
-/// Used for regular checking while attribute "USE" is defined.
-/// \param [in] pDEF - string holding "DEF" value.
-/// \param [in] pUSE - string holding "USE" value.
-/// \param [in] pType - type of element to find.
-/// \param [out] pNE - pointer to found node element.
-#define MACRO_USE_CHECKANDAPPLY(pDEF, pUSE, pType, pNE) \
-	do { \
-	XML_CheckNode_MustBeEmpty(); \
-	if(!pDEF.empty()) Throw_DEF_And_USE(); \
-	if(!FindNodeElement(pUSE, CX3DImporter_NodeElement::pType, &pNE)) Throw_USE_NotFound(pUSE); \
-	 \
-	NodeElement_Cur->Child.push_back(pNE);/* add found object as child to current element */ \
-	} while(false)
-
-/// \def MACRO_ATTRREAD_LOOPBEG
-/// Begin of loop that read attributes values.
-#define MACRO_ATTRREAD_LOOPBEG \
-	for(int idx = 0, idx_end = mReader->getAttributeCount(); idx < idx_end; idx++) \
-	{ \
-		std::string an(mReader->getAttributeName(idx));
-
-/// \def MACRO_ATTRREAD_LOOPEND
-/// End of loop that read attributes values.
-#define MACRO_ATTRREAD_LOOPEND \
-		Throw_IncorrectAttr(an); \
-	}
-
-/// \def MACRO_ATTRREAD_CHECK_REF
-/// Check current attribute name and if it equal to requested then read value. Result write to output variable by reference. If result was read then
-/// "continue" will called.
-/// \param [in] pAttrName - attribute name.
-/// \param [out] pVarName - output variable name.
-/// \param [in] pFunction - function which read attribute value and write it to pVarName.
-#define MACRO_ATTRREAD_CHECK_REF(pAttrName, pVarName, pFunction) \
-	if(an == pAttrName) \
-	{ \
-		pFunction(idx, pVarName); \
-		continue; \
-	}
-
-/// \def MACRO_ATTRREAD_CHECK_RET
-/// Check current attribute name and if it equal to requested then read value. Result write to output variable using return value of \ref pFunction.
-/// If result was read then  "continue" will called.
-/// \param [in] pAttrName - attribute name.
-/// \param [out] pVarName - output variable name.
-/// \param [in] pFunction - function which read attribute value and write it to pVarName.
-#define MACRO_ATTRREAD_CHECK_RET(pAttrName, pVarName, pFunction) \
-	if(an == pAttrName) \
-	{ \
-		pVarName = pFunction(idx); \
-		continue; \
-	}
-
-/// \def MACRO_ATTRREAD_CHECKUSEDEF_RET
-/// Compact variant for checking "USE" and "DEF". Also skip bbox attributes: "bboxCenter", "bboxSize".
-/// If result was read then  "continue" will called.
-/// \param [out] pDEF_Var - output variable name for "DEF" value.
-/// \param [out] pUSE_Var - output variable name for "USE" value.
-#define MACRO_ATTRREAD_CHECKUSEDEF_RET(pDEF_Var, pUSE_Var) \
-	MACRO_ATTRREAD_CHECK_RET("DEF", pDEF_Var, mReader->getAttributeValue); \
-	MACRO_ATTRREAD_CHECK_RET("USE", pUSE_Var, mReader->getAttributeValue); \
-	if(an == "bboxCenter") continue; \
-	if(an == "bboxSize") continue; \
-	if(an == "containerField") continue; \
-	do {} while(false)
-
-/// \def MACRO_NODECHECK_LOOPBEGIN(pNodeName)
-/// Begin of loop of parsing child nodes. Do not add ';' at end.
-/// \param [in] pNodeName - current node name.
-#define MACRO_NODECHECK_LOOPBEGIN(pNodeName) \
-	do { \
-	bool close_found = false; \
-	 \
-	while(mReader->read()) \
-	{ \
-		if(mReader->getNodeType() == irr::io::EXN_ELEMENT) \
-		{
-
-/// \def MACRO_NODECHECK_LOOPEND(pNodeName)
-/// End of loop of parsing child nodes.
-/// \param [in] pNodeName - current node name.
-#define MACRO_NODECHECK_LOOPEND(pNodeName) \
-		}/* if(mReader->getNodeType() == irr::io::EXN_ELEMENT) */ \
-		else if(mReader->getNodeType() == irr::io::EXN_ELEMENT_END) \
-		{ \
-			if(XML_CheckNode_NameEqual(pNodeName)) \
-			{ \
-				close_found = true; \
-	 \
-				break; \
-			} \
-		}/* else if(mReader->getNodeType() == irr::io::EXN_ELEMENT_END) */ \
-	}/* while(mReader->read()) */ \
-	 \
-	if(!close_found) Throw_CloseNotFound(pNodeName); \
-	 \
-	} while(false)
-
-#define MACRO_NODECHECK_METADATA(pNodeName) \
-	MACRO_NODECHECK_LOOPBEGIN(pNodeName) \
-			/* and childs must be metadata nodes */ \
-			if(!ParseHelper_CheckRead_X3DMetadataObject()) XML_CheckNode_SkipUnsupported(pNodeName); \
-	 MACRO_NODECHECK_LOOPEND(pNodeName)
-
-/// \def MACRO_FACE_ADD_QUAD_FA(pCCW, pOut, pIn, pP1, pP2, pP3, pP4)
-/// Add points as quad. Means that pP1..pP4 set in CCW order.
-#define MACRO_FACE_ADD_QUAD_FA(pCCW, pOut, pIn, pP1, pP2, pP3, pP4) \
-	do { \
-	if(pCCW) \
-	{ \
-		pOut.push_back(pIn[pP1]); \
-		pOut.push_back(pIn[pP2]); \
-		pOut.push_back(pIn[pP3]); \
-		pOut.push_back(pIn[pP4]); \
-	} \
-	else \
-	{ \
-		pOut.push_back(pIn[pP4]); \
-		pOut.push_back(pIn[pP3]); \
-		pOut.push_back(pIn[pP2]); \
-		pOut.push_back(pIn[pP1]); \
-	} \
-	} while(false)
-
-/// \def MACRO_FACE_ADD_QUAD(pCCW, pOut, pP1, pP2, pP3, pP4)
-/// Add points as quad. Means that pP1..pP4 set in CCW order.
-#define MACRO_FACE_ADD_QUAD(pCCW, pOut, pP1, pP2, pP3, pP4) \
-	do { \
-	if(pCCW) \
-	{ \
-		pOut.push_back(pP1); \
-		pOut.push_back(pP2); \
-		pOut.push_back(pP3); \
-		pOut.push_back(pP4); \
-	} \
-	else \
-	{ \
-		pOut.push_back(pP4); \
-		pOut.push_back(pP3); \
-		pOut.push_back(pP2); \
-		pOut.push_back(pP1); \
-	} \
-	} while(false)
-
-#endif // X3DIMPORTER_MACRO_HPP_INCLUDED
diff --git a/code/AssetLib/X3D/X3DImporter_Metadata.cpp b/code/AssetLib/X3D/X3DImporter_Metadata.cpp
deleted file mode 100644
index 126eddb4c..000000000
--- a/code/AssetLib/X3D/X3DImporter_Metadata.cpp
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
-Open Asset Import Library (assimp)
-----------------------------------------------------------------------
-
-Copyright (c) 2006-2020, assimp team
-
-
-All rights reserved.
-
-Redistribution and use of this software in source and binary forms,
-with or without modification, are permitted provided that the
-following conditions are met:
-
-* Redistributions of source code must retain the above
-copyright notice, this list of conditions and the
-following disclaimer.
-
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the
-following disclaimer in the documentation and/or other
-materials provided with the distribution.
-
-* Neither the name of the assimp team, nor the names of its
-contributors may be used to endorse or promote products
-derived from this software without specific prior
-written permission of the assimp team.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-----------------------------------------------------------------------
-*/
-/// \file   X3DImporter_Metadata.cpp
-/// \brief  Parsing data from nodes of "Metadata" set of X3D.
-/// \date   2015-2016
-/// \author smal.root@gmail.com
-
-#ifndef ASSIMP_BUILD_NO_X3D_IMPORTER
-
-#include "X3DImporter.hpp"
-#include "X3DImporter_Macro.hpp"
-
-namespace Assimp
-{
-
-/// \def MACRO_METADATA_FINDCREATE(pDEF_Var, pUSE_Var, pReference, pValue, pNE, pMetaName)
-/// Find element by "USE" or create new one.
-/// \param [in] pDEF_Var - variable name with "DEF" value.
-/// \param [in] pUSE_Var - variable name with "USE" value.
-/// \param [in] pReference - variable name with "reference" value.
-/// \param [in] pValue - variable name with "value" value.
-/// \param [in, out] pNE - pointer to node element.
-/// \param [in] pMetaClass - Class of node.
-/// \param [in] pMetaName - Name of node.
-/// \param [in] pType - type of element to find.
-#define MACRO_METADATA_FINDCREATE(pDEF_Var, pUSE_Var, pReference, pValue, pNE, pMetaClass, pMetaName, pType) \
-	/* if "USE" defined then find already defined element. */ \
-	if(!pUSE_Var.empty()) \
-	{ \
-		MACRO_USE_CHECKANDAPPLY(pDEF_Var, pUSE_Var, pType, pNE); \
-	} \
-	else \
-	{ \
-		pNE = new pMetaClass(NodeElement_Cur); \
-		if(!pDEF_Var.empty()) pNE->ID = pDEF_Var; \
-	 \
-		((pMetaClass*)pNE)->Reference = pReference; \
-		((pMetaClass*)pNE)->Value = pValue; \
-		/* also metadata node can contain childs */ \
-		if(!mReader->isEmptyElement()) \
-			ParseNode_Metadata(pNE, pMetaName);/* in that case node element will be added to child elements list of current node. */ \
-		else \
-			NodeElement_Cur->Child.push_back(pNE);/* else - add element to child list manually */ \
-	 \
-		NodeElement_List.push_back(pNE);/* add new element to elements list. */ \
-	}/* if(!pUSE_Var.empty()) else */ \
-	 \
-	do {} while(false)
-
-bool X3DImporter::ParseHelper_CheckRead_X3DMetadataObject()
-{
-	if(XML_CheckNode_NameEqual("MetadataBoolean"))
-		ParseNode_MetadataBoolean();
-	else if(XML_CheckNode_NameEqual("MetadataDouble"))
-		ParseNode_MetadataDouble();
-	else if(XML_CheckNode_NameEqual("MetadataFloat"))
-		ParseNode_MetadataFloat();
-	else if(XML_CheckNode_NameEqual("MetadataInteger"))
-		ParseNode_MetadataInteger();
-	else if(XML_CheckNode_NameEqual("MetadataSet"))
-		ParseNode_MetadataSet();
-	else if(XML_CheckNode_NameEqual("MetadataString"))
-		ParseNode_MetadataString();
-	else
-		return false;
-
-	return true;
-}
-
-void X3DImporter::ParseNode_Metadata(CX3DImporter_NodeElement* pParentElement, const std::string& /*pNodeName*/)
-{
-	ParseHelper_Node_Enter(pParentElement);
-	MACRO_NODECHECK_METADATA(mReader->getNodeName());
-	ParseHelper_Node_Exit();
-}
-
-// <MetadataBoolean
-// DEF=""       ID
-// USE=""       IDREF
-// name=""      SFString [inputOutput]
-// reference="" SFString [inputOutput]
-// value=""     MFBool   [inputOutput]
-// />
-void X3DImporter::ParseNode_MetadataBoolean()
-{
-    std::string def, use;
-    std::string name, reference;
-    std::vector<bool> value;
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_RET("name", name, mReader->getAttributeValue);
-		MACRO_ATTRREAD_CHECK_RET("reference", reference, mReader->getAttributeValue);
-		MACRO_ATTRREAD_CHECK_REF("value", value, XML_ReadNode_GetAttrVal_AsArrB);
-	MACRO_ATTRREAD_LOOPEND;
-
-	MACRO_METADATA_FINDCREATE(def, use, reference, value, ne, CX3DImporter_NodeElement_MetaBoolean, "MetadataBoolean", ENET_MetaBoolean);
-}
-
-// <MetadataDouble
-// DEF=""       ID
-// USE=""       IDREF
-// name=""      SFString [inputOutput]
-// reference="" SFString [inputOutput]
-// value=""     MFDouble [inputOutput]
-// />
-void X3DImporter::ParseNode_MetadataDouble()
-{
-    std::string def, use;
-    std::string name, reference;
-    std::vector<double> value;
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_RET("name", name, mReader->getAttributeValue);
-		MACRO_ATTRREAD_CHECK_RET("reference", reference, mReader->getAttributeValue);
-		MACRO_ATTRREAD_CHECK_REF("value", value, XML_ReadNode_GetAttrVal_AsArrD);
-	MACRO_ATTRREAD_LOOPEND;
-
-	MACRO_METADATA_FINDCREATE(def, use, reference, value, ne, CX3DImporter_NodeElement_MetaDouble, "MetadataDouble", ENET_MetaDouble);
-}
-
-// <MetadataFloat
-// DEF=""       ID
-// USE=""       IDREF
-// name=""      SFString [inputOutput]
-// reference="" SFString [inputOutput]
-// value=""     MFFloat  [inputOutput]
-// />
-void X3DImporter::ParseNode_MetadataFloat()
-{
-    std::string def, use;
-    std::string name, reference;
-    std::vector<float> value;
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_RET("name", name, mReader->getAttributeValue);
-		MACRO_ATTRREAD_CHECK_RET("reference", reference, mReader->getAttributeValue);
-		MACRO_ATTRREAD_CHECK_REF("value", value, XML_ReadNode_GetAttrVal_AsArrF);
-	MACRO_ATTRREAD_LOOPEND;
-
-	MACRO_METADATA_FINDCREATE(def, use, reference, value, ne, CX3DImporter_NodeElement_MetaFloat, "MetadataFloat", ENET_MetaFloat);
-}
-
-// <MetadataInteger
-// DEF=""       ID
-// USE=""       IDREF
-// name=""      SFString  [inputOutput]
-// reference="" SFString  [inputOutput]
-// value=""     MFInteger [inputOutput]
-// />
-void X3DImporter::ParseNode_MetadataInteger()
-{
-    std::string def, use;
-    std::string name, reference;
-    std::vector<int32_t> value;
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_RET("name", name, mReader->getAttributeValue);
-		MACRO_ATTRREAD_CHECK_RET("reference", reference, mReader->getAttributeValue);
-		MACRO_ATTRREAD_CHECK_REF("value", value, XML_ReadNode_GetAttrVal_AsArrI32);
-	MACRO_ATTRREAD_LOOPEND;
-
-	MACRO_METADATA_FINDCREATE(def, use, reference, value, ne, CX3DImporter_NodeElement_MetaInteger, "MetadataInteger", ENET_MetaInteger);
-}
-
-// <MetadataSet
-// DEF=""       ID
-// USE=""       IDREF
-// name=""      SFString [inputOutput]
-// reference="" SFString [inputOutput]
-// />
-void X3DImporter::ParseNode_MetadataSet()
-{
-    std::string def, use;
-    std::string name, reference;
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_RET("name", name, mReader->getAttributeValue);
-		MACRO_ATTRREAD_CHECK_RET("reference", reference, mReader->getAttributeValue);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_MetaSet, ne);
-	}
-	else
-	{
-		ne = new CX3DImporter_NodeElement_MetaSet(NodeElement_Cur);
-		if(!def.empty()) ne->ID = def;
-
-		((CX3DImporter_NodeElement_MetaSet*)ne)->Reference = reference;
-		// also metadata node can contain childs
-		if(!mReader->isEmptyElement())
-			ParseNode_Metadata(ne, "MetadataSet");
-		else
-			NodeElement_Cur->Child.push_back(ne);// made object as child to current element
-
-		NodeElement_List.push_back(ne);// add new element to elements list.
-	}// if(!use.empty()) else
-}
-
-// <MetadataString
-// DEF=""       ID
-// USE=""       IDREF
-// name=""      SFString [inputOutput]
-// reference="" SFString [inputOutput]
-// value=""     MFString [inputOutput]
-// />
-void X3DImporter::ParseNode_MetadataString()
-{
-    std::string def, use;
-    std::string name, reference;
-    std::list<std::string> value;
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_RET("name", name, mReader->getAttributeValue);
-		MACRO_ATTRREAD_CHECK_RET("reference", reference, mReader->getAttributeValue);
-		MACRO_ATTRREAD_CHECK_REF("value", value, XML_ReadNode_GetAttrVal_AsListS);
-	MACRO_ATTRREAD_LOOPEND;
-
-	MACRO_METADATA_FINDCREATE(def, use, reference, value, ne, CX3DImporter_NodeElement_MetaString, "MetadataString", ENET_MetaString);
-}
-
-}// namespace Assimp
-
-#endif // !ASSIMP_BUILD_NO_X3D_IMPORTER
diff --git a/code/AssetLib/X3D/X3DImporter_Networking.cpp b/code/AssetLib/X3D/X3DImporter_Networking.cpp
deleted file mode 100644
index 688362ab9..000000000
--- a/code/AssetLib/X3D/X3DImporter_Networking.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
-Open Asset Import Library (assimp)
-----------------------------------------------------------------------
-
-Copyright (c) 2006-2020, assimp team
-
-
-All rights reserved.
-
-Redistribution and use of this software in source and binary forms,
-with or without modification, are permitted provided that the
-following conditions are met:
-
-* Redistributions of source code must retain the above
-copyright notice, this list of conditions and the
-following disclaimer.
-
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the
-following disclaimer in the documentation and/or other
-materials provided with the distribution.
-
-* Neither the name of the assimp team, nor the names of its
-contributors may be used to endorse or promote products
-derived from this software without specific prior
-written permission of the assimp team.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-----------------------------------------------------------------------
-*/
-/// \file   X3DImporter_Networking.cpp
-/// \brief  Parsing data from nodes of "Networking" set of X3D.
-/// \date   2015-2016
-/// \author smal.root@gmail.com
-
-#ifndef ASSIMP_BUILD_NO_X3D_IMPORTER
-
-#include "X3DImporter.hpp"
-#include "X3DImporter_Macro.hpp"
-
-// Header files, Assimp.
-#include <assimp/DefaultIOSystem.h>
-
-//#include <regex>
-
-namespace Assimp
-{
-
-//static std::regex pattern_parentDir(R"((^|/)[^/]+/../)");
-static std::string parentDir("/../");
-
-// <Inline
-// DEF=""              ID
-// USE=""              IDREF
-// bboxCenter="0 0 0"  SFVec3f  [initializeOnly]
-// bboxSize="-1 -1 -1" SFVec3f  [initializeOnly]
-// load="true"         SFBool   [inputOutput]
-// url=""              MFString [inputOutput]
-// />
-void X3DImporter::ParseNode_Networking_Inline()
-{
-    std::string def, use;
-    bool load = true;
-    std::list<std::string> url;
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_RET("load", load, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_REF("url", url, XML_ReadNode_GetAttrVal_AsListS);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		CX3DImporter_NodeElement* ne;
-
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_Group, ne);
-	}
-	else
-	{
-		ParseHelper_Group_Begin(true);// create new grouping element and go deeper if node has children.
-		// at this place new group mode created and made current, so we can name it.
-		if(!def.empty()) NodeElement_Cur->ID = def;
-
-		if(load && !url.empty())
-		{
-			std::string full_path = mpIOHandler->CurrentDirectory() + url.front();
-
-			//full_path = std::regex_replace(full_path, pattern_parentDir, "$1");
-			for (std::string::size_type pos = full_path.find(parentDir); pos != std::string::npos; pos = full_path.find(parentDir, pos)) {
-				if (pos > 0) {
-					std::string::size_type pos2 = full_path.rfind('/', pos - 1);
-					if (pos2 != std::string::npos) {
-						full_path.erase(pos2, pos - pos2 + 3);
-						pos = pos2;
-					}
-					else {
-						full_path.erase(0, pos + 4);
-						pos = 0;
-					}
-				}
-				else {
-					pos += 3;
-				}
-			}
-			// Attribute "url" can contain list of strings. But we need only one - first.
-			std::string::size_type slashPos = full_path.find_last_of("\\/");
-			mpIOHandler->PushDirectory(slashPos == std::string::npos ? std::string() : full_path.substr(0, slashPos + 1));
-			ParseFile(full_path, mpIOHandler);
-			mpIOHandler->PopDirectory();
-		}
-
-		// check for X3DMetadataObject childs.
-		if(!mReader->isEmptyElement()) ParseNode_Metadata(NodeElement_Cur, "Inline");
-
-		// exit from node in that place
-		ParseHelper_Node_Exit();
-	}// if(!use.empty()) else
-}
-
-}// namespace Assimp
-
-#endif // !ASSIMP_BUILD_NO_X3D_IMPORTER
diff --git a/code/AssetLib/X3D/X3DImporter_Node.hpp b/code/AssetLib/X3D/X3DImporter_Node.hpp
deleted file mode 100644
index ebc5200c3..000000000
--- a/code/AssetLib/X3D/X3DImporter_Node.hpp
+++ /dev/null
@@ -1,780 +0,0 @@
-/*
-Open Asset Import Library (assimp)
-----------------------------------------------------------------------
-
-Copyright (c) 2006-2020, assimp team
-
-
-All rights reserved.
-
-Redistribution and use of this software in source and binary forms,
-with or without modification, are permitted provided that the
-following conditions are met:
-
-* Redistributions of source code must retain the above
-copyright notice, this list of conditions and the
-following disclaimer.
-
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the
-following disclaimer in the documentation and/or other
-materials provided with the distribution.
-
-* Neither the name of the assimp team, nor the names of its
-contributors may be used to endorse or promote products
-derived from this software without specific prior
-written permission of the assimp team.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-----------------------------------------------------------------------
-*/
-/// \file   X3DImporter_Node.hpp
-/// \brief  Elements of scene graph.
-/// \date   2015-2016
-/// \author smal.root@gmail.com
-
-#ifndef INCLUDED_AI_X3D_IMPORTER_NODE_H
-#define INCLUDED_AI_X3D_IMPORTER_NODE_H
-
-// Header files, Assimp.
-#include <assimp/scene.h>
-#include <assimp/types.h>
-
-// Header files, stdlib.
-#include <list>
-#include <vector>
-#include <string>
-
-/// \class CX3DImporter_NodeElement
-/// Base class for elements of nodes.
-class CX3DImporter_NodeElement
-{
-	/***********************************************/
-	/******************** Types ********************/
-	/***********************************************/
-
-public:
-
-	/// \enum EType
-	/// Define what data type contain node element.
-	enum EType
-	{
-		ENET_Group,                  ///< Element has type "Group".
-		ENET_MetaBoolean,            ///< Element has type "Metadata boolean".
-		ENET_MetaDouble,             ///< Element has type "Metadata double".
-		ENET_MetaFloat,              ///< Element has type "Metadata float".
-		ENET_MetaInteger,            ///< Element has type "Metadata integer".
-		ENET_MetaSet,                ///< Element has type "Metadata set".
-		ENET_MetaString,             ///< Element has type "Metadata string".
-		ENET_Arc2D,                  ///< Element has type "Arc2D".
-		ENET_ArcClose2D,             ///< Element has type "ArcClose2D".
-		ENET_Circle2D,               ///< Element has type "Circle2D".
-		ENET_Disk2D,                 ///< Element has type "Disk2D".
-		ENET_Polyline2D,             ///< Element has type "Polyline2D".
-		ENET_Polypoint2D,            ///< Element has type "Polypoint2D".
-		ENET_Rectangle2D,            ///< Element has type "Rectangle2D".
-		ENET_TriangleSet2D,          ///< Element has type "TriangleSet2D".
-		ENET_Box,                    ///< Element has type "Box".
-		ENET_Cone,                   ///< Element has type "Cone".
-		ENET_Cylinder,               ///< Element has type "Cylinder".
-		ENET_Sphere,                 ///< Element has type "Sphere".
-		ENET_ElevationGrid,          ///< Element has type "ElevationGrid".
-		ENET_Extrusion,              ///< Element has type "Extrusion".
-		ENET_Coordinate,             ///< Element has type "Coordinate".
-		ENET_Normal,                 ///< Element has type "Normal".
-		ENET_TextureCoordinate,      ///< Element has type "TextureCoordinate".
-		ENET_IndexedFaceSet,         ///< Element has type "IndexedFaceSet".
-		ENET_IndexedLineSet,         ///< Element has type "IndexedLineSet".
-		ENET_IndexedTriangleSet,     ///< Element has type "IndexedTriangleSet".
-		ENET_IndexedTriangleFanSet,  ///< Element has type "IndexedTriangleFanSet".
-		ENET_IndexedTriangleStripSet,///< Element has type "IndexedTriangleStripSet".
-		ENET_LineSet,                ///< Element has type "LineSet".
-		ENET_PointSet,               ///< Element has type "PointSet".
-		ENET_TriangleSet,            ///< Element has type "TriangleSet".
-		ENET_TriangleFanSet,         ///< Element has type "TriangleFanSet".
-		ENET_TriangleStripSet,       ///< Element has type "TriangleStripSet".
-		ENET_Color,                  ///< Element has type "Color".
-		ENET_ColorRGBA,              ///< Element has type "ColorRGBA".
-		ENET_Shape,                  ///< Element has type "Shape".
-		ENET_Appearance,             ///< Element has type "Appearance".
-		ENET_Material,               ///< Element has type "Material".
-		ENET_ImageTexture,           ///< Element has type "ImageTexture".
-		ENET_TextureTransform,       ///< Element has type "TextureTransform".
-		ENET_DirectionalLight,       ///< Element has type "DirectionalLight".
-		ENET_PointLight,             ///< Element has type "PointLight".
-		ENET_SpotLight,              ///< Element has type "SpotLight".
-
-		ENET_Invalid                 ///< Element has invalid type and possible contain invalid data.
-	};
-
-	/***********************************************/
-	/****************** Constants ******************/
-	/***********************************************/
-
-public:
-
-	const EType Type;
-
-	/***********************************************/
-	/****************** Variables ******************/
-	/***********************************************/
-
-public:
-
-	std::string ID;///< ID of the element. Can be empty. In X3D synonym for "ID" attribute.
-	CX3DImporter_NodeElement* Parent;///< Parent element. If nullptr then this node is root.
-	std::list<CX3DImporter_NodeElement*> Child;///< Child elements.
-
-	/***********************************************/
-	/****************** Functions ******************/
-	/***********************************************/
-
-    /// @brief  The destructor, virtual.
-    virtual ~CX3DImporter_NodeElement() {
-        // empty
-    }
-
-private:
-	/// Disabled copy constructor.
-	CX3DImporter_NodeElement(const CX3DImporter_NodeElement& pNodeElement);
-
-	/// Disabled assign operator.
-	CX3DImporter_NodeElement& operator=(const CX3DImporter_NodeElement& pNodeElement);
-
-	/// Disabled default constructor.
-	CX3DImporter_NodeElement();
-
-protected:
-	/// In constructor inheritor must set element type.
-	/// \param [in] pType - element type.
-	/// \param [in] pParent - parent element.
-	CX3DImporter_NodeElement(const EType pType, CX3DImporter_NodeElement* pParent)
-		: Type(pType), Parent(pParent)
-	{}
-};// class IX3DImporter_NodeElement
-
-/// \class CX3DImporter_NodeElement_Group
-/// Class that define grouping node. Define transformation matrix for children.
-/// Also can select which child will be kept and others are removed.
-class CX3DImporter_NodeElement_Group : public CX3DImporter_NodeElement
-{
-	/***********************************************/
-	/****************** Variables ******************/
-	/***********************************************/
-
-public:
-
-	aiMatrix4x4 Transformation;///< Transformation matrix.
-
-	/// \var bool Static
-	/// As you know node elements can use already defined node elements when attribute "USE" is defined.
-	/// Standard search when looking for an element in the whole scene graph, existing at this moment.
-	/// If a node is marked as static, the children(or lower) can not search for elements in the nodes upper then static.
-	bool Static;
-
-	bool UseChoice;///< Flag: if true then use number from \ref Choice to choose what the child will be kept.
-	int32_t Choice;///< Number of the child which will be kept.
-
-	/***********************************************/
-	/****************** Functions ******************/
-	/***********************************************/
-
-private:
-
-	/// \fn CX3DImporter_NodeElement_Group(const CX3DImporter_NodeElement_Group& pNode)
-	/// Disabled copy constructor.
-	CX3DImporter_NodeElement_Group(const CX3DImporter_NodeElement_Group& pNode);
-
-	/// \fn CX3DImporter_NodeElement_Group& operator=(const CX3DImporter_NodeElement_Group& pNode)
-	/// Disabled assign operator.
-	CX3DImporter_NodeElement_Group& operator=(const CX3DImporter_NodeElement_Group& pNode);
-
-	/// \fn CX3DImporter_NodeElement_Group()
-	/// Disabled default constructor.
-	CX3DImporter_NodeElement_Group();
-
-public:
-
-	/// \fn CX3DImporter_NodeElement_Group(CX3DImporter_NodeElement_Group* pParent, const bool pStatic = false)
-	/// Constructor.
-	/// \param [in] pParent - pointer to parent node.
-	/// \param [in] pStatic - static node flag.
-	CX3DImporter_NodeElement_Group(CX3DImporter_NodeElement* pParent, const bool pStatic = false)
-		: CX3DImporter_NodeElement(ENET_Group, pParent), Static(pStatic), UseChoice(false)
-	{}
-
-};// class CX3DImporter_NodeElement_Group
-
-/// \class CX3DImporter_NodeElement_Meta
-/// This struct describe metavalue.
-class CX3DImporter_NodeElement_Meta : public CX3DImporter_NodeElement
-{
-	/***********************************************/
-	/****************** Variables ******************/
-	/***********************************************/
-
-public:
-
-	std::string Name;///< Name of metadata object.
-	/// \var std::string Reference
-	/// If provided, it identifies the metadata standard or other specification that defines the name field. If the reference field is not provided or is
-	/// empty, the meaning of the name field is considered implicit to the characters in the string.
-	std::string Reference;
-
-	/***********************************************/
-	/****************** Functions ******************/
-	/***********************************************/
-
-private:
-
-	/// \fn CX3DImporter_NodeElement_Meta(const CX3DImporter_NodeElement_Meta& pNode)
-	/// Disabled copy constructor.
-	CX3DImporter_NodeElement_Meta(const CX3DImporter_NodeElement_Meta& pNode);
-
-	/// \fn CX3DImporter_NodeElement_Meta& operator=(const CX3DImporter_NodeElement_Meta& pNode)
-	/// Disabled assign operator.
-	CX3DImporter_NodeElement_Meta& operator=(const CX3DImporter_NodeElement_Meta& pNode);
-
-	/// \fn CX3DImporter_NodeElement_Meta()
-	/// Disabled default constructor.
-	CX3DImporter_NodeElement_Meta();
-
-public:
-
-	/// \fn CX3DImporter_NodeElement_Meta(const EType pType, CX3DImporter_NodeElement* pParent)
-	/// In constructor inheritor must set element type.
-	/// \param [in] pType - element type.
-	/// \param [in] pParent - pointer to parent node.
-	CX3DImporter_NodeElement_Meta(const EType pType, CX3DImporter_NodeElement* pParent)
-		: CX3DImporter_NodeElement(pType, pParent)
-	{}
-
-};// class CX3DImporter_NodeElement_Meta
-
-/// \struct CX3DImporter_NodeElement_MetaBoolean
-/// This struct describe metavalue of type boolean.
-struct CX3DImporter_NodeElement_MetaBoolean : public CX3DImporter_NodeElement_Meta
-{
-	std::vector<bool> Value;///< Stored value.
-
-	/// \fn CX3DImporter_NodeElement_MetaBoolean(CX3DImporter_NodeElement* pParent)
-	/// Constructor
-	/// \param [in] pParent - pointer to parent node.
-	CX3DImporter_NodeElement_MetaBoolean(CX3DImporter_NodeElement* pParent)
-		: CX3DImporter_NodeElement_Meta(ENET_MetaBoolean, pParent)
-	{}
-
-};// struct CX3DImporter_NodeElement_MetaBoolean
-
-/// \struct CX3DImporter_NodeElement_MetaDouble
-/// This struct describe metavalue of type double.
-struct CX3DImporter_NodeElement_MetaDouble : public CX3DImporter_NodeElement_Meta
-{
-	std::vector<double> Value;///< Stored value.
-
-	/// \fn CX3DImporter_NodeElement_MetaDouble(CX3DImporter_NodeElement* pParent)
-	/// Constructor
-	/// \param [in] pParent - pointer to parent node.
-	CX3DImporter_NodeElement_MetaDouble(CX3DImporter_NodeElement* pParent)
-		: CX3DImporter_NodeElement_Meta(ENET_MetaDouble, pParent)
-	{}
-
-};// struct CX3DImporter_NodeElement_MetaDouble
-
-/// \struct CX3DImporter_NodeElement_MetaFloat
-/// This struct describe metavalue of type float.
-struct CX3DImporter_NodeElement_MetaFloat : public CX3DImporter_NodeElement_Meta
-{
-	std::vector<float> Value;///< Stored value.
-
-	/// \fn CX3DImporter_NodeElement_MetaFloat(CX3DImporter_NodeElement* pParent)
-	/// Constructor
-	/// \param [in] pParent - pointer to parent node.
-	CX3DImporter_NodeElement_MetaFloat(CX3DImporter_NodeElement* pParent)
-		: CX3DImporter_NodeElement_Meta(ENET_MetaFloat, pParent)
-	{}
-
-};// struct CX3DImporter_NodeElement_MetaFloat
-
-/// \struct CX3DImporter_NodeElement_MetaInteger
-/// This struct describe metavalue of type integer.
-struct CX3DImporter_NodeElement_MetaInteger : public CX3DImporter_NodeElement_Meta
-{
-	std::vector<int32_t> Value;///< Stored value.
-
-	/// \fn CX3DImporter_NodeElement_MetaInteger(CX3DImporter_NodeElement* pParent)
-	/// Constructor
-	/// \param [in] pParent - pointer to parent node.
-	CX3DImporter_NodeElement_MetaInteger(CX3DImporter_NodeElement* pParent)
-		: CX3DImporter_NodeElement_Meta(ENET_MetaInteger, pParent)
-	{}
-
-};// struct CX3DImporter_NodeElement_MetaInteger
-
-/// \struct CX3DImporter_NodeElement_MetaSet
-/// This struct describe container for metaobjects.
-struct CX3DImporter_NodeElement_MetaSet : public CX3DImporter_NodeElement_Meta
-{
-	std::list<CX3DImporter_NodeElement_Meta> Value;///< Stored value.
-
-	/// \fn CX3DImporter_NodeElement_MetaSet(CX3DImporter_NodeElement* pParent)
-	/// Constructor
-	/// \param [in] pParent - pointer to parent node.
-	CX3DImporter_NodeElement_MetaSet(CX3DImporter_NodeElement* pParent)
-		: CX3DImporter_NodeElement_Meta(ENET_MetaSet, pParent)
-	{}
-
-};// struct CX3DImporter_NodeElement_MetaSet
-
-/// \struct CX3DImporter_NodeElement_MetaString
-/// This struct describe metavalue of type string.
-struct CX3DImporter_NodeElement_MetaString : public CX3DImporter_NodeElement_Meta
-{
-	std::list<std::string> Value;///< Stored value.
-
-	/// \fn CX3DImporter_NodeElement_MetaString(CX3DImporter_NodeElement* pParent)
-	/// Constructor
-	/// \param [in] pParent - pointer to parent node.
-	CX3DImporter_NodeElement_MetaString(CX3DImporter_NodeElement* pParent)
-		: CX3DImporter_NodeElement_Meta(ENET_MetaString, pParent)
-	{}
-
-};// struct CX3DImporter_NodeElement_MetaString
-
-/// \struct CX3DImporter_NodeElement_Color
-/// This struct hold <Color> value.
-struct CX3DImporter_NodeElement_Color : public CX3DImporter_NodeElement
-{
-	std::list<aiColor3D> Value;///< Stored value.
-
-	/// \fn CX3DImporter_NodeElement_Color(CX3DImporter_NodeElement* pParent)
-	/// Constructor
-	/// \param [in] pParent - pointer to parent node.
-	CX3DImporter_NodeElement_Color(CX3DImporter_NodeElement* pParent)
-		: CX3DImporter_NodeElement(ENET_Color, pParent)
-	{}
-
-};// struct CX3DImporter_NodeElement_Color
-
-/// \struct CX3DImporter_NodeElement_ColorRGBA
-/// This struct hold <ColorRGBA> value.
-struct CX3DImporter_NodeElement_ColorRGBA : public CX3DImporter_NodeElement
-{
-	std::list<aiColor4D> Value;///< Stored value.
-
-	/// \fn CX3DImporter_NodeElement_ColorRGBA(CX3DImporter_NodeElement* pParent)
-	/// Constructor
-	/// \param [in] pParent - pointer to parent node.
-	CX3DImporter_NodeElement_ColorRGBA(CX3DImporter_NodeElement* pParent)
-		: CX3DImporter_NodeElement(ENET_ColorRGBA, pParent)
-	{}
-
-};// struct CX3DImporter_NodeElement_ColorRGBA
-
-/// \struct CX3DImporter_NodeElement_Coordinate
-/// This struct hold <Coordinate> value.
-struct CX3DImporter_NodeElement_Coordinate : public CX3DImporter_NodeElement
-{
-	std::list<aiVector3D> Value;///< Stored value.
-
-	/// \fn CX3DImporter_NodeElement_Coordinate(CX3DImporter_NodeElement* pParent)
-	/// Constructor
-	/// \param [in] pParent - pointer to parent node.
-	CX3DImporter_NodeElement_Coordinate(CX3DImporter_NodeElement* pParent)
-		: CX3DImporter_NodeElement(ENET_Coordinate, pParent)
-	{}
-
-};// struct CX3DImporter_NodeElement_Coordinate
-
-/// \struct CX3DImporter_NodeElement_Normal
-/// This struct hold <Normal> value.
-struct CX3DImporter_NodeElement_Normal : public CX3DImporter_NodeElement
-{
-	std::list<aiVector3D> Value;///< Stored value.
-
-	/// \fn CX3DImporter_NodeElement_Normal(CX3DImporter_NodeElement* pParent)
-	/// Constructor
-	/// \param [in] pParent - pointer to parent node.
-	CX3DImporter_NodeElement_Normal(CX3DImporter_NodeElement* pParent)
-		: CX3DImporter_NodeElement(ENET_Normal, pParent)
-	{}
-
-};// struct CX3DImporter_NodeElement_Normal
-
-/// \struct CX3DImporter_NodeElement_TextureCoordinate
-/// This struct hold <TextureCoordinate> value.
-struct CX3DImporter_NodeElement_TextureCoordinate : public CX3DImporter_NodeElement
-{
-	std::list<aiVector2D> Value;///< Stored value.
-
-	/// \fn CX3DImporter_NodeElement_TextureCoordinate(CX3DImporter_NodeElement* pParent)
-	/// Constructor
-	/// \param [in] pParent - pointer to parent node.
-	CX3DImporter_NodeElement_TextureCoordinate(CX3DImporter_NodeElement* pParent)
-		: CX3DImporter_NodeElement(ENET_TextureCoordinate, pParent)
-	{}
-
-};// struct CX3DImporter_NodeElement_TextureCoordinate
-
-/// \class CX3DImporter_NodeElement_Geometry2D
-/// Two-dimensional figure.
-class CX3DImporter_NodeElement_Geometry2D : public CX3DImporter_NodeElement
-{
-	/***********************************************/
-	/****************** Variables ******************/
-	/***********************************************/
-
-public:
-
-	std::list<aiVector3D> Vertices;///< Vertices list.
-	size_t NumIndices;///< Number of indices in one face.
-	bool Solid;///< Flag: if true then render must use back-face culling, else render must draw both sides of object.
-
-	/***********************************************/
-	/****************** Functions ******************/
-	/***********************************************/
-
-private:
-
-	/// \fn CX3DImporter_NodeElement_Geometry2D(const CX3DImporter_NodeElement_Geometry2D& pNode)
-	/// Disabled copy constructor.
-	CX3DImporter_NodeElement_Geometry2D(const CX3DImporter_NodeElement_Geometry2D& pNode);
-
-	/// \fn CX3DImporter_NodeElement_Geometry2D& operator=(const CX3DImporter_NodeElement_Geometry2D& pNode)
-	/// Disabled assign operator.
-	CX3DImporter_NodeElement_Geometry2D& operator=(const CX3DImporter_NodeElement_Geometry2D& pNode);
-
-public:
-
-	/// \fn CX3DImporter_NodeElement_Geometry2D(const EType pType, CX3DImporter_NodeElement* pParent)
-	/// Constructor.
-	/// \param [in] pParent - pointer to parent node.
-	/// \param [in] pType - type of geometry object.
-	CX3DImporter_NodeElement_Geometry2D(const EType pType, CX3DImporter_NodeElement* pParent)
-		: CX3DImporter_NodeElement(pType, pParent), Solid(true)
-	{}
-
-};// class CX3DImporter_NodeElement_Geometry2D
-
-/// \class CX3DImporter_NodeElement_Geometry3D
-/// Three-dimensional body.
-class CX3DImporter_NodeElement_Geometry3D : public CX3DImporter_NodeElement {
-public:
-	std::list<aiVector3D> Vertices;  ///< Vertices list.
-	size_t                NumIndices;///< Number of indices in one face.
-	bool                  Solid;     ///< Flag: if true then render must use back-face culling, else render must draw both sides of object.
-
-	/// Constructor.
-	/// \param [in] pParent - pointer to parent node.
-	/// \param [in] pType - type of geometry object.
-	CX3DImporter_NodeElement_Geometry3D(const EType pType, CX3DImporter_NodeElement* pParent)
-	: CX3DImporter_NodeElement(pType, pParent)
-	, Vertices()
-	, NumIndices( 0 )
-	, Solid(true) {
-        // empty		
-	}
-
-private:
-	/// Disabled copy constructor.
-	CX3DImporter_NodeElement_Geometry3D(const CX3DImporter_NodeElement_Geometry3D& pNode);
-
-	/// Disabled assign operator.
-	CX3DImporter_NodeElement_Geometry3D& operator=(const CX3DImporter_NodeElement_Geometry3D& pNode);
-};// class CX3DImporter_NodeElement_Geometry3D
-
-/// \class CX3DImporter_NodeElement_ElevationGrid
-/// Uniform rectangular grid of varying height.
-class CX3DImporter_NodeElement_ElevationGrid : public CX3DImporter_NodeElement_Geometry3D
-{
-	/***********************************************/
-	/****************** Variables ******************/
-	/***********************************************/
-
-public:
-
-	bool NormalPerVertex;///< If true then normals are defined for every vertex, else for every face(line).
-	bool ColorPerVertex;///< If true then colors are defined for every vertex, else for every face(line).
-	/// \var CreaseAngle
-	/// If the angle between the geometric normals of two adjacent faces is less than the crease angle, normals shall be calculated so that the faces are
-	/// shaded smoothly across the edge; otherwise, normals shall be calculated so that a lighting discontinuity across the edge is produced.
-	float CreaseAngle;
-	std::vector<int32_t> CoordIdx;///< Coordinates list by faces. In X3D format: "-1" - delimiter for faces.
-
-	/***********************************************/
-	/****************** Functions ******************/
-	/***********************************************/
-
-private:
-
-	/// \fn CX3DImporter_NodeElement_ElevationGrid(const CX3DImporter_NodeElement_ElevationGrid& pNode)
-	/// Disabled copy constructor.
-	CX3DImporter_NodeElement_ElevationGrid(const CX3DImporter_NodeElement_ElevationGrid& pNode);
-
-	/// \fn CX3DImporter_NodeElement_ElevationGrid& operator=(const CX3DImporter_NodeElement_ElevationGrid& pNode)
-	/// Disabled assign operator.
-	CX3DImporter_NodeElement_ElevationGrid& operator=(const CX3DImporter_NodeElement_ElevationGrid& pNode);
-
-public:
-
-	/// \fn CX3DImporter_NodeElement_ElevationGrid(const EType pType, CX3DImporter_NodeElement* pParent)
-	/// Constructor.
-	/// \param [in] pParent - pointer to parent node.
-	/// \param [in] pType - type of geometry object.
-	CX3DImporter_NodeElement_ElevationGrid(const EType pType, CX3DImporter_NodeElement* pParent)
-		: CX3DImporter_NodeElement_Geometry3D(pType, pParent)
-	{}
-
-};// class CX3DImporter_NodeElement_IndexedSet
-
-/// \class CX3DImporter_NodeElement_IndexedSet
-/// Shape with indexed vertices.
-class CX3DImporter_NodeElement_IndexedSet : public CX3DImporter_NodeElement_Geometry3D
-{
-	/***********************************************/
-	/****************** Variables ******************/
-	/***********************************************/
-
-public:
-
-	/// \var CCW
-	/// The ccw field defines the ordering of the vertex coordinates of the geometry with respect to user-given or automatically generated normal vectors
-	/// used in the lighting model equations. If ccw is TRUE, the normals shall follow the right hand rule; the orientation of each normal with respect to
-	/// the vertices (taken in order) shall be such that the vertices appear to be oriented in a counterclockwise order when the vertices are viewed (in the
-	/// local coordinate system of the Shape) from the opposite direction as the normal. If ccw is FALSE, the normals shall be oriented in the opposite
-	/// direction. If normals are not generated but are supplied using a Normal node, and the orientation of the normals does not match the setting of the
-	/// ccw field, results are undefined.
-	bool CCW;
-	std::vector<int32_t> ColorIndex;///< Field to specify the polygonal faces by indexing into the <Color> or <ColorRGBA>.
-	bool ColorPerVertex;///< If true then colors are defined for every vertex, else for every face(line).
-	/// \var Convex
-	/// The convex field indicates whether all polygons in the shape are convex (TRUE). A polygon is convex if it is planar, does not intersect itself,
-	/// and all of the interior angles at its vertices are less than 180 degrees. Non planar and self intersecting polygons may produce undefined results
-	/// even if the convex field is FALSE.
-	bool Convex;
-	std::vector<int32_t> CoordIndex;///< Field to specify the polygonal faces by indexing into the <Coordinate>.
-	/// \var CreaseAngle
-	/// If the angle between the geometric normals of two adjacent faces is less than the crease angle, normals shall be calculated so that the faces are
-	/// shaded smoothly across the edge; otherwise, normals shall be calculated so that a lighting discontinuity across the edge is produced.
-	float CreaseAngle;
-	std::vector<int32_t> NormalIndex;///< Field to specify the polygonal faces by indexing into the <Normal>.
-	bool NormalPerVertex;///< If true then normals are defined for every vertex, else for every face(line).
-	std::vector<int32_t> TexCoordIndex;///< Field to specify the polygonal faces by indexing into the <TextureCoordinate>.
-
-	/***********************************************/
-	/****************** Functions ******************/
-	/***********************************************/
-
-private:
-
-	/// \fn CX3DImporter_NodeElement_IndexedSet(const CX3DImporter_NodeElement_IndexedSet& pNode)
-	/// Disabled copy constructor.
-	CX3DImporter_NodeElement_IndexedSet(const CX3DImporter_NodeElement_IndexedSet& pNode);
-
-	/// \fn CX3DImporter_NodeElement_IndexedSet& operator=(const CX3DImporter_NodeElement_IndexedSet& pNode)
-	/// Disabled assign operator.
-	CX3DImporter_NodeElement_IndexedSet& operator=(const CX3DImporter_NodeElement_IndexedSet& pNode);
-
-public:
-
-	/// \fn CX3DImporter_NodeElement_IndexedSet(const EType pType, CX3DImporter_NodeElement* pParent)
-	/// Constructor.
-	/// \param [in] pParent - pointer to parent node.
-	/// \param [in] pType - type of geometry object.
-	CX3DImporter_NodeElement_IndexedSet(const EType pType, CX3DImporter_NodeElement* pParent)
-		: CX3DImporter_NodeElement_Geometry3D(pType, pParent)
-	{}
-
-};// class CX3DImporter_NodeElement_IndexedSet
-
-/// \class CX3DImporter_NodeElement_Set
-/// Shape with set of vertices.
-class CX3DImporter_NodeElement_Set : public CX3DImporter_NodeElement_Geometry3D
-{
-	/***********************************************/
-	/****************** Variables ******************/
-	/***********************************************/
-
-public:
-
-	/// \var CCW
-	/// The ccw field defines the ordering of the vertex coordinates of the geometry with respect to user-given or automatically generated normal vectors
-	/// used in the lighting model equations. If ccw is TRUE, the normals shall follow the right hand rule; the orientation of each normal with respect to
-	/// the vertices (taken in order) shall be such that the vertices appear to be oriented in a counterclockwise order when the vertices are viewed (in the
-	/// local coordinate system of the Shape) from the opposite direction as the normal. If ccw is FALSE, the normals shall be oriented in the opposite
-	/// direction. If normals are not generated but are supplied using a Normal node, and the orientation of the normals does not match the setting of the
-	/// ccw field, results are undefined.
-	bool CCW;
-	bool ColorPerVertex;///< If true then colors are defined for every vertex, else for every face(line).
-	bool NormalPerVertex;///< If true then normals are defined for every vertex, else for every face(line).
-	std::vector<int32_t> CoordIndex;///< Field to specify the polygonal faces by indexing into the <Coordinate>.
-	std::vector<int32_t> NormalIndex;///< Field to specify the polygonal faces by indexing into the <Normal>.
-	std::vector<int32_t> TexCoordIndex;///< Field to specify the polygonal faces by indexing into the <TextureCoordinate>.
-	std::vector<int32_t> VertexCount;///< Field describes how many vertices are to be used in each polyline(polygon) from the <Coordinate> field.
-
-	/***********************************************/
-	/****************** Functions ******************/
-	/***********************************************/
-
-private:
-
-	/// \fn CX3DImporter_NodeElement_Set(const CX3DImporter_NodeElement_Set& pNode)
-	/// Disabled copy constructor.
-	CX3DImporter_NodeElement_Set(const CX3DImporter_NodeElement_Set& pNode);
-
-	/// \fn CX3DImporter_NodeElement_Set& operator=(const CX3DImporter_NodeElement_Set& pNode)
-	/// Disabled assign operator.
-	CX3DImporter_NodeElement_Set& operator=(const CX3DImporter_NodeElement_Set& pNode);
-
-public:
-
-	/// \fn CX3DImporter_NodeElement_Set(const EType pType, CX3DImporter_NodeElement* pParent)
-	/// Constructor.
-	/// \param [in] pParent - pointer to parent node.
-	/// \param [in] pType - type of geometry object.
-	CX3DImporter_NodeElement_Set(const EType pType, CX3DImporter_NodeElement* pParent)
-		: CX3DImporter_NodeElement_Geometry3D(pType, pParent)
-	{}
-
-};// class CX3DImporter_NodeElement_Set
-
-/// \struct CX3DImporter_NodeElement_Shape
-/// This struct hold <Shape> value.
-struct CX3DImporter_NodeElement_Shape : public CX3DImporter_NodeElement
-{
-	/// \fn CX3DImporter_NodeElement_Shape(CX3DImporter_NodeElement_Shape* pParent)
-	/// Constructor
-	/// \param [in] pParent - pointer to parent node.
-	CX3DImporter_NodeElement_Shape(CX3DImporter_NodeElement* pParent)
-		: CX3DImporter_NodeElement(ENET_Shape, pParent)
-	{}
-
-};// struct CX3DImporter_NodeElement_Shape
-
-/// \struct CX3DImporter_NodeElement_Appearance
-/// This struct hold <Appearance> value.
-struct CX3DImporter_NodeElement_Appearance : public CX3DImporter_NodeElement
-{
-	/// \fn CX3DImporter_NodeElement_Appearance(CX3DImporter_NodeElement_Appearance* pParent)
-	/// Constructor
-	/// \param [in] pParent - pointer to parent node.
-	CX3DImporter_NodeElement_Appearance(CX3DImporter_NodeElement* pParent)
-		: CX3DImporter_NodeElement(ENET_Appearance, pParent)
-	{}
-
-};// struct CX3DImporter_NodeElement_Appearance
-
-/// \class CX3DImporter_NodeElement_Material
-/// Material.
-class CX3DImporter_NodeElement_Material : public CX3DImporter_NodeElement {
-public:
-	float     AmbientIntensity;///< Specifies how much ambient light from light sources this surface shall reflect.
-	aiColor3D DiffuseColor;    ///< Reflects all X3D light sources depending on the angle of the surface with respect to the light source.
-	aiColor3D EmissiveColor;   ///< Models "glowing" objects. This can be useful for displaying pre-lit models.
-	float     Shininess;       ///< Lower shininess values produce soft glows, while higher values result in sharper, smaller highlights.
-	aiColor3D SpecularColor;   ///< The specularColor and shininess fields determine the specular highlights.
-	float     Transparency;    ///< Specifies how "clear" an object is, with 1.0 being completely transparent, and 0.0 completely opaque.
-
-	/// Constructor.
-	/// \param [in] pParent - pointer to parent node.
-	/// \param [in] pType - type of geometry object.
-	CX3DImporter_NodeElement_Material(CX3DImporter_NodeElement* pParent)
-	: CX3DImporter_NodeElement(ENET_Material, pParent)
-	, AmbientIntensity( 0.0f )
-	, DiffuseColor()
-	, EmissiveColor()
-	, Shininess( 0.0f )
-	, SpecularColor()
-	, Transparency( 1.0f ) {
-		// empty
-	}
-
-private:
-	/// Disabled copy constructor.
-	CX3DImporter_NodeElement_Material(const CX3DImporter_NodeElement_Material& pNode);
-
-	/// Disabled assign operator.
-	CX3DImporter_NodeElement_Material& operator=(const CX3DImporter_NodeElement_Material& pNode);
-};// class CX3DImporter_NodeElement_Material
-
-/// \struct CX3DImporter_NodeElement_ImageTexture
-/// This struct hold <ImageTexture> value.
-struct CX3DImporter_NodeElement_ImageTexture : public CX3DImporter_NodeElement
-{
-	/// \var RepeatS
-	/// RepeatS and RepeatT, that specify how the texture wraps in the S and T directions. If repeatS is TRUE (the default), the texture map is repeated
-	/// outside the [0.0, 1.0] texture coordinate range in the S direction so that it fills the shape. If repeatS is FALSE, the texture coordinates are
-	/// clamped in the S direction to lie within the [0.0, 1.0] range. The repeatT field is analogous to the repeatS field.
-	bool RepeatS;
-	bool RepeatT;///< See \ref RepeatS.
-	std::string URL;///< URL of the texture.
-	/// \fn CX3DImporter_NodeElement_ImageTexture(CX3DImporter_NodeElement_ImageTexture* pParent)
-	/// Constructor
-	/// \param [in] pParent - pointer to parent node.
-	CX3DImporter_NodeElement_ImageTexture(CX3DImporter_NodeElement* pParent)
-		: CX3DImporter_NodeElement(ENET_ImageTexture, pParent)
-	{}
-
-};// struct CX3DImporter_NodeElement_ImageTexture
-
-/// \struct CX3DImporter_NodeElement_TextureTransform
-/// This struct hold <TextureTransform> value.
-struct CX3DImporter_NodeElement_TextureTransform : public CX3DImporter_NodeElement
-{
-	aiVector2D Center;///< Specifies a translation offset in texture coordinate space about which the rotation and scale fields are applied.
-	float Rotation;///< Specifies a rotation in angle base units of the texture coordinates about the center point after the scale has been applied.
-	aiVector2D Scale;///< Specifies a scaling factor in S and T of the texture coordinates about the center point.
-	aiVector2D Translation;///<  Specifies a translation of the texture coordinates.
-
-	/// \fn CX3DImporter_NodeElement_TextureTransform(CX3DImporter_NodeElement_TextureTransform* pParent)
-	/// Constructor
-	/// \param [in] pParent - pointer to parent node.
-	CX3DImporter_NodeElement_TextureTransform(CX3DImporter_NodeElement* pParent)
-		: CX3DImporter_NodeElement(ENET_TextureTransform, pParent)
-	{}
-
-};// struct CX3DImporter_NodeElement_TextureTransform
-
-/// \struct CX3DImporter_NodeElement_Light
-/// This struct hold <TextureTransform> value.
-struct CX3DImporter_NodeElement_Light : public CX3DImporter_NodeElement
-{
-	float AmbientIntensity;///< Specifies the intensity of the ambient emission from the light.
-	aiColor3D Color;///< specifies the spectral colour properties of both the direct and ambient light emission as an RGB value.
-	aiVector3D Direction;///< Specifies the direction vector of the illumination emanating from the light source in the local coordinate system.
-	/// \var Global
-	/// Field that determines whether the light is global or scoped. Global lights illuminate all objects that fall within their volume of lighting influence.
-	/// Scoped lights only illuminate objects that are in the same transformation hierarchy as the light.
-	bool Global;
-	float Intensity;///< Specifies the brightness of the direct emission from the light.
-	/// \var Attenuation
-	/// PointLight node's illumination falls off with distance as specified by three attenuation coefficients. The attenuation factor
-	/// is: "1 / max(attenuation[0] + attenuation[1] * r + attenuation[2] * r2, 1)", where r is the distance from the light to the surface being illuminated.
-	aiVector3D Attenuation;
-	aiVector3D Location;///< Specifies a translation offset of the centre point of the light source from the light's local coordinate system origin.
-	float Radius;///< Specifies the radial extent of the solid angle and the maximum distance from location that may be illuminated by the light source.
-	float BeamWidth;///< Specifies an inner solid angle in which the light source emits light at uniform full intensity.
-	float CutOffAngle;///< The light source's emission intensity drops off from the inner solid angle (beamWidth) to the outer solid angle (cutOffAngle).
-
-	/// \fn CX3DImporter_NodeElement_Light(EType pLightType, CX3DImporter_NodeElement* pParent)
-	/// Constructor
-	/// \param [in] pParent - pointer to parent node.
-	/// \param [in] pLightType - type of the light source.
-	CX3DImporter_NodeElement_Light(EType pLightType, CX3DImporter_NodeElement* pParent)
-		: CX3DImporter_NodeElement(pLightType, pParent)
-	{}
-
-};// struct CX3DImporter_NodeElement_Light
-
-#endif // INCLUDED_AI_X3D_IMPORTER_NODE_H
diff --git a/code/AssetLib/X3D/X3DImporter_Postprocess.cpp b/code/AssetLib/X3D/X3DImporter_Postprocess.cpp
deleted file mode 100644
index 993aff02c..000000000
--- a/code/AssetLib/X3D/X3DImporter_Postprocess.cpp
+++ /dev/null
@@ -1,829 +0,0 @@
-/*
-Open Asset Import Library (assimp)
-----------------------------------------------------------------------
-
-Copyright (c) 2006-2020, assimp team
-
-
-All rights reserved.
-
-Redistribution and use of this software in source and binary forms,
-with or without modification, are permitted provided that the
-following conditions are met:
-
-* Redistributions of source code must retain the above
-copyright notice, this list of conditions and the
-following disclaimer.
-
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the
-following disclaimer in the documentation and/or other
-materials provided with the distribution.
-
-* Neither the name of the assimp team, nor the names of its
-contributors may be used to endorse or promote products
-derived from this software without specific prior
-written permission of the assimp team.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-----------------------------------------------------------------------
-*/
-/// \file   X3DImporter_Postprocess.cpp
-/// \brief  Convert built scenegraph and objects to Assimp scenegraph.
-/// \date   2015-2016
-/// \author smal.root@gmail.com
-
-#ifndef ASSIMP_BUILD_NO_X3D_IMPORTER
-
-#include "X3DImporter.hpp"
-
-// Header files, Assimp.
-#include <assimp/ai_assert.h>
-#include <assimp/StandardShapes.h>
-#include <assimp/StringUtils.h>
-
-// Header files, stdlib.
-#include <algorithm>
-#include <iterator>
-#include <string>
-
-namespace Assimp
-{
-
-aiMatrix4x4 X3DImporter::PostprocessHelper_Matrix_GlobalToCurrent() const
-{
-    CX3DImporter_NodeElement* cur_node;
-    std::list<aiMatrix4x4> matr;
-    aiMatrix4x4 out_matr;
-
-	// starting walk from current element to root
-	cur_node = NodeElement_Cur;
-	if(cur_node != nullptr)
-	{
-		do
-		{
-			// if cur_node is group then store group transformation matrix in list.
-			if(cur_node->Type == CX3DImporter_NodeElement::ENET_Group) matr.push_back(((CX3DImporter_NodeElement_Group*)cur_node)->Transformation);
-
-			cur_node = cur_node->Parent;
-		} while(cur_node != nullptr);
-	}
-
-	// multiplicate all matrices in reverse order
-	for(std::list<aiMatrix4x4>::reverse_iterator rit = matr.rbegin(); rit != matr.rend(); ++rit) out_matr = out_matr * (*rit);
-
-	return out_matr;
-}
-
-void X3DImporter::PostprocessHelper_CollectMetadata(const CX3DImporter_NodeElement& pNodeElement, std::list<CX3DImporter_NodeElement*>& pList) const
-{
-	// walk through childs and find for metadata.
-	for(std::list<CX3DImporter_NodeElement*>::const_iterator el_it = pNodeElement.Child.begin(); el_it != pNodeElement.Child.end(); ++el_it)
-	{
-		if(((*el_it)->Type == CX3DImporter_NodeElement::ENET_MetaBoolean) || ((*el_it)->Type == CX3DImporter_NodeElement::ENET_MetaDouble) ||
-			((*el_it)->Type == CX3DImporter_NodeElement::ENET_MetaFloat) || ((*el_it)->Type == CX3DImporter_NodeElement::ENET_MetaInteger) ||
-			((*el_it)->Type == CX3DImporter_NodeElement::ENET_MetaString))
-		{
-			pList.push_back(*el_it);
-		}
-		else if((*el_it)->Type == CX3DImporter_NodeElement::ENET_MetaSet)
-		{
-			PostprocessHelper_CollectMetadata(**el_it, pList);
-		}
-	}// for(std::list<CX3DImporter_NodeElement*>::const_iterator el_it = pNodeElement.Child.begin(); el_it != pNodeElement.Child.end(); el_it++)
-}
-
-bool X3DImporter::PostprocessHelper_ElementIsMetadata(const CX3DImporter_NodeElement::EType pType) const
-{
-	if((pType == CX3DImporter_NodeElement::ENET_MetaBoolean) || (pType == CX3DImporter_NodeElement::ENET_MetaDouble) ||
-		(pType == CX3DImporter_NodeElement::ENET_MetaFloat) || (pType == CX3DImporter_NodeElement::ENET_MetaInteger) ||
-		(pType == CX3DImporter_NodeElement::ENET_MetaString) || (pType == CX3DImporter_NodeElement::ENET_MetaSet))
-	{
-		return true;
-	}
-	else
-	{
-		return false;
-	}
-}
-
-bool X3DImporter::PostprocessHelper_ElementIsMesh(const CX3DImporter_NodeElement::EType pType) const
-{
-	if((pType == CX3DImporter_NodeElement::ENET_Arc2D) || (pType == CX3DImporter_NodeElement::ENET_ArcClose2D) ||
-		(pType == CX3DImporter_NodeElement::ENET_Box) || (pType == CX3DImporter_NodeElement::ENET_Circle2D) ||
-		(pType == CX3DImporter_NodeElement::ENET_Cone) || (pType == CX3DImporter_NodeElement::ENET_Cylinder) ||
-		(pType == CX3DImporter_NodeElement::ENET_Disk2D) || (pType == CX3DImporter_NodeElement::ENET_ElevationGrid) ||
-		(pType == CX3DImporter_NodeElement::ENET_Extrusion) || (pType == CX3DImporter_NodeElement::ENET_IndexedFaceSet) ||
-		(pType == CX3DImporter_NodeElement::ENET_IndexedLineSet) || (pType == CX3DImporter_NodeElement::ENET_IndexedTriangleFanSet) ||
-		(pType == CX3DImporter_NodeElement::ENET_IndexedTriangleSet) || (pType == CX3DImporter_NodeElement::ENET_IndexedTriangleStripSet) ||
-		(pType == CX3DImporter_NodeElement::ENET_PointSet) || (pType == CX3DImporter_NodeElement::ENET_LineSet) ||
-		(pType == CX3DImporter_NodeElement::ENET_Polyline2D) || (pType == CX3DImporter_NodeElement::ENET_Polypoint2D) ||
-		(pType == CX3DImporter_NodeElement::ENET_Rectangle2D) || (pType == CX3DImporter_NodeElement::ENET_Sphere) ||
-		(pType == CX3DImporter_NodeElement::ENET_TriangleFanSet) || (pType == CX3DImporter_NodeElement::ENET_TriangleSet) ||
-		(pType == CX3DImporter_NodeElement::ENET_TriangleSet2D) || (pType == CX3DImporter_NodeElement::ENET_TriangleStripSet))
-	{
-		return true;
-	}
-	else
-	{
-		return false;
-	}
-}
-
-void X3DImporter::Postprocess_BuildLight(const CX3DImporter_NodeElement& pNodeElement, std::list<aiLight*>& pSceneLightList) const
-{
-    const CX3DImporter_NodeElement_Light& ne = *( ( CX3DImporter_NodeElement_Light* ) &pNodeElement );
-    aiMatrix4x4 transform_matr = PostprocessHelper_Matrix_GlobalToCurrent();
-    aiLight* new_light = new aiLight;
-
-	new_light->mName = ne.ID;
-	new_light->mColorAmbient = ne.Color * ne.AmbientIntensity;
-	new_light->mColorDiffuse = ne.Color * ne.Intensity;
-	new_light->mColorSpecular = ne.Color * ne.Intensity;
-	switch(pNodeElement.Type)
-	{
-		case CX3DImporter_NodeElement::ENET_DirectionalLight:
-			new_light->mType = aiLightSource_DIRECTIONAL;
-			new_light->mDirection = ne.Direction, new_light->mDirection *= transform_matr;
-
-			break;
-		case CX3DImporter_NodeElement::ENET_PointLight:
-			new_light->mType = aiLightSource_POINT;
-			new_light->mPosition = ne.Location, new_light->mPosition *= transform_matr;
-			new_light->mAttenuationConstant = ne.Attenuation.x;
-			new_light->mAttenuationLinear = ne.Attenuation.y;
-			new_light->mAttenuationQuadratic = ne.Attenuation.z;
-
-			break;
-		case CX3DImporter_NodeElement::ENET_SpotLight:
-			new_light->mType = aiLightSource_SPOT;
-			new_light->mPosition = ne.Location, new_light->mPosition *= transform_matr;
-			new_light->mDirection = ne.Direction, new_light->mDirection *= transform_matr;
-			new_light->mAttenuationConstant = ne.Attenuation.x;
-			new_light->mAttenuationLinear = ne.Attenuation.y;
-			new_light->mAttenuationQuadratic = ne.Attenuation.z;
-			new_light->mAngleInnerCone = ne.BeamWidth;
-			new_light->mAngleOuterCone = ne.CutOffAngle;
-
-			break;
-		default:
-			throw DeadlyImportError("Postprocess_BuildLight. Unknown type of light: " + to_string(pNodeElement.Type) + ".");
-	}
-
-	pSceneLightList.push_back(new_light);
-}
-
-void X3DImporter::Postprocess_BuildMaterial(const CX3DImporter_NodeElement& pNodeElement, aiMaterial** pMaterial) const
-{
-	// check argument
-	if(pMaterial == nullptr) throw DeadlyImportError("Postprocess_BuildMaterial. pMaterial is nullptr.");
-	if(*pMaterial != nullptr) throw DeadlyImportError("Postprocess_BuildMaterial. *pMaterial must be nullptr.");
-
-	*pMaterial = new aiMaterial;
-	aiMaterial& taimat = **pMaterial;// creating alias for convenience.
-
-	// at this point pNodeElement point to <Appearance> node. Walk through childs and add all stored data.
-	for(std::list<CX3DImporter_NodeElement*>::const_iterator el_it = pNodeElement.Child.begin(); el_it != pNodeElement.Child.end(); ++el_it)
-	{
-		if((*el_it)->Type == CX3DImporter_NodeElement::ENET_Material)
-		{
-			aiColor3D tcol3;
-			float tvalf;
-			CX3DImporter_NodeElement_Material& tnemat = *((CX3DImporter_NodeElement_Material*)*el_it);
-
-			tcol3.r = tnemat.AmbientIntensity, tcol3.g = tnemat.AmbientIntensity, tcol3.b = tnemat.AmbientIntensity;
-			taimat.AddProperty(&tcol3, 1, AI_MATKEY_COLOR_AMBIENT);
-			taimat.AddProperty(&tnemat.DiffuseColor, 1, AI_MATKEY_COLOR_DIFFUSE);
-			taimat.AddProperty(&tnemat.EmissiveColor, 1, AI_MATKEY_COLOR_EMISSIVE);
-			taimat.AddProperty(&tnemat.SpecularColor, 1, AI_MATKEY_COLOR_SPECULAR);
-			tvalf = 1;
-			taimat.AddProperty(&tvalf, 1, AI_MATKEY_SHININESS_STRENGTH);
-			taimat.AddProperty(&tnemat.Shininess, 1, AI_MATKEY_SHININESS);
-			tvalf = 1.0f - tnemat.Transparency;
-			taimat.AddProperty(&tvalf, 1, AI_MATKEY_OPACITY);
-		}// if((*el_it)->Type == CX3DImporter_NodeElement::ENET_Material)
-		else if((*el_it)->Type == CX3DImporter_NodeElement::ENET_ImageTexture)
-		{
-			CX3DImporter_NodeElement_ImageTexture& tnetex = *((CX3DImporter_NodeElement_ImageTexture*)*el_it);
-			aiString url_str(tnetex.URL.c_str());
-			int mode = aiTextureOp_Multiply;
-
-			taimat.AddProperty(&url_str, AI_MATKEY_TEXTURE_DIFFUSE(0));
-			taimat.AddProperty(&tnetex.RepeatS, 1, AI_MATKEY_MAPPINGMODE_U_DIFFUSE(0));
-			taimat.AddProperty(&tnetex.RepeatT, 1, AI_MATKEY_MAPPINGMODE_V_DIFFUSE(0));
-			taimat.AddProperty(&mode, 1, AI_MATKEY_TEXOP_DIFFUSE(0));
-		}// else if((*el_it)->Type == CX3DImporter_NodeElement::ENET_ImageTexture)
-		else if((*el_it)->Type == CX3DImporter_NodeElement::ENET_TextureTransform)
-		{
-			aiUVTransform trans;
-			CX3DImporter_NodeElement_TextureTransform& tnetextr = *((CX3DImporter_NodeElement_TextureTransform*)*el_it);
-
-			trans.mTranslation = tnetextr.Translation - tnetextr.Center;
-			trans.mScaling = tnetextr.Scale;
-			trans.mRotation = tnetextr.Rotation;
-			taimat.AddProperty(&trans, 1, AI_MATKEY_UVTRANSFORM_DIFFUSE(0));
-		}// else if((*el_it)->Type == CX3DImporter_NodeElement::ENET_TextureTransform)
-	}// for(std::list<CX3DImporter_NodeElement*>::const_iterator el_it = pNodeElement.Child.begin(); el_it != pNodeElement.Child.end(); el_it++)
-}
-
-void X3DImporter::Postprocess_BuildMesh(const CX3DImporter_NodeElement& pNodeElement, aiMesh** pMesh) const
-{
-	// check argument
-	if(pMesh == nullptr) throw DeadlyImportError("Postprocess_BuildMesh. pMesh is nullptr.");
-	if(*pMesh != nullptr) throw DeadlyImportError("Postprocess_BuildMesh. *pMesh must be nullptr.");
-
-	/************************************************************************************************************************************/
-	/************************************************************ Geometry2D ************************************************************/
-	/************************************************************************************************************************************/
-	if((pNodeElement.Type == CX3DImporter_NodeElement::ENET_Arc2D) || (pNodeElement.Type == CX3DImporter_NodeElement::ENET_ArcClose2D) ||
-		(pNodeElement.Type == CX3DImporter_NodeElement::ENET_Circle2D) || (pNodeElement.Type == CX3DImporter_NodeElement::ENET_Disk2D) ||
-		(pNodeElement.Type == CX3DImporter_NodeElement::ENET_Polyline2D) || (pNodeElement.Type == CX3DImporter_NodeElement::ENET_Polypoint2D) ||
-		(pNodeElement.Type == CX3DImporter_NodeElement::ENET_Rectangle2D) || (pNodeElement.Type == CX3DImporter_NodeElement::ENET_TriangleSet2D))
-	{
-		CX3DImporter_NodeElement_Geometry2D& tnemesh = *((CX3DImporter_NodeElement_Geometry2D*)&pNodeElement);// create alias for convenience
-		std::vector<aiVector3D> tarr;
-
-		tarr.reserve(tnemesh.Vertices.size());
-		for(std::list<aiVector3D>::iterator it = tnemesh.Vertices.begin(); it != tnemesh.Vertices.end(); ++it) tarr.push_back(*it);
-		*pMesh = StandardShapes::MakeMesh(tarr, static_cast<unsigned int>(tnemesh.NumIndices));// create mesh from vertices using Assimp help.
-
-		return;// mesh is build, nothing to do anymore.
-	}
-	/************************************************************************************************************************************/
-	/************************************************************ Geometry3D ************************************************************/
-	/************************************************************************************************************************************/
-	//
-	// Predefined figures
-	//
-	if((pNodeElement.Type == CX3DImporter_NodeElement::ENET_Box) || (pNodeElement.Type == CX3DImporter_NodeElement::ENET_Cone) ||
-		(pNodeElement.Type == CX3DImporter_NodeElement::ENET_Cylinder) || (pNodeElement.Type == CX3DImporter_NodeElement::ENET_Sphere))
-	{
-		CX3DImporter_NodeElement_Geometry3D& tnemesh = *((CX3DImporter_NodeElement_Geometry3D*)&pNodeElement);// create alias for convenience
-		std::vector<aiVector3D> tarr;
-
-		tarr.reserve(tnemesh.Vertices.size());
-		for(std::list<aiVector3D>::iterator it = tnemesh.Vertices.begin(); it != tnemesh.Vertices.end(); ++it) tarr.push_back(*it);
-
-		*pMesh = StandardShapes::MakeMesh(tarr, static_cast<unsigned int>(tnemesh.NumIndices));// create mesh from vertices using Assimp help.
-
-		return;// mesh is build, nothing to do anymore.
-	}
-	//
-	// Parametric figures
-	//
-	if(pNodeElement.Type == CX3DImporter_NodeElement::ENET_ElevationGrid)
-	{
-		CX3DImporter_NodeElement_ElevationGrid& tnemesh = *((CX3DImporter_NodeElement_ElevationGrid*)&pNodeElement);// create alias for convenience
-
-		// at first create mesh from existing vertices.
-		*pMesh = GeometryHelper_MakeMesh(tnemesh.CoordIdx, tnemesh.Vertices);
-		// copy additional information from children
-		for(std::list<CX3DImporter_NodeElement*>::iterator ch_it = tnemesh.Child.begin(); ch_it != tnemesh.Child.end(); ++ch_it)
-		{
-			if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_Color)
-				MeshGeometry_AddColor(**pMesh, ((CX3DImporter_NodeElement_Color*)*ch_it)->Value, tnemesh.ColorPerVertex);
-			else if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_ColorRGBA)
-				MeshGeometry_AddColor(**pMesh, ((CX3DImporter_NodeElement_ColorRGBA*)*ch_it)->Value, tnemesh.ColorPerVertex);
-			else if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_Normal)
-				MeshGeometry_AddNormal(**pMesh,  ((CX3DImporter_NodeElement_Normal*)*ch_it)->Value, tnemesh.NormalPerVertex);
-			else if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_TextureCoordinate)
-				MeshGeometry_AddTexCoord(**pMesh, ((CX3DImporter_NodeElement_TextureCoordinate*)*ch_it)->Value);
-			else
-				throw DeadlyImportError("Postprocess_BuildMesh. Unknown child of ElevationGrid: " + to_string((*ch_it)->Type) + ".");
-		}// for(std::list<CX3DImporter_NodeElement*>::iterator ch_it = tnemesh.Child.begin(); ch_it != tnemesh.Child.end(); ++ch_it)
-
-		return;// mesh is build, nothing to do anymore.
-	}// if(pNodeElement.Type == CX3DImporter_NodeElement::ENET_ElevationGrid)
-	//
-	// Indexed primitives sets
-	//
-	if(pNodeElement.Type == CX3DImporter_NodeElement::ENET_IndexedFaceSet)
-	{
-		CX3DImporter_NodeElement_IndexedSet& tnemesh = *((CX3DImporter_NodeElement_IndexedSet*)&pNodeElement);// create alias for convenience
-
-		// at first search for <Coordinate> node and create mesh.
-		for(std::list<CX3DImporter_NodeElement*>::iterator ch_it = tnemesh.Child.begin(); ch_it != tnemesh.Child.end(); ++ch_it)
-		{
-			if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_Coordinate)
-			{
-				*pMesh = GeometryHelper_MakeMesh(tnemesh.CoordIndex, ((CX3DImporter_NodeElement_Coordinate*)*ch_it)->Value);
-			}
-		}
-
-		// copy additional information from children
-		for(std::list<CX3DImporter_NodeElement*>::iterator ch_it = tnemesh.Child.begin(); ch_it != tnemesh.Child.end(); ++ch_it)
-		{
-			if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_Color)
-				MeshGeometry_AddColor(**pMesh, tnemesh.CoordIndex, tnemesh.ColorIndex, ((CX3DImporter_NodeElement_Color*)*ch_it)->Value, tnemesh.ColorPerVertex);
-			else if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_ColorRGBA)
-				MeshGeometry_AddColor(**pMesh, tnemesh.CoordIndex, tnemesh.ColorIndex, ((CX3DImporter_NodeElement_ColorRGBA*)*ch_it)->Value,
-										tnemesh.ColorPerVertex);
-			else if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_Coordinate)
-				{} // skip because already read when mesh created.
-			else if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_Normal)
-				MeshGeometry_AddNormal(**pMesh, tnemesh.CoordIndex, tnemesh.NormalIndex, ((CX3DImporter_NodeElement_Normal*)*ch_it)->Value,
-										tnemesh.NormalPerVertex);
-			else if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_TextureCoordinate)
-				MeshGeometry_AddTexCoord(**pMesh, tnemesh.CoordIndex, tnemesh.TexCoordIndex, ((CX3DImporter_NodeElement_TextureCoordinate*)*ch_it)->Value);
-			else
-				throw DeadlyImportError("Postprocess_BuildMesh. Unknown child of IndexedFaceSet: " + to_string((*ch_it)->Type) + ".");
-		}// for(std::list<CX3DImporter_NodeElement*>::iterator ch_it = tnemesh.Child.begin(); ch_it != tnemesh.Child.end(); ++ch_it)
-
-		return;// mesh is build, nothing to do anymore.
-	}// if(pNodeElement.Type == CX3DImporter_NodeElement::ENET_IndexedFaceSet)
-
-	if(pNodeElement.Type == CX3DImporter_NodeElement::ENET_IndexedLineSet)
-	{
-		CX3DImporter_NodeElement_IndexedSet& tnemesh = *((CX3DImporter_NodeElement_IndexedSet*)&pNodeElement);// create alias for convenience
-
-		// at first search for <Coordinate> node and create mesh.
-		for(std::list<CX3DImporter_NodeElement*>::iterator ch_it = tnemesh.Child.begin(); ch_it != tnemesh.Child.end(); ++ch_it)
-		{
-			if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_Coordinate)
-			{
-				*pMesh = GeometryHelper_MakeMesh(tnemesh.CoordIndex, ((CX3DImporter_NodeElement_Coordinate*)*ch_it)->Value);
-			}
-		}
-
-		// copy additional information from children
-		for(std::list<CX3DImporter_NodeElement*>::iterator ch_it = tnemesh.Child.begin(); ch_it != tnemesh.Child.end(); ++ch_it)
-		{
-			ai_assert(*pMesh);
-			if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_Color)
-				MeshGeometry_AddColor(**pMesh, tnemesh.CoordIndex, tnemesh.ColorIndex, ((CX3DImporter_NodeElement_Color*)*ch_it)->Value, tnemesh.ColorPerVertex);
-			else if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_ColorRGBA)
-				MeshGeometry_AddColor(**pMesh, tnemesh.CoordIndex, tnemesh.ColorIndex, ((CX3DImporter_NodeElement_ColorRGBA*)*ch_it)->Value,
-										tnemesh.ColorPerVertex);
-			else if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_Coordinate)
-				{} // skip because already read when mesh created.
-			else
-				throw DeadlyImportError("Postprocess_BuildMesh. Unknown child of IndexedLineSet: " + to_string((*ch_it)->Type) + ".");
-		}// for(std::list<CX3DImporter_NodeElement*>::iterator ch_it = tnemesh.Child.begin(); ch_it != tnemesh.Child.end(); ++ch_it)
-
-		return;// mesh is build, nothing to do anymore.
-	}// if(pNodeElement.Type == CX3DImporter_NodeElement::ENET_IndexedLineSet)
-
-	if((pNodeElement.Type == CX3DImporter_NodeElement::ENET_IndexedTriangleSet) ||
-		(pNodeElement.Type == CX3DImporter_NodeElement::ENET_IndexedTriangleFanSet) ||
-		(pNodeElement.Type == CX3DImporter_NodeElement::ENET_IndexedTriangleStripSet))
-	{
-		CX3DImporter_NodeElement_IndexedSet& tnemesh = *((CX3DImporter_NodeElement_IndexedSet*)&pNodeElement);// create alias for convenience
-
-		// at first search for <Coordinate> node and create mesh.
-		for(std::list<CX3DImporter_NodeElement*>::iterator ch_it = tnemesh.Child.begin(); ch_it != tnemesh.Child.end(); ++ch_it)
-		{
-			if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_Coordinate)
-			{
-				*pMesh = GeometryHelper_MakeMesh(tnemesh.CoordIndex, ((CX3DImporter_NodeElement_Coordinate*)*ch_it)->Value);
-			}
-		}
-
-		// copy additional information from children
-		for(std::list<CX3DImporter_NodeElement*>::iterator ch_it = tnemesh.Child.begin(); ch_it != tnemesh.Child.end(); ++ch_it)
-		{
-			ai_assert(*pMesh);
-			if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_Color)
-				MeshGeometry_AddColor(**pMesh, tnemesh.CoordIndex, tnemesh.ColorIndex, ((CX3DImporter_NodeElement_Color*)*ch_it)->Value, tnemesh.ColorPerVertex);
-			else if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_ColorRGBA)
-				MeshGeometry_AddColor(**pMesh, tnemesh.CoordIndex, tnemesh.ColorIndex, ((CX3DImporter_NodeElement_ColorRGBA*)*ch_it)->Value,
-										tnemesh.ColorPerVertex);
-			else if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_Coordinate)
-				{} // skip because already read when mesh created.
-			else if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_Normal)
-				MeshGeometry_AddNormal(**pMesh, tnemesh.CoordIndex, tnemesh.NormalIndex, ((CX3DImporter_NodeElement_Normal*)*ch_it)->Value,
-										tnemesh.NormalPerVertex);
-			else if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_TextureCoordinate)
-				MeshGeometry_AddTexCoord(**pMesh, tnemesh.CoordIndex, tnemesh.TexCoordIndex, ((CX3DImporter_NodeElement_TextureCoordinate*)*ch_it)->Value);
-			else
-				throw DeadlyImportError("Postprocess_BuildMesh. Unknown child of IndexedTriangleSet or IndexedTriangleFanSet, or \
-																	IndexedTriangleStripSet: " + to_string((*ch_it)->Type) + ".");
-		}// for(std::list<CX3DImporter_NodeElement*>::iterator ch_it = tnemesh.Child.begin(); ch_it != tnemesh.Child.end(); ++ch_it)
-
-		return;// mesh is build, nothing to do anymore.
-	}// if((pNodeElement.Type == CX3DImporter_NodeElement::ENET_IndexedTriangleFanSet) || (pNodeElement.Type == CX3DImporter_NodeElement::ENET_IndexedTriangleStripSet))
-
-	if(pNodeElement.Type == CX3DImporter_NodeElement::ENET_Extrusion)
-	{
-		CX3DImporter_NodeElement_IndexedSet& tnemesh = *((CX3DImporter_NodeElement_IndexedSet*)&pNodeElement);// create alias for convenience
-
-		*pMesh = GeometryHelper_MakeMesh(tnemesh.CoordIndex, tnemesh.Vertices);
-
-		return;// mesh is build, nothing to do anymore.
-	}// if(pNodeElement.Type == CX3DImporter_NodeElement::ENET_Extrusion)
-
-	//
-	// Primitives sets
-	//
-	if(pNodeElement.Type == CX3DImporter_NodeElement::ENET_PointSet)
-	{
-		CX3DImporter_NodeElement_Set& tnemesh = *((CX3DImporter_NodeElement_Set*)&pNodeElement);// create alias for convenience
-
-		// at first search for <Coordinate> node and create mesh.
-		for(std::list<CX3DImporter_NodeElement*>::iterator ch_it = tnemesh.Child.begin(); ch_it != tnemesh.Child.end(); ++ch_it)
-		{
-			if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_Coordinate)
-			{
-				std::vector<aiVector3D> vec_copy;
-
-				vec_copy.reserve(((CX3DImporter_NodeElement_Coordinate*)*ch_it)->Value.size());
-				for(std::list<aiVector3D>::const_iterator it = ((CX3DImporter_NodeElement_Coordinate*)*ch_it)->Value.begin();
-					it != ((CX3DImporter_NodeElement_Coordinate*)*ch_it)->Value.end(); ++it)
-				{
-					vec_copy.push_back(*it);
-				}
-
-				*pMesh = StandardShapes::MakeMesh(vec_copy, 1);
-			}
-		}
-
-		// copy additional information from children
-		for(std::list<CX3DImporter_NodeElement*>::iterator ch_it = tnemesh.Child.begin(); ch_it != tnemesh.Child.end(); ++ch_it)
-		{
-			ai_assert(*pMesh);
-			if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_Color)
-				MeshGeometry_AddColor(**pMesh, ((CX3DImporter_NodeElement_Color*)*ch_it)->Value, true);
-			else if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_ColorRGBA)
-				MeshGeometry_AddColor(**pMesh, ((CX3DImporter_NodeElement_ColorRGBA*)*ch_it)->Value, true);
-			else if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_Coordinate)
-				{} // skip because already read when mesh created.
-			else
-				throw DeadlyImportError("Postprocess_BuildMesh. Unknown child of PointSet: " + to_string((*ch_it)->Type) + ".");
-		}// for(std::list<CX3DImporter_NodeElement*>::iterator ch_it = tnemesh.Child.begin(); ch_it != tnemesh.Child.end(); ++ch_it)
-
-		return;// mesh is build, nothing to do anymore.
-	}// if(pNodeElement.Type == CX3DImporter_NodeElement::ENET_PointSet)
-
-	if(pNodeElement.Type == CX3DImporter_NodeElement::ENET_LineSet)
-	{
-		CX3DImporter_NodeElement_Set& tnemesh = *((CX3DImporter_NodeElement_Set*)&pNodeElement);// create alias for convenience
-
-		// at first search for <Coordinate> node and create mesh.
-		for(std::list<CX3DImporter_NodeElement*>::iterator ch_it = tnemesh.Child.begin(); ch_it != tnemesh.Child.end(); ++ch_it)
-		{
-			if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_Coordinate)
-			{
-				*pMesh = GeometryHelper_MakeMesh(tnemesh.CoordIndex, ((CX3DImporter_NodeElement_Coordinate*)*ch_it)->Value);
-			}
-		}
-
-		// copy additional information from children
-		for(std::list<CX3DImporter_NodeElement*>::iterator ch_it = tnemesh.Child.begin(); ch_it != tnemesh.Child.end(); ++ch_it)
-		{
-			ai_assert(*pMesh);
-			if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_Color)
-				MeshGeometry_AddColor(**pMesh, ((CX3DImporter_NodeElement_Color*)*ch_it)->Value, true);
-			else if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_ColorRGBA)
-				MeshGeometry_AddColor(**pMesh, ((CX3DImporter_NodeElement_ColorRGBA*)*ch_it)->Value, true);
-			else if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_Coordinate)
-				{} // skip because already read when mesh created.
-			else
-				throw DeadlyImportError("Postprocess_BuildMesh. Unknown child of LineSet: " + to_string((*ch_it)->Type) + ".");
-		}// for(std::list<CX3DImporter_NodeElement*>::iterator ch_it = tnemesh.Child.begin(); ch_it != tnemesh.Child.end(); ++ch_it)
-
-		return;// mesh is build, nothing to do anymore.
-	}// if(pNodeElement.Type == CX3DImporter_NodeElement::ENET_LineSet)
-
-	if(pNodeElement.Type == CX3DImporter_NodeElement::ENET_TriangleFanSet)
-	{
-		CX3DImporter_NodeElement_Set& tnemesh = *((CX3DImporter_NodeElement_Set*)&pNodeElement);// create alias for convenience
-
-		// at first search for <Coordinate> node and create mesh.
-		for(std::list<CX3DImporter_NodeElement*>::iterator ch_it = tnemesh.Child.begin(); ch_it != tnemesh.Child.end(); ++ch_it)
-		{
-			if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_Coordinate)
-			{
-				*pMesh = GeometryHelper_MakeMesh(tnemesh.CoordIndex, ((CX3DImporter_NodeElement_Coordinate*)*ch_it)->Value);
-			}
-		}
-
-		// copy additional information from children
-		for(std::list<CX3DImporter_NodeElement*>::iterator ch_it = tnemesh.Child.begin(); ch_it != tnemesh.Child.end(); ++ch_it)
-		{
-			if ( nullptr == *pMesh ) {
-				break;
-			}
-			if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_Color)
-				MeshGeometry_AddColor(**pMesh, ((CX3DImporter_NodeElement_Color*)*ch_it)->Value,tnemesh.ColorPerVertex);
-			else if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_ColorRGBA)
-				MeshGeometry_AddColor(**pMesh, ((CX3DImporter_NodeElement_ColorRGBA*)*ch_it)->Value, tnemesh.ColorPerVertex);
-			else if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_Coordinate)
-				{} // skip because already read when mesh created.
-			else if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_Normal)
-				MeshGeometry_AddNormal(**pMesh, tnemesh.CoordIndex, tnemesh.NormalIndex, ((CX3DImporter_NodeElement_Normal*)*ch_it)->Value,
-										tnemesh.NormalPerVertex);
-			else if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_TextureCoordinate)
-				MeshGeometry_AddTexCoord(**pMesh, tnemesh.CoordIndex, tnemesh.TexCoordIndex, ((CX3DImporter_NodeElement_TextureCoordinate*)*ch_it)->Value);
-			else
-				throw DeadlyImportError("Postprocess_BuildMesh. Unknown child of TrianlgeFanSet: " + to_string((*ch_it)->Type) + ".");
-		}// for(std::list<CX3DImporter_NodeElement*>::iterator ch_it = tnemesh.Child.begin(); ch_it != tnemesh.Child.end(); ++ch_it)
-
-		return;// mesh is build, nothing to do anymore.
-	}// if(pNodeElement.Type == CX3DImporter_NodeElement::ENET_TriangleFanSet)
-
-	if(pNodeElement.Type == CX3DImporter_NodeElement::ENET_TriangleSet)
-	{
-		CX3DImporter_NodeElement_Set& tnemesh = *((CX3DImporter_NodeElement_Set*)&pNodeElement);// create alias for convenience
-
-		// at first search for <Coordinate> node and create mesh.
-		for(std::list<CX3DImporter_NodeElement*>::iterator ch_it = tnemesh.Child.begin(); ch_it != tnemesh.Child.end(); ++ch_it)
-		{
-			if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_Coordinate)
-			{
-				std::vector<aiVector3D> vec_copy;
-
-				vec_copy.reserve(((CX3DImporter_NodeElement_Coordinate*)*ch_it)->Value.size());
-				for(std::list<aiVector3D>::const_iterator it = ((CX3DImporter_NodeElement_Coordinate*)*ch_it)->Value.begin();
-					it != ((CX3DImporter_NodeElement_Coordinate*)*ch_it)->Value.end(); ++it)
-				{
-					vec_copy.push_back(*it);
-				}
-
-				*pMesh = StandardShapes::MakeMesh(vec_copy, 3);
-			}
-		}
-
-		// copy additional information from children
-		for(std::list<CX3DImporter_NodeElement*>::iterator ch_it = tnemesh.Child.begin(); ch_it != tnemesh.Child.end(); ++ch_it)
-		{
-			ai_assert(*pMesh);
-			if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_Color)
-				MeshGeometry_AddColor(**pMesh, ((CX3DImporter_NodeElement_Color*)*ch_it)->Value, tnemesh.ColorPerVertex);
-			else if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_ColorRGBA)
-				MeshGeometry_AddColor(**pMesh, ((CX3DImporter_NodeElement_ColorRGBA*)*ch_it)->Value, tnemesh.ColorPerVertex);
-			else if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_Coordinate)
-				{} // skip because already read when mesh created.
-			else if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_Normal)
-				MeshGeometry_AddNormal(**pMesh, tnemesh.CoordIndex, tnemesh.NormalIndex, ((CX3DImporter_NodeElement_Normal*)*ch_it)->Value,
-										tnemesh.NormalPerVertex);
-			else if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_TextureCoordinate)
-				MeshGeometry_AddTexCoord(**pMesh, tnemesh.CoordIndex, tnemesh.TexCoordIndex, ((CX3DImporter_NodeElement_TextureCoordinate*)*ch_it)->Value);
-			else
-				throw DeadlyImportError("Postprocess_BuildMesh. Unknown child of TrianlgeSet: " + to_string((*ch_it)->Type) + ".");
-		}// for(std::list<CX3DImporter_NodeElement*>::iterator ch_it = tnemesh.Child.begin(); ch_it != tnemesh.Child.end(); ++ch_it)
-
-		return;// mesh is build, nothing to do anymore.
-	}// if(pNodeElement.Type == CX3DImporter_NodeElement::ENET_TriangleSet)
-
-	if(pNodeElement.Type == CX3DImporter_NodeElement::ENET_TriangleStripSet)
-	{
-		CX3DImporter_NodeElement_Set& tnemesh = *((CX3DImporter_NodeElement_Set*)&pNodeElement);// create alias for convenience
-
-		// at first search for <Coordinate> node and create mesh.
-		for(std::list<CX3DImporter_NodeElement*>::iterator ch_it = tnemesh.Child.begin(); ch_it != tnemesh.Child.end(); ++ch_it)
-		{
-			if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_Coordinate)
-			{
-				*pMesh = GeometryHelper_MakeMesh(tnemesh.CoordIndex, ((CX3DImporter_NodeElement_Coordinate*)*ch_it)->Value);
-			}
-		}
-
-		// copy additional information from children
-		for(std::list<CX3DImporter_NodeElement*>::iterator ch_it = tnemesh.Child.begin(); ch_it != tnemesh.Child.end(); ++ch_it)
-		{
-			ai_assert(*pMesh);
-			if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_Color)
-				MeshGeometry_AddColor(**pMesh, ((CX3DImporter_NodeElement_Color*)*ch_it)->Value, tnemesh.ColorPerVertex);
-			else if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_ColorRGBA)
-				MeshGeometry_AddColor(**pMesh, ((CX3DImporter_NodeElement_ColorRGBA*)*ch_it)->Value, tnemesh.ColorPerVertex);
-			else if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_Coordinate)
-				{} // skip because already read when mesh created.
-			else if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_Normal)
-				MeshGeometry_AddNormal(**pMesh, tnemesh.CoordIndex, tnemesh.NormalIndex, ((CX3DImporter_NodeElement_Normal*)*ch_it)->Value,
-										tnemesh.NormalPerVertex);
-			else if((*ch_it)->Type == CX3DImporter_NodeElement::ENET_TextureCoordinate)
-				MeshGeometry_AddTexCoord(**pMesh, tnemesh.CoordIndex, tnemesh.TexCoordIndex, ((CX3DImporter_NodeElement_TextureCoordinate*)*ch_it)->Value);
-			else
-				throw DeadlyImportError("Postprocess_BuildMesh. Unknown child of TriangleStripSet: " + to_string((*ch_it)->Type) + ".");
-		}// for(std::list<CX3DImporter_NodeElement*>::iterator ch_it = tnemesh.Child.begin(); ch_it != tnemesh.Child.end(); ++ch_it)
-
-		return;// mesh is build, nothing to do anymore.
-	}// if(pNodeElement.Type == CX3DImporter_NodeElement::ENET_TriangleStripSet)
-
-	throw DeadlyImportError("Postprocess_BuildMesh. Unknown mesh type: " + to_string(pNodeElement.Type) + ".");
-}
-
-void X3DImporter::Postprocess_BuildNode(const CX3DImporter_NodeElement& pNodeElement, aiNode& pSceneNode, std::list<aiMesh*>& pSceneMeshList,
-										std::list<aiMaterial*>& pSceneMaterialList, std::list<aiLight*>& pSceneLightList) const
-{
-    std::list<CX3DImporter_NodeElement*>::const_iterator chit_begin = pNodeElement.Child.begin();
-    std::list<CX3DImporter_NodeElement*>::const_iterator chit_end = pNodeElement.Child.end();
-    std::list<aiNode*> SceneNode_Child;
-    std::list<unsigned int> SceneNode_Mesh;
-
-	// At first read all metadata
-	Postprocess_CollectMetadata(pNodeElement, pSceneNode);
-	// check if we have deal with grouping node. Which can contain transformation or switch
-	if(pNodeElement.Type == CX3DImporter_NodeElement::ENET_Group)
-	{
-		const CX3DImporter_NodeElement_Group& tne_group = *((CX3DImporter_NodeElement_Group*)&pNodeElement);// create alias for convenience
-
-		pSceneNode.mTransformation = tne_group.Transformation;
-		if(tne_group.UseChoice)
-		{
-			// If Choice is less than zero or greater than the number of nodes in the children field, nothing is chosen.
-			if((tne_group.Choice < 0) || ((size_t)tne_group.Choice >= pNodeElement.Child.size()))
-			{
-				chit_begin = pNodeElement.Child.end();
-				chit_end = pNodeElement.Child.end();
-			}
-			else
-			{
-				for(size_t i = 0; i < (size_t)tne_group.Choice; i++) ++chit_begin;// forward iterator to chosen node.
-
-				chit_end = chit_begin;
-				++chit_end;// point end iterator to next element after chosen node.
-			}
-		}// if(tne_group.UseChoice)
-	}// if(pNodeElement.Type == CX3DImporter_NodeElement::ENET_Group)
-
-	// Reserve memory for fast access and check children.
-	for(std::list<CX3DImporter_NodeElement*>::const_iterator it = chit_begin; it != chit_end; ++it)
-	{// in this loop we do not read metadata because it's already read at begin.
-		if((*it)->Type == CX3DImporter_NodeElement::ENET_Group)
-		{
-			// if child is group then create new node and do recursive call.
-			aiNode* new_node = new aiNode;
-
-			new_node->mName = (*it)->ID;
-			new_node->mParent = &pSceneNode;
-			SceneNode_Child.push_back(new_node);
-			Postprocess_BuildNode(**it, *new_node, pSceneMeshList, pSceneMaterialList, pSceneLightList);
-		}
-		else if((*it)->Type == CX3DImporter_NodeElement::ENET_Shape)
-		{
-			// shape can contain only one geometry and one appearance nodes.
-			Postprocess_BuildShape(*((CX3DImporter_NodeElement_Shape*)*it), SceneNode_Mesh, pSceneMeshList, pSceneMaterialList);
-		}
-		else if(((*it)->Type == CX3DImporter_NodeElement::ENET_DirectionalLight) || ((*it)->Type == CX3DImporter_NodeElement::ENET_PointLight) ||
-				((*it)->Type == CX3DImporter_NodeElement::ENET_SpotLight))
-		{
-			Postprocess_BuildLight(*((CX3DImporter_NodeElement_Light*)*it), pSceneLightList);
-		}
-		else if(!PostprocessHelper_ElementIsMetadata((*it)->Type))// skip metadata
-		{
-			throw DeadlyImportError("Postprocess_BuildNode. Unknown type: " + to_string((*it)->Type) + ".");
-		}
-	}// for(std::list<CX3DImporter_NodeElement*>::const_iterator it = chit_begin; it != chit_end; it++)
-
-	// copy data about children and meshes to aiNode.
-	if(!SceneNode_Child.empty())
-	{
-		std::list<aiNode*>::const_iterator it = SceneNode_Child.begin();
-
-		pSceneNode.mNumChildren = static_cast<unsigned int>(SceneNode_Child.size());
-		pSceneNode.mChildren = new aiNode*[pSceneNode.mNumChildren];
-		for(size_t i = 0; i < pSceneNode.mNumChildren; i++) pSceneNode.mChildren[i] = *it++;
-	}
-
-	if(!SceneNode_Mesh.empty())
-	{
-		std::list<unsigned int>::const_iterator it = SceneNode_Mesh.begin();
-
-		pSceneNode.mNumMeshes = static_cast<unsigned int>(SceneNode_Mesh.size());
-		pSceneNode.mMeshes = new unsigned int[pSceneNode.mNumMeshes];
-		for(size_t i = 0; i < pSceneNode.mNumMeshes; i++) pSceneNode.mMeshes[i] = *it++;
-	}
-
-	// that's all. return to previous deals
-}
-
-void X3DImporter::Postprocess_BuildShape(const CX3DImporter_NodeElement_Shape& pShapeNodeElement, std::list<unsigned int>& pNodeMeshInd,
-							std::list<aiMesh*>& pSceneMeshList, std::list<aiMaterial*>& pSceneMaterialList) const
-{
-    aiMaterial* tmat = nullptr;
-    aiMesh* tmesh = nullptr;
-    CX3DImporter_NodeElement::EType mesh_type = CX3DImporter_NodeElement::ENET_Invalid;
-    unsigned int mat_ind = 0;
-
-	for(std::list<CX3DImporter_NodeElement*>::const_iterator it = pShapeNodeElement.Child.begin(); it != pShapeNodeElement.Child.end(); ++it)
-	{
-		if(PostprocessHelper_ElementIsMesh((*it)->Type))
-		{
-			Postprocess_BuildMesh(**it, &tmesh);
-			if(tmesh != nullptr)
-			{
-				// if mesh successfully built then add data about it to arrays
-				pNodeMeshInd.push_back(static_cast<unsigned int>(pSceneMeshList.size()));
-				pSceneMeshList.push_back(tmesh);
-				// keep mesh type. Need above for texture coordinate generation.
-				mesh_type = (*it)->Type;
-			}
-		}
-		else if((*it)->Type == CX3DImporter_NodeElement::ENET_Appearance)
-		{
-			Postprocess_BuildMaterial(**it, &tmat);
-			if(tmat != nullptr)
-			{
-				// if material successfully built then add data about it to array
-				mat_ind = static_cast<unsigned int>(pSceneMaterialList.size());
-				pSceneMaterialList.push_back(tmat);
-			}
-		}
-	}// for(std::list<CX3DImporter_NodeElement*>::const_iterator it = pShapeNodeElement.Child.begin(); it != pShapeNodeElement.Child.end(); it++)
-
-	// associate read material with read mesh.
-	if((tmesh != nullptr) && (tmat != nullptr))
-	{
-		tmesh->mMaterialIndex = mat_ind;
-		// Check texture mapping. If material has texture but mesh has no texture coordinate then try to ask Assimp to generate texture coordinates.
-		if((tmat->GetTextureCount(aiTextureType_DIFFUSE) != 0) && !tmesh->HasTextureCoords(0))
-		{
-			int32_t tm;
-			aiVector3D tvec3;
-
-			switch(mesh_type)
-			{
-				case CX3DImporter_NodeElement::ENET_Box:
-					tm = aiTextureMapping_BOX;
-					break;
-				case CX3DImporter_NodeElement::ENET_Cone:
-				case CX3DImporter_NodeElement::ENET_Cylinder:
-					tm = aiTextureMapping_CYLINDER;
-					break;
-				case CX3DImporter_NodeElement::ENET_Sphere:
-					tm = aiTextureMapping_SPHERE;
-					break;
-				default:
-					tm = aiTextureMapping_PLANE;
-					break;
-			}// switch(mesh_type)
-
-			tmat->AddProperty(&tm, 1, AI_MATKEY_MAPPING_DIFFUSE(0));
-		}// if((tmat->GetTextureCount(aiTextureType_DIFFUSE) != 0) && !tmesh->HasTextureCoords(0))
-	}// if((tmesh != nullptr) && (tmat != nullptr))
-}
-
-void X3DImporter::Postprocess_CollectMetadata(const CX3DImporter_NodeElement& pNodeElement, aiNode& pSceneNode) const
-{
-    std::list<CX3DImporter_NodeElement*> meta_list;
-    size_t meta_idx;
-
-	PostprocessHelper_CollectMetadata(pNodeElement, meta_list);// find metadata in current node element.
-	if ( !meta_list.empty() )
-	{
-        if ( pSceneNode.mMetaData != nullptr ) {
-            throw DeadlyImportError( "Postprocess. MetaData member in node are not nullptr. Something went wrong." );
-        }
-
-		// copy collected metadata to output node.
-        pSceneNode.mMetaData = aiMetadata::Alloc( static_cast<unsigned int>(meta_list.size()) );
-		meta_idx = 0;
-		for(std::list<CX3DImporter_NodeElement*>::const_iterator it = meta_list.begin(); it != meta_list.end(); ++it, ++meta_idx)
-		{
-			CX3DImporter_NodeElement_Meta* cur_meta = (CX3DImporter_NodeElement_Meta*)*it;
-
-			// due to limitations we can add only first element of value list.
-			// Add an element according to its type.
-			if((*it)->Type == CX3DImporter_NodeElement::ENET_MetaBoolean)
-			{
-				if(((CX3DImporter_NodeElement_MetaBoolean*)cur_meta)->Value.size() > 0) {
-					const bool v = (bool) *( ( (CX3DImporter_NodeElement_MetaBoolean*) cur_meta )->Value.begin());
-                    pSceneNode.mMetaData->Set(static_cast<unsigned int>(meta_idx), cur_meta->Name, v);
-                }
-			}
-			else if((*it)->Type == CX3DImporter_NodeElement::ENET_MetaDouble)
-			{
-				if(((CX3DImporter_NodeElement_MetaDouble*)cur_meta)->Value.size() > 0)
-					pSceneNode.mMetaData->Set(static_cast<unsigned int>(meta_idx), cur_meta->Name, (float)*(((CX3DImporter_NodeElement_MetaDouble*)cur_meta)->Value.begin()));
-			}
-			else if((*it)->Type == CX3DImporter_NodeElement::ENET_MetaFloat)
-			{
-				if(((CX3DImporter_NodeElement_MetaFloat*)cur_meta)->Value.size() > 0)
-					pSceneNode.mMetaData->Set(static_cast<unsigned int>(meta_idx), cur_meta->Name, *(((CX3DImporter_NodeElement_MetaFloat*)cur_meta)->Value.begin()));
-			}
-			else if((*it)->Type == CX3DImporter_NodeElement::ENET_MetaInteger)
-			{
-				if(((CX3DImporter_NodeElement_MetaInteger*)cur_meta)->Value.size() > 0)
-					pSceneNode.mMetaData->Set(static_cast<unsigned int>(meta_idx), cur_meta->Name, *(((CX3DImporter_NodeElement_MetaInteger*)cur_meta)->Value.begin()));
-			}
-			else if((*it)->Type == CX3DImporter_NodeElement::ENET_MetaString)
-			{
-				if(((CX3DImporter_NodeElement_MetaString*)cur_meta)->Value.size() > 0)
-				{
-					aiString tstr(((CX3DImporter_NodeElement_MetaString*)cur_meta)->Value.begin()->data());
-
-					pSceneNode.mMetaData->Set(static_cast<unsigned int>(meta_idx), cur_meta->Name, tstr);
-				}
-			}
-			else
-			{
-				throw DeadlyImportError("Postprocess. Unknown metadata type.");
-			}// if((*it)->Type == CX3DImporter_NodeElement::ENET_Meta*) else
-		}// for(std::list<CX3DImporter_NodeElement*>::const_iterator it = meta_list.begin(); it != meta_list.end(); it++)
-	}// if( !meta_list.empty() )
-}
-
-}// namespace Assimp
-
-#endif // !ASSIMP_BUILD_NO_X3D_IMPORTER
diff --git a/code/AssetLib/X3D/X3DImporter_Rendering.cpp b/code/AssetLib/X3D/X3DImporter_Rendering.cpp
deleted file mode 100644
index a574d5549..000000000
--- a/code/AssetLib/X3D/X3DImporter_Rendering.cpp
+++ /dev/null
@@ -1,1071 +0,0 @@
-/*
-Open Asset Import Library (assimp)
-----------------------------------------------------------------------
-
-Copyright (c) 2006-2020, assimp team
-
-
-All rights reserved.
-
-Redistribution and use of this software in source and binary forms,
-with or without modification, are permitted provided that the
-following conditions are met:
-
-* Redistributions of source code must retain the above
-copyright notice, this list of conditions and the
-following disclaimer.
-
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the
-following disclaimer in the documentation and/or other
-materials provided with the distribution.
-
-* Neither the name of the assimp team, nor the names of its
-contributors may be used to endorse or promote products
-derived from this software without specific prior
-written permission of the assimp team.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-----------------------------------------------------------------------
-*/
-/// \file   X3DImporter_Rendering.cpp
-/// \brief  Parsing data from nodes of "Rendering" set of X3D.
-/// \date   2015-2016
-/// \author smal.root@gmail.com
-
-#ifndef ASSIMP_BUILD_NO_X3D_IMPORTER
-
-#include "X3DImporter.hpp"
-#include "X3DImporter_Macro.hpp"
-
-namespace Assimp
-{
-
-// <Color
-// DEF=""           ID
-// USE=""           IDREF
-// color="" MFColor [inputOutput]
-// />
-void X3DImporter::ParseNode_Rendering_Color()
-{
-    std::string use, def;
-    std::list<aiColor3D> color;
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_REF("color", color, XML_ReadNode_GetAttrVal_AsListCol3f);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_Color, ne);
-	}
-	else
-	{
-		// create and if needed - define new geometry object.
-		ne = new CX3DImporter_NodeElement_Color(NodeElement_Cur);
-		if(!def.empty()) ne->ID = def;
-
-		((CX3DImporter_NodeElement_Color*)ne)->Value = color;
-		// check for X3DMetadataObject childs.
-		if(!mReader->isEmptyElement())
-			ParseNode_Metadata(ne, "Color");
-		else
-			NodeElement_Cur->Child.push_back(ne);// add made object as child to current element
-
-		NodeElement_List.push_back(ne);// add element to node element list because its a new object in graph
-	}// if(!use.empty()) else
-}
-
-// <ColorRGBA
-// DEF=""               ID
-// USE=""               IDREF
-// color="" MFColorRGBA [inputOutput]
-// />
-void X3DImporter::ParseNode_Rendering_ColorRGBA()
-{
-    std::string use, def;
-    std::list<aiColor4D> color;
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_REF("color", color, XML_ReadNode_GetAttrVal_AsListCol4f);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_ColorRGBA, ne);
-	}
-	else
-	{
-		// create and if needed - define new geometry object.
-		ne = new CX3DImporter_NodeElement_ColorRGBA(NodeElement_Cur);
-		if(!def.empty()) ne->ID = def;
-
-		((CX3DImporter_NodeElement_ColorRGBA*)ne)->Value = color;
-		// check for X3DMetadataObject childs.
-		if(!mReader->isEmptyElement())
-			ParseNode_Metadata(ne, "ColorRGBA");
-		else
-			NodeElement_Cur->Child.push_back(ne);// add made object as child to current element
-
-		NodeElement_List.push_back(ne);// add element to node element list because its a new object in graph
-	}// if(!use.empty()) else
-}
-
-// <Coordinate
-// DEF=""      ID
-// USE=""      IDREF
-// point=""    MFVec3f [inputOutput]
-// />
-void X3DImporter::ParseNode_Rendering_Coordinate()
-{
-    std::string use, def;
-    std::list<aiVector3D> point;
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_REF("point", point, XML_ReadNode_GetAttrVal_AsListVec3f);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_Coordinate, ne);
-	}
-	else
-	{
-		// create and if needed - define new geometry object.
-		ne = new CX3DImporter_NodeElement_Coordinate(NodeElement_Cur);
-		if(!def.empty()) ne->ID = def;
-
-		((CX3DImporter_NodeElement_Coordinate*)ne)->Value = point;
-		// check for X3DMetadataObject childs.
-		if(!mReader->isEmptyElement())
-			ParseNode_Metadata(ne, "Coordinate");
-		else
-			NodeElement_Cur->Child.push_back(ne);// add made object as child to current element
-
-		NodeElement_List.push_back(ne);// add element to node element list because its a new object in graph
-	}// if(!use.empty()) else
-}
-
-// <IndexedLineSet
-// DEF=""                ID
-// USE=""                IDREF
-// colorIndex=""         MFInt32 [initializeOnly]
-// colorPerVertex="true" SFBool  [initializeOnly]
-// coordIndex=""         MFInt32 [initializeOnly]
-// >
-//    <!-- ColorCoordinateContentModel -->
-// ColorCoordinateContentModel is the child-node content model corresponding to IndexedLineSet, LineSet and PointSet. ColorCoordinateContentModel can
-// contain any-order Coordinate node with Color (or ColorRGBA) node. No more than one instance of any single node type is allowed.
-// A ProtoInstance node (with the proper node type) can be substituted for any node in this content model.
-// </IndexedLineSet>
-void X3DImporter::ParseNode_Rendering_IndexedLineSet()
-{
-    std::string use, def;
-    std::vector<int32_t> colorIndex;
-    bool colorPerVertex = true;
-    std::vector<int32_t> coordIndex;
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_REF("colorIndex", colorIndex, XML_ReadNode_GetAttrVal_AsArrI32);
-		MACRO_ATTRREAD_CHECK_RET("colorPerVertex", colorPerVertex, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_REF("coordIndex", coordIndex, XML_ReadNode_GetAttrVal_AsArrI32);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_IndexedLineSet, ne);
-	}
-	else
-	{
-		// check data
-		if((coordIndex.size() < 2) || ((coordIndex.back() == (-1)) && (coordIndex.size() < 3)))
-			throw DeadlyImportError("IndexedLineSet must contain not empty \"coordIndex\" attribute.");
-
-		// create and if needed - define new geometry object.
-		ne = new CX3DImporter_NodeElement_IndexedSet(CX3DImporter_NodeElement::ENET_IndexedLineSet, NodeElement_Cur);
-		if(!def.empty()) ne->ID = def;
-
-		CX3DImporter_NodeElement_IndexedSet& ne_alias = *((CX3DImporter_NodeElement_IndexedSet*)ne);
-
-		ne_alias.ColorIndex = colorIndex;
-		ne_alias.ColorPerVertex = colorPerVertex;
-		ne_alias.CoordIndex = coordIndex;
-        // check for child nodes
-        if(!mReader->isEmptyElement())
-        {
-			ParseHelper_Node_Enter(ne);
-			MACRO_NODECHECK_LOOPBEGIN("IndexedLineSet");
-				// check for Color and Coordinate nodes
-				if(XML_CheckNode_NameEqual("Color")) { ParseNode_Rendering_Color(); continue; }
-				if(XML_CheckNode_NameEqual("ColorRGBA")) { ParseNode_Rendering_ColorRGBA(); continue; }
-				if(XML_CheckNode_NameEqual("Coordinate")) { ParseNode_Rendering_Coordinate(); continue; }
-				// check for X3DMetadataObject
-				if(!ParseHelper_CheckRead_X3DMetadataObject()) XML_CheckNode_SkipUnsupported("IndexedLineSet");
-
-			MACRO_NODECHECK_LOOPEND("IndexedLineSet");
-			ParseHelper_Node_Exit();
-		}// if(!mReader->isEmptyElement())
-		else
-		{
-			NodeElement_Cur->Child.push_back(ne);// add made object as child to current element
-		}
-
-		NodeElement_List.push_back(ne);// add element to node element list because its a new object in graph
-	}// if(!use.empty()) else
-}
-
-// <IndexedTriangleFanSet
-// DEF=""                 ID
-// USE=""                 IDREF
-// ccw="true"             SFBool  [initializeOnly]
-// colorPerVertex="true"  SFBool  [initializeOnly]
-// index=""               MFInt32 [initializeOnly]
-// normalPerVertex="true" SFBool  [initializeOnly]
-// solid="true"           SFBool  [initializeOnly]
-// >
-//    <!-- ComposedGeometryContentModel -->
-// ComposedGeometryContentModel is the child-node content model corresponding to X3DComposedGeometryNodes. It can contain Color (or ColorRGBA), Coordinate,
-// Normal and TextureCoordinate, in any order. No more than one instance of these nodes is allowed. Multiple VertexAttribute (FloatVertexAttribute,
-// Matrix3VertexAttribute, Matrix4VertexAttribute) nodes can also be contained.
-// A ProtoInstance node (with the proper node type) can be substituted for any node in this content model.
-// </IndexedTriangleFanSet>
-void X3DImporter::ParseNode_Rendering_IndexedTriangleFanSet()
-{
-    std::string use, def;
-    bool ccw = true;
-    bool colorPerVertex = true;
-    std::vector<int32_t> index;
-    bool normalPerVertex = true;
-    bool solid = true;
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_RET("ccw", ccw, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_RET("colorPerVertex", colorPerVertex, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_REF("index", index, XML_ReadNode_GetAttrVal_AsArrI32);
-		MACRO_ATTRREAD_CHECK_RET("normalPerVertex", normalPerVertex, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_RET("solid", solid, XML_ReadNode_GetAttrVal_AsBool);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_IndexedTriangleFanSet, ne);
-	}
-	else
-	{
-		// check data
-		if(index.size() == 0) throw DeadlyImportError("IndexedTriangleFanSet must contain not empty \"index\" attribute.");
-
-		// create and if needed - define new geometry object.
-		ne = new CX3DImporter_NodeElement_IndexedSet(CX3DImporter_NodeElement::ENET_IndexedTriangleFanSet, NodeElement_Cur);
-		if(!def.empty()) ne->ID = def;
-
-		CX3DImporter_NodeElement_IndexedSet& ne_alias = *((CX3DImporter_NodeElement_IndexedSet*)ne);
-
-		ne_alias.CCW = ccw;
-		ne_alias.ColorPerVertex = colorPerVertex;
-		ne_alias.NormalPerVertex = normalPerVertex;
-		ne_alias.Solid = solid;
-
-		ne_alias.CoordIndex.clear();
-		int counter = 0;
-		int32_t idx[3];
-		for(std::vector<int32_t>::const_iterator idx_it = index.begin(); idx_it != index.end(); ++idx_it)
-		{
-			idx[2] = *idx_it;
-			if (idx[2] < 0)
-			{
-				counter = 0;
-			}
-			else
-			{
-				if (counter >= 2)
-				{
-					if(ccw)
-					{
-						ne_alias.CoordIndex.push_back(idx[0]);
-						ne_alias.CoordIndex.push_back(idx[1]);
-						ne_alias.CoordIndex.push_back(idx[2]);
-					}
-					else
-					{
-						ne_alias.CoordIndex.push_back(idx[0]);
-						ne_alias.CoordIndex.push_back(idx[2]);
-						ne_alias.CoordIndex.push_back(idx[1]);
-					}
-					ne_alias.CoordIndex.push_back(-1);
-					idx[1] = idx[2];
-				}
-				else
-				{
-					idx[counter] = idx[2];
-				}
-				++counter;
-			}
-		}// for(std::list<int32_t>::const_iterator idx_it = index.begin(); idx_it != ne_alias.index.end(); idx_it++)
-
-        // check for child nodes
-        if(!mReader->isEmptyElement())
-        {
-			ParseHelper_Node_Enter(ne);
-			MACRO_NODECHECK_LOOPBEGIN("IndexedTriangleFanSet");
-				// check for X3DComposedGeometryNodes
-				if(XML_CheckNode_NameEqual("Color")) { ParseNode_Rendering_Color(); continue; }
-				if(XML_CheckNode_NameEqual("ColorRGBA")) { ParseNode_Rendering_ColorRGBA(); continue; }
-				if(XML_CheckNode_NameEqual("Coordinate")) { ParseNode_Rendering_Coordinate(); continue; }
-				if(XML_CheckNode_NameEqual("Normal")) { ParseNode_Rendering_Normal(); continue; }
-				if(XML_CheckNode_NameEqual("TextureCoordinate")) { ParseNode_Texturing_TextureCoordinate(); continue; }
-				// check for X3DMetadataObject
-				if(!ParseHelper_CheckRead_X3DMetadataObject()) XML_CheckNode_SkipUnsupported("IndexedTriangleFanSet");
-
-			MACRO_NODECHECK_LOOPEND("IndexedTriangleFanSet");
-			ParseHelper_Node_Exit();
-		}// if(!mReader->isEmptyElement())
-		else
-		{
-			NodeElement_Cur->Child.push_back(ne);// add made object as child to current element
-		}
-
-		NodeElement_List.push_back(ne);// add element to node element list because its a new object in graph
-	}// if(!use.empty()) else
-}
-
-// <IndexedTriangleSet
-// DEF=""                 ID
-// USE=""                 IDREF
-// ccw="true"             SFBool  [initializeOnly]
-// colorPerVertex="true"  SFBool  [initializeOnly]
-// index=""               MFInt32 [initializeOnly]
-// normalPerVertex="true" SFBool  [initializeOnly]
-// solid="true"           SFBool  [initializeOnly]
-// >
-//    <!-- ComposedGeometryContentModel -->
-// ComposedGeometryContentModel is the child-node content model corresponding to X3DComposedGeometryNodes. It can contain Color (or ColorRGBA), Coordinate,
-// Normal and TextureCoordinate, in any order. No more than one instance of these nodes is allowed. Multiple VertexAttribute (FloatVertexAttribute,
-// Matrix3VertexAttribute, Matrix4VertexAttribute) nodes can also be contained.
-// A ProtoInstance node (with the proper node type) can be substituted for any node in this content model.
-// </IndexedTriangleSet>
-void X3DImporter::ParseNode_Rendering_IndexedTriangleSet()
-{
-    std::string use, def;
-    bool ccw = true;
-    bool colorPerVertex = true;
-    std::vector<int32_t> index;
-    bool normalPerVertex = true;
-    bool solid = true;
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_RET("ccw", ccw, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_RET("colorPerVertex", colorPerVertex, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_REF("index", index, XML_ReadNode_GetAttrVal_AsArrI32);
-		MACRO_ATTRREAD_CHECK_RET("normalPerVertex", normalPerVertex, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_RET("solid", solid, XML_ReadNode_GetAttrVal_AsBool);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_IndexedTriangleSet, ne);
-	}
-	else
-	{
-		// check data
-		if(index.size() == 0) throw DeadlyImportError("IndexedTriangleSet must contain not empty \"index\" attribute.");
-
-		// create and if needed - define new geometry object.
-		ne = new CX3DImporter_NodeElement_IndexedSet(CX3DImporter_NodeElement::ENET_IndexedTriangleSet, NodeElement_Cur);
-		if(!def.empty()) ne->ID = def;
-
-		CX3DImporter_NodeElement_IndexedSet& ne_alias = *((CX3DImporter_NodeElement_IndexedSet*)ne);
-
-		ne_alias.CCW = ccw;
-		ne_alias.ColorPerVertex = colorPerVertex;
-		ne_alias.NormalPerVertex = normalPerVertex;
-		ne_alias.Solid = solid;
-
-		ne_alias.CoordIndex.clear();
-		int counter = 0;
-		int32_t idx[3];
-		for(std::vector<int32_t>::const_iterator idx_it = index.begin(); idx_it != index.end(); ++idx_it)
-		{
-			idx[counter++] = *idx_it;
-			if (counter > 2)
-			{
-				counter = 0;
-				if(ccw)
-				{
-					ne_alias.CoordIndex.push_back(idx[0]);
-					ne_alias.CoordIndex.push_back(idx[1]);
-					ne_alias.CoordIndex.push_back(idx[2]);
-				}
-				else
-				{
-					ne_alias.CoordIndex.push_back(idx[0]);
-					ne_alias.CoordIndex.push_back(idx[2]);
-					ne_alias.CoordIndex.push_back(idx[1]);
-				}
-				ne_alias.CoordIndex.push_back(-1);
-			}
-		}// for(std::list<int32_t>::const_iterator idx_it = index.begin(); idx_it != ne_alias.index.end(); idx_it++)
-
-        // check for child nodes
-        if(!mReader->isEmptyElement())
-        {
-			ParseHelper_Node_Enter(ne);
-			MACRO_NODECHECK_LOOPBEGIN("IndexedTriangleSet");
-				// check for X3DComposedGeometryNodes
-				if(XML_CheckNode_NameEqual("Color")) { ParseNode_Rendering_Color(); continue; }
-				if(XML_CheckNode_NameEqual("ColorRGBA")) { ParseNode_Rendering_ColorRGBA(); continue; }
-				if(XML_CheckNode_NameEqual("Coordinate")) { ParseNode_Rendering_Coordinate(); continue; }
-				if(XML_CheckNode_NameEqual("Normal")) { ParseNode_Rendering_Normal(); continue; }
-				if(XML_CheckNode_NameEqual("TextureCoordinate")) { ParseNode_Texturing_TextureCoordinate(); continue; }
-				// check for X3DMetadataObject
-				if(!ParseHelper_CheckRead_X3DMetadataObject()) XML_CheckNode_SkipUnsupported("IndexedTriangleSet");
-
-			MACRO_NODECHECK_LOOPEND("IndexedTriangleSet");
-			ParseHelper_Node_Exit();
-		}// if(!mReader->isEmptyElement())
-		else
-		{
-			NodeElement_Cur->Child.push_back(ne);// add made object as child to current element
-		}
-
-		NodeElement_List.push_back(ne);// add element to node element list because its a new object in graph
-	}// if(!use.empty()) else
-}
-
-// <IndexedTriangleStripSet
-// DEF=""                 ID
-// USE=""                 IDREF
-// ccw="true"             SFBool  [initializeOnly]
-// colorPerVertex="true"  SFBool  [initializeOnly]
-// index=""               MFInt32 [initializeOnly]
-// normalPerVertex="true" SFBool  [initializeOnly]
-// solid="true"           SFBool  [initializeOnly]
-// >
-//    <!-- ComposedGeometryContentModel -->
-// ComposedGeometryContentModel is the child-node content model corresponding to X3DComposedGeometryNodes. It can contain Color (or ColorRGBA), Coordinate,
-// Normal and TextureCoordinate, in any order. No more than one instance of these nodes is allowed. Multiple VertexAttribute (FloatVertexAttribute,
-// Matrix3VertexAttribute, Matrix4VertexAttribute) nodes can also be contained.
-// A ProtoInstance node (with the proper node type) can be substituted for any node in this content model.
-// </IndexedTriangleStripSet>
-void X3DImporter::ParseNode_Rendering_IndexedTriangleStripSet()
-{
-    std::string use, def;
-    bool ccw = true;
-    bool colorPerVertex = true;
-    std::vector<int32_t> index;
-    bool normalPerVertex = true;
-    bool solid = true;
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_RET("ccw", ccw, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_RET("colorPerVertex", colorPerVertex, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_REF("index", index, XML_ReadNode_GetAttrVal_AsArrI32);
-		MACRO_ATTRREAD_CHECK_RET("normalPerVertex", normalPerVertex, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_RET("solid", solid, XML_ReadNode_GetAttrVal_AsBool);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_IndexedTriangleStripSet, ne);
-	}
-	else
-	{
-		// check data
-		if(index.size() == 0) throw DeadlyImportError("IndexedTriangleStripSet must contain not empty \"index\" attribute.");
-
-		// create and if needed - define new geometry object.
-		ne = new CX3DImporter_NodeElement_IndexedSet(CX3DImporter_NodeElement::ENET_IndexedTriangleStripSet, NodeElement_Cur);
-		if(!def.empty()) ne->ID = def;
-
-		CX3DImporter_NodeElement_IndexedSet& ne_alias = *((CX3DImporter_NodeElement_IndexedSet*)ne);
-
-		ne_alias.CCW = ccw;
-		ne_alias.ColorPerVertex = colorPerVertex;
-		ne_alias.NormalPerVertex = normalPerVertex;
-		ne_alias.Solid = solid;
-
-		ne_alias.CoordIndex.clear();
-		int counter = 0;
-		int32_t idx[3];
-		for(std::vector<int32_t>::const_iterator idx_it = index.begin(); idx_it != index.end(); ++idx_it)
-		{
-			idx[2] = *idx_it;
-			if (idx[2] < 0)
-			{
-				counter = 0;
-			}
-			else
-			{
-				if (counter >= 2)
-				{
-					if(ccw)
-					{
-						ne_alias.CoordIndex.push_back(idx[0]);
-						ne_alias.CoordIndex.push_back(idx[1]);
-						ne_alias.CoordIndex.push_back(idx[2]);
-					}
-					else
-					{
-						ne_alias.CoordIndex.push_back(idx[0]);
-						ne_alias.CoordIndex.push_back(idx[2]);
-						ne_alias.CoordIndex.push_back(idx[1]);
-					}
-					ne_alias.CoordIndex.push_back(-1);
-				}
-				idx[counter & 1] = idx[2];
-				++counter;
-			}
-		}// for(std::list<int32_t>::const_iterator idx_it = index.begin(); idx_it != ne_alias.index.end(); idx_it++)
-
-        // check for child nodes
-        if(!mReader->isEmptyElement())
-        {
-			ParseHelper_Node_Enter(ne);
-			MACRO_NODECHECK_LOOPBEGIN("IndexedTriangleStripSet");
-				// check for X3DComposedGeometryNodes
-				if(XML_CheckNode_NameEqual("Color")) { ParseNode_Rendering_Color(); continue; }
-				if(XML_CheckNode_NameEqual("ColorRGBA")) { ParseNode_Rendering_ColorRGBA(); continue; }
-				if(XML_CheckNode_NameEqual("Coordinate")) { ParseNode_Rendering_Coordinate(); continue; }
-				if(XML_CheckNode_NameEqual("Normal")) { ParseNode_Rendering_Normal(); continue; }
-				if(XML_CheckNode_NameEqual("TextureCoordinate")) { ParseNode_Texturing_TextureCoordinate(); continue; }
-				// check for X3DMetadataObject
-				if(!ParseHelper_CheckRead_X3DMetadataObject()) XML_CheckNode_SkipUnsupported("IndexedTriangleStripSet");
-
-			MACRO_NODECHECK_LOOPEND("IndexedTriangleStripSet");
-			ParseHelper_Node_Exit();
-		}// if(!mReader->isEmptyElement())
-		else
-		{
-			NodeElement_Cur->Child.push_back(ne);// add made object as child to current element
-		}
-
-		NodeElement_List.push_back(ne);// add element to node element list because its a new object in graph
-	}// if(!use.empty()) else
-}
-
-// <LineSet
-// DEF=""         ID
-// USE=""         IDREF
-// vertexCount="" MFInt32 [initializeOnly]
-// >
-//    <!-- ColorCoordinateContentModel -->
-// ColorCoordinateContentModel is the child-node content model corresponding to IndexedLineSet, LineSet and PointSet. ColorCoordinateContentModel can
-// contain any-order Coordinate node with Color (or ColorRGBA) node. No more than one instance of any single node type is allowed.
-// A ProtoInstance node (with the proper node type) can be substituted for any node in this content model.
-// </LineSet>
-void X3DImporter::ParseNode_Rendering_LineSet()
-{
-    std::string use, def;
-    std::vector<int32_t> vertexCount;
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_REF("vertexCount", vertexCount, XML_ReadNode_GetAttrVal_AsArrI32);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_LineSet, ne);
-	}
-	else
-	{
-		// check data
-		if(vertexCount.size() == 0) throw DeadlyImportError("LineSet must contain not empty \"vertexCount\" attribute.");
-
-		// create and if needed - define new geometry object.
-		ne = new CX3DImporter_NodeElement_Set(CX3DImporter_NodeElement::ENET_LineSet, NodeElement_Cur);
-		if(!def.empty()) ne->ID = def;
-
-		CX3DImporter_NodeElement_Set& ne_alias = *((CX3DImporter_NodeElement_Set*)ne);
-
-		ne_alias.VertexCount = vertexCount;
-		// create CoordIdx
-		size_t coord_num = 0;
-
-		ne_alias.CoordIndex.clear();
-		for(std::vector<int32_t>::const_iterator vc_it = ne_alias.VertexCount.begin(); vc_it != ne_alias.VertexCount.end(); ++vc_it)
-		{
-			if(*vc_it < 2) throw DeadlyImportError("LineSet. vertexCount shall be greater than or equal to two.");
-
-			for(int32_t i = 0; i < *vc_it; i++) ne_alias.CoordIndex.push_back(static_cast<int32_t>(coord_num++));// add vertices indices
-
-			 ne_alias.CoordIndex.push_back(-1);// add face delimiter.
-		}
-
-        // check for child nodes
-        if(!mReader->isEmptyElement())
-        {
-			ParseHelper_Node_Enter(ne);
-			MACRO_NODECHECK_LOOPBEGIN("LineSet");
-				// check for X3DComposedGeometryNodes
-				if(XML_CheckNode_NameEqual("Color")) { ParseNode_Rendering_Color(); continue; }
-				if(XML_CheckNode_NameEqual("ColorRGBA")) { ParseNode_Rendering_ColorRGBA(); continue; }
-				if(XML_CheckNode_NameEqual("Coordinate")) { ParseNode_Rendering_Coordinate(); continue; }
-				// check for X3DMetadataObject
-				if(!ParseHelper_CheckRead_X3DMetadataObject()) XML_CheckNode_SkipUnsupported("LineSet");
-
-			MACRO_NODECHECK_LOOPEND("LineSet");
-			ParseHelper_Node_Exit();
-		}// if(!mReader->isEmptyElement())
-		else
-		{
-			NodeElement_Cur->Child.push_back(ne);// add made object as child to current element
-		}
-
-		NodeElement_List.push_back(ne);// add element to node element list because its a new object in graph
-	}// if(!use.empty()) else
-}
-
-// <PointSet
-// DEF="" ID
-// USE="" IDREF
-// >
-//    <!-- ColorCoordinateContentModel -->
-// ColorCoordinateContentModel is the child-node content model corresponding to IndexedLineSet, LineSet and PointSet. ColorCoordinateContentModel can
-// contain any-order Coordinate node with Color (or ColorRGBA) node. No more than one instance of any single node type is allowed.
-// A ProtoInstance node (with the proper node type) can be substituted for any node in this content model.
-// </PointSet>
-void X3DImporter::ParseNode_Rendering_PointSet()
-{
-    std::string use, def;
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_PointSet, ne);
-	}
-	else
-	{
-		// create and if needed - define new geometry object.
-		ne = new CX3DImporter_NodeElement_IndexedSet(CX3DImporter_NodeElement::ENET_PointSet, NodeElement_Cur);
-		if(!def.empty()) ne->ID = def;
-
-        // check for child nodes
-        if(!mReader->isEmptyElement())
-        {
-			ParseHelper_Node_Enter(ne);
-			MACRO_NODECHECK_LOOPBEGIN("PointSet");
-				// check for X3DComposedGeometryNodes
-				if(XML_CheckNode_NameEqual("Color")) { ParseNode_Rendering_Color(); continue; }
-				if(XML_CheckNode_NameEqual("ColorRGBA")) { ParseNode_Rendering_ColorRGBA(); continue; }
-				if(XML_CheckNode_NameEqual("Coordinate")) { ParseNode_Rendering_Coordinate(); continue; }
-				// check for X3DMetadataObject
-				if(!ParseHelper_CheckRead_X3DMetadataObject()) XML_CheckNode_SkipUnsupported("PointSet");
-
-			MACRO_NODECHECK_LOOPEND("PointSet");
-			ParseHelper_Node_Exit();
-		}// if(!mReader->isEmptyElement())
-		else
-		{
-			NodeElement_Cur->Child.push_back(ne);// add made object as child to current element
-		}
-
-		NodeElement_List.push_back(ne);// add element to node element list because its a new object in graph
-	}// if(!use.empty()) else
-}
-
-// <TriangleFanSet
-// DEF=""                 ID
-// USE=""                 IDREF
-// ccw="true"             SFBool  [initializeOnly]
-// colorPerVertex="true"  SFBool  [initializeOnly]
-// fanCount=""            MFInt32 [inputOutput]
-// normalPerVertex="true" SFBool  [initializeOnly]
-// solid="true"           SFBool  [initializeOnly]
-// >
-//    <!-- ComposedGeometryContentModel -->
-// ComposedGeometryContentModel is the child-node content model corresponding to X3DComposedGeometryNodes. It can contain Color (or ColorRGBA), Coordinate,
-// Normal and TextureCoordinate, in any order. No more than one instance of these nodes is allowed. Multiple VertexAttribute (FloatVertexAttribute,
-// Matrix3VertexAttribute, Matrix4VertexAttribute) nodes can also be contained.
-// A ProtoInstance node (with the proper node type) can be substituted for any node in this content model.
-// </TriangleFanSet>
-void X3DImporter::ParseNode_Rendering_TriangleFanSet()
-{
-    std::string use, def;
-    bool ccw = true;
-    bool colorPerVertex = true;
-    std::vector<int32_t> fanCount;
-    bool normalPerVertex = true;
-    bool solid = true;
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_RET("ccw", ccw, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_RET("colorPerVertex", colorPerVertex, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_REF("fanCount", fanCount, XML_ReadNode_GetAttrVal_AsArrI32);
-		MACRO_ATTRREAD_CHECK_RET("normalPerVertex", normalPerVertex, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_RET("solid", solid, XML_ReadNode_GetAttrVal_AsBool);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_TriangleFanSet, ne);
-	}
-	else
-	{
-		// check data
-		if(fanCount.size() == 0) throw DeadlyImportError("TriangleFanSet must contain not empty \"fanCount\" attribute.");
-
-		// create and if needed - define new geometry object.
-		ne = new CX3DImporter_NodeElement_Set(CX3DImporter_NodeElement::ENET_TriangleFanSet, NodeElement_Cur);
-		if(!def.empty()) ne->ID = def;
-
-		CX3DImporter_NodeElement_Set& ne_alias = *((CX3DImporter_NodeElement_Set*)ne);
-
-		ne_alias.CCW = ccw;
-		ne_alias.ColorPerVertex = colorPerVertex;
-		ne_alias.VertexCount = fanCount;
-		ne_alias.NormalPerVertex = normalPerVertex;
-		ne_alias.Solid = solid;
-		// create CoordIdx
-		size_t coord_num_first, coord_num_prev;
-
-		ne_alias.CoordIndex.clear();
-		// assign indices for first triangle
-		coord_num_first = 0;
-		coord_num_prev = 1;
-		for(std::vector<int32_t>::const_iterator vc_it = ne_alias.VertexCount.begin(); vc_it != ne_alias.VertexCount.end(); ++vc_it)
-		{
-			if(*vc_it < 3) throw DeadlyImportError("TriangleFanSet. fanCount shall be greater than or equal to three.");
-
-			for(int32_t vc = 2; vc < *vc_it; vc++)
-			{
-				if(ccw)
-				{
-					// 2 1
-					//  0
-					ne_alias.CoordIndex.push_back(static_cast<int32_t>(coord_num_first));// first vertex is a center and always is [0].
-					ne_alias.CoordIndex.push_back(static_cast<int32_t>(coord_num_prev++));
-					ne_alias.CoordIndex.push_back(static_cast<int32_t>(coord_num_prev));
-				}
-				else
-				{
-					// 1 2
-					//  0
-					ne_alias.CoordIndex.push_back(static_cast<int32_t>(coord_num_first));// first vertex is a center and always is [0].
-					ne_alias.CoordIndex.push_back(static_cast<int32_t>(coord_num_prev + 1));
-					ne_alias.CoordIndex.push_back(static_cast<int32_t>(coord_num_prev++));
-				}// if(ccw) else
-
-				ne_alias.CoordIndex.push_back(-1);// add face delimiter.
-			}// for(int32_t vc = 2; vc < *vc_it; vc++)
-
-			coord_num_prev++;// that index will be center of next fan
-			coord_num_first = coord_num_prev++;// forward to next point - second point of fan
-		}// for(std::list<int32_t>::const_iterator vc_it = ne_alias.VertexCount.begin(); vc_it != ne_alias.VertexCount.end(); vc_it++)
-        // check for child nodes
-        if(!mReader->isEmptyElement())
-        {
-			ParseHelper_Node_Enter(ne);
-			MACRO_NODECHECK_LOOPBEGIN("TriangleFanSet");
-				// check for X3DComposedGeometryNodes
-				if(XML_CheckNode_NameEqual("Color")) { ParseNode_Rendering_Color(); continue; }
-				if(XML_CheckNode_NameEqual("ColorRGBA")) { ParseNode_Rendering_ColorRGBA(); continue; }
-				if(XML_CheckNode_NameEqual("Coordinate")) { ParseNode_Rendering_Coordinate(); continue; }
-				if(XML_CheckNode_NameEqual("Normal")) { ParseNode_Rendering_Normal(); continue; }
-				if(XML_CheckNode_NameEqual("TextureCoordinate")) { ParseNode_Texturing_TextureCoordinate(); continue; }
-				// check for X3DMetadataObject
-				if(!ParseHelper_CheckRead_X3DMetadataObject()) XML_CheckNode_SkipUnsupported("TriangleFanSet");
-
-			MACRO_NODECHECK_LOOPEND("TriangleFanSet");
-			ParseHelper_Node_Exit();
-		}// if(!mReader->isEmptyElement())
-		else
-		{
-			NodeElement_Cur->Child.push_back(ne);// add made object as child to current element
-		}
-
-		NodeElement_List.push_back(ne);// add element to node element list because its a new object in graph
-	}// if(!use.empty()) else
-}
-
-// <TriangleSet
-// DEF=""                 ID
-// USE=""                 IDREF
-// ccw="true"             SFBool  [initializeOnly]
-// colorPerVertex="true"  SFBool  [initializeOnly]
-// normalPerVertex="true" SFBool  [initializeOnly]
-// solid="true"           SFBool  [initializeOnly]
-// >
-//    <!-- ComposedGeometryContentModel -->
-// ComposedGeometryContentModel is the child-node content model corresponding to X3DComposedGeometryNodes. It can contain Color (or ColorRGBA), Coordinate,
-// Normal and TextureCoordinate, in any order. No more than one instance of these nodes is allowed. Multiple VertexAttribute (FloatVertexAttribute,
-// Matrix3VertexAttribute, Matrix4VertexAttribute) nodes can also be contained.
-// A ProtoInstance node (with the proper node type) can be substituted for any node in this content model.
-// </TriangleSet>
-void X3DImporter::ParseNode_Rendering_TriangleSet()
-{
-    std::string use, def;
-    bool ccw = true;
-    bool colorPerVertex = true;
-    bool normalPerVertex = true;
-    bool solid = true;
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_RET("ccw", ccw, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_RET("colorPerVertex", colorPerVertex, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_RET("normalPerVertex", normalPerVertex, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_RET("solid", solid, XML_ReadNode_GetAttrVal_AsBool);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_TriangleSet, ne);
-	}
-	else
-	{
-		// create and if needed - define new geometry object.
-		ne = new CX3DImporter_NodeElement_IndexedSet(CX3DImporter_NodeElement::ENET_TriangleSet, NodeElement_Cur);
-		if(!def.empty()) ne->ID = def;
-
-		CX3DImporter_NodeElement_Set& ne_alias = *((CX3DImporter_NodeElement_Set*)ne);
-
-		ne_alias.CCW = ccw;
-		ne_alias.ColorPerVertex = colorPerVertex;
-		ne_alias.NormalPerVertex = normalPerVertex;
-		ne_alias.Solid = solid;
-        // check for child nodes
-        if(!mReader->isEmptyElement())
-        {
-			ParseHelper_Node_Enter(ne);
-			MACRO_NODECHECK_LOOPBEGIN("TriangleSet");
-				// check for X3DComposedGeometryNodes
-				if(XML_CheckNode_NameEqual("Color")) { ParseNode_Rendering_Color(); continue; }
-				if(XML_CheckNode_NameEqual("ColorRGBA")) { ParseNode_Rendering_ColorRGBA(); continue; }
-				if(XML_CheckNode_NameEqual("Coordinate")) { ParseNode_Rendering_Coordinate(); continue; }
-				if(XML_CheckNode_NameEqual("Normal")) { ParseNode_Rendering_Normal(); continue; }
-				if(XML_CheckNode_NameEqual("TextureCoordinate")) { ParseNode_Texturing_TextureCoordinate(); continue; }
-				// check for X3DMetadataObject
-				if(!ParseHelper_CheckRead_X3DMetadataObject()) XML_CheckNode_SkipUnsupported("TriangleSet");
-
-			MACRO_NODECHECK_LOOPEND("TriangleSet");
-			ParseHelper_Node_Exit();
-		}// if(!mReader->isEmptyElement())
-		else
-		{
-			NodeElement_Cur->Child.push_back(ne);// add made object as child to current element
-		}
-
-		NodeElement_List.push_back(ne);// add element to node element list because its a new object in graph
-	}// if(!use.empty()) else
-}
-
-// <TriangleStripSet
-// DEF=""                 ID
-// USE=""                 IDREF
-// ccw="true"             SFBool  [initializeOnly]
-// colorPerVertex="true"  SFBool  [initializeOnly]
-// normalPerVertex="true" SFBool  [initializeOnly]
-// solid="true"           SFBool  [initializeOnly]
-// stripCount=""          MFInt32 [inputOutput]
-// >
-//    <!-- ComposedGeometryContentModel -->
-// ComposedGeometryContentModel is the child-node content model corresponding to X3DComposedGeometryNodes. It can contain Color (or ColorRGBA), Coordinate,
-// Normal and TextureCoordinate, in any order. No more than one instance of these nodes is allowed. Multiple VertexAttribute (FloatVertexAttribute,
-// Matrix3VertexAttribute, Matrix4VertexAttribute) nodes can also be contained.
-// A ProtoInstance node (with the proper node type) can be substituted for any node in this content model.
-// </TriangleStripSet>
-void X3DImporter::ParseNode_Rendering_TriangleStripSet()
-{
-    std::string use, def;
-    bool ccw = true;
-    bool colorPerVertex = true;
-    std::vector<int32_t> stripCount;
-    bool normalPerVertex = true;
-    bool solid = true;
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_RET("ccw", ccw, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_RET("colorPerVertex", colorPerVertex, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_REF("stripCount", stripCount, XML_ReadNode_GetAttrVal_AsArrI32);
-		MACRO_ATTRREAD_CHECK_RET("normalPerVertex", normalPerVertex, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_RET("solid", solid, XML_ReadNode_GetAttrVal_AsBool);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_TriangleStripSet, ne);
-	}
-	else
-	{
-		// check data
-		if(stripCount.size() == 0) throw DeadlyImportError("TriangleStripSet must contain not empty \"stripCount\" attribute.");
-
-		// create and if needed - define new geometry object.
-		ne = new CX3DImporter_NodeElement_Set(CX3DImporter_NodeElement::ENET_TriangleStripSet, NodeElement_Cur);
-		if(!def.empty()) ne->ID = def;
-
-		CX3DImporter_NodeElement_Set& ne_alias = *((CX3DImporter_NodeElement_Set*)ne);
-
-		ne_alias.CCW = ccw;
-		ne_alias.ColorPerVertex = colorPerVertex;
-		ne_alias.VertexCount = stripCount;
-		ne_alias.NormalPerVertex = normalPerVertex;
-		ne_alias.Solid = solid;
-		// create CoordIdx
-		size_t coord_num0, coord_num1, coord_num2;// indices of current triangle
-		bool odd_tri;// sequence of current triangle
-		size_t coord_num_sb;// index of first point of strip
-
-		ne_alias.CoordIndex.clear();
-		coord_num_sb = 0;
-		for(std::vector<int32_t>::const_iterator vc_it = ne_alias.VertexCount.begin(); vc_it != ne_alias.VertexCount.end(); ++vc_it)
-		{
-			if(*vc_it < 3) throw DeadlyImportError("TriangleStripSet. stripCount shall be greater than or equal to three.");
-
-			// set initial values for first triangle
-			coord_num0 = coord_num_sb;
-			coord_num1 = coord_num_sb + 1;
-			coord_num2 = coord_num_sb + 2;
-			odd_tri = true;
-
-			for(int32_t vc = 2; vc < *vc_it; vc++)
-			{
-				if(ccw)
-				{
-					// 0 2
-					//  1
-					ne_alias.CoordIndex.push_back(static_cast<int32_t>(coord_num0));
-					ne_alias.CoordIndex.push_back(static_cast<int32_t>(coord_num1));
-					ne_alias.CoordIndex.push_back(static_cast<int32_t>(coord_num2));
-				}
-				else
-				{
-					// 0 1
-					//  2
-					ne_alias.CoordIndex.push_back(static_cast<int32_t>(coord_num0));
-					ne_alias.CoordIndex.push_back(static_cast<int32_t>(coord_num2));
-					ne_alias.CoordIndex.push_back(static_cast<int32_t>(coord_num1));
-				}// if(ccw) else
-
-				ne_alias.CoordIndex.push_back(-1);// add face delimiter.
-				// prepare values for next triangle
-				if(odd_tri)
-				{
-					coord_num0 = coord_num2;
-					coord_num2++;
-				}
-				else
-				{
-					coord_num1 = coord_num2;
-					coord_num2 = coord_num1 + 1;
-				}
-
-				odd_tri = !odd_tri;
-				coord_num_sb = coord_num2;// that index will be start of next strip
-			}// for(int32_t vc = 2; vc < *vc_it; vc++)
-		}// for(std::list<int32_t>::const_iterator vc_it = ne_alias.VertexCount.begin(); vc_it != ne_alias.VertexCount.end(); vc_it++)
-        // check for child nodes
-        if(!mReader->isEmptyElement())
-        {
-			ParseHelper_Node_Enter(ne);
-			MACRO_NODECHECK_LOOPBEGIN("TriangleStripSet");
-				// check for X3DComposedGeometryNodes
-				if(XML_CheckNode_NameEqual("Color")) { ParseNode_Rendering_Color(); continue; }
-				if(XML_CheckNode_NameEqual("ColorRGBA")) { ParseNode_Rendering_ColorRGBA(); continue; }
-				if(XML_CheckNode_NameEqual("Coordinate")) { ParseNode_Rendering_Coordinate(); continue; }
-				if(XML_CheckNode_NameEqual("Normal")) { ParseNode_Rendering_Normal(); continue; }
-				if(XML_CheckNode_NameEqual("TextureCoordinate")) { ParseNode_Texturing_TextureCoordinate(); continue; }
-				// check for X3DMetadataObject
-				if(!ParseHelper_CheckRead_X3DMetadataObject()) XML_CheckNode_SkipUnsupported("TriangleStripSet");
-
-			MACRO_NODECHECK_LOOPEND("TriangleStripSet");
-			ParseHelper_Node_Exit();
-		}// if(!mReader->isEmptyElement())
-		else
-		{
-			NodeElement_Cur->Child.push_back(ne);// add made object as child to current element
-		}
-
-		NodeElement_List.push_back(ne);// add element to node element list because its a new object in graph
-	}// if(!use.empty()) else
-}
-
-// <Normal
-// DEF=""      ID
-// USE=""      IDREF
-// vector=""   MFVec3f [inputOutput]
-// />
-void X3DImporter::ParseNode_Rendering_Normal()
-{
-std::string use, def;
-std::list<aiVector3D> vector;
-CX3DImporter_NodeElement* ne;
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_REF("vector", vector, XML_ReadNode_GetAttrVal_AsListVec3f);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_Normal, ne);
-	}
-	else
-	{
-		// create and if needed - define new geometry object.
-		ne = new CX3DImporter_NodeElement_Normal(NodeElement_Cur);
-		if(!def.empty()) ne->ID = def;
-
-		((CX3DImporter_NodeElement_Normal*)ne)->Value = vector;
-		// check for X3DMetadataObject childs.
-		if(!mReader->isEmptyElement())
-			ParseNode_Metadata(ne, "Normal");
-		else
-			NodeElement_Cur->Child.push_back(ne);// add made object as child to current element
-
-		NodeElement_List.push_back(ne);// add element to node element list because its a new object in graph
-	}// if(!use.empty()) else
-}
-
-}// namespace Assimp
-
-#endif // !ASSIMP_BUILD_NO_X3D_IMPORTER
diff --git a/code/AssetLib/X3D/X3DImporter_Shape.cpp b/code/AssetLib/X3D/X3DImporter_Shape.cpp
deleted file mode 100644
index a77b0d20c..000000000
--- a/code/AssetLib/X3D/X3DImporter_Shape.cpp
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
-Open Asset Import Library (assimp)
-----------------------------------------------------------------------
-
-Copyright (c) 2006-2020, assimp team
-
-
-All rights reserved.
-
-Redistribution and use of this software in source and binary forms,
-with or without modification, are permitted provided that the
-following conditions are met:
-
-* Redistributions of source code must retain the above
-copyright notice, this list of conditions and the
-following disclaimer.
-
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the
-following disclaimer in the documentation and/or other
-materials provided with the distribution.
-
-* Neither the name of the assimp team, nor the names of its
-contributors may be used to endorse or promote products
-derived from this software without specific prior
-written permission of the assimp team.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-----------------------------------------------------------------------
-*/
-/// \file   X3DImporter_Shape.cpp
-/// \brief  Parsing data from nodes of "Shape" set of X3D.
-/// \date   2015-2016
-/// \author smal.root@gmail.com
-
-#ifndef ASSIMP_BUILD_NO_X3D_IMPORTER
-
-#include "X3DImporter.hpp"
-#include "X3DImporter_Macro.hpp"
-
-namespace Assimp
-{
-
-// <Shape
-// DEF=""              ID
-// USE=""              IDREF
-// bboxCenter="0 0 0"  SFVec3f [initializeOnly]
-// bboxSize="-1 -1 -1" SFVec3f [initializeOnly]
-// >
-//    <!-- ShapeChildContentModel -->
-// "ShapeChildContentModel is the child-node content model corresponding to X3DShapeNode. ShapeChildContentModel can contain a single Appearance node and a
-// single geometry node, in any order.
-// A ProtoInstance node (with the proper node type) can be substituted for any node in this content model."
-// </Shape>
-// A Shape node is unlit if either of the following is true:
-//     The shape's appearance field is nullptr (default).
-//     The material field in the Appearance node is nullptr (default).
-// NOTE Geometry nodes that represent lines or points do not support lighting.
-void X3DImporter::ParseNode_Shape_Shape()
-{
-    std::string use, def;
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_Shape, ne);
-	}
-	else
-	{
-		// create and if needed - define new geometry object.
-		ne = new CX3DImporter_NodeElement_Shape(NodeElement_Cur);
-		if(!def.empty()) ne->ID = def;
-
-        // check for child nodes
-        if(!mReader->isEmptyElement())
-        {
-			ParseHelper_Node_Enter(ne);
-			MACRO_NODECHECK_LOOPBEGIN("Shape");
-				// check for appearance node
-				if(XML_CheckNode_NameEqual("Appearance")) { ParseNode_Shape_Appearance(); continue; }
-				// check for X3DGeometryNodes
-				if(XML_CheckNode_NameEqual("Arc2D")) { ParseNode_Geometry2D_Arc2D(); continue; }
-				if(XML_CheckNode_NameEqual("ArcClose2D")) { ParseNode_Geometry2D_ArcClose2D(); continue; }
-				if(XML_CheckNode_NameEqual("Circle2D")) { ParseNode_Geometry2D_Circle2D(); continue; }
-				if(XML_CheckNode_NameEqual("Disk2D")) { ParseNode_Geometry2D_Disk2D(); continue; }
-				if(XML_CheckNode_NameEqual("Polyline2D")) { ParseNode_Geometry2D_Polyline2D(); continue; }
-				if(XML_CheckNode_NameEqual("Polypoint2D")) { ParseNode_Geometry2D_Polypoint2D(); continue; }
-				if(XML_CheckNode_NameEqual("Rectangle2D")) { ParseNode_Geometry2D_Rectangle2D(); continue; }
-				if(XML_CheckNode_NameEqual("TriangleSet2D")) { ParseNode_Geometry2D_TriangleSet2D(); continue; }
-				if(XML_CheckNode_NameEqual("Box")) { ParseNode_Geometry3D_Box(); continue; }
-				if(XML_CheckNode_NameEqual("Cone")) { ParseNode_Geometry3D_Cone(); continue; }
-				if(XML_CheckNode_NameEqual("Cylinder")) { ParseNode_Geometry3D_Cylinder(); continue; }
-				if(XML_CheckNode_NameEqual("ElevationGrid")) { ParseNode_Geometry3D_ElevationGrid(); continue; }
-				if(XML_CheckNode_NameEqual("Extrusion")) { ParseNode_Geometry3D_Extrusion(); continue; }
-				if(XML_CheckNode_NameEqual("IndexedFaceSet")) { ParseNode_Geometry3D_IndexedFaceSet(); continue; }
-				if(XML_CheckNode_NameEqual("Sphere")) { ParseNode_Geometry3D_Sphere(); continue; }
-				if(XML_CheckNode_NameEqual("IndexedLineSet")) { ParseNode_Rendering_IndexedLineSet(); continue; }
-				if(XML_CheckNode_NameEqual("LineSet")) { ParseNode_Rendering_LineSet(); continue; }
-				if(XML_CheckNode_NameEqual("PointSet")) { ParseNode_Rendering_PointSet(); continue; }
-				if(XML_CheckNode_NameEqual("IndexedTriangleFanSet")) { ParseNode_Rendering_IndexedTriangleFanSet(); continue; }
-				if(XML_CheckNode_NameEqual("IndexedTriangleSet")) { ParseNode_Rendering_IndexedTriangleSet(); continue; }
-				if(XML_CheckNode_NameEqual("IndexedTriangleStripSet")) { ParseNode_Rendering_IndexedTriangleStripSet(); continue; }
-				if(XML_CheckNode_NameEqual("TriangleFanSet")) { ParseNode_Rendering_TriangleFanSet(); continue; }
-				if(XML_CheckNode_NameEqual("TriangleSet")) { ParseNode_Rendering_TriangleSet(); continue; }
-				if(XML_CheckNode_NameEqual("TriangleStripSet")) { ParseNode_Rendering_TriangleStripSet(); continue; }
-				// check for X3DMetadataObject
-				if(!ParseHelper_CheckRead_X3DMetadataObject()) XML_CheckNode_SkipUnsupported("Shape");
-
-			MACRO_NODECHECK_LOOPEND("Shape");
-			ParseHelper_Node_Exit();
-		}// if(!mReader->isEmptyElement())
-		else
-		{
-			NodeElement_Cur->Child.push_back(ne);// add made object as child to current element
-		}
-
-		NodeElement_List.push_back(ne);// add element to node element list because its a new object in graph
-	}// if(!use.empty()) else
-}
-
-// <Appearance
-// DEF="" ID
-// USE="" IDREF
-// >
-// <!-- AppearanceChildContentModel -->
-// "Child-node content model corresponding to X3DAppearanceChildNode. Appearance can contain FillProperties, LineProperties, Material, any Texture node and
-// any TextureTransform node, in any order. No more than one instance of these nodes is allowed. Appearance may also contain multiple shaders (ComposedShader,
-// PackagedShader, ProgramShader).
-// A ProtoInstance node (with the proper node type) can be substituted for any node in this content model."
-// </Appearance>
-void X3DImporter::ParseNode_Shape_Appearance()
-{
-    std::string use, def;
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_Appearance, ne);
-	}
-	else
-	{
-		// create and if needed - define new geometry object.
-		ne = new CX3DImporter_NodeElement_Appearance(NodeElement_Cur);
-		if(!def.empty()) ne->ID = def;
-
-        // check for child nodes
-        if(!mReader->isEmptyElement())
-        {
-			ParseHelper_Node_Enter(ne);
-			MACRO_NODECHECK_LOOPBEGIN("Appearance");
-				if(XML_CheckNode_NameEqual("Material")) { ParseNode_Shape_Material(); continue; }
-				if(XML_CheckNode_NameEqual("ImageTexture")) { ParseNode_Texturing_ImageTexture(); continue; }
-				if(XML_CheckNode_NameEqual("TextureTransform")) { ParseNode_Texturing_TextureTransform(); continue; }
-				// check for X3DMetadataObject
-				if(!ParseHelper_CheckRead_X3DMetadataObject()) XML_CheckNode_SkipUnsupported("Appearance");
-
-			MACRO_NODECHECK_LOOPEND("Appearance");
-			ParseHelper_Node_Exit();
-		}// if(!mReader->isEmptyElement())
-		else
-		{
-			NodeElement_Cur->Child.push_back(ne);// add made object as child to current element
-		}
-
-		NodeElement_List.push_back(ne);// add element to node element list because its a new object in graph
-	}// if(!use.empty()) else
-}
-
-// <Material
-// DEF=""                     ID
-// USE=""                     IDREF
-// ambientIntensity="0.2"     SFFloat [inputOutput]
-// diffuseColor="0.8 0.8 0.8" SFColor [inputOutput]
-// emissiveColor="0 0 0"      SFColor [inputOutput]
-// shininess="0.2"            SFFloat [inputOutput]
-// specularColor="0 0 0"      SFColor [inputOutput]
-// transparency="0"           SFFloat [inputOutput]
-// />
-void X3DImporter::ParseNode_Shape_Material()
-{
-    std::string use, def;
-    float ambientIntensity = 0.2f;
-    float shininess = 0.2f;
-    float transparency = 0;
-    aiColor3D diffuseColor(0.8f, 0.8f, 0.8f);
-    aiColor3D emissiveColor(0, 0, 0);
-    aiColor3D specularColor(0, 0, 0);
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_RET("ambientIntensity", ambientIntensity, XML_ReadNode_GetAttrVal_AsFloat);
-		MACRO_ATTRREAD_CHECK_RET("shininess", shininess, XML_ReadNode_GetAttrVal_AsFloat);
-		MACRO_ATTRREAD_CHECK_RET("transparency", transparency, XML_ReadNode_GetAttrVal_AsFloat);
-		MACRO_ATTRREAD_CHECK_REF("diffuseColor", diffuseColor, XML_ReadNode_GetAttrVal_AsCol3f);
-		MACRO_ATTRREAD_CHECK_REF("emissiveColor", emissiveColor, XML_ReadNode_GetAttrVal_AsCol3f);
-		MACRO_ATTRREAD_CHECK_REF("specularColor", specularColor, XML_ReadNode_GetAttrVal_AsCol3f);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_Material, ne);
-	}
-	else
-	{
-		// create and if needed - define new geometry object.
-		ne = new CX3DImporter_NodeElement_Material(NodeElement_Cur);
-		if(!def.empty()) ne->ID = def;
-
-		((CX3DImporter_NodeElement_Material*)ne)->AmbientIntensity = ambientIntensity;
-		((CX3DImporter_NodeElement_Material*)ne)->Shininess = shininess;
-		((CX3DImporter_NodeElement_Material*)ne)->Transparency = transparency;
-		((CX3DImporter_NodeElement_Material*)ne)->DiffuseColor = diffuseColor;
-		((CX3DImporter_NodeElement_Material*)ne)->EmissiveColor = emissiveColor;
-		((CX3DImporter_NodeElement_Material*)ne)->SpecularColor = specularColor;
-        // check for child nodes
-		if(!mReader->isEmptyElement())
-			ParseNode_Metadata(ne, "Material");
-		else
-			NodeElement_Cur->Child.push_back(ne);// add made object as child to current element
-
-		NodeElement_List.push_back(ne);// add element to node element list because its a new object in graph
-	}// if(!use.empty()) else
-}
-
-}// namespace Assimp
-
-#endif // !ASSIMP_BUILD_NO_X3D_IMPORTER
diff --git a/code/AssetLib/X3D/X3DImporter_Texturing.cpp b/code/AssetLib/X3D/X3DImporter_Texturing.cpp
deleted file mode 100644
index 0f8c75c41..000000000
--- a/code/AssetLib/X3D/X3DImporter_Texturing.cpp
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
-Open Asset Import Library (assimp)
-----------------------------------------------------------------------
-
-Copyright (c) 2006-2020, assimp team
-
-
-All rights reserved.
-
-Redistribution and use of this software in source and binary forms,
-with or without modification, are permitted provided that the
-following conditions are met:
-
-* Redistributions of source code must retain the above
-copyright notice, this list of conditions and the
-following disclaimer.
-
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the
-following disclaimer in the documentation and/or other
-materials provided with the distribution.
-
-* Neither the name of the assimp team, nor the names of its
-contributors may be used to endorse or promote products
-derived from this software without specific prior
-written permission of the assimp team.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-----------------------------------------------------------------------
-*/
-/// \file   X3DImporter_Texturing.cpp
-/// \brief  Parsing data from nodes of "Texturing" set of X3D.
-/// \date   2015-2016
-/// \author smal.root@gmail.com
-
-#ifndef ASSIMP_BUILD_NO_X3D_IMPORTER
-
-#include "X3DImporter.hpp"
-#include "X3DImporter_Macro.hpp"
-
-namespace Assimp
-{
-
-// <ImageTexture
-// DEF=""         ID
-// USE=""         IDREF
-// repeatS="true" SFBool
-// repeatT="true" SFBool
-// url=""         MFString
-// />
-// When the url field contains no values ([]), texturing is disabled.
-void X3DImporter::ParseNode_Texturing_ImageTexture()
-{
-    std::string use, def;
-    bool repeatS = true;
-    bool repeatT = true;
-    std::list<std::string> url;
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_RET("repeatS", repeatS, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_RET("repeatT", repeatT, XML_ReadNode_GetAttrVal_AsBool);
-		MACRO_ATTRREAD_CHECK_REF("url", url, XML_ReadNode_GetAttrVal_AsListS);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_ImageTexture, ne);
-	}
-	else
-	{
-		// create and if needed - define new geometry object.
-		ne = new CX3DImporter_NodeElement_ImageTexture(NodeElement_Cur);
-		if(!def.empty()) ne->ID = def;
-
-		((CX3DImporter_NodeElement_ImageTexture*)ne)->RepeatS = repeatS;
-		((CX3DImporter_NodeElement_ImageTexture*)ne)->RepeatT = repeatT;
-		// Attribute "url" can contain list of strings. But we need only one - first.
-		if(!url.empty())
-			((CX3DImporter_NodeElement_ImageTexture*)ne)->URL = url.front();
-		else
-			((CX3DImporter_NodeElement_ImageTexture*)ne)->URL = "";
-
-		// check for X3DMetadataObject childs.
-		if(!mReader->isEmptyElement())
-			ParseNode_Metadata(ne, "ImageTexture");
-		else
-			NodeElement_Cur->Child.push_back(ne);// add made object as child to current element
-
-		NodeElement_List.push_back(ne);// add element to node element list because its a new object in graph
-	}// if(!use.empty()) else
-}
-
-// <TextureCoordinate
-// DEF=""      ID
-// USE=""      IDREF
-// point=""    MFVec3f [inputOutput]
-// />
-void X3DImporter::ParseNode_Texturing_TextureCoordinate()
-{
-    std::string use, def;
-    std::list<aiVector2D> point;
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_REF("point", point, XML_ReadNode_GetAttrVal_AsListVec2f);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_TextureCoordinate, ne);
-	}
-	else
-	{
-		// create and if needed - define new geometry object.
-		ne = new CX3DImporter_NodeElement_TextureCoordinate(NodeElement_Cur);
-		if(!def.empty()) ne->ID = def;
-
-		((CX3DImporter_NodeElement_TextureCoordinate*)ne)->Value = point;
-		// check for X3DMetadataObject childs.
-		if(!mReader->isEmptyElement())
-			ParseNode_Metadata(ne, "TextureCoordinate");
-		else
-			NodeElement_Cur->Child.push_back(ne);// add made object as child to current element
-
-		NodeElement_List.push_back(ne);// add element to node element list because its a new object in graph
-	}// if(!use.empty()) else
-}
-
-// <TextureTransform
-// DEF=""            ID
-// USE=""            IDREF
-// center="0 0"      SFVec2f [inputOutput]
-// rotation="0"      SFFloat [inputOutput]
-// scale="1 1"       SFVec2f [inputOutput]
-// translation="0 0" SFVec2f [inputOutput]
-// />
-void X3DImporter::ParseNode_Texturing_TextureTransform()
-{
-    std::string use, def;
-    aiVector2D center(0, 0);
-    float rotation = 0;
-    aiVector2D scale(1, 1);
-    aiVector2D translation(0, 0);
-    CX3DImporter_NodeElement* ne( nullptr );
-
-	MACRO_ATTRREAD_LOOPBEG;
-		MACRO_ATTRREAD_CHECKUSEDEF_RET(def, use);
-		MACRO_ATTRREAD_CHECK_REF("center", center, XML_ReadNode_GetAttrVal_AsVec2f);
-		MACRO_ATTRREAD_CHECK_RET("rotation", rotation, XML_ReadNode_GetAttrVal_AsFloat);
-		MACRO_ATTRREAD_CHECK_REF("scale", scale, XML_ReadNode_GetAttrVal_AsVec2f);
-		MACRO_ATTRREAD_CHECK_REF("translation", translation, XML_ReadNode_GetAttrVal_AsVec2f);
-	MACRO_ATTRREAD_LOOPEND;
-
-	// if "USE" defined then find already defined element.
-	if(!use.empty())
-	{
-		MACRO_USE_CHECKANDAPPLY(def, use, ENET_TextureTransform, ne);
-	}
-	else
-	{
-		// create and if needed - define new geometry object.
-		ne = new CX3DImporter_NodeElement_TextureTransform(NodeElement_Cur);
-		if(!def.empty()) ne->ID = def;
-
-		((CX3DImporter_NodeElement_TextureTransform*)ne)->Center = center;
-		((CX3DImporter_NodeElement_TextureTransform*)ne)->Rotation = rotation;
-		((CX3DImporter_NodeElement_TextureTransform*)ne)->Scale = scale;
-		((CX3DImporter_NodeElement_TextureTransform*)ne)->Translation = translation;
-		// check for X3DMetadataObject childs.
-		if(!mReader->isEmptyElement())
-			ParseNode_Metadata(ne, "TextureTransform");
-		else
-			NodeElement_Cur->Child.push_back(ne);// add made object as child to current element
-
-		NodeElement_List.push_back(ne);// add element to node element list because its a new object in graph
-	}// if(!use.empty()) else
-}
-
-}// namespace Assimp
-
-#endif // !ASSIMP_BUILD_NO_X3D_IMPORTER
diff --git a/code/AssetLib/X3D/X3DVocabulary.cpp b/code/AssetLib/X3D/X3DVocabulary.cpp
deleted file mode 100644
index b985a0d14..000000000
--- a/code/AssetLib/X3D/X3DVocabulary.cpp
+++ /dev/null
@@ -1,1676 +0,0 @@
-/*
-Open Asset Import Library (assimp)
-----------------------------------------------------------------------
-
-Copyright (c) 2006-2020, assimp team
-
-
-All rights reserved.
-
-Redistribution and use of this software in source and binary forms,
-with or without modification, are permitted provided that the
-following conditions are met:
-
-* Redistributions of source code must retain the above
-copyright notice, this list of conditions and the
-following disclaimer.
-
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the
-following disclaimer in the documentation and/or other
-materials provided with the distribution.
-
-* Neither the name of the assimp team, nor the names of its
-contributors may be used to endorse or promote products
-derived from this software without specific prior
-written permission of the assimp team.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-----------------------------------------------------------------------
-*/
-/// \file   X3DVocabulary.cpp
-/// \brief  Vocabulary for Fast Infoset encoded binary X3D files.
-/// \date   2017
-/// \author Patrick Daehne
-
-#ifndef ASSIMP_BUILD_NO_X3D_IMPORTER
-
-#include "FIReader.hpp"
-
-namespace Assimp {
-
-static const char *encodingAlgorithmTable_3_2[] = {
-    "encoder://web3d.org/QuantizedFloatArrayEncoder",
-    "encoder://web3d.org/DeltazlibIntArrayEncoder",
-    "encoder://web3d.org/QuantizedzlibFloatArrayEncoder",
-    "encoder://web3d.org/zlibFloatArrayEncoder",
-    "encoder://web3d.org/QuantizedDoubleArrayEncoder",
-    "encoder://web3d.org/zlibDoubleArrayEncoder",
-    "encoder://web3d.org/QuantizedzlibDoubleArrayEncoder",
-    "encoder://web3d.org/RangeIntArrayEncoder"
-};
-
-static const std::shared_ptr<const FIValue> attributeValueTable_3_2[] = {
-    FIStringValue::create("false"),
-    FIStringValue::create("true")
-};
-
-static const FIQName elementNameTable_3_2[] = {
-    { "Shape", nullptr, nullptr },
-    { "Appearance", nullptr, nullptr },
-    { "Material", nullptr, nullptr },
-    { "IndexedFaceSet", nullptr, nullptr },
-    { "ProtoInstance", nullptr, nullptr },
-    { "Transform", nullptr, nullptr },
-    { "ImageTexture", nullptr, nullptr },
-    { "TextureTransform", nullptr, nullptr },
-    { "Coordinate", nullptr, nullptr },
-    { "Normal", nullptr, nullptr },
-    { "Color", nullptr, nullptr },
-    { "ColorRGBA", nullptr, nullptr },
-    { "TextureCoordinate", nullptr, nullptr },
-    { "ROUTE", nullptr, nullptr },
-    { "fieldValue", nullptr, nullptr },
-    { "Group", nullptr, nullptr },
-    { "LOD", nullptr, nullptr },
-    { "Switch", nullptr, nullptr },
-    { "Script", nullptr, nullptr },
-    { "IndexedTriangleFanSet", nullptr, nullptr },
-    { "IndexedTriangleSet", nullptr, nullptr },
-    { "IndexedTriangleStripSet", nullptr, nullptr },
-    { "MultiTexture", nullptr, nullptr },
-    { "MultiTextureCoordinate", nullptr, nullptr },
-    { "MultiTextureTransform", nullptr, nullptr },
-    { "IndexedLineSet", nullptr, nullptr },
-    { "PointSet", nullptr, nullptr },
-    { "StaticGroup", nullptr, nullptr },
-    { "Sphere", nullptr, nullptr },
-    { "Box", nullptr, nullptr },
-    { "Cone", nullptr, nullptr },
-    { "Anchor", nullptr, nullptr },
-    { "Arc2D", nullptr, nullptr },
-    { "ArcClose2D", nullptr, nullptr },
-    { "AudioClip", nullptr, nullptr },
-    { "Background", nullptr, nullptr },
-    { "Billboard", nullptr, nullptr },
-    { "BooleanFilter", nullptr, nullptr },
-    { "BooleanSequencer", nullptr, nullptr },
-    { "BooleanToggle", nullptr, nullptr },
-    { "BooleanTrigger", nullptr, nullptr },
-    { "Circle2D", nullptr, nullptr },
-    { "Collision", nullptr, nullptr },
-    { "ColorInterpolator", nullptr, nullptr },
-    { "Contour2D", nullptr, nullptr },
-    { "ContourPolyline2D", nullptr, nullptr },
-    { "CoordinateDouble", nullptr, nullptr },
-    { "CoordinateInterpolator", nullptr, nullptr },
-    { "CoordinateInterpolator2D", nullptr, nullptr },
-    { "Cylinder", nullptr, nullptr },
-    { "CylinderSensor", nullptr, nullptr },
-    { "DirectionalLight", nullptr, nullptr },
-    { "Disk2D", nullptr, nullptr },
-    { "EXPORT", nullptr, nullptr },
-    { "ElevationGrid", nullptr, nullptr },
-    { "EspduTransform", nullptr, nullptr },
-    { "ExternProtoDeclare", nullptr, nullptr },
-    { "Extrusion", nullptr, nullptr },
-    { "FillProperties", nullptr, nullptr },
-    { "Fog", nullptr, nullptr },
-    { "FontStyle", nullptr, nullptr },
-    { "GeoCoordinate", nullptr, nullptr },
-    { "GeoElevationGrid", nullptr, nullptr },
-    { "GeoLOD", nullptr, nullptr },
-    { "GeoLocation", nullptr, nullptr },
-    { "GeoMetadata", nullptr, nullptr },
-    { "GeoOrigin", nullptr, nullptr },
-    { "GeoPositionInterpolator", nullptr, nullptr },
-    { "GeoTouchSensor", nullptr, nullptr },
-    { "GeoViewpoint", nullptr, nullptr },
-    { "HAnimDisplacer", nullptr, nullptr },
-    { "HAnimHumanoid", nullptr, nullptr },
-    { "HAnimJoint", nullptr, nullptr },
-    { "HAnimSegment", nullptr, nullptr },
-    { "HAnimSite", nullptr, nullptr },
-    { "IMPORT", nullptr, nullptr },
-    { "IS", nullptr, nullptr },
-    { "Inline", nullptr, nullptr },
-    { "IntegerSequencer", nullptr, nullptr },
-    { "IntegerTrigger", nullptr, nullptr },
-    { "KeySensor", nullptr, nullptr },
-    { "LineProperties", nullptr, nullptr },
-    { "LineSet", nullptr, nullptr },
-    { "LoadSensor", nullptr, nullptr },
-    { "MetadataDouble", nullptr, nullptr },
-    { "MetadataFloat", nullptr, nullptr },
-    { "MetadataInteger", nullptr, nullptr },
-    { "MetadataSet", nullptr, nullptr },
-    { "MetadataString", nullptr, nullptr },
-    { "MovieTexture", nullptr, nullptr },
-    { "NavigationInfo", nullptr, nullptr },
-    { "NormalInterpolator", nullptr, nullptr },
-    { "NurbsCurve", nullptr, nullptr },
-    { "NurbsCurve2D", nullptr, nullptr },
-    { "NurbsOrientationInterpolator", nullptr, nullptr },
-    { "NurbsPatchSurface", nullptr, nullptr },
-    { "NurbsPositionInterpolator", nullptr, nullptr },
-    { "NurbsSet", nullptr, nullptr },
-    { "NurbsSurfaceInterpolator", nullptr, nullptr },
-    { "NurbsSweptSurface", nullptr, nullptr },
-    { "NurbsSwungSurface", nullptr, nullptr },
-    { "NurbsTextureCoordinate", nullptr, nullptr },
-    { "NurbsTrimmedSurface", nullptr, nullptr },
-    { "OrientationInterpolator", nullptr, nullptr },
-    { "PixelTexture", nullptr, nullptr },
-    { "PlaneSensor", nullptr, nullptr },
-    { "PointLight", nullptr, nullptr },
-    { "Polyline2D", nullptr, nullptr },
-    { "Polypoint2D", nullptr, nullptr },
-    { "PositionInterpolator", nullptr, nullptr },
-    { "PositionInterpolator2D", nullptr, nullptr },
-    { "ProtoBody", nullptr, nullptr },
-    { "ProtoDeclare", nullptr, nullptr },
-    { "ProtoInterface", nullptr, nullptr },
-    { "ProximitySensor", nullptr, nullptr },
-    { "ReceiverPdu", nullptr, nullptr },
-    { "Rectangle2D", nullptr, nullptr },
-    { "ScalarInterpolator", nullptr, nullptr },
-    { "Scene", nullptr, nullptr },
-    { "SignalPdu", nullptr, nullptr },
-    { "Sound", nullptr, nullptr },
-    { "SphereSensor", nullptr, nullptr },
-    { "SpotLight", nullptr, nullptr },
-    { "StringSensor", nullptr, nullptr },
-    { "Text", nullptr, nullptr },
-    { "TextureBackground", nullptr, nullptr },
-    { "TextureCoordinateGenerator", nullptr, nullptr },
-    { "TimeSensor", nullptr, nullptr },
-    { "TimeTrigger", nullptr, nullptr },
-    { "TouchSensor", nullptr, nullptr },
-    { "TransmitterPdu", nullptr, nullptr },
-    { "TriangleFanSet", nullptr, nullptr },
-    { "TriangleSet", nullptr, nullptr },
-    { "TriangleSet2D", nullptr, nullptr },
-    { "TriangleStripSet", nullptr, nullptr },
-    { "Viewpoint", nullptr, nullptr },
-    { "VisibilitySensor", nullptr, nullptr },
-    { "WorldInfo", nullptr, nullptr },
-    { "X3D", nullptr, nullptr },
-    { "component", nullptr, nullptr },
-    { "connect", nullptr, nullptr },
-    { "field", nullptr, nullptr },
-    { "head", nullptr, nullptr },
-    { "humanoidBodyType", nullptr, nullptr },
-    { "meta", nullptr, nullptr },
-    { "CADAssembly", nullptr, nullptr },
-    { "CADFace", nullptr, nullptr },
-    { "CADLayer", nullptr, nullptr },
-    { "CADPart", nullptr, nullptr },
-    { "ComposedCubeMapTexture", nullptr, nullptr },
-    { "ComposedShader", nullptr, nullptr },
-    { "ComposedTexture3D", nullptr, nullptr },
-    { "FloatVertexAttribute", nullptr, nullptr },
-    { "FogCoordinate", nullptr, nullptr },
-    { "GeneratedCubeMapTexture", nullptr, nullptr },
-    { "ImageCubeMapTexture", nullptr, nullptr },
-    { "ImageTexture3D", nullptr, nullptr },
-    { "IndexedQuadSet", nullptr, nullptr },
-    { "LocalFog", nullptr, nullptr },
-    { "Matrix3VertexAttribute", nullptr, nullptr },
-    { "Matrix4VertexAttribute", nullptr, nullptr },
-    { "PackagedShader", nullptr, nullptr },
-    { "PixelTexture3D", nullptr, nullptr },
-    { "ProgramShader", nullptr, nullptr },
-    { "QuadSet", nullptr, nullptr },
-    { "ShaderPart", nullptr, nullptr },
-    { "ShaderProgram", nullptr, nullptr },
-    { "TextureCoordinate3D", nullptr, nullptr },
-    { "TextureCoordinate4D", nullptr, nullptr },
-    { "TextureTransform3D", nullptr, nullptr },
-    { "TextureTransformMatrix3D", nullptr, nullptr },
-    { "BallJoint", nullptr, nullptr },
-    { "BoundedPhysicsModel", nullptr, nullptr },
-    { "ClipPlane", nullptr, nullptr },
-    { "CollidableOffset", nullptr, nullptr },
-    { "CollidableShape", nullptr, nullptr },
-    { "CollisionCollection", nullptr, nullptr },
-    { "CollisionSensor", nullptr, nullptr },
-    { "CollisionSpace", nullptr, nullptr },
-    { "ColorDamper", nullptr, nullptr },
-    { "ConeEmitter", nullptr, nullptr },
-    { "Contact", nullptr, nullptr },
-    { "CoordinateDamper", nullptr, nullptr },
-    { "DISEntityManager", nullptr, nullptr },
-    { "DISEntityTypeMapping", nullptr, nullptr },
-    { "DoubleAxisHingeJoint", nullptr, nullptr },
-    { "EaseInEaseOut", nullptr, nullptr },
-    { "ExplosionEmitter", nullptr, nullptr },
-    { "ForcePhysicsModel", nullptr, nullptr },
-    { "GeoProximitySensor", nullptr, nullptr },
-    { "GeoTransform", nullptr, nullptr },
-    { "Layer", nullptr, nullptr },
-    { "LayerSet", nullptr, nullptr },
-    { "Layout", nullptr, nullptr },
-    { "LayoutGroup", nullptr, nullptr },
-    { "LayoutLayer", nullptr, nullptr },
-    { "LinePickSensor", nullptr, nullptr },
-    { "MotorJoint", nullptr, nullptr },
-    { "OrientationChaser", nullptr, nullptr },
-    { "OrientationDamper", nullptr, nullptr },
-    { "OrthoViewpoint", nullptr, nullptr },
-    { "ParticleSystem", nullptr, nullptr },
-    { "PickableGroup", nullptr, nullptr },
-    { "PointEmitter", nullptr, nullptr },
-    { "PointPickSensor", nullptr, nullptr },
-    { "PolylineEmitter", nullptr, nullptr },
-    { "PositionChaser", nullptr, nullptr },
-    { "PositionChaser2D", nullptr, nullptr },
-    { "PositionDamper", nullptr, nullptr },
-    { "PositionDamper2D", nullptr, nullptr },
-    { "PrimitivePickSensor", nullptr, nullptr },
-    { "RigidBody", nullptr, nullptr },
-    { "RigidBodyCollection", nullptr, nullptr },
-    { "ScalarChaser", nullptr, nullptr },
-    { "ScreenFontStyle", nullptr, nullptr },
-    { "ScreenGroup", nullptr, nullptr },
-    { "SingleAxisHingeJoint", nullptr, nullptr },
-    { "SliderJoint", nullptr, nullptr },
-    { "SplinePositionInterpolator", nullptr, nullptr },
-    { "SplinePositionInterpolator2D", nullptr, nullptr },
-    { "SplineScalarInterpolator", nullptr, nullptr },
-    { "SquadOrientationInterpolator", nullptr, nullptr },
-    { "SurfaceEmitter", nullptr, nullptr },
-    { "TexCoordDamper", nullptr, nullptr },
-    { "TextureProperties", nullptr, nullptr },
-    { "TransformSensor", nullptr, nullptr },
-    { "TwoSidedMaterial", nullptr, nullptr },
-    { "UniversalJoint", nullptr, nullptr },
-    { "ViewpointGroup", nullptr, nullptr },
-    { "Viewport", nullptr, nullptr },
-    { "VolumeEmitter", nullptr, nullptr },
-    { "VolumePickSensor", nullptr, nullptr },
-    { "WindPhysicsModel", nullptr, nullptr }
-};
-
-static const FIQName attributeNameTable_3_2[] = {
-    { "DEF", nullptr, nullptr },
-    { "USE", nullptr, nullptr },
-    { "containerField", nullptr, nullptr },
-    { "fromNode", nullptr, nullptr },
-    { "fromField", nullptr, nullptr },
-    { "toNode", nullptr, nullptr },
-    { "toField", nullptr, nullptr },
-    { "name", nullptr, nullptr },
-    { "value", nullptr, nullptr },
-    { "color", nullptr, nullptr },
-    { "colorIndex", nullptr, nullptr },
-    { "coordIndex", nullptr, nullptr },
-    { "texCoordIndex", nullptr, nullptr },
-    { "normalIndex", nullptr, nullptr },
-    { "colorPerVertex", nullptr, nullptr },
-    { "normalPerVertex", nullptr, nullptr },
-    { "rotation", nullptr, nullptr },
-    { "scale", nullptr, nullptr },
-    { "center", nullptr, nullptr },
-    { "scaleOrientation", nullptr, nullptr },
-    { "translation", nullptr, nullptr },
-    { "url", nullptr, nullptr },
-    { "repeatS", nullptr, nullptr },
-    { "repeatT", nullptr, nullptr },
-    { "point", nullptr, nullptr },
-    { "vector", nullptr, nullptr },
-    { "range", nullptr, nullptr },
-    { "ambientIntensity", nullptr, nullptr },
-    { "diffuseColor", nullptr, nullptr },
-    { "emissiveColor", nullptr, nullptr },
-    { "shininess", nullptr, nullptr },
-    { "specularColor", nullptr, nullptr },
-    { "transparency", nullptr, nullptr },
-    { "whichChoice", nullptr, nullptr },
-    { "index", nullptr, nullptr },
-    { "mode", nullptr, nullptr },
-    { "source", nullptr, nullptr },
-    { "function", nullptr, nullptr },
-    { "alpha", nullptr, nullptr },
-    { "vertexCount", nullptr, nullptr },
-    { "radius", nullptr, nullptr },
-    { "size", nullptr, nullptr },
-    { "height", nullptr, nullptr },
-    { "solid", nullptr, nullptr },
-    { "ccw", nullptr, nullptr },
-    { "key", nullptr, nullptr },
-    { "keyValue", nullptr, nullptr },
-    { "enabled", nullptr, nullptr },
-    { "direction", nullptr, nullptr },
-    { "position", nullptr, nullptr },
-    { "orientation", nullptr, nullptr },
-    { "bboxCenter", nullptr, nullptr },
-    { "bboxSize", nullptr, nullptr },
-    { "AS", nullptr, nullptr },
-    { "InlineDEF", nullptr, nullptr },
-    { "accessType", nullptr, nullptr },
-    { "actionKeyPress", nullptr, nullptr },
-    { "actionKeyRelease", nullptr, nullptr },
-    { "address", nullptr, nullptr },
-    { "altKey", nullptr, nullptr },
-    { "antennaLocation", nullptr, nullptr },
-    { "antennaPatternLength", nullptr, nullptr },
-    { "antennaPatternType", nullptr, nullptr },
-    { "applicationID", nullptr, nullptr },
-    { "articulationParameterArray", nullptr, nullptr },
-    { "articulationParameterChangeIndicatorArray", nullptr, nullptr },
-    { "articulationParameterCount", nullptr, nullptr },
-    { "articulationParameterDesignatorArray", nullptr, nullptr },
-    { "articulationParameterIdPartAttachedArray", nullptr, nullptr },
-    { "articulationParameterTypeArray", nullptr, nullptr },
-    { "attenuation", nullptr, nullptr },
-    { "autoOffset", nullptr, nullptr },
-    { "avatarSize", nullptr, nullptr },
-    { "axisOfRotation", nullptr, nullptr },
-    { "backUrl", nullptr, nullptr },
-    { "beamWidth", nullptr, nullptr },
-    { "beginCap", nullptr, nullptr },
-    { "bindTime", nullptr, nullptr },
-    { "bottom", nullptr, nullptr },
-    { "bottomRadius", nullptr, nullptr },
-    { "bottomUrl", nullptr, nullptr },
-    { "centerOfMass", nullptr, nullptr },
-    { "centerOfRotation", nullptr, nullptr },
-    { "child1Url", nullptr, nullptr },
-    { "child2Url", nullptr, nullptr },
-    { "child3Url", nullptr, nullptr },
-    { "child4Url", nullptr, nullptr },
-    { "class", nullptr, nullptr },
-    { "closureType", nullptr, nullptr },
-    { "collideTime", nullptr, nullptr },
-    { "content", nullptr, nullptr },
-    { "controlKey", nullptr, nullptr },
-    { "controlPoint", nullptr, nullptr },
-    { "convex", nullptr, nullptr },
-    { "coordinateSystem", nullptr, nullptr },
-    { "copyright", nullptr, nullptr },
-    { "creaseAngle", nullptr, nullptr },
-    { "crossSection", nullptr, nullptr },
-    { "cryptoKeyID", nullptr, nullptr },
-    { "cryptoSystem", nullptr, nullptr },
-    { "cutOffAngle", nullptr, nullptr },
-    { "cycleInterval", nullptr, nullptr },
-    { "cycleTime", nullptr, nullptr },
-    { "data", nullptr, nullptr },
-    { "dataFormat", nullptr, nullptr },
-    { "dataLength", nullptr, nullptr },
-    { "dataUrl", nullptr, nullptr },
-    { "date", nullptr, nullptr },
-    { "deadReckoning", nullptr, nullptr },
-    { "deletionAllowed", nullptr, nullptr },
-    { "description", nullptr, nullptr },
-    { "detonateTime", nullptr, nullptr },
-    { "dir", nullptr, nullptr },
-    { "directOutput", nullptr, nullptr },
-    { "diskAngle", nullptr, nullptr },
-    { "displacements", nullptr, nullptr },
-    { "documentation", nullptr, nullptr },
-    { "elapsedTime", nullptr, nullptr },
-    { "ellipsoid", nullptr, nullptr },
-    { "encodingScheme", nullptr, nullptr },
-    { "endAngle", nullptr, nullptr },
-    { "endCap", nullptr, nullptr },
-    { "enterTime", nullptr, nullptr },
-    { "enteredText", nullptr, nullptr },
-    { "entityCategory", nullptr, nullptr },
-    { "entityCountry", nullptr, nullptr },
-    { "entityDomain", nullptr, nullptr },
-    { "entityExtra", nullptr, nullptr },
-    { "entityID", nullptr, nullptr },
-    { "entityKind", nullptr, nullptr },
-    { "entitySpecific", nullptr, nullptr },
-    { "entitySubCategory", nullptr, nullptr },
-    { "exitTime", nullptr, nullptr },
-    { "extent", nullptr, nullptr },
-    { "family", nullptr, nullptr },
-    { "fanCount", nullptr, nullptr },
-    { "fieldOfView", nullptr, nullptr },
-    { "filled", nullptr, nullptr },
-    { "finalText", nullptr, nullptr },
-    { "fireMissionIndex", nullptr, nullptr },
-    { "fired1", nullptr, nullptr },
-    { "fired2", nullptr, nullptr },
-    { "firedTime", nullptr, nullptr },
-    { "firingRange", nullptr, nullptr },
-    { "firingRate", nullptr, nullptr },
-    { "fogType", nullptr, nullptr },
-    { "forceID", nullptr, nullptr },
-    { "frequency", nullptr, nullptr },
-    { "frontUrl", nullptr, nullptr },
-    { "fuse", nullptr, nullptr },
-    { "geoCoords", nullptr, nullptr },
-    { "geoGridOrigin", nullptr, nullptr },
-    { "geoSystem", nullptr, nullptr },
-    { "groundAngle", nullptr, nullptr },
-    { "groundColor", nullptr, nullptr },
-    { "hatchColor", nullptr, nullptr },
-    { "hatchStyle", nullptr, nullptr },
-    { "hatched", nullptr, nullptr },
-    { "headlight", nullptr, nullptr },
-    { "horizontal", nullptr, nullptr },
-    { "horizontalDatum", nullptr, nullptr },
-    { "http-equiv", nullptr, nullptr },
-    { "image", nullptr, nullptr },
-    { "importedDEF", nullptr, nullptr },
-    { "info", nullptr, nullptr },
-    { "innerRadius", nullptr, nullptr },
-    { "inputFalse", nullptr, nullptr },
-    { "inputNegate", nullptr, nullptr },
-    { "inputSource", nullptr, nullptr },
-    { "inputTrue", nullptr, nullptr },
-    { "integerKey", nullptr, nullptr },
-    { "intensity", nullptr, nullptr },
-    { "jump", nullptr, nullptr },
-    { "justify", nullptr, nullptr },
-    { "keyPress", nullptr, nullptr },
-    { "keyRelease", nullptr, nullptr },
-    { "knot", nullptr, nullptr },
-    { "lang", nullptr, nullptr },
-    { "language", nullptr, nullptr },
-    { "leftToRight", nullptr, nullptr },
-    { "leftUrl", nullptr, nullptr },
-    { "length", nullptr, nullptr },
-    { "lengthOfModulationParameters", nullptr, nullptr },
-    { "level", nullptr, nullptr },
-    { "limitOrientation", nullptr, nullptr },
-    { "lineSegments", nullptr, nullptr },
-    { "linearAcceleration", nullptr, nullptr },
-    { "linearVelocity", nullptr, nullptr },
-    { "linetype", nullptr, nullptr },
-    { "linewidthScaleFactor", nullptr, nullptr },
-    { "llimit", nullptr, nullptr },
-    { "load", nullptr, nullptr },
-    { "loadTime", nullptr, nullptr },
-    { "localDEF", nullptr, nullptr },
-    { "location", nullptr, nullptr },
-    { "loop", nullptr, nullptr },
-    { "marking", nullptr, nullptr },
-    { "mass", nullptr, nullptr },
-    { "maxAngle", nullptr, nullptr },
-    { "maxBack", nullptr, nullptr },
-    { "maxExtent", nullptr, nullptr },
-    { "maxFront", nullptr, nullptr },
-    { "maxPosition", nullptr, nullptr },
-    { "metadataFormat", nullptr, nullptr },
-    { "minAngle", nullptr, nullptr },
-    { "minBack", nullptr, nullptr },
-    { "minFront", nullptr, nullptr },
-    { "minPosition", nullptr, nullptr },
-    { "modulationTypeDetail", nullptr, nullptr },
-    { "modulationTypeMajor", nullptr, nullptr },
-    { "modulationTypeSpreadSpectrum", nullptr, nullptr },
-    { "modulationTypeSystem", nullptr, nullptr },
-    { "momentsOfInertia", nullptr, nullptr },
-    { "multicastRelayHost", nullptr, nullptr },
-    { "multicastRelayPort", nullptr, nullptr },
-    { "munitionApplicationID", nullptr, nullptr },
-    { "munitionEndPoint", nullptr, nullptr },
-    { "munitionEntityID", nullptr, nullptr },
-    { "munitionQuantity", nullptr, nullptr },
-    { "munitionSiteID", nullptr, nullptr },
-    { "munitionStartPoint", nullptr, nullptr },
-    { "mustEvaluate", nullptr, nullptr },
-    { "navType", nullptr, nullptr },
-    { "networkMode", nullptr, nullptr },
-    { "next", nullptr, nullptr },
-    { "nodeField", nullptr, nullptr },
-    { "offset", nullptr, nullptr },
-    { "on", nullptr, nullptr },
-    { "order", nullptr, nullptr },
-    { "originator", nullptr, nullptr },
-    { "outerRadius", nullptr, nullptr },
-    { "parameter", nullptr, nullptr },
-    { "pauseTime", nullptr, nullptr },
-    { "pitch", nullptr, nullptr },
-    { "points", nullptr, nullptr },
-    { "port", nullptr, nullptr },
-    { "power", nullptr, nullptr },
-    { "previous", nullptr, nullptr },
-    { "priority", nullptr, nullptr },
-    { "profile", nullptr, nullptr },
-    { "progress", nullptr, nullptr },
-    { "protoField", nullptr, nullptr },
-    { "radioEntityTypeCategory", nullptr, nullptr },
-    { "radioEntityTypeCountry", nullptr, nullptr },
-    { "radioEntityTypeDomain", nullptr, nullptr },
-    { "radioEntityTypeKind", nullptr, nullptr },
-    { "radioEntityTypeNomenclature", nullptr, nullptr },
-    { "radioEntityTypeNomenclatureVersion", nullptr, nullptr },
-    { "radioID", nullptr, nullptr },
-    { "readInterval", nullptr, nullptr },
-    { "receivedPower", nullptr, nullptr },
-    { "receiverState", nullptr, nullptr },
-    { "reference", nullptr, nullptr },
-    { "relativeAntennaLocation", nullptr, nullptr },
-    { "resolution", nullptr, nullptr },
-    { "resumeTime", nullptr, nullptr },
-    { "rightUrl", nullptr, nullptr },
-    { "rootUrl", nullptr, nullptr },
-    { "rotateYUp", nullptr, nullptr },
-    { "rtpHeaderExpected", nullptr, nullptr },
-    { "sampleRate", nullptr, nullptr },
-    { "samples", nullptr, nullptr },
-    { "shiftKey", nullptr, nullptr },
-    { "side", nullptr, nullptr },
-    { "siteID", nullptr, nullptr },
-    { "skinCoordIndex", nullptr, nullptr },
-    { "skinCoordWeight", nullptr, nullptr },
-    { "skyAngle", nullptr, nullptr },
-    { "skyColor", nullptr, nullptr },
-    { "spacing", nullptr, nullptr },
-    { "spatialize", nullptr, nullptr },
-    { "speed", nullptr, nullptr },
-    { "speedFactor", nullptr, nullptr },
-    { "spine", nullptr, nullptr },
-    { "startAngle", nullptr, nullptr },
-    { "startTime", nullptr, nullptr },
-    { "stiffness", nullptr, nullptr },
-    { "stopTime", nullptr, nullptr },
-    { "string", nullptr, nullptr },
-    { "stripCount", nullptr, nullptr },
-    { "style", nullptr, nullptr },
-    { "summary", nullptr, nullptr },
-    { "tdlType", nullptr, nullptr },
-    { "tessellation", nullptr, nullptr },
-    { "tessellationScale", nullptr, nullptr },
-    { "time", nullptr, nullptr },
-    { "timeOut", nullptr, nullptr },
-    { "timestamp", nullptr, nullptr },
-    { "title", nullptr, nullptr },
-    { "toggle", nullptr, nullptr },
-    { "top", nullptr, nullptr },
-    { "topToBottom", nullptr, nullptr },
-    { "topUrl", nullptr, nullptr },
-    { "touchTime", nullptr, nullptr },
-    { "transmitFrequencyBandwidth", nullptr, nullptr },
-    { "transmitState", nullptr, nullptr },
-    { "transmitterApplicationID", nullptr, nullptr },
-    { "transmitterEntityID", nullptr, nullptr },
-    { "transmitterRadioID", nullptr, nullptr },
-    { "transmitterSiteID", nullptr, nullptr },
-    { "transparent", nullptr, nullptr },
-    { "triggerTime", nullptr, nullptr },
-    { "triggerTrue", nullptr, nullptr },
-    { "triggerValue", nullptr, nullptr },
-    { "type", nullptr, nullptr },
-    { "uDimension", nullptr, nullptr },
-    { "uKnot", nullptr, nullptr },
-    { "uOrder", nullptr, nullptr },
-    { "uTessellation", nullptr, nullptr },
-    { "ulimit", nullptr, nullptr },
-    { "vDimension", nullptr, nullptr },
-    { "vKnot", nullptr, nullptr },
-    { "vOrder", nullptr, nullptr },
-    { "vTessellation", nullptr, nullptr },
-    { "version", nullptr, nullptr },
-    { "verticalDatum", nullptr, nullptr },
-    { "vertices", nullptr, nullptr },
-    { "visibilityLimit", nullptr, nullptr },
-    { "visibilityRange", nullptr, nullptr },
-    { "warhead", nullptr, nullptr },
-    { "weight", nullptr, nullptr },
-    { "whichGeometry", nullptr, nullptr },
-    { "writeInterval", nullptr, nullptr },
-    { "xDimension", nullptr, nullptr },
-    { "xSpacing", nullptr, nullptr },
-    { "yScale", nullptr, nullptr },
-    { "zDimension", nullptr, nullptr },
-    { "zSpacing", nullptr, nullptr },
-    { "visible", nullptr, nullptr },
-    { "repeatR", nullptr, nullptr },
-    { "texture", nullptr, nullptr },
-    { "back", nullptr, nullptr },
-    { "front", nullptr, nullptr },
-    { "left", nullptr, nullptr },
-    { "right", nullptr, nullptr },
-    { "parts", nullptr, nullptr },
-    { "isSelected", nullptr, nullptr },
-    { "isValid", nullptr, nullptr },
-    { "numComponents", nullptr, nullptr },
-    { "depth", nullptr, nullptr },
-    { "update", nullptr, nullptr },
-    { "fogCoord", nullptr, nullptr },
-    { "texCoord", nullptr, nullptr },
-    { "activate", nullptr, nullptr },
-    { "programs", nullptr, nullptr },
-    { "matrix", nullptr, nullptr },
-    { "anchorPoint", nullptr, nullptr },
-    { "body1", nullptr, nullptr },
-    { "body2", nullptr, nullptr },
-    { "mustOutput", nullptr, nullptr },
-    { "body1AnchorPoint", nullptr, nullptr },
-    { "body2AnchorPoint", nullptr, nullptr },
-    { "plane", nullptr, nullptr },
-    { "appliedParameters", nullptr, nullptr },
-    { "bounce", nullptr, nullptr },
-    { "frictionCoefficients", nullptr, nullptr },
-    { "minBounceSpeed", nullptr, nullptr },
-    { "slipFactors", nullptr, nullptr },
-    { "softnessConstantForceMix", nullptr, nullptr },
-    { "softnessErrorCorrection", nullptr, nullptr },
-    { "surfaceSpeed", nullptr, nullptr },
-    { "isActive", nullptr, nullptr },
-    { "useGeometry", nullptr, nullptr },
-    { "set_destination", nullptr, nullptr },
-    { "set_value", nullptr, nullptr },
-    { "tau", nullptr, nullptr },
-    { "tolerance", nullptr, nullptr },
-    { "value_changed", nullptr, nullptr },
-    { "initialDestination", nullptr, nullptr },
-    { "initialValue", nullptr, nullptr },
-    { "angle", nullptr, nullptr },
-    { "variation", nullptr, nullptr },
-    { "surfaceArea", nullptr, nullptr },
-    { "frictionDirection", nullptr, nullptr },
-    { "slipCoefficients", nullptr, nullptr },
-    { "category", nullptr, nullptr },
-    { "country", nullptr, nullptr },
-    { "domain", nullptr, nullptr },
-    { "extra", nullptr, nullptr },
-    { "kind", nullptr, nullptr },
-    { "specific", nullptr, nullptr },
-    { "subcategory", nullptr, nullptr },
-    { "axis1", nullptr, nullptr },
-    { "axis2", nullptr, nullptr },
-    { "desiredAngularVelocity1", nullptr, nullptr },
-    { "desiredAngularVelocity2", nullptr, nullptr },
-    { "maxAngle1", nullptr, nullptr },
-    { "maxTorque1", nullptr, nullptr },
-    { "maxTorque2", nullptr, nullptr },
-    { "minAngle1", nullptr, nullptr },
-    { "stopBounce1", nullptr, nullptr },
-    { "stopConstantForceMix1", nullptr, nullptr },
-    { "stopErrorCorrection1", nullptr, nullptr },
-    { "suspensionErrorCorrection", nullptr, nullptr },
-    { "suspensionForce", nullptr, nullptr },
-    { "body1Axis", nullptr, nullptr },
-    { "body2Axis", nullptr, nullptr },
-    { "hinge1Angle", nullptr, nullptr },
-    { "hinge1AngleRate", nullptr, nullptr },
-    { "hinge2Angle", nullptr, nullptr },
-    { "hinge2AngleRate", nullptr, nullptr },
-    { "set_fraction", nullptr, nullptr },
-    { "easeInEaseOut", nullptr, nullptr },
-    { "modifiedFraction_changed", nullptr, nullptr },
-    { "force", nullptr, nullptr },
-    { "geoCenter", nullptr, nullptr },
-    { "centerOfRotation_changed", nullptr, nullptr },
-    { "geoCoord_changed", nullptr, nullptr },
-    { "orientation_changed", nullptr, nullptr },
-    { "position_changed", nullptr, nullptr },
-    { "isPickable", nullptr, nullptr },
-    { "viewport", nullptr, nullptr },
-    { "activeLayer", nullptr, nullptr },
-    { "align", nullptr, nullptr },
-    { "offsetUnits", nullptr, nullptr },
-    { "scaleMode", nullptr, nullptr },
-    { "sizeUnits", nullptr, nullptr },
-    { "layout", nullptr, nullptr },
-    { "objectType", nullptr, nullptr },
-    { "pickedNormal", nullptr, nullptr },
-    { "pickedPoint", nullptr, nullptr },
-    { "pickedTextureCoordinate", nullptr, nullptr },
-    { "intersectionType", nullptr, nullptr },
-    { "sortOrder", nullptr, nullptr },
-    { "axis1Angle", nullptr, nullptr },
-    { "axis1Torque", nullptr, nullptr },
-    { "axis2Angle", nullptr, nullptr },
-    { "axis2Torque", nullptr, nullptr },
-    { "axis3Angle", nullptr, nullptr },
-    { "axis3Torque", nullptr, nullptr },
-    { "enabledAxies", nullptr, nullptr },
-    { "motor1Axis", nullptr, nullptr },
-    { "motor2Axis", nullptr, nullptr },
-    { "motor3Axis", nullptr, nullptr },
-    { "stop1Bounce", nullptr, nullptr },
-    { "stop1ErrorCorrection", nullptr, nullptr },
-    { "stop2Bounce", nullptr, nullptr },
-    { "stop2ErrorCorrection", nullptr, nullptr },
-    { "stop3Bounce", nullptr, nullptr },
-    { "stop3ErrorCorrection", nullptr, nullptr },
-    { "motor1Angle", nullptr, nullptr },
-    { "motor1AngleRate", nullptr, nullptr },
-    { "motor2Angle", nullptr, nullptr },
-    { "motor2AngleRate", nullptr, nullptr },
-    { "motor3Angle", nullptr, nullptr },
-    { "motor3AngleRate", nullptr, nullptr },
-    { "autoCalc", nullptr, nullptr },
-    { "duration", nullptr, nullptr },
-    { "retainUserOffsets", nullptr, nullptr },
-    { "isBound", nullptr, nullptr },
-    { "appearance", nullptr, nullptr },
-    { "createParticles", nullptr, nullptr },
-    { "lifetimeVariation", nullptr, nullptr },
-    { "maxParticles", nullptr, nullptr },
-    { "particleLifetime", nullptr, nullptr },
-    { "particleSize", nullptr, nullptr },
-    { "colorKey", nullptr, nullptr },
-    { "geometryType", nullptr, nullptr },
-    { "texCoordKey", nullptr, nullptr },
-    { "pickable", nullptr, nullptr },
-    { "angularDampingFactor", nullptr, nullptr },
-    { "angularVelocity", nullptr, nullptr },
-    { "autoDamp", nullptr, nullptr },
-    { "autoDisable", nullptr, nullptr },
-    { "disableAngularSpeed", nullptr, nullptr },
-    { "disableLinearSpeed", nullptr, nullptr },
-    { "disableTime", nullptr, nullptr },
-    { "finiteRotationAxis", nullptr, nullptr },
-    { "fixed", nullptr, nullptr },
-    { "forces", nullptr, nullptr },
-    { "inertia", nullptr, nullptr },
-    { "linearDampingFactor", nullptr, nullptr },
-    { "torques", nullptr, nullptr },
-    { "useFiniteRotation", nullptr, nullptr },
-    { "useGlobalForce", nullptr, nullptr },
-    { "constantForceMix", nullptr, nullptr },
-    { "constantSurfaceThickness", nullptr, nullptr },
-    { "errorCorrection", nullptr, nullptr },
-    { "iterations", nullptr, nullptr },
-    { "maxCorrectionSpeed", nullptr, nullptr },
-    { "preferAccuracy", nullptr, nullptr },
-    { "pointSize", nullptr, nullptr },
-    { "stopBounce", nullptr, nullptr },
-    { "stopErrorCorrection", nullptr, nullptr },
-    { "angleRate", nullptr, nullptr },
-    { "maxSeparation", nullptr, nullptr },
-    { "minSeparation", nullptr, nullptr },
-    { "separation", nullptr, nullptr },
-    { "separationRate", nullptr, nullptr },
-    { "closed", nullptr, nullptr },
-    { "keyVelocity", nullptr, nullptr },
-    { "normalizeVelocity", nullptr, nullptr },
-    { "surface", nullptr, nullptr },
-    { "anisotropicDegree", nullptr, nullptr },
-    { "borderColor", nullptr, nullptr },
-    { "borderWidth", nullptr, nullptr },
-    { "boundaryModeS", nullptr, nullptr },
-    { "boundaryModeT", nullptr, nullptr },
-    { "boundaryModeR", nullptr, nullptr },
-    { "magnificationFilter", nullptr, nullptr },
-    { "minificationFilter", nullptr, nullptr },
-    { "textureCompression", nullptr, nullptr },
-    { "texturePriority", nullptr, nullptr },
-    { "generateMipMaps", nullptr, nullptr },
-    { "targetObject", nullptr, nullptr },
-    { "backAmbientIntensity", nullptr, nullptr },
-    { "backDiffuseColor", nullptr, nullptr },
-    { "backEmissiveColor", nullptr, nullptr },
-    { "backShininess", nullptr, nullptr },
-    { "backSpecularColor", nullptr, nullptr },
-    { "separateBackColor", nullptr, nullptr },
-    { "displayed", nullptr, nullptr },
-    { "clipBoundary", nullptr, nullptr },
-    { "internal", nullptr, nullptr },
-    { "gustiness", nullptr, nullptr },
-    { "turbulence", nullptr, nullptr }
-};
-
-FIVocabulary X3D_vocabulary_3_2 = {
-    nullptr, 0,
-    encodingAlgorithmTable_3_2, 8,
-    nullptr, 0,
-    nullptr, 0,
-    nullptr, 0,
-    nullptr, 0,
-    nullptr, 0,
-    attributeValueTable_3_2, 2,
-    nullptr, 0,
-    nullptr, 0,
-    elementNameTable_3_2, 233,
-    attributeNameTable_3_2, 516
-};
-
-static const char *encodingAlgorithmTable_3_3[] = {
-    "encoder://web3d.org/QuantizedFloatArrayEncoder",
-    "encoder://web3d.org/DeltazlibIntArrayEncoder",
-    "encoder://web3d.org/QuantizedzlibFloatArrayEncoder",
-    "encoder://web3d.org/zlibFloatArrayEncoder",
-    "encoder://web3d.org/QuantizedDoubleArrayEncoder",
-    "encoder://web3d.org/zlibDoubleArrayEncoder",
-    "encoder://web3d.org/QuantizedzlibDoubleArrayEncoder",
-    "encoder://web3d.org/RangeIntArrayEncoder"
-};
-
-static const std::shared_ptr<const FIValue> attributeValueTable_3_3[] = {
-    FIStringValue::create("false"),
-    FIStringValue::create("true")
-};
-
-static const FIQName elementNameTable_3_3[] = {
-    { "Shape", nullptr, nullptr },
-    { "Appearance", nullptr, nullptr },
-    { "Material", nullptr, nullptr },
-    { "IndexedFaceSet", nullptr, nullptr },
-    { "ProtoInstance", nullptr, nullptr },
-    { "Transform", nullptr, nullptr },
-    { "ImageTexture", nullptr, nullptr },
-    { "TextureTransform", nullptr, nullptr },
-    { "Coordinate", nullptr, nullptr },
-    { "Normal", nullptr, nullptr },
-    { "Color", nullptr, nullptr },
-    { "ColorRGBA", nullptr, nullptr },
-    { "TextureCoordinate", nullptr, nullptr },
-    { "ROUTE", nullptr, nullptr },
-    { "fieldValue", nullptr, nullptr },
-    { "Group", nullptr, nullptr },
-    { "LOD", nullptr, nullptr },
-    { "Switch", nullptr, nullptr },
-    { "Script", nullptr, nullptr },
-    { "IndexedTriangleFanSet", nullptr, nullptr },
-    { "IndexedTriangleSet", nullptr, nullptr },
-    { "IndexedTriangleStripSet", nullptr, nullptr },
-    { "MultiTexture", nullptr, nullptr },
-    { "MultiTextureCoordinate", nullptr, nullptr },
-    { "MultiTextureTransform", nullptr, nullptr },
-    { "IndexedLineSet", nullptr, nullptr },
-    { "PointSet", nullptr, nullptr },
-    { "StaticGroup", nullptr, nullptr },
-    { "Sphere", nullptr, nullptr },
-    { "Box", nullptr, nullptr },
-    { "Cone", nullptr, nullptr },
-    { "Anchor", nullptr, nullptr },
-    { "Arc2D", nullptr, nullptr },
-    { "ArcClose2D", nullptr, nullptr },
-    { "AudioClip", nullptr, nullptr },
-    { "Background", nullptr, nullptr },
-    { "Billboard", nullptr, nullptr },
-    { "BooleanFilter", nullptr, nullptr },
-    { "BooleanSequencer", nullptr, nullptr },
-    { "BooleanToggle", nullptr, nullptr },
-    { "BooleanTrigger", nullptr, nullptr },
-    { "Circle2D", nullptr, nullptr },
-    { "Collision", nullptr, nullptr },
-    { "ColorInterpolator", nullptr, nullptr },
-    { "Contour2D", nullptr, nullptr },
-    { "ContourPolyline2D", nullptr, nullptr },
-    { "CoordinateDouble", nullptr, nullptr },
-    { "CoordinateInterpolator", nullptr, nullptr },
-    { "CoordinateInterpolator2D", nullptr, nullptr },
-    { "Cylinder", nullptr, nullptr },
-    { "CylinderSensor", nullptr, nullptr },
-    { "DirectionalLight", nullptr, nullptr },
-    { "Disk2D", nullptr, nullptr },
-    { "EXPORT", nullptr, nullptr },
-    { "ElevationGrid", nullptr, nullptr },
-    { "EspduTransform", nullptr, nullptr },
-    { "ExternProtoDeclare", nullptr, nullptr },
-    { "Extrusion", nullptr, nullptr },
-    { "FillProperties", nullptr, nullptr },
-    { "Fog", nullptr, nullptr },
-    { "FontStyle", nullptr, nullptr },
-    { "GeoCoordinate", nullptr, nullptr },
-    { "GeoElevationGrid", nullptr, nullptr },
-    { "GeoLOD", nullptr, nullptr },
-    { "GeoLocation", nullptr, nullptr },
-    { "GeoMetadata", nullptr, nullptr },
-    { "GeoOrigin", nullptr, nullptr },
-    { "GeoPositionInterpolator", nullptr, nullptr },
-    { "GeoTouchSensor", nullptr, nullptr },
-    { "GeoViewpoint", nullptr, nullptr },
-    { "HAnimDisplacer", nullptr, nullptr },
-    { "HAnimHumanoid", nullptr, nullptr },
-    { "HAnimJoint", nullptr, nullptr },
-    { "HAnimSegment", nullptr, nullptr },
-    { "HAnimSite", nullptr, nullptr },
-    { "IMPORT", nullptr, nullptr },
-    { "IS", nullptr, nullptr },
-    { "Inline", nullptr, nullptr },
-    { "IntegerSequencer", nullptr, nullptr },
-    { "IntegerTrigger", nullptr, nullptr },
-    { "KeySensor", nullptr, nullptr },
-    { "LineProperties", nullptr, nullptr },
-    { "LineSet", nullptr, nullptr },
-    { "LoadSensor", nullptr, nullptr },
-    { "MetadataDouble", nullptr, nullptr },
-    { "MetadataFloat", nullptr, nullptr },
-    { "MetadataInteger", nullptr, nullptr },
-    { "MetadataSet", nullptr, nullptr },
-    { "MetadataString", nullptr, nullptr },
-    { "MovieTexture", nullptr, nullptr },
-    { "NavigationInfo", nullptr, nullptr },
-    { "NormalInterpolator", nullptr, nullptr },
-    { "NurbsCurve", nullptr, nullptr },
-    { "NurbsCurve2D", nullptr, nullptr },
-    { "NurbsOrientationInterpolator", nullptr, nullptr },
-    { "NurbsPatchSurface", nullptr, nullptr },
-    { "NurbsPositionInterpolator", nullptr, nullptr },
-    { "NurbsSet", nullptr, nullptr },
-    { "NurbsSurfaceInterpolator", nullptr, nullptr },
-    { "NurbsSweptSurface", nullptr, nullptr },
-    { "NurbsSwungSurface", nullptr, nullptr },
-    { "NurbsTextureCoordinate", nullptr, nullptr },
-    { "NurbsTrimmedSurface", nullptr, nullptr },
-    { "OrientationInterpolator", nullptr, nullptr },
-    { "PixelTexture", nullptr, nullptr },
-    { "PlaneSensor", nullptr, nullptr },
-    { "PointLight", nullptr, nullptr },
-    { "Polyline2D", nullptr, nullptr },
-    { "Polypoint2D", nullptr, nullptr },
-    { "PositionInterpolator", nullptr, nullptr },
-    { "PositionInterpolator2D", nullptr, nullptr },
-    { "ProtoBody", nullptr, nullptr },
-    { "ProtoDeclare", nullptr, nullptr },
-    { "ProtoInterface", nullptr, nullptr },
-    { "ProximitySensor", nullptr, nullptr },
-    { "ReceiverPdu", nullptr, nullptr },
-    { "Rectangle2D", nullptr, nullptr },
-    { "ScalarInterpolator", nullptr, nullptr },
-    { "Scene", nullptr, nullptr },
-    { "SignalPdu", nullptr, nullptr },
-    { "Sound", nullptr, nullptr },
-    { "SphereSensor", nullptr, nullptr },
-    { "SpotLight", nullptr, nullptr },
-    { "StringSensor", nullptr, nullptr },
-    { "Text", nullptr, nullptr },
-    { "TextureBackground", nullptr, nullptr },
-    { "TextureCoordinateGenerator", nullptr, nullptr },
-    { "TimeSensor", nullptr, nullptr },
-    { "TimeTrigger", nullptr, nullptr },
-    { "TouchSensor", nullptr, nullptr },
-    { "TransmitterPdu", nullptr, nullptr },
-    { "TriangleFanSet", nullptr, nullptr },
-    { "TriangleSet", nullptr, nullptr },
-    { "TriangleSet2D", nullptr, nullptr },
-    { "TriangleStripSet", nullptr, nullptr },
-    { "Viewpoint", nullptr, nullptr },
-    { "VisibilitySensor", nullptr, nullptr },
-    { "WorldInfo", nullptr, nullptr },
-    { "X3D", nullptr, nullptr },
-    { "component", nullptr, nullptr },
-    { "connect", nullptr, nullptr },
-    { "field", nullptr, nullptr },
-    { "head", nullptr, nullptr },
-    { "humanoidBodyType", nullptr, nullptr },
-    { "meta", nullptr, nullptr },
-    { "CADAssembly", nullptr, nullptr },
-    { "CADFace", nullptr, nullptr },
-    { "CADLayer", nullptr, nullptr },
-    { "CADPart", nullptr, nullptr },
-    { "ComposedCubeMapTexture", nullptr, nullptr },
-    { "ComposedShader", nullptr, nullptr },
-    { "ComposedTexture3D", nullptr, nullptr },
-    { "FloatVertexAttribute", nullptr, nullptr },
-    { "FogCoordinate", nullptr, nullptr },
-    { "GeneratedCubeMapTexture", nullptr, nullptr },
-    { "ImageCubeMapTexture", nullptr, nullptr },
-    { "ImageTexture3D", nullptr, nullptr },
-    { "IndexedQuadSet", nullptr, nullptr },
-    { "LocalFog", nullptr, nullptr },
-    { "Matrix3VertexAttribute", nullptr, nullptr },
-    { "Matrix4VertexAttribute", nullptr, nullptr },
-    { "PackagedShader", nullptr, nullptr },
-    { "PixelTexture3D", nullptr, nullptr },
-    { "ProgramShader", nullptr, nullptr },
-    { "QuadSet", nullptr, nullptr },
-    { "ShaderPart", nullptr, nullptr },
-    { "ShaderProgram", nullptr, nullptr },
-    { "TextureCoordinate3D", nullptr, nullptr },
-    { "TextureCoordinate4D", nullptr, nullptr },
-    { "TextureTransform3D", nullptr, nullptr },
-    { "TextureTransformMatrix3D", nullptr, nullptr },
-    { "BallJoint", nullptr, nullptr },
-    { "BoundedPhysicsModel", nullptr, nullptr },
-    { "ClipPlane", nullptr, nullptr },
-    { "CollidableOffset", nullptr, nullptr },
-    { "CollidableShape", nullptr, nullptr },
-    { "CollisionCollection", nullptr, nullptr },
-    { "CollisionSensor", nullptr, nullptr },
-    { "CollisionSpace", nullptr, nullptr },
-    { "ColorDamper", nullptr, nullptr },
-    { "ConeEmitter", nullptr, nullptr },
-    { "Contact", nullptr, nullptr },
-    { "CoordinateDamper", nullptr, nullptr },
-    { "DISEntityManager", nullptr, nullptr },
-    { "DISEntityTypeMapping", nullptr, nullptr },
-    { "DoubleAxisHingeJoint", nullptr, nullptr },
-    { "EaseInEaseOut", nullptr, nullptr },
-    { "ExplosionEmitter", nullptr, nullptr },
-    { "ForcePhysicsModel", nullptr, nullptr },
-    { "GeoProximitySensor", nullptr, nullptr },
-    { "GeoTransform", nullptr, nullptr },
-    { "Layer", nullptr, nullptr },
-    { "LayerSet", nullptr, nullptr },
-    { "Layout", nullptr, nullptr },
-    { "LayoutGroup", nullptr, nullptr },
-    { "LayoutLayer", nullptr, nullptr },
-    { "LinePickSensor", nullptr, nullptr },
-    { "MotorJoint", nullptr, nullptr },
-    { "OrientationChaser", nullptr, nullptr },
-    { "OrientationDamper", nullptr, nullptr },
-    { "OrthoViewpoint", nullptr, nullptr },
-    { "ParticleSystem", nullptr, nullptr },
-    { "PickableGroup", nullptr, nullptr },
-    { "PointEmitter", nullptr, nullptr },
-    { "PointPickSensor", nullptr, nullptr },
-    { "PolylineEmitter", nullptr, nullptr },
-    { "PositionChaser", nullptr, nullptr },
-    { "PositionChaser2D", nullptr, nullptr },
-    { "PositionDamper", nullptr, nullptr },
-    { "PositionDamper2D", nullptr, nullptr },
-    { "PrimitivePickSensor", nullptr, nullptr },
-    { "RigidBody", nullptr, nullptr },
-    { "RigidBodyCollection", nullptr, nullptr },
-    { "ScalarChaser", nullptr, nullptr },
-    { "ScreenFontStyle", nullptr, nullptr },
-    { "ScreenGroup", nullptr, nullptr },
-    { "SingleAxisHingeJoint", nullptr, nullptr },
-    { "SliderJoint", nullptr, nullptr },
-    { "SplinePositionInterpolator", nullptr, nullptr },
-    { "SplinePositionInterpolator2D", nullptr, nullptr },
-    { "SplineScalarInterpolator", nullptr, nullptr },
-    { "SquadOrientationInterpolator", nullptr, nullptr },
-    { "SurfaceEmitter", nullptr, nullptr },
-    { "TexCoordDamper2D", nullptr, nullptr },
-    { "TextureProperties", nullptr, nullptr },
-    { "TransformSensor", nullptr, nullptr },
-    { "TwoSidedMaterial", nullptr, nullptr },
-    { "UniversalJoint", nullptr, nullptr },
-    { "ViewpointGroup", nullptr, nullptr },
-    { "Viewport", nullptr, nullptr },
-    { "VolumeEmitter", nullptr, nullptr },
-    { "VolumePickSensor", nullptr, nullptr },
-    { "WindPhysicsModel", nullptr, nullptr },
-    { "BlendedVolumeStyle", nullptr, nullptr },
-    { "BoundaryEnhancementVolumeStyle", nullptr, nullptr },
-    { "CartoonVolumeStyle", nullptr, nullptr },
-    { "ComposedVolumeStyle", nullptr, nullptr },
-    { "EdgeEnhancementVolumeStyle", nullptr, nullptr },
-    { "IsoSurfaceVolumeData", nullptr, nullptr },
-    { "MetadataBoolean", nullptr, nullptr },
-    { "OpacityMapVolumeStyle", nullptr, nullptr },
-    { "ProjectionVolumeStyle", nullptr, nullptr },
-    { "SegmentedVolumeData", nullptr, nullptr },
-    { "ShadedVolumeStyle", nullptr, nullptr },
-    { "SilhouetteEnhancementVolumeStyle", nullptr, nullptr },
-    { "ToneMappedVolumeStyle", nullptr, nullptr },
-    { "VolumeData", nullptr, nullptr },
-    { "ColorChaser", nullptr, nullptr },
-    { "CoordinateChaser", nullptr, nullptr },
-    { "ScalarDamper", nullptr, nullptr },
-    { "TexCoordChaser2D", nullptr, nullptr },
-    { "unit", nullptr, nullptr }
-};
-
-static const FIQName attributeNameTable_3_3[] = {
-    { "DEF", nullptr, nullptr },
-    { "USE", nullptr, nullptr },
-    { "containerField", nullptr, nullptr },
-    { "fromNode", nullptr, nullptr },
-    { "fromField", nullptr, nullptr },
-    { "toNode", nullptr, nullptr },
-    { "toField", nullptr, nullptr },
-    { "name", nullptr, nullptr },
-    { "value", nullptr, nullptr },
-    { "color", nullptr, nullptr },
-    { "colorIndex", nullptr, nullptr },
-    { "coordIndex", nullptr, nullptr },
-    { "texCoordIndex", nullptr, nullptr },
-    { "normalIndex", nullptr, nullptr },
-    { "colorPerVertex", nullptr, nullptr },
-    { "normalPerVertex", nullptr, nullptr },
-    { "rotation", nullptr, nullptr },
-    { "scale", nullptr, nullptr },
-    { "center", nullptr, nullptr },
-    { "scaleOrientation", nullptr, nullptr },
-    { "translation", nullptr, nullptr },
-    { "url", nullptr, nullptr },
-    { "repeatS", nullptr, nullptr },
-    { "repeatT", nullptr, nullptr },
-    { "point", nullptr, nullptr },
-    { "vector", nullptr, nullptr },
-    { "range", nullptr, nullptr },
-    { "ambientIntensity", nullptr, nullptr },
-    { "diffuseColor", nullptr, nullptr },
-    { "emissiveColor", nullptr, nullptr },
-    { "shininess", nullptr, nullptr },
-    { "specularColor", nullptr, nullptr },
-    { "transparency", nullptr, nullptr },
-    { "whichChoice", nullptr, nullptr },
-    { "index", nullptr, nullptr },
-    { "mode", nullptr, nullptr },
-    { "source", nullptr, nullptr },
-    { "function", nullptr, nullptr },
-    { "alpha", nullptr, nullptr },
-    { "vertexCount", nullptr, nullptr },
-    { "radius", nullptr, nullptr },
-    { "size", nullptr, nullptr },
-    { "height", nullptr, nullptr },
-    { "solid", nullptr, nullptr },
-    { "ccw", nullptr, nullptr },
-    { "key", nullptr, nullptr },
-    { "keyValue", nullptr, nullptr },
-    { "enabled", nullptr, nullptr },
-    { "direction", nullptr, nullptr },
-    { "position", nullptr, nullptr },
-    { "orientation", nullptr, nullptr },
-    { "bboxCenter", nullptr, nullptr },
-    { "bboxSize", nullptr, nullptr },
-    { "AS", nullptr, nullptr },
-    { "InlineDEF", nullptr, nullptr },
-    { "accessType", nullptr, nullptr },
-    { "actionKeyPress", nullptr, nullptr },
-    { "actionKeyRelease", nullptr, nullptr },
-    { "address", nullptr, nullptr },
-    { "altKey", nullptr, nullptr },
-    { "antennaLocation", nullptr, nullptr },
-    { "antennaPatternLength", nullptr, nullptr },
-    { "antennaPatternType", nullptr, nullptr },
-    { "applicationID", nullptr, nullptr },
-    { "articulationParameterArray", nullptr, nullptr },
-    { "articulationParameterChangeIndicatorArray", nullptr, nullptr },
-    { "articulationParameterCount", nullptr, nullptr },
-    { "articulationParameterDesignatorArray", nullptr, nullptr },
-    { "articulationParameterIdPartAttachedArray", nullptr, nullptr },
-    { "articulationParameterTypeArray", nullptr, nullptr },
-    { "attenuation", nullptr, nullptr },
-    { "autoOffset", nullptr, nullptr },
-    { "avatarSize", nullptr, nullptr },
-    { "axisOfRotation", nullptr, nullptr },
-    { "backUrl", nullptr, nullptr },
-    { "beamWidth", nullptr, nullptr },
-    { "beginCap", nullptr, nullptr },
-    { "bindTime", nullptr, nullptr },
-    { "bottom", nullptr, nullptr },
-    { "bottomRadius", nullptr, nullptr },
-    { "bottomUrl", nullptr, nullptr },
-    { "centerOfMass", nullptr, nullptr },
-    { "centerOfRotation", nullptr, nullptr },
-    { "child1Url", nullptr, nullptr },
-    { "child2Url", nullptr, nullptr },
-    { "child3Url", nullptr, nullptr },
-    { "child4Url", nullptr, nullptr },
-    { "class", nullptr, nullptr },
-    { "closureType", nullptr, nullptr },
-    { "collideTime", nullptr, nullptr },
-    { "content", nullptr, nullptr },
-    { "controlKey", nullptr, nullptr },
-    { "controlPoint", nullptr, nullptr },
-    { "convex", nullptr, nullptr },
-    { "coordinateSystem", nullptr, nullptr },
-    { "copyright", nullptr, nullptr },
-    { "creaseAngle", nullptr, nullptr },
-    { "crossSection", nullptr, nullptr },
-    { "cryptoKeyID", nullptr, nullptr },
-    { "cryptoSystem", nullptr, nullptr },
-    { "cutOffAngle", nullptr, nullptr },
-    { "cycleInterval", nullptr, nullptr },
-    { "cycleTime", nullptr, nullptr },
-    { "data", nullptr, nullptr },
-    { "dataFormat", nullptr, nullptr },
-    { "dataLength", nullptr, nullptr },
-    { "dataUrl", nullptr, nullptr },
-    { "date", nullptr, nullptr },
-    { "deadReckoning", nullptr, nullptr },
-    { "deletionAllowed", nullptr, nullptr },
-    { "description", nullptr, nullptr },
-    { "detonateTime", nullptr, nullptr },
-    { "dir", nullptr, nullptr },
-    { "directOutput", nullptr, nullptr },
-    { "diskAngle", nullptr, nullptr },
-    { "displacements", nullptr, nullptr },
-    { "documentation", nullptr, nullptr },
-    { "elapsedTime", nullptr, nullptr },
-    { "ellipsoid", nullptr, nullptr },
-    { "encodingScheme", nullptr, nullptr },
-    { "endAngle", nullptr, nullptr },
-    { "endCap", nullptr, nullptr },
-    { "enterTime", nullptr, nullptr },
-    { "enteredText", nullptr, nullptr },
-    { "entityCategory", nullptr, nullptr },
-    { "entityCountry", nullptr, nullptr },
-    { "entityDomain", nullptr, nullptr },
-    { "entityExtra", nullptr, nullptr },
-    { "entityID", nullptr, nullptr },
-    { "entityKind", nullptr, nullptr },
-    { "entitySpecific", nullptr, nullptr },
-    { "entitySubCategory", nullptr, nullptr },
-    { "exitTime", nullptr, nullptr },
-    { "extent", nullptr, nullptr },
-    { "family", nullptr, nullptr },
-    { "fanCount", nullptr, nullptr },
-    { "fieldOfView", nullptr, nullptr },
-    { "filled", nullptr, nullptr },
-    { "finalText", nullptr, nullptr },
-    { "fireMissionIndex", nullptr, nullptr },
-    { "fired1", nullptr, nullptr },
-    { "fired2", nullptr, nullptr },
-    { "firedTime", nullptr, nullptr },
-    { "firingRange", nullptr, nullptr },
-    { "firingRate", nullptr, nullptr },
-    { "fogType", nullptr, nullptr },
-    { "forceID", nullptr, nullptr },
-    { "frequency", nullptr, nullptr },
-    { "frontUrl", nullptr, nullptr },
-    { "fuse", nullptr, nullptr },
-    { "geoCoords", nullptr, nullptr },
-    { "geoGridOrigin", nullptr, nullptr },
-    { "geoSystem", nullptr, nullptr },
-    { "groundAngle", nullptr, nullptr },
-    { "groundColor", nullptr, nullptr },
-    { "hatchColor", nullptr, nullptr },
-    { "hatchStyle", nullptr, nullptr },
-    { "hatched", nullptr, nullptr },
-    { "headlight", nullptr, nullptr },
-    { "horizontal", nullptr, nullptr },
-    { "horizontalDatum", nullptr, nullptr },
-    { "http-equiv", nullptr, nullptr },
-    { "image", nullptr, nullptr },
-    { "importedDEF", nullptr, nullptr },
-    { "info", nullptr, nullptr },
-    { "innerRadius", nullptr, nullptr },
-    { "inputFalse", nullptr, nullptr },
-    { "inputNegate", nullptr, nullptr },
-    { "inputSource", nullptr, nullptr },
-    { "inputTrue", nullptr, nullptr },
-    { "integerKey", nullptr, nullptr },
-    { "intensity", nullptr, nullptr },
-    { "jump", nullptr, nullptr },
-    { "justify", nullptr, nullptr },
-    { "keyPress", nullptr, nullptr },
-    { "keyRelease", nullptr, nullptr },
-    { "knot", nullptr, nullptr },
-    { "lang", nullptr, nullptr },
-    { "language", nullptr, nullptr },
-    { "leftToRight", nullptr, nullptr },
-    { "leftUrl", nullptr, nullptr },
-    { "length", nullptr, nullptr },
-    { "lengthOfModulationParameters", nullptr, nullptr },
-    { "level", nullptr, nullptr },
-    { "limitOrientation", nullptr, nullptr },
-    { "lineSegments", nullptr, nullptr },
-    { "linearAcceleration", nullptr, nullptr },
-    { "linearVelocity", nullptr, nullptr },
-    { "linetype", nullptr, nullptr },
-    { "linewidthScaleFactor", nullptr, nullptr },
-    { "llimit", nullptr, nullptr },
-    { "load", nullptr, nullptr },
-    { "loadTime", nullptr, nullptr },
-    { "localDEF", nullptr, nullptr },
-    { "location", nullptr, nullptr },
-    { "loop", nullptr, nullptr },
-    { "marking", nullptr, nullptr },
-    { "mass", nullptr, nullptr },
-    { "maxAngle", nullptr, nullptr },
-    { "maxBack", nullptr, nullptr },
-    { "maxExtent", nullptr, nullptr },
-    { "maxFront", nullptr, nullptr },
-    { "maxPosition", nullptr, nullptr },
-    { "metadataFormat", nullptr, nullptr },
-    { "minAngle", nullptr, nullptr },
-    { "minBack", nullptr, nullptr },
-    { "minFront", nullptr, nullptr },
-    { "minPosition", nullptr, nullptr },
-    { "modulationTypeDetail", nullptr, nullptr },
-    { "modulationTypeMajor", nullptr, nullptr },
-    { "modulationTypeSpreadSpectrum", nullptr, nullptr },
-    { "modulationTypeSystem", nullptr, nullptr },
-    { "momentsOfInertia", nullptr, nullptr },
-    { "multicastRelayHost", nullptr, nullptr },
-    { "multicastRelayPort", nullptr, nullptr },
-    { "munitionApplicationID", nullptr, nullptr },
-    { "munitionEndPoint", nullptr, nullptr },
-    { "munitionEntityID", nullptr, nullptr },
-    { "munitionQuantity", nullptr, nullptr },
-    { "munitionSiteID", nullptr, nullptr },
-    { "munitionStartPoint", nullptr, nullptr },
-    { "mustEvaluate", nullptr, nullptr },
-    { "navType", nullptr, nullptr },
-    { "networkMode", nullptr, nullptr },
-    { "next", nullptr, nullptr },
-    { "nodeField", nullptr, nullptr },
-    { "offset", nullptr, nullptr },
-    { "on", nullptr, nullptr },
-    { "order", nullptr, nullptr },
-    { "originator", nullptr, nullptr },
-    { "outerRadius", nullptr, nullptr },
-    { "parameter", nullptr, nullptr },
-    { "pauseTime", nullptr, nullptr },
-    { "pitch", nullptr, nullptr },
-    { "points", nullptr, nullptr },
-    { "port", nullptr, nullptr },
-    { "power", nullptr, nullptr },
-    { "previous", nullptr, nullptr },
-    { "priority", nullptr, nullptr },
-    { "profile", nullptr, nullptr },
-    { "progress", nullptr, nullptr },
-    { "protoField", nullptr, nullptr },
-    { "radioEntityTypeCategory", nullptr, nullptr },
-    { "radioEntityTypeCountry", nullptr, nullptr },
-    { "radioEntityTypeDomain", nullptr, nullptr },
-    { "radioEntityTypeKind", nullptr, nullptr },
-    { "radioEntityTypeNomenclature", nullptr, nullptr },
-    { "radioEntityTypeNomenclatureVersion", nullptr, nullptr },
-    { "radioID", nullptr, nullptr },
-    { "readInterval", nullptr, nullptr },
-    { "receivedPower", nullptr, nullptr },
-    { "receiverState", nullptr, nullptr },
-    { "reference", nullptr, nullptr },
-    { "relativeAntennaLocation", nullptr, nullptr },
-    { "resolution", nullptr, nullptr },
-    { "resumeTime", nullptr, nullptr },
-    { "rightUrl", nullptr, nullptr },
-    { "rootUrl", nullptr, nullptr },
-    { "rotateYUp", nullptr, nullptr },
-    { "rtpHeaderExpected", nullptr, nullptr },
-    { "sampleRate", nullptr, nullptr },
-    { "samples", nullptr, nullptr },
-    { "shiftKey", nullptr, nullptr },
-    { "side", nullptr, nullptr },
-    { "siteID", nullptr, nullptr },
-    { "skinCoordIndex", nullptr, nullptr },
-    { "skinCoordWeight", nullptr, nullptr },
-    { "skyAngle", nullptr, nullptr },
-    { "skyColor", nullptr, nullptr },
-    { "spacing", nullptr, nullptr },
-    { "spatialize", nullptr, nullptr },
-    { "speed", nullptr, nullptr },
-    { "speedFactor", nullptr, nullptr },
-    { "spine", nullptr, nullptr },
-    { "startAngle", nullptr, nullptr },
-    { "startTime", nullptr, nullptr },
-    { "stiffness", nullptr, nullptr },
-    { "stopTime", nullptr, nullptr },
-    { "string", nullptr, nullptr },
-    { "stripCount", nullptr, nullptr },
-    { "style", nullptr, nullptr },
-    { "summary", nullptr, nullptr },
-    { "tdlType", nullptr, nullptr },
-    { "tessellation", nullptr, nullptr },
-    { "tessellationScale", nullptr, nullptr },
-    { "time", nullptr, nullptr },
-    { "timeOut", nullptr, nullptr },
-    { "timestamp", nullptr, nullptr },
-    { "title", nullptr, nullptr },
-    { "toggle", nullptr, nullptr },
-    { "top", nullptr, nullptr },
-    { "topToBottom", nullptr, nullptr },
-    { "topUrl", nullptr, nullptr },
-    { "touchTime", nullptr, nullptr },
-    { "transmitFrequencyBandwidth", nullptr, nullptr },
-    { "transmitState", nullptr, nullptr },
-    { "transmitterApplicationID", nullptr, nullptr },
-    { "transmitterEntityID", nullptr, nullptr },
-    { "transmitterRadioID", nullptr, nullptr },
-    { "transmitterSiteID", nullptr, nullptr },
-    { "transparent", nullptr, nullptr },
-    { "triggerTime", nullptr, nullptr },
-    { "triggerTrue", nullptr, nullptr },
-    { "triggerValue", nullptr, nullptr },
-    { "type", nullptr, nullptr },
-    { "uDimension", nullptr, nullptr },
-    { "uKnot", nullptr, nullptr },
-    { "uOrder", nullptr, nullptr },
-    { "uTessellation", nullptr, nullptr },
-    { "ulimit", nullptr, nullptr },
-    { "vDimension", nullptr, nullptr },
-    { "vKnot", nullptr, nullptr },
-    { "vOrder", nullptr, nullptr },
-    { "vTessellation", nullptr, nullptr },
-    { "version", nullptr, nullptr },
-    { "verticalDatum", nullptr, nullptr },
-    { "vertices", nullptr, nullptr },
-    { "visibilityLimit", nullptr, nullptr },
-    { "visibilityRange", nullptr, nullptr },
-    { "warhead", nullptr, nullptr },
-    { "weight", nullptr, nullptr },
-    { "whichGeometry", nullptr, nullptr },
-    { "writeInterval", nullptr, nullptr },
-    { "xDimension", nullptr, nullptr },
-    { "xSpacing", nullptr, nullptr },
-    { "yScale", nullptr, nullptr },
-    { "zDimension", nullptr, nullptr },
-    { "zSpacing", nullptr, nullptr },
-    { "visible", nullptr, nullptr },
-    { "repeatR", nullptr, nullptr },
-    { "texture", nullptr, nullptr },
-    { "back", nullptr, nullptr },
-    { "front", nullptr, nullptr },
-    { "left", nullptr, nullptr },
-    { "right", nullptr, nullptr },
-    { "parts", nullptr, nullptr },
-    { "isSelected", nullptr, nullptr },
-    { "isValid", nullptr, nullptr },
-    { "numComponents", nullptr, nullptr },
-    { "depth", nullptr, nullptr },
-    { "update", nullptr, nullptr },
-    { "fogCoord", nullptr, nullptr },
-    { "texCoord", nullptr, nullptr },
-    { "activate", nullptr, nullptr },
-    { "programs", nullptr, nullptr },
-    { "matrix", nullptr, nullptr },
-    { "anchorPoint", nullptr, nullptr },
-    { "body1", nullptr, nullptr },
-    { "body2", nullptr, nullptr },
-    { "forceOutput", nullptr, nullptr },
-    { "body1AnchorPoint", nullptr, nullptr },
-    { "body2AnchorPoint", nullptr, nullptr },
-    { "plane", nullptr, nullptr },
-    { "appliedParameters", nullptr, nullptr },
-    { "bounce", nullptr, nullptr },
-    { "frictionCoefficients", nullptr, nullptr },
-    { "minBounceSpeed", nullptr, nullptr },
-    { "slipFactors", nullptr, nullptr },
-    { "softnessConstantForceMix", nullptr, nullptr },
-    { "softnessErrorCorrection", nullptr, nullptr },
-    { "surfaceSpeed", nullptr, nullptr },
-    { "isActive", nullptr, nullptr },
-    { "useGeometry", nullptr, nullptr },
-    { "set_destination", nullptr, nullptr },
-    { "set_value", nullptr, nullptr },
-    { "tau", nullptr, nullptr },
-    { "tolerance", nullptr, nullptr },
-    { "value_changed", nullptr, nullptr },
-    { "initialDestination", nullptr, nullptr },
-    { "initialValue", nullptr, nullptr },
-    { "angle", nullptr, nullptr },
-    { "variation", nullptr, nullptr },
-    { "surfaceArea", nullptr, nullptr },
-    { "frictionDirection", nullptr, nullptr },
-    { "slipCoefficients", nullptr, nullptr },
-    { "category", nullptr, nullptr },
-    { "country", nullptr, nullptr },
-    { "domain", nullptr, nullptr },
-    { "extra", nullptr, nullptr },
-    { "kind", nullptr, nullptr },
-    { "specific", nullptr, nullptr },
-    { "subcategory", nullptr, nullptr },
-    { "axis1", nullptr, nullptr },
-    { "axis2", nullptr, nullptr },
-    { "desiredAngularVelocity1", nullptr, nullptr },
-    { "desiredAngularVelocity2", nullptr, nullptr },
-    { "maxAngle1", nullptr, nullptr },
-    { "maxTorque1", nullptr, nullptr },
-    { "maxTorque2", nullptr, nullptr },
-    { "minAngle1", nullptr, nullptr },
-    { "stopBounce1", nullptr, nullptr },
-    { "stopConstantForceMix1", nullptr, nullptr },
-    { "stopErrorCorrection1", nullptr, nullptr },
-    { "suspensionErrorCorrection", nullptr, nullptr },
-    { "suspensionForce", nullptr, nullptr },
-    { "body1Axis", nullptr, nullptr },
-    { "body2Axis", nullptr, nullptr },
-    { "hinge1Angle", nullptr, nullptr },
-    { "hinge1AngleRate", nullptr, nullptr },
-    { "hinge2Angle", nullptr, nullptr },
-    { "hinge2AngleRate", nullptr, nullptr },
-    { "set_fraction", nullptr, nullptr },
-    { "easeInEaseOut", nullptr, nullptr },
-    { "modifiedFraction_changed", nullptr, nullptr },
-    { "force", nullptr, nullptr },
-    { "geoCenter", nullptr, nullptr },
-    { "centerOfRotation_changed", nullptr, nullptr },
-    { "geoCoord_changed", nullptr, nullptr },
-    { "orientation_changed", nullptr, nullptr },
-    { "position_changed", nullptr, nullptr },
-    { "isPickable", nullptr, nullptr },
-    { "viewport", nullptr, nullptr },
-    { "activeLayer", nullptr, nullptr },
-    { "align", nullptr, nullptr },
-    { "offsetUnits", nullptr, nullptr },
-    { "scaleMode", nullptr, nullptr },
-    { "sizeUnits", nullptr, nullptr },
-    { "layout", nullptr, nullptr },
-    { "objectType", nullptr, nullptr },
-    { "pickedNormal", nullptr, nullptr },
-    { "pickedPoint", nullptr, nullptr },
-    { "pickedTextureCoordinate", nullptr, nullptr },
-    { "intersectionType", nullptr, nullptr },
-    { "sortOrder", nullptr, nullptr },
-    { "axis1Angle", nullptr, nullptr },
-    { "axis1Torque", nullptr, nullptr },
-    { "axis2Angle", nullptr, nullptr },
-    { "axis2Torque", nullptr, nullptr },
-    { "axis3Angle", nullptr, nullptr },
-    { "axis3Torque", nullptr, nullptr },
-    { "enabledAxies", nullptr, nullptr },
-    { "motor1Axis", nullptr, nullptr },
-    { "motor2Axis", nullptr, nullptr },
-    { "motor3Axis", nullptr, nullptr },
-    { "stop1Bounce", nullptr, nullptr },
-    { "stop1ErrorCorrection", nullptr, nullptr },
-    { "stop2Bounce", nullptr, nullptr },
-    { "stop2ErrorCorrection", nullptr, nullptr },
-    { "stop3Bounce", nullptr, nullptr },
-    { "stop3ErrorCorrection", nullptr, nullptr },
-    { "motor1Angle", nullptr, nullptr },
-    { "motor1AngleRate", nullptr, nullptr },
-    { "motor2Angle", nullptr, nullptr },
-    { "motor2AngleRate", nullptr, nullptr },
-    { "motor3Angle", nullptr, nullptr },
-    { "motor3AngleRate", nullptr, nullptr },
-    { "autoCalc", nullptr, nullptr },
-    { "duration", nullptr, nullptr },
-    { "retainUserOffsets", nullptr, nullptr },
-    { "isBound", nullptr, nullptr },
-    { "appearance", nullptr, nullptr },
-    { "createParticles", nullptr, nullptr },
-    { "lifetimeVariation", nullptr, nullptr },
-    { "maxParticles", nullptr, nullptr },
-    { "particleLifetime", nullptr, nullptr },
-    { "particleSize", nullptr, nullptr },
-    { "colorKey", nullptr, nullptr },
-    { "geometryType", nullptr, nullptr },
-    { "texCoordKey", nullptr, nullptr },
-    { "pickable", nullptr, nullptr },
-    { "angularDampingFactor", nullptr, nullptr },
-    { "angularVelocity", nullptr, nullptr },
-    { "autoDamp", nullptr, nullptr },
-    { "autoDisable", nullptr, nullptr },
-    { "disableAngularSpeed", nullptr, nullptr },
-    { "disableLinearSpeed", nullptr, nullptr },
-    { "disableTime", nullptr, nullptr },
-    { "finiteRotationAxis", nullptr, nullptr },
-    { "fixed", nullptr, nullptr },
-    { "forces", nullptr, nullptr },
-    { "inertia", nullptr, nullptr },
-    { "linearDampingFactor", nullptr, nullptr },
-    { "torques", nullptr, nullptr },
-    { "useFiniteRotation", nullptr, nullptr },
-    { "useGlobalForce", nullptr, nullptr },
-    { "constantForceMix", nullptr, nullptr },
-    { "constantSurfaceThickness", nullptr, nullptr },
-    { "errorCorrection", nullptr, nullptr },
-    { "iterations", nullptr, nullptr },
-    { "maxCorrectionSpeed", nullptr, nullptr },
-    { "preferAccuracy", nullptr, nullptr },
-    { "pointSize", nullptr, nullptr },
-    { "stopBounce", nullptr, nullptr },
-    { "stopErrorCorrection", nullptr, nullptr },
-    { "angleRate", nullptr, nullptr },
-    { "maxSeparation", nullptr, nullptr },
-    { "minSeparation", nullptr, nullptr },
-    { "separation", nullptr, nullptr },
-    { "separationRate", nullptr, nullptr },
-    { "closed", nullptr, nullptr },
-    { "keyVelocity", nullptr, nullptr },
-    { "normalizeVelocity", nullptr, nullptr },
-    { "surface", nullptr, nullptr },
-    { "anisotropicDegree", nullptr, nullptr },
-    { "borderColor", nullptr, nullptr },
-    { "borderWidth", nullptr, nullptr },
-    { "boundaryModeS", nullptr, nullptr },
-    { "boundaryModeT", nullptr, nullptr },
-    { "boundaryModeR", nullptr, nullptr },
-    { "magnificationFilter", nullptr, nullptr },
-    { "minificationFilter", nullptr, nullptr },
-    { "textureCompression", nullptr, nullptr },
-    { "texturePriority", nullptr, nullptr },
-    { "generateMipMaps", nullptr, nullptr },
-    { "targetObject", nullptr, nullptr },
-    { "backAmbientIntensity", nullptr, nullptr },
-    { "backDiffuseColor", nullptr, nullptr },
-    { "backEmissiveColor", nullptr, nullptr },
-    { "backShininess", nullptr, nullptr },
-    { "backSpecularColor", nullptr, nullptr },
-    { "separateBackColor", nullptr, nullptr },
-    { "displayed", nullptr, nullptr },
-    { "clipBoundary", nullptr, nullptr },
-    { "internal", nullptr, nullptr },
-    { "gustiness", nullptr, nullptr },
-    { "turbulence", nullptr, nullptr },
-    { "unitCategory", nullptr, nullptr },
-    { "unitName", nullptr, nullptr },
-    { "unitConversionFactor", nullptr, nullptr },
-    { "weightConstant1", nullptr, nullptr },
-    { "weightConstant2", nullptr, nullptr },
-    { "weightFunction1", nullptr, nullptr },
-    { "weightFunction2", nullptr, nullptr },
-    { "boundaryOpacity", nullptr, nullptr },
-    { "opacityFactor", nullptr, nullptr },
-    { "retainedOpacity", nullptr, nullptr },
-    { "colorSteps", nullptr, nullptr },
-    { "orthogonalColor", nullptr, nullptr },
-    { "parallelColor", nullptr, nullptr },
-    { "ordered", nullptr, nullptr },
-    { "edgeColor", nullptr, nullptr },
-    { "gradientThreshold", nullptr, nullptr },
-    { "contourStepSize", nullptr, nullptr },
-    { "dimensions", nullptr, nullptr },
-    { "surfaceTolerance", nullptr, nullptr },
-    { "surfaceValues", nullptr, nullptr },
-    { "intensityThreshold", nullptr, nullptr },
-    { "segmentEnabled", nullptr, nullptr },
-    { "lighting", nullptr, nullptr },
-    { "shadows", nullptr, nullptr },
-    { "phaseFunction", nullptr, nullptr },
-    { "silhouetteBoundaryOpacity", nullptr, nullptr },
-    { "silhouetteRetainedOpacity", nullptr, nullptr },
-    { "silhouetteSharpness", nullptr, nullptr },
-    { "coolColor", nullptr, nullptr },
-    { "warmColor", nullptr, nullptr }
-};
-
-FIVocabulary X3D_vocabulary_3_3 = {
-    nullptr, 0,
-    encodingAlgorithmTable_3_3, 8,
-    nullptr, 0,
-    nullptr, 0,
-    nullptr, 0,
-    nullptr, 0,
-    nullptr, 0,
-    attributeValueTable_3_3, 2,
-    nullptr, 0,
-    nullptr, 0,
-    elementNameTable_3_3, 252,
-    attributeNameTable_3_3, 546
-};
-
-}// namespace Assimp
-
-#endif // !ASSIMP_BUILD_NO_X3D_IMPORTER
diff --git a/code/AssetLib/XGL/XGLLoader.cpp b/code/AssetLib/XGL/XGLLoader.cpp
index 938f2a321..3590b9441 100644
--- a/code/AssetLib/XGL/XGLLoader.cpp
+++ b/code/AssetLib/XGL/XGLLoader.cpp
@@ -5,8 +5,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -58,403 +56,363 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <memory>
 
 using namespace Assimp;
-using namespace irr;
-using namespace irr::io;
 
 // zlib is needed for compressed XGL files
 #ifndef ASSIMP_BUILD_NO_COMPRESSED_XGL
-#ifdef ASSIMP_BUILD_NO_OWN_ZLIB
-#include <zlib.h>
-#else
-#include <contrib/zlib/zlib.h>
-#endif
+#  ifdef ASSIMP_BUILD_NO_OWN_ZLIB
+#    include <zlib.h>
+#  else
+#    include <contrib/zlib/zlib.h>
+#  endif
 #endif
 
 namespace Assimp { // this has to be in here because LogFunctions is in ::Assimp
+
 template <>
 const char *LogFunctions<XGLImporter>::Prefix() {
     static auto prefix = "XGL: ";
-    return prefix;
+	return prefix;
 }
 } // namespace Assimp
 
 static const aiImporterDesc desc = {
-    "XGL Importer",
-    "",
-    "",
-    "",
-    aiImporterFlags_SupportTextFlavour | aiImporterFlags_SupportCompressedFlavour,
-    0,
-    0,
-    0,
-    0,
-    "xgl zgl"
+	"XGL Importer",
+	"",
+	"",
+	"",
+	aiImporterFlags_SupportTextFlavour | aiImporterFlags_SupportCompressedFlavour,
+	0,
+	0,
+	0,
+	0,
+	"xgl zgl"
 };
 
 // ------------------------------------------------------------------------------------------------
 // Constructor to be privately used by Importer
 XGLImporter::XGLImporter() :
-        m_reader(nullptr), m_scene(nullptr) {
+        mXmlParser(nullptr),
+        m_scene(nullptr) {
     // empty
 }
 
 // ------------------------------------------------------------------------------------------------
 // Destructor, private as well
 XGLImporter::~XGLImporter() {
-    // empty
+	delete mXmlParser;
+    mXmlParser = nullptr;
 }
 
 // ------------------------------------------------------------------------------------------------
 // Returns whether the class can handle the format of the given file.
 bool XGLImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool checkSig) const {
-    /* NOTE: A simple check for the file extension is not enough
+	/* NOTE: A simple check for the file extension is not enough
      * here. XGL and ZGL are ok, but xml is too generic
      * and might be collada as well. So open the file and
      * look for typical signal tokens.
      */
-    const std::string extension = GetExtension(pFile);
+	const std::string extension = GetExtension(pFile);
 
-    if (extension == "xgl" || extension == "zgl") {
-        return true;
-    } else if (extension == "xml" || checkSig) {
-        ai_assert(pIOHandler != nullptr);
+	if (extension == "xgl" || extension == "zgl") {
+		return true;
+	} else if (extension == "xml" || checkSig) {
+		ai_assert(pIOHandler != NULL);
 
-        const char *tokens[] = { "<world>", "<World>", "<WORLD>" };
-        return SearchFileHeaderForToken(pIOHandler, pFile, tokens, 3);
-    }
-    return false;
+		const char *tokens[] = { "<world>", "<World>", "<WORLD>" };
+		return SearchFileHeaderForToken(pIOHandler, pFile, tokens, 3);
+	}
+	return false;
 }
 
 // ------------------------------------------------------------------------------------------------
 // Get a list of all file extensions which are handled by this class
 const aiImporterDesc *XGLImporter::GetInfo() const {
-    return &desc;
+	return &desc;
 }
 
 // ------------------------------------------------------------------------------------------------
 // Imports the given file into the given scene structure.
-void XGLImporter::InternReadFile(const std::string &pFile,
-        aiScene *pScene, IOSystem *pIOHandler) {
+void XGLImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSystem *pIOHandler) {
 #ifndef ASSIMP_BUILD_NO_COMPRESSED_XGL
-    std::vector<Bytef> uncompressed;
+	std::vector<Bytef> uncompressed;
 #endif
 
-    m_scene = pScene;
-    std::shared_ptr<IOStream> stream(pIOHandler->Open(pFile, "rb"));
+	m_scene = pScene;
+	std::shared_ptr<IOStream> stream(pIOHandler->Open(pFile, "rb"));
 
-    // check whether we can read from the file
-    if (stream.get() == nullptr) {
-        throw DeadlyImportError("Failed to open XGL/ZGL file " + pFile + "");
-    }
+	// check whether we can read from the file
+	if (stream.get() == NULL) {
+		throw DeadlyImportError("Failed to open XGL/ZGL file " + pFile + "");
+	}
 
-    // see if its compressed, if so uncompress it
-    if (GetExtension(pFile) == "zgl") {
+	// see if its compressed, if so uncompress it
+	if (GetExtension(pFile) == "zgl") {
 #ifdef ASSIMP_BUILD_NO_COMPRESSED_XGL
-        ThrowException("Cannot read ZGL file since Assimp was built without compression support");
+		ThrowException("Cannot read ZGL file since Assimp was built without compression support");
 #else
-        std::unique_ptr<StreamReaderLE> raw_reader(new StreamReaderLE(stream));
+		std::unique_ptr<StreamReaderLE> raw_reader(new StreamReaderLE(stream));
 
-        // build a zlib stream
-        z_stream zstream;
-        zstream.opaque = Z_NULL;
-        zstream.zalloc = Z_NULL;
-        zstream.zfree = Z_NULL;
-        zstream.data_type = Z_BINARY;
+		// build a zlib stream
+		z_stream zstream;
+		zstream.opaque = Z_NULL;
+		zstream.zalloc = Z_NULL;
+		zstream.zfree = Z_NULL;
+		zstream.data_type = Z_BINARY;
 
-        // raw decompression without a zlib or gzip header
-        inflateInit2(&zstream, -MAX_WBITS);
+		// raw decompression without a zlib or gzip header
+		inflateInit2(&zstream, -MAX_WBITS);
 
-        // skip two extra bytes, zgl files do carry a crc16 upfront (I think)
-        raw_reader->IncPtr(2);
+		// skip two extra bytes, zgl files do carry a crc16 upfront (I think)
+		raw_reader->IncPtr(2);
 
-        zstream.next_in = reinterpret_cast<Bytef *>(raw_reader->GetPtr());
-        zstream.avail_in = (uInt)raw_reader->GetRemainingSize();
+		zstream.next_in = reinterpret_cast<Bytef *>(raw_reader->GetPtr());
+		zstream.avail_in = (uInt) raw_reader->GetRemainingSize();
 
-        size_t total = 0l;
+		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
+		// 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);
+		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 .XGL 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);
+			if (ret != Z_STREAM_END && ret != Z_OK) {
+				ThrowException("Failure decompressing this file using gzip, seemingly it is NOT a compressed .XGL 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);
+		// terminate zlib
+		inflateEnd(&zstream);
 
-        // replace the input stream with a memory stream
-        stream.reset(new MemoryIOStream(reinterpret_cast<uint8_t *>(uncompressed.data()), total));
+		// replace the input stream with a memory stream
+		stream.reset(new MemoryIOStream(reinterpret_cast<uint8_t *>(uncompressed.data()), total));
 #endif
-    }
+	}
 
-    // construct the irrXML parser
-    CIrrXML_IOStreamReader st(stream.get());
-    m_reader.reset(createIrrXMLReader((IFileReadCallBack *)&st));
+	// parse the XML file
+    mXmlParser = new XmlParser;
+    if (!mXmlParser->parse(stream.get())) {
+		return;
+	}
 
-    // parse the XML file
-    TempScope scope;
+	TempScope scope;
+    XmlNode *worldNode = mXmlParser->findNode("WORLD");
+    if (nullptr != worldNode) {
+		ReadWorld(*worldNode, scope);
+	}
 
-    while (ReadElement()) {
-        if (!ASSIMP_stricmp(m_reader->getNodeName(), "world")) {
-            ReadWorld(scope);
-        }
-    }
+	std::vector<aiMesh *> &meshes = scope.meshes_linear;
+	std::vector<aiMaterial *> &materials = scope.materials_linear;
+	if (!meshes.size() || !materials.size()) {
+		ThrowException("failed to extract data from XGL file, no meshes loaded");
+	}
 
-    std::vector<aiMesh *> &meshes = scope.meshes_linear;
-    std::vector<aiMaterial *> &materials = scope.materials_linear;
-    if (!meshes.size() || !materials.size()) {
-        ThrowException("failed to extract data from XGL file, no meshes loaded");
-    }
+	// copy meshes
+	m_scene->mNumMeshes = static_cast<unsigned int>(meshes.size());
+	m_scene->mMeshes = new aiMesh *[m_scene->mNumMeshes]();
+	std::copy(meshes.begin(), meshes.end(), m_scene->mMeshes);
 
-    // copy meshes
-    m_scene->mNumMeshes = static_cast<unsigned int>(meshes.size());
-    m_scene->mMeshes = new aiMesh *[m_scene->mNumMeshes]();
-    std::copy(meshes.begin(), meshes.end(), m_scene->mMeshes);
+	// copy materials
+	m_scene->mNumMaterials = static_cast<unsigned int>(materials.size());
+	m_scene->mMaterials = new aiMaterial *[m_scene->mNumMaterials]();
+	std::copy(materials.begin(), materials.end(), m_scene->mMaterials);
 
-    // copy materials
-    m_scene->mNumMaterials = static_cast<unsigned int>(materials.size());
-    m_scene->mMaterials = new aiMaterial *[m_scene->mNumMaterials]();
-    std::copy(materials.begin(), materials.end(), m_scene->mMaterials);
+	if (scope.light) {
+		m_scene->mNumLights = 1;
+		m_scene->mLights = new aiLight *[1];
+		m_scene->mLights[0] = scope.light;
 
-    if (scope.light) {
-        m_scene->mNumLights = 1;
-        m_scene->mLights = new aiLight *[1];
-        m_scene->mLights[0] = scope.light;
+		scope.light->mName = m_scene->mRootNode->mName;
+	}
 
-        scope.light->mName = m_scene->mRootNode->mName;
-    }
-
-    scope.dismiss();
+	scope.dismiss();
 }
 
 // ------------------------------------------------------------------------------------------------
-bool XGLImporter::ReadElement() {
-    while (m_reader->read()) {
-        if (m_reader->getNodeType() == EXN_ELEMENT) {
-            return true;
-        }
-    }
-    return false;
+void XGLImporter::ReadWorld(XmlNode &node, TempScope &scope) {
+    for (XmlNode &currentNode : node.children()) {
+        const std::string &s = ai_stdStrToLower(currentNode.name());
+        
+		// XXX right now we'd skip <lighting> if it comes after
+		// <object> or <mesh>
+		if (s == "lighting") {
+            ReadLighting(currentNode, scope);
+		} else if (s == "object" || s == "mesh" || s == "mat") {
+			break;
+		}
+	}
+
+	aiNode *const nd = ReadObject(node, scope, true);
+	if (!nd) {
+		ThrowException("failure reading <world>");
+	}
+	if (!nd->mName.length) {
+		nd->mName.Set("WORLD");
+	}
+
+	m_scene->mRootNode = nd;
 }
 
 // ------------------------------------------------------------------------------------------------
-bool XGLImporter::ReadElementUpToClosing(const char *closetag) {
-    while (m_reader->read()) {
-        if (m_reader->getNodeType() == EXN_ELEMENT) {
-            return true;
-        } else if (m_reader->getNodeType() == EXN_ELEMENT_END && !ASSIMP_stricmp(m_reader->getNodeName(), closetag)) {
-            return false;
-        }
-    }
-    LogError("unexpected EOF, expected closing <" + std::string(closetag) + "> tag");
-    return false;
+void XGLImporter::ReadLighting(XmlNode &node, TempScope &scope) {
+    const std::string &s = ai_stdStrToLower(node.name());
+	if (s == "directionallight") {
+		scope.light = ReadDirectionalLight(node);
+	} else if (s == "ambient") {
+		LogWarn("ignoring <ambient> tag");
+	} else if (s == "spheremap") {
+		LogWarn("ignoring <spheremap> tag");
+	}
 }
 
 // ------------------------------------------------------------------------------------------------
-bool XGLImporter::SkipToText() {
-    while (m_reader->read()) {
-        if (m_reader->getNodeType() == EXN_TEXT) {
-            return true;
-        } else if (m_reader->getNodeType() == EXN_ELEMENT || m_reader->getNodeType() == EXN_ELEMENT_END) {
-            ThrowException("expected text contents but found another element (or element end)");
-        }
-    }
-    return false;
+aiLight *XGLImporter::ReadDirectionalLight(XmlNode &node) {
+	std::unique_ptr<aiLight> l(new aiLight());
+	l->mType = aiLightSource_DIRECTIONAL;
+	find_node_by_name_predicate predicate("directionallight");
+	XmlNode child = node.find_child(predicate);
+	if (child.empty()) {
+		return nullptr;
+	}
+
+	const std::string &s = ai_stdStrToLower(child.name());
+	if (s == "direction") {
+		l->mDirection = ReadVec3(child);
+	} else if (s == "diffuse") {
+		l->mColorDiffuse = ReadCol3(child);
+	} else if (s == "specular") {
+		l->mColorSpecular = ReadCol3(child);
+	}
+
+	return l.release();
 }
 
 // ------------------------------------------------------------------------------------------------
-std::string XGLImporter::GetElementName() {
-    const char *s = m_reader->getNodeName();
-    size_t len = strlen(s);
+aiNode *XGLImporter::ReadObject(XmlNode &node, TempScope &scope, bool skipFirst/*, const char *closetag */) {
+	aiNode *nd = new aiNode;
+	std::vector<aiNode *> children;
+	std::vector<unsigned int> meshes;
 
-    std::string ret;
-    ret.resize(len);
-    std::transform(s, s + len, ret.begin(), ::ToLower<char>);
-    return ret;
+	try {
+		for (XmlNode &child : node.children()) {
+
+			skipFirst = false;
+
+			const std::string &s = ai_stdStrToLower(child.name());
+			if (s == "mesh") {
+				const size_t prev = scope.meshes_linear.size();
+				if (ReadMesh(child, scope)) {
+					const size_t newc = scope.meshes_linear.size();
+					for (size_t i = 0; i < newc - prev; ++i) {
+						meshes.push_back(static_cast<unsigned int>(i + prev));
+					}
+				}
+			} else if (s == "mat") {
+				ReadMaterial(child, scope);
+			} else if (s == "object") {
+				children.push_back(ReadObject(child, scope));
+			} else if (s == "objectref") {
+				// XXX
+			} else if (s == "meshref") {
+				const unsigned int id = static_cast<unsigned int>(ReadIndexFromText(child));
+
+				std::multimap<unsigned int, aiMesh *>::iterator it = scope.meshes.find(id), end = scope.meshes.end();
+				if (it == end) {
+					ThrowException("<meshref> index out of range");
+				}
+
+				for (; it != end && (*it).first == id; ++it) {
+					// ok, this is n^2 and should get optimized one day
+					aiMesh *const m = it->second;
+					unsigned int i = 0, mcount = static_cast<unsigned int>(scope.meshes_linear.size());
+					for (; i < mcount; ++i) {
+						if (scope.meshes_linear[i] == m) {
+							meshes.push_back(i);
+							break;
+						}
+					}
+
+					ai_assert(i < mcount);
+				}
+			} else if (s == "transform") {
+				nd->mTransformation = ReadTrafo(child);
+			}
+		}
+	} catch (...) {
+		for (aiNode *ch : children) {
+			delete ch;
+		}
+		throw;
+	}
+
+	// FIX: since we used std::multimap<> to keep meshes by id, mesh order now depends on the behaviour
+	// of the multimap implementation with respect to the ordering of entries with same values.
+	// C++11 gives the guarantee that it uses insertion order, before it is implementation-specific.
+	// Sort by material id to always guarantee a deterministic result.
+	std::sort(meshes.begin(), meshes.end(), SortMeshByMaterialId(scope));
+
+	// link meshes to node
+	nd->mNumMeshes = static_cast<unsigned int>(meshes.size());
+	if (0 != nd->mNumMeshes) {
+		nd->mMeshes = new unsigned int[nd->mNumMeshes]();
+		for (unsigned int i = 0; i < nd->mNumMeshes; ++i) {
+			nd->mMeshes[i] = meshes[i];
+		}
+	}
+
+	// link children to parent
+	nd->mNumChildren = static_cast<unsigned int>(children.size());
+	if (nd->mNumChildren) {
+		nd->mChildren = new aiNode *[nd->mNumChildren]();
+		for (unsigned int i = 0; i < nd->mNumChildren; ++i) {
+			nd->mChildren[i] = children[i];
+			children[i]->mParent = nd;
+		}
+	}
+
+	return nd;
 }
 
 // ------------------------------------------------------------------------------------------------
-void XGLImporter::ReadWorld(TempScope &scope) {
-    while (ReadElementUpToClosing("world")) {
-        const std::string &s = GetElementName();
-        // XXX right now we'd skip <lighting> if it comes after
-        // <object> or <mesh>
-        if (s == "lighting") {
-            ReadLighting(scope);
-        } else if (s == "object" || s == "mesh" || s == "mat") {
-            break;
-        }
-    }
+aiMatrix4x4 XGLImporter::ReadTrafo(XmlNode &node) {
+	aiVector3D forward, up, right, position;
+	float scale = 1.0f;
 
-    aiNode *const nd = ReadObject(scope, true, "world");
-    if (!nd) {
-        ThrowException("failure reading <world>");
-    }
-    if (!nd->mName.length) {
-        nd->mName.Set("WORLD");
-    }
+	aiMatrix4x4 m;
+	XmlNode child = node.child("TRANSFORM");
+	if (child.empty()) {
+		return m;
+	}
 
-    m_scene->mRootNode = nd;
-}
+	for (XmlNode &sub_child : child.children()) {
+        const std::string &s = ai_stdStrToLower(sub_child.name());
+		if (s == "forward") {
+			forward = ReadVec3(sub_child);
+		} else if (s == "up") {
+			up = ReadVec3(sub_child);
+		} else if (s == "position") {
+			position = ReadVec3(sub_child);
+		}
+		if (s == "scale") {
+			scale = ReadFloat(sub_child);
+			if (scale < 0.f) {
+				// this is wrong, but we can leave the value and pass it to the caller
+				LogError("found negative scaling in <transform>, ignoring");
+			}
+		}
+	}
 
-// ------------------------------------------------------------------------------------------------
-void XGLImporter::ReadLighting(TempScope &scope) {
-    while (ReadElementUpToClosing("lighting")) {
-        const std::string &s = GetElementName();
-        if (s == "directionallight") {
-            scope.light = ReadDirectionalLight();
-        } else if (s == "ambient") {
-            LogWarn("ignoring <ambient> tag");
-        } else if (s == "spheremap") {
-            LogWarn("ignoring <spheremap> tag");
-        }
-    }
-}
-
-// ------------------------------------------------------------------------------------------------
-aiLight *XGLImporter::ReadDirectionalLight() {
-    std::unique_ptr<aiLight> l(new aiLight());
-    l->mType = aiLightSource_DIRECTIONAL;
-
-    while (ReadElementUpToClosing("directionallight")) {
-        const std::string &s = GetElementName();
-        if (s == "direction") {
-            l->mDirection = ReadVec3();
-        } else if (s == "diffuse") {
-            l->mColorDiffuse = ReadCol3();
-        } else if (s == "specular") {
-            l->mColorSpecular = ReadCol3();
-        }
-    }
-    return l.release();
-}
-
-// ------------------------------------------------------------------------------------------------
-aiNode *XGLImporter::ReadObject(TempScope &scope, bool skipFirst, const char *closetag) {
-    aiNode *nd = new aiNode;
-    std::vector<aiNode *> children;
-    std::vector<unsigned int> meshes;
-
-    try {
-        while (skipFirst || ReadElementUpToClosing(closetag)) {
-            skipFirst = false;
-
-            const std::string &s = GetElementName();
-            if (s == "mesh") {
-                const size_t prev = scope.meshes_linear.size();
-                if (ReadMesh(scope)) {
-                    const size_t newc = scope.meshes_linear.size();
-                    for (size_t i = 0; i < newc - prev; ++i) {
-                        meshes.push_back(static_cast<unsigned int>(i + prev));
-                    }
-                }
-            } else if (s == "mat") {
-                ReadMaterial(scope);
-            } else if (s == "object") {
-                children.push_back(ReadObject(scope));
-            } else if (s == "objectref") {
-                // XXX
-            } else if (s == "meshref") {
-                const unsigned int id = static_cast<unsigned int>(ReadIndexFromText());
-
-                std::multimap<unsigned int, aiMesh *>::iterator it = scope.meshes.find(id), end = scope.meshes.end();
-                if (it == end) {
-                    ThrowException("<meshref> index out of range");
-                }
-
-                for (; it != end && (*it).first == id; ++it) {
-                    // ok, this is n^2 and should get optimized one day
-                    aiMesh *const m = (*it).second;
-
-                    unsigned int i = 0, mcount = static_cast<unsigned int>(scope.meshes_linear.size());
-                    for (; i < mcount; ++i) {
-                        if (scope.meshes_linear[i] == m) {
-                            meshes.push_back(i);
-                            break;
-                        }
-                    }
-
-                    ai_assert(i < mcount);
-                }
-            } else if (s == "transform") {
-                nd->mTransformation = ReadTrafo();
-            }
-        }
-
-    } catch (...) {
-        for (aiNode *ch : children) {
-            delete ch;
-        }
-        throw;
-    }
-
-    // FIX: since we used std::multimap<> to keep meshes by id, mesh order now depends on the behaviour
-    // of the multimap implementation with respect to the ordering of entries with same values.
-    // C++11 gives the guarantee that it uses insertion order, before it is implementation-specific.
-    // Sort by material id to always guarantee a deterministic result.
-    std::sort(meshes.begin(), meshes.end(), SortMeshByMaterialId(scope));
-
-    // link meshes to node
-    nd->mNumMeshes = static_cast<unsigned int>(meshes.size());
-    if (nd->mNumMeshes) {
-        nd->mMeshes = new unsigned int[nd->mNumMeshes]();
-        for (unsigned int i = 0; i < nd->mNumMeshes; ++i) {
-            nd->mMeshes[i] = meshes[i];
-        }
-    }
-
-    // link children to parent
-    nd->mNumChildren = static_cast<unsigned int>(children.size());
-    if (nd->mNumChildren) {
-        nd->mChildren = new aiNode *[nd->mNumChildren]();
-        for (unsigned int i = 0; i < nd->mNumChildren; ++i) {
-            nd->mChildren[i] = children[i];
-            children[i]->mParent = nd;
-        }
-    }
-
-    return nd;
-}
-
-// ------------------------------------------------------------------------------------------------
-aiMatrix4x4 XGLImporter::ReadTrafo() {
-    aiVector3D forward, up, right, position;
-    float scale = 1.0f;
-
-    while (ReadElementUpToClosing("transform")) {
-        const std::string &s = GetElementName();
-        if (s == "forward") {
-            forward = ReadVec3();
-        } else if (s == "up") {
-            up = ReadVec3();
-        } else if (s == "position") {
-            position = ReadVec3();
-        }
-        if (s == "scale") {
-            scale = ReadFloat();
-            if (scale < 0.f) {
-                // this is wrong, but we can leave the value and pass it to the caller
-                LogError("found negative scaling in <transform>, ignoring");
-            }
-        }
-    }
-
-    aiMatrix4x4 m;
     if (forward.SquareLength() < 1e-4 || up.SquareLength() < 1e-4) {
-        LogError("A direction vector in <transform> is zero, ignoring trafo");
-        return m;
+	    LogError("A direction vector in <transform> is zero, ignoring trafo");
+	    return m;
     }
 
     forward.Normalize();
@@ -462,10 +420,10 @@ aiMatrix4x4 XGLImporter::ReadTrafo() {
 
     right = forward ^ up;
     if (std::fabs(up * forward) > 1e-4) {
-        // this is definitely wrong - a degenerate coordinate space ruins everything
-        // so substitute identity transform.
-        LogError("<forward> and <up> vectors in <transform> are skewing, ignoring trafo");
-        return m;
+	    // this is definitely wrong - a degenerate coordinate space ruins everything
+	    // so substitute identity transform.
+	    LogError("<forward> and <up> vectors in <transform> are skewing, ignoring trafo");
+	    return m;
     }
 
     right *= scale;
@@ -488,403 +446,390 @@ aiMatrix4x4 XGLImporter::ReadTrafo() {
     m.b4 = position.y;
     m.c4 = position.z;
 
-    return m;
+	return m;
 }
 
 // ------------------------------------------------------------------------------------------------
 aiMesh *XGLImporter::ToOutputMesh(const TempMaterialMesh &m) {
-    std::unique_ptr<aiMesh> mesh(new aiMesh());
+	std::unique_ptr<aiMesh> mesh(new aiMesh());
 
-    mesh->mNumVertices = static_cast<unsigned int>(m.positions.size());
-    mesh->mVertices = new aiVector3D[mesh->mNumVertices];
-    std::copy(m.positions.begin(), m.positions.end(), mesh->mVertices);
+	mesh->mNumVertices = static_cast<unsigned int>(m.positions.size());
+	mesh->mVertices = new aiVector3D[mesh->mNumVertices];
+	std::copy(m.positions.begin(), m.positions.end(), mesh->mVertices);
 
-    if (m.normals.size()) {
-        mesh->mNormals = new aiVector3D[mesh->mNumVertices];
-        std::copy(m.normals.begin(), m.normals.end(), mesh->mNormals);
-    }
+	if (m.normals.size()) {
+		mesh->mNormals = new aiVector3D[mesh->mNumVertices];
+		std::copy(m.normals.begin(), m.normals.end(), mesh->mNormals);
+	}
 
-    if (m.uvs.size()) {
-        mesh->mNumUVComponents[0] = 2;
-        mesh->mTextureCoords[0] = new aiVector3D[mesh->mNumVertices];
+	if (m.uvs.size()) {
+		mesh->mNumUVComponents[0] = 2;
+		mesh->mTextureCoords[0] = new aiVector3D[mesh->mNumVertices];
 
-        for (unsigned int i = 0; i < mesh->mNumVertices; ++i) {
-            mesh->mTextureCoords[0][i] = aiVector3D(m.uvs[i].x, m.uvs[i].y, 0.f);
-        }
-    }
+		for (unsigned int i = 0; i < mesh->mNumVertices; ++i) {
+			mesh->mTextureCoords[0][i] = aiVector3D(m.uvs[i].x, m.uvs[i].y, 0.f);
+		}
+	}
 
-    mesh->mNumFaces = static_cast<unsigned int>(m.vcounts.size());
-    mesh->mFaces = new aiFace[m.vcounts.size()];
+	mesh->mNumFaces = static_cast<unsigned int>(m.vcounts.size());
+	mesh->mFaces = new aiFace[m.vcounts.size()];
 
-    unsigned int idx = 0;
-    for (unsigned int i = 0; i < mesh->mNumFaces; ++i) {
-        aiFace &f = mesh->mFaces[i];
-        f.mNumIndices = m.vcounts[i];
-        f.mIndices = new unsigned int[f.mNumIndices];
-        for (unsigned int c = 0; c < f.mNumIndices; ++c) {
-            f.mIndices[c] = idx++;
-        }
-    }
+	unsigned int idx = 0;
+	for (unsigned int i = 0; i < mesh->mNumFaces; ++i) {
+		aiFace &f = mesh->mFaces[i];
+		f.mNumIndices = m.vcounts[i];
+		f.mIndices = new unsigned int[f.mNumIndices];
+		for (unsigned int c = 0; c < f.mNumIndices; ++c) {
+			f.mIndices[c] = idx++;
+		}
+	}
 
-    ai_assert(idx == mesh->mNumVertices);
+	ai_assert(idx == mesh->mNumVertices);
+
+	mesh->mPrimitiveTypes = m.pflags;
+	mesh->mMaterialIndex = m.matid;
 
-    mesh->mPrimitiveTypes = m.pflags;
-    mesh->mMaterialIndex = m.matid;
     return mesh.release();
 }
 
 // ------------------------------------------------------------------------------------------------
-bool XGLImporter::ReadMesh(TempScope &scope) {
-    TempMesh t;
+bool XGLImporter::ReadMesh(XmlNode &node, TempScope &scope) {
+	TempMesh t;
 
-    std::map<unsigned int, TempMaterialMesh> bymat;
-    const unsigned int mesh_id = ReadIDAttr();
+	std::map<unsigned int, TempMaterialMesh> bymat;
+    const unsigned int mesh_id = ReadIDAttr(node);
 
-    while (ReadElementUpToClosing("mesh")) {
-        const std::string &s = GetElementName();
+	for (XmlNode &child : node.children()) {
+        const std::string &s = ai_stdStrToLower(child.name());
 
-        if (s == "mat") {
-            ReadMaterial(scope);
-        } else if (s == "p") {
-            if (!m_reader->getAttributeValue("ID")) {
-                LogWarn("no ID attribute on <p>, ignoring");
-            } else {
-                int id = m_reader->getAttributeValueAsInt("ID");
-                t.points[id] = ReadVec3();
-            }
-        } else if (s == "n") {
-            if (!m_reader->getAttributeValue("ID")) {
-                LogWarn("no ID attribute on <n>, ignoring");
-            } else {
-                int id = m_reader->getAttributeValueAsInt("ID");
-                t.normals[id] = ReadVec3();
-            }
-        } else if (s == "tc") {
-            if (!m_reader->getAttributeValue("ID")) {
-                LogWarn("no ID attribute on <tc>, ignoring");
-            } else {
-                int id = m_reader->getAttributeValueAsInt("ID");
-                t.uvs[id] = ReadVec2();
-            }
-        } else if (s == "f" || s == "l" || s == "p") {
-            const unsigned int vcount = s == "f" ? 3 : (s == "l" ? 2 : 1);
+		if (s == "mat") {
+			ReadMaterial(child, scope);
+		} else if (s == "p") {
+			pugi::xml_attribute attr = child.attribute("ID");
+			if (attr.empty()) {
+				LogWarn("no ID attribute on <p>, ignoring");
+			} else {
+				int id = attr.as_int();
+				t.points[id] = ReadVec3(child);
+			}
+		} else if (s == "n") {
+			pugi::xml_attribute attr = child.attribute("ID");
+			if (attr.empty()) {
+				LogWarn("no ID attribute on <n>, ignoring");
+			} else {
+				int id = attr.as_int();
+				t.normals[id] = ReadVec3(child);
+			}
+		} else if (s == "tc") {
+			pugi::xml_attribute attr = child.attribute("ID");
+			if (attr.empty()) {
+				LogWarn("no ID attribute on <tc>, ignoring");
+			} else {
+				int id = attr.as_int();
+				t.uvs[id] = ReadVec2(child);
+			}
+		} else if (s == "f" || s == "l" || s == "p") {
+			const unsigned int vcount = s == "f" ? 3 : (s == "l" ? 2 : 1);
 
-            unsigned int mid = ~0u;
-            TempFace tf[3];
-            bool has[3] = { 0 };
+			unsigned int mid = ~0u;
+			TempFace tf[3];
+			bool has[3] = { false };
+			for (XmlNode &sub_child : child.children()) {
+                const std::string &scn = ai_stdStrToLower(sub_child.name());
+                if (scn == "fv1" || scn == "lv1" || scn == "pv1") {
+					ReadFaceVertex(sub_child, t, tf[0]);
+					has[0] = true;
+                } else if (scn == "fv2" || scn == "lv2") {
+					ReadFaceVertex(sub_child, t, tf[1]);
+					has[1] = true;
+                } else if (scn == "fv3") {
+					ReadFaceVertex(sub_child, t, tf[2]);
+					has[2] = true;
+                } else if (scn == "mat") {
+					if (mid != ~0u) {
+						LogWarn("only one material tag allowed per <f>");
+					}
+					mid = ResolveMaterialRef(sub_child, scope);
+                } else if (scn == "matref") {
+					if (mid != ~0u) {
+						LogWarn("only one material tag allowed per <f>");
+					}
+					mid = ResolveMaterialRef(sub_child, scope);
+				}
+			}
 
-            while (ReadElementUpToClosing(s.c_str())) {
-                const std::string &elemName = GetElementName();
-                if (elemName == "fv1" || elemName == "lv1" || elemName == "pv1") {
-                    ReadFaceVertex(t, tf[0]);
-                    has[0] = true;
-                } else if (elemName == "fv2" || elemName == "lv2") {
-                    ReadFaceVertex(t, tf[1]);
-                    has[1] = true;
-                } else if (elemName == "fv3") {
-                    ReadFaceVertex(t, tf[2]);
-                    has[2] = true;
-                } else if (elemName == "mat") {
-                    if (mid != ~0u) {
-                        LogWarn("only one material tag allowed per <f>");
-                    }
-                    mid = ResolveMaterialRef(scope);
-                } else if (elemName == "matref") {
-                    if (mid != ~0u) {
-                        LogWarn("only one material tag allowed per <f>");
-                    }
-                    mid = ResolveMaterialRef(scope);
-                }
-            }
+			if (mid == ~0u) {
+				ThrowException("missing material index");
+			}
 
-            if (mid == ~0u) {
-                ThrowException("missing material index");
-            }
+			bool nor = false;
+			bool uv = false;
+			for (unsigned int i = 0; i < vcount; ++i) {
+				if (!has[i]) {
+					ThrowException("missing face vertex data");
+				}
 
-            bool nor = false;
-            bool uv = false;
-            for (unsigned int i = 0; i < vcount; ++i) {
-                if (!has[i]) {
-                    ThrowException("missing face vertex data");
-                }
+				nor = nor || tf[i].has_normal;
+				uv = uv || tf[i].has_uv;
+			}
 
-                nor = nor || tf[i].has_normal;
-                uv = uv || tf[i].has_uv;
-            }
+			if (mid >= (1 << 30)) {
+				LogWarn("material indices exhausted, this may cause errors in the output");
+			}
+			unsigned int meshId = mid | ((nor ? 1 : 0) << 31) | ((uv ? 1 : 0) << 30);
 
-            if (mid >= (1 << 30)) {
-                LogWarn("material indices exhausted, this may cause errors in the output");
-            }
-            unsigned int meshId = mid | ((nor ? 1 : 0) << 31) | ((uv ? 1 : 0) << 30);
+			TempMaterialMesh &mesh = bymat[meshId];
+			mesh.matid = mid;
 
-            TempMaterialMesh &mesh = bymat[meshId];
-            mesh.matid = mid;
+			for (unsigned int i = 0; i < vcount; ++i) {
+				mesh.positions.push_back(tf[i].pos);
+				if (nor) {
+					mesh.normals.push_back(tf[i].normal);
+				}
+				if (uv) {
+					mesh.uvs.push_back(tf[i].uv);
+				}
 
-            for (unsigned int i = 0; i < vcount; ++i) {
-                mesh.positions.push_back(tf[i].pos);
-                if (nor) {
-                    mesh.normals.push_back(tf[i].normal);
-                }
-                if (uv) {
-                    mesh.uvs.push_back(tf[i].uv);
-                }
+				mesh.pflags |= 1 << (vcount - 1);
+			}
 
-                mesh.pflags |= 1 << (vcount - 1);
-            }
+			mesh.vcounts.push_back(vcount);
+		}
+	}
 
-            mesh.vcounts.push_back(vcount);
-        }
-    }
+	// finally extract output meshes and add them to the scope
+	typedef std::pair<const unsigned int, TempMaterialMesh> pairt;
+	for (const pairt &p : bymat) {
+		aiMesh *const m = ToOutputMesh(p.second);
+		scope.meshes_linear.push_back(m);
 
-    // finally extract output meshes and add them to the scope
-    typedef std::pair<const unsigned int, TempMaterialMesh> pairt;
-    for (const pairt &p : bymat) {
-        aiMesh *const m = ToOutputMesh(p.second);
-        scope.meshes_linear.push_back(m);
+		// if this is a definition, keep it on the stack
+		if (mesh_id != ~0u) {
+			scope.meshes.insert(std::pair<unsigned int, aiMesh *>(mesh_id, m));
+		}
+	}
 
-        // if this is a definition, keep it on the stack
-        if (mesh_id != ~0u) {
-            scope.meshes.insert(std::pair<unsigned int, aiMesh *>(mesh_id, m));
-        }
-    }
-
-    // no id == not a reference, insert this mesh right *here*
-    return mesh_id == ~0u;
+	// no id == not a reference, insert this mesh right *here*
+	return mesh_id == ~0u;
 }
 
 // ----------------------------------------------------------------------------------------------
-unsigned int XGLImporter::ResolveMaterialRef(TempScope &scope) {
-    const std::string &s = GetElementName();
-    if (s == "mat") {
-        ReadMaterial(scope);
-        return static_cast<unsigned int>(scope.materials_linear.size() - 1);
-    }
+unsigned int XGLImporter::ResolveMaterialRef(XmlNode &node, TempScope &scope) {
+	const std::string &s = node.name();
+	if (s == "mat") {
+		ReadMaterial(node, scope);
+		return static_cast<unsigned int>(scope.materials_linear.size() - 1);
+	}
 
-    const int id = ReadIndexFromText();
+	const int id = ReadIndexFromText(node);
 
-    std::map<unsigned int, aiMaterial *>::iterator it = scope.materials.find(id), end = scope.materials.end();
-    if (it == end) {
-        ThrowException("<matref> index out of range");
-    }
+	std::map<unsigned int, aiMaterial *>::iterator it = scope.materials.find(id), end = scope.materials.end();
+	if (it == end) {
+		ThrowException("<matref> index out of range");
+	}
 
-    // ok, this is n^2 and should get optimized one day
-    aiMaterial *const m = (*it).second;
+	// ok, this is n^2 and should get optimized one day
+	aiMaterial *const m = it->second;
 
-    unsigned int i = 0, mcount = static_cast<unsigned int>(scope.materials_linear.size());
-    for (; i < mcount; ++i) {
-        if (scope.materials_linear[i] == m) {
-            return i;
-        }
-    }
+	unsigned int i = 0, mcount = static_cast<unsigned int>(scope.materials_linear.size());
+	for (; i < mcount; ++i) {
+		if (scope.materials_linear[i] == m) {
+			return i;
+		}
+	}
 
-    ai_assert(false);
-    return 0;
+	ai_assert(false);
+
+	return 0;
 }
 
 // ------------------------------------------------------------------------------------------------
-void XGLImporter::ReadMaterial(TempScope &scope) {
-    const unsigned int mat_id = ReadIDAttr();
+void XGLImporter::ReadMaterial(XmlNode &node, TempScope &scope) {
+    const unsigned int mat_id = ReadIDAttr(node);
 
-    aiMaterial *mat(new aiMaterial);
-    while (ReadElementUpToClosing("mat")) {
-        const std::string &s = GetElementName();
-        if (s == "amb") {
-            const aiColor3D c = ReadCol3();
-            mat->AddProperty(&c, 1, AI_MATKEY_COLOR_AMBIENT);
-        } else if (s == "diff") {
-            const aiColor3D c = ReadCol3();
-            mat->AddProperty(&c, 1, AI_MATKEY_COLOR_DIFFUSE);
-        } else if (s == "spec") {
-            const aiColor3D c = ReadCol3();
-            mat->AddProperty(&c, 1, AI_MATKEY_COLOR_SPECULAR);
-        } else if (s == "emiss") {
-            const aiColor3D c = ReadCol3();
-            mat->AddProperty(&c, 1, AI_MATKEY_COLOR_EMISSIVE);
-        } else if (s == "alpha") {
-            const float f = ReadFloat();
-            mat->AddProperty(&f, 1, AI_MATKEY_OPACITY);
-        } else if (s == "shine") {
-            const float f = ReadFloat();
-            mat->AddProperty(&f, 1, AI_MATKEY_SHININESS);
-        }
-    }
+	aiMaterial *mat(new aiMaterial);
+	for (XmlNode &child : node.children()) {
+        const std::string &s = ai_stdStrToLower(child.name());
+		if (s == "amb") {
+			const aiColor3D c = ReadCol3(child);
+			mat->AddProperty(&c, 1, AI_MATKEY_COLOR_AMBIENT);
+		} else if (s == "diff") {
+			const aiColor3D c = ReadCol3(child);
+			mat->AddProperty(&c, 1, AI_MATKEY_COLOR_DIFFUSE);
+		} else if (s == "spec") {
+			const aiColor3D c = ReadCol3(child);
+			mat->AddProperty(&c, 1, AI_MATKEY_COLOR_SPECULAR);
+		} else if (s == "emiss") {
+			const aiColor3D c = ReadCol3(child);
+			mat->AddProperty(&c, 1, AI_MATKEY_COLOR_EMISSIVE);
+		} else if (s == "alpha") {
+			const float f = ReadFloat(child);
+			mat->AddProperty(&f, 1, AI_MATKEY_OPACITY);
+		} else if (s == "shine") {
+			const float f = ReadFloat(child);
+			mat->AddProperty(&f, 1, AI_MATKEY_SHININESS);
+		}
+	}
 
-    scope.materials[mat_id] = mat;
-    scope.materials_linear.push_back(mat);
+	scope.materials[mat_id] = mat;
+	scope.materials_linear.push_back(mat);
 }
 
 // ----------------------------------------------------------------------------------------------
-void XGLImporter::ReadFaceVertex(const TempMesh &t, TempFace &out) {
-    const std::string &end = GetElementName();
+void XGLImporter::ReadFaceVertex(XmlNode &node, const TempMesh &t, TempFace &out) {
+	bool havep = false;
+	for (XmlNode &child : node.children()) {
+        const std::string &s = ai_stdStrToLower(child.name());
+		if (s == "pref") {
+			const unsigned int id = ReadIndexFromText(child);
+			std::map<unsigned int, aiVector3D>::const_iterator it = t.points.find(id);
+			if (it == t.points.end()) {
+				ThrowException("point index out of range");
+			}
 
-    bool havep = false;
-    while (ReadElementUpToClosing(end.c_str())) {
-        const std::string &s = GetElementName();
-        if (s == "pref") {
-            const unsigned int id = ReadIndexFromText();
-            std::map<unsigned int, aiVector3D>::const_iterator it = t.points.find(id);
-            if (it == t.points.end()) {
-                ThrowException("point index out of range");
-            }
+			out.pos = (*it).second;
+			havep = true;
+		} else if (s == "nref") {
+			const unsigned int id = ReadIndexFromText(child);
+			std::map<unsigned int, aiVector3D>::const_iterator it = t.normals.find(id);
+			if (it == t.normals.end()) {
+				ThrowException("normal index out of range");
+			}
 
-            out.pos = (*it).second;
-            havep = true;
-        } else if (s == "nref") {
-            const unsigned int id = ReadIndexFromText();
-            std::map<unsigned int, aiVector3D>::const_iterator it = t.normals.find(id);
-            if (it == t.normals.end()) {
-                ThrowException("normal index out of range");
-            }
+			out.normal = (*it).second;
+			out.has_normal = true;
+		} else if (s == "tcref") {
+			const unsigned int id = ReadIndexFromText(child);
+			std::map<unsigned int, aiVector2D>::const_iterator it = t.uvs.find(id);
+			if (it == t.uvs.end()) {
+				ThrowException("uv index out of range");
+			}
 
-            out.normal = (*it).second;
-            out.has_normal = true;
-        } else if (s == "tcref") {
-            const unsigned int id = ReadIndexFromText();
-            std::map<unsigned int, aiVector2D>::const_iterator it = t.uvs.find(id);
-            if (it == t.uvs.end()) {
-                ThrowException("uv index out of range");
-            }
+			out.uv = (*it).second;
+			out.has_uv = true;
+		} else if (s == "p") {
+			out.pos = ReadVec3(child);
+		} else if (s == "n") {
+			out.normal = ReadVec3(child);
+		} else if (s == "tc") {
+			out.uv = ReadVec2(child);
+		}
+	}
 
-            out.uv = (*it).second;
-            out.has_uv = true;
-        } else if (s == "p") {
-            out.pos = ReadVec3();
-        } else if (s == "n") {
-            out.normal = ReadVec3();
-        } else if (s == "tc") {
-            out.uv = ReadVec2();
-        }
-    }
-
-    if (!havep) {
-        ThrowException("missing <pref> in <fvN> element");
-    }
+	if (!havep) {
+		ThrowException("missing <pref> in <fvN> element");
+	}
 }
 
 // ------------------------------------------------------------------------------------------------
-unsigned int XGLImporter::ReadIDAttr() {
-    for (int i = 0, e = m_reader->getAttributeCount(); i < e; ++i) {
+unsigned int XGLImporter::ReadIDAttr(XmlNode &node) {
+	for (pugi::xml_attribute attr : node.attributes()) {
+		if (!ASSIMP_stricmp(attr.name(), "id")) {
+			return attr.as_int();
+		}
+	}
 
-        if (!ASSIMP_stricmp(m_reader->getAttributeName(i), "id")) {
-            return m_reader->getAttributeValueAsInt(i);
-        }
-    }
-    return ~0u;
+	return ~0u;
 }
 
 // ------------------------------------------------------------------------------------------------
-float XGLImporter::ReadFloat() {
-    if (!SkipToText()) {
-        LogError("unexpected EOF reading float element contents");
-        return 0.f;
-    }
-    const char *s = m_reader->getNodeData(), *se;
+float XGLImporter::ReadFloat(XmlNode &node) {
+    std::string v;
+    XmlParser::getValueAsString(node, v);
+    const char *s = v.c_str(), *se;
+	if (!SkipSpaces(&s)) {
+		LogError("unexpected EOL, failed to parse index element");
+		return 0.f;
+	}
+	float t;
+	se = fast_atoreal_move(s, t);
+	if (se == s) {
+		LogError("failed to read float text");
+		return 0.f;
+	}
 
-    if (!SkipSpaces(&s)) {
-        LogError("unexpected EOL, failed to parse float");
-        return 0.f;
-    }
-
-    float t;
-    se = fast_atoreal_move(s, t);
-
-    if (se == s) {
-        LogError("failed to read float text");
-        return 0.f;
-    }
-
-    return t;
+	return t;
 }
 
 // ------------------------------------------------------------------------------------------------
-unsigned int XGLImporter::ReadIndexFromText() {
-    if (!SkipToText()) {
-        LogError("unexpected EOF reading index element contents");
-        return ~0u;
-    }
-    const char *s = m_reader->getNodeData(), *se;
-    if (!SkipSpaces(&s)) {
-        LogError("unexpected EOL, failed to parse index element");
-        return ~0u;
-    }
+unsigned int XGLImporter::ReadIndexFromText(XmlNode &node) {
+    std::string v;
+    XmlParser::getValueAsString(node, v);
+    const char *s = v.c_str();
+	if (!SkipSpaces(&s)) {
+		LogError("unexpected EOL, failed to parse index element");
+		return ~0u;
+	}
+	const char *se;
+	const unsigned int t = strtoul10(s, &se);
 
-    const unsigned int t = strtoul10(s, &se);
+	if (se == s) {
+		LogError("failed to read index");
+		return ~0u;
+	}
 
-    if (se == s) {
-        LogError("failed to read index");
-        return ~0u;
-    }
-
-    return t;
+	return t;
 }
 
 // ------------------------------------------------------------------------------------------------
-aiVector2D XGLImporter::ReadVec2() {
-    aiVector2D vec;
+aiVector2D XGLImporter::ReadVec2(XmlNode &node) {
+	aiVector2D vec;
+    std::string val;
+    XmlParser::getValueAsString(node, val);
+    const char *s = val.c_str();
+	ai_real v[2];
+	for (int i = 0; i < 2; ++i) {
+		if (!SkipSpaces(&s)) {
+			LogError("unexpected EOL, failed to parse vec2");
+			return vec;
+		}
 
-    if (!SkipToText()) {
-        LogError("unexpected EOF reading vec2 contents");
-        return vec;
-    }
-    const char *s = m_reader->getNodeData();
+		v[i] = fast_atof(&s);
 
-    ai_real v[2];
-    for (int i = 0; i < 2; ++i) {
-        if (!SkipSpaces(&s)) {
-            LogError("unexpected EOL, failed to parse vec2");
-            return vec;
-        }
+		SkipSpaces(&s);
+		if (i != 1 && *s != ',') {
+			LogError("expected comma, failed to parse vec2");
+			return vec;
+		}
+		++s;
+	}
+	vec.x = v[0];
+	vec.y = v[1];
 
-        v[i] = fast_atof(&s);
-
-        SkipSpaces(&s);
-        if (i != 1 && *s != ',') {
-            LogError("expected comma, failed to parse vec2");
-            return vec;
-        }
-        ++s;
-    }
-    vec.x = v[0];
-    vec.y = v[1];
-
-    return vec;
+	return vec;
 }
 
 // ------------------------------------------------------------------------------------------------
-aiVector3D XGLImporter::ReadVec3() {
-    aiVector3D vec;
+aiVector3D XGLImporter::ReadVec3(XmlNode &node) {
+	aiVector3D vec;
+    std::string v;
+    XmlParser::getValueAsString(node, v);
+	const char *s = v.c_str();
+	for (int i = 0; i < 3; ++i) {
+		if (!SkipSpaces(&s)) {
+			LogError("unexpected EOL, failed to parse vec3");
+			return vec;
+		}
+		vec[i] = fast_atof(&s);
 
-    if (!SkipToText()) {
-        LogError("unexpected EOF reading vec3 contents");
-        return vec;
-    }
-    const char *s = m_reader->getNodeData();
+		SkipSpaces(&s);
+		if (i != 2 && *s != ',') {
+			LogError("expected comma, failed to parse vec3");
+			return vec;
+		}
+		++s;
+	}
 
-    for (int i = 0; i < 3; ++i) {
-        if (!SkipSpaces(&s)) {
-            LogError("unexpected EOL, failed to parse vec3");
-            return vec;
-        }
-        vec[i] = fast_atof(&s);
-
-        SkipSpaces(&s);
-        if (i != 2 && *s != ',') {
-            LogError("expected comma, failed to parse vec3");
-            return vec;
-        }
-        ++s;
-    }
-
-    return vec;
+	return vec;
 }
 
 // ------------------------------------------------------------------------------------------------
-aiColor3D XGLImporter::ReadCol3() {
-    const aiVector3D &v = ReadVec3();
-    if (v.x < 0.f || v.x > 1.0f || v.y < 0.f || v.y > 1.0f || v.z < 0.f || v.z > 1.0f) {
-        LogWarn("color values out of range, ignoring");
-    }
-    return aiColor3D(v.x, v.y, v.z);
+aiColor3D XGLImporter::ReadCol3(XmlNode &node) {
+	const aiVector3D &v = ReadVec3(node);
+	if (v.x < 0.f || v.x > 1.0f || v.y < 0.f || v.y > 1.0f || v.z < 0.f || v.z > 1.0f) {
+		LogWarn("color values out of range, ignoring");
+	}
+	return aiColor3D(v.x, v.y, v.z);
 }
 
 #endif
diff --git a/code/AssetLib/XGL/XGLLoader.h b/code/AssetLib/XGL/XGLLoader.h
index bf699541f..8626aeb0e 100644
--- a/code/AssetLib/XGL/XGLLoader.h
+++ b/code/AssetLib/XGL/XGLLoader.h
@@ -4,7 +4,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -47,12 +46,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_XGLLOADER_H_INCLUDED
 
 #include <assimp/BaseImporter.h>
+#include <assimp/XmlParser.h>
 #include <assimp/LogAux.h>
-#include <assimp/irrXMLWrapper.h>
 #include <assimp/light.h>
 #include <assimp/material.h>
 #include <assimp/mesh.h>
+#include <assimp/light.h>
 #include <assimp/Importer.hpp>
+#include <assimp/XmlParser.h>
+
 #include <map>
 #include <memory>
 
@@ -70,7 +72,6 @@ public:
     XGLImporter();
     ~XGLImporter();
 
-public:
     // -------------------------------------------------------------------
     /** Returns whether the class can handle the format of the given file.
      *  See BaseImporter::CanRead() for details.    */
@@ -92,7 +93,9 @@ protected:
 private:
     struct TempScope {
         TempScope() :
-                light() {}
+                light() {
+            // empty
+        }
 
         ~TempScope() {
             for (aiMesh *m : meshes_linear) {
@@ -125,7 +128,9 @@ private:
 
     struct SortMeshByMaterialId {
         SortMeshByMaterialId(const TempScope &scope) :
-                scope(scope) {}
+                scope(scope) {
+            // empty
+        }
         bool operator()(unsigned int a, unsigned int b) const {
             return scope.meshes_linear[a]->mMaterialIndex < scope.meshes_linear[b]->mMaterialIndex;
         };
@@ -141,7 +146,10 @@ private:
 
     struct TempMaterialMesh {
         TempMaterialMesh() :
-                pflags(), matid() {}
+                pflags(),
+                matid() {
+            // empty
+        }
 
         std::vector<aiVector3D> positions, normals;
         std::vector<aiVector2D> uvs;
@@ -153,7 +161,10 @@ private:
 
     struct TempFace {
         TempFace() :
-                has_uv(), has_normal() {}
+                has_uv(),
+                has_normal() {
+            // empty
+        }
 
         aiVector3D pos;
         aiVector3D normal;
@@ -169,27 +180,27 @@ private:
     bool ReadElement();
     bool ReadElementUpToClosing(const char *closetag);
     bool SkipToText();
-    unsigned int ReadIDAttr();
+    unsigned int ReadIDAttr(XmlNode &node);
 
-    void ReadWorld(TempScope &scope);
-    void ReadLighting(TempScope &scope);
-    aiLight *ReadDirectionalLight();
-    aiNode *ReadObject(TempScope &scope, bool skipFirst = false, const char *closetag = "object");
-    bool ReadMesh(TempScope &scope);
-    void ReadMaterial(TempScope &scope);
-    aiVector2D ReadVec2();
-    aiVector3D ReadVec3();
-    aiColor3D ReadCol3();
-    aiMatrix4x4 ReadTrafo();
-    unsigned int ReadIndexFromText();
-    float ReadFloat();
+    void ReadWorld(XmlNode &node, TempScope &scope);
+    void ReadLighting(XmlNode &node, TempScope &scope);
+    aiLight *ReadDirectionalLight(XmlNode &node);
+    aiNode *ReadObject(XmlNode &node, TempScope &scope, bool skipFirst = false/*, const char *closetag = "object"*/);
+    bool ReadMesh(XmlNode &node, TempScope &scope);
+    void ReadMaterial(XmlNode &node, TempScope &scope);
+    aiVector2D ReadVec2(XmlNode &node);
+    aiVector3D ReadVec3(XmlNode &node);
+    aiColor3D ReadCol3(XmlNode &node);
+    aiMatrix4x4 ReadTrafo(XmlNode &node);
+    unsigned int ReadIndexFromText(XmlNode &node);
+    float ReadFloat(XmlNode &node);
 
     aiMesh *ToOutputMesh(const TempMaterialMesh &m);
-    void ReadFaceVertex(const TempMesh &t, TempFace &out);
-    unsigned int ResolveMaterialRef(TempScope &scope);
+    void ReadFaceVertex(XmlNode &node, const TempMesh &t, TempFace &out);
+    unsigned int ResolveMaterialRef(XmlNode &node, TempScope &scope);
 
 private:
-    std::shared_ptr<irr::io::IrrXMLReader> m_reader;
+    XmlParser *mXmlParser;
     aiScene *m_scene;
 };
 
diff --git a/code/AssetLib/glTF/glTFAsset.h b/code/AssetLib/glTF/glTFAsset.h
index d6d1dd372..189cf1da8 100644
--- a/code/AssetLib/glTF/glTFAsset.h
+++ b/code/AssetLib/glTF/glTFAsset.h
@@ -1,4 +1,4 @@
-/*
+/*
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
@@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef GLTFASSET_H_INC
 #define GLTFASSET_H_INC
 
-#ifndef ASSIMP_BUILD_NO_GLTF_IMPORTER
+#if !defined(ASSIMP_BUILD_NO_GLTF_IMPORTER) && !defined(ASSIMP_BUILD_NO_GLTF1_IMPORTER)
 
 #include <assimp/Exceptional.h>
 
@@ -60,19 +60,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <algorithm>
 #include <stdexcept>
 
-#ifndef RAPIDJSON_HAS_STDSTRING
-#define RAPIDJSON_HAS_STDSTRING 1
-#endif
-
 #if (__GNUC__ == 8 && __GNUC_MINOR__ >= 0)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wclass-memaccess"
 #endif
 
-#ifndef RAPIDJSON_NOMEMBERITERATORCLASS
-#define RAPIDJSON_NOMEMBERITERATORCLASS
-#endif
-
 #include <rapidjson/rapidjson.h>
 #include <rapidjson/document.h>
 #include <rapidjson/error/en.h>
diff --git a/code/AssetLib/glTF/glTFAsset.inl b/code/AssetLib/glTF/glTFAsset.inl
index 116f76535..18c4784d1 100644
--- a/code/AssetLib/glTF/glTFAsset.inl
+++ b/code/AssetLib/glTF/glTFAsset.inl
@@ -40,6 +40,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <assimp/StringUtils.h>
+#include <assimp/MemoryIOWrapper.h>
 #include <iomanip>
 
 // Header files, Assimp
@@ -57,10 +58,10 @@ namespace glTF {
 
 namespace {
 
-#ifdef _WIN32
+#if _MSC_VER
 #    pragma warning(push)
 #    pragma warning(disable : 4706)
-#endif // _WIN32
+#endif // _MSC_VER
 
 //
 // JSON Value reading helpers
@@ -235,15 +236,15 @@ Ref<T> LazyDict<T>::Get(const char *id) {
 
     // read it from the JSON object
     if (!mDict) {
-        throw DeadlyImportError("GLTF: Missing section \"" + std::string(mDictId) + "\"");
+        throw DeadlyImportError("GLTF: Missing section \"", mDictId, "\"");
     }
 
     Value::MemberIterator obj = mDict->FindMember(id);
     if (obj == mDict->MemberEnd()) {
-        throw DeadlyImportError("GLTF: Missing object with id \"" + std::string(id) + "\" in \"" + mDictId + "\"");
+        throw DeadlyImportError("GLTF: Missing object with id \"", id, "\" in \"", mDictId, "\"");
     }
     if (!obj->value.IsObject()) {
-        throw DeadlyImportError("GLTF: Object with id \"" + std::string(id) + "\" is not a JSON object");
+        throw DeadlyImportError("GLTF: Object with id \"", id, "\" is not a JSON object");
     }
 
     // create an instance of the given type
@@ -317,13 +318,13 @@ inline void Buffer::Read(Value &obj, Asset &r) {
             this->mData.reset(data, std::default_delete<uint8_t[]>());
 
             if (statedLength > 0 && this->byteLength != statedLength) {
-                throw DeadlyImportError("GLTF: buffer \"" + id + "\", expected " + to_string(statedLength) +
-                                        " bytes, but found " + to_string(dataURI.dataLength));
+                throw DeadlyImportError("GLTF: buffer \"", id, "\", expected ", to_string(statedLength),
+                                        " bytes, but found ", to_string(dataURI.dataLength));
             }
         } else { // assume raw data
             if (statedLength != dataURI.dataLength) {
-                throw DeadlyImportError("GLTF: buffer \"" + id + "\", expected " + to_string(statedLength) +
-                                        " bytes, but found " + to_string(dataURI.dataLength));
+                throw DeadlyImportError("GLTF: buffer \"", id, "\", expected ", to_string(statedLength),
+                                        " bytes, but found ", to_string(dataURI.dataLength));
             }
 
             this->mData.reset(new uint8_t[dataURI.dataLength], std::default_delete<uint8_t[]>());
@@ -331,7 +332,10 @@ inline void Buffer::Read(Value &obj, Asset &r) {
         }
     } else { // Local file
         if (byteLength > 0) {
-            std::string dir = !r.mCurrentAssetDir.empty() ? (r.mCurrentAssetDir) : "";
+            std::string dir = !r.mCurrentAssetDir.empty() ? (
+                r.mCurrentAssetDir.back() == '/' ?
+                   r.mCurrentAssetDir : r.mCurrentAssetDir + '/'
+            ) : "";
 
             IOStream *file = r.OpenFile(dir + uri, "rb");
             if (file) {
@@ -339,9 +343,9 @@ inline void Buffer::Read(Value &obj, Asset &r) {
                 delete file;
 
                 if (!ok)
-                    throw DeadlyImportError("GLTF: error while reading referenced file \"" + std::string(uri) + "\"");
+                    throw DeadlyImportError("GLTF: error while reading referenced file \"", uri, "\"");
             } else {
-                throw DeadlyImportError("GLTF: could not open referenced file \"" + std::string(uri) + "\"");
+                throw DeadlyImportError("GLTF: could not open referenced file \"", uri, "\"");
             }
         }
     }
@@ -372,8 +376,8 @@ inline void Buffer::EncodedRegion_Mark(const size_t pOffset, const size_t pEncod
 
         char val[val_size];
 
-        ai_snprintf(val, val_size, "%llu", (long long)pOffset);
-        throw DeadlyImportError(std::string("GLTF: incorrect offset value (") + val + ") for marking encoded region.");
+        ai_snprintf(val, val_size, AI_SIZEFMT, pOffset);
+        throw DeadlyImportError("GLTF: incorrect offset value (", val, ") for marking encoded region.");
     }
 
     // Check length
@@ -382,8 +386,8 @@ inline void Buffer::EncodedRegion_Mark(const size_t pOffset, const size_t pEncod
 
         char val[val_size];
 
-        ai_snprintf(val, val_size, "%llu, %llu", (long long)pOffset, (long long)pEncodedData_Length);
-        throw DeadlyImportError(std::string("GLTF: encoded region with offset/length (") + val + ") is out of range.");
+        ai_snprintf(val, val_size, AI_SIZEFMT "/" AI_SIZEFMT, pOffset, pEncodedData_Length);
+        throw DeadlyImportError("GLTF: encoded region with offset/length (", val, ") is out of range.");
     }
 
     // Add new region
@@ -403,7 +407,7 @@ inline void Buffer::EncodedRegion_SetCurrent(const std::string &pID) {
         }
     }
 
-    throw DeadlyImportError("GLTF: EncodedRegion with ID: \"" + pID + "\" not found.");
+    throw DeadlyImportError("GLTF: EncodedRegion with ID: \"", pID, "\" not found.");
 }
 
 inline bool Buffer::ReplaceData(const size_t pBufferData_Offset, const size_t pBufferData_Count, const uint8_t *pReplace_Data, const size_t pReplace_Count) {
@@ -836,8 +840,8 @@ inline void Mesh::Read(Value &pJSON_Object, Asset &pAsset_Root) {
 
     if (json_extensions == nullptr) goto mr_skip_extensions;
 
-    for (Value::MemberIterator it_memb = json_extensions->MemberBegin(); it_memb != json_extensions->MemberEnd(); it_memb++) {
 #ifdef ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC
+    for (Value::MemberIterator it_memb = json_extensions->MemberBegin(); it_memb != json_extensions->MemberEnd(); it_memb++) {
         if (it_memb->name.GetString() == std::string("Open3DGC-compression")) {
             // Search for compressed data.
             // Compressed data contain description of part of "buffer" which is encoded. This part must be decoded and
@@ -851,7 +855,7 @@ inline void Mesh::Read(Value &pJSON_Object, Asset &pAsset_Root) {
 /************** Read data from JSON-document **************/
 #define MESH_READ_COMPRESSEDDATA_MEMBER(pFieldName, pOut)                                                  \
     if (!ReadMember(*comp_data, pFieldName, pOut)) {                                                       \
-        throw DeadlyImportError(std::string("GLTF: \"compressedData\" must has \"") + pFieldName + "\"."); \
+        throw DeadlyImportError("GLTF: \"compressedData\" must has \"", pFieldName, "\"."); \
     }
 
             const char *mode_str;
@@ -880,18 +884,18 @@ inline void Mesh::Read(Value &pJSON_Object, Asset &pAsset_Root) {
             else if (strcmp(mode_str, "ascii") == 0)
                 ext_o3dgc->Binary = false;
             else
-                throw DeadlyImportError(std::string("GLTF: for compressed data supported modes is: \"ascii\", \"binary\". Not the: \"") + mode_str + "\".");
+                throw DeadlyImportError("GLTF: for compressed data supported modes is: \"ascii\", \"binary\". Not the: \"", mode_str, "\".");
 
             /************************ Decoding ************************/
             Decode_O3DGC(*ext_o3dgc, pAsset_Root);
             Extension.push_back(ext_o3dgc); // store info in mesh extensions list.
         } // if(it_memb->name.GetString() == "Open3DGC-compression")
         else
-#endif
         {
-            throw DeadlyImportError(std::string("GLTF: Unknown mesh extension: \"") + it_memb->name.GetString() + "\".");
+            throw DeadlyImportError("GLTF: Unknown mesh extension: \"", it_memb->name.GetString(), "\".");
         }
     } // for(Value::MemberIterator it_memb = json_extensions->MemberBegin(); it_memb != json_extensions->MemberEnd(); json_extensions++)
+#endif
 
 mr_skip_extensions:
 
@@ -923,24 +927,24 @@ inline void Mesh::Decode_O3DGC(const SCompression_Open3DGC &pCompression_Open3DG
     size_t size_coordindex = ifs.GetNCoordIndex() * 3; // See float attributes note.
 
     if (primitives[0].indices->count != size_coordindex)
-        throw DeadlyImportError("GLTF: Open3DGC. Compressed indices count (" + to_string(size_coordindex) +
-                                ") not equal to uncompressed (" + to_string(primitives[0].indices->count) + ").");
+        throw DeadlyImportError("GLTF: Open3DGC. Compressed indices count (", to_string(size_coordindex),
+                                ") not equal to uncompressed (", to_string(primitives[0].indices->count), ").");
 
     size_coordindex *= sizeof(IndicesType);
     // Coordinates
     size_t size_coord = ifs.GetNCoord(); // See float attributes note.
 
     if (primitives[0].attributes.position[0]->count != size_coord)
-        throw DeadlyImportError("GLTF: Open3DGC. Compressed positions count (" + to_string(size_coord) +
-                                ") not equal to uncompressed (" + to_string(primitives[0].attributes.position[0]->count) + ").");
+        throw DeadlyImportError("GLTF: Open3DGC. Compressed positions count (", to_string(size_coord),
+                                ") not equal to uncompressed (", to_string(primitives[0].attributes.position[0]->count), ").");
 
     size_coord *= 3 * sizeof(float);
     // Normals
     size_t size_normal = ifs.GetNNormal(); // See float attributes note.
 
     if (primitives[0].attributes.normal[0]->count != size_normal)
-        throw DeadlyImportError("GLTF: Open3DGC. Compressed normals count (" + to_string(size_normal) +
-                                ") not equal to uncompressed (" + to_string(primitives[0].attributes.normal[0]->count) + ").");
+        throw DeadlyImportError("GLTF: Open3DGC. Compressed normals count (", to_string(size_normal),
+                                ") not equal to uncompressed (", to_string(primitives[0].attributes.normal[0]->count), ").");
 
     size_normal *= 3 * sizeof(float);
     // Additional attributes.
@@ -961,8 +965,8 @@ inline void Mesh::Decode_O3DGC(const SCompression_Open3DGC &pCompression_Open3DG
                 // Check situation when encoded data contain texture coordinates but primitive not.
                 if (idx_texcoord < primitives[0].attributes.texcoord.size()) {
                     if (primitives[0].attributes.texcoord[idx]->count != tval)
-                        throw DeadlyImportError("GLTF: Open3DGC. Compressed texture coordinates count (" + to_string(tval) +
-                                                ") not equal to uncompressed (" + to_string(primitives[0].attributes.texcoord[idx]->count) + ").");
+                        throw DeadlyImportError("GLTF: Open3DGC. Compressed texture coordinates count (", to_string(tval),
+                                                ") not equal to uncompressed (", to_string(primitives[0].attributes.texcoord[idx]->count), ").");
 
                     idx_texcoord++;
                 } else {
@@ -971,7 +975,7 @@ inline void Mesh::Decode_O3DGC(const SCompression_Open3DGC &pCompression_Open3DG
 
                 break;
             default:
-                throw DeadlyImportError("GLTF: Open3DGC. Unsupported type of float attribute: " + to_string(ifs.GetFloatAttributeType(static_cast<unsigned long>(idx))));
+                throw DeadlyImportError("GLTF: Open3DGC. Unsupported type of float attribute: ", to_string(ifs.GetFloatAttributeType(static_cast<unsigned long>(idx))));
         }
 
         tval *= ifs.GetFloatAttributeDim(static_cast<unsigned long>(idx)) * sizeof(o3dgc::Real); // After checking count of objects we can get size of array.
@@ -990,7 +994,7 @@ inline void Mesh::Decode_O3DGC(const SCompression_Open3DGC &pCompression_Open3DG
                 break;
 
             default:
-                throw DeadlyImportError("GLTF: Open3DGC. Unsupported type of int attribute: " + to_string(ifs.GetIntAttributeType(static_cast<unsigned long>(idx))));
+                throw DeadlyImportError("GLTF: Open3DGC. Unsupported type of int attribute: ", to_string(ifs.GetIntAttributeType(static_cast<unsigned long>(idx))));
         }
 
         tval *= ifs.GetIntAttributeDim(static_cast<unsigned long>(idx)) * sizeof(long); // See float attributes note.
@@ -1025,7 +1029,7 @@ inline void Mesh::Decode_O3DGC(const SCompression_Open3DGC &pCompression_Open3DG
 
                 break;
             default:
-                throw DeadlyImportError("GLTF: Open3DGC. Unsupported type of float attribute: " + to_string(ifs.GetFloatAttributeType(static_cast<unsigned long>(idx))));
+                throw DeadlyImportError("GLTF: Open3DGC. Unsupported type of float attribute: ", to_string(ifs.GetFloatAttributeType(static_cast<unsigned long>(idx))));
         }
     }
 
@@ -1039,7 +1043,7 @@ inline void Mesh::Decode_O3DGC(const SCompression_Open3DGC &pCompression_Open3DG
 
             // ifs.SetIntAttribute(idx, (long* const)(decoded_data + get_buf_offset(primitives[0].attributes.joint)));
             default:
-                throw DeadlyImportError("GLTF: Open3DGC. Unsupported type of int attribute: " + to_string(ifs.GetIntAttributeType(static_cast<unsigned long>(idx))));
+                throw DeadlyImportError("GLTF: Open3DGC. Unsupported type of int attribute: ", to_string(ifs.GetIntAttributeType(static_cast<unsigned long>(idx))));
         }
     }
 
@@ -1060,7 +1064,7 @@ inline void Mesh::Decode_O3DGC(const SCompression_Open3DGC &pCompression_Open3DG
 inline void Camera::Read(Value &obj, Asset & /*r*/) {
     type = MemberOrDefault(obj, "type", Camera::Perspective);
 
-    const char *subobjId = (type == Camera::Orthographic) ? "ortographic" : "perspective";
+    const char *subobjId = (type == Camera::Orthographic) ? "orthographic" : "perspective";
 
     Value *it = FindObject(obj, subobjId);
     if (!it) throw DeadlyImportError("GLTF: Camera missing its parameters");
@@ -1071,10 +1075,10 @@ inline void Camera::Read(Value &obj, Asset & /*r*/) {
         perspective.zfar = MemberOrDefault(*it, "zfar", 100.f);
         perspective.znear = MemberOrDefault(*it, "znear", 0.01f);
     } else {
-        ortographic.xmag = MemberOrDefault(obj, "xmag", 1.f);
-        ortographic.ymag = MemberOrDefault(obj, "ymag", 1.f);
-        ortographic.zfar = MemberOrDefault(obj, "zfar", 100.f);
-        ortographic.znear = MemberOrDefault(obj, "znear", 0.01f);
+        ortographic.xmag = MemberOrDefault(*it, "xmag", 1.f);
+        ortographic.ymag = MemberOrDefault(*it, "ymag", 1.f);
+        ortographic.zfar = MemberOrDefault(*it, "zfar", 100.f);
+        ortographic.znear = MemberOrDefault(*it, "znear", 0.01f);
     }
 }
 
@@ -1231,7 +1235,7 @@ inline void AssetMetadata::Read(Document &doc) {
     }
 
     if (version.empty() || version[0] != '1') {
-        throw DeadlyImportError("GLTF: Unsupported glTF version: " + version);
+        throw DeadlyImportError("GLTF: Unsupported glTF version: ", version);
     }
 }
 
@@ -1276,7 +1280,9 @@ inline void Asset::Load(const std::string &pFile, bool isBinary) {
 
     /*int pos = std::max(int(pFile.rfind('/')), int(pFile.rfind('\\')));
     if (pos != int(std::string::npos)) mCurrentAssetDir = pFile.substr(0, pos + 1);*/
-    mCurrentAssetDir = getCurrentAssetDir(pFile);
+    if (0 != strncmp(pFile.c_str(), AI_MEMORYIO_MAGIC_FILENAME, AI_MEMORYIO_MAGIC_FILENAME_LENGTH)) {
+        mCurrentAssetDir = getCurrentAssetDir(pFile);
+    }
 
     shared_ptr<IOStream> stream(OpenFile(pFile.c_str(), "rb", true));
     if (!stream) {
@@ -1309,7 +1315,7 @@ inline void Asset::Load(const std::string &pFile, bool isBinary) {
     if (doc.HasParseError()) {
         char buffer[32];
         ai_snprintf(buffer, 32, "%d", static_cast<int>(doc.GetErrorOffset()));
-        throw DeadlyImportError(std::string("GLTF: JSON parse error, offset ") + buffer + ": " + GetParseError_En(doc.GetParseError()));
+        throw DeadlyImportError("GLTF: JSON parse error, offset ", buffer, ": ", GetParseError_En(doc.GetParseError()));
     }
 
     if (!doc.IsObject()) {
@@ -1412,8 +1418,8 @@ inline std::string Asset::FindUniqueID(const std::string &str, const char *suffi
     return id;
 }
 
-#ifdef _WIN32
+#if _MSC_VER
 #    pragma warning(pop)
-#endif // WIN32
+#endif // _MSC_VER
 
 } // namespace glTF
diff --git a/code/AssetLib/glTF/glTFAssetWriter.h b/code/AssetLib/glTF/glTFAssetWriter.h
index f166ee532..ed81d12cd 100644
--- a/code/AssetLib/glTF/glTFAssetWriter.h
+++ b/code/AssetLib/glTF/glTFAssetWriter.h
@@ -50,7 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef GLTFASSETWRITER_H_INC
 #define GLTFASSETWRITER_H_INC
 
-#ifndef ASSIMP_BUILD_NO_GLTF_IMPORTER
+#if !defined(ASSIMP_BUILD_NO_GLTF_IMPORTER) && !defined(ASSIMP_BUILD_NO_GLTF1_IMPORTER)
 
 #include "glTFAsset.h"
 
diff --git a/code/AssetLib/glTF/glTFAssetWriter.inl b/code/AssetLib/glTF/glTFAssetWriter.inl
index d8d2556fa..8db507c7e 100644
--- a/code/AssetLib/glTF/glTFAssetWriter.inl
+++ b/code/AssetLib/glTF/glTFAssetWriter.inl
@@ -43,10 +43,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <rapidjson/writer.h>
 #include <rapidjson/prettywriter.h>
 
-#ifdef _WIN32
+#if _MSC_VER
 #    pragma warning(push)
 #    pragma warning( disable : 4706)
-#endif // _WIN32
+#endif // _MSC_VER
 
 namespace glTF {
 
@@ -305,11 +305,11 @@ namespace glTF {
 			Value json_extensions;
 
 			json_extensions.SetObject();
+#ifdef ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC
 			for(Mesh::SExtension* ptr_ext : m.Extension)
 			{
 				switch(ptr_ext->Type)
 				{
-#ifdef ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC
 					case Mesh::SExtension::EType::Compression_Open3DGC:
 						{
 							Value json_comp_data;
@@ -339,11 +339,11 @@ namespace glTF {
 						}
 
 						break;
-#endif
 					default:
 						throw DeadlyImportError("GLTF: Can not write mesh: unknown mesh extension, only Open3DGC is supported.");
 				}// switch(ptr_ext->Type)
 			}// for(Mesh::SExtension* ptr_ext : m.Extension)
+#endif
 
 			// Add extensions to mesh
 			obj.AddMember("extensions", json_extensions, w.mAl);
@@ -707,7 +707,7 @@ namespace glTF {
         w.WriteObjects(d);
     }
 
-#ifdef _WIN32
+#if _MSC_VER
 #    pragma warning(pop)
 #endif // _WIN32
 
diff --git a/code/AssetLib/glTF/glTFCommon.cpp b/code/AssetLib/glTF/glTFCommon.cpp
index 2c46a46e3..01ba31209 100644
--- a/code/AssetLib/glTF/glTFCommon.cpp
+++ b/code/AssetLib/glTF/glTFCommon.cpp
@@ -38,6 +38,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ----------------------------------------------------------------------
 */
+#ifndef ASSIMP_BUILD_NO_GLTF_IMPORTER
+
 #include "AssetLib/glTF/glTFCommon.h"
 
 namespace glTFCommon {
@@ -47,7 +49,9 @@ using namespace glTFCommon::Util;
 namespace Util {
 
 size_t DecodeBase64(const char *in, size_t inLength, uint8_t *&out) {
-    ai_assert(inLength % 4 == 0);
+    if (inLength % 4 != 0) {
+        throw DeadlyImportError("Invalid base64 encoded data: \"", std::string(in, std::min(size_t(32), inLength)), "\", length:", inLength);
+    }
 
     if (inLength < 4) {
         out = 0;
@@ -187,3 +191,5 @@ bool ParseDataURI(const char *const_uri, size_t uriLen, DataURI &out) {
 
 } // namespace Util
 } // namespace glTFCommon
+
+#endif
diff --git a/code/AssetLib/glTF/glTFCommon.h b/code/AssetLib/glTF/glTFCommon.h
index b151918b6..6d402b0e3 100644
--- a/code/AssetLib/glTF/glTFCommon.h
+++ b/code/AssetLib/glTF/glTFCommon.h
@@ -52,8 +52,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <string>
 #include <vector>
 
-#define RAPIDJSON_HAS_STDSTRING 1
-#define RAPIDJSON_NOMEMBERITERATORCLASS
 #include <rapidjson/document.h>
 #include <rapidjson/error/en.h>
 #include <rapidjson/rapidjson.h>
@@ -190,10 +188,10 @@ inline void CopyValue(const glTFCommon::mat4 &v, aiMatrix4x4 &o) {
     o.d4 = v[15];
 }
 
-#ifdef _WIN32
+#if _MSC_VER
 #    pragma warning(push)
 #    pragma warning(disable : 4310)
-#endif // _WIN32
+#endif // _MSC_VER
 
 inline std::string getCurrentAssetDir(const std::string &pFile) {
     std::string path = pFile;
@@ -204,9 +202,9 @@ inline std::string getCurrentAssetDir(const std::string &pFile) {
 
     return path;
 }
-#ifdef _WIN32
+#if _MSC_VER
 #    pragma warning(pop)
-#endif // _WIN32
+#endif // _MSC_VER
 
 namespace Util {
 
@@ -251,7 +249,10 @@ inline char EncodeCharBase64(uint8_t b) {
 }
 
 inline uint8_t DecodeCharBase64(char c) {
-    return DATA<true>::tableDecodeBase64[size_t(c)]; // TODO faster with lookup table or ifs?
+    if (c & 0x80) {
+        throw DeadlyImportError("Invalid base64 char value: ", size_t(c));
+    }
+    return DATA<true>::tableDecodeBase64[size_t(c & 0x7F)]; // TODO faster with lookup table or ifs?
 }
 
 size_t DecodeBase64(const char *in, size_t inLength, uint8_t *&out);
diff --git a/code/AssetLib/glTF/glTFExporter.cpp b/code/AssetLib/glTF/glTFExporter.cpp
index b85affc08..1951167c6 100644
--- a/code/AssetLib/glTF/glTFExporter.cpp
+++ b/code/AssetLib/glTF/glTFExporter.cpp
@@ -525,6 +525,12 @@ void ExportSkin(Asset& mAsset, const aiMesh* aimesh, Ref<Mesh>& meshRef, Ref<Buf
     delete[] vertexJointData;
 }
 
+#if defined(__has_warning)
+#if __has_warning("-Wunused-but-set-variable")
+#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
+#endif
+#endif
+
 void glTFExporter::ExportMeshes()
 {
     // Not for
@@ -536,10 +542,12 @@ void glTFExporter::ExportMeshes()
 
     // Variables needed for compression. BEGIN.
     // Indices, not pointers - because pointer to buffer is changing while writing to it.
+#ifdef ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC
     size_t idx_srcdata_begin = 0; // Index of buffer before writing mesh data. Also, index of begin of coordinates array in buffer.
     size_t idx_srcdata_normal = SIZE_MAX;// Index of begin of normals array in buffer. SIZE_MAX - mean that mesh has no normals.
-    std::vector<size_t> idx_srcdata_tc;// Array of indices. Every index point to begin of texture coordinates array in buffer.
     size_t idx_srcdata_ind;// Index of begin of coordinates indices array in buffer.
+#endif
+    std::vector<size_t> idx_srcdata_tc;// Array of indices. Every index point to begin of texture coordinates array in buffer.
     bool comp_allow;// Point that data of current mesh can be compressed.
     // Variables needed for compression. END.
 
@@ -609,13 +617,17 @@ void glTFExporter::ExportMeshes()
 
 		/******************* Vertices ********************/
 		// If compression is used then you need parameters of uncompressed region: begin and size. At this step "begin" is stored.
+#ifdef ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC
 		if(comp_allow) idx_srcdata_begin = b->byteLength;
+#endif
 
         Ref<Accessor> v = ExportData(*mAsset, meshId, b, aim->mNumVertices, aim->mVertices, AttribType::VEC3, AttribType::VEC3, ComponentType_FLOAT, BufferViewTarget_ARRAY_BUFFER);
 		if (v) p.attributes.position.push_back(v);
 
 		/******************** Normals ********************/
+#ifdef ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC
 		if(comp_allow && (aim->mNormals != 0)) idx_srcdata_normal = b->byteLength;// Store index of normals array.
+#endif
 
 		Ref<Accessor> n = ExportData(*mAsset, meshId, b, aim->mNumVertices, aim->mNormals, AttribType::VEC3, AttribType::VEC3, ComponentType_FLOAT, BufferViewTarget_ARRAY_BUFFER);
 		if (n) p.attributes.normal.push_back(n);
@@ -640,7 +652,9 @@ void glTFExporter::ExportMeshes()
 		}
 
 		/*************** Vertices indices ****************/
+#ifdef ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC
 		idx_srcdata_ind = b->byteLength;// Store index of indices array.
+#endif
 
 		if (aim->mNumFaces > 0) {
 			std::vector<IndicesType> indices;
@@ -677,7 +691,7 @@ void glTFExporter::ExportMeshes()
 		{
 #ifdef ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC
 			// Only one type of compression supported at now - Open3DGC.
-			//
+		//
 			o3dgc::BinaryStream bs;
 			o3dgc::SC3DMCEncoder<IndicesType> encoder;
 			o3dgc::IndexedFaceSet<IndicesType> comp_o3dgc_ifs;
@@ -793,6 +807,12 @@ void glTFExporter::ExportMeshes()
     }
 }
 
+#if defined(__has_warning)
+#if __has_warning("-Wunused-but-set-variable")
+#pragma GCC diagnostic pop
+#endif
+#endif
+
 /*
  * Export the root node of the node hierarchy.
  * Calls ExportNode for all children.
diff --git a/code/AssetLib/glTF/glTFExporter.h b/code/AssetLib/glTF/glTFExporter.h
index 415992314..fe7592566 100644
--- a/code/AssetLib/glTF/glTFExporter.h
+++ b/code/AssetLib/glTF/glTFExporter.h
@@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_GLTFEXPORTER_H_INC
 #define AI_GLTFEXPORTER_H_INC
 
-#ifndef ASSIMP_BUILD_NO_GLTF_EXPORTER
+#if !defined(ASSIMP_BUILD_NO_GLTF_EXPORTER) && !defined(ASSIMP_BUILD_NO_GLTF1_EXPORTER)
 
 #include <assimp/types.h>
 #include <assimp/material.h>
diff --git a/code/AssetLib/glTF/glTFImporter.cpp b/code/AssetLib/glTF/glTFImporter.cpp
index b4ef9b06f..512a4334b 100644
--- a/code/AssetLib/glTF/glTFImporter.cpp
+++ b/code/AssetLib/glTF/glTFImporter.cpp
@@ -1,4 +1,4 @@
-/*
+/*
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
@@ -39,7 +39,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ----------------------------------------------------------------------
 */
 
-#ifndef ASSIMP_BUILD_NO_GLTF_IMPORTER
+#if !defined(ASSIMP_BUILD_NO_GLTF_IMPORTER) && !defined(ASSIMP_BUILD_NO_GLTF1_IMPORTER)
 
 #include "AssetLib/glTF/glTFImporter.h"
 #include "AssetLib/glTF/glTFAsset.h"
@@ -215,8 +215,8 @@ void glTFImporter::ImportMeshes(glTF::Asset &r) {
 
         // Check if mesh extensions is used
         if (mesh.Extension.size() > 0) {
-            for (Mesh::SExtension *cur_ext : mesh.Extension) {
 #ifdef ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC
+            for (Mesh::SExtension *cur_ext : mesh.Extension) {
                 if (cur_ext->Type == Mesh::SExtension::EType::Compression_Open3DGC) {
                     // Limitations for meshes when using Open3DGC-compression.
                     // It's a current limitation of sp... Specification have not this part still - about mesh compression. Why only one primitive?
@@ -233,12 +233,12 @@ void glTFImporter::ImportMeshes(glTF::Asset &r) {
 
                     buf->EncodedRegion_SetCurrent(mesh.id);
                 } else
-#endif
                 {
-                    throw DeadlyImportError("GLTF: Can not import mesh: unknown mesh extension (code: \"" + to_string(cur_ext->Type) +
+                    throw DeadlyImportError("GLTF: Can not import mesh: unknown mesh extension (code: \"", to_string(cur_ext->Type),
                                             "\"), only Open3DGC is supported.");
                 }
             }
+#endif
         } // if(mesh.Extension.size() > 0)
 
         meshOffsets.push_back(k);
diff --git a/code/AssetLib/glTF2/glTF2Asset.h b/code/AssetLib/glTF2/glTF2Asset.h
index f79ddee87..94cbef2cd 100644
--- a/code/AssetLib/glTF2/glTF2Asset.h
+++ b/code/AssetLib/glTF2/glTF2Asset.h
@@ -1,4 +1,4 @@
-/*
+/*
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
@@ -46,11 +46,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *   KHR_materials_pbrSpecularGlossiness full
  *   KHR_materials_unlit full
  *   KHR_lights_punctual full
+ *   KHR_materials_sheen full
+ *   KHR_materials_clearcoat full
+ *   KHR_materials_transmission full
  */
 #ifndef GLTF2ASSET_H_INC
 #define GLTF2ASSET_H_INC
 
-#ifndef ASSIMP_BUILD_NO_GLTF_IMPORTER
+#if !defined(ASSIMP_BUILD_NO_GLTF_IMPORTER) && !defined(ASSIMP_BUILD_NO_GLTF2_IMPORTER)
 
 #include <assimp/Exceptional.h>
 
@@ -62,19 +65,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <string>
 #include <vector>
 
-#ifndef RAPIDJSON_HAS_STDSTRING
-#define RAPIDJSON_HAS_STDSTRING 1
-#endif
-
 #if (__GNUC__ == 8 && __GNUC_MINOR__ >= 0)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wclass-memaccess"
 #endif
 
-#ifndef RAPIDJSON_NOMEMBERITERATORCLASS
-#define RAPIDJSON_NOMEMBERITERATORCLASS
-#endif 
-
 #include <rapidjson/document.h>
 #include <rapidjson/error/en.h>
 #include <rapidjson/rapidjson.h>
@@ -202,7 +197,7 @@ inline unsigned int ComponentTypeSize(ComponentType t) {
     case ComponentType_UNSIGNED_BYTE:
         return 1;
     default:
-        throw DeadlyImportError("GLTF: Unsupported Component Type " + to_string(t));
+        throw DeadlyImportError("GLTF: Unsupported Component Type ", to_string(t));
     }
 }
 
@@ -406,6 +401,8 @@ struct Accessor : public Object {
     void ExtractData(T *&outData);
 
     void WriteData(size_t count, const void *src_buffer, size_t src_stride);
+    void WriteSparseValues(size_t count, const void *src_data, size_t src_dataStride);
+    void WriteSparseIndices(size_t count, const void *src_idx, size_t src_idxStride);
 
     //! Helper class to iterate the data
     class Indexer {
@@ -683,6 +680,7 @@ const vec4 defaultBaseColor = { 1, 1, 1, 1 };
 const vec3 defaultEmissiveFactor = { 0, 0, 0 };
 const vec4 defaultDiffuseFactor = { 1, 1, 1, 1 };
 const vec3 defaultSpecularFactor = { 1, 1, 1 };
+const vec3 defaultSheenFactor = { 0, 0, 0 };
 
 struct TextureInfo {
     Ref<Texture> texture;
@@ -724,6 +722,29 @@ struct PbrSpecularGlossiness {
     void SetDefaults();
 };
 
+struct MaterialSheen {
+    vec3 sheenColorFactor;
+    float sheenRoughnessFactor;
+    TextureInfo sheenColorTexture;
+    TextureInfo sheenRoughnessTexture;
+
+    MaterialSheen() { SetDefaults(); }
+    void SetDefaults();
+};
+
+struct MaterialClearcoat {
+    float clearcoatFactor = 0.f;
+    float clearcoatRoughnessFactor = 0.f;
+    TextureInfo clearcoatTexture;
+    TextureInfo clearcoatRoughnessTexture;
+    NormalTextureInfo clearcoatNormalTexture;
+};
+
+struct MaterialTransmission {
+    TextureInfo transmissionTexture;
+    float transmissionFactor = 0.f;
+};
+
 //! The material appearance of a primitive.
 struct Material : public Object {
     //PBR metallic roughness properties
@@ -741,6 +762,15 @@ struct Material : public Object {
     //extension: KHR_materials_pbrSpecularGlossiness
     Nullable<PbrSpecularGlossiness> pbrSpecularGlossiness;
 
+    //extension: KHR_materials_sheen
+    Nullable<MaterialSheen> materialSheen;
+
+    //extension: KHR_materials_clearcoat
+    Nullable<MaterialClearcoat> materialClearcoat;
+
+    //extension: KHR_materials_transmission
+    Nullable<MaterialTransmission> materialTransmission;
+
     //extension: KHR_materials_unlit
     bool unlit;
 
@@ -802,7 +832,7 @@ struct CustomExtension : public Object {
     Nullable<std::vector<CustomExtension>> mValues;
 
     operator bool() const {
-        return Size();
+        return Size() != 0;
     }
 
     size_t Size() const {
@@ -869,6 +899,7 @@ struct Sampler : public Object {
 };
 
 struct Scene : public Object {
+    std::string name;
     std::vector<Ref<Node>> nodes;
 
     Scene() {}
@@ -1058,6 +1089,9 @@ public:
         bool KHR_materials_unlit;
         bool KHR_lights_punctual;
         bool KHR_texture_transform;
+        bool KHR_materials_sheen;
+        bool KHR_materials_clearcoat;
+        bool KHR_materials_transmission;
     } extensionsUsed;
 
     //! Keeps info about the required extensions
@@ -1066,6 +1100,7 @@ public:
     } extensionsRequired;
 
     AssetMetadata asset;
+    Value* extras = nullptr;
 
     // Dictionaries for each type of object
 
@@ -1128,6 +1163,14 @@ private:
     IOStream *OpenFile(std::string path, const char *mode, bool absolute = false);
 };
 
+inline std::string getContextForErrorMessages(const std::string &id, const std::string &name) {
+    std::string context = id;
+    if (!name.empty()) {
+        context += " (\"" + name + "\")";
+    }
+    return context;
+}
+
 } // namespace glTF2
 
 // Include the implementation of the methods
diff --git a/code/AssetLib/glTF2/glTF2Asset.inl b/code/AssetLib/glTF2/glTF2Asset.inl
index 94f8d9ffa..0e265efef 100644
--- a/code/AssetLib/glTF2/glTF2Asset.inl
+++ b/code/AssetLib/glTF2/glTF2Asset.inl
@@ -44,6 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <assimp/StringUtils.h>
 #include <assimp/DefaultLogger.hpp>
+#include <assimp/MemoryIOWrapper.h>
 
 using namespace Assimp;
 
@@ -269,27 +270,32 @@ Ref<T> LazyDict<T>::Retrieve(unsigned int i) {
 
     // read it from the JSON object
     if (!mDict) {
-        throw DeadlyImportError("GLTF: Missing section \"" + std::string(mDictId) + "\"");
+        throw DeadlyImportError("GLTF: Missing section \"", mDictId, "\"");
     }
 
     if (!mDict->IsArray()) {
-        throw DeadlyImportError("GLTF: Field is not an array \"" + std::string(mDictId) + "\"");
+        throw DeadlyImportError("GLTF: Field \"", mDictId, "\"  is not an array");
+    }
+
+    if (i >= mDict->Size()) {
+        throw DeadlyImportError("GLTF: Array index ", i, " is out of bounds (", mDict->Size(), ") for \"", mDictId, "\"");
     }
 
     Value &obj = (*mDict)[i];
 
     if (!obj.IsObject()) {
-        throw DeadlyImportError("GLTF: Object at index \"" + to_string(i) + "\" is not a JSON object");
+        throw DeadlyImportError("GLTF: Object at index ", i, " in array \"", mDictId, "\" is not a JSON object");
     }
 
     if (mRecursiveReferenceCheck.find(i) != mRecursiveReferenceCheck.end()) {
-        throw DeadlyImportError("GLTF: Object at index \"" + to_string(i) + "\" has recursive reference to itself");
+        throw DeadlyImportError("GLTF: Object at index ", i, " in array \"", mDictId, "\" has recursive reference to itself");
     }
     mRecursiveReferenceCheck.insert(i);
 
     // Unique ptr prevents memory leak in case of Read throws an exception
     auto inst = std::unique_ptr<T>(new T());
-    inst->id = std::string(mDictId) + "_" + to_string(i);
+    // Try to make this human readable so it can be used in error messages.
+    inst->id = std::string(mDictId) + "[" + to_string(i) + "]";
     inst->oIndex = i;
     ReadMember(obj, "name", inst->name);
     inst->Read(obj, mAsset);
@@ -381,13 +387,13 @@ inline void Buffer::Read(Value &obj, Asset &r) {
             this->mData.reset(data, std::default_delete<uint8_t[]>());
 
             if (statedLength > 0 && this->byteLength != statedLength) {
-                throw DeadlyImportError("GLTF: buffer \"" + id + "\", expected " + to_string(statedLength) +
-                                        " bytes, but found " + to_string(dataURI.dataLength));
+                throw DeadlyImportError("GLTF: buffer \"", id, "\", expected ", to_string(statedLength),
+                                        " bytes, but found ", to_string(dataURI.dataLength));
             }
         } else { // assume raw data
             if (statedLength != dataURI.dataLength) {
-                throw DeadlyImportError("GLTF: buffer \"" + id + "\", expected " + to_string(statedLength) +
-                                        " bytes, but found " + to_string(dataURI.dataLength));
+                throw DeadlyImportError("GLTF: buffer \"", id, "\", expected ", to_string(statedLength),
+                                        " bytes, but found ", to_string(dataURI.dataLength));
             }
 
             this->mData.reset(new uint8_t[dataURI.dataLength], std::default_delete<uint8_t[]>());
@@ -395,7 +401,10 @@ inline void Buffer::Read(Value &obj, Asset &r) {
         }
     } else { // Local file
         if (byteLength > 0) {
-            std::string dir = !r.mCurrentAssetDir.empty() ? (r.mCurrentAssetDir) : "";
+            std::string dir = !r.mCurrentAssetDir.empty() ? (
+                r.mCurrentAssetDir.back() == '/' ?
+                   r.mCurrentAssetDir : r.mCurrentAssetDir + '/'
+            ) : "";
 
             IOStream *file = r.OpenFile(dir + uri, "rb");
             if (file) {
@@ -403,9 +412,9 @@ inline void Buffer::Read(Value &obj, Asset &r) {
                 delete file;
 
                 if (!ok)
-                    throw DeadlyImportError("GLTF: error while reading referenced file \"" + std::string(uri) + "\"");
+                    throw DeadlyImportError("GLTF: error while reading referenced file \"", uri, "\"");
             } else {
-                throw DeadlyImportError("GLTF: could not open referenced file \"" + std::string(uri) + "\"");
+                throw DeadlyImportError("GLTF: could not open referenced file \"", uri, "\"");
             }
         }
     }
@@ -436,8 +445,8 @@ inline void Buffer::EncodedRegion_Mark(const size_t pOffset, const size_t pEncod
 
         char val[val_size];
 
-        ai_snprintf(val, val_size, "%llu", (long long)pOffset);
-        throw DeadlyImportError(std::string("GLTF: incorrect offset value (") + val + ") for marking encoded region.");
+        ai_snprintf(val, val_size, AI_SIZEFMT, pOffset);
+        throw DeadlyImportError("GLTF: incorrect offset value (", val, ") for marking encoded region.");
     }
 
     // Check length
@@ -446,8 +455,8 @@ inline void Buffer::EncodedRegion_Mark(const size_t pOffset, const size_t pEncod
 
         char val[val_size];
 
-        ai_snprintf(val, val_size, "%llu, %llu", (long long)pOffset, (long long)pEncodedData_Length);
-        throw DeadlyImportError(std::string("GLTF: encoded region with offset/length (") + val + ") is out of range.");
+        ai_snprintf(val, val_size, AI_SIZEFMT "/" AI_SIZEFMT, pOffset, pEncodedData_Length);
+        throw DeadlyImportError("GLTF: encoded region with offset/length (", val, ") is out of range.");
     }
 
     // Add new region
@@ -467,7 +476,7 @@ inline void Buffer::EncodedRegion_SetCurrent(const std::string &pID) {
         }
     }
 
-    throw DeadlyImportError("GLTF: EncodedRegion with ID: \"" + pID + "\" not found.");
+    throw DeadlyImportError("GLTF: EncodedRegion with ID: \"", pID, "\" not found.");
 }
 
 inline bool Buffer::ReplaceData(const size_t pBufferData_Offset, const size_t pBufferData_Count, const uint8_t *pReplace_Data, const size_t pReplace_Count) {
@@ -551,9 +560,18 @@ inline void BufferView::Read(Value &obj, Asset &r) {
         buffer = r.buffers.Retrieve(bufferVal->GetUint());
     }
 
+    if (!buffer) {
+        throw DeadlyImportError("GLTF: Buffer view without valid buffer.");
+    }
+
     byteOffset = MemberOrDefault(obj, "byteOffset", size_t(0));
     byteLength = MemberOrDefault(obj, "byteLength", size_t(0));
     byteStride = MemberOrDefault(obj, "byteStride", 0u);
+
+    // Check length
+    if ((byteOffset + byteLength) > buffer->byteLength) {
+        throw DeadlyImportError("GLTF: Buffer view with offset/length (", byteOffset, "/", byteLength, ") is out of range.");
+    }
 }
 
 inline uint8_t *BufferView::GetPointer(size_t accOffset) {
@@ -627,6 +645,20 @@ inline void Accessor::Read(Value &obj, Asset &r) {
     const char *typestr;
     type = ReadMember(obj, "type", typestr) ? AttribType::FromString(typestr) : AttribType::SCALAR;
 
+    if (bufferView) {
+        // Check length
+        unsigned long long byteLength = (unsigned long long)GetBytesPerComponent() * (unsigned long long)count;
+
+        // handle integer overflow
+        if (byteLength < count) {
+            throw DeadlyImportError("GLTF: Accessor with offset/count (", byteOffset, "/", count, ") is out of range.");
+        }
+
+        if ((byteOffset + byteLength) > bufferView->byteLength || (bufferView->byteOffset + byteOffset + byteLength) > bufferView->buffer->byteLength) {
+            throw DeadlyImportError("GLTF: Accessor with offset/length (", byteOffset, "/", byteLength, ") is out of range.");
+        }
+    }
+
     if (Value *sparseValue = FindObject(obj, "sparse")) {
         sparse.reset(new Sparse);
         // count
@@ -716,13 +748,14 @@ inline void CopyData(size_t count,
         }
     }
 }
+
 } // namespace
 
 template <class T>
 void Accessor::ExtractData(T *&outData) {
     uint8_t *data = GetPointer();
     if (!data) {
-        throw DeadlyImportError("GLTF2: data is nullptr.");
+        throw DeadlyImportError("GLTF2: data is null when extracting data from ", getContextForErrorMessages(id, name));
     }
 
     const size_t elemSize = GetElementSize();
@@ -731,8 +764,15 @@ void Accessor::ExtractData(T *&outData) {
     const size_t stride = bufferView && bufferView->byteStride ? bufferView->byteStride : elemSize;
 
     const size_t targetElemSize = sizeof(T);
-    ai_assert(elemSize <= targetElemSize);
-    ai_assert(count * stride <= (bufferView ? bufferView->byteLength : sparse->data.size()));
+
+    if (elemSize > targetElemSize) {
+        throw DeadlyImportError("GLTF: elemSize ", elemSize, " > targetElemSize ", targetElemSize, " in ", getContextForErrorMessages(id, name));
+    }
+
+    const size_t maxSize = (bufferView ? bufferView->byteLength : sparse->data.size());
+    if (count*stride > maxSize) {
+        throw DeadlyImportError("GLTF: count*stride ", (count * stride), " > maxSize ", maxSize, " in ", getContextForErrorMessages(id, name));
+    }
 
     outData = new T[count];
     if (stride == elemSize && targetElemSize == elemSize) {
@@ -757,6 +797,33 @@ inline void Accessor::WriteData(size_t _count, const void *src_buffer, size_t sr
     CopyData(_count, src, src_stride, dst, dst_stride);
 }
 
+inline void Accessor::WriteSparseValues(size_t _count, const void *src_data, size_t src_dataStride) {
+    if (!sparse)
+        return;
+
+    // values
+    uint8_t *value_buffer_ptr = sparse->values->buffer->GetPointer();
+    size_t value_offset = sparse->valuesByteOffset + sparse->values->byteOffset;
+    size_t value_dst_stride = GetNumComponents() * GetBytesPerComponent();
+    const uint8_t *value_src = reinterpret_cast<const uint8_t *>(src_data);
+    uint8_t *value_dst = reinterpret_cast<uint8_t *>(value_buffer_ptr + value_offset);
+    ai_assert(value_dst + _count * value_dst_stride <= value_buffer_ptr + sparse->values->buffer->byteLength);
+    CopyData(_count, value_src, src_dataStride, value_dst, value_dst_stride);
+}
+
+inline void Accessor::WriteSparseIndices(size_t _count, const void *src_idx, size_t src_idxStride) {
+    if (!sparse)
+        return;
+
+    // indices
+    uint8_t *indices_buffer_ptr = sparse->indices->buffer->GetPointer();
+    size_t indices_offset = sparse->indicesByteOffset + sparse->indices->byteOffset;
+    size_t indices_dst_stride = 1 * sizeof(unsigned short);
+    const uint8_t *indices_src = reinterpret_cast<const uint8_t *>(src_idx);
+    uint8_t *indices_dst = reinterpret_cast<uint8_t *>(indices_buffer_ptr + indices_offset);
+    ai_assert(indices_dst + _count * indices_dst_stride <= indices_buffer_ptr + sparse->indices->buffer->byteLength);
+    CopyData(_count, indices_src, src_idxStride, indices_dst, indices_dst_stride);
+}
 inline Accessor::Indexer::Indexer(Accessor &acc) :
         accessor(acc),
         data(acc.GetPointer()),
@@ -769,9 +836,11 @@ template <class T>
 T Accessor::Indexer::GetValue(int i) {
     ai_assert(data);
     ai_assert(i * stride < accessor.bufferView->byteLength);
+    // Ensure that the memcpy doesn't overwrite the local.
+    const size_t sizeToCopy = std::min(elemSize, sizeof(T));
     T value = T();
-    memcpy(&value, data + i * stride, elemSize);
-    //value >>= 8 * (sizeof(T) - elemSize);
+    // Assume platform endianness matches GLTF binary data (which is little-endian).
+    memcpy(&value, data + i * stride, sizeToCopy);
     return value;
 }
 
@@ -800,6 +869,14 @@ inline void Image::Read(Value &obj, Asset &r) {
             }
         } else if (Value *bufferViewVal = FindUInt(obj, "bufferView")) {
             this->bufferView = r.bufferViews.Retrieve(bufferViewVal->GetUint());
+            if (Value *mtype = FindString(obj, "mimeType")) {
+                this->mimeType = mtype->GetString();
+            }
+            if (!this->bufferView || this->mimeType.empty())
+            {
+                throw DeadlyImportError("GLTF2: ", getContextForErrorMessages(id, name), " does not have a URI, so it must have a valid bufferView and mimetype");
+            }
+
             Ref<Buffer> buffer = this->bufferView->buffer;
 
             this->mDataLength = this->bufferView->byteLength;
@@ -807,10 +884,10 @@ inline void Image::Read(Value &obj, Asset &r) {
 
             this->mData.reset(new uint8_t[this->mDataLength]);
             memcpy(this->mData.get(), buffer->GetPointer() + this->bufferView->byteOffset, this->mDataLength);
-
-            if (Value *mtype = FindString(obj, "mimeType")) {
-                this->mimeType = mtype->GetString();
-            }
+        }
+        else
+        {
+            throw DeadlyImportError("GLTF2: ", getContextForErrorMessages(id, name), " should have either a URI of a bufferView and mimetype" );
         }
     }
 }
@@ -969,6 +1046,44 @@ inline void Material::Read(Value &material, Asset &r) {
         if (r.extensionsUsed.KHR_texture_transform) {
         }
 
+        if (r.extensionsUsed.KHR_materials_sheen) {
+            if (Value *curMaterialSheen = FindObject(*extensions, "KHR_materials_sheen")) {
+                MaterialSheen sheen;
+
+                ReadMember(*curMaterialSheen, "sheenColorFactor", sheen.sheenColorFactor);
+                ReadTextureProperty(r, *curMaterialSheen, "sheenColorTexture", sheen.sheenColorTexture);
+                ReadMember(*curMaterialSheen, "sheenRoughnessFactor", sheen.sheenRoughnessFactor);
+                ReadTextureProperty(r, *curMaterialSheen, "sheenRoughnessTexture", sheen.sheenRoughnessTexture);
+
+                this->materialSheen = Nullable<MaterialSheen>(sheen);
+            }
+        }
+
+        if (r.extensionsUsed.KHR_materials_clearcoat) {
+            if (Value *curMaterialClearcoat = FindObject(*extensions, "KHR_materials_clearcoat")) {
+                MaterialClearcoat clearcoat;
+
+                ReadMember(*curMaterialClearcoat, "clearcoatFactor", clearcoat.clearcoatFactor);
+                ReadTextureProperty(r, *curMaterialClearcoat, "clearcoatTexture", clearcoat.clearcoatTexture);
+                ReadMember(*curMaterialClearcoat, "clearcoatRoughnessFactor", clearcoat.clearcoatRoughnessFactor);
+                ReadTextureProperty(r, *curMaterialClearcoat, "clearcoatRoughnessTexture", clearcoat.clearcoatRoughnessTexture);
+                ReadTextureProperty(r, *curMaterialClearcoat, "clearcoatNormalTexture", clearcoat.clearcoatNormalTexture);
+
+                this->materialClearcoat = Nullable<MaterialClearcoat>(clearcoat);
+            }
+        }
+
+        if (r.extensionsUsed.KHR_materials_transmission) {
+            if (Value *curMaterialTransmission = FindObject(*extensions, "KHR_materials_transmission")) {
+                MaterialTransmission transmission;
+
+                ReadMember(*curMaterialTransmission, "transmissionFactor", transmission.transmissionFactor);
+                ReadTextureProperty(r, *curMaterialTransmission, "transmissionTexture", transmission.transmissionTexture);
+
+                this->materialTransmission = Nullable<MaterialTransmission>(transmission);
+            }
+        }
+
         unlit = nullptr != FindObject(*extensions, "KHR_materials_unlit");
     }
 }
@@ -1008,6 +1123,12 @@ inline void PbrSpecularGlossiness::SetDefaults() {
     glossinessFactor = 1.0;
 }
 
+inline void MaterialSheen::SetDefaults() {
+    //KHR_materials_sheen properties
+    SetVector(sheenColorFactor, defaultSheenFactor);
+    sheenRoughnessFactor = 0.f;
+}
+
 namespace {
 
 template <int N>
@@ -1015,10 +1136,10 @@ inline int Compare(const char *attr, const char (&str)[N]) {
     return (strncmp(attr, str, N - 1) == 0) ? N - 1 : 0;
 }
 
-#ifdef _WIN32
+#if _MSC_VER
 #pragma warning(push)
 #pragma warning(disable : 4706)
-#endif // _WIN32
+#endif // _MSC_VER
 
 inline bool GetAttribVector(Mesh::Primitive &p, const char *attr, Mesh::AccessorList *&v, int &pos) {
     if ((pos = Compare(attr, "POSITION"))) {
@@ -1082,7 +1203,10 @@ inline void Mesh::Read(Value &pJSON_Object, Asset &pAsset_Root) {
                     Mesh::AccessorList *vec = 0;
                     if (GetAttribVector(prim, attr, vec, undPos)) {
                         size_t idx = (attr[undPos] == '_') ? atoi(attr + undPos + 1) : 0;
-                        if ((*vec).size() <= idx) (*vec).resize(idx + 1);
+                        if ((*vec).size() != idx) {
+                            throw DeadlyImportError("GLTF: Invalid attribute: ", attr, ". All indices for indexed attribute semantics must start with 0 and be continuous positive integers: TEXCOORD_0, TEXCOORD_1, etc.");
+                        }
+                        (*vec).resize(idx + 1);
                         (*vec)[idx] = pAsset_Root.accessors.Retrieve(it->value.GetUint());
                     }
                 }
@@ -1203,7 +1327,7 @@ inline void Light::Read(Value &obj, Asset & /*r*/) {
         Value *spot = FindObject(obj, "spot");
         if (!spot) throw DeadlyImportError("GLTF: Light missing its spot parameters");
         innerConeAngle = MemberOrDefault(*spot, "innerConeAngle", 0.0f);
-        outerConeAngle = MemberOrDefault(*spot, "outerConeAngle", M_PI / 4.0f);
+        outerConeAngle = MemberOrDefault(*spot, "outerConeAngle", static_cast<float>(M_PI / 4.0f));
     }
 }
 
@@ -1287,6 +1411,8 @@ inline void Node::Read(Value &obj, Asset &r) {
         }
     }
 
+	// Do not retrieve a skin here, just take a reference, to avoid infinite recursion
+    // Skins will be properly loaded later
     Value *curSkin = FindUInt(obj, "skin");
     if (nullptr != curSkin) {
         this->skin = r.skins.Get(curSkin->GetUint());
@@ -1319,6 +1445,11 @@ inline void Node::Read(Value &obj, Asset &r) {
 }
 
 inline void Scene::Read(Value &obj, Asset &r) {
+    if (Value *scene_name = FindString(obj, "name")) {
+        if (scene_name->IsString()) {
+            this->name = scene_name->GetString();
+        }
+    }
     if (Value *array = FindArray(obj, "nodes")) {
         for (unsigned int i = 0; i < array->Size(); ++i) {
             if (!(*array)[i].IsUint()) continue;
@@ -1429,7 +1560,7 @@ inline void AssetMetadata::Read(Document &doc) {
     }
 
     if (version.empty() || version[0] != '2') {
-        throw DeadlyImportError("GLTF: Unsupported glTF version: " + version);
+        throw DeadlyImportError("GLTF: Unsupported glTF version: ", version);
     }
 }
 
@@ -1507,8 +1638,10 @@ inline void Asset::Load(const std::string &pFile, bool isBinary) {
     /*int pos = std::max(int(pFile.rfind('/')), int(pFile.rfind('\\')));
     if (pos != int(std::string::npos)) */
 
-    mCurrentAssetDir = glTFCommon::getCurrentAssetDir(pFile);
-
+    if (0 != strncmp(pFile.c_str(), AI_MEMORYIO_MAGIC_FILENAME, AI_MEMORYIO_MAGIC_FILENAME_LENGTH)) {
+        mCurrentAssetDir = glTFCommon::getCurrentAssetDir(pFile);
+    }
+    
     shared_ptr<IOStream> stream(OpenFile(pFile.c_str(), "rb", true));
     if (!stream) {
         throw DeadlyImportError("GLTF: Could not open file for reading");
@@ -1541,7 +1674,7 @@ inline void Asset::Load(const std::string &pFile, bool isBinary) {
     if (doc.HasParseError()) {
         char buffer[32];
         ai_snprintf(buffer, 32, "%d", static_cast<int>(doc.GetErrorOffset()));
-        throw DeadlyImportError(std::string("GLTF: JSON parse error, offset ") + buffer + ": " + GetParseError_En(doc.GetParseError()));
+        throw DeadlyImportError("GLTF: JSON parse error, offset ", buffer, ": ", GetParseError_En(doc.GetParseError()));
     }
 
     if (!doc.IsObject()) {
@@ -1584,7 +1717,6 @@ inline void Asset::Load(const std::string &pFile, bool isBinary) {
         }
     }
 
-    // Read skins after nodes have been loaded to avoid infinite recursion
     if (Value *skinsArray = FindArray(doc, "skins")) {
         for (unsigned int i = 0; i < skinsArray->Size(); ++i) {
             skins.Retrieve(i);
@@ -1649,6 +1781,9 @@ inline void Asset::ReadExtensionsUsed(Document &doc) {
     CHECK_EXT(KHR_materials_unlit);
     CHECK_EXT(KHR_lights_punctual);
     CHECK_EXT(KHR_texture_transform);
+    CHECK_EXT(KHR_materials_sheen);
+    CHECK_EXT(KHR_materials_clearcoat);
+    CHECK_EXT(KHR_materials_transmission);
 
 #undef CHECK_EXT
 }
@@ -1695,8 +1830,8 @@ inline std::string Asset::FindUniqueID(const std::string &str, const char *suffi
     return id;
 }
 
-#ifdef _WIN32
-#pragma warning(pop)
-#endif // _WIN32
+#if _MSC_VER
+#   pragma warning(pop)
+#endif // _MSC_VER
 
 } // namespace glTF2
diff --git a/code/AssetLib/glTF2/glTF2AssetWriter.h b/code/AssetLib/glTF2/glTF2AssetWriter.h
index 784ab2ea5..bf4f80dbe 100644
--- a/code/AssetLib/glTF2/glTF2AssetWriter.h
+++ b/code/AssetLib/glTF2/glTF2AssetWriter.h
@@ -46,11 +46,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * glTF Extensions Support:
  *   KHR_materials_pbrSpecularGlossiness: full
  *   KHR_materials_unlit: full
+ *   KHR_materials_sheen: full
+ *   KHR_materials_clearcoat: full
+ *   KHR_materials_transmission: full
  */
 #ifndef GLTF2ASSETWRITER_H_INC
 #define GLTF2ASSETWRITER_H_INC
 
-#ifndef ASSIMP_BUILD_NO_GLTF_IMPORTER
+#if !defined(ASSIMP_BUILD_NO_GLTF_IMPORTER) && !defined(ASSIMP_BUILD_NO_GLTF2_IMPORTER)
 
 #include "glTF2Asset.h"
 
diff --git a/code/AssetLib/glTF2/glTF2AssetWriter.inl b/code/AssetLib/glTF2/glTF2AssetWriter.inl
index d5b478e35..65fddaec5 100644
--- a/code/AssetLib/glTF2/glTF2AssetWriter.inl
+++ b/code/AssetLib/glTF2/glTF2AssetWriter.inl
@@ -1,4 +1,4 @@
-/*
+/*
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
@@ -107,21 +107,47 @@ namespace glTF2 {
 
     inline void Write(Value& obj, Accessor& a, AssetWriter& w)
     {
-        obj.AddMember("bufferView", a.bufferView->index, w.mAl);
-        obj.AddMember("byteOffset", (unsigned int)a.byteOffset, w.mAl);
+        if (a.bufferView) {
+            obj.AddMember("bufferView", a.bufferView->index, w.mAl);
+            obj.AddMember("byteOffset", (unsigned int)a.byteOffset, w.mAl);
+            Value vTmpMax, vTmpMin;
+            if (a.componentType == ComponentType_FLOAT) {
+                obj.AddMember("max", MakeValue(vTmpMax, a.max, w.mAl), w.mAl);
+                obj.AddMember("min", MakeValue(vTmpMin, a.min, w.mAl), w.mAl);
+            } else {
+                obj.AddMember("max", MakeValueCast<int64_t>(vTmpMax, a.max, w.mAl), w.mAl);
+                obj.AddMember("min", MakeValueCast<int64_t>(vTmpMin, a.min, w.mAl), w.mAl);
+            }
+        }
 
         obj.AddMember("componentType", int(a.componentType), w.mAl);
         obj.AddMember("count", (unsigned int)a.count, w.mAl);
         obj.AddMember("type", StringRef(AttribType::ToString(a.type)), w.mAl);
 
-        Value vTmpMax, vTmpMin;
-		if (a.componentType == ComponentType_FLOAT) {
-			obj.AddMember("max", MakeValue(vTmpMax, a.max, w.mAl), w.mAl);
-			obj.AddMember("min", MakeValue(vTmpMin, a.min, w.mAl), w.mAl);
-		} else {
-			obj.AddMember("max", MakeValueCast<int64_t>(vTmpMax, a.max, w.mAl), w.mAl);
-			obj.AddMember("min", MakeValueCast<int64_t>(vTmpMin, a.min, w.mAl), w.mAl);
-		}
+        if (a.sparse) {
+            Value sparseValue;
+            sparseValue.SetObject();
+
+            //count
+            sparseValue.AddMember("count", (unsigned int)a.sparse->count, w.mAl);
+
+            //indices
+            Value indices;
+            indices.SetObject();
+            indices.AddMember("bufferView", a.sparse->indices->index, w.mAl);
+            indices.AddMember("byteOffset", (unsigned int)a.sparse->indicesByteOffset, w.mAl);
+            indices.AddMember("componentType", int(a.sparse->indicesType), w.mAl);
+            sparseValue.AddMember("indices", indices, w.mAl);
+
+            //values
+            Value values;
+            values.SetObject();
+            values.AddMember("bufferView", a.sparse->values->index, w.mAl);
+            values.AddMember("byteOffset", (unsigned int)a.sparse->valuesByteOffset, w.mAl);
+            sparseValue.AddMember("values", values, w.mAl);
+
+            obj.AddMember("sparse", sparseValue, w.mAl);
+        }
     }
 
     inline void Write(Value& obj, Animation& a, AssetWriter& w)
@@ -391,6 +417,63 @@ namespace glTF2 {
           exts.AddMember("KHR_materials_unlit", unlit, w.mAl);
         }
 
+        if (m.materialSheen.isPresent) {
+            Value materialSheen(rapidjson::Type::kObjectType);
+
+            MaterialSheen &sheen = m.materialSheen.value;
+
+            WriteVec(materialSheen, sheen.sheenColorFactor, "sheenColorFactor", defaultSheenFactor, w.mAl);
+
+            if (sheen.sheenRoughnessFactor != 0.f) {
+                WriteFloat(materialSheen, sheen.sheenRoughnessFactor, "sheenRoughnessFactor", w.mAl);
+            }
+
+            WriteTex(materialSheen, sheen.sheenColorTexture, "sheenColorTexture", w.mAl);
+            WriteTex(materialSheen, sheen.sheenRoughnessTexture, "sheenRoughnessTexture", w.mAl);
+
+            if (!materialSheen.ObjectEmpty()) {
+                exts.AddMember("KHR_materials_sheen", materialSheen, w.mAl);
+            }
+        }
+
+        if (m.materialClearcoat.isPresent) {
+            Value materialClearcoat(rapidjson::Type::kObjectType);
+
+            MaterialClearcoat &clearcoat = m.materialClearcoat.value;
+
+            if (clearcoat.clearcoatFactor != 0.f) {
+                WriteFloat(materialClearcoat, clearcoat.clearcoatFactor, "clearcoatFactor", w.mAl);
+            }
+
+            if (clearcoat.clearcoatRoughnessFactor != 0.f) {
+                WriteFloat(materialClearcoat, clearcoat.clearcoatRoughnessFactor, "clearcoatRoughnessFactor", w.mAl);
+            }
+
+            WriteTex(materialClearcoat, clearcoat.clearcoatTexture, "clearcoatTexture", w.mAl);
+            WriteTex(materialClearcoat, clearcoat.clearcoatRoughnessTexture, "clearcoatRoughnessTexture", w.mAl);
+            WriteTex(materialClearcoat, clearcoat.clearcoatNormalTexture, "clearcoatNormalTexture", w.mAl);
+                        
+            if (!materialClearcoat.ObjectEmpty()) {
+                exts.AddMember("KHR_materials_clearcoat", materialClearcoat, w.mAl);
+            }
+        }
+
+        if (m.materialTransmission.isPresent) {
+            Value materialTransmission(rapidjson::Type::kObjectType);
+
+            MaterialTransmission &transmission = m.materialTransmission.value;
+
+            if (transmission.transmissionFactor != 0.f) {
+                WriteFloat(materialTransmission, transmission.transmissionFactor, "transmissionFactor", w.mAl);
+            }
+
+            WriteTex(materialTransmission, transmission.transmissionTexture, "transmissionTexture", w.mAl);
+                                   
+            if (!materialTransmission.ObjectEmpty()) {
+                exts.AddMember("KHR_materials_transmission", materialTransmission, w.mAl);
+            }
+        }
+
         if (!exts.ObjectEmpty()) {
             obj.AddMember("extensions", exts, w.mAl);
         }
@@ -616,6 +699,10 @@ namespace glTF2 {
         if (mAsset.scene) {
             mDoc.AddMember("scene", mAsset.scene->index, mAl);
         }
+        
+        if(mAsset.extras) {
+            mDoc.AddMember("extras", *mAsset.extras, mAl);
+        }
     }
 
     inline void AssetWriter::WriteFile(const char* path)
@@ -709,10 +796,13 @@ namespace glTF2 {
         // Binary chunk
         //
 
+        int GLB_Chunk_count = 1;
         uint32_t binaryChunkLength = 0;
         if (bodyBuffer->byteLength > 0) {
             binaryChunkLength = (bodyBuffer->byteLength + 3) & ~3; // Round up to next multiple of 4
-            //auto curPaddingLength = binaryChunkLength - bodyBuffer->byteLength;
+            
+            auto curPaddingLength = binaryChunkLength - bodyBuffer->byteLength;
+            ++GLB_Chunk_count;
 
             GLB_Chunk binaryChunk;
             binaryChunk.chunkLength = binaryChunkLength;
@@ -727,7 +817,7 @@ namespace glTF2 {
             if (outfile->Write(bodyBuffer->GetPointer(), 1, bodyBuffer->byteLength) != bodyBuffer->byteLength) {
                 throw DeadlyExportError("Failed to write body data!");
             }
-            if (paddingLength && outfile->Write(&padding, 1, paddingLength) != paddingLength) {
+            if (curPaddingLength && outfile->Write(&padding, 1, paddingLength) != paddingLength) {
                 throw DeadlyExportError("Failed to write body data padding!");
             }
         }
@@ -742,7 +832,7 @@ namespace glTF2 {
         header.version = 2;
         AI_SWAP4(header.version);
 
-        header.length = uint32_t(sizeof(GLB_Header) + 2 * sizeof(GLB_Chunk) + jsonChunkLength + binaryChunkLength);
+        header.length = uint32_t(sizeof(GLB_Header) + GLB_Chunk_count * sizeof(GLB_Chunk) + jsonChunkLength + binaryChunkLength);
         AI_SWAP4(header.length);
 
         outfile->Seek(0, aiOrigin_SET);
@@ -775,6 +865,18 @@ namespace glTF2 {
             if (this->mAsset.extensionsUsed.KHR_materials_unlit) {
               exts.PushBack(StringRef("KHR_materials_unlit"), mAl);
             }
+
+            if (this->mAsset.extensionsUsed.KHR_materials_sheen) {
+                exts.PushBack(StringRef("KHR_materials_sheen"), mAl);
+            }
+                        
+            if (this->mAsset.extensionsUsed.KHR_materials_clearcoat) {
+                exts.PushBack(StringRef("KHR_materials_clearcoat"), mAl);
+            }
+
+            if (this->mAsset.extensionsUsed.KHR_materials_transmission) {
+                exts.PushBack(StringRef("KHR_materials_transmission"), mAl);
+            }
         }
 
         if (!exts.Empty())
diff --git a/code/AssetLib/glTF2/glTF2Exporter.cpp b/code/AssetLib/glTF2/glTF2Exporter.cpp
index 476824123..9bc670cb2 100644
--- a/code/AssetLib/glTF2/glTF2Exporter.cpp
+++ b/code/AssetLib/glTF2/glTF2Exporter.cpp
@@ -115,7 +115,14 @@ glTF2Exporter::glTF2Exporter(const char* filename, IOSystem* pIOSystem, const ai
     ExportScene();
 
     ExportAnimations();
-
+    
+    // export extras
+    if(mProperties->HasPropertyCallback("extras"))
+    {
+        std::function<void*(void*)> ExportExtras = mProperties->GetPropertyCallback("extras");
+        mAsset->extras = (rapidjson::Value*)ExportExtras(0);
+    }
+    
     AssetWriter writer(*mAsset);
 
     if (isBinary) {
@@ -214,6 +221,158 @@ inline void SetAccessorRange(ComponentType compType, Ref<Accessor> acc, void* da
 	}
 }
 
+// compute the (data-dataBase), store the non-zero data items
+template <typename T>
+size_t NZDiff(void *data, void *dataBase, size_t count, unsigned int numCompsIn, unsigned int numCompsOut, void *&outputNZDiff, void *&outputNZIdx) {
+    std::vector<T> vNZDiff;
+    std::vector<unsigned short> vNZIdx;
+    size_t totalComps = count * numCompsIn;
+    T *bufferData_ptr = static_cast<T *>(data);
+    T *bufferData_end = bufferData_ptr + totalComps;
+    T *bufferBase_ptr = static_cast<T *>(dataBase);
+
+    // Search and set extreme values.
+    for (short idx = 0; bufferData_ptr < bufferData_end; idx += 1, bufferData_ptr += numCompsIn) {
+        bool bNonZero = false;
+
+        //for the data, check any component Non Zero
+        for (unsigned int j = 0; j < numCompsOut; j++) {
+            double valueData = bufferData_ptr[j];
+            double valueBase = bufferBase_ptr ? bufferBase_ptr[j] : 0;
+            if ((valueData - valueBase) != 0) {
+                bNonZero = true;
+                break;
+            }
+        }
+
+        //all zeros, continue
+        if (!bNonZero)
+            continue;
+
+        //non zero, store the data
+        for (unsigned int j = 0; j < numCompsOut; j++) {
+            T valueData = bufferData_ptr[j];
+            T valueBase = bufferBase_ptr ? bufferBase_ptr[j] : 0;
+            vNZDiff.push_back(valueData - valueBase);
+        }
+        vNZIdx.push_back(idx);
+    }
+
+    //avoid all-0, put 1 item
+    if (vNZDiff.size() == 0) {
+        for (unsigned int j = 0; j < numCompsOut; j++)
+            vNZDiff.push_back(0);
+        vNZIdx.push_back(0);
+    }
+
+    //process data
+    outputNZDiff = new T[vNZDiff.size()];
+    memcpy(outputNZDiff, vNZDiff.data(), vNZDiff.size() * sizeof(T));
+
+    outputNZIdx = new unsigned short[vNZIdx.size()];
+    memcpy(outputNZIdx, vNZIdx.data(), vNZIdx.size() * sizeof(unsigned short));
+    return vNZIdx.size();
+}
+
+inline size_t NZDiff(ComponentType compType, void *data, void *dataBase, size_t count, unsigned int numCompsIn, unsigned int numCompsOut, void *&nzDiff, void *&nzIdx) {
+    switch (compType) {
+    case ComponentType_SHORT:
+        return NZDiff<short>(data, dataBase, count, numCompsIn, numCompsOut, nzDiff, nzIdx);
+    case ComponentType_UNSIGNED_SHORT:
+        return NZDiff<unsigned short>(data, dataBase, count, numCompsIn, numCompsOut, nzDiff, nzIdx);
+    case ComponentType_UNSIGNED_INT:
+        return NZDiff<unsigned int>(data, dataBase, count, numCompsIn, numCompsOut, nzDiff, nzIdx);
+    case ComponentType_FLOAT:
+        return NZDiff<float>(data, dataBase, count, numCompsIn, numCompsOut, nzDiff, nzIdx);
+    case ComponentType_BYTE:
+        return NZDiff<int8_t>(data, dataBase, count, numCompsIn, numCompsOut, nzDiff, nzIdx);
+    case ComponentType_UNSIGNED_BYTE:
+        return NZDiff<uint8_t>(data, dataBase, count, numCompsIn, numCompsOut, nzDiff, nzIdx);
+    }
+    return 0;
+}
+
+inline Ref<Accessor> ExportDataSparse(Asset &a, std::string &meshName, Ref<Buffer> &buffer,
+        size_t count, void *data, AttribType::Value typeIn, AttribType::Value typeOut, ComponentType compType, BufferViewTarget target = BufferViewTarget_NONE, void *dataBase = 0) {
+    if (!count || !data) {
+        return Ref<Accessor>();
+    }
+
+    unsigned int numCompsIn = AttribType::GetNumComponents(typeIn);
+    unsigned int numCompsOut = AttribType::GetNumComponents(typeOut);
+    unsigned int bytesPerComp = ComponentTypeSize(compType);
+
+    // accessor
+    Ref<Accessor> acc = a.accessors.Create(a.FindUniqueID(meshName, "accessor"));
+
+    // if there is a basic data vector
+    if (dataBase) {
+        size_t base_offset = buffer->byteLength;
+        size_t base_padding = base_offset % bytesPerComp;
+        base_offset += base_padding;
+        size_t base_length = count * numCompsOut * bytesPerComp;
+        buffer->Grow(base_length + base_padding);
+
+        Ref<BufferView> bv = a.bufferViews.Create(a.FindUniqueID(meshName, "view"));
+        bv->buffer = buffer;
+        bv->byteOffset = base_offset;
+        bv->byteLength = base_length; //! The target that the WebGL buffer should be bound to.
+        bv->byteStride = 0;
+        bv->target = target;
+        acc->bufferView = bv;
+        acc->WriteData(count, dataBase, numCompsIn * bytesPerComp);
+    }
+    acc->byteOffset = 0;
+    acc->componentType = compType;
+    acc->count = count;
+    acc->type = typeOut;
+
+    if (data) {
+        void *nzDiff = 0, *nzIdx = 0;
+        size_t nzCount = NZDiff(compType, data, dataBase, count, numCompsIn, numCompsOut, nzDiff, nzIdx);
+        acc->sparse.reset(new Accessor::Sparse);
+        acc->sparse->count = nzCount;
+
+        //indices
+        unsigned int bytesPerIdx = sizeof(unsigned short);
+        size_t indices_offset = buffer->byteLength;
+        size_t indices_padding = indices_offset % bytesPerIdx;
+        indices_offset += indices_padding;
+        size_t indices_length = nzCount * 1 * bytesPerIdx;
+        buffer->Grow(indices_length + indices_padding);
+
+        Ref<BufferView> indicesBV = a.bufferViews.Create(a.FindUniqueID(meshName, "view"));
+        indicesBV->buffer = buffer;
+        indicesBV->byteOffset = indices_offset;
+        indicesBV->byteLength = indices_length;
+        indicesBV->byteStride = 0;
+        acc->sparse->indices = indicesBV;
+        acc->sparse->indicesType = ComponentType_UNSIGNED_SHORT;
+        acc->sparse->indicesByteOffset = 0;
+        acc->WriteSparseIndices(nzCount, nzIdx, 1 * bytesPerIdx);
+
+        //values
+        size_t values_offset = buffer->byteLength;
+        size_t values_padding = values_offset % bytesPerComp;
+        values_offset += values_padding;
+        size_t values_length = nzCount * numCompsOut * bytesPerComp;
+        buffer->Grow(values_length + values_padding);
+
+        Ref<BufferView> valuesBV = a.bufferViews.Create(a.FindUniqueID(meshName, "view"));
+        valuesBV->buffer = buffer;
+        valuesBV->byteOffset = values_offset;
+        valuesBV->byteLength = values_length;
+        valuesBV->byteStride = 0;
+        acc->sparse->values = valuesBV;
+        acc->sparse->valuesByteOffset = 0;
+        acc->WriteSparseValues(nzCount, nzDiff, numCompsIn * bytesPerComp);
+
+        //clear
+        delete[] (char*)nzDiff;
+        delete[] (char*)nzIdx;
+    }
+    return acc;
+}
 inline Ref<Accessor> ExportData(Asset& a, std::string& meshName, Ref<Buffer>& buffer,
     size_t count, void* data, AttribType::Value typeIn, AttribType::Value typeOut, ComponentType compType, BufferViewTarget target = BufferViewTarget_NONE)
 {
@@ -555,6 +714,53 @@ void glTF2Exporter::ExportMaterials()
             mAsset->extensionsUsed.KHR_materials_unlit = true;
             m->unlit = true;
         }
+
+        bool hasMaterialSheen = false;
+        mat->Get(AI_MATKEY_GLTF_MATERIAL_SHEEN, hasMaterialSheen);
+
+        if (hasMaterialSheen) {
+            mAsset->extensionsUsed.KHR_materials_sheen = true;
+
+            MaterialSheen sheen;
+
+            GetMatColor(mat, sheen.sheenColorFactor, AI_MATKEY_GLTF_MATERIAL_SHEEN_COLOR_FACTOR);
+            mat->Get(AI_MATKEY_GLTF_MATERIAL_SHEEN_ROUGHNESS_FACTOR, sheen.sheenRoughnessFactor);
+            GetMatTex(mat, sheen.sheenColorTexture, AI_MATKEY_GLTF_MATERIAL_SHEEN_COLOR_TEXTURE);
+            GetMatTex(mat, sheen.sheenRoughnessTexture, AI_MATKEY_GLTF_MATERIAL_SHEEN_ROUGHNESS_TEXTURE);
+
+            m->materialSheen = Nullable<MaterialSheen>(sheen);
+        }
+
+        bool hasMaterialClearcoat = false;
+        mat->Get(AI_MATKEY_GLTF_MATERIAL_CLEARCOAT, hasMaterialClearcoat);
+
+        if (hasMaterialClearcoat) {
+            mAsset->extensionsUsed.KHR_materials_clearcoat= true;
+
+            MaterialClearcoat clearcoat;
+
+            mat->Get(AI_MATKEY_GLTF_MATERIAL_CLEARCOAT_FACTOR, clearcoat.clearcoatFactor);
+            mat->Get(AI_MATKEY_GLTF_MATERIAL_CLEARCOAT_ROUGHNESS_FACTOR, clearcoat.clearcoatRoughnessFactor);
+            GetMatTex(mat, clearcoat.clearcoatTexture, AI_MATKEY_GLTF_MATERIAL_CLEARCOAT_TEXTURE);
+            GetMatTex(mat, clearcoat.clearcoatRoughnessTexture, AI_MATKEY_GLTF_MATERIAL_CLEARCOAT_ROUGHNESS_TEXTURE);
+            GetMatTex(mat, clearcoat.clearcoatNormalTexture, AI_MATKEY_GLTF_MATERIAL_CLEARCOAT_NORMAL_TEXTURE);
+
+            m->materialClearcoat = Nullable<MaterialClearcoat>(clearcoat);
+        }
+
+        bool hasMaterialTransmission = false;
+        mat->Get(AI_MATKEY_GLTF_MATERIAL_TRANSMISSION, hasMaterialTransmission);
+
+        if (hasMaterialTransmission) {
+            mAsset->extensionsUsed.KHR_materials_transmission = true;
+
+            MaterialTransmission transmission;
+
+            mat->Get(AI_MATKEY_GLTF_MATERIAL_TRANSMISSION_FACTOR, transmission.transmissionFactor);
+            GetMatTex(mat, transmission.transmissionTexture, AI_MATKEY_GLTF_MATERIAL_TRANSMISSION_TEXTURE);
+
+            m->materialTransmission = Nullable<MaterialTransmission>(transmission);
+        }
     }
 }
 
@@ -824,6 +1030,10 @@ void glTF2Exporter::ExportMeshes()
 
         /*************** Targets for blendshapes ****************/
         if (aim->mNumAnimMeshes > 0) {
+            bool bUseSparse = this->mProperties->HasPropertyBool("GLTF2_SPARSE_ACCESSOR_EXP") &&
+                              this->mProperties->GetPropertyBool("GLTF2_SPARSE_ACCESSOR_EXP");
+            bool bIncludeNormal = this->mProperties->HasPropertyBool("GLTF2_TARGET_NORMAL_EXP") &&
+                                  this->mProperties->GetPropertyBool("GLTF2_TARGET_NORMAL_EXP");
             bool bExportTargetNames = this->mProperties->HasPropertyBool("GLTF2_TARGETNAMES_EXP") &&
                               this->mProperties->GetPropertyBool("GLTF2_TARGETNAMES_EXP");
 
@@ -832,7 +1042,6 @@ void glTF2Exporter::ExportMeshes()
                 aiAnimMesh *pAnimMesh = aim->mAnimMeshes[am];
                 if (bExportTargetNames)
                     m->targetNames.push_back(pAnimMesh->mName.data);
-
                 // position
                 if (pAnimMesh->HasPositions()) {
                     // NOTE: in gltf it is the diff stored
@@ -840,9 +1049,16 @@ void glTF2Exporter::ExportMeshes()
                     for (unsigned int vt = 0; vt < pAnimMesh->mNumVertices; ++vt) {
                         pPositionDiff[vt] = pAnimMesh->mVertices[vt] - aim->mVertices[vt];
                     }
-                    Ref<Accessor> vec = ExportData(*mAsset, meshId, b,
-                            pAnimMesh->mNumVertices, pPositionDiff,
-                            AttribType::VEC3, AttribType::VEC3, ComponentType_FLOAT);
+                    Ref<Accessor> vec;
+                    if (bUseSparse) {
+                        vec = ExportDataSparse(*mAsset, meshId, b,
+                                pAnimMesh->mNumVertices, pPositionDiff,
+                                AttribType::VEC3, AttribType::VEC3, ComponentType_FLOAT);
+                    } else {
+                        vec = ExportData(*mAsset, meshId, b,
+                                pAnimMesh->mNumVertices, pPositionDiff,
+                                AttribType::VEC3, AttribType::VEC3, ComponentType_FLOAT);
+                    }
                     if (vec) {
                         p.targets[am].position.push_back(vec);
                     }
@@ -850,14 +1066,21 @@ void glTF2Exporter::ExportMeshes()
                 }
 
                 // normal
-                if (pAnimMesh->HasNormals()) {
+                if (pAnimMesh->HasNormals() && bIncludeNormal) {
                     aiVector3D *pNormalDiff = new aiVector3D[pAnimMesh->mNumVertices];
                     for (unsigned int vt = 0; vt < pAnimMesh->mNumVertices; ++vt) {
                         pNormalDiff[vt] = pAnimMesh->mNormals[vt] - aim->mNormals[vt];
                     }
-                    Ref<Accessor> vec = ExportData(*mAsset, meshId, b,
-                            pAnimMesh->mNumVertices, pNormalDiff,
-                            AttribType::VEC3, AttribType::VEC3, ComponentType_FLOAT);
+                    Ref<Accessor> vec;
+                    if (bUseSparse) {
+                        vec = ExportDataSparse(*mAsset, meshId, b,
+                                pAnimMesh->mNumVertices, pNormalDiff,
+                                AttribType::VEC3, AttribType::VEC3, ComponentType_FLOAT);
+                    } else {
+                        vec = ExportData(*mAsset, meshId, b,
+                                pAnimMesh->mNumVertices, pNormalDiff,
+                                AttribType::VEC3, AttribType::VEC3, ComponentType_FLOAT);
+                    }
                     if (vec) {
                         p.targets[am].normal.push_back(vec);
                     }
@@ -950,7 +1173,7 @@ void glTF2Exporter::MergeMeshes()
                         unsigned int meshIndex = meshRef.GetIndex();
 
                         if (meshIndex == removedIndex) {
-                            node->meshes.erase(curNode->meshes.begin() + mm);
+                            curNode->meshes.erase(curNode->meshes.begin() + mm);
                         } else if (meshIndex > removedIndex) {
                             Ref<Mesh> newMeshRef = mAsset->meshes.Get(meshIndex - 1);
 
@@ -1082,9 +1305,6 @@ inline Ref<Accessor> GetSamplerInputRef(Asset& asset, std::string& animId, Ref<B
 inline void ExtractTranslationSampler(Asset& asset, std::string& animId, Ref<Buffer>& buffer, const aiNodeAnim* nodeChannel, float ticksPerSecond, Animation::Sampler& sampler)
 {
     const unsigned int numKeyframes = nodeChannel->mNumPositionKeys;
-    if (numKeyframes == 0) {
-        return;
-    }
 
     std::vector<float> times(numKeyframes);
     std::vector<float> values(numKeyframes * 3);
@@ -1105,9 +1325,6 @@ inline void ExtractTranslationSampler(Asset& asset, std::string& animId, Ref<Buf
 inline void ExtractScaleSampler(Asset& asset, std::string& animId, Ref<Buffer>& buffer, const aiNodeAnim* nodeChannel, float ticksPerSecond, Animation::Sampler& sampler)
 {
     const unsigned int numKeyframes = nodeChannel->mNumScalingKeys;
-    if (numKeyframes == 0) {
-        return;
-    }
 
     std::vector<float> times(numKeyframes);
     std::vector<float> values(numKeyframes * 3);
@@ -1128,9 +1345,6 @@ inline void ExtractScaleSampler(Asset& asset, std::string& animId, Ref<Buffer>&
 inline void ExtractRotationSampler(Asset& asset, std::string& animId, Ref<Buffer>& buffer, const aiNodeAnim* nodeChannel, float ticksPerSecond, Animation::Sampler& sampler)
 {
     const unsigned int numKeyframes = nodeChannel->mNumRotationKeys;
-    if (numKeyframes == 0) {
-        return;
-    }
 
     std::vector<float> times(numKeyframes);
     std::vector<float> values(numKeyframes * 4);
@@ -1171,29 +1385,36 @@ void glTF2Exporter::ExportAnimations()
         if (anim->mName.length > 0) {
             nameAnim = anim->mName.C_Str();
         }
+        Ref<Animation> animRef = mAsset->animations.Create(nameAnim);
 
         for (unsigned int channelIndex = 0; channelIndex < anim->mNumChannels; ++channelIndex) {
             const aiNodeAnim* nodeChannel = anim->mChannels[channelIndex];
 
-            // It appears that assimp stores this type of animation as multiple animations.
-            // where each aiNodeAnim in mChannels animates a specific node.
             std::string name = nameAnim + "_" + to_string(channelIndex);
             name = mAsset->FindUniqueID(name, "animation");
-            Ref<Animation> animRef = mAsset->animations.Create(name);
 
             Ref<Node> animNode = mAsset->nodes.Get(nodeChannel->mNodeName.C_Str());
 
-            Animation::Sampler translationSampler;
-            ExtractTranslationSampler(*mAsset, name, bufferRef, nodeChannel, ticksPerSecond, translationSampler);
-            AddSampler(animRef, animNode, translationSampler, AnimationPath_TRANSLATION);
+            if (nodeChannel->mNumPositionKeys > 0)
+            {
+                Animation::Sampler translationSampler;
+                ExtractTranslationSampler(*mAsset, name, bufferRef, nodeChannel, ticksPerSecond, translationSampler);
+                AddSampler(animRef, animNode, translationSampler, AnimationPath_TRANSLATION);
+            }
 
-            Animation::Sampler rotationSampler;
-            ExtractRotationSampler(*mAsset, name, bufferRef, nodeChannel, ticksPerSecond, rotationSampler);
-            AddSampler(animRef, animNode, rotationSampler, AnimationPath_ROTATION);
+            if (nodeChannel->mNumRotationKeys > 0)
+            {
+                Animation::Sampler rotationSampler;
+                ExtractRotationSampler(*mAsset, name, bufferRef, nodeChannel, ticksPerSecond, rotationSampler);
+                AddSampler(animRef, animNode, rotationSampler, AnimationPath_ROTATION);
+            }
 
-            Animation::Sampler scaleSampler;
-            ExtractScaleSampler(*mAsset, name, bufferRef, nodeChannel, ticksPerSecond, scaleSampler);
-            AddSampler(animRef, animNode, scaleSampler, AnimationPath_SCALE);
+            if (nodeChannel->mNumScalingKeys > 0)
+            {
+                Animation::Sampler scaleSampler;
+                ExtractScaleSampler(*mAsset, name, bufferRef, nodeChannel, ticksPerSecond, scaleSampler);
+                AddSampler(animRef, animNode, scaleSampler, AnimationPath_SCALE);
+            }
         }
 
         // Assimp documentation staes this is not used (not implemented)
diff --git a/code/AssetLib/glTF2/glTF2Exporter.h b/code/AssetLib/glTF2/glTF2Exporter.h
index 421a4806e..1d28ed459 100644
--- a/code/AssetLib/glTF2/glTF2Exporter.h
+++ b/code/AssetLib/glTF2/glTF2Exporter.h
@@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_GLTF2EXPORTER_H_INC
 #define AI_GLTF2EXPORTER_H_INC
 
-#ifndef ASSIMP_BUILD_NO_GLTF_IMPORTER
+#if !defined(ASSIMP_BUILD_NO_GLTF_IMPORTER) && !defined(ASSIMP_BUILD_NO_GLTF2_IMPORTER)
 
 #include <assimp/types.h>
 #include <assimp/material.h>
diff --git a/code/AssetLib/glTF2/glTF2Importer.cpp b/code/AssetLib/glTF2/glTF2Importer.cpp
index 4d740d8c1..ac3b7144e 100644
--- a/code/AssetLib/glTF2/glTF2Importer.cpp
+++ b/code/AssetLib/glTF2/glTF2Importer.cpp
@@ -39,7 +39,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ----------------------------------------------------------------------
 */
 
-#ifndef ASSIMP_BUILD_NO_GLTF_IMPORTER
+#if !defined(ASSIMP_BUILD_NO_GLTF_IMPORTER) && !defined(ASSIMP_BUILD_NO_GLTF2_IMPORTER)
 
 #include "AssetLib/glTF2/glTF2Importer.h"
 #include "PostProcessing/MakeVerboseFormat.h"
@@ -69,8 +69,8 @@ using namespace glTFCommon;
 namespace {
 // generate bi-tangents from normals and tangents according to spec
 struct Tangent {
-	aiVector3D xyz;
-	ai_real w;
+    aiVector3D xyz;
+    ai_real w;
 };
 } // namespace
 
@@ -79,1262 +79,1367 @@ struct Tangent {
 //
 
 static const aiImporterDesc desc = {
-	"glTF2 Importer",
-	"",
-	"",
-	"",
-	aiImporterFlags_SupportTextFlavour | aiImporterFlags_SupportBinaryFlavour | aiImporterFlags_LimitedSupport | aiImporterFlags_Experimental,
-	0,
-	0,
-	0,
-	0,
-	"gltf glb"
+    "glTF2 Importer",
+    "",
+    "",
+    "",
+    aiImporterFlags_SupportTextFlavour | aiImporterFlags_SupportBinaryFlavour | aiImporterFlags_LimitedSupport | aiImporterFlags_Experimental,
+    0,
+    0,
+    0,
+    0,
+    "gltf glb"
 };
 
 glTF2Importer::glTF2Importer() :
-		BaseImporter(),
-		meshOffsets(),
-		embeddedTexIdxs(),
-		mScene(nullptr) {
-	// empty
+        BaseImporter(),
+        meshOffsets(),
+        embeddedTexIdxs(),
+        mScene(nullptr) {
+    // empty
 }
 
 glTF2Importer::~glTF2Importer() {
-	// empty
+    // empty
 }
 
 const aiImporterDesc *glTF2Importer::GetInfo() const {
-	return &desc;
+    return &desc;
 }
 
 bool glTF2Importer::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool /* checkSig */) const {
-	const std::string &extension = GetExtension(pFile);
+    const std::string &extension = GetExtension(pFile);
 
-	if (extension != "gltf" && extension != "glb") {
+    if (extension != "gltf" && extension != "glb") {
         return false;
-  }
+    }
 
-	if (pIOHandler) {
-		glTF2::Asset asset(pIOHandler);
-		asset.Load(pFile, extension == "glb");
-		std::string version = asset.asset.version;
-		return !version.empty() && version[0] == '2';
-	}
+    if (pIOHandler) {
+        glTF2::Asset asset(pIOHandler);
+        asset.Load(pFile, extension == "glb");
+        std::string version = asset.asset.version;
+        return !version.empty() && version[0] == '2';
+    }
 
-	return false;
+    return false;
 }
 
 static aiTextureMapMode ConvertWrappingMode(SamplerWrap gltfWrapMode) {
-	switch (gltfWrapMode) {
-		case SamplerWrap::Mirrored_Repeat:
-			return aiTextureMapMode_Mirror;
+    switch (gltfWrapMode) {
+        case SamplerWrap::Mirrored_Repeat:
+            return aiTextureMapMode_Mirror;
 
-		case SamplerWrap::Clamp_To_Edge:
-			return aiTextureMapMode_Clamp;
+        case SamplerWrap::Clamp_To_Edge:
+            return aiTextureMapMode_Clamp;
 
-		case SamplerWrap::UNSET:
-		case SamplerWrap::Repeat:
-		default:
-			return aiTextureMapMode_Wrap;
-	}
+        case SamplerWrap::UNSET:
+        case SamplerWrap::Repeat:
+        default:
+            return aiTextureMapMode_Wrap;
+    }
 }
 
 inline void SetMaterialColorProperty(Asset & /*r*/, vec4 &prop, aiMaterial *mat, const char *pKey, unsigned int type, unsigned int idx) {
-	aiColor4D col;
-	CopyValue(prop, col);
-	mat->AddProperty(&col, 1, pKey, type, idx);
+    aiColor4D col;
+    CopyValue(prop, col);
+    mat->AddProperty(&col, 1, pKey, type, idx);
 }
 
 inline void SetMaterialColorProperty(Asset & /*r*/, vec3 &prop, aiMaterial *mat, const char *pKey, unsigned int type, unsigned int idx) {
-	aiColor4D col;
-	glTFCommon::CopyValue(prop, col);
-	mat->AddProperty(&col, 1, pKey, type, idx);
+    aiColor4D col;
+    glTFCommon::CopyValue(prop, col);
+    mat->AddProperty(&col, 1, pKey, type, idx);
 }
 
 inline void SetMaterialTextureProperty(std::vector<int> &embeddedTexIdxs, Asset & /*r*/, glTF2::TextureInfo prop, aiMaterial *mat, aiTextureType texType, unsigned int texSlot = 0) {
-	if (prop.texture && prop.texture->source) {
-		aiString uri(prop.texture->source->uri);
+    if (prop.texture && prop.texture->source) {
+        aiString uri(prop.texture->source->uri);
 
-		int texIdx = embeddedTexIdxs[prop.texture->source.GetIndex()];
-		if (texIdx != -1) { // embedded
-			// setup texture reference string (copied from ColladaLoader::FindFilenameForEffectTexture)
-			uri.data[0] = '*';
-			uri.length = 1 + ASSIMP_itoa10(uri.data + 1, MAXLEN - 1, texIdx);
-		}
+        int texIdx = embeddedTexIdxs[prop.texture->source.GetIndex()];
+        if (texIdx != -1) { // embedded
+            // setup texture reference string (copied from ColladaLoader::FindFilenameForEffectTexture)
+            uri.data[0] = '*';
+            uri.length = 1 + ASSIMP_itoa10(uri.data + 1, MAXLEN - 1, texIdx);
+        }
 
         mat->AddProperty(&uri, AI_MATKEY_TEXTURE(texType, texSlot));
         mat->AddProperty(&prop.texCoord, 1, AI_MATKEY_GLTF_TEXTURE_TEXCOORD(texType, texSlot));
 
-		if (prop.textureTransformSupported) {
-			aiUVTransform transform;
-			transform.mScaling.x = prop.TextureTransformExt_t.scale[0];
-			transform.mScaling.y = prop.TextureTransformExt_t.scale[1];
-			transform.mRotation = -prop.TextureTransformExt_t.rotation; // must be negated
+        if (prop.textureTransformSupported) {
+            aiUVTransform transform;
+            transform.mScaling.x = prop.TextureTransformExt_t.scale[0];
+            transform.mScaling.y = prop.TextureTransformExt_t.scale[1];
+            transform.mRotation = -prop.TextureTransformExt_t.rotation; // must be negated
 
-			// A change of coordinates is required to map glTF UV transformations into the space used by
-			// Assimp. In glTF all UV origins are at 0,1 (top left of texture) in Assimp space. In Assimp
-			// rotation occurs around the image center (0.5,0.5) where as in glTF rotation is around the
-			// texture origin. All three can be corrected for solely by a change of the translation since
-			// the transformations available are shape preserving. Note the importer already flips the V
-			// coordinate of the actual meshes during import.
-			const ai_real rcos(cos(-transform.mRotation));
-			const ai_real rsin(sin(-transform.mRotation));
-			transform.mTranslation.x = (static_cast<ai_real>( 0.5 ) * transform.mScaling.x) * (-rcos + rsin + 1) + prop.TextureTransformExt_t.offset[0];
-			transform.mTranslation.y = ((static_cast<ai_real>( 0.5 ) * transform.mScaling.y) * (rsin + rcos - 1)) + 1 - transform.mScaling.y - prop.TextureTransformExt_t.offset[1];;
+            // A change of coordinates is required to map glTF UV transformations into the space used by
+            // Assimp. In glTF all UV origins are at 0,1 (top left of texture) in Assimp space. In Assimp
+            // rotation occurs around the image center (0.5,0.5) where as in glTF rotation is around the
+            // texture origin. All three can be corrected for solely by a change of the translation since
+            // the transformations available are shape preserving. Note the importer already flips the V
+            // coordinate of the actual meshes during import.
+            const ai_real rcos(cos(-transform.mRotation));
+            const ai_real rsin(sin(-transform.mRotation));
+            transform.mTranslation.x = (static_cast<ai_real>( 0.5 ) * transform.mScaling.x) * (-rcos + rsin + 1) + prop.TextureTransformExt_t.offset[0];
+            transform.mTranslation.y = ((static_cast<ai_real>( 0.5 ) * transform.mScaling.y) * (rsin + rcos - 1)) + 1 - transform.mScaling.y - prop.TextureTransformExt_t.offset[1];;
 
-			mat->AddProperty(&transform, 1, _AI_MATKEY_UVTRANSFORM_BASE, texType, texSlot);
-		}
+            mat->AddProperty(&transform, 1, _AI_MATKEY_UVTRANSFORM_BASE, texType, texSlot);
+        }
 
-		if (prop.texture->sampler) {
-			Ref<Sampler> sampler = prop.texture->sampler;
+        if (prop.texture->sampler) {
+            Ref<Sampler> sampler = prop.texture->sampler;
 
-			aiString name(sampler->name);
-			aiString id(sampler->id);
+            aiString name(sampler->name);
+            aiString id(sampler->id);
 
-			mat->AddProperty(&name, AI_MATKEY_GLTF_MAPPINGNAME(texType, texSlot));
-			mat->AddProperty(&id, AI_MATKEY_GLTF_MAPPINGID(texType, texSlot));
+            mat->AddProperty(&name, AI_MATKEY_GLTF_MAPPINGNAME(texType, texSlot));
+            mat->AddProperty(&id, AI_MATKEY_GLTF_MAPPINGID(texType, texSlot));
 
-			aiTextureMapMode wrapS = ConvertWrappingMode(sampler->wrapS);
-			aiTextureMapMode wrapT = ConvertWrappingMode(sampler->wrapT);
-			mat->AddProperty(&wrapS, 1, AI_MATKEY_MAPPINGMODE_U(texType, texSlot));
-			mat->AddProperty(&wrapT, 1, AI_MATKEY_MAPPINGMODE_V(texType, texSlot));
+            aiTextureMapMode wrapS = ConvertWrappingMode(sampler->wrapS);
+            aiTextureMapMode wrapT = ConvertWrappingMode(sampler->wrapT);
+            mat->AddProperty(&wrapS, 1, AI_MATKEY_MAPPINGMODE_U(texType, texSlot));
+            mat->AddProperty(&wrapT, 1, AI_MATKEY_MAPPINGMODE_V(texType, texSlot));
 
-			if (sampler->magFilter != SamplerMagFilter::UNSET) {
-				mat->AddProperty(&sampler->magFilter, 1, AI_MATKEY_GLTF_MAPPINGFILTER_MAG(texType, texSlot));
-			}
+            if (sampler->magFilter != SamplerMagFilter::UNSET) {
+                mat->AddProperty(&sampler->magFilter, 1, AI_MATKEY_GLTF_MAPPINGFILTER_MAG(texType, texSlot));
+            }
 
-			if (sampler->minFilter != SamplerMinFilter::UNSET) {
-				mat->AddProperty(&sampler->minFilter, 1, AI_MATKEY_GLTF_MAPPINGFILTER_MIN(texType, texSlot));
-			}
-		}
-	}
+            if (sampler->minFilter != SamplerMinFilter::UNSET) {
+                mat->AddProperty(&sampler->minFilter, 1, AI_MATKEY_GLTF_MAPPINGFILTER_MIN(texType, texSlot));
+            }
+        }
+    }
 }
 
 inline void SetMaterialTextureProperty(std::vector<int> &embeddedTexIdxs, Asset &r, glTF2::NormalTextureInfo &prop, aiMaterial *mat, aiTextureType texType, unsigned int texSlot = 0) {
-	SetMaterialTextureProperty(embeddedTexIdxs, r, (glTF2::TextureInfo)prop, mat, texType, texSlot);
+    SetMaterialTextureProperty(embeddedTexIdxs, r, (glTF2::TextureInfo)prop, mat, texType, texSlot);
 
-	if (prop.texture && prop.texture->source) {
-		mat->AddProperty(&prop.scale, 1, AI_MATKEY_GLTF_TEXTURE_SCALE(texType, texSlot));
-	}
+    if (prop.texture && prop.texture->source) {
+        mat->AddProperty(&prop.scale, 1, AI_MATKEY_GLTF_TEXTURE_SCALE(texType, texSlot));
+    }
 }
 
 inline void SetMaterialTextureProperty(std::vector<int> &embeddedTexIdxs, Asset &r, glTF2::OcclusionTextureInfo &prop, aiMaterial *mat, aiTextureType texType, unsigned int texSlot = 0) {
-	SetMaterialTextureProperty(embeddedTexIdxs, r, (glTF2::TextureInfo)prop, mat, texType, texSlot);
+    SetMaterialTextureProperty(embeddedTexIdxs, r, (glTF2::TextureInfo)prop, mat, texType, texSlot);
 
-	if (prop.texture && prop.texture->source) {
-		mat->AddProperty(&prop.strength, 1, AI_MATKEY_GLTF_TEXTURE_STRENGTH(texType, texSlot));
-	}
+    if (prop.texture && prop.texture->source) {
+        mat->AddProperty(&prop.strength, 1, AI_MATKEY_GLTF_TEXTURE_STRENGTH(texType, texSlot));
+    }
 }
 
 static aiMaterial *ImportMaterial(std::vector<int> &embeddedTexIdxs, Asset &r, Material &mat) {
-	aiMaterial *aimat = new aiMaterial();
+    aiMaterial *aimat = new aiMaterial();
 
-	if (!mat.name.empty()) {
-		aiString str(mat.name);
+    try {
+        if (!mat.name.empty()) {
+            aiString str(mat.name);
 
-		aimat->AddProperty(&str, AI_MATKEY_NAME);
-	}
+            aimat->AddProperty(&str, AI_MATKEY_NAME);
+        }
 
-	SetMaterialColorProperty(r, mat.pbrMetallicRoughness.baseColorFactor, aimat, AI_MATKEY_COLOR_DIFFUSE);
-	SetMaterialColorProperty(r, mat.pbrMetallicRoughness.baseColorFactor, aimat, AI_MATKEY_GLTF_PBRMETALLICROUGHNESS_BASE_COLOR_FACTOR);
+        SetMaterialColorProperty(r, mat.pbrMetallicRoughness.baseColorFactor, aimat, AI_MATKEY_COLOR_DIFFUSE);
+        SetMaterialColorProperty(r, mat.pbrMetallicRoughness.baseColorFactor, aimat, AI_MATKEY_GLTF_PBRMETALLICROUGHNESS_BASE_COLOR_FACTOR);
 
-	SetMaterialTextureProperty(embeddedTexIdxs, r, mat.pbrMetallicRoughness.baseColorTexture, aimat, aiTextureType_DIFFUSE);
-	SetMaterialTextureProperty(embeddedTexIdxs, r, mat.pbrMetallicRoughness.baseColorTexture, aimat, AI_MATKEY_GLTF_PBRMETALLICROUGHNESS_BASE_COLOR_TEXTURE);
+        SetMaterialTextureProperty(embeddedTexIdxs, r, mat.pbrMetallicRoughness.baseColorTexture, aimat, aiTextureType_DIFFUSE);
+        SetMaterialTextureProperty(embeddedTexIdxs, r, mat.pbrMetallicRoughness.baseColorTexture, aimat, AI_MATKEY_GLTF_PBRMETALLICROUGHNESS_BASE_COLOR_TEXTURE);
 
-	SetMaterialTextureProperty(embeddedTexIdxs, r, mat.pbrMetallicRoughness.metallicRoughnessTexture, aimat, AI_MATKEY_GLTF_PBRMETALLICROUGHNESS_METALLICROUGHNESS_TEXTURE);
+        SetMaterialTextureProperty(embeddedTexIdxs, r, mat.pbrMetallicRoughness.metallicRoughnessTexture, aimat, AI_MATKEY_GLTF_PBRMETALLICROUGHNESS_METALLICROUGHNESS_TEXTURE);
 
-	aimat->AddProperty(&mat.pbrMetallicRoughness.metallicFactor, 1, AI_MATKEY_GLTF_PBRMETALLICROUGHNESS_METALLIC_FACTOR);
-	aimat->AddProperty(&mat.pbrMetallicRoughness.roughnessFactor, 1, AI_MATKEY_GLTF_PBRMETALLICROUGHNESS_ROUGHNESS_FACTOR);
+        aimat->AddProperty(&mat.pbrMetallicRoughness.metallicFactor, 1, AI_MATKEY_GLTF_PBRMETALLICROUGHNESS_METALLIC_FACTOR);
+        aimat->AddProperty(&mat.pbrMetallicRoughness.roughnessFactor, 1, AI_MATKEY_GLTF_PBRMETALLICROUGHNESS_ROUGHNESS_FACTOR);
 
-	float roughnessAsShininess = 1 - mat.pbrMetallicRoughness.roughnessFactor;
-	roughnessAsShininess *= roughnessAsShininess * 1000;
-	aimat->AddProperty(&roughnessAsShininess, 1, AI_MATKEY_SHININESS);
+        float roughnessAsShininess = 1 - mat.pbrMetallicRoughness.roughnessFactor;
+        roughnessAsShininess *= roughnessAsShininess * 1000;
+        aimat->AddProperty(&roughnessAsShininess, 1, AI_MATKEY_SHININESS);
 
-	SetMaterialTextureProperty(embeddedTexIdxs, r, mat.normalTexture, aimat, aiTextureType_NORMALS);
-	SetMaterialTextureProperty(embeddedTexIdxs, r, mat.occlusionTexture, aimat, aiTextureType_LIGHTMAP);
-	SetMaterialTextureProperty(embeddedTexIdxs, r, mat.emissiveTexture, aimat, aiTextureType_EMISSIVE);
-	SetMaterialColorProperty(r, mat.emissiveFactor, aimat, AI_MATKEY_COLOR_EMISSIVE);
+        SetMaterialTextureProperty(embeddedTexIdxs, r, mat.normalTexture, aimat, aiTextureType_NORMALS);
+        SetMaterialTextureProperty(embeddedTexIdxs, r, mat.occlusionTexture, aimat, aiTextureType_LIGHTMAP);
+        SetMaterialTextureProperty(embeddedTexIdxs, r, mat.emissiveTexture, aimat, aiTextureType_EMISSIVE);
+        SetMaterialColorProperty(r, mat.emissiveFactor, aimat, AI_MATKEY_COLOR_EMISSIVE);
 
-	aimat->AddProperty(&mat.doubleSided, 1, AI_MATKEY_TWOSIDED);
+        aimat->AddProperty(&mat.doubleSided, 1, AI_MATKEY_TWOSIDED);
 
-	aiString alphaMode(mat.alphaMode);
-	aimat->AddProperty(&alphaMode, AI_MATKEY_GLTF_ALPHAMODE);
-	aimat->AddProperty(&mat.alphaCutoff, 1, AI_MATKEY_GLTF_ALPHACUTOFF);
+        aiString alphaMode(mat.alphaMode);
+        aimat->AddProperty(&alphaMode, AI_MATKEY_GLTF_ALPHAMODE);
+        aimat->AddProperty(&mat.alphaCutoff, 1, AI_MATKEY_GLTF_ALPHACUTOFF);
 
-	//pbrSpecularGlossiness
-	if (mat.pbrSpecularGlossiness.isPresent) {
-		PbrSpecularGlossiness &pbrSG = mat.pbrSpecularGlossiness.value;
+        //pbrSpecularGlossiness
+        if (mat.pbrSpecularGlossiness.isPresent) {
+            PbrSpecularGlossiness &pbrSG = mat.pbrSpecularGlossiness.value;
 
-		aimat->AddProperty(&mat.pbrSpecularGlossiness.isPresent, 1, AI_MATKEY_GLTF_PBRSPECULARGLOSSINESS);
-		SetMaterialColorProperty(r, pbrSG.diffuseFactor, aimat, AI_MATKEY_COLOR_DIFFUSE);
-		SetMaterialColorProperty(r, pbrSG.specularFactor, aimat, AI_MATKEY_COLOR_SPECULAR);
+            aimat->AddProperty(&mat.pbrSpecularGlossiness.isPresent, 1, AI_MATKEY_GLTF_PBRSPECULARGLOSSINESS);
+            SetMaterialColorProperty(r, pbrSG.diffuseFactor, aimat, AI_MATKEY_COLOR_DIFFUSE);
+            SetMaterialColorProperty(r, pbrSG.specularFactor, aimat, AI_MATKEY_COLOR_SPECULAR);
 
-		float glossinessAsShininess = pbrSG.glossinessFactor * 1000.0f;
-		aimat->AddProperty(&glossinessAsShininess, 1, AI_MATKEY_SHININESS);
-		aimat->AddProperty(&pbrSG.glossinessFactor, 1, AI_MATKEY_GLTF_PBRSPECULARGLOSSINESS_GLOSSINESS_FACTOR);
+            float glossinessAsShininess = pbrSG.glossinessFactor * 1000.0f;
+            aimat->AddProperty(&glossinessAsShininess, 1, AI_MATKEY_SHININESS);
+            aimat->AddProperty(&pbrSG.glossinessFactor, 1, AI_MATKEY_GLTF_PBRSPECULARGLOSSINESS_GLOSSINESS_FACTOR);
 
-		SetMaterialTextureProperty(embeddedTexIdxs, r, pbrSG.diffuseTexture, aimat, aiTextureType_DIFFUSE);
+            SetMaterialTextureProperty(embeddedTexIdxs, r, pbrSG.diffuseTexture, aimat, aiTextureType_DIFFUSE);
 
-		SetMaterialTextureProperty(embeddedTexIdxs, r, pbrSG.specularGlossinessTexture, aimat, aiTextureType_SPECULAR);
-	}
-	if (mat.unlit) {
-		aimat->AddProperty(&mat.unlit, 1, AI_MATKEY_GLTF_UNLIT);
-	}
+            SetMaterialTextureProperty(embeddedTexIdxs, r, pbrSG.specularGlossinessTexture, aimat, aiTextureType_SPECULAR);
+        }
+        if (mat.unlit) {
+            aimat->AddProperty(&mat.unlit, 1, AI_MATKEY_GLTF_UNLIT);
+        }
 
-	return aimat;
+        //KHR_materials_sheen
+        if (mat.materialSheen.isPresent) {
+            MaterialSheen &sheen = mat.materialSheen.value;
+
+            aimat->AddProperty(&mat.materialSheen.isPresent, 1, AI_MATKEY_GLTF_MATERIAL_SHEEN);
+            SetMaterialColorProperty(r, sheen.sheenColorFactor, aimat, AI_MATKEY_GLTF_MATERIAL_SHEEN_COLOR_FACTOR);
+            aimat->AddProperty(&sheen.sheenRoughnessFactor, 1, AI_MATKEY_GLTF_MATERIAL_SHEEN_ROUGHNESS_FACTOR);
+            SetMaterialTextureProperty(embeddedTexIdxs, r, sheen.sheenColorTexture, aimat, AI_MATKEY_GLTF_MATERIAL_SHEEN_COLOR_TEXTURE);
+            SetMaterialTextureProperty(embeddedTexIdxs, r, sheen.sheenRoughnessTexture, aimat, AI_MATKEY_GLTF_MATERIAL_SHEEN_ROUGHNESS_TEXTURE);
+        }
+
+        //KHR_materials_clearcoat
+        if (mat.materialClearcoat.isPresent) {
+            MaterialClearcoat &clearcoat = mat.materialClearcoat.value;
+
+            aimat->AddProperty(&mat.materialClearcoat.isPresent, 1, AI_MATKEY_GLTF_MATERIAL_CLEARCOAT);
+            aimat->AddProperty(&clearcoat.clearcoatFactor, 1, AI_MATKEY_GLTF_MATERIAL_CLEARCOAT_FACTOR);
+            aimat->AddProperty(&clearcoat.clearcoatRoughnessFactor, 1, AI_MATKEY_GLTF_MATERIAL_CLEARCOAT_ROUGHNESS_FACTOR);
+            SetMaterialTextureProperty(embeddedTexIdxs, r, clearcoat.clearcoatTexture, aimat, AI_MATKEY_GLTF_MATERIAL_CLEARCOAT_TEXTURE);
+            SetMaterialTextureProperty(embeddedTexIdxs, r, clearcoat.clearcoatRoughnessTexture, aimat, AI_MATKEY_GLTF_MATERIAL_CLEARCOAT_ROUGHNESS_TEXTURE);
+            SetMaterialTextureProperty(embeddedTexIdxs, r, clearcoat.clearcoatNormalTexture, aimat, AI_MATKEY_GLTF_MATERIAL_CLEARCOAT_NORMAL_TEXTURE);
+        }
+
+        //KHR_materials_transmission
+        if (mat.materialTransmission.isPresent) {
+            MaterialTransmission &transmission = mat.materialTransmission.value;
+
+            aimat->AddProperty(&mat.materialTransmission.isPresent, 1, AI_MATKEY_GLTF_MATERIAL_TRANSMISSION);
+            aimat->AddProperty(&transmission.transmissionFactor, 1, AI_MATKEY_GLTF_MATERIAL_TRANSMISSION_FACTOR);
+            SetMaterialTextureProperty(embeddedTexIdxs, r, transmission.transmissionTexture, aimat, AI_MATKEY_GLTF_MATERIAL_TRANSMISSION_TEXTURE);
+        }
+
+        return aimat;
+    } catch (...) {
+        delete aimat;
+        throw;
+    }
 }
 
 void glTF2Importer::ImportMaterials(glTF2::Asset &r) {
-	const unsigned int numImportedMaterials = unsigned(r.materials.Size());
-	ASSIMP_LOG_DEBUG_F("Importing ", numImportedMaterials, " materials");
-	Material defaultMaterial;
+    const unsigned int numImportedMaterials = unsigned(r.materials.Size());
+    ASSIMP_LOG_DEBUG_F("Importing ", numImportedMaterials, " materials");
+    Material defaultMaterial;
 
-	mScene->mNumMaterials = numImportedMaterials + 1;
-	mScene->mMaterials = new aiMaterial *[mScene->mNumMaterials];
-	mScene->mMaterials[numImportedMaterials] = ImportMaterial(embeddedTexIdxs, r, defaultMaterial);
+    mScene->mNumMaterials = numImportedMaterials + 1;
+    mScene->mMaterials = new aiMaterial *[mScene->mNumMaterials];
+    std::fill(mScene->mMaterials, mScene->mMaterials + mScene->mNumMaterials, nullptr);
+    mScene->mMaterials[numImportedMaterials] = ImportMaterial(embeddedTexIdxs, r, defaultMaterial);
 
-	for (unsigned int i = 0; i < numImportedMaterials; ++i) {
-		mScene->mMaterials[i] = ImportMaterial(embeddedTexIdxs, r, r.materials[i]);
-	}
+    for (unsigned int i = 0; i < numImportedMaterials; ++i) {
+        mScene->mMaterials[i] = ImportMaterial(embeddedTexIdxs, r, r.materials[i]);
+    }
 }
 
-static inline void SetFace(aiFace &face, int a) {
-	face.mNumIndices = 1;
-	face.mIndices = new unsigned int[1];
-	face.mIndices[0] = a;
+static inline void SetFaceAndAdvance1(aiFace*& face, unsigned int numVertices, unsigned int a) {
+    if (a >= numVertices) {
+        return;
+    }
+    face->mNumIndices = 1;
+    face->mIndices = new unsigned int[1];
+    face->mIndices[0] = a;
+    ++face;
 }
 
-static inline void SetFace(aiFace &face, int a, int b) {
-	face.mNumIndices = 2;
-	face.mIndices = new unsigned int[2];
-	face.mIndices[0] = a;
-	face.mIndices[1] = b;
+static inline void SetFaceAndAdvance2(aiFace*& face, unsigned int numVertices, unsigned int a, unsigned int b) {
+    if ((a >= numVertices) || (b >= numVertices)) {
+        return;
+    }
+    face->mNumIndices = 2;
+    face->mIndices = new unsigned int[2];
+    face->mIndices[0] = a;
+    face->mIndices[1] = b;
+    ++face;
 }
 
-static inline void SetFace(aiFace &face, int a, int b, int c) {
-	face.mNumIndices = 3;
-	face.mIndices = new unsigned int[3];
-	face.mIndices[0] = a;
-	face.mIndices[1] = b;
-	face.mIndices[2] = c;
+static inline void SetFaceAndAdvance3(aiFace*& face, unsigned int numVertices, unsigned int a, unsigned int b, unsigned int c) {
+    if ((a >= numVertices) || (b >= numVertices) || (c >= numVertices)) {
+        return;
+    }
+    face->mNumIndices = 3;
+    face->mIndices = new unsigned int[3];
+    face->mIndices[0] = a;
+    face->mIndices[1] = b;
+    face->mIndices[2] = c;
+    ++face;
 }
 
 #ifdef ASSIMP_BUILD_DEBUG
 static inline bool CheckValidFacesIndices(aiFace *faces, unsigned nFaces, unsigned nVerts) {
-	for (unsigned i = 0; i < nFaces; ++i) {
-		for (unsigned j = 0; j < faces[i].mNumIndices; ++j) {
-			unsigned idx = faces[i].mIndices[j];
-			if (idx >= nVerts) {
-				return false;
-			}
-		}
-	}
-	return true;
+    for (unsigned i = 0; i < nFaces; ++i) {
+        for (unsigned j = 0; j < faces[i].mNumIndices; ++j) {
+            unsigned idx = faces[i].mIndices[j];
+            if (idx >= nVerts) {
+                return false;
+            }
+        }
+    }
+    return true;
 }
 #endif // ASSIMP_BUILD_DEBUG
 
 void glTF2Importer::ImportMeshes(glTF2::Asset &r) {
-	ASSIMP_LOG_DEBUG_F("Importing ", r.meshes.Size(), " meshes");
-	std::vector<aiMesh *> meshes;
+    ASSIMP_LOG_DEBUG_F("Importing ", r.meshes.Size(), " meshes");
+    std::vector<std::unique_ptr<aiMesh>> meshes;
 
-	unsigned int k = 0;
+    unsigned int k = 0;
     meshOffsets.clear();
 
-	for (unsigned int m = 0; m < r.meshes.Size(); ++m) {
-		Mesh &mesh = r.meshes[m];
+    for (unsigned int m = 0; m < r.meshes.Size(); ++m) {
+        Mesh &mesh = r.meshes[m];
 
-		meshOffsets.push_back(k);
-		k += unsigned(mesh.primitives.size());
+        meshOffsets.push_back(k);
+        k += unsigned(mesh.primitives.size());
 
-		for (unsigned int p = 0; p < mesh.primitives.size(); ++p) {
-			Mesh::Primitive &prim = mesh.primitives[p];
+        for (unsigned int p = 0; p < mesh.primitives.size(); ++p) {
+            Mesh::Primitive &prim = mesh.primitives[p];
 
-			aiMesh *aim = new aiMesh();
-			meshes.push_back(aim);
+            aiMesh *aim = new aiMesh();
+            meshes.push_back(std::unique_ptr<aiMesh>(aim));
 
-			aim->mName = mesh.name.empty() ? mesh.id : mesh.name;
+            aim->mName = mesh.name.empty() ? mesh.id : mesh.name;
 
-			if (mesh.primitives.size() > 1) {
-				ai_uint32 &len = aim->mName.length;
-				aim->mName.data[len] = '-';
-				len += 1 + ASSIMP_itoa10(aim->mName.data + len + 1, unsigned(MAXLEN - len - 1), p);
-			}
+            if (mesh.primitives.size() > 1) {
+                ai_uint32 &len = aim->mName.length;
+                aim->mName.data[len] = '-';
+                len += 1 + ASSIMP_itoa10(aim->mName.data + len + 1, unsigned(MAXLEN - len - 1), p);
+            }
 
-			switch (prim.mode) {
-				case PrimitiveMode_POINTS:
-					aim->mPrimitiveTypes |= aiPrimitiveType_POINT;
-					break;
+            switch (prim.mode) {
+                case PrimitiveMode_POINTS:
+                    aim->mPrimitiveTypes |= aiPrimitiveType_POINT;
+                    break;
 
-				case PrimitiveMode_LINES:
-				case PrimitiveMode_LINE_LOOP:
-				case PrimitiveMode_LINE_STRIP:
-					aim->mPrimitiveTypes |= aiPrimitiveType_LINE;
-					break;
+                case PrimitiveMode_LINES:
+                case PrimitiveMode_LINE_LOOP:
+                case PrimitiveMode_LINE_STRIP:
+                    aim->mPrimitiveTypes |= aiPrimitiveType_LINE;
+                    break;
 
-				case PrimitiveMode_TRIANGLES:
-				case PrimitiveMode_TRIANGLE_STRIP:
-				case PrimitiveMode_TRIANGLE_FAN:
-					aim->mPrimitiveTypes |= aiPrimitiveType_TRIANGLE;
-					break;
-			}
+                case PrimitiveMode_TRIANGLES:
+                case PrimitiveMode_TRIANGLE_STRIP:
+                case PrimitiveMode_TRIANGLE_FAN:
+                    aim->mPrimitiveTypes |= aiPrimitiveType_TRIANGLE;
+                    break;
+            }
 
-			Mesh::Primitive::Attributes &attr = prim.attributes;
+            Mesh::Primitive::Attributes &attr = prim.attributes;
 
-			if (attr.position.size() > 0 && attr.position[0]) {
-				aim->mNumVertices = static_cast<unsigned int>(attr.position[0]->count);
-				attr.position[0]->ExtractData(aim->mVertices);
-			}
+            if (attr.position.size() > 0 && attr.position[0]) {
+                aim->mNumVertices = static_cast<unsigned int>(attr.position[0]->count);
+                attr.position[0]->ExtractData(aim->mVertices);
+            }
 
-			if (attr.normal.size() > 0 && attr.normal[0]) {
-				attr.normal[0]->ExtractData(aim->mNormals);
+            if (attr.normal.size() > 0 && attr.normal[0]) {
+                attr.normal[0]->ExtractData(aim->mNormals);
 
-				// only extract tangents if normals are present
-				if (attr.tangent.size() > 0 && attr.tangent[0]) {
-					// generate bitangents from normals and tangents according to spec
-					Tangent *tangents = nullptr;
+                // only extract tangents if normals are present
+                if (attr.tangent.size() > 0 && attr.tangent[0]) {
+                    // generate bitangents from normals and tangents according to spec
+                    Tangent *tangents = nullptr;
 
-					attr.tangent[0]->ExtractData(tangents);
+                    attr.tangent[0]->ExtractData(tangents);
 
-					aim->mTangents = new aiVector3D[aim->mNumVertices];
-					aim->mBitangents = new aiVector3D[aim->mNumVertices];
+                    aim->mTangents = new aiVector3D[aim->mNumVertices];
+                    aim->mBitangents = new aiVector3D[aim->mNumVertices];
 
-					for (unsigned int i = 0; i < aim->mNumVertices; ++i) {
-						aim->mTangents[i] = tangents[i].xyz;
-						aim->mBitangents[i] = (aim->mNormals[i] ^ tangents[i].xyz) * tangents[i].w;
-					}
+                    for (unsigned int i = 0; i < aim->mNumVertices; ++i) {
+                        aim->mTangents[i] = tangents[i].xyz;
+                        aim->mBitangents[i] = (aim->mNormals[i] ^ tangents[i].xyz) * tangents[i].w;
+                    }
 
-					delete[] tangents;
-				}
-			}
+                    delete[] tangents;
+                }
+            }
 
-			for (size_t c = 0; c < attr.color.size() && c < AI_MAX_NUMBER_OF_COLOR_SETS; ++c) {
-				if (attr.color[c]->count != aim->mNumVertices) {
-					DefaultLogger::get()->warn("Color stream size in mesh \"" + mesh.name +
-											   "\" does not match the vertex count");
-					continue;
-				}
-				attr.color[c]->ExtractData(aim->mColors[c]);
-			}
-			for (size_t tc = 0; tc < attr.texcoord.size() && tc < AI_MAX_NUMBER_OF_TEXTURECOORDS; ++tc) {
+            for (size_t c = 0; c < attr.color.size() && c < AI_MAX_NUMBER_OF_COLOR_SETS; ++c) {
+                if (attr.color[c]->count != aim->mNumVertices) {
+                    DefaultLogger::get()->warn("Color stream size in mesh \"" + mesh.name +
+                                               "\" does not match the vertex count");
+                    continue;
+                }
+                attr.color[c]->ExtractData(aim->mColors[c]);
+            }
+            for (size_t tc = 0; tc < attr.texcoord.size() && tc < AI_MAX_NUMBER_OF_TEXTURECOORDS; ++tc) {
                 if (!attr.texcoord[tc]) {
                     DefaultLogger::get()->warn("Texture coordinate accessor not found or non-contiguous texture coordinate sets.");
                     continue;
                 }
 
-				if (attr.texcoord[tc]->count != aim->mNumVertices) {
-					DefaultLogger::get()->warn("Texcoord stream size in mesh \"" + mesh.name +
-											   "\" does not match the vertex count");
-					continue;
-				}
+                if (attr.texcoord[tc]->count != aim->mNumVertices) {
+                    DefaultLogger::get()->warn("Texcoord stream size in mesh \"" + mesh.name +
+                                               "\" does not match the vertex count");
+                    continue;
+                }
 
-				attr.texcoord[tc]->ExtractData(aim->mTextureCoords[tc]);
-				aim->mNumUVComponents[tc] = attr.texcoord[tc]->GetNumComponents();
+                attr.texcoord[tc]->ExtractData(aim->mTextureCoords[tc]);
+                aim->mNumUVComponents[tc] = attr.texcoord[tc]->GetNumComponents();
 
-				aiVector3D *values = aim->mTextureCoords[tc];
-				for (unsigned int i = 0; i < aim->mNumVertices; ++i) {
-					values[i].y = 1 - values[i].y; // Flip Y coords
-				}
-			}
+                aiVector3D *values = aim->mTextureCoords[tc];
+                for (unsigned int i = 0; i < aim->mNumVertices; ++i) {
+                    values[i].y = 1 - values[i].y; // Flip Y coords
+                }
+            }
 
-			std::vector<Mesh::Primitive::Target> &targets = prim.targets;
-			if (targets.size() > 0) {
-				aim->mNumAnimMeshes = (unsigned int)targets.size();
-				aim->mAnimMeshes = new aiAnimMesh *[aim->mNumAnimMeshes];
-				for (size_t i = 0; i < targets.size(); i++) {
-					aim->mAnimMeshes[i] = aiCreateAnimMesh(aim);
-					aiAnimMesh &aiAnimMesh = *(aim->mAnimMeshes[i]);
-					Mesh::Primitive::Target &target = targets[i];
+            std::vector<Mesh::Primitive::Target> &targets = prim.targets;
+            if (targets.size() > 0) {
+                aim->mNumAnimMeshes = (unsigned int)targets.size();
+                aim->mAnimMeshes = new aiAnimMesh *[aim->mNumAnimMeshes];
+                std::fill(aim->mAnimMeshes, aim->mAnimMeshes + aim->mNumAnimMeshes, nullptr);
+                for (size_t i = 0; i < targets.size(); i++) {
+                    bool needPositions = targets[i].position.size() > 0;
+                    bool needNormals = targets[i].normal.size() > 0;
+                    bool needTangents = targets[i].tangent.size() > 0;
+                    // GLTF morph does not support colors and texCoords
+                    aim->mAnimMeshes[i] = aiCreateAnimMesh(aim,
+                            needPositions, needNormals, needTangents, false, false);
+                    aiAnimMesh &aiAnimMesh = *(aim->mAnimMeshes[i]);
+                    Mesh::Primitive::Target &target = targets[i];
 
-					if (target.position.size() > 0) {
-						aiVector3D *positionDiff = nullptr;
-						target.position[0]->ExtractData(positionDiff);
-						for (unsigned int vertexId = 0; vertexId < aim->mNumVertices; vertexId++) {
-							aiAnimMesh.mVertices[vertexId] += positionDiff[vertexId];
-						}
-						delete[] positionDiff;
-					}
-					if (target.normal.size() > 0) {
-						aiVector3D *normalDiff = nullptr;
-						target.normal[0]->ExtractData(normalDiff);
-						for (unsigned int vertexId = 0; vertexId < aim->mNumVertices; vertexId++) {
-							aiAnimMesh.mNormals[vertexId] += normalDiff[vertexId];
-						}
-						delete[] normalDiff;
-					}
-					if (target.tangent.size() > 0) {
-						Tangent *tangent = nullptr;
-						attr.tangent[0]->ExtractData(tangent);
+                    if (needPositions) {
+                        aiVector3D *positionDiff = nullptr;
+                        target.position[0]->ExtractData(positionDiff);
+                        for (unsigned int vertexId = 0; vertexId < aim->mNumVertices; vertexId++) {
+                            aiAnimMesh.mVertices[vertexId] += positionDiff[vertexId];
+                        }
+                        delete[] positionDiff;
+                    }
+                    if (needNormals) {
+                        aiVector3D *normalDiff = nullptr;
+                        target.normal[0]->ExtractData(normalDiff);
+                        for (unsigned int vertexId = 0; vertexId < aim->mNumVertices; vertexId++) {
+                            aiAnimMesh.mNormals[vertexId] += normalDiff[vertexId];
+                        }
+                        delete[] normalDiff;
+                    }
+                    if (needTangents) {
+                        Tangent *tangent = nullptr;
+                        attr.tangent[0]->ExtractData(tangent);
 
-						aiVector3D *tangentDiff = nullptr;
-						target.tangent[0]->ExtractData(tangentDiff);
+                        aiVector3D *tangentDiff = nullptr;
+                        target.tangent[0]->ExtractData(tangentDiff);
 
-						for (unsigned int vertexId = 0; vertexId < aim->mNumVertices; ++vertexId) {
-							tangent[vertexId].xyz += tangentDiff[vertexId];
-							aiAnimMesh.mTangents[vertexId] = tangent[vertexId].xyz;
-							aiAnimMesh.mBitangents[vertexId] = (aiAnimMesh.mNormals[vertexId] ^ tangent[vertexId].xyz) * tangent[vertexId].w;
-						}
-						delete[] tangent;
-						delete[] tangentDiff;
-					}
-					if (mesh.weights.size() > i) {
-						aiAnimMesh.mWeight = mesh.weights[i];
-					}
-					if (mesh.targetNames.size() > i) {
-						aiAnimMesh.mName = mesh.targetNames[i];
-					}
-				}
-			}
+                        for (unsigned int vertexId = 0; vertexId < aim->mNumVertices; ++vertexId) {
+                            tangent[vertexId].xyz += tangentDiff[vertexId];
+                            aiAnimMesh.mTangents[vertexId] = tangent[vertexId].xyz;
+                            aiAnimMesh.mBitangents[vertexId] = (aiAnimMesh.mNormals[vertexId] ^ tangent[vertexId].xyz) * tangent[vertexId].w;
+                        }
+                        delete[] tangent;
+                        delete[] tangentDiff;
+                    }
+                    if (mesh.weights.size() > i) {
+                        aiAnimMesh.mWeight = mesh.weights[i];
+                    }
+                    if (mesh.targetNames.size() > i) {
+                        aiAnimMesh.mName = mesh.targetNames[i];
+                    }
+                }
+            }
 
-			aiFace *faces = nullptr;
-			size_t nFaces = 0;
+            aiFace *faces = nullptr;
+            aiFace *facePtr = nullptr;
+            size_t nFaces = 0;
 
-			if (prim.indices) {
-				size_t count = prim.indices->count;
+            if (prim.indices) {
+                size_t count = prim.indices->count;
 
-				Accessor::Indexer data = prim.indices->GetIndexer();
-				ai_assert(data.IsValid());
+                Accessor::Indexer data = prim.indices->GetIndexer();
+                if (!data.IsValid()) {
+                    throw DeadlyImportError("GLTF: Invalid accessor without data in mesh ", getContextForErrorMessages(mesh.id, mesh.name));
+                }
 
-				switch (prim.mode) {
-					case PrimitiveMode_POINTS: {
-						nFaces = count;
-						faces = new aiFace[nFaces];
-						for (unsigned int i = 0; i < count; ++i) {
-							SetFace(faces[i], data.GetUInt(i));
-						}
-						break;
-					}
+                switch (prim.mode) {
+                    case PrimitiveMode_POINTS: {
+                        nFaces = count;
+                        facePtr = faces = new aiFace[nFaces];
+                        for (unsigned int i = 0; i < count; ++i) {
+                            SetFaceAndAdvance1(facePtr, aim->mNumVertices, data.GetUInt(i));
+                        }
+                        break;
+                    }
 
-					case PrimitiveMode_LINES: {
-						nFaces = count / 2;
-						if (nFaces * 2 != count) {
-							ASSIMP_LOG_WARN("The number of vertices was not compatible with the LINES mode. Some vertices were dropped.");
-							count = nFaces * 2;
-						}
-						faces = new aiFace[nFaces];
-						for (unsigned int i = 0; i < count; i += 2) {
-							SetFace(faces[i / 2], data.GetUInt(i), data.GetUInt(i + 1));
-						}
-						break;
-					}
+                    case PrimitiveMode_LINES: {
+                        nFaces = count / 2;
+                        if (nFaces * 2 != count) {
+                            ASSIMP_LOG_WARN("The number of vertices was not compatible with the LINES mode. Some vertices were dropped.");
+                            count = nFaces * 2;
+                        }
+                        facePtr = faces = new aiFace[nFaces];
+                        for (unsigned int i = 0; i < count; i += 2) {
+                            SetFaceAndAdvance2(facePtr, aim->mNumVertices, data.GetUInt(i), data.GetUInt(i + 1));
+                        }
+                        break;
+                    }
 
-					case PrimitiveMode_LINE_LOOP:
-					case PrimitiveMode_LINE_STRIP: {
-						nFaces = count - ((prim.mode == PrimitiveMode_LINE_STRIP) ? 1 : 0);
-						faces = new aiFace[nFaces];
-						SetFace(faces[0], data.GetUInt(0), data.GetUInt(1));
-						for (unsigned int i = 2; i < count; ++i) {
-							SetFace(faces[i - 1], faces[i - 2].mIndices[1], data.GetUInt(i));
-						}
-						if (prim.mode == PrimitiveMode_LINE_LOOP) { // close the loop
-							SetFace(faces[count - 1], faces[count - 2].mIndices[1], faces[0].mIndices[0]);
-						}
-						break;
-					}
+                    case PrimitiveMode_LINE_LOOP:
+                    case PrimitiveMode_LINE_STRIP: {
+                        nFaces = count - ((prim.mode == PrimitiveMode_LINE_STRIP) ? 1 : 0);
+                        facePtr = faces = new aiFace[nFaces];
+                        SetFaceAndAdvance2(facePtr, aim->mNumVertices, data.GetUInt(0), data.GetUInt(1));
+                        for (unsigned int i = 2; i < count; ++i) {
+                            SetFaceAndAdvance2(facePtr, aim->mNumVertices, data.GetUInt(i - 1), data.GetUInt(i));
+                        }
+                        if (prim.mode == PrimitiveMode_LINE_LOOP) { // close the loop
+                            SetFaceAndAdvance2(facePtr, aim->mNumVertices, data.GetUInt(static_cast<int>(count) - 1), faces[0].mIndices[0]);
+                        }
+                        break;
+                    }
 
-					case PrimitiveMode_TRIANGLES: {
-						nFaces = count / 3;
-						if (nFaces * 3 != count) {
-							ASSIMP_LOG_WARN("The number of vertices was not compatible with the TRIANGLES mode. Some vertices were dropped.");
-							count = nFaces * 3;
-						}
-						faces = new aiFace[nFaces];
-						for (unsigned int i = 0; i < count; i += 3) {
-							SetFace(faces[i / 3], data.GetUInt(i), data.GetUInt(i + 1), data.GetUInt(i + 2));
-						}
-						break;
-					}
-					case PrimitiveMode_TRIANGLE_STRIP: {
-						nFaces = count - 2;
-						faces = new aiFace[nFaces];
-						for (unsigned int i = 0; i < nFaces; ++i) {
-							//The ordering is to ensure that the triangles are all drawn with the same orientation
-							if ((i + 1) % 2 == 0) {
-								//For even n, vertices n + 1, n, and n + 2 define triangle n
-								SetFace(faces[i], data.GetUInt(i + 1), data.GetUInt(i), data.GetUInt(i + 2));
-							} else {
-								//For odd n, vertices n, n+1, and n+2 define triangle n
-								SetFace(faces[i], data.GetUInt(i), data.GetUInt(i + 1), data.GetUInt(i + 2));
-							}
-						}
-						break;
-					}
-					case PrimitiveMode_TRIANGLE_FAN:
-						nFaces = count - 2;
-						faces = new aiFace[nFaces];
-						SetFace(faces[0], data.GetUInt(0), data.GetUInt(1), data.GetUInt(2));
-						for (unsigned int i = 1; i < nFaces; ++i) {
-							SetFace(faces[i], faces[0].mIndices[0], faces[i - 1].mIndices[2], data.GetUInt(i + 2));
-						}
-						break;
-				}
-			} else { // no indices provided so directly generate from counts
+                    case PrimitiveMode_TRIANGLES: {
+                        nFaces = count / 3;
+                        if (nFaces * 3 != count) {
+                            ASSIMP_LOG_WARN("The number of vertices was not compatible with the TRIANGLES mode. Some vertices were dropped.");
+                            count = nFaces * 3;
+                        }
+                        facePtr = faces = new aiFace[nFaces];
+                        for (unsigned int i = 0; i < count; i += 3) {
+                            SetFaceAndAdvance3(facePtr, aim->mNumVertices, data.GetUInt(i), data.GetUInt(i + 1), data.GetUInt(i + 2));
+                        }
+                        break;
+                    }
+                    case PrimitiveMode_TRIANGLE_STRIP: {
+                        nFaces = count - 2;
+                        facePtr = faces = new aiFace[nFaces];
+                        for (unsigned int i = 0; i < nFaces; ++i) {
+                            //The ordering is to ensure that the triangles are all drawn with the same orientation
+                            if ((i + 1) % 2 == 0) {
+                                //For even n, vertices n + 1, n, and n + 2 define triangle n
+                                SetFaceAndAdvance3(facePtr, aim->mNumVertices, data.GetUInt(i + 1), data.GetUInt(i), data.GetUInt(i + 2));
+                            } else {
+                                //For odd n, vertices n, n+1, and n+2 define triangle n
+                                SetFaceAndAdvance3(facePtr, aim->mNumVertices, data.GetUInt(i), data.GetUInt(i + 1), data.GetUInt(i + 2));
+                            }
+                        }
+                        break;
+                    }
+                    case PrimitiveMode_TRIANGLE_FAN:
+                        nFaces = count - 2;
+                        facePtr = faces = new aiFace[nFaces];
+                        SetFaceAndAdvance3(facePtr, aim->mNumVertices, data.GetUInt(0), data.GetUInt(1), data.GetUInt(2));
+                        for (unsigned int i = 1; i < nFaces; ++i) {
+                            SetFaceAndAdvance3(facePtr, aim->mNumVertices, data.GetUInt(0), data.GetUInt(i + 1), data.GetUInt(i + 2));
+                        }
+                        break;
+                }
+            } else { // no indices provided so directly generate from counts
 
-				// use the already determined count as it includes checks
-				unsigned int count = aim->mNumVertices;
+                // use the already determined count as it includes checks
+                unsigned int count = aim->mNumVertices;
 
-				switch (prim.mode) {
-					case PrimitiveMode_POINTS: {
-						nFaces = count;
-						faces = new aiFace[nFaces];
-						for (unsigned int i = 0; i < count; ++i) {
-							SetFace(faces[i], i);
-						}
-						break;
-					}
+                switch (prim.mode) {
+                    case PrimitiveMode_POINTS: {
+                        nFaces = count;
+                        facePtr = faces = new aiFace[nFaces];
+                        for (unsigned int i = 0; i < count; ++i) {
+                            SetFaceAndAdvance1(facePtr, aim->mNumVertices, i);
+                        }
+                        break;
+                    }
 
-					case PrimitiveMode_LINES: {
-						nFaces = count / 2;
-						if (nFaces * 2 != count) {
-							ASSIMP_LOG_WARN("The number of vertices was not compatible with the LINES mode. Some vertices were dropped.");
-							count = (unsigned int)nFaces * 2;
-						}
-						faces = new aiFace[nFaces];
-						for (unsigned int i = 0; i < count; i += 2) {
-							SetFace(faces[i / 2], i, i + 1);
-						}
-						break;
-					}
+                    case PrimitiveMode_LINES: {
+                        nFaces = count / 2;
+                        if (nFaces * 2 != count) {
+                            ASSIMP_LOG_WARN("The number of vertices was not compatible with the LINES mode. Some vertices were dropped.");
+                            count = (unsigned int)nFaces * 2;
+                        }
+                        facePtr = faces = new aiFace[nFaces];
+                        for (unsigned int i = 0; i < count; i += 2) {
+                            SetFaceAndAdvance2(facePtr, aim->mNumVertices, i, i + 1);
+                        }
+                        break;
+                    }
 
-					case PrimitiveMode_LINE_LOOP:
-					case PrimitiveMode_LINE_STRIP: {
-						nFaces = count - ((prim.mode == PrimitiveMode_LINE_STRIP) ? 1 : 0);
-						faces = new aiFace[nFaces];
-						SetFace(faces[0], 0, 1);
-						for (unsigned int i = 2; i < count; ++i) {
-							SetFace(faces[i - 1], faces[i - 2].mIndices[1], i);
-						}
-						if (prim.mode == PrimitiveMode_LINE_LOOP) { // close the loop
-							SetFace(faces[count - 1], faces[count - 2].mIndices[1], faces[0].mIndices[0]);
-						}
-						break;
-					}
+                    case PrimitiveMode_LINE_LOOP:
+                    case PrimitiveMode_LINE_STRIP: {
+                        nFaces = count - ((prim.mode == PrimitiveMode_LINE_STRIP) ? 1 : 0);
+                        facePtr = faces = new aiFace[nFaces];
+                        SetFaceAndAdvance2(facePtr, aim->mNumVertices, 0, 1);
+                        for (unsigned int i = 2; i < count; ++i) {
+                            SetFaceAndAdvance2(facePtr, aim->mNumVertices, i - 1, i);
+                        }
+                        if (prim.mode == PrimitiveMode_LINE_LOOP) { // close the loop
+                            SetFaceAndAdvance2(facePtr, aim->mNumVertices, count - 1, 0);
+                        }
+                        break;
+                    }
 
-					case PrimitiveMode_TRIANGLES: {
-						nFaces = count / 3;
-						if (nFaces * 3 != count) {
-							ASSIMP_LOG_WARN("The number of vertices was not compatible with the TRIANGLES mode. Some vertices were dropped.");
-							count = (unsigned int)nFaces * 3;
-						}
-						faces = new aiFace[nFaces];
-						for (unsigned int i = 0; i < count; i += 3) {
-							SetFace(faces[i / 3], i, i + 1, i + 2);
-						}
-						break;
-					}
-					case PrimitiveMode_TRIANGLE_STRIP: {
-						nFaces = count - 2;
-						faces = new aiFace[nFaces];
-						for (unsigned int i = 0; i < nFaces; ++i) {
-							//The ordering is to ensure that the triangles are all drawn with the same orientation
-							if ((i + 1) % 2 == 0) {
-								//For even n, vertices n + 1, n, and n + 2 define triangle n
-								SetFace(faces[i], i + 1, i, i + 2);
-							} else {
-								//For odd n, vertices n, n+1, and n+2 define triangle n
-								SetFace(faces[i], i, i + 1, i + 2);
-							}
-						}
-						break;
-					}
-					case PrimitiveMode_TRIANGLE_FAN:
-						nFaces = count - 2;
-						faces = new aiFace[nFaces];
-						SetFace(faces[0], 0, 1, 2);
-						for (unsigned int i = 1; i < nFaces; ++i) {
-							SetFace(faces[i], faces[0].mIndices[0], faces[i - 1].mIndices[2], i + 2);
-						}
-						break;
-				}
-			}
+                    case PrimitiveMode_TRIANGLES: {
+                        nFaces = count / 3;
+                        if (nFaces * 3 != count) {
+                            ASSIMP_LOG_WARN("The number of vertices was not compatible with the TRIANGLES mode. Some vertices were dropped.");
+                            count = (unsigned int)nFaces * 3;
+                        }
+                        facePtr = faces = new aiFace[nFaces];
+                        for (unsigned int i = 0; i < count; i += 3) {
+                            SetFaceAndAdvance3(facePtr, aim->mNumVertices, i, i + 1, i + 2);
+                        }
+                        break;
+                    }
+                    case PrimitiveMode_TRIANGLE_STRIP: {
+                        nFaces = count - 2;
+                        facePtr = faces = new aiFace[nFaces];
+                        for (unsigned int i = 0; i < nFaces; ++i) {
+                            //The ordering is to ensure that the triangles are all drawn with the same orientation
+                            if ((i + 1) % 2 == 0) {
+                                //For even n, vertices n + 1, n, and n + 2 define triangle n
+                                SetFaceAndAdvance3(facePtr, aim->mNumVertices, i + 1, i, i + 2);
+                            } else {
+                                //For odd n, vertices n, n+1, and n+2 define triangle n
+                                SetFaceAndAdvance3(facePtr, aim->mNumVertices, i, i + 1, i + 2);
+                            }
+                        }
+                        break;
+                    }
+                    case PrimitiveMode_TRIANGLE_FAN:
+                        nFaces = count - 2;
+                        facePtr = faces = new aiFace[nFaces];
+                        SetFaceAndAdvance3(facePtr, aim->mNumVertices, 0, 1, 2);
+                        for (unsigned int i = 1; i < nFaces; ++i) {
+                            SetFaceAndAdvance3(facePtr, aim->mNumVertices, 0, i + 1, i + 2);
+                        }
+                        break;
+                }
+            }
 
-			if (nullptr != faces) {
-				aim->mFaces = faces;
-				aim->mNumFaces = static_cast<unsigned int>(nFaces);
-				ai_assert(CheckValidFacesIndices(faces, static_cast<unsigned>(nFaces), aim->mNumVertices));
-			}
+            if (faces) {
+                aim->mFaces = faces;
+                const unsigned int actualNumFaces = static_cast<unsigned int>(facePtr - faces);
+                if (actualNumFaces < nFaces) {
+                    ASSIMP_LOG_WARN("Some faces had out-of-range indices. Those faces were dropped.");
+                }
+                if (actualNumFaces == 0)
+                {
+                    throw DeadlyImportError("Mesh \"", aim->mName.C_Str(), "\" has no faces");
+                }
+                aim->mNumFaces = actualNumFaces;
+                ai_assert(CheckValidFacesIndices(faces, actualNumFaces, aim->mNumVertices));
+            }
 
-			if (prim.material) {
-				aim->mMaterialIndex = prim.material.GetIndex();
-			} else {
-				aim->mMaterialIndex = mScene->mNumMaterials - 1;
-			}
-		}
-	}
+            if (prim.material) {
+                aim->mMaterialIndex = prim.material.GetIndex();
+            } else {
+                aim->mMaterialIndex = mScene->mNumMaterials - 1;
+            }
+        }
+    }
 
-	meshOffsets.push_back(k);
+    meshOffsets.push_back(k);
 
-	CopyVector(meshes, mScene->mMeshes, mScene->mNumMeshes);
+    CopyVector(meshes, mScene->mMeshes, mScene->mNumMeshes);
 }
 
 void glTF2Importer::ImportCameras(glTF2::Asset &r) {
-	if (!r.cameras.Size()) return;
+    if (!r.cameras.Size()) return;
 
     const unsigned int numCameras = r.cameras.Size();
-	ASSIMP_LOG_DEBUG_F("Importing ", numCameras, " cameras");
-	mScene->mNumCameras = numCameras;
-	mScene->mCameras = new aiCamera *[numCameras];
+    ASSIMP_LOG_DEBUG_F("Importing ", numCameras, " cameras");
+    mScene->mNumCameras = numCameras;
+    mScene->mCameras = new aiCamera *[numCameras];
+    std::fill(mScene->mCameras, mScene->mCameras + numCameras, nullptr);
 
-	for (size_t i = 0; i < numCameras; ++i) {
-		Camera &cam = r.cameras[i];
+    for (size_t i = 0; i < numCameras; ++i) {
+        Camera &cam = r.cameras[i];
 
-		aiCamera *aicam = mScene->mCameras[i] = new aiCamera();
+        aiCamera *aicam = mScene->mCameras[i] = new aiCamera();
 
-		// cameras point in -Z by default, rest is specified in node transform
-		aicam->mLookAt = aiVector3D(0.f, 0.f, -1.f);
+        // cameras point in -Z by default, rest is specified in node transform
+        aicam->mLookAt = aiVector3D(0.f, 0.f, -1.f);
 
-		if (cam.type == Camera::Perspective) {
+        if (cam.type == Camera::Perspective) {
 
-			aicam->mAspect = cam.cameraProperties.perspective.aspectRatio;
-			aicam->mHorizontalFOV = cam.cameraProperties.perspective.yfov * ((aicam->mAspect == 0.f) ? 1.f : aicam->mAspect);
-			aicam->mClipPlaneFar = cam.cameraProperties.perspective.zfar;
-			aicam->mClipPlaneNear = cam.cameraProperties.perspective.znear;
-		} else {
-			aicam->mClipPlaneFar = cam.cameraProperties.ortographic.zfar;
-			aicam->mClipPlaneNear = cam.cameraProperties.ortographic.znear;
-			aicam->mHorizontalFOV = 0.0;
-			aicam->mOrthographicWidth = cam.cameraProperties.ortographic.xmag;
-			aicam->mAspect = 1.0f;
-			if (0.f != cam.cameraProperties.ortographic.ymag) {
-				aicam->mAspect = cam.cameraProperties.ortographic.xmag / cam.cameraProperties.ortographic.ymag;
-			}
-		}
-	}
+            aicam->mAspect = cam.cameraProperties.perspective.aspectRatio;
+            aicam->mHorizontalFOV = cam.cameraProperties.perspective.yfov * ((aicam->mAspect == 0.f) ? 1.f : aicam->mAspect);
+            aicam->mClipPlaneFar = cam.cameraProperties.perspective.zfar;
+            aicam->mClipPlaneNear = cam.cameraProperties.perspective.znear;
+        } else {
+            aicam->mClipPlaneFar = cam.cameraProperties.ortographic.zfar;
+            aicam->mClipPlaneNear = cam.cameraProperties.ortographic.znear;
+            aicam->mHorizontalFOV = 0.0;
+            aicam->mOrthographicWidth = cam.cameraProperties.ortographic.xmag;
+            aicam->mAspect = 1.0f;
+            if (0.f != cam.cameraProperties.ortographic.ymag) {
+                aicam->mAspect = cam.cameraProperties.ortographic.xmag / cam.cameraProperties.ortographic.ymag;
+            }
+        }
+    }
 }
 
 void glTF2Importer::ImportLights(glTF2::Asset &r) {
-	if (!r.lights.Size())
-		return;
+    if (!r.lights.Size())
+        return;
 
     const unsigned int numLights = r.lights.Size();
-	ASSIMP_LOG_DEBUG_F("Importing ", numLights, " lights");
-	mScene->mNumLights = numLights;
-	mScene->mLights = new aiLight *[numLights];
+    ASSIMP_LOG_DEBUG_F("Importing ", numLights, " lights");
+    mScene->mNumLights = numLights;
+    mScene->mLights = new aiLight *[numLights];
+    std::fill(mScene->mLights, mScene->mLights + numLights, nullptr);
 
-	for (size_t i = 0; i < numLights; ++i) {
-		Light &light = r.lights[i];
+    for (size_t i = 0; i < numLights; ++i) {
+        Light &light = r.lights[i];
 
-		aiLight *ail = mScene->mLights[i] = new aiLight();
+        aiLight *ail = mScene->mLights[i] = new aiLight();
 
-		switch (light.type) {
-			case Light::Directional:
-				ail->mType = aiLightSource_DIRECTIONAL;
-				break;
-			case Light::Point:
-				ail->mType = aiLightSource_POINT;
-				break;
-			case Light::Spot:
-				ail->mType = aiLightSource_SPOT;
-				break;
-		}
+        switch (light.type) {
+            case Light::Directional:
+                ail->mType = aiLightSource_DIRECTIONAL;
+                break;
+            case Light::Point:
+                ail->mType = aiLightSource_POINT;
+                break;
+            case Light::Spot:
+                ail->mType = aiLightSource_SPOT;
+                break;
+        }
 
-		if (ail->mType != aiLightSource_POINT) {
-			ail->mDirection = aiVector3D(0.0f, 0.0f, -1.0f);
-			ail->mUp = aiVector3D(0.0f, 1.0f, 0.0f);
-		}
+        if (ail->mType != aiLightSource_POINT) {
+            ail->mDirection = aiVector3D(0.0f, 0.0f, -1.0f);
+            ail->mUp = aiVector3D(0.0f, 1.0f, 0.0f);
+        }
 
-		vec3 colorWithIntensity = { light.color[0] * light.intensity, light.color[1] * light.intensity, light.color[2] * light.intensity };
-		CopyValue(colorWithIntensity, ail->mColorAmbient);
-		CopyValue(colorWithIntensity, ail->mColorDiffuse);
-		CopyValue(colorWithIntensity, ail->mColorSpecular);
+        vec3 colorWithIntensity = { light.color[0] * light.intensity, light.color[1] * light.intensity, light.color[2] * light.intensity };
+        CopyValue(colorWithIntensity, ail->mColorAmbient);
+        CopyValue(colorWithIntensity, ail->mColorDiffuse);
+        CopyValue(colorWithIntensity, ail->mColorSpecular);
 
-		if (ail->mType == aiLightSource_DIRECTIONAL) {
-			ail->mAttenuationConstant = 1.0;
-			ail->mAttenuationLinear = 0.0;
-			ail->mAttenuationQuadratic = 0.0;
-		} else {
-			//in PBR attenuation is calculated using inverse square law which can be expressed
-			//using assimps equation: 1/(att0 + att1 * d + att2 * d*d) with the following parameters
-			//this is correct equation for the case when range (see
-			//https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_lights_punctual)
-			//is not present. When range is not present it is assumed that it is infinite and so numerator is 1.
-			//When range is present then numerator might be any value in range [0,1] and then assimps equation
-			//will not suffice. In this case range is added into metadata in ImportNode function
-			//and its up to implementation to read it when it wants to
-			ail->mAttenuationConstant = 0.0;
-			ail->mAttenuationLinear = 0.0;
-			ail->mAttenuationQuadratic = 1.0;
-		}
+        if (ail->mType == aiLightSource_DIRECTIONAL) {
+            ail->mAttenuationConstant = 1.0;
+            ail->mAttenuationLinear = 0.0;
+            ail->mAttenuationQuadratic = 0.0;
+        } else {
+            //in PBR attenuation is calculated using inverse square law which can be expressed
+            //using assimps equation: 1/(att0 + att1 * d + att2 * d*d) with the following parameters
+            //this is correct equation for the case when range (see
+            //https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_lights_punctual)
+            //is not present. When range is not present it is assumed that it is infinite and so numerator is 1.
+            //When range is present then numerator might be any value in range [0,1] and then assimps equation
+            //will not suffice. In this case range is added into metadata in ImportNode function
+            //and its up to implementation to read it when it wants to
+            ail->mAttenuationConstant = 0.0;
+            ail->mAttenuationLinear = 0.0;
+            ail->mAttenuationQuadratic = 1.0;
+        }
 
-		if (ail->mType == aiLightSource_SPOT) {
-			ail->mAngleInnerCone = light.innerConeAngle;
-			ail->mAngleOuterCone = light.outerConeAngle;
-		}
-	}
+        if (ail->mType == aiLightSource_SPOT) {
+            ail->mAngleInnerCone = light.innerConeAngle;
+            ail->mAngleOuterCone = light.outerConeAngle;
+        }
+    }
 }
 
 static void GetNodeTransform(aiMatrix4x4 &matrix, const glTF2::Node &node) {
-	if (node.matrix.isPresent) {
-		CopyValue(node.matrix.value, matrix);
-	} else {
-		if (node.translation.isPresent) {
-			aiVector3D trans;
-			CopyValue(node.translation.value, trans);
-			aiMatrix4x4 t;
-			aiMatrix4x4::Translation(trans, t);
-			matrix = matrix * t;
-		}
+    if (node.matrix.isPresent) {
+        CopyValue(node.matrix.value, matrix);
+    } else {
+        if (node.translation.isPresent) {
+            aiVector3D trans;
+            CopyValue(node.translation.value, trans);
+            aiMatrix4x4 t;
+            aiMatrix4x4::Translation(trans, t);
+            matrix = matrix * t;
+        }
 
-		if (node.rotation.isPresent) {
-			aiQuaternion rot;
-			CopyValue(node.rotation.value, rot);
-			matrix = matrix * aiMatrix4x4(rot.GetMatrix());
-		}
+        if (node.rotation.isPresent) {
+            aiQuaternion rot;
+            CopyValue(node.rotation.value, rot);
+            matrix = matrix * aiMatrix4x4(rot.GetMatrix());
+        }
 
-		if (node.scale.isPresent) {
-			aiVector3D scal(1.f);
-			CopyValue(node.scale.value, scal);
-			aiMatrix4x4 s;
-			aiMatrix4x4::Scaling(scal, s);
-			matrix = matrix * s;
-		}
-	}
+        if (node.scale.isPresent) {
+            aiVector3D scal(1.f);
+            CopyValue(node.scale.value, scal);
+            aiMatrix4x4 s;
+            aiMatrix4x4::Scaling(scal, s);
+            matrix = matrix * s;
+        }
+    }
 }
 
 static void BuildVertexWeightMapping(Mesh::Primitive &primitive, std::vector<std::vector<aiVertexWeight>> &map) {
-	Mesh::Primitive::Attributes &attr = primitive.attributes;
-	if (attr.weight.empty() || attr.joint.empty()) {
-		return;
-	}
-	if (attr.weight[0]->count != attr.joint[0]->count) {
-		return;
-	}
+    Mesh::Primitive::Attributes &attr = primitive.attributes;
+    if (attr.weight.empty() || attr.joint.empty()) {
+        return;
+    }
+    if (attr.weight[0]->count != attr.joint[0]->count) {
+        return;
+    }
 
-	size_t num_vertices = attr.weight[0]->count;
+    size_t num_vertices = attr.weight[0]->count;
 
-	struct Weights {
-		float values[4];
-	};
-	Weights *weights = nullptr;
-	attr.weight[0]->ExtractData(weights);
+    struct Weights {
+        float values[4];
+    };
+    Weights *weights = nullptr;
+    attr.weight[0]->ExtractData(weights);
 
-	struct Indices8 {
-		uint8_t values[4];
-	};
-	struct Indices16 {
-		uint16_t values[4];
-	};
-	Indices8 *indices8 = nullptr;
-	Indices16 *indices16 = nullptr;
-	if (attr.joint[0]->GetElementSize() == 4) {
-		attr.joint[0]->ExtractData(indices8);
-	} else {
-		attr.joint[0]->ExtractData(indices16);
-	}
-	//
-	if (nullptr == indices8 && nullptr == indices16) {
-		// Something went completely wrong!
-		ai_assert(false);
-		return;
-	}
+    struct Indices8 {
+        uint8_t values[4];
+    };
+    struct Indices16 {
+        uint16_t values[4];
+    };
+    Indices8 *indices8 = nullptr;
+    Indices16 *indices16 = nullptr;
+    if (attr.joint[0]->GetElementSize() == 4) {
+        attr.joint[0]->ExtractData(indices8);
+    } else {
+        attr.joint[0]->ExtractData(indices16);
+    }
+    //
+    if (nullptr == indices8 && nullptr == indices16) {
+        // Something went completely wrong!
+        ai_assert(false);
+        return;
+    }
 
-	for (size_t i = 0; i < num_vertices; ++i) {
-		for (int j = 0; j < 4; ++j) {
-			const unsigned int bone = (indices8 != nullptr) ? indices8[i].values[j] : indices16[i].values[j];
-			const float weight = weights[i].values[j];
-			if (weight > 0 && bone < map.size()) {
-				map[bone].reserve(8);
-				map[bone].emplace_back(static_cast<unsigned int>(i), weight);
-			}
-		}
-	}
+    for (size_t i = 0; i < num_vertices; ++i) {
+        for (int j = 0; j < 4; ++j) {
+            const unsigned int bone = (indices8 != nullptr) ? indices8[i].values[j] : indices16[i].values[j];
+            const float weight = weights[i].values[j];
+            if (weight > 0 && bone < map.size()) {
+                map[bone].reserve(8);
+                map[bone].emplace_back(static_cast<unsigned int>(i), weight);
+            }
+        }
+    }
 
-	delete[] weights;
-	delete[] indices8;
-	delete[] indices16;
+    delete[] weights;
+    delete[] indices8;
+    delete[] indices16;
 }
 
 static std::string GetNodeName(const Node &node) {
-	return node.name.empty() ? node.id : node.name;
+    return node.name.empty() ? node.id : node.name;
 }
 
 void ParseExtensions(aiMetadata *metadata, const CustomExtension &extension) {
-	if (extension.mStringValue.isPresent) {
-		metadata->Add(extension.name.c_str(), aiString(extension.mStringValue.value));
-	} else if (extension.mDoubleValue.isPresent) {
-		metadata->Add(extension.name.c_str(), extension.mDoubleValue.value);
-	} else if (extension.mUint64Value.isPresent) {
-		metadata->Add(extension.name.c_str(), extension.mUint64Value.value);
-	} else if (extension.mInt64Value.isPresent) {
-		metadata->Add(extension.name.c_str(), static_cast<int32_t>(extension.mInt64Value.value));
-	} else if (extension.mBoolValue.isPresent) {
-		metadata->Add(extension.name.c_str(), extension.mBoolValue.value);
-	} else if (extension.mValues.isPresent) {
-		aiMetadata val;
-		for (size_t i = 0; i < extension.mValues.value.size(); ++i) {
-			ParseExtensions(&val, extension.mValues.value[i]);
-		}
-		metadata->Add(extension.name.c_str(), val);
-	}
+    if (extension.mStringValue.isPresent) {
+        metadata->Add(extension.name.c_str(), aiString(extension.mStringValue.value));
+    } else if (extension.mDoubleValue.isPresent) {
+        metadata->Add(extension.name.c_str(), extension.mDoubleValue.value);
+    } else if (extension.mUint64Value.isPresent) {
+        metadata->Add(extension.name.c_str(), extension.mUint64Value.value);
+    } else if (extension.mInt64Value.isPresent) {
+        metadata->Add(extension.name.c_str(), static_cast<int32_t>(extension.mInt64Value.value));
+    } else if (extension.mBoolValue.isPresent) {
+        metadata->Add(extension.name.c_str(), extension.mBoolValue.value);
+    } else if (extension.mValues.isPresent) {
+        aiMetadata val;
+        for (size_t i = 0; i < extension.mValues.value.size(); ++i) {
+            ParseExtensions(&val, extension.mValues.value[i]);
+        }
+        metadata->Add(extension.name.c_str(), val);
+    }
 }
 
 aiNode *ImportNode(aiScene *pScene, glTF2::Asset &r, std::vector<unsigned int> &meshOffsets, glTF2::Ref<glTF2::Node> &ptr) {
-	Node &node = *ptr;
+    Node &node = *ptr;
 
-	aiNode *ainode = new aiNode(GetNodeName(node));
+    aiNode *ainode = new aiNode(GetNodeName(node));
 
-	if (!node.children.empty()) {
-		ainode->mNumChildren = unsigned(node.children.size());
-		ainode->mChildren = new aiNode *[ainode->mNumChildren];
+    try {
+        if (!node.children.empty()) {
+            ainode->mNumChildren = unsigned(node.children.size());
+            ainode->mChildren = new aiNode *[ainode->mNumChildren];
+            std::fill(ainode->mChildren, ainode->mChildren + ainode->mNumChildren, nullptr);
 
-		for (unsigned int i = 0; i < ainode->mNumChildren; ++i) {
-			aiNode *child = ImportNode(pScene, r, meshOffsets, node.children[i]);
-			child->mParent = ainode;
-			ainode->mChildren[i] = child;
-		}
-	}
+            for (unsigned int i = 0; i < ainode->mNumChildren; ++i) {
+                aiNode *child = ImportNode(pScene, r, meshOffsets, node.children[i]);
+                child->mParent = ainode;
+                ainode->mChildren[i] = child;
+            }
+        }
 
-	if (node.extensions) {
-		ainode->mMetaData = new aiMetadata;
-		ParseExtensions(ainode->mMetaData, node.extensions);
-	}
+        if (node.extensions) {
+            ainode->mMetaData = new aiMetadata;
+            ParseExtensions(ainode->mMetaData, node.extensions);
+        }
 
-	GetNodeTransform(ainode->mTransformation, node);
+        GetNodeTransform(ainode->mTransformation, node);
 
-	if (!node.meshes.empty()) {
-		// GLTF files contain at most 1 mesh per node.
-		assert(node.meshes.size() == 1);
-		int mesh_idx = node.meshes[0].GetIndex();
-		int count = meshOffsets[mesh_idx + 1] - meshOffsets[mesh_idx];
+        if (!node.meshes.empty()) {
+            // GLTF files contain at most 1 mesh per node.
+            if (node.meshes.size() > 1)
+            {
+                throw DeadlyImportError("GLTF: Invalid input, found ", node.meshes.size(), " meshes in ", getContextForErrorMessages(node.id, node.name), ", but only 1 mesh per node allowed.");
+            }
+            int mesh_idx = node.meshes[0].GetIndex();
+            int count = meshOffsets[mesh_idx + 1] - meshOffsets[mesh_idx];
 
-		ainode->mNumMeshes = count;
-		ainode->mMeshes = new unsigned int[count];
+            ainode->mNumMeshes = count;
+            ainode->mMeshes = new unsigned int[count];
 
-		if (node.skin) {
-			for (int primitiveNo = 0; primitiveNo < count; ++primitiveNo) {
-				aiMesh *mesh = pScene->mMeshes[meshOffsets[mesh_idx] + primitiveNo];
-				unsigned int numBones =static_cast<unsigned int>(node.skin->jointNames.size());
+            if (node.skin) {
+                for (int primitiveNo = 0; primitiveNo < count; ++primitiveNo) {
+                    aiMesh *mesh = pScene->mMeshes[meshOffsets[mesh_idx] + primitiveNo];
+                    unsigned int numBones =static_cast<unsigned int>(node.skin->jointNames.size());
 
-				std::vector<std::vector<aiVertexWeight>> weighting(numBones);
-				BuildVertexWeightMapping(node.meshes[0]->primitives[primitiveNo], weighting);
+                    std::vector<std::vector<aiVertexWeight>> weighting(numBones);
+                    BuildVertexWeightMapping(node.meshes[0]->primitives[primitiveNo], weighting);
 
-				unsigned int realNumBones = 0;
-				for (uint32_t i = 0; i < numBones; ++i) {
-					if (weighting[i].size() > 0) {
-						realNumBones++;
-					}
-				}
+                    mesh->mNumBones = static_cast<unsigned int>(numBones);
+                    mesh->mBones = new aiBone *[mesh->mNumBones];
+                    std::fill(mesh->mBones, mesh->mBones + mesh->mNumBones, nullptr);
 
-				mesh->mNumBones = static_cast<unsigned int>(realNumBones);
-				mesh->mBones = new aiBone *[mesh->mNumBones];
+                    // GLTF and Assimp choose to store bone weights differently.
+                    // GLTF has each vertex specify which bones influence the vertex.
+                    // Assimp has each bone specify which vertices it has influence over.
+                    // To convert this data, we first read over the vertex data and pull
+                    // out the bone-to-vertex mapping.  Then, when creating the aiBones,
+                    // we copy the bone-to-vertex mapping into the bone.  This is unfortunate
+                    // both because it's somewhat slow and because, for many applications,
+                    // we then need to reconvert the data back into the vertex-to-bone
+                    // mapping which makes things doubly-slow.
 
-				// GLTF and Assimp choose to store bone weights differently.
-				// GLTF has each vertex specify which bones influence the vertex.
-				// Assimp has each bone specify which vertices it has influence over.
-				// To convert this data, we first read over the vertex data and pull
-				// out the bone-to-vertex mapping.  Then, when creating the aiBones,
-				// we copy the bone-to-vertex mapping into the bone.  This is unfortunate
-				// both because it's somewhat slow and because, for many applications,
-				// we then need to reconvert the data back into the vertex-to-bone
-				// mapping which makes things doubly-slow.
+                    mat4 *pbindMatrices = nullptr;
+                    node.skin->inverseBindMatrices->ExtractData(pbindMatrices);
 
-				mat4 *pbindMatrices = nullptr;
-				node.skin->inverseBindMatrices->ExtractData(pbindMatrices);
+                    for (uint32_t i = 0; i < numBones; ++i) {
+                        const std::vector<aiVertexWeight> &weights = weighting[i];
+                        aiBone *bone = new aiBone();
 
-				int cb = 0;
-				for (uint32_t i = 0; i < numBones; ++i) {
-					const std::vector<aiVertexWeight> &weights = weighting[i];
-					if (weights.size() > 0) {
-						aiBone *bone = new aiBone();
+                        Ref<Node> joint = node.skin->jointNames[i];
+                        if (!joint->name.empty()) {
+                            bone->mName = joint->name;
+                        } else {
+                            // Assimp expects each bone to have a unique name.
+                            static const std::string kDefaultName = "bone_";
+                            char postfix[10] = { 0 };
+                            ASSIMP_itoa10(postfix, i);
+                            bone->mName = (kDefaultName + postfix);
+                        }
+                        GetNodeTransform(bone->mOffsetMatrix, *joint);
+                        CopyValue(pbindMatrices[i], bone->mOffsetMatrix);
+                        bone->mNumWeights = static_cast<uint32_t>(weights.size());
 
-						Ref<Node> joint = node.skin->jointNames[i];
-						if (!joint->name.empty()) {
-							bone->mName = joint->name;
-						} else {
-							// Assimp expects each bone to have a unique name.
-							static const std::string kDefaultName = "bone_";
-							char postfix[10] = { 0 };
-							ASSIMP_itoa10(postfix, i);
-							bone->mName = (kDefaultName + postfix);
-						}
-						GetNodeTransform(bone->mOffsetMatrix, *joint);
-						CopyValue(pbindMatrices[i], bone->mOffsetMatrix);
-						bone->mNumWeights = static_cast<uint32_t>(weights.size());
-						bone->mWeights = new aiVertexWeight[bone->mNumWeights];
-						memcpy(bone->mWeights, weights.data(), bone->mNumWeights * sizeof(aiVertexWeight));
-						mesh->mBones[cb++] = bone;
-					}
-				}
+                        if (bone->mNumWeights > 0) {
+                          bone->mWeights = new aiVertexWeight[bone->mNumWeights];
+                          memcpy(bone->mWeights, weights.data(), bone->mNumWeights * sizeof(aiVertexWeight));
+                        } else {
+                            // Assimp expects all bones to have at least 1 weight.
+                            bone->mWeights = new aiVertexWeight[1];
+                            bone->mNumWeights = 1;
+                            bone->mWeights->mVertexId = 0;
+                            bone->mWeights->mWeight = 0.f;
+                        }
+                        mesh->mBones[i] = bone;
+                    }
 
-				if (pbindMatrices) {
-					delete[] pbindMatrices;
-				}
-			}
-		}
+                    if (pbindMatrices) {
+                        delete[] pbindMatrices;
+                    }
+                }
+            }
 
-		int k = 0;
-		for (unsigned int j = meshOffsets[mesh_idx]; j < meshOffsets[mesh_idx + 1]; ++j, ++k) {
-			ainode->mMeshes[k] = j;
-		}
-	}
+            int k = 0;
+            for (unsigned int j = meshOffsets[mesh_idx]; j < meshOffsets[mesh_idx + 1]; ++j, ++k) {
+                ainode->mMeshes[k] = j;
+            }
+        }
 
-	if (node.camera) {
-		pScene->mCameras[node.camera.GetIndex()]->mName = ainode->mName;
-		if (node.translation.isPresent) {
-			aiVector3D trans;
-			CopyValue(node.translation.value, trans);
-			pScene->mCameras[node.camera.GetIndex()]->mPosition = trans;
-		}
-	}
+        if (node.camera) {
+            pScene->mCameras[node.camera.GetIndex()]->mName = ainode->mName;
+            if (node.translation.isPresent) {
+                aiVector3D trans;
+                CopyValue(node.translation.value, trans);
+                pScene->mCameras[node.camera.GetIndex()]->mPosition = trans;
+            }
+        }
 
-	if (node.light) {
-		pScene->mLights[node.light.GetIndex()]->mName = ainode->mName;
+        if (node.light) {
+            pScene->mLights[node.light.GetIndex()]->mName = ainode->mName;
 
-		//range is optional - see https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_lights_punctual
-		//it is added to meta data of parent node, because there is no other place to put it
-		if (node.light->range.isPresent) {
-			if (!ainode->mMetaData) {
-				ainode->mMetaData = aiMetadata::Alloc(1);
-				ainode->mMetaData->Set(0, "PBR_LightRange", node.light->range.value);
-			}
-			else {
-				ainode->mMetaData->Add("PBR_LightRange", node.light->range.value);
-			}
-		}
-	}
+            //range is optional - see https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_lights_punctual
+            //it is added to meta data of parent node, because there is no other place to put it
+            if (node.light->range.isPresent) {
+                if (!ainode->mMetaData) {
+                    ainode->mMetaData = aiMetadata::Alloc(1);
+                    ainode->mMetaData->Set(0, "PBR_LightRange", node.light->range.value);
+                }
+                else {
+                    ainode->mMetaData->Add("PBR_LightRange", node.light->range.value);
+                }
+            }
+        }
 
-	return ainode;
+        return ainode;
+    } catch (...) {
+        delete ainode;
+        throw;
+    }
 }
 
 void glTF2Importer::ImportNodes(glTF2::Asset &r) {
-	if (!r.scene) {
-		throw DeadlyImportError("GLTF: No scene");
-	}
-	ASSIMP_LOG_DEBUG("Importing nodes");
+    if (!r.scene) {
+        throw DeadlyImportError("GLTF: No scene");
+    }
+    ASSIMP_LOG_DEBUG("Importing nodes");
 
-	std::vector<Ref<Node>> rootNodes = r.scene->nodes;
+    std::vector<Ref<Node>> rootNodes = r.scene->nodes;
 
-	// The root nodes
-	unsigned int numRootNodes = unsigned(rootNodes.size());
-	if (numRootNodes == 1) { // a single root node: use it
-		mScene->mRootNode = ImportNode(mScene, r, meshOffsets, rootNodes[0]);
-	} else if (numRootNodes > 1) { // more than one root node: create a fake root
-		aiNode *root = new aiNode("ROOT");
-		root->mChildren = new aiNode *[numRootNodes];
-		for (unsigned int i = 0; i < numRootNodes; ++i) {
-			aiNode *node = ImportNode(mScene, r, meshOffsets, rootNodes[i]);
-			node->mParent = root;
-			root->mChildren[root->mNumChildren++] = node;
-		}
-		mScene->mRootNode = root;
-	} else {
-		mScene->mRootNode = new aiNode("ROOT");
-	}
+    // The root nodes
+    unsigned int numRootNodes = unsigned(rootNodes.size());
+    if (numRootNodes == 1) { // a single root node: use it
+        mScene->mRootNode = ImportNode(mScene, r, meshOffsets, rootNodes[0]);
+    } else if (numRootNodes > 1) { // more than one root node: create a fake root
+        aiNode *root = mScene->mRootNode = new aiNode("ROOT");
+
+        root->mChildren = new aiNode *[numRootNodes];
+        std::fill(root->mChildren, root->mChildren + numRootNodes, nullptr);
+
+        for (unsigned int i = 0; i < numRootNodes; ++i) {
+            aiNode *node = ImportNode(mScene, r, meshOffsets, rootNodes[i]);
+            node->mParent = root;
+            root->mChildren[root->mNumChildren++] = node;
+        }
+    } else {
+        mScene->mRootNode = new aiNode("ROOT");
+    }
 }
 
 struct AnimationSamplers {
-	AnimationSamplers() :
-			translation(nullptr),
-			rotation(nullptr),
-			scale(nullptr),
-			weight(nullptr) {
-		// empty
-	}
+    AnimationSamplers() :
+            translation(nullptr),
+            rotation(nullptr),
+            scale(nullptr),
+            weight(nullptr) {
+        // empty
+    }
 
-	Animation::Sampler *translation;
-	Animation::Sampler *rotation;
-	Animation::Sampler *scale;
-	Animation::Sampler *weight;
+    Animation::Sampler *translation;
+    Animation::Sampler *rotation;
+    Animation::Sampler *scale;
+    Animation::Sampler *weight;
 };
 
 aiNodeAnim *CreateNodeAnim(glTF2::Asset&, Node &node, AnimationSamplers &samplers) {
-	aiNodeAnim *anim = new aiNodeAnim();
-	anim->mNodeName = GetNodeName(node);
+    aiNodeAnim *anim = new aiNodeAnim();
 
-	static const float kMillisecondsFromSeconds = 1000.f;
+    try {
+        anim->mNodeName = GetNodeName(node);
 
-	if (samplers.translation) {
-		float *times = nullptr;
-		samplers.translation->input->ExtractData(times);
-		aiVector3D *values = nullptr;
-		samplers.translation->output->ExtractData(values);
-		anim->mNumPositionKeys = static_cast<uint32_t>(samplers.translation->input->count);
-		anim->mPositionKeys = new aiVectorKey[anim->mNumPositionKeys];
-		for (unsigned int i = 0; i < anim->mNumPositionKeys; ++i) {
-			anim->mPositionKeys[i].mTime = times[i] * kMillisecondsFromSeconds;
-			anim->mPositionKeys[i].mValue = values[i];
-		}
-		delete[] times;
-		delete[] values;
-	} else if (node.translation.isPresent) {
-		anim->mNumPositionKeys = 1;
-		anim->mPositionKeys = new aiVectorKey[anim->mNumPositionKeys];
-		anim->mPositionKeys->mTime = 0.f;
-		anim->mPositionKeys->mValue.x = node.translation.value[0];
-		anim->mPositionKeys->mValue.y = node.translation.value[1];
-		anim->mPositionKeys->mValue.z = node.translation.value[2];
-	}
+        static const float kMillisecondsFromSeconds = 1000.f;
 
-	if (samplers.rotation) {
-		float *times = nullptr;
-		samplers.rotation->input->ExtractData(times);
-		aiQuaternion *values = nullptr;
-		samplers.rotation->output->ExtractData(values);
-		anim->mNumRotationKeys = static_cast<uint32_t>(samplers.rotation->input->count);
-		anim->mRotationKeys = new aiQuatKey[anim->mNumRotationKeys];
-		for (unsigned int i = 0; i < anim->mNumRotationKeys; ++i) {
-			anim->mRotationKeys[i].mTime = times[i] * kMillisecondsFromSeconds;
-			anim->mRotationKeys[i].mValue.x = values[i].w;
-			anim->mRotationKeys[i].mValue.y = values[i].x;
-			anim->mRotationKeys[i].mValue.z = values[i].y;
-			anim->mRotationKeys[i].mValue.w = values[i].z;
-		}
-		delete[] times;
-		delete[] values;
-	} else if (node.rotation.isPresent) {
-		anim->mNumRotationKeys = 1;
-		anim->mRotationKeys = new aiQuatKey[anim->mNumRotationKeys];
-		anim->mRotationKeys->mTime = 0.f;
-		anim->mRotationKeys->mValue.x = node.rotation.value[0];
-		anim->mRotationKeys->mValue.y = node.rotation.value[1];
-		anim->mRotationKeys->mValue.z = node.rotation.value[2];
-		anim->mRotationKeys->mValue.w = node.rotation.value[3];
-	}
+        if (samplers.translation) {
+            float *times = nullptr;
+            samplers.translation->input->ExtractData(times);
+            aiVector3D *values = nullptr;
+            samplers.translation->output->ExtractData(values);
+            anim->mNumPositionKeys = static_cast<uint32_t>(samplers.translation->input->count);
+            anim->mPositionKeys = new aiVectorKey[anim->mNumPositionKeys];
+            unsigned int ii = (samplers.translation->interpolation == Interpolation_CUBICSPLINE) ? 1 : 0;
+            for (unsigned int i = 0; i < anim->mNumPositionKeys; ++i) {
+                anim->mPositionKeys[i].mTime = times[i] * kMillisecondsFromSeconds;
+                anim->mPositionKeys[i].mValue = values[ii];
+                ii += (samplers.translation->interpolation == Interpolation_CUBICSPLINE) ? 3 : 1;
+            }
+            delete[] times;
+            delete[] values;
+        } else if (node.translation.isPresent) {
+            anim->mNumPositionKeys = 1;
+            anim->mPositionKeys = new aiVectorKey[anim->mNumPositionKeys];
+            anim->mPositionKeys->mTime = 0.f;
+            anim->mPositionKeys->mValue.x = node.translation.value[0];
+            anim->mPositionKeys->mValue.y = node.translation.value[1];
+            anim->mPositionKeys->mValue.z = node.translation.value[2];
+        }
 
-	if (samplers.scale) {
-		float *times = nullptr;
-		samplers.scale->input->ExtractData(times);
-		aiVector3D *values = nullptr;
-		samplers.scale->output->ExtractData(values);
-		anim->mNumScalingKeys = static_cast<uint32_t>(samplers.scale->input->count);
-		anim->mScalingKeys = new aiVectorKey[anim->mNumScalingKeys];
-		for (unsigned int i = 0; i < anim->mNumScalingKeys; ++i) {
-			anim->mScalingKeys[i].mTime = times[i] * kMillisecondsFromSeconds;
-			anim->mScalingKeys[i].mValue = values[i];
-		}
-		delete[] times;
-		delete[] values;
-	} else if (node.scale.isPresent) {
-		anim->mNumScalingKeys = 1;
-		anim->mScalingKeys = new aiVectorKey[anim->mNumScalingKeys];
-		anim->mScalingKeys->mTime = 0.f;
-		anim->mScalingKeys->mValue.x = node.scale.value[0];
-		anim->mScalingKeys->mValue.y = node.scale.value[1];
-		anim->mScalingKeys->mValue.z = node.scale.value[2];
-	}
+        if (samplers.rotation) {
+            float *times = nullptr;
+            samplers.rotation->input->ExtractData(times);
+            aiQuaternion *values = nullptr;
+            samplers.rotation->output->ExtractData(values);
+            anim->mNumRotationKeys = static_cast<uint32_t>(samplers.rotation->input->count);
+            anim->mRotationKeys = new aiQuatKey[anim->mNumRotationKeys];
+            unsigned int ii = (samplers.rotation->interpolation == Interpolation_CUBICSPLINE) ? 1 : 0;
+            for (unsigned int i = 0; i < anim->mNumRotationKeys; ++i) {
+                anim->mRotationKeys[i].mTime = times[i] * kMillisecondsFromSeconds;
+                anim->mRotationKeys[i].mValue.x = values[ii].w;
+                anim->mRotationKeys[i].mValue.y = values[ii].x;
+                anim->mRotationKeys[i].mValue.z = values[ii].y;
+                anim->mRotationKeys[i].mValue.w = values[ii].z;
+                ii += (samplers.rotation->interpolation == Interpolation_CUBICSPLINE) ? 3 : 1;
+            }
+            delete[] times;
+            delete[] values;
+        } else if (node.rotation.isPresent) {
+            anim->mNumRotationKeys = 1;
+            anim->mRotationKeys = new aiQuatKey[anim->mNumRotationKeys];
+            anim->mRotationKeys->mTime = 0.f;
+            anim->mRotationKeys->mValue.x = node.rotation.value[0];
+            anim->mRotationKeys->mValue.y = node.rotation.value[1];
+            anim->mRotationKeys->mValue.z = node.rotation.value[2];
+            anim->mRotationKeys->mValue.w = node.rotation.value[3];
+        }
 
-	return anim;
+        if (samplers.scale) {
+            float *times = nullptr;
+            samplers.scale->input->ExtractData(times);
+            aiVector3D *values = nullptr;
+            samplers.scale->output->ExtractData(values);
+            anim->mNumScalingKeys = static_cast<uint32_t>(samplers.scale->input->count);
+            anim->mScalingKeys = new aiVectorKey[anim->mNumScalingKeys];
+            unsigned int ii = (samplers.scale->interpolation == Interpolation_CUBICSPLINE) ? 1 : 0;
+            for (unsigned int i = 0; i < anim->mNumScalingKeys; ++i) {
+                anim->mScalingKeys[i].mTime = times[i] * kMillisecondsFromSeconds;
+                anim->mScalingKeys[i].mValue = values[ii];
+                ii += (samplers.scale->interpolation == Interpolation_CUBICSPLINE) ? 3 : 1;
+            }
+            delete[] times;
+            delete[] values;
+        } else if (node.scale.isPresent) {
+            anim->mNumScalingKeys = 1;
+            anim->mScalingKeys = new aiVectorKey[anim->mNumScalingKeys];
+            anim->mScalingKeys->mTime = 0.f;
+            anim->mScalingKeys->mValue.x = node.scale.value[0];
+            anim->mScalingKeys->mValue.y = node.scale.value[1];
+            anim->mScalingKeys->mValue.z = node.scale.value[2];
+        }
+
+        return anim;
+    } catch (...) {
+        delete anim;
+        throw;
+    }
 }
 
 aiMeshMorphAnim *CreateMeshMorphAnim(glTF2::Asset&, Node &node, AnimationSamplers &samplers) {
-	aiMeshMorphAnim *anim = new aiMeshMorphAnim();
-	anim->mName = GetNodeName(node);
+    aiMeshMorphAnim *anim = new aiMeshMorphAnim();
 
-	static const float kMillisecondsFromSeconds = 1000.f;
+    try {
+        anim->mName = GetNodeName(node);
 
-	if (nullptr != samplers.weight) {
-		float *times = nullptr;
-		samplers.weight->input->ExtractData(times);
-		float *values = nullptr;
-		samplers.weight->output->ExtractData(values);
-		anim->mNumKeys = static_cast<uint32_t>(samplers.weight->input->count);
+        static const float kMillisecondsFromSeconds = 1000.f;
 
-		const unsigned int numMorphs = (unsigned int)samplers.weight->output->count / anim->mNumKeys;
+        if (nullptr != samplers.weight) {
+            float *times = nullptr;
+            samplers.weight->input->ExtractData(times);
+            float *values = nullptr;
+            samplers.weight->output->ExtractData(values);
+            anim->mNumKeys = static_cast<uint32_t>(samplers.weight->input->count);
 
-		anim->mKeys = new aiMeshMorphKey[anim->mNumKeys];
-		unsigned int k = 0u;
-		for (unsigned int i = 0u; i < anim->mNumKeys; ++i) {
-			anim->mKeys[i].mTime = times[i] * kMillisecondsFromSeconds;
-			anim->mKeys[i].mNumValuesAndWeights = numMorphs;
-			anim->mKeys[i].mValues = new unsigned int[numMorphs];
-			anim->mKeys[i].mWeights = new double[numMorphs];
+            // for Interpolation_CUBICSPLINE can have more outputs
+            const unsigned int weightStride = (unsigned int)samplers.weight->output->count / anim->mNumKeys;
+            const unsigned int numMorphs = (samplers.weight->interpolation == Interpolation_CUBICSPLINE) ? weightStride - 2 : weightStride;
 
-			for (unsigned int j = 0u; j < numMorphs; ++j, ++k) {
-				anim->mKeys[i].mValues[j] = j;
-				anim->mKeys[i].mWeights[j] = (0.f > values[k]) ? 0.f : values[k];
-			}
-		}
+            anim->mKeys = new aiMeshMorphKey[anim->mNumKeys];
+            unsigned int ii = (samplers.weight->interpolation == Interpolation_CUBICSPLINE) ? 1 : 0;
+            for (unsigned int i = 0u; i < anim->mNumKeys; ++i) {
+                unsigned int k = weightStride * i + ii;
+                anim->mKeys[i].mTime = times[i] * kMillisecondsFromSeconds;
+                anim->mKeys[i].mNumValuesAndWeights = numMorphs;
+                anim->mKeys[i].mValues = new unsigned int[numMorphs];
+                anim->mKeys[i].mWeights = new double[numMorphs];
 
-		delete[] times;
-		delete[] values;
-	}
+                for (unsigned int j = 0u; j < numMorphs; ++j, ++k) {
+                    anim->mKeys[i].mValues[j] = j;
+                    anim->mKeys[i].mWeights[j] = (0.f > values[k]) ? 0.f : values[k];
+                }
+            }
 
-	return anim;
+            delete[] times;
+            delete[] values;
+        }
+
+        return anim;
+    } catch (...) {
+        delete anim;
+        throw;
+    }
 }
 
 std::unordered_map<unsigned int, AnimationSamplers> GatherSamplers(Animation &anim) {
-	std::unordered_map<unsigned int, AnimationSamplers> samplers;
-	for (unsigned int c = 0; c < anim.channels.size(); ++c) {
-		Animation::Channel &channel = anim.channels[c];
-		if (channel.sampler >= static_cast<int>(anim.samplers.size())) {
-			continue;
-		}
+    std::unordered_map<unsigned int, AnimationSamplers> samplers;
+    for (unsigned int c = 0; c < anim.channels.size(); ++c) {
+        Animation::Channel &channel = anim.channels[c];
+        if (channel.sampler < 0 || channel.sampler >= static_cast<int>(anim.samplers.size())) {
+            continue;
+        }
 
-		const unsigned int node_index = channel.target.node.GetIndex();
+        const unsigned int node_index = channel.target.node.GetIndex();
 
-		AnimationSamplers &sampler = samplers[node_index];
-		if (channel.target.path == AnimationPath_TRANSLATION) {
-			sampler.translation = &anim.samplers[channel.sampler];
-		} else if (channel.target.path == AnimationPath_ROTATION) {
-			sampler.rotation = &anim.samplers[channel.sampler];
-		} else if (channel.target.path == AnimationPath_SCALE) {
-			sampler.scale = &anim.samplers[channel.sampler];
-		} else if (channel.target.path == AnimationPath_WEIGHTS) {
-			sampler.weight = &anim.samplers[channel.sampler];
-		}
-	}
+        AnimationSamplers &sampler = samplers[node_index];
+        if (channel.target.path == AnimationPath_TRANSLATION) {
+            sampler.translation = &anim.samplers[channel.sampler];
+        } else if (channel.target.path == AnimationPath_ROTATION) {
+            sampler.rotation = &anim.samplers[channel.sampler];
+        } else if (channel.target.path == AnimationPath_SCALE) {
+            sampler.scale = &anim.samplers[channel.sampler];
+        } else if (channel.target.path == AnimationPath_WEIGHTS) {
+            sampler.weight = &anim.samplers[channel.sampler];
+        }
+    }
 
-	return samplers;
+    return samplers;
 }
 
 void glTF2Importer::ImportAnimations(glTF2::Asset &r) {
-	if (!r.scene) return;
+    if (!r.scene) return;
 
     const unsigned numAnimations = r.animations.Size();
-	ASSIMP_LOG_DEBUG_F("Importing ", numAnimations, " animations");
-	mScene->mNumAnimations = numAnimations;
-	if (mScene->mNumAnimations == 0) {
-		return;
-	}
+    ASSIMP_LOG_DEBUG_F("Importing ", numAnimations, " animations");
+    mScene->mNumAnimations = numAnimations;
+    if (mScene->mNumAnimations == 0) {
+        return;
+    }
 
     mScene->mAnimations = new aiAnimation *[numAnimations];
-	for (unsigned int i = 0; i < numAnimations; ++i) {
-		Animation &anim = r.animations[i];
+    std::fill(mScene->mAnimations, mScene->mAnimations + numAnimations, nullptr);
 
-		aiAnimation *ai_anim = new aiAnimation();
-		ai_anim->mName = anim.name;
-		ai_anim->mDuration = 0;
-		ai_anim->mTicksPerSecond = 0;
+    for (unsigned int i = 0; i < numAnimations; ++i) {
+        aiAnimation *ai_anim = mScene->mAnimations[i] = new aiAnimation();
 
-		std::unordered_map<unsigned int, AnimationSamplers> samplers = GatherSamplers(anim);
+        Animation &anim = r.animations[i];
 
-		uint32_t numChannels = 0u;
-		uint32_t numMorphMeshChannels = 0u;
+        ai_anim->mName = anim.name;
+        ai_anim->mDuration = 0;
+        ai_anim->mTicksPerSecond = 0;
 
-		for (auto &iter : samplers) {
-			if ((nullptr != iter.second.rotation) || (nullptr != iter.second.scale) || (nullptr != iter.second.translation)) {
-				++numChannels;
-			}
-			if (nullptr != iter.second.weight) {
-				++numMorphMeshChannels;
-			}
-		}
+        std::unordered_map<unsigned int, AnimationSamplers> samplers = GatherSamplers(anim);
 
-		ai_anim->mNumChannels = numChannels;
-		if (ai_anim->mNumChannels > 0) {
-			ai_anim->mChannels = new aiNodeAnim *[ai_anim->mNumChannels];
-			int j = 0;
-			for (auto &iter : samplers) {
-				if ((nullptr != iter.second.rotation) || (nullptr != iter.second.scale) || (nullptr != iter.second.translation)) {
-					ai_anim->mChannels[j] = CreateNodeAnim(r, r.nodes[iter.first], iter.second);
-					++j;
-				}
-			}
-		}
+        uint32_t numChannels = 0u;
+        uint32_t numMorphMeshChannels = 0u;
 
-		ai_anim->mNumMorphMeshChannels = numMorphMeshChannels;
-		if (ai_anim->mNumMorphMeshChannels > 0) {
-			ai_anim->mMorphMeshChannels = new aiMeshMorphAnim *[ai_anim->mNumMorphMeshChannels];
-			int j = 0;
-			for (auto &iter : samplers) {
-				if (nullptr != iter.second.weight) {
-					ai_anim->mMorphMeshChannels[j] = CreateMeshMorphAnim(r, r.nodes[iter.first], iter.second);
-					++j;
-				}
-			}
-		}
+        for (auto &iter : samplers) {
+            if ((nullptr != iter.second.rotation) || (nullptr != iter.second.scale) || (nullptr != iter.second.translation)) {
+                ++numChannels;
+            }
+            if (nullptr != iter.second.weight) {
+                ++numMorphMeshChannels;
+            }
+        }
 
-		// Use the latest keyframe for the duration of the animation
-		double maxDuration = 0;
-		unsigned int maxNumberOfKeys = 0;
-		for (unsigned int j = 0; j < ai_anim->mNumChannels; ++j) {
-			auto chan = ai_anim->mChannels[j];
-			if (chan->mNumPositionKeys) {
-				auto lastPosKey = chan->mPositionKeys[chan->mNumPositionKeys - 1];
-				if (lastPosKey.mTime > maxDuration) {
-					maxDuration = lastPosKey.mTime;
-				}
-				maxNumberOfKeys = std::max(maxNumberOfKeys, chan->mNumPositionKeys);
-			}
-			if (chan->mNumRotationKeys) {
-				auto lastRotKey = chan->mRotationKeys[chan->mNumRotationKeys - 1];
-				if (lastRotKey.mTime > maxDuration) {
-					maxDuration = lastRotKey.mTime;
-				}
-				maxNumberOfKeys = std::max(maxNumberOfKeys, chan->mNumRotationKeys);
-			}
-			if (chan->mNumScalingKeys) {
-				auto lastScaleKey = chan->mScalingKeys[chan->mNumScalingKeys - 1];
-				if (lastScaleKey.mTime > maxDuration) {
-					maxDuration = lastScaleKey.mTime;
-				}
-				maxNumberOfKeys = std::max(maxNumberOfKeys, chan->mNumScalingKeys);
-			}
-		}
+        ai_anim->mNumChannels = numChannels;
+        if (ai_anim->mNumChannels > 0) {
+            ai_anim->mChannels = new aiNodeAnim *[ai_anim->mNumChannels];
+            std::fill(ai_anim->mChannels, ai_anim->mChannels + ai_anim->mNumChannels, nullptr);
+            int j = 0;
+            for (auto &iter : samplers) {
+                if ((nullptr != iter.second.rotation) || (nullptr != iter.second.scale) || (nullptr != iter.second.translation)) {
+                    ai_anim->mChannels[j] = CreateNodeAnim(r, r.nodes[iter.first], iter.second);
+                    ++j;
+                }
+            }
+        }
 
-		for (unsigned int j = 0; j < ai_anim->mNumMorphMeshChannels; ++j) {
-			const auto *const chan = ai_anim->mMorphMeshChannels[j];
+        ai_anim->mNumMorphMeshChannels = numMorphMeshChannels;
+        if (ai_anim->mNumMorphMeshChannels > 0) {
+            ai_anim->mMorphMeshChannels = new aiMeshMorphAnim *[ai_anim->mNumMorphMeshChannels];
+            std::fill(ai_anim->mMorphMeshChannels, ai_anim->mMorphMeshChannels + ai_anim->mNumMorphMeshChannels, nullptr);
+            int j = 0;
+            for (auto &iter : samplers) {
+                if (nullptr != iter.second.weight) {
+                    ai_anim->mMorphMeshChannels[j] = CreateMeshMorphAnim(r, r.nodes[iter.first], iter.second);
+                    ++j;
+                }
+            }
+        }
 
-			if (0u != chan->mNumKeys) {
-				const auto &lastKey = chan->mKeys[chan->mNumKeys - 1u];
-				if (lastKey.mTime > maxDuration) {
-					maxDuration = lastKey.mTime;
-				}
-				maxNumberOfKeys = std::max(maxNumberOfKeys, chan->mNumKeys);
-			}
-		}
+        // Use the latest keyframe for the duration of the animation
+        double maxDuration = 0;
+        unsigned int maxNumberOfKeys = 0;
+        for (unsigned int j = 0; j < ai_anim->mNumChannels; ++j) {
+            auto chan = ai_anim->mChannels[j];
+            if (chan->mNumPositionKeys) {
+                auto lastPosKey = chan->mPositionKeys[chan->mNumPositionKeys - 1];
+                if (lastPosKey.mTime > maxDuration) {
+                    maxDuration = lastPosKey.mTime;
+                }
+                maxNumberOfKeys = std::max(maxNumberOfKeys, chan->mNumPositionKeys);
+            }
+            if (chan->mNumRotationKeys) {
+                auto lastRotKey = chan->mRotationKeys[chan->mNumRotationKeys - 1];
+                if (lastRotKey.mTime > maxDuration) {
+                    maxDuration = lastRotKey.mTime;
+                }
+                maxNumberOfKeys = std::max(maxNumberOfKeys, chan->mNumRotationKeys);
+            }
+            if (chan->mNumScalingKeys) {
+                auto lastScaleKey = chan->mScalingKeys[chan->mNumScalingKeys - 1];
+                if (lastScaleKey.mTime > maxDuration) {
+                    maxDuration = lastScaleKey.mTime;
+                }
+                maxNumberOfKeys = std::max(maxNumberOfKeys, chan->mNumScalingKeys);
+            }
+        }
 
-		ai_anim->mDuration = maxDuration;
-		ai_anim->mTicksPerSecond = 1000.0;
+        for (unsigned int j = 0; j < ai_anim->mNumMorphMeshChannels; ++j) {
+            const auto *const chan = ai_anim->mMorphMeshChannels[j];
 
-		mScene->mAnimations[i] = ai_anim;
-	}
+            if (0u != chan->mNumKeys) {
+                const auto &lastKey = chan->mKeys[chan->mNumKeys - 1u];
+                if (lastKey.mTime > maxDuration) {
+                    maxDuration = lastKey.mTime;
+                }
+                maxNumberOfKeys = std::max(maxNumberOfKeys, chan->mNumKeys);
+            }
+        }
+
+        ai_anim->mDuration = maxDuration;
+        ai_anim->mTicksPerSecond = 1000.0;
+    }
 }
 
 void glTF2Importer::ImportEmbeddedTextures(glTF2::Asset &r) {
-	embeddedTexIdxs.resize(r.images.Size(), -1);
+    embeddedTexIdxs.resize(r.images.Size(), -1);
 
-	int numEmbeddedTexs = 0;
-	for (size_t i = 0; i < r.images.Size(); ++i) {
-		if (r.images[i].HasData()) {
-			numEmbeddedTexs += 1;
-		}
-	}
+    int numEmbeddedTexs = 0;
+    for (size_t i = 0; i < r.images.Size(); ++i) {
+        if (r.images[i].HasData()) {
+            numEmbeddedTexs += 1;
+        }
+    }
 
-	if (numEmbeddedTexs == 0)
-		return;
+    if (numEmbeddedTexs == 0)
+        return;
 
-  	ASSIMP_LOG_DEBUG_F("Importing ", numEmbeddedTexs, " embedded textures");
+      ASSIMP_LOG_DEBUG_F("Importing ", numEmbeddedTexs, " embedded textures");
 
-	mScene->mTextures = new aiTexture *[numEmbeddedTexs];
+    mScene->mTextures = new aiTexture *[numEmbeddedTexs];
+    std::fill(mScene->mTextures, mScene->mTextures + numEmbeddedTexs, nullptr);
 
-	// Add the embedded textures
-	for (size_t i = 0; i < r.images.Size(); ++i) {
-		Image &img = r.images[i];
-		if (!img.HasData()) {
-			continue;
-		}
+    // Add the embedded textures
+    for (size_t i = 0; i < r.images.Size(); ++i) {
+        Image &img = r.images[i];
+        if (!img.HasData()) {
+            continue;
+        }
 
-		int idx = mScene->mNumTextures++;
-		embeddedTexIdxs[i] = idx;
+        int idx = mScene->mNumTextures++;
+        embeddedTexIdxs[i] = idx;
 
-		aiTexture *tex = mScene->mTextures[idx] = new aiTexture();
+        aiTexture *tex = mScene->mTextures[idx] = new aiTexture();
 
-		size_t length = img.GetDataLength();
-		void *data = img.StealData();
+        size_t length = img.GetDataLength();
+        void *data = img.StealData();
 
-		tex->mFilename = img.name;
-		tex->mWidth = static_cast<unsigned int>(length);
-		tex->mHeight = 0;
-		tex->pcData = reinterpret_cast<aiTexel *>(data);
+        tex->mFilename = img.name;
+        tex->mWidth = static_cast<unsigned int>(length);
+        tex->mHeight = 0;
+        tex->pcData = reinterpret_cast<aiTexel *>(data);
 
-		if (!img.mimeType.empty()) {
-			const char *ext = strchr(img.mimeType.c_str(), '/') + 1;
-			if (ext) {
-				if (strcmp(ext, "jpeg") == 0) {
+        if (!img.mimeType.empty()) {
+            const char *ext = strchr(img.mimeType.c_str(), '/') + 1;
+            if (ext) {
+                if (strcmp(ext, "jpeg") == 0) {
                     ext = "jpg";
                 }
 
-				size_t len = strlen(ext);
-				if (len <= 3) {
-					strcpy(tex->achFormatHint, ext);
-				}
-			}
-		}
-	}
+                size_t len = strlen(ext);
+                if (len <= 3) {
+                    strcpy(tex->achFormatHint, ext);
+                }
+            }
+        }
+    }
 }
 
 void glTF2Importer::ImportCommonMetadata(glTF2::Asset& a) {
-	ASSIMP_LOG_DEBUG("Importing metadata");
+    ASSIMP_LOG_DEBUG("Importing metadata");
     ai_assert(mScene->mMetaData == nullptr);
     const bool hasVersion = !a.asset.version.empty();
     const bool hasGenerator = !a.asset.generator.empty();
@@ -1357,37 +1462,40 @@ void glTF2Importer::InternReadFile(const std::string &pFile, aiScene *pScene, IO
 
     ASSIMP_LOG_DEBUG("Reading GLTF2 file");
 
-	// clean all member arrays
-	meshOffsets.clear();
-	embeddedTexIdxs.clear();
+    // clean all member arrays
+    meshOffsets.clear();
+    embeddedTexIdxs.clear();
 
-	this->mScene = pScene;
+    this->mScene = pScene;
 
-	// read the asset file
-	glTF2::Asset asset(pIOHandler);
-	asset.Load(pFile, GetExtension(pFile) == "glb");
+    // read the asset file
+    glTF2::Asset asset(pIOHandler);
+    asset.Load(pFile, GetExtension(pFile) == "glb");
+    if (asset.scene) {
+        pScene->mName = asset.scene->name;
+    }
 
-	//
-	// Copy the data out
-	//
+    //
+    // Copy the data out
+    //
 
-	ImportEmbeddedTextures(asset);
-	ImportMaterials(asset);
+    ImportEmbeddedTextures(asset);
+    ImportMaterials(asset);
 
-	ImportMeshes(asset);
+    ImportMeshes(asset);
 
-	ImportCameras(asset);
-	ImportLights(asset);
+    ImportCameras(asset);
+    ImportLights(asset);
 
-	ImportNodes(asset);
+    ImportNodes(asset);
 
-	ImportAnimations(asset);
+    ImportAnimations(asset);
 
     ImportCommonMetadata(asset);
 
-	if (pScene->mNumMeshes == 0) {
-		pScene->mFlags |= AI_SCENE_FLAGS_INCOMPLETE;
-	}
+    if (pScene->mNumMeshes == 0) {
+        pScene->mFlags |= AI_SCENE_FLAGS_INCOMPLETE;
+    }
 }
 
 #endif // ASSIMP_BUILD_NO_GLTF_IMPORTER
diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index 9f8f519d9..bbcad86e5 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -137,7 +137,7 @@ SET( PUBLIC_HEADERS
   ${HEADER_PATH}/XMLTools.h
   ${HEADER_PATH}/IOStreamBuffer.h
   ${HEADER_PATH}/CreateAnimMesh.h
-  ${HEADER_PATH}/irrXMLWrapper.h
+  ${HEADER_PATH}/XmlParser.h
   ${HEADER_PATH}/BlobIOSystem.h
   ${HEADER_PATH}/MathFunctions.h
   ${HEADER_PATH}/Exceptional.h
@@ -200,6 +200,7 @@ SET( Common_SRCS
   Common/simd.cpp
   Common/material.cpp
   Common/AssertHandler.cpp
+  Common/Exceptional.cpp
 )
 SOURCE_GROUP(Common FILES ${Common_SRCS})
 
@@ -743,9 +744,6 @@ SET( PostProcessing_SRCS
 )
 SOURCE_GROUP( PostProcessing FILES ${PostProcessing_SRCS})
 
-SET( IrrXML_SRCS ${HEADER_PATH}/irrXMLWrapper.h )
-SOURCE_GROUP( IrrXML FILES ${IrrXML_SRCS})
-
 ADD_ASSIMP_IMPORTER( Q3D
   AssetLib/Q3D/Q3DLoader.cpp
   AssetLib/Q3D/Q3DLoader.h
@@ -800,21 +798,6 @@ ADD_ASSIMP_IMPORTER( X
 ADD_ASSIMP_IMPORTER( X3D
   AssetLib/X3D/X3DImporter.cpp
   AssetLib/X3D/X3DImporter.hpp
-  AssetLib/X3D/X3DImporter_Geometry2D.cpp
-  AssetLib/X3D/X3DImporter_Geometry3D.cpp
-  AssetLib/X3D/X3DImporter_Group.cpp
-  AssetLib/X3D/X3DImporter_Light.cpp
-  AssetLib/X3D/X3DImporter_Macro.hpp
-  AssetLib/X3D/X3DImporter_Metadata.cpp
-  AssetLib/X3D/X3DImporter_Networking.cpp
-  AssetLib/X3D/X3DImporter_Node.hpp
-  AssetLib/X3D/X3DImporter_Postprocess.cpp
-  AssetLib/X3D/X3DImporter_Rendering.cpp
-  AssetLib/X3D/X3DImporter_Shape.cpp
-  AssetLib/X3D/X3DImporter_Texturing.cpp
-  AssetLib/X3D/FIReader.hpp
-  AssetLib/X3D/FIReader.cpp
-  AssetLib/X3D/X3DVocabulary.cpp
 )
 
 ADD_ASSIMP_IMPORTER( GLTF
@@ -864,16 +847,6 @@ if ((CMAKE_COMPILER_IS_MINGW) AND (CMAKE_BUILD_TYPE MATCHES Debug))
   SET_SOURCE_FILES_PROPERTIES(Importer/StepFile/StepFileGen1.cpp PROPERTIES STATIC_LIBRARY_FLAGS -Os )
 endif()
 
-#ADD_ASSIMP_IMPORTER( STEP
-#    Step/STEPFile.h
-#    Importer/StepFile/StepFileImporter.h
-#    Importer/StepFile/StepFileImporter.cpp
-#    Importer/StepFile/StepFileGen1.cpp
-#    Importer/StepFile/StepFileGen2.cpp
-#    Importer/StepFile/StepFileGen3.cpp
-#    Importer/StepFile/StepReaderGen.h
-#)
-
 if ((NOT ASSIMP_NO_EXPORT) OR (NOT ASSIMP_EXPORTERS_ENABLED STREQUAL ""))
 	SET( Exporter_SRCS
 	  Common/Exporter.cpp
@@ -888,18 +861,22 @@ SET( Extra_SRCS
 )
 SOURCE_GROUP( Extra FILES ${Extra_SRCS})
 
-# irrXML
+# pugixml
 IF(ASSIMP_HUNTER_ENABLED)
-  hunter_add_package(irrXML)
-  find_package(irrXML CONFIG REQUIRED)
+  hunter_add_package(pugixml)
+  find_package(pugixml CONFIG REQUIRED)
 ELSE()
-  # irrXML already included in contrib directory by parent CMakeLists.txt.
+  SET( Pugixml_SRCS
+    ../contrib/pugixml/src/pugiconfig.hpp
+    ../contrib/pugixml/src/pugixml.hpp
+  )
+  SOURCE_GROUP( Contrib\\Pugixml FILES ${Pugixml_SRCS})
 ENDIF()
 
 # utf8
 IF(ASSIMP_HUNTER_ENABLED)
   hunter_add_package(utf8)
-  find_package(utf8 CONFIG REQUIRED)
+  find_package(utf8cpp CONFIG REQUIRED)
 ELSE()
   # utf8 is header-only, so Assimp doesn't need to do anything.
 ENDIF()
@@ -943,6 +920,7 @@ IF(ASSIMP_HUNTER_ENABLED)
   find_package(minizip CONFIG REQUIRED)
 ELSE()
   SET( unzip_SRCS
+    ../contrib/unzip/crypt.c
     ../contrib/unzip/crypt.h
     ../contrib/unzip/ioapi.c
     ../contrib/unzip/ioapi.h
@@ -1038,7 +1016,7 @@ ENDIF()
 # RT-extensions is used in "contrib/Open3DGC/o3dgcTimer.h" for collecting statistics. Pointed file
 # has implementation for different platforms: WIN32, __MACH__ and other ("else" block).
 FIND_PACKAGE(RT QUIET)
-IF (NOT ASSIMP_HUNTER_ENABLED AND (RT_FOUND OR MSVC))
+IF (NOT ASSIMP_HUNTER_ENABLED AND (RT_FOUND OR WIN32))
   SET( ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC 1 )
   ADD_DEFINITIONS( -DASSIMP_IMPORTER_GLTF_USE_OPEN3DGC=1 )
 ELSE ()
@@ -1054,6 +1032,12 @@ IF(ASSIMP_HUNTER_ENABLED)
 ELSE()
   INCLUDE_DIRECTORIES( "../contrib/rapidjson/include" )
   INCLUDE_DIRECTORIES( "../contrib" )
+  INCLUDE_DIRECTORIES( "../contrib/pugixml/src" )
+  ADD_DEFINITIONS( -DRAPIDJSON_HAS_STDSTRING=1 )
+  option( ASSIMP_RAPIDJSON_NO_MEMBER_ITERATOR "Suppress rapidjson warning on MSVC (NOTE: breaks android build)" ON )
+  if(ASSIMP_RAPIDJSON_NO_MEMBER_ITERATOR)
+    ADD_DEFINITIONS( -DRAPIDJSON_NOMEMBERITERATORCLASS )
+  endif()
 ENDIF()
 
 # VC2010 fixes
@@ -1066,7 +1050,7 @@ endif()
 
 ADD_DEFINITIONS( -DASSIMP_BUILD_DLL_EXPORT )
 
-if ( MSVC )
+IF( MSVC OR "${CMAKE_CXX_SIMULATE_ID}" MATCHES "MSVC") # clang with MSVC ABI
   ADD_DEFINITIONS( -D_SCL_SECURE_NO_WARNINGS )
   ADD_DEFINITIONS( -D_CRT_SECURE_NO_WARNINGS )
 endif ()
@@ -1107,13 +1091,13 @@ SET( assimp_src
   ${ASSIMP_EXPORTER_SRCS}
 
   # Third-party libraries
-  ${IrrXML_SRCS}
   ${unzip_compile_SRCS}
   ${Poly2Tri_SRCS}
   ${Clipper_SRCS}
   ${openddl_parser_SRCS}
   ${open3dgc_SRCS}
   ${ziplib_SRCS}
+  ${Pugixml_SRCS}
   # Necessary to show the headers in the project when using the VC++ generator:
 
   ${PUBLIC_HEADERS}
@@ -1136,6 +1120,8 @@ ENDIF ()
 ADD_LIBRARY( assimp ${assimp_src} )
 ADD_LIBRARY(assimp::assimp ALIAS assimp)
 
+TARGET_USE_COMMON_OUTPUT_DIRECTORY(assimp)
+
 # enable warnings as errors ########################################
 IF (MSVC)
   TARGET_COMPILE_OPTIONS(assimp PRIVATE /WX)
@@ -1153,17 +1139,17 @@ IF(ASSIMP_HUNTER_ENABLED)
   TARGET_LINK_LIBRARIES(assimp
       PUBLIC
       polyclipping::polyclipping
-      irrXML::irrXML
       openddlparser::openddl_parser
       poly2tri::poly2tri
       minizip::minizip
       ZLIB::zlib
       RapidJSON::rapidjson
-      utf8::utf8
+      utf8cpp
       zip::zip
+      pugixml
   )
 ELSE()
-  TARGET_LINK_LIBRARIES(assimp ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES} ${IRRXML_LIBRARY} )
+  TARGET_LINK_LIBRARIES(assimp ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES} )
 ENDIF()
 
 if(ASSIMP_ANDROID_JNIIOSYSTEM)
@@ -1256,23 +1242,16 @@ IF (RT_FOUND AND ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC)
   TARGET_LINK_LIBRARIES(assimp ${RT_LIBRARY})
 ENDIF ()
 
-IF(ASSIMP_HUNTER_ENABLED)
-  INSTALL( TARGETS assimp
-    EXPORT "${TARGETS_EXPORT_NAME}"
-    LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
-    ARCHIVE DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
-    RUNTIME DESTINATION ${ASSIMP_BIN_INSTALL_DIR}
-    FRAMEWORK DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
-    COMPONENT ${LIBASSIMP_COMPONENT}
-    INCLUDES DESTINATION "include")
-ELSE()
+
 INSTALL( TARGETS assimp
-    LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
-    ARCHIVE DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
-    RUNTIME DESTINATION ${ASSIMP_BIN_INSTALL_DIR}
-    FRAMEWORK DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
-    COMPONENT ${LIBASSIMP_COMPONENT})
-ENDIF()
+  EXPORT "${TARGETS_EXPORT_NAME}"
+  LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
+  ARCHIVE DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
+  RUNTIME DESTINATION ${ASSIMP_BIN_INSTALL_DIR}
+  FRAMEWORK DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
+  COMPONENT ${LIBASSIMP_COMPONENT}
+  INCLUDES DESTINATION include
+)
 INSTALL( FILES ${PUBLIC_HEADERS} DESTINATION ${ASSIMP_INCLUDE_INSTALL_DIR}/assimp COMPONENT assimp-dev)
 INSTALL( FILES ${COMPILER_HEADERS} DESTINATION ${ASSIMP_INCLUDE_INSTALL_DIR}/assimp/Compiler COMPONENT assimp-dev)
 
diff --git a/code/Common/Assimp.cpp b/code/Common/Assimp.cpp
index 33de72e0f..26aa52300 100644
--- a/code/Common/Assimp.cpp
+++ b/code/Common/Assimp.cpp
@@ -1079,7 +1079,7 @@ ASSIMP_API void aiMatrix4DecomposeIntoScalingAxisAnglePosition(
         const C_STRUCT aiMatrix4x4 *mat,
         C_STRUCT aiVector3D *scaling,
         C_STRUCT aiVector3D *axis,
-        float *angle,
+        ai_real *angle,
         C_STRUCT aiVector3D *position) {
     ai_assert(nullptr != mat);
     ai_assert(nullptr != scaling);
diff --git a/code/Common/BaseImporter.cpp b/code/Common/BaseImporter.cpp
index 47ff05f2f..b9c4d2bc3 100644
--- a/code/Common/BaseImporter.cpp
+++ b/code/Common/BaseImporter.cpp
@@ -5,8 +5,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -130,10 +128,11 @@ aiScene *BaseImporter::ReadFile(Importer *pImp, const std::string &pFile, IOSyst
         // passes scale into ScaleProcess
         UpdateImporterScale(pImp);
 
-    } catch (const std::exception &err) {
+    } catch( const std::exception &err ) {
         // extract error description
         m_ErrorText = err.what();
-        ASSIMP_LOG_ERROR(m_ErrorText);
+        ASSIMP_LOG_ERROR(err.what());
+        m_Exception = std::current_exception();
         return nullptr;
     }
 
@@ -343,7 +342,7 @@ std::string BaseImporter::GetExtension(const std::string &file) {
 }
 
 #ifdef ASSIMP_USE_HUNTER
-#include <utf8/utf8.h>
+#include <utf8.h>
 #else
 #include "../contrib/utf8cpp/source/utf8.h"
 #endif
diff --git a/code/Common/CreateAnimMesh.cpp b/code/Common/CreateAnimMesh.cpp
index 05472529d..d2d7e1d14 100644
--- a/code/Common/CreateAnimMesh.cpp
+++ b/code/Common/CreateAnimMesh.cpp
@@ -44,42 +44,46 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 namespace Assimp    {
 
-aiAnimMesh *aiCreateAnimMesh(const aiMesh *mesh)
+aiAnimMesh *aiCreateAnimMesh(const aiMesh *mesh, bool needPositions, bool needNormals, bool needTangents, bool needColors, bool needTexCoords)
 {
     aiAnimMesh *animesh = new aiAnimMesh;
     animesh->mNumVertices = mesh->mNumVertices;
-    if (mesh->mVertices) {
+    if (needPositions && mesh->mVertices) {
         animesh->mVertices = new aiVector3D[animesh->mNumVertices];
         std::memcpy(animesh->mVertices, mesh->mVertices, mesh->mNumVertices * sizeof(aiVector3D));
     }
-    if (mesh->mNormals) {
+    if (needNormals && mesh->mNormals) {
         animesh->mNormals = new aiVector3D[animesh->mNumVertices];
         std::memcpy(animesh->mNormals, mesh->mNormals, mesh->mNumVertices * sizeof(aiVector3D));
     }
-    if (mesh->mTangents) {
+    if (needTangents && mesh->mTangents) {
         animesh->mTangents = new aiVector3D[animesh->mNumVertices];
         std::memcpy(animesh->mTangents, mesh->mTangents, mesh->mNumVertices * sizeof(aiVector3D));
     }
-    if (mesh->mBitangents) {
+    if (needTangents && mesh->mBitangents) {
         animesh->mBitangents = new aiVector3D[animesh->mNumVertices];
         std::memcpy(animesh->mBitangents, mesh->mBitangents, mesh->mNumVertices * sizeof(aiVector3D));
     }
 
-    for (int i = 0; i < AI_MAX_NUMBER_OF_COLOR_SETS; ++i) {
-        if (mesh->mColors[i]) {
-            animesh->mColors[i] = new aiColor4D[animesh->mNumVertices];
-            std::memcpy(animesh->mColors[i], mesh->mColors[i], mesh->mNumVertices * sizeof(aiColor4D));
-        } else {
-            animesh->mColors[i] = nullptr;
+    if (needColors) {
+        for (int i = 0; i < AI_MAX_NUMBER_OF_COLOR_SETS; ++i) {
+            if (mesh->mColors[i]) {
+                animesh->mColors[i] = new aiColor4D[animesh->mNumVertices];
+                std::memcpy(animesh->mColors[i], mesh->mColors[i], mesh->mNumVertices * sizeof(aiColor4D));
+            } else {
+                animesh->mColors[i] = nullptr;
+            }
         }
     }
 
-    for (int i = 0; i < AI_MAX_NUMBER_OF_TEXTURECOORDS; ++i) {
-        if (mesh->mTextureCoords[i]) {
-            animesh->mTextureCoords[i] = new aiVector3D[animesh->mNumVertices];
-            std::memcpy(animesh->mTextureCoords[i], mesh->mTextureCoords[i], mesh->mNumVertices * sizeof(aiVector3D));
-        } else {
-            animesh->mTextureCoords[i] = nullptr;
+    if (needTexCoords) {
+        for (int i = 0; i < AI_MAX_NUMBER_OF_TEXTURECOORDS; ++i) {
+            if (mesh->mTextureCoords[i]) {
+                animesh->mTextureCoords[i] = new aiVector3D[animesh->mNumVertices];
+                std::memcpy(animesh->mTextureCoords[i], mesh->mTextureCoords[i], mesh->mNumVertices * sizeof(aiVector3D));
+            } else {
+                animesh->mTextureCoords[i] = nullptr;
+            }
         }
     }
     return animesh;
diff --git a/code/Common/DefaultIOStream.cpp b/code/Common/DefaultIOStream.cpp
index 65edd1bdd..449b6c1e1 100644
--- a/code/Common/DefaultIOStream.cpp
+++ b/code/Common/DefaultIOStream.cpp
@@ -5,8 +5,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -52,27 +50,32 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 using namespace Assimp;
 
 namespace {
+
 template <size_t sizeOfPointer>
-size_t select_ftell(FILE *file) {
+inline size_t select_ftell(FILE *file) {
     return ::ftell(file);
 }
 
 template <size_t sizeOfPointer>
-int select_fseek(FILE *file, int64_t offset, int origin) {
+inline int select_fseek(FILE *file, int64_t offset, int origin) {
     return ::fseek(file, static_cast<long>(offset), origin);
 }
 
+
+    
 #if defined _WIN32 && (!defined __GNUC__ || __MSVCRT_VERSION__ >= 0x0601)
 template <>
-size_t select_ftell<8>(FILE *file) {
+inline size_t select_ftell<8>(FILE *file) {
     return (size_t)::_ftelli64(file);
 }
 
 template <>
-int select_fseek<8>(FILE *file, int64_t offset, int origin) {
+inline int select_fseek<8>(FILE *file, int64_t offset, int origin) {
     return ::_fseeki64(file, offset, origin);
 }
-#endif
+
+#endif // #if defined _WIN32 && (!defined __GNUC__ || __MSVCRT_VERSION__ >= 0x0601)
+    
 } // namespace
 
 // ----------------------------------------------------------------------------------
@@ -100,7 +103,6 @@ size_t DefaultIOStream::Write(const void *pvBuffer,
         size_t pCount) {
     ai_assert(nullptr != pvBuffer);
     ai_assert(0 != pSize);
-    ai_assert(0 != pCount);
 
     return (mFile ? ::fwrite(pvBuffer, pSize, pCount, mFile) : 0);
 }
diff --git a/code/Common/DefaultIOSystem.cpp b/code/Common/DefaultIOSystem.cpp
index 31e76bdc9..4154aad32 100644
--- a/code/Common/DefaultIOSystem.cpp
+++ b/code/Common/DefaultIOSystem.cpp
@@ -5,8 +5,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -62,19 +60,32 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 using namespace Assimp;
 
 #ifdef _WIN32
+
+const std::wstring wdummy;
+
 static std::wstring Utf8ToWide(const char *in) {
+    if (nullptr == in) {
+        return wdummy;
+    }
     int size = MultiByteToWideChar(CP_UTF8, 0, in, -1, nullptr, 0);
     // size includes terminating null; std::wstring adds null automatically
     std::wstring out(static_cast<size_t>(size) - 1, L'\0');
     MultiByteToWideChar(CP_UTF8, 0, in, -1, &out[0], size);
+    
     return out;
 }
 
+const std::string dummy;
+
 static std::string WideToUtf8(const wchar_t *in) {
+    if (nullptr == in) {
+        return dummy;
+    }
     int size = WideCharToMultiByte(CP_UTF8, 0, in, -1, nullptr, 0, nullptr, nullptr);
     // size includes terminating null; std::string adds null automatically
     std::string out(static_cast<size_t>(size) - 1, '\0');
     WideCharToMultiByte(CP_UTF8, 0, in, -1, &out[0], size, nullptr, nullptr);
+    
     return out;
 }
 #endif
@@ -106,7 +117,12 @@ IOStream *DefaultIOSystem::Open(const char *strFile, const char *strMode) {
     ai_assert(strMode != nullptr);
     FILE *file;
 #ifdef _WIN32
-    file = ::_wfopen(Utf8ToWide(strFile).c_str(), Utf8ToWide(strMode).c_str());
+    std::wstring name = Utf8ToWide(strFile);
+    if (name.empty()) {
+        return nullptr;
+    }
+    
+    file = ::_wfopen(name.c_str(), Utf8ToWide(strMode).c_str());
 #else
     file = ::fopen(strFile, strMode);
 #endif
diff --git a/code/Common/DefaultLogger.cpp b/code/Common/DefaultLogger.cpp
index 8c946e8fd..76a5cbab7 100644
--- a/code/Common/DefaultLogger.cpp
+++ b/code/Common/DefaultLogger.cpp
@@ -260,7 +260,7 @@ void DefaultLogger::kill() {
 // ----------------------------------------------------------------------------------
 //  Debug message
 void DefaultLogger::OnDebug(const char *message) {
-    if (m_Severity < Logger::DEBUG) {
+    if (m_Severity < Logger::DEBUGGING) {
         return;
     }
 
diff --git a/code/Common/Exceptional.cpp b/code/Common/Exceptional.cpp
new file mode 100644
index 000000000..ae5257c19
--- /dev/null
+++ b/code/Common/Exceptional.cpp
@@ -0,0 +1,52 @@
+/*
+---------------------------------------------------------------------------
+Open Asset Import Library (assimp)
+---------------------------------------------------------------------------
+
+Copyright (c) 2006-2020, assimp team
+
+All rights reserved.
+
+Redistribution and use of this software in source and binary forms,
+with or without modification, are permitted provided that the following
+conditions are met:
+
+* Redistributions of source code must retain the above
+  copyright notice, this list of conditions and the
+  following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+  copyright notice, this list of conditions and the
+  following disclaimer in the documentation and/or other
+  materials provided with the distribution.
+
+* Neither the name of the assimp team, nor the names of its
+  contributors may be used to endorse or promote products
+  derived from this software without specific prior
+  written permission of the assimp team.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+---------------------------------------------------------------------------
+*/
+
+/** @file Exceptional.cpp
+
+Implementations of the exception classes.
+
+*/
+
+#include <assimp/Exceptional.h>
+#include <assimp/TinyFormatter.h>
+
+DeadlyErrorBase::DeadlyErrorBase(Assimp::Formatter::format f) :
+        runtime_error(std::string(f)){}
diff --git a/code/Common/Exporter.cpp b/code/Common/Exporter.cpp
index 58fc01d91..207b93fc7 100644
--- a/code/Common/Exporter.cpp
+++ b/code/Common/Exporter.cpp
@@ -74,9 +74,9 @@ Here we implement only the C++ interface (Assimp::Exporter).
 
 namespace Assimp {
 
-#ifdef _WIN32
-#    pragma warning( disable : 4800 ) 
-#endif // _WIN32
+#ifdef _MSC_VER
+#    pragma warning( disable : 4800 )
+#endif // _MSC_VER
 
 
 // PostStepRegistry.cpp
@@ -140,6 +140,8 @@ void ExportAssimp2Json(const char* , IOSystem*, const aiScene* , const Assimp::E
 #endif
 
 static void setupExporterArray(std::vector<Exporter::ExportFormatEntry> &exporters) {
+	(void)exporters;
+
 #ifndef ASSIMP_BUILD_NO_COLLADA_EXPORTER
 	exporters.push_back(Exporter::ExportFormatEntry("collada", "COLLADA - Digital Asset Exchange Schema", "dae", &ExportSceneCollada));
 #endif
@@ -179,11 +181,14 @@ static void setupExporterArray(std::vector<Exporter::ExportFormatEntry> &exporte
 			aiProcess_Triangulate | aiProcess_SortByPType | aiProcess_JoinIdenticalVertices));
 #endif
 
-#ifndef ASSIMP_BUILD_NO_GLTF_EXPORTER
+#if !defined(ASSIMP_BUILD_NO_GLTF_EXPORTER) && !defined(ASSIMP_BUILD_NO_GLTF2_EXPORTER)
 	exporters.push_back(Exporter::ExportFormatEntry("gltf2", "GL Transmission Format v. 2", "gltf", &ExportSceneGLTF2,
 			aiProcess_JoinIdenticalVertices | aiProcess_Triangulate | aiProcess_SortByPType));
 	exporters.push_back(Exporter::ExportFormatEntry("glb2", "GL Transmission Format v. 2 (binary)", "glb", &ExportSceneGLB2,
 			aiProcess_JoinIdenticalVertices | aiProcess_Triangulate | aiProcess_SortByPType));
+#endif
+
+#if !defined(ASSIMP_BUILD_NO_GLTF_EXPORTER) && !defined(ASSIMP_BUILD_NO_GLTF1_EXPORTER)
 	exporters.push_back(Exporter::ExportFormatEntry("gltf", "GL Transmission Format", "gltf", &ExportSceneGLTF,
 			aiProcess_JoinIdenticalVertices | aiProcess_Triangulate | aiProcess_SortByPType));
 	exporters.push_back(Exporter::ExportFormatEntry("glb", "GL Transmission Format (binary)", "glb", &ExportSceneGLB,
@@ -580,10 +585,23 @@ ExportProperties::ExportProperties(const ExportProperties &other)
 : mIntProperties(other.mIntProperties)
 , mFloatProperties(other.mFloatProperties)
 , mStringProperties(other.mStringProperties)
-, mMatrixProperties(other.mMatrixProperties) {
+, mMatrixProperties(other.mMatrixProperties)
+, mCallbackProperties(other.mCallbackProperties){
     // empty
 }
 
+bool ExportProperties::SetPropertyCallback(const char *szName, const std::function<void *(void *)> &f) {
+    return SetGenericProperty<std::function<void *(void *)>>(mCallbackProperties, szName, f);
+}
+
+std::function<void *(void *)> ExportProperties::GetPropertyCallback(const char *szName) const {
+    return GetGenericProperty<std::function<void *(void *)>>(mCallbackProperties, szName, 0);
+}
+
+bool ExportProperties::HasPropertyCallback(const char *szName) const {
+    return HasGenericProperty<std::function<void *(void *)>>(mCallbackProperties, szName);
+}
+
 // ------------------------------------------------------------------------------------------------
 // Set a configuration property
 bool ExportProperties::SetPropertyInteger(const char* szName, int iValue) {
diff --git a/code/Common/Importer.cpp b/code/Common/Importer.cpp
index a46d39b48..38eb63f40 100644
--- a/code/Common/Importer.cpp
+++ b/code/Common/Importer.cpp
@@ -387,6 +387,7 @@ void Importer::FreeScene( ) {
     pimpl->mScene = nullptr;
 
     pimpl->mErrorString = "";
+    pimpl->mException = std::exception_ptr();
     ASSIMP_END_EXCEPTION_REGION(void);
 }
 
@@ -399,6 +400,13 @@ const char* Importer::GetErrorString() const {
     return pimpl->mErrorString.c_str();
 }
 
+const std::exception_ptr& Importer::GetException() const {
+    ai_assert(nullptr != pimpl);
+    
+    // Must remain valid as long as ReadFile() or FreeFile() are not called
+    return pimpl->mException;
+}
+
 // ------------------------------------------------------------------------------------------------
 // Enable extra-verbose mode
 void Importer::SetExtraVerbose(bool bDo) {
@@ -426,6 +434,7 @@ aiScene* Importer::GetOrphanedScene() {
     pimpl->mScene = nullptr;
 
     pimpl->mErrorString = ""; // reset error string
+    pimpl->mException = std::exception_ptr();
     ASSIMP_END_EXCEPTION_REGION(aiScene*);
     
     return s;
@@ -502,7 +511,7 @@ const aiScene* Importer::ReadFileFromMemory( const void* pBuffer,
     ReadFile(fbuff,pFlags);
     SetIOHandler(io);
 
-    ASSIMP_END_EXCEPTION_REGION_WITH_ERROR_STRING(const aiScene*, pimpl->mErrorString);
+    ASSIMP_END_EXCEPTION_REGION_WITH_ERROR_STRING(const aiScene*, pimpl->mErrorString, pimpl->mException);
     return pimpl->mScene;
 }
 
@@ -515,46 +524,55 @@ void WriteLogOpening(const std::string& file) {
     // need to ask the authors of incoming bug reports for
     // the library version they're using - a log dump is
     // sufficient.
-    const unsigned int flags( aiGetCompileFlags() );
+    const unsigned int flags = aiGetCompileFlags();
     std::stringstream stream;
     stream << "Assimp " << aiGetVersionMajor() << "." << aiGetVersionMinor() << "." << aiGetVersionRevision() << " "
 #if defined(ASSIMP_BUILD_ARCHITECTURE)
-        << ASSIMP_BUILD_ARCHITECTURE
+           << ASSIMP_BUILD_ARCHITECTURE
 #elif defined(_M_IX86) || defined(__x86_32__) || defined(__i386__)
-        << "x86"
+           << "x86"
 #elif defined(_M_X64) || defined(__x86_64__)
-        << "amd64"
+           << "amd64"
 #elif defined(_M_IA64) || defined(__ia64__)
-        << "itanium"
+           << "itanium"
 #elif defined(__ppc__) || defined(__powerpc__)
-        << "ppc32"
+           << "ppc32"
 #elif defined(__powerpc64__)
-        << "ppc64"
+           << "ppc64"
 #elif defined(__arm__)
-        << "arm"
+           << "arm"
 #else
-        << "<unknown architecture>"
+           << "<unknown architecture>"
 #endif
-        << " "
+           << " "
 #if defined(ASSIMP_BUILD_COMPILER)
-        << ( ASSIMP_BUILD_COMPILER )
+           << (ASSIMP_BUILD_COMPILER)
 #elif defined(_MSC_VER)
-        << "msvc"
+           << "msvc"
 #elif defined(__GNUC__)
-        << "gcc"
+           << "gcc"
+#elif defined(__clang__)
+           << "clang"
+#elif defined(__EMSCRIPTEN__)
+           << "emscripten"
+#elif defined(__MINGW32__)
+           << "MinGW-w64 32bit"
+#elif defined(__MINGW64__)
+           << "MinGW-w64 64bit"
 #else
-        << "<unknown compiler>"
+           << "<unknown compiler>"
 #endif
 
 #ifdef ASSIMP_BUILD_DEBUG
-        << " debug"
+           << " debug"
 #endif
 
-        << (flags & ASSIMP_CFLAGS_NOBOOST ? " noboost" : "")
-        << (flags & ASSIMP_CFLAGS_SHARED  ? " shared" : "")
-        << (flags & ASSIMP_CFLAGS_SINGLETHREADED  ? " singlethreaded" : "");
+           << (flags & ASSIMP_CFLAGS_NOBOOST ? " noboost" : "")
+           << (flags & ASSIMP_CFLAGS_SHARED ? " shared" : "")
+           << (flags & ASSIMP_CFLAGS_SINGLETHREADED ? " singlethreaded" : "")
+           << (flags & ASSIMP_CFLAGS_DOUBLE_SUPPORT ? " double : " : "single : ");
 
-        ASSIMP_LOG_DEBUG(stream.str());
+    ASSIMP_LOG_DEBUG(stream.str());
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -700,6 +718,7 @@ const aiScene* Importer::ReadFile( const char* _pFile, unsigned int pFlags) {
         // if failed, extract the error string
         else if( !pimpl->mScene) {
             pimpl->mErrorString = imp->GetErrorText();
+            pimpl->mException = imp->GetException();
         }
 
         // clear any data allocated by post-process steps
@@ -724,7 +743,7 @@ const aiScene* Importer::ReadFile( const char* _pFile, unsigned int pFlags) {
 #endif // ! ASSIMP_CATCH_GLOBAL_EXCEPTIONS
 
     // either successful or failure - the pointer expresses it anyways
-    ASSIMP_END_EXCEPTION_REGION_WITH_ERROR_STRING(const aiScene*, pimpl->mErrorString);
+    ASSIMP_END_EXCEPTION_REGION_WITH_ERROR_STRING(const aiScene*, pimpl->mErrorString, pimpl->mException);
     
     return pimpl->mScene;
 }
@@ -1174,7 +1193,7 @@ void Importer::GetMemoryRequirements(aiMemoryInfo& in) const {
 
         // add all bone anims
         for (unsigned int a = 0; a < pc->mNumChannels; ++a) {
-            const aiNodeAnim* pc2 = pc->mChannels[i];
+            const aiNodeAnim* pc2 = pc->mChannels[a];
             in.animations += sizeof(aiNodeAnim);
             in.animations += pc2->mNumPositionKeys * sizeof(aiVectorKey);
             in.animations += pc2->mNumScalingKeys * sizeof(aiVectorKey);
diff --git a/code/Common/Importer.h b/code/Common/Importer.h
index eaf42e9c5..eb70bc38f 100644
--- a/code/Common/Importer.h
+++ b/code/Common/Importer.h
@@ -4,7 +4,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -97,9 +96,13 @@ public:
     /** The imported data, if ReadFile() was successful, nullptr otherwise. */
     aiScene* mScene;
 
-    /** The error description, if there was one. */
+    /** The error description, if there was one. In the case of an exception,
+     *  mException will carry the full details. */
     std::string mErrorString;
 
+    /** Any exception which occurred */
+    std::exception_ptr mException;
+
     /** List of integer properties */
     IntPropertyMap mIntProperties;
 
@@ -124,26 +127,26 @@ public:
 };
 
 inline
-ImporterPimpl::ImporterPimpl() AI_NO_EXCEPT
-: mIOHandler( nullptr )
-, mIsDefaultHandler( false )
-, mProgressHandler( nullptr )
-, mIsDefaultProgressHandler( false )
-, mImporter()
-, mPostProcessingSteps()
-, mScene( nullptr )
-, mErrorString()
-, mIntProperties()
-, mFloatProperties()
-, mStringProperties()
-, mMatrixProperties()
-, bExtraVerbose( false )
-, mPPShared( nullptr ) {
+ImporterPimpl::ImporterPimpl() AI_NO_EXCEPT :
+        mIOHandler( nullptr ),
+        mIsDefaultHandler( false ),
+        mProgressHandler( nullptr ),
+        mIsDefaultProgressHandler( false ),
+        mImporter(),
+        mPostProcessingSteps(),
+        mScene( nullptr ),
+        mErrorString(),
+        mException(),
+        mIntProperties(),
+        mFloatProperties(),
+        mStringProperties(),
+        mMatrixProperties(),
+        bExtraVerbose( false ),
+        mPPShared( nullptr ) {
     // empty
 }
 //! @endcond
 
-
 struct BatchData;
 
 // ---------------------------------------------------------------------------
@@ -154,17 +157,13 @@ struct BatchData;
  *  could, this has not yet been implemented at the moment).
  *
  *  @note The class may not be used by more than one thread*/
-class ASSIMP_API BatchLoader
-{
-    // friend of Importer
-
+class ASSIMP_API BatchLoader {
 public:
     //! @cond never
     // -------------------------------------------------------------------
     /** Wraps a full list of configuration properties for an importer.
      *  Properties can be set using SetGenericProperty */
-    struct PropertyMap
-    {
+    struct PropertyMap {
         ImporterPimpl::IntPropertyMap     ints;
         ImporterPimpl::FloatPropertyMap   floats;
         ImporterPimpl::StringPropertyMap  strings;
@@ -181,7 +180,6 @@ public:
     };
     //! @endcond
 
-public:
     // -------------------------------------------------------------------
     /** Construct a batch loader from a given IO system to be used
      *  to access external files 
diff --git a/code/Common/ImporterRegistry.cpp b/code/Common/ImporterRegistry.cpp
index da51696bc..c24f39a31 100644
--- a/code/Common/ImporterRegistry.cpp
+++ b/code/Common/ImporterRegistry.cpp
@@ -1,4 +1,4 @@
-/*
+/*
 ---------------------------------------------------------------------------
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
@@ -179,8 +179,10 @@ corresponding preprocessor flag to selectively disable formats.
 #ifndef ASSIMP_BUILD_NO_ASSBIN_IMPORTER
 #include "AssetLib/Assbin/AssbinLoader.h"
 #endif
-#ifndef ASSIMP_BUILD_NO_GLTF_IMPORTER
+#if !defined(ASSIMP_BUILD_NO_GLTF_IMPORTER) && !defined(ASSIMP_BUILD_NO_GLTF1_IMPORTER)
 #include "AssetLib/glTF/glTFImporter.h"
+#endif
+#if !defined(ASSIMP_BUILD_NO_GLTF_IMPORTER) && !defined(ASSIMP_BUILD_NO_GLTF2_IMPORTER)
 #include "AssetLib/glTF2/glTF2Importer.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_C4D_IMPORTER
@@ -339,8 +341,10 @@ void GetImporterInstanceList(std::vector<BaseImporter *> &out) {
 #if (!defined ASSIMP_BUILD_NO_ASSBIN_IMPORTER)
     out.push_back(new AssbinImporter());
 #endif
-#if (!defined ASSIMP_BUILD_NO_GLTF_IMPORTER)
+#if (!defined ASSIMP_BUILD_NO_GLTF_IMPORTER && !defined ASSIMP_BUILD_NO_GLTF1_IMPORTER)
     out.push_back(new glTFImporter());
+#endif
+#if (!defined ASSIMP_BUILD_NO_GLTF_IMPORTER && !defined ASSIMP_BUILD_NO_GLTF2_IMPORTER)
     out.push_back(new glTF2Importer());
 #endif
 #if (!defined ASSIMP_BUILD_NO_C4D_IMPORTER)
diff --git a/code/Common/SceneCombiner.cpp b/code/Common/SceneCombiner.cpp
index bfc4899a1..193586a7c 100644
--- a/code/Common/SceneCombiner.cpp
+++ b/code/Common/SceneCombiner.cpp
@@ -183,9 +183,10 @@ void SceneCombiner::MergeScenes(aiScene **_dest, std::vector<aiScene *> &src, un
             *_dest = src[0];
         return;
     }
-    if (*_dest)
+    if (*_dest) {
         (*_dest)->~aiScene();
-    else
+        new (*_dest) aiScene();
+    } else
         *_dest = new aiScene();
 
     // Create a dummy scene to serve as master for the others
diff --git a/code/Common/ScenePreprocessor.cpp b/code/Common/ScenePreprocessor.cpp
index 55aa04ad2..113ca7ff1 100644
--- a/code/Common/ScenePreprocessor.cpp
+++ b/code/Common/ScenePreprocessor.cpp
@@ -4,7 +4,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -52,8 +51,12 @@ void ScenePreprocessor::ProcessScene() {
     ai_assert(scene != nullptr);
 
     // Process all meshes
-    for (unsigned int i = 0; i < scene->mNumMeshes; ++i)
+    for (unsigned int i = 0; i < scene->mNumMeshes; ++i) {
+        if (nullptr == scene->mMeshes[i]) {
+            continue;
+        }
         ProcessMesh(scene->mMeshes[i]);
+    }
 
     // - nothing to do for nodes for the moment
     // - nothing to do for textures for the moment
@@ -61,8 +64,12 @@ void ScenePreprocessor::ProcessScene() {
     // - nothing to do for cameras for the moment
 
     // Process all animations
-    for (unsigned int i = 0; i < scene->mNumAnimations; ++i)
+    for (unsigned int i = 0; i < scene->mNumAnimations; ++i) {
+        if (nullptr == scene->mAnimations[i]) {
+            continue;
+        }
         ProcessAnimation(scene->mAnimations[i]);
+    }
 
     // Generate a default material if none was specified
     if (!scene->mNumMaterials && scene->mNumMeshes) {
@@ -96,8 +103,9 @@ void ScenePreprocessor::ProcessMesh(aiMesh *mesh) {
         if (!mesh->mTextureCoords[i]) {
             mesh->mNumUVComponents[i] = 0;
         } else {
-            if (!mesh->mNumUVComponents[i])
+            if (!mesh->mNumUVComponents[i]) {
                 mesh->mNumUVComponents[i] = 2;
+            }
 
             aiVector3D *p = mesh->mTextureCoords[i], *end = p + mesh->mNumVertices;
 
@@ -105,16 +113,19 @@ void ScenePreprocessor::ProcessMesh(aiMesh *mesh) {
             // as if they were 2D channels .. just in case an application doesn't handle
             // this case
             if (2 == mesh->mNumUVComponents[i]) {
-                for (; p != end; ++p)
+                for (; p != end; ++p) {
                     p->z = 0.f;
+                }
             } else if (1 == mesh->mNumUVComponents[i]) {
-                for (; p != end; ++p)
+                for (; p != end; ++p) {
                     p->z = p->y = 0.f;
+                }
             } else if (3 == mesh->mNumUVComponents[i]) {
                 // Really 3D coordinates? Check whether the third coordinate is != 0 for at least one element
                 for (; p != end; ++p) {
-                    if (p->z != 0)
+                    if (p->z != 0) {
                         break;
+                    }
                 }
                 if (p == end) {
                     ASSIMP_LOG_WARN("ScenePreprocessor: UVs are declared to be 3D but they're obviously not. Reverting to 2D.");
@@ -151,7 +162,6 @@ void ScenePreprocessor::ProcessMesh(aiMesh *mesh) {
 
     // If tangents and normals are given but no bitangents compute them
     if (mesh->mTangents && mesh->mNormals && !mesh->mBitangents) {
-
         mesh->mBitangents = new aiVector3D[mesh->mNumVertices];
         for (unsigned int i = 0; i < mesh->mNumVertices; ++i) {
             mesh->mBitangents[i] = mesh->mNormals[i] ^ mesh->mTangents[i];
@@ -165,11 +175,9 @@ void ScenePreprocessor::ProcessAnimation(aiAnimation *anim) {
     for (unsigned int i = 0; i < anim->mNumChannels; ++i) {
         aiNodeAnim *channel = anim->mChannels[i];
 
-        /*  If the exact duration of the animation is not given
-         *  compute it now.
-         */
+        //  If the exact duration of the animation is not given
+        //  compute it now.
         if (anim->mDuration == -1.) {
-
             // Position keys
             for (unsigned int j = 0; j < channel->mNumPositionKeys; ++j) {
                 aiVectorKey &key = channel->mPositionKeys[j];
@@ -192,11 +200,10 @@ void ScenePreprocessor::ProcessAnimation(aiAnimation *anim) {
             }
         }
 
-        /*  Check whether the animation channel has no rotation
-         *  or position tracks. In this case we generate a dummy
-         *  track from the information we have in the transformation
-         *  matrix of the corresponding node.
-         */
+        // Check whether the animation channel has no rotation
+        // or position tracks. In this case we generate a dummy
+        // track from the information we have in the transformation
+        // matrix of the corresponding node.
         if (!channel->mNumRotationKeys || !channel->mNumPositionKeys || !channel->mNumScalingKeys) {
             // Find the node that belongs to this animation
             aiNode *node = scene->mRootNode->FindNode(channel->mNodeName);
@@ -210,6 +217,10 @@ void ScenePreprocessor::ProcessAnimation(aiAnimation *anim) {
 
                 // No rotation keys? Generate a dummy track
                 if (!channel->mNumRotationKeys) {
+                    if (channel->mRotationKeys) {
+                        delete[] channel->mRotationKeys;
+                        channel->mRotationKeys = nullptr;
+                    }
                     ai_assert(!channel->mRotationKeys);
                     channel->mNumRotationKeys = 1;
                     channel->mRotationKeys = new aiQuatKey[1];
@@ -225,6 +236,10 @@ void ScenePreprocessor::ProcessAnimation(aiAnimation *anim) {
 
                 // No scaling keys? Generate a dummy track
                 if (!channel->mNumScalingKeys) {
+                    if (channel->mScalingKeys) {
+                        delete[] channel->mScalingKeys;
+                        channel->mScalingKeys = nullptr;
+                    }
                     ai_assert(!channel->mScalingKeys);
                     channel->mNumScalingKeys = 1;
                     channel->mScalingKeys = new aiVectorKey[1];
@@ -240,6 +255,10 @@ void ScenePreprocessor::ProcessAnimation(aiAnimation *anim) {
 
                 // No position keys? Generate a dummy track
                 if (!channel->mNumPositionKeys) {
+                    if (channel->mPositionKeys) {
+                        delete[] channel->mPositionKeys;
+                        channel->mPositionKeys = nullptr;
+                    }
                     ai_assert(!channel->mPositionKeys);
                     channel->mNumPositionKeys = 1;
                     channel->mPositionKeys = new aiVectorKey[1];
diff --git a/code/Common/SpatialSort.cpp b/code/Common/SpatialSort.cpp
index 86e22b242..88f06b618 100644
--- a/code/Common/SpatialSort.cpp
+++ b/code/Common/SpatialSort.cpp
@@ -208,13 +208,14 @@ BinFloat ToBinary(const ai_real &pValue) {
     // floating-point numbers are of sign-magnitude format, so find out what signed number
     //  representation we must convert negative values to.
     // See http://en.wikipedia.org/wiki/Signed_number_representations.
+    const BinFloat mask = BinFloat(1) << (CHAR_BIT * sizeof(BinFloat) - 1);
 
     // Two's complement?
-    const bool DefaultValue = ((-42 == (~42 + 1)) && (binValue & 0x80000000));
-    const bool OneComplement = ((-42 == ~42) && (binValue & 0x80000000));
+    const bool DefaultValue = ((-42 == (~42 + 1)) && (binValue & mask));
+    const bool OneComplement = ((-42 == ~42) && (binValue & mask));
 
     if (DefaultValue)
-        return BinFloat(1 << (CHAR_BIT * sizeof(BinFloat) - 1)) - binValue;
+        return mask - binValue;
     // One's complement?
     else if (OneComplement)
         return BinFloat(-0) - binValue;
diff --git a/code/Common/StandardShapes.cpp b/code/Common/StandardShapes.cpp
index b30fa2e25..99029a925 100644
--- a/code/Common/StandardShapes.cpp
+++ b/code/Common/StandardShapes.cpp
@@ -139,7 +139,7 @@ aiMesh *StandardShapes::MakeMesh(const std::vector<aiVector3D> &positions,
         aiFace &f = out->mFaces[i];
         f.mNumIndices = numIndices;
         f.mIndices = new unsigned int[numIndices];
-        for (unsigned int j = 0; i < numIndices; ++i, ++a) {
+        for (unsigned int j = 0; j < numIndices; ++j, ++a) {
             f.mIndices[j] = a;
         }
     }
diff --git a/code/Common/Subdivision.cpp b/code/Common/Subdivision.cpp
index b1f07c9f5..c60d2f0d3 100644
--- a/code/Common/Subdivision.cpp
+++ b/code/Common/Subdivision.cpp
@@ -53,9 +53,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 using namespace Assimp;
 void mydummy() {}
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 #pragma warning(disable : 4709)
-#endif // _WIN32
+#endif // _MSC_VER
 // ------------------------------------------------------------------------------------------------
 /** Subdivider stub class to implement the Catmull-Clarke subdivision algorithm. The
  *  implementation is basing on recursive refinement. Directly evaluating the result is also
diff --git a/code/Common/Version.cpp b/code/Common/Version.cpp
index 5698defbf..439e9aac7 100644
--- a/code/Common/Version.cpp
+++ b/code/Common/Version.cpp
@@ -40,7 +40,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ---------------------------------------------------------------------------
 */
 
-// Actually just a dummy, used by the compiler to build the precompiled header.
+// Actually just a dummy, used by the compiler to build the pre-compiled header.
 
 #include "ScenePrivate.h"
 #include <assimp/scene.h>
@@ -51,13 +51,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 // --------------------------------------------------------------------------------
 // Legal information string - don't remove this.
 static const char *LEGAL_INFORMATION =
-
         "Open Asset Import Library (Assimp).\n"
         "A free C/C++ library to import various 3D file formats into applications\n\n"
-
         "(c) 2006-2020, assimp team\n"
         "License under the terms and conditions of the 3-clause BSD license\n"
-        "http://assimp.org\n";
+        "https://www.assimp.org\n";
 
 // ------------------------------------------------------------------------------------------------
 // Get legal string
@@ -104,6 +102,9 @@ ASSIMP_API unsigned int aiGetCompileFlags() {
 #ifdef _STLPORT_VERSION
     flags |= ASSIMP_CFLAGS_STLPORT;
 #endif
+#ifdef ASSIMP_DOUBLE_PRECISION
+    flags |= ASSIMP_CFLAGS_DOUBLE_SUPPORT;
+#endif
 
     return flags;
 }
@@ -113,13 +114,29 @@ ASSIMP_API unsigned int aiGetVersionRevision() {
     return GitVersion;
 }
 
+// ------------------------------------------------------------------------------------------------
 ASSIMP_API const char *aiGetBranchName() {
     return GitBranch;
 }
 
 // ------------------------------------------------------------------------------------------------
 ASSIMP_API aiScene::aiScene() :
-        mFlags(0), mRootNode(nullptr), mNumMeshes(0), mMeshes(nullptr), mNumMaterials(0), mMaterials(nullptr), mNumAnimations(0), mAnimations(nullptr), mNumTextures(0), mTextures(nullptr), mNumLights(0), mLights(nullptr), mNumCameras(0), mCameras(nullptr), mMetaData(nullptr), mPrivate(new Assimp::ScenePrivateData()) {
+        mFlags(0),
+        mRootNode(nullptr),
+        mNumMeshes(0),
+        mMeshes(nullptr),
+        mNumMaterials(0),
+        mMaterials(nullptr),
+        mNumAnimations(0),
+        mAnimations(nullptr),
+        mNumTextures(0),
+        mTextures(nullptr),
+        mNumLights(0),
+        mLights(nullptr),
+        mNumCameras(0),
+        mCameras(nullptr),
+        mMetaData(nullptr),
+        mPrivate(new Assimp::ScenePrivateData()) {
     // empty
 }
 
diff --git a/code/Common/ZipArchiveIOSystem.cpp b/code/Common/ZipArchiveIOSystem.cpp
index f55f9ff53..e0c9ebd7a 100644
--- a/code/Common/ZipArchiveIOSystem.cpp
+++ b/code/Common/ZipArchiveIOSystem.cpp
@@ -146,23 +146,14 @@ int IOSystem2Unzip::testerror(voidpf /*opaque*/, voidpf /*stream*/) {
 zlib_filefunc_def IOSystem2Unzip::get(IOSystem *pIOHandler) {
     zlib_filefunc_def mapping;
 
-#ifdef ASSIMP_USE_HUNTER
     mapping.zopen_file = (open_file_func)open;
     mapping.zread_file = (read_file_func)read;
     mapping.zwrite_file = (write_file_func)write;
     mapping.ztell_file = (tell_file_func)tell;
     mapping.zseek_file = (seek_file_func)seek;
     mapping.zclose_file = (close_file_func)close;
-    mapping.zerror_file = (error_file_func)testerror;
-#else
-    mapping.zopen_file = open;
-    mapping.zread_file = read;
-    mapping.zwrite_file = write;
-    mapping.ztell_file = tell;
-    mapping.zseek_file = seek;
-    mapping.zclose_file = close;
     mapping.zerror_file = testerror;
-#endif
+
     mapping.opaque = reinterpret_cast<voidpf>(pIOHandler);
 
     return mapping;
@@ -226,10 +217,28 @@ ZipFile *ZipFileInfo::Extract(unzFile zip_handle) const {
 
     ZipFile *zip_file = new ZipFile(m_Size);
 
-    if (unzReadCurrentFile(zip_handle, zip_file->m_Buffer.get(), static_cast<unsigned int>(m_Size)) != static_cast<int>(m_Size)) {
-        // Failed, release the memory
-        delete zip_file;
-        zip_file = nullptr;
+    // Unzip has a limit of UINT16_MAX bytes buffer
+    uint16_t unzipBufferSize = zip_file->m_Size <= UINT16_MAX ? static_cast<uint16_t>(zip_file->m_Size) : UINT16_MAX;
+    std::unique_ptr<uint8_t[]> unzipBuffer = std::unique_ptr<uint8_t[]>(new uint8_t[unzipBufferSize]);
+    size_t readCount = 0;
+    while (readCount < zip_file->m_Size)
+    {
+        size_t bufferSize = zip_file->m_Size - readCount;
+        if (bufferSize > UINT16_MAX) {
+            bufferSize = UINT16_MAX;
+        }
+
+        int ret = unzReadCurrentFile(zip_handle, unzipBuffer.get(), static_cast<unsigned int>(bufferSize));
+        if (ret != static_cast<int>(bufferSize))
+        {
+            // Failed, release the memory
+            delete zip_file;
+            zip_file = nullptr;
+            break;
+        }
+
+        std::memcpy(zip_file->m_Buffer.get() + readCount, unzipBuffer.get(), ret);
+        readCount += ret;
     }
 
     ai_assert(unzCloseCurrentFile(zip_handle) == UNZ_OK);
@@ -335,7 +344,7 @@ ZipArchiveIOSystem::Implement::Implement(IOSystem *pIOHandler, const char *pFile
     if (pFilename[0] == 0 || nullptr == pMode) {
         return;
     }
-    
+
     zlib_filefunc_def mapping = IOSystem2Unzip::get(pIOHandler);
     m_ZipFileHandle = unzOpen2(pFilename, &mapping);
 }
diff --git a/code/Material/MaterialSystem.cpp b/code/Material/MaterialSystem.cpp
index e83ab97af..ae1748eb8 100644
--- a/code/Material/MaterialSystem.cpp
+++ b/code/Material/MaterialSystem.cpp
@@ -402,7 +402,7 @@ aiMaterial::~aiMaterial() {
 }
 
 // ------------------------------------------------------------------------------------------------
-aiString aiMaterial::GetName() {
+aiString aiMaterial::GetName() const {
     aiString name;
     Get(AI_MATKEY_NAME, name);
 
diff --git a/code/PostProcessing/ArmaturePopulate.cpp b/code/PostProcessing/ArmaturePopulate.cpp
index 97feca31c..48dcecb15 100644
--- a/code/PostProcessing/ArmaturePopulate.cpp
+++ b/code/PostProcessing/ArmaturePopulate.cpp
@@ -168,7 +168,6 @@ void ArmaturePopulate::BuildBoneStack(aiNode *,
                                       const std::vector<aiBone *> &bones,
                                       std::map<aiBone *, aiNode *> &bone_stack,
                                   std::vector<aiNode *> &node_stack) {
-    ai_assert(scene);
     ai_assert(root_node);
     ai_assert(!node_stack.empty());
 
diff --git a/code/PostProcessing/FindDegenerates.cpp b/code/PostProcessing/FindDegenerates.cpp
index e5defdeb0..364a75308 100644
--- a/code/PostProcessing/FindDegenerates.cpp
+++ b/code/PostProcessing/FindDegenerates.cpp
@@ -5,8 +5,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -45,25 +43,23 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Implementation of the FindDegenerates post-process step.
 */
 
-
-
-// internal headers
 #include "ProcessHelper.h"
 #include "FindDegenerates.h"
+
 #include <assimp/Exceptional.h>
 
+#include <unordered_map>
+
 using namespace Assimp;
 
-//remove mesh at position 'index' from the scene
-static void removeMesh(aiScene* pScene, unsigned const index);
-//correct node indices to meshes and remove references to deleted mesh
-static void updateSceneGraph(aiNode* pNode, unsigned const index);
+// Correct node indices to meshes and remove references to deleted mesh
+static void updateSceneGraph(aiNode* pNode, const std::unordered_map<unsigned int, unsigned int>& meshMap);
 
 // ------------------------------------------------------------------------------------------------
 // Constructor to be privately used by Importer
-FindDegeneratesProcess::FindDegeneratesProcess()
-: mConfigRemoveDegenerates( false )
-, mConfigCheckAreaOfTriangle( false ){
+FindDegeneratesProcess::FindDegeneratesProcess() :
+        mConfigRemoveDegenerates( false ),
+        mConfigCheckAreaOfTriangle( false ){
     // empty
 }
 
@@ -91,50 +87,50 @@ void FindDegeneratesProcess::SetupProperties(const Importer* pImp) {
 // Executes the post processing step on the given imported data.
 void FindDegeneratesProcess::Execute( aiScene* pScene) {
     ASSIMP_LOG_DEBUG("FindDegeneratesProcess begin");
-    for (unsigned int i = 0; i < pScene->mNumMeshes;++i)
-    {
-        //Do not process point cloud, ExecuteOnMesh works only with faces data
+    if ( nullptr == pScene) {
+        return;
+    }
+    
+    std::unordered_map<unsigned int, unsigned int> meshMap;
+    meshMap.reserve(pScene->mNumMeshes);
+
+    const unsigned int originalNumMeshes = pScene->mNumMeshes;
+    unsigned int targetIndex = 0;
+    for (unsigned int i = 0; i < pScene->mNumMeshes; ++i) {
+        // Do not process point cloud, ExecuteOnMesh works only with faces data
         if ((pScene->mMeshes[i]->mPrimitiveTypes != aiPrimitiveType::aiPrimitiveType_POINT) && ExecuteOnMesh(pScene->mMeshes[i])) {
-            removeMesh(pScene, i);
-            --i; //the current i is removed, do not skip the next one
+            delete pScene->mMeshes[i];
+            // Not strictly required, but clean:
+            pScene->mMeshes[i] = nullptr;
+        } else {
+            meshMap[i] = targetIndex;
+            pScene->mMeshes[targetIndex] = pScene->mMeshes[i];
+            ++targetIndex;
         }
     }
+    pScene->mNumMeshes = targetIndex;
+
+    if (meshMap.size() < originalNumMeshes) {
+        updateSceneGraph(pScene->mRootNode, meshMap);
+    }
+
     ASSIMP_LOG_DEBUG("FindDegeneratesProcess finished");
 }
 
-static void removeMesh(aiScene* pScene, unsigned const index) {
-    //we start at index and copy the pointers one position forward
-    //save the mesh pointer to delete it later
-    auto delete_me = pScene->mMeshes[index];
-    for (unsigned i = index; i < pScene->mNumMeshes - 1; ++i) {
-        pScene->mMeshes[i] = pScene->mMeshes[i+1];
-    }
-    pScene->mMeshes[pScene->mNumMeshes - 1] = nullptr;
-    --(pScene->mNumMeshes);
-    delete delete_me;
-
-    //removing a mesh also requires updating all references to it in the scene graph
-    updateSceneGraph(pScene->mRootNode, index);
-}
-
-static void updateSceneGraph(aiNode* pNode, unsigned const index) {
+static void updateSceneGraph(aiNode* pNode, const std::unordered_map<unsigned int, unsigned int>& meshMap) {
+    unsigned int targetIndex = 0;
     for (unsigned i = 0; i < pNode->mNumMeshes; ++i) {
-        if (pNode->mMeshes[i] > index) {
-            --(pNode->mMeshes[i]);
-            continue;
-        }
-        if (pNode->mMeshes[i] == index) {
-            for (unsigned j = i; j < pNode->mNumMeshes -1; ++j) {
-                pNode->mMeshes[j] = pNode->mMeshes[j+1];
-            }
-            --(pNode->mNumMeshes);
-            --i;
-            continue;
+        const unsigned int sourceMeshIndex = pNode->mMeshes[i];
+        auto it = meshMap.find(sourceMeshIndex);
+        if (it != meshMap.end()) {
+            pNode->mMeshes[targetIndex] = it->second;
+            ++targetIndex;
         }
     }
+    pNode->mNumMeshes = targetIndex;
     //recurse to all children
     for (unsigned i = 0; i < pNode->mNumChildren; ++i) {
-        updateSceneGraph(pNode->mChildren[i], index);
+        updateSceneGraph(pNode->mChildren[i], meshMap);
     }
 }
 
diff --git a/code/PostProcessing/ProcessHelper.h b/code/PostProcessing/ProcessHelper.h
index 660555ef0..8520b21ec 100644
--- a/code/PostProcessing/ProcessHelper.h
+++ b/code/PostProcessing/ProcessHelper.h
@@ -222,7 +222,7 @@ template <>
 struct MinMaxChooser<aiVertexWeight> {
     void operator()(aiVertexWeight &min, aiVertexWeight &max) {
         MinMaxChooser<unsigned int>()(min.mVertexId, max.mVertexId);
-        MinMaxChooser<float>()(min.mWeight, max.mWeight);
+        MinMaxChooser<ai_real>()(min.mWeight, max.mWeight);
     }
 };
 
diff --git a/code/PostProcessing/SortByPTypeProcess.cpp b/code/PostProcessing/SortByPTypeProcess.cpp
index c4f9c7e4d..332d9d7ef 100644
--- a/code/PostProcessing/SortByPTypeProcess.cpp
+++ b/code/PostProcessing/SortByPTypeProcess.cpp
@@ -243,6 +243,45 @@ void SortByPTypeProcess::Execute(aiScene *pScene) {
                 }
             }
 
+            if (mesh->mNumAnimMeshes > 0 && mesh->mAnimMeshes) {
+                out->mNumAnimMeshes = mesh->mNumAnimMeshes;
+                out->mAnimMeshes = new aiAnimMesh *[out->mNumAnimMeshes];
+            }
+
+            for (unsigned int j = 0; j < mesh->mNumAnimMeshes; ++j) {
+                aiAnimMesh *animMesh = mesh->mAnimMeshes[j];
+                aiAnimMesh *outAnimMesh = out->mAnimMeshes[j] = new aiAnimMesh;
+                outAnimMesh->mNumVertices = out->mNumVertices;
+                if (animMesh->mVertices)
+                    outAnimMesh->mVertices = new aiVector3D[out->mNumVertices];
+                else
+                    outAnimMesh->mVertices = nullptr;
+                if (animMesh->mNormals)
+                    outAnimMesh->mNormals = new aiVector3D[out->mNumVertices];
+                else
+                    outAnimMesh->mNormals = nullptr;
+                if (animMesh->mTangents)
+                    outAnimMesh->mTangents = new aiVector3D[out->mNumVertices];
+                else
+                    outAnimMesh->mTangents = nullptr;
+                if (animMesh->mBitangents)
+                    outAnimMesh->mBitangents = new aiVector3D[out->mNumVertices];
+                else
+                    outAnimMesh->mBitangents = nullptr;
+                for (int jj = 0; jj < AI_MAX_NUMBER_OF_COLOR_SETS; ++jj) {
+                    if (animMesh->mColors[jj])
+                        outAnimMesh->mColors[jj] = new aiColor4D[out->mNumVertices];
+                    else
+                        outAnimMesh->mColors[jj] = nullptr;
+                }
+                for (int jj = 0; jj < AI_MAX_NUMBER_OF_TEXTURECOORDS; ++jj) {
+                    if (animMesh->mTextureCoords[jj])
+                        outAnimMesh->mTextureCoords[jj] = new aiVector3D[out->mNumVertices];
+                    else
+                        outAnimMesh->mTextureCoords[jj] = nullptr;
+                }
+            }
+
             typedef std::vector<aiVertexWeight> TempBoneInfo;
             std::vector<TempBoneInfo> tempBones(mesh->mNumBones);
 
@@ -252,6 +291,7 @@ void SortByPTypeProcess::Execute(aiScene *pScene) {
             }
 
             unsigned int outIdx = 0;
+            unsigned int amIdx = 0; // AnimMesh index
             for (unsigned int m = 0; m < mesh->mNumFaces; ++m) {
                 aiFace &in = mesh->mFaces[m];
                 if ((real == 3 && in.mNumIndices <= 3) || (real != 3 && in.mNumIndices != real + 1)) {
@@ -293,6 +333,30 @@ void SortByPTypeProcess::Execute(aiScene *pScene) {
                         *cols[pp]++ = mesh->mColors[pp][idx];
                     }
 
+                    unsigned int pp = 0;
+                    for (; pp < mesh->mNumAnimMeshes; ++pp) {
+                        aiAnimMesh *animMesh = mesh->mAnimMeshes[pp];
+                        aiAnimMesh *outAnimMesh = out->mAnimMeshes[pp];
+                        if (animMesh->mVertices)
+                            outAnimMesh->mVertices[amIdx] = animMesh->mVertices[idx];
+                        if (animMesh->mNormals)
+                            outAnimMesh->mNormals[amIdx] = animMesh->mNormals[idx];
+                        if (animMesh->mTangents)
+                            outAnimMesh->mTangents[amIdx] = animMesh->mTangents[idx];
+                        if (animMesh->mBitangents)
+                            outAnimMesh->mBitangents[amIdx] = animMesh->mBitangents[idx];
+                        for (int jj = 0; jj < AI_MAX_NUMBER_OF_COLOR_SETS; ++jj) {
+                            if (animMesh->mColors[jj])
+                                outAnimMesh->mColors[jj][amIdx] = animMesh->mColors[jj][idx];
+                        }
+                        for (int jj = 0; jj < AI_MAX_NUMBER_OF_TEXTURECOORDS; ++jj) {
+                            if (animMesh->mTextureCoords[jj])
+                                outAnimMesh->mTextureCoords[jj][amIdx] = animMesh->mTextureCoords[jj][idx];
+                        }
+                    }
+                    if (pp == mesh->mNumAnimMeshes)
+                        amIdx++;
+
                     in.mIndices[q] = outIdx++;
                 }
 
diff --git a/code/PostProcessing/SplitByBoneCountProcess.cpp b/code/PostProcessing/SplitByBoneCountProcess.cpp
index 1fd26c757..b39444859 100644
--- a/code/PostProcessing/SplitByBoneCountProcess.cpp
+++ b/code/PostProcessing/SplitByBoneCountProcess.cpp
@@ -408,6 +408,45 @@ void SplitByBoneCountProcess::SplitMesh( const aiMesh* pMesh, std::vector<aiMesh
             }
         }
 
+        // ... and copy all the morph targets for all the vertices which made it into the new submesh
+        if (pMesh->mNumAnimMeshes > 0) {
+            newMesh->mNumAnimMeshes = pMesh->mNumAnimMeshes;
+            newMesh->mAnimMeshes = new aiAnimMesh*[newMesh->mNumAnimMeshes];
+            
+            for (unsigned int morphIdx = 0; morphIdx < newMesh->mNumAnimMeshes; ++morphIdx) {
+                aiAnimMesh* origTarget = pMesh->mAnimMeshes[morphIdx];
+                aiAnimMesh* newTarget = new aiAnimMesh;
+                newTarget->mName = origTarget->mName;
+                newTarget->mWeight = origTarget->mWeight;
+                newTarget->mNumVertices = numSubMeshVertices;
+                newTarget->mVertices = new aiVector3D[numSubMeshVertices];
+                newMesh->mAnimMeshes[morphIdx] = newTarget;
+                
+                if (origTarget->HasNormals()) {
+                    newTarget->mNormals = new aiVector3D[numSubMeshVertices];
+                }
+                
+                if (origTarget->HasTangentsAndBitangents()) {
+                    newTarget->mTangents = new aiVector3D[numSubMeshVertices];
+                    newTarget->mBitangents = new aiVector3D[numSubMeshVertices];
+                }
+                
+                for( unsigned int vi = 0; vi < numSubMeshVertices; ++vi) {
+                    // find the source vertex for it in the source mesh
+                    unsigned int previousIndex = previousVertexIndices[vi];
+                    newTarget->mVertices[vi] = origTarget->mVertices[previousIndex];
+
+                    if (newTarget->HasNormals()) {
+                        newTarget->mNormals[vi] = origTarget->mNormals[previousIndex];
+                    }
+                    if (newTarget->HasTangentsAndBitangents()) {
+                        newTarget->mTangents[vi] = origTarget->mTangents[previousIndex];
+                        newTarget->mBitangents[vi] = origTarget->mBitangents[previousIndex];
+                    }
+                }
+            }
+        }
+
         // I have the strange feeling that this will break apart at some point in time...
     }
 }
diff --git a/code/PostProcessing/TriangulateProcess.cpp b/code/PostProcessing/TriangulateProcess.cpp
index 8035b34f4..ebd35c997 100644
--- a/code/PostProcessing/TriangulateProcess.cpp
+++ b/code/PostProcessing/TriangulateProcess.cpp
@@ -64,6 +64,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "Common/PolyTools.h"
 
 #include <memory>
+#include <cstdint>
 
 //#define AI_BUILD_TRIANGULATE_COLOR_FACE_WINDING
 //#define AI_BUILD_TRIANGULATE_DEBUG_POLYS
@@ -141,7 +142,7 @@ bool TriangulateProcess::TriangulateMesh( aiMesh* pMesh)
     }
 
     // Find out how many output faces we'll get
-    unsigned int numOut = 0, max_out = 0;
+    uint32_t numOut = 0, max_out = 0;
     bool get_normals = true;
     for( unsigned int a = 0; a < pMesh->mNumFaces; a++) {
         aiFace& face = pMesh->mFaces[a];
diff --git a/code/PostProcessing/ValidateDataStructure.cpp b/code/PostProcessing/ValidateDataStructure.cpp
index a288e397d..e7392d9e5 100644
--- a/code/PostProcessing/ValidateDataStructure.cpp
+++ b/code/PostProcessing/ValidateDataStructure.cpp
@@ -85,7 +85,7 @@ AI_WONT_RETURN void ValidateDSProcess::ReportError(const char *msg, ...) {
 
     va_end(args);
 
-    throw DeadlyImportError("Validation failed: " + std::string(szBuffer, iLen));
+    throw DeadlyImportError("Validation failed: ", std::string(szBuffer, iLen));
 }
 // ------------------------------------------------------------------------------------------------
 void ValidateDSProcess::ReportWarning(const char *msg, ...) {
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
deleted file mode 100644
index f1d023bec..000000000
--- a/contrib/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# Compile internal irrXML only if system is not requested
-if( NOT ASSIMP_SYSTEM_IRRXML )
-    add_subdirectory(irrXML)
-endif()
diff --git a/contrib/Open3DGC/o3dgcArithmeticCodec.cpp b/contrib/Open3DGC/o3dgcArithmeticCodec.cpp
index 3597ec39a..2ae70fa2e 100644
--- a/contrib/Open3DGC/o3dgcArithmeticCodec.cpp
+++ b/contrib/Open3DGC/o3dgcArithmeticCodec.cpp
@@ -522,8 +522,7 @@ namespace o3dgc
 
       buffer_size = max_code_bytes;                           // assign new memory
       delete [] new_buffer;                   // free anything previously assigned
-      if ((new_buffer = new unsigned char[buffer_size+16]) == 0) // 16 extra bytes
-        AC_Error("cannot assign memory for compressed data buffer");
+      new_buffer = new unsigned char[buffer_size+16];        // 16 extra bytes
       code_buffer = new_buffer;                  // set buffer for compressed data
     }
 
@@ -732,7 +731,6 @@ namespace o3dgc
           table_size = table_shift = 0;
           distribution = new unsigned[data_symbols];
         }
-        if (distribution == 0) AC_Error("cannot assign model memory");
       }
                                  // compute cumulative distribution, decoder table
       unsigned s = 0;
@@ -803,7 +801,6 @@ namespace o3dgc
           distribution = new unsigned[2*data_symbols];
         }
         symbol_count = distribution + data_symbols;
-        if (distribution == 0) AC_Error("cannot assign model memory");
       }
 
       reset();                                                 // initialize model
diff --git a/contrib/Open3DGC/o3dgcSC3DMCDecoder.inl b/contrib/Open3DGC/o3dgcSC3DMCDecoder.inl
index c965fcd50..8bd85f27b 100644
--- a/contrib/Open3DGC/o3dgcSC3DMCDecoder.inl
+++ b/contrib/Open3DGC/o3dgcSC3DMCDecoder.inl
@@ -27,10 +27,10 @@ THE SOFTWARE.
 #include "o3dgcArithmeticCodec.h"
 #include "o3dgcTimer.h"
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 #    pragma warning(push)
 #    pragma warning( disable : 4456)
-#endif // _WIN32
+#endif // _MSC_VER
 
 //#define DEBUG_VERBOSE
 
@@ -852,9 +852,9 @@ namespace o3dgc
     }
 } // namespace o3dgc
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 #    pragma warning( pop )
-#endif // _WIN32
+#endif // _MSC_VER
 
 #endif // O3DGC_SC3DMC_DECODER_INL
 
diff --git a/contrib/Open3DGC/o3dgcSC3DMCEncoder.inl b/contrib/Open3DGC/o3dgcSC3DMCEncoder.inl
index 78d4b3e78..ca1e0ea76 100644
--- a/contrib/Open3DGC/o3dgcSC3DMCEncoder.inl
+++ b/contrib/Open3DGC/o3dgcSC3DMCEncoder.inl
@@ -32,10 +32,10 @@ THE SOFTWARE.
 
 //#define DEBUG_VERBOSE
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 #    pragma warning(push)
 #    pragma warning(disable : 4456)
-#endif // _WIN32
+#endif // _MSC_VER
 
 namespace o3dgc
 {
@@ -927,9 +927,9 @@ namespace o3dgc
     }
 } // namespace o3dgc
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 #    pragma warning(pop)
-#endif // _WIN32
+#endif // _MSC_VER
 
 #endif // O3DGC_SC3DMC_ENCODER_INL
 
diff --git a/contrib/Open3DGC/o3dgcTimer.h b/contrib/Open3DGC/o3dgcTimer.h
index d9a285968..f5ed0c83f 100644
--- a/contrib/Open3DGC/o3dgcTimer.h
+++ b/contrib/Open3DGC/o3dgcTimer.h
@@ -28,7 +28,9 @@ THE SOFTWARE.
 
 #ifdef _WIN32
 /* Thank you, Microsoft, for file WinDef.h with min/max redefinition. */
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include <windows.h>
 #elif __APPLE__
 #include <mach/clock.h>
diff --git a/contrib/Open3DGC/o3dgcVector.inl b/contrib/Open3DGC/o3dgcVector.inl
index 5549b00ce..de8dfd5f1 100644
--- a/contrib/Open3DGC/o3dgcVector.inl
+++ b/contrib/Open3DGC/o3dgcVector.inl
@@ -175,7 +175,7 @@ namespace o3dgc
         m_data[2] = rhs.m_data[2];
     }
     template <typename T>
-    inline Vec3<T>::~Vec3(void){};
+    inline Vec3<T>::~Vec3(void){}
 
     template <typename T>
     inline Vec3<T>::Vec3() {}
@@ -308,7 +308,7 @@ namespace o3dgc
         m_data[1] = rhs.m_data[1];
     }
     template <typename T>
-    inline Vec2<T>::~Vec2(void){};
+    inline Vec2<T>::~Vec2(void){}
 
     template <typename T>
     inline Vec2<T>::Vec2() {}
diff --git a/contrib/gtest/include/gtest/internal/gtest-port.h b/contrib/gtest/include/gtest/internal/gtest-port.h
index 0094ed507..f66d9cd32 100644
--- a/contrib/gtest/include/gtest/internal/gtest-port.h
+++ b/contrib/gtest/include/gtest/internal/gtest-port.h
@@ -312,10 +312,22 @@
     __pragma(warning(disable: warnings))
 # define GTEST_DISABLE_MSC_WARNINGS_POP_()          \
     __pragma(warning(pop))
+# if defined(__clang__)
+#  define GTEST_DISABLE_CLANG_DEPRECATED_WARNINGS_PUSH_() \
+      _Pragma("clang diagnostic push") \
+      _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"")
+#  define GTEST_DISABLE_CLANG_WARNINGS_POP_() \
+      _Pragma("clang diagnostic pop")
+# else
+#  define GTEST_DISABLE_CLANG_DEPRECATED_WARNINGS_PUSH_()
+#  define GTEST_DISABLE_CLANG_WARNINGS_POP_()
+# endif
 #else
 // Older versions of MSVC don't have __pragma.
 # define GTEST_DISABLE_MSC_WARNINGS_PUSH_(warnings)
 # define GTEST_DISABLE_MSC_WARNINGS_POP_()
+# define GTEST_DISABLE_CLANG_DEPRECATED_WARNINGS_PUSH_()
+# define GTEST_DISABLE_CLANG_WARNINGS_POP_()
 #endif
 
 #ifndef GTEST_LANG_CXX11
@@ -2352,6 +2364,7 @@ inline bool IsDir(const StatStruct& st) { return S_ISDIR(st.st_mode); }
 // Functions deprecated by MSVC 8.0.
 
 GTEST_DISABLE_MSC_WARNINGS_PUSH_(4996 /* deprecated function */)
+GTEST_DISABLE_CLANG_DEPRECATED_WARNINGS_PUSH_()
 
 inline const char* StrNCpy(char* dest, const char* src, size_t n) {
   return strncpy(dest, src, n);
@@ -2399,6 +2412,7 @@ inline const char* GetEnv(const char* name) {
 #endif
 }
 
+GTEST_DISABLE_CLANG_WARNINGS_POP_()
 GTEST_DISABLE_MSC_WARNINGS_POP_()
 
 #if GTEST_OS_WINDOWS_MOBILE
diff --git a/contrib/gtest/src/gtest-port.cc b/contrib/gtest/src/gtest-port.cc
index e5bf3dd2b..e04aa9a57 100644
--- a/contrib/gtest/src/gtest-port.cc
+++ b/contrib/gtest/src/gtest-port.cc
@@ -926,7 +926,7 @@ GTestLog::~GTestLog() {
 // Disable Microsoft deprecation warnings for POSIX functions called from
 // this class (creat, dup, dup2, and close)
 GTEST_DISABLE_MSC_WARNINGS_PUSH_(4996)
-
+GTEST_DISABLE_CLANG_DEPRECATED_WARNINGS_PUSH_()
 #if GTEST_HAS_STREAM_REDIRECTION
 
 // Object that captures an output stream (stdout/stderr).
@@ -1010,6 +1010,7 @@ class CapturedStream {
 };
 
 GTEST_DISABLE_MSC_WARNINGS_POP_()
+GTEST_DISABLE_CLANG_WARNINGS_POP_()
 
 static CapturedStream* g_captured_stderr = NULL;
 static CapturedStream* g_captured_stdout = NULL;
diff --git a/contrib/irrXML/CMakeLists.txt b/contrib/irrXML/CMakeLists.txt
deleted file mode 100644
index 29f11a506..000000000
--- a/contrib/irrXML/CMakeLists.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-set( IrrXML_SRCS
-  CXMLReaderImpl.h
-  heapsort.h
-  irrArray.h
-  irrString.h
-  irrTypes.h
-  irrXML.cpp
-  irrXML.h
-)
-
-if ( MSVC )
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4127")
-  ADD_DEFINITIONS( -D_SCL_SECURE_NO_WARNINGS )
-  ADD_DEFINITIONS( -D_CRT_SECURE_NO_WARNINGS )
-endif ( MSVC )
-
-IF(CMAKE_SYSTEM_NAME MATCHES "(Darwin|FreeBSD)")
-  IF(APPLE)
-    add_library(IrrXML STATIC ${IrrXML_SRCS})
-  ELSE()
-    add_library(IrrXML ${IrrXML_SRCS})
-  ENDIF()
-ELSE()
-  add_library(IrrXML STATIC ${IrrXML_SRCS})
-ENDIF()
-set(IRRXML_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" CACHE INTERNAL "IrrXML_Include" )
-set(IRRXML_LIBRARY "IrrXML" CACHE INTERNAL "IrrXML" )
-
-install(TARGETS IrrXML
-  LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
-  ARCHIVE DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
-  RUNTIME DESTINATION ${ASSIMP_BIN_INSTALL_DIR}
-  FRAMEWORK DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
-  COMPONENT ${LIBASSIMP_COMPONENT})
diff --git a/contrib/irrXML/CXMLReaderImpl.h b/contrib/irrXML/CXMLReaderImpl.h
deleted file mode 100644
index 63349b0cc..000000000
--- a/contrib/irrXML/CXMLReaderImpl.h
+++ /dev/null
@@ -1,806 +0,0 @@
-// Copyright (C) 2002-2005 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine" and the "irrXML" project.
-// For conditions of distribution and use, see copyright notice in irrlicht.h and/or irrXML.h
-
-#ifndef __ICXML_READER_IMPL_H_INCLUDED__
-#define __ICXML_READER_IMPL_H_INCLUDED__
-
-#include "irrXML.h"
-#include "irrString.h"
-#include "irrArray.h"
-#include "fast_atof.h"
-
-#ifdef _DEBUG
-#define IRR_DEBUGPRINT(x) printf((x));
-#else // _DEBUG 
-#define IRR_DEBUGPRINT(x)
-#endif // _DEBUG
-
-
-namespace irr
-{
-namespace io
-{
-
-
-//! implementation of the IrrXMLReader
-template<class char_type, class superclass>
-class CXMLReaderImpl : public IIrrXMLReader<char_type, superclass>
-{
-public:
-	//! Constructor
-	CXMLReaderImpl(IFileReadCallBack* callback, bool deleteCallBack = true) 
-	: TextData(0)
-	, P(0)
-	, TextBegin(0)
-	, TextSize(0)
-	, CurrentNodeType(EXN_NONE)
-	, SourceFormat(ETF_ASCII)
-	, TargetFormat(ETF_ASCII)
-	, NodeName ()
-	, EmptyString()
-	, IsEmptyElement(false)
-	, SpecialCharacters()
-	, Attributes() {
-		if (!callback) {
-			return;
-		}
-
-		storeTargetFormat();
-
-		// read whole xml file
-
-		readFile(callback);
-		
-		// clean up
-
-		if (deleteCallBack)
-			delete callback;
-
-		// create list with special characters
-
-		createSpecialCharacterList();
-
-		// set pointer to text begin
-		P = TextBegin;
-	}
-    	
-
-	//! Destructor
-	virtual ~CXMLReaderImpl()
-	{
-		delete [] TextData;
-	}
-
-
-	//! Reads forward to the next xml node. 
-	//! \return Returns false, if there was no further node. 
-	virtual bool read()
-	{
-		// if not end reached, parse the node
-		if (P && (unsigned int)(P - TextBegin) < TextSize - 1 && *P != 0)
-		{
-			parseCurrentNode();
-			return true;
-		}
-
-		_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
-		return false;
-	}
-
-
-	//! Returns the type of the current XML node.
-	virtual EXML_NODE getNodeType() const
-	{
-		return CurrentNodeType;
-	}
-
-
-	//! Returns attribute count of the current XML node.
-	virtual int getAttributeCount() const
-	{
-		return Attributes.size();
-	}
-
-
-	//! Returns name of an attribute.
-	virtual const char_type* getAttributeName(int idx) const
-	{
-		if (idx < 0 || idx >= (int)Attributes.size())
-			return 0;
-
-		return Attributes[idx].Name.c_str();
-	}
-
-
-	//! Returns the value of an attribute. 
-	virtual const char_type* getAttributeValue(int idx) const
-	{
-		if (idx < 0 || idx >= (int)Attributes.size())
-			return 0;
-
-		return Attributes[idx].Value.c_str();
-	}
-
-
-	//! Returns the value of an attribute. 
-	virtual const char_type* getAttributeValue(const char_type* name) const
-	{
-		const SAttribute* attr = getAttributeByName(name);
-		if (!attr)
-			return 0;
-
-		return attr->Value.c_str();
-	}
-
-
-	//! Returns the value of an attribute
-	virtual const char_type* getAttributeValueSafe(const char_type* name) const
-	{
-		const SAttribute* attr = getAttributeByName(name);
-		if (!attr)
-			return EmptyString.c_str();
-
-		return attr->Value.c_str();
-	}
-
-
-
-	//! Returns the value of an attribute as integer. 
-	int getAttributeValueAsInt(const char_type* name) const
-	{
-		return (int)getAttributeValueAsFloat(name);
-	}
-
-
-	//! Returns the value of an attribute as integer. 
-	int getAttributeValueAsInt(int idx) const
-	{
-		return (int)getAttributeValueAsFloat(idx);
-	}
-
-
-	//! Returns the value of an attribute as float. 
-	float getAttributeValueAsFloat(const char_type* name) const
-	{
-		const SAttribute* attr = getAttributeByName(name);
-		if (!attr)
-			return 0;
-
-		core::stringc c = attr->Value.c_str();
-		return core::fast_atof(c.c_str());
-	}
-
-
-	//! Returns the value of an attribute as float. 
-	float getAttributeValueAsFloat(int idx) const
-	{
-		const char_type* attrvalue = getAttributeValue(idx);
-		if (!attrvalue)
-			return 0;
-
-		core::stringc c = attrvalue;
-		return core::fast_atof(c.c_str());
-	}
-
-
-	//! Returns the name of the current node.
-	virtual const char_type* getNodeName() const
-	{
-		return NodeName.c_str();
-	}
-
-
-	//! Returns data of the current node.
-	virtual const char_type* getNodeData() const
-	{
-		return NodeName.c_str();
-	}
-
-
-	//! Returns if an element is an empty element, like <foo />
-	virtual bool isEmptyElement() const
-	{
-		return IsEmptyElement;
-	}
-
-	//! Returns format of the source xml file.
-	virtual ETEXT_FORMAT getSourceFormat() const
-	{
-		return SourceFormat;
-	}
-
-	//! Returns format of the strings returned by the parser.
-	virtual ETEXT_FORMAT getParserFormat() const
-	{
-		return TargetFormat;
-	}
-
-private:
-
-	// Reads the current xml node
-	void parseCurrentNode()
-	{
-		char_type* start = P;
-
-		// more forward until '<' found
-		while(*P != L'<' && *P)
-			++P;
-
-		if (!*P)
-			return;
-
-		if (P - start > 0)
-		{
-			// we found some text, store it
-			if (setText(start, P))
-				return;
-		}
-
-		++P;
-
-		// based on current token, parse and report next element
-		switch(*P)
-		{
-		case L'/':
-			parseClosingXMLElement(); 
-			break;
-		case L'?':
-			ignoreDefinition();	
-			break;
-		case L'!':
-			if (!parseCDATA())
-				parseComment();	
-			break;
-		default:
-			parseOpeningXMLElement();
-			break;
-		}
-	}
-
-
-	//! sets the state that text was found. Returns true if set should be set
-	bool setText(char_type* start, char_type* end)
-	{
-		// check if text is more than 2 characters, and if not, check if there is 
-		// only white space, so that this text won't be reported
-		if (end - start < 3)
-		{
-			char_type* p = start;
-			for(; p != end; ++p)
-				if (!isWhiteSpace(*p))
-					break;
-
-			if (p == end)
-				return false;
-		}
-
-		// set current text to the parsed text, and replace xml special characters
-		core::string<char_type> s(start, (int)(end - start));
-		NodeName = replaceSpecialCharacters(s);
-
-		// current XML node type is text
-		CurrentNodeType = EXN_TEXT;
-
-		return true;
-	}
-
-
-
-	//! ignores an xml definition like <?xml something />
-	void ignoreDefinition()
-	{
-		CurrentNodeType = EXN_UNKNOWN;
-
-		// move until end marked with '>' reached
-		while(*P != L'>')
-			++P;
-
-		++P;
-	}
-
-
-	//! parses a comment
-	void parseComment()
-	{
-		CurrentNodeType = EXN_COMMENT;
-		P += 1;
-
-		char_type *pCommentBegin = P;
-
-		int count = 1;
-
-		// move until end of comment reached
-		while(count)
-		{
-			if (*P == L'>')
-				--count;
-			else
-			if (*P == L'<')
-				++count;
-
-			++P;
-		}
-
-		P -= 3;
-		NodeName = core::string<char_type>(pCommentBegin+2, (int)(P - pCommentBegin-2));
-		P += 3;
-	}
-
-
-	//! parses an opening xml element and reads attributes
-	void parseOpeningXMLElement()
-	{
-		CurrentNodeType = EXN_ELEMENT;
-		IsEmptyElement = false;
-		Attributes.clear();
-
-		// find name
-		const char_type* startName = P;
-
-		// find end of element
-		while(*P != L'>' && !isWhiteSpace(*P))
-			++P;
-
-		const char_type* endName = P;
-
-		// find Attributes
-		while(*P != L'>')
-		{
-			if (isWhiteSpace(*P))
-				++P;
-			else
-			{
-				if (*P != L'/')
-				{
-					// we've got an attribute
-
-					// read the attribute names
-					const char_type* attributeNameBegin = P;
-
-					while(!isWhiteSpace(*P) && *P != L'=')
-						++P;
-
-					const char_type* attributeNameEnd = P;
-					++P;
-
-					// read the attribute value
-					// check for quotes and single quotes, thx to murphy
-					while( (*P != L'\"') && (*P != L'\'') && *P) 
-						++P;
-
-					if (!*P) // malformatted xml file
-						return;
-
-					const char_type attributeQuoteChar = *P;
-
-					++P;
-					const char_type* attributeValueBegin = P;
-					
-					while(*P != attributeQuoteChar && *P)
-						++P;
-
-					if (!*P) // malformatted xml file
-						return;
-
-					const char_type* attributeValueEnd = P;
-					++P;
-
-					SAttribute attr;
-					attr.Name = core::string<char_type>(attributeNameBegin, 
-						(int)(attributeNameEnd - attributeNameBegin));
-
-					core::string<char_type> s(attributeValueBegin, 
-						(int)(attributeValueEnd - attributeValueBegin));
-
-					attr.Value = replaceSpecialCharacters(s);
-					Attributes.push_back(attr);
-				}
-				else
-				{
-					// tag is closed directly
-					++P;
-					IsEmptyElement = true;
-					break;
-				}
-			}
-		}
-
-		// check if this tag is closing directly
-		if (endName > startName && *(endName-1) == L'/')
-		{
-			// directly closing tag
-			IsEmptyElement = true;
-			endName--;
-		}
-		
-		NodeName = core::string<char_type>(startName, (int)(endName - startName));
-
-		++P;
-	}
-
-
-	//! parses an closing xml tag
-	void parseClosingXMLElement()
-	{
-		CurrentNodeType = EXN_ELEMENT_END;
-		IsEmptyElement = false;
-		Attributes.clear();
-
-		++P;
-		const char_type* pBeginClose = P;
-
-		while(*P != L'>')
-			++P;
-
-		NodeName = core::string<char_type>(pBeginClose, (int)(P - pBeginClose));
-		++P;
-	}
-
-	//! parses a possible CDATA section, returns false if begin was not a CDATA section
-	bool parseCDATA()
-	{
-		if (*(P+1) != L'[')
-			return false;
-
-		CurrentNodeType = EXN_CDATA;
-
-		// skip '<![CDATA['
-		int count=0;
-		while( *P && count<8 )
-		{
-			++P;
-			++count;
-		}
-
-		if (!*P)
-			return true;
-
-		char_type *cDataBegin = P;
-		char_type *cDataEnd = 0;
-
-		// find end of CDATA
-		while(*P && !cDataEnd)
-		{
-			if (*P == L'>' && 
-			   (*(P-1) == L']') &&
-			   (*(P-2) == L']'))
-			{
-				cDataEnd = P - 2;
-			}
-
-			++P;
-		}
-
-		if ( cDataEnd )
-			NodeName = core::string<char_type>(cDataBegin, (int)(cDataEnd - cDataBegin));
-		else
-			NodeName = "";
-
-		return true;
-	}
-
-
-	// structure for storing attribute-name pairs
-	struct SAttribute
-	{
-		core::string<char_type> Name;
-		core::string<char_type> Value;
-	};
-
-	// finds a current attribute by name, returns 0 if not found
-	const SAttribute* getAttributeByName(const char_type* name) const
-	{
-		if (!name)
-			return 0;
-
-		core::string<char_type> n = name;
-
-		for (int i=0; i<(int)Attributes.size(); ++i)
-			if (Attributes[i].Name == n)
-				return &Attributes[i];
-
-		return 0;
-	}
-
-	// replaces xml special characters in a string and creates a new one
-	core::string<char_type> replaceSpecialCharacters(
-		core::string<char_type>& origstr)
-	{
-		int pos = origstr.findFirst(L'&');
-		int oldPos = 0;
-
-		if (pos == -1)
-			return origstr;
-
-		core::string<char_type> newstr;
-
-		while(pos != -1 && pos < origstr.size()-2)
-		{
-			// check if it is one of the special characters
-
-			int specialChar = -1;
-			for (int i=0; i<(int)SpecialCharacters.size(); ++i)
-			{
-				const char_type* p = &origstr.c_str()[pos]+1;
-
-				if (equalsn(&SpecialCharacters[i][1], p, SpecialCharacters[i].size()-1))
-				{
-					specialChar = i;
-					break;
-				}
-			}
-
-			if (specialChar != -1)
-			{
-				newstr.append(origstr.subString(oldPos, pos - oldPos));
-				newstr.append(SpecialCharacters[specialChar][0]);
-				pos += SpecialCharacters[specialChar].size();
-			}
-			else
-			{
-				newstr.append(origstr.subString(oldPos, pos - oldPos + 1));
-				pos += 1;
-			}
-
-			// find next &
-			oldPos = pos;
-			pos = origstr.findNext(L'&', pos);		
-		}
-
-		if (oldPos < origstr.size()-1)
-			newstr.append(origstr.subString(oldPos, origstr.size()-oldPos));
-
-		return newstr;
-	}
-
-
-
-	//! reads the xml file and converts it into the wanted character format.
-	bool readFile(IFileReadCallBack* callback)
-	{
-		int size = callback->getSize();		
-		size += 4; // We need two terminating 0's at the end.
-		           // For ASCII we need 1 0's, for UTF-16 2, for UTF-32 4.
-
-		char* data8 = new char[size];
-
-		if (!callback->read(data8, size-4))
-		{
-			delete [] data8;
-			return false;
-		}
-
-		// add zeros at end
-
-		data8[size-1] = 0;
-		data8[size-2] = 0;
-		data8[size-3] = 0;
-		data8[size-4] = 0;
-
-		char16* data16 = reinterpret_cast<char16*>(data8);
-		char32* data32 = reinterpret_cast<char32*>(data8);	
-
-		// now we need to convert the data to the desired target format
-		// based on the byte order mark.
-
-		const unsigned char UTF8[] = {0xEF, 0xBB, 0xBF}; // 0xEFBBBF;
-		const int UTF16_BE = 0xFFFE;
-		const int UTF16_LE = 0xFEFF;
-		const int UTF32_BE = 0xFFFE0000;
-		const int UTF32_LE = 0x0000FEFF;
-
-		// check source for all utf versions and convert to target data format
-		
-		if (size >= 4 && data32[0] == (char32)UTF32_BE)
-		{
-			// UTF-32, big endian
-			SourceFormat = ETF_UTF32_BE;
-			convertTextData(data32+1, data8, (size/4)); // data32+1 because we need to skip the header
-		}
-		else
-		if (size >= 4 && data32[0] == (char32)UTF32_LE)
-		{
-			// UTF-32, little endian
-			SourceFormat = ETF_UTF32_LE;
-			convertTextData(data32+1, data8, (size/4)); // data32+1 because we need to skip the header
-		}
-		else
-		if (size >= 2 && data16[0] == UTF16_BE)
-		{
-			// UTF-16, big endian
-			SourceFormat = ETF_UTF16_BE;
-			convertTextData(data16+1, data8, (size/2)); // data16+1 because we need to skip the header
-		}
-		else
-		if (size >= 2 && data16[0] == UTF16_LE)
-		{
-			// UTF-16, little endian
-			SourceFormat = ETF_UTF16_LE;
-			convertTextData(data16+1, data8, (size/2)); // data16+1 because we need to skip the header
-		}
-		else
-		if (size >= 3 && data8[0] == UTF8[0] && data8[1] == UTF8[1] && data8[2] == UTF8[2])
-		{
-			// UTF-8
-			SourceFormat = ETF_UTF8;
-			convertTextData(data8+3, data8, size); // data8+3 because we need to skip the header
-		}
-		else
-		{
-			// ASCII
-			SourceFormat = ETF_ASCII;
-			convertTextData(data8, data8, size);
-		}
-
-		return true;
-	}
-
-
-	//! converts the text file into the desired format.
-	//! \param source: begin of the text (without byte order mark)
-	//! \param pointerToStore: pointer to text data block which can be
-	//! stored or deleted based on the nesessary conversion.
-	//! \param sizeWithoutHeader: Text size in characters without header
-	template<class src_char_type>
-	void convertTextData(src_char_type* source, char* pointerToStore, int sizeWithoutHeader)
-	{
-		// convert little to big endian if necessary
-		if (sizeof(src_char_type) > 1 && 
-			isLittleEndian(TargetFormat) != isLittleEndian(SourceFormat))
-			convertToLittleEndian(source);
-
-		// check if conversion is necessary:
-		if (sizeof(src_char_type) == sizeof(char_type))
-		{
-			// no need to convert
-			TextBegin = (char_type*)source;
-			TextData = (char_type*)pointerToStore;
-			TextSize = sizeWithoutHeader;
-		}
-		else
-		{
-			// convert source into target data format. 
-			// TODO: implement a real conversion. This one just 
-			// copies bytes. This is a problem when there are 
-			// unicode symbols using more than one character.
-
-			TextData = new char_type[sizeWithoutHeader];
-
-			for (int i=0; i<sizeWithoutHeader; ++i)
-				TextData[i] = (char_type)source[i];
-
-			TextBegin = TextData;
-			TextSize = sizeWithoutHeader;
-
-			// delete original data because no longer needed
-			delete [] pointerToStore;
-		}
-	}
-
-	//! converts whole text buffer to little endian
-	template<class src_char_type>
-	void convertToLittleEndian(src_char_type* t)
-	{
-		if (sizeof(src_char_type) == 4) 
-		{
-			// 32 bit
-
-			while(*t)
-			{
-				*t = ((*t & 0xff000000) >> 24) |
-				     ((*t & 0x00ff0000) >> 8)  |
-				     ((*t & 0x0000ff00) << 8)  |
-				     ((*t & 0x000000ff) << 24);
-				++t;
-			}
-		}
-		else
-		{
-			// 16 bit 
-
-			while(*t)
-			{
-				*t = (*t >> 8) | (*t << 8);
-				++t;
-			}
-		}
-	}
-
-	//! returns if a format is little endian
-	inline bool isLittleEndian(ETEXT_FORMAT f)
-	{
-		return f == ETF_ASCII ||
-		       f == ETF_UTF8 ||
-		       f == ETF_UTF16_LE ||
-		       f == ETF_UTF32_LE;
-	}
-
-
-	//! returns true if a character is whitespace
-	inline bool isWhiteSpace(char_type c)
-	{
-		return (c==' ' || c=='\t' || c=='\n' || c=='\r');
-	}
-
-
-	//! generates a list with xml special characters
-	void createSpecialCharacterList()
-	{
-		// list of strings containing special symbols, 
-		// the first character is the special character,
-		// the following is the symbol string without trailing &.
-
-		SpecialCharacters.push_back("&amp;");
-		SpecialCharacters.push_back("<lt;");
-		SpecialCharacters.push_back(">gt;");
-		SpecialCharacters.push_back("\"quot;");
-		SpecialCharacters.push_back("'apos;");
-		
-	}
-
-
-	//! compares the first n characters of the strings
-	bool equalsn(const char_type* str1, const char_type* str2, int len)
-	{
-		int i;
-		for(i=0; str1[i] && str2[i] && i < len; ++i)
-			if (str1[i] != str2[i])
-				return false;
-
-		// if one (or both) of the strings was smaller then they
-		// are only equal if they have the same lenght
-		return (i == len) || (str1[i] == 0 && str2[i] == 0);
-	}
-
-
-	//! stores the target text format
-	void storeTargetFormat()
-	{
-		// get target format. We could have done this using template specialization,
-		// but VisualStudio 6 don't like it and we want to support it.
-
-		switch(sizeof(char_type))
-		{
-		case 1: 
-			TargetFormat = ETF_UTF8;
-			break;
-		case 2: 
-			TargetFormat = ETF_UTF16_LE;
-			break;
-		case 4: 
-			TargetFormat = ETF_UTF32_LE;
-			break;
-		default:
-			TargetFormat = ETF_ASCII; // should never happen.
-		}
-	}
-
-
-	// instance variables:
-
-	char_type* TextData;         // data block of the text file
-	char_type* P;                // current point in text to parse
-	char_type* TextBegin;        // start of text to parse
-	unsigned int TextSize;       // size of text to parse in characters, not bytes
-
-	EXML_NODE CurrentNodeType;   // type of the currently parsed node
-	ETEXT_FORMAT SourceFormat;   // source format of the xml file
-	ETEXT_FORMAT TargetFormat;   // output format of this parser
-
-	core::string<char_type> NodeName;    // name of the node currently in
-	core::string<char_type> EmptyString; // empty string to be returned by getSafe() methods
-
-	bool IsEmptyElement;       // is the currently parsed node empty?
-
-	core::array< core::string<char_type> > SpecialCharacters; // see createSpecialCharacterList()
-
-	core::array<SAttribute> Attributes; // attributes of current element
-	
-}; // end CXMLReaderImpl
-
-
-} // end namespace
-} // end namespace
-
-#endif
diff --git a/contrib/irrXML/heapsort.h b/contrib/irrXML/heapsort.h
deleted file mode 100644
index d0db319d0..000000000
--- a/contrib/irrXML/heapsort.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright (C) 2002-2005 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __IRR_HEAPSORT_H_INCLUDED__
-#define __IRR_HEAPSORT_H_INCLUDED__
-
-#include "irrTypes.h"
-
-namespace irr
-{
-namespace core
-{
-
-//! Sinks an element into the heap.
-template<class T>
-inline void heapsink(T*array, s32 element, s32 max)
-{
-	while ((element<<1) < max)	// there is a left child
-	{
-		s32 j = (element<<1);
-	
-		if (j+1 < max && array[j] < array[j+1])
-			j = j+1;							// take right child
-
-		if (array[element] < array[j])
-		{
-			T t = array[j];						// swap elements
-			array[j] = array[element];
-			array[element] = t;
-			element = j;
-		}
-		else
-			return;
-	}
-}
-
-
-//! Sorts an array with size 'size' using heapsort.
-template<class T>
-inline void heapsort(T* array_, s32 size)
-{
-	// for heapsink we pretent this is not c++, where
-	// arrays start with index 0. So we decrease the array pointer,
-	// the maximum always +2 and the element always +1
-
-	T* virtualArray = array_ - 1;
-	s32 virtualSize = size + 2;
-	s32 i;
-
-	// build heap
-
-	for (i=((size-1)/2); i>=0; --i)	
-		heapsink(virtualArray, i+1, virtualSize-1);
-
-	// sort array
-
-	for (i=size-1; i>=0; --i)	
-	{
-		T t = array_[0];
-		array_[0] = array_[i];
-		array_[i] = t;
-		heapsink(virtualArray, 1, i + 1);
-	}
-}
-
-} // end namespace core
-} // end namespace irr
-
-
-
-#endif
-
diff --git a/contrib/irrXML/irrArray.h b/contrib/irrXML/irrArray.h
deleted file mode 100644
index 40c822590..000000000
--- a/contrib/irrXML/irrArray.h
+++ /dev/null
@@ -1,444 +0,0 @@
-// Copyright (C) 2002-2005 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine" and the "irrXML" project.
-// For conditions of distribution and use, see copyright notice in irrlicht.h and irrXML.h
-
-#ifndef __IRR_ARRAY_H_INCLUDED__
-#define __IRR_ARRAY_H_INCLUDED__
-
-#include "irrTypes.h"
-#include "heapsort.h"
-
-namespace irr
-{
-namespace core
-{
-
-//!	Self reallocating template array (like stl vector) with additional features.
-/** Some features are: Heap sorting, binary search methods, easier debugging.
-*/
-template <class T>
-class array
-{
-
-public:
-
-	array()
-		: data(0), allocated(0), used(0),
-			free_when_destroyed(true), is_sorted(true)
-	{
-	}
-
-	//! Constructs a array and allocates an initial chunk of memory.
-	//! \param start_count: Amount of elements to allocate.
-	array(u32 start_count)
-		: data(0), allocated(0), used(0),
-			free_when_destroyed(true),	is_sorted(true)
-	{
-		reallocate(start_count);
-	}
-
-
-	//! Copy constructor
-	array(const array<T>& other)
-		: data(0)
-	{
-		*this = other;
-	}
-
-
-
-	//! Destructor. Frees allocated memory, if set_free_when_destroyed
-	//! was not set to false by the user before.
-	~array()
-	{
-		if (free_when_destroyed)
-			delete [] data;
-	}
-
-
-
-	//! Reallocates the array, make it bigger or smaller.
-	//! \param new_size: New size of array.
-	void reallocate(u32 new_size)
-	{
-		T* old_data = data;
-
-		data = new T[new_size];
-		allocated = new_size;
-		
-		s32 end = used < new_size ? used : new_size;
-		for (s32 i=0; i<end; ++i)
-			data[i] = old_data[i];
-
-		if (allocated < used)
-			used = allocated;
-		
-		delete [] old_data;
-	}
-
-	//! Adds an element at back of array. If the array is to small to 
-	//! add this new element, the array is made bigger.
-	//! \param element: Element to add at the back of the array.
-	void push_back(const T& element)
-	{
-		if (used + 1 > allocated)
-		{
-			// reallocate(used * 2 +1);
-			// this doesn't work if the element is in the same array. So
-			// we'll copy the element first to be sure we'll get no data
-			// corruption
-
-			T e;
-			e = element;           // copy element
-			reallocate(used * 2 +1); // increase data block
-			data[used++] = e;        // push_back
-			is_sorted = false; 
-			return;
-		}
-
-		data[used++] = element;
-		is_sorted = false;
-	}
-
-
-	//! Adds an element at the front of the array. If the array is to small to 
-	//! add this new element, the array is made bigger. Please note that this
-	//! is slow, because the whole array needs to be copied for this.
-	//! \param element: Element to add at the back of the array.
-	void push_front(const T& element)
-	{
-		if (used + 1 > allocated)
-			reallocate(used * 2 +1);
-
-		for (int i=(int)used; i>0; --i)
-			data[i] = data[i-1];
-
-		data[0] = element;
-		is_sorted = false;
-		++used;
-	}
-
-	
-	//! Insert item into array at specified position. Please use this
-	//! only if you know what you are doing (possible performance loss). 
-	//! The preferred method of adding elements should be push_back().
-	//! \param element: Element to be inserted
-	//! \param index: Where position to insert the new element.
-	void insert(const T& element, u32 index=0) 
-	{
-		_IRR_DEBUG_BREAK_IF(index>used) // access violation
-
-		if (used + 1 > allocated)
-			reallocate(used * 2 +1);
-
-		for (u32 i=used++; i>index; i--) 
-			data[i] = data[i-1];
-
-		data[index] = element;
-		is_sorted = false;
-	}
-
-
-
-
-	//! Clears the array and deletes all allocated memory.
-	void clear()
-	{
-		delete [] data;
-		data = 0;
-		used = 0;
-		allocated = 0;
-		is_sorted = true;
-	}
-
-
-
-	//! Sets pointer to new array, using this as new workspace.
-	//! \param newPointer: Pointer to new array of elements.
-	//! \param size: Size of the new array.
-	void set_pointer(T* newPointer, u32 size)
-	{
-		delete [] data;
-		data = newPointer;
-		allocated = size;
-		used = size;
-		is_sorted = false;
-	}
-
-
-
-	//! Sets if the array should delete the memory it used.
-	//! \param f: If true, the array frees the allocated memory in its
-	//! destructor, otherwise not. The default is true.
-	void set_free_when_destroyed(bool f)
-	{
-		free_when_destroyed = f;
-	}
-
-
-
-	//! Sets the size of the array.
-	//! \param usedNow: Amount of elements now used.
-	void set_used(u32 usedNow)
-	{
-		if (allocated < usedNow)
-			reallocate(usedNow);
-
-		used = usedNow;
-	}
-
-
-
-	//! Assignement operator
-	void operator=(const array<T>& other)
-	{
-		if (data)
-			delete [] data;
-
-		//if (allocated < other.allocated)
-		if (other.allocated == 0)
-			data = 0;
-		else
-			data = new T[other.allocated];
-
-		used = other.used;
-		free_when_destroyed = other.free_when_destroyed;
-		is_sorted = other.is_sorted;
-		allocated = other.allocated;
-
-		for (u32 i=0; i<other.used; ++i)
-			data[i] = other.data[i];
-	}
-
-
-	//! Direct access operator
-	T& operator [](u32 index)
-	{
-		_IRR_DEBUG_BREAK_IF(index>=used) // access violation
-
-		return data[index];
-	}
-
-
-
-	//! Direct access operator
-	const T& operator [](u32 index) const
-	{
-		_IRR_DEBUG_BREAK_IF(index>=used) // access violation
-
-		return data[index];
-	}
-
-    //! Gets last frame
-	const T& getLast() const
-	{
-		_IRR_DEBUG_BREAK_IF(!used) // access violation
-
-		return data[used-1];
-	}
-
-    //! Gets last frame
-	T& getLast()
-	{
-		_IRR_DEBUG_BREAK_IF(!used) // access violation
-
-		return data[used-1];
-	}
-    
-
-	//! Returns a pointer to the array.
-	//! \return Pointer to the array.
-	T* pointer()
-	{
-		return data;
-	}
-
-
-
-	//! Returns a const pointer to the array.
-	//! \return Pointer to the array.
-	const T* const_pointer() const
-	{
-		return data;
-	}
-
-
-
-	//! Returns size of used array.
-	//! \return Size of elements in the array.
-	u32 size() const
-	{
-		return used;
-	}
-
-
-
-	//! Returns amount memory allocated.
-	//! \return Returns amount of memory allocated. The amount of bytes
-	//! allocated would  be allocated_size() * sizeof(ElementsUsed);
-	u32 allocated_size() const
-	{
-		return allocated;
-	}
-
-
-
-	//! Returns true if array is empty
-	//! \return True if the array is empty, false if not.
-	bool empty() const
-	{
-		return used == 0;
-	}
-
-
-
-	//! Sorts the array using heapsort. There is no additional memory waste and
-	//! the algorithm performs (O) n log n in worst case.
-	void sort()
-	{
-		if (is_sorted || used<2)
-			return;
-
-		heapsort(data, used);
-		is_sorted = true;
-	}
-
-
-
-	//! Performs a binary search for an element, returns -1 if not found.
-	//! The array will be sorted before the binary search if it is not
-	//! already sorted.
-	//! \param element: Element to search for.
-	//! \return Returns position of the searched element if it was found,
-	//! otherwise -1 is returned.
-	s32 binary_search(const T& element)
-	{
-		return binary_search(element, 0, used-1);
-	}
-
-
-
-	//! Performs a binary search for an element, returns -1 if not found.
-	//! The array will be sorted before the binary search if it is not
-	//! already sorted.
-	//! \param element: Element to search for.
-	//! \param left: First left index
-	//! \param right: Last right index.
-	//! \return Returns position of the searched element if it was found,
-	//! otherwise -1 is returned.
-	s32 binary_search(const T& element, s32 left, s32 right)
-	{
-		if (!used)
-			return -1;
-
-		sort();
-
-		s32 m;
-
-		do
-		{
-			m = (left+right)>>1;
-
-			if (element < data[m])
-				right = m - 1;
-			else
-				left = m + 1;
-
-		} while((element < data[m] || data[m] < element) && left<=right);
-
-		// this last line equals to:
-		// " while((element != array[m]) && left<=right);"
-		// but we only want to use the '<' operator.
-		// the same in next line, it is "(element == array[m])"
-
-		if (!(element < data[m]) && !(data[m] < element))
-			return m;
-
-		return -1;
-	}
-
-
-	//! Finds an element in linear time, which is very slow. Use
-	//! binary_search for faster finding. Only works if =operator is implemented.
-	//! \param element: Element to search for.
-	//! \return Returns position of the searched element if it was found,
-	//! otherwise -1 is returned.
-	s32 linear_search(T& element)
-	{
-		for (u32 i=0; i<used; ++i)
-			if (!(element < data[i]) && !(data[i] < element))
-				return (s32)i;
-
-		return -1;
-	}
-
-
-	//! Finds an element in linear time, which is very slow. Use
-	//! binary_search for faster finding. Only works if =operator is implemented.
-	//! \param element: Element to search for.
-	//! \return Returns position of the searched element if it was found,
-	//! otherwise -1 is returned.
-	s32 linear_reverse_search(T& element)
-	{
-		for (s32 i=used-1; i>=0; --i)
-			if (data[i] == element)
-				return (s32)i;
-
-		return -1;
-	}
-
-
-
-	//! Erases an element from the array. May be slow, because all elements 
-	//! following after the erased element have to be copied.
-	//! \param index: Index of element to be erased.
-	void erase(u32 index)
-	{
-		_IRR_DEBUG_BREAK_IF(index>=used || index<0) // access violation
-
-		for (u32 i=index+1; i<used; ++i)
-			data[i-1] = data[i];
-
-		--used;
-	}
-
-
-	//! Erases some elements from the array. may be slow, because all elements 
-	//! following after the erased element have to be copied.
-	//! \param index: Index of the first element to be erased.
-	//! \param count: Amount of elements to be erased.
-	void erase(u32 index, s32 count)
-	{
-		_IRR_DEBUG_BREAK_IF(index>=used || index<0 || count<1 || index+count>used) // access violation
-
-		for (u32 i=index+count; i<used; ++i)
-			data[i-count] = data[i];
-
-		used-= count;
-	}
-
-
-	//! Sets if the array is sorted
-	void set_sorted(bool _is_sorted)
-	{
-		is_sorted = _is_sorted;
-	}
-
-			
-	private:
-
-		T* data;
-		u32 allocated;
-		u32 used;
-		bool free_when_destroyed;
-		bool is_sorted;
-};
-
-
-} // end namespace core
-} // end namespace irr
-
-
-
-#endif
-
diff --git a/contrib/irrXML/irrString.h b/contrib/irrXML/irrString.h
deleted file mode 100644
index 246348891..000000000
--- a/contrib/irrXML/irrString.h
+++ /dev/null
@@ -1,661 +0,0 @@
-// Copyright (C) 2002-2005 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine" and the "irrXML" project.
-// For conditions of distribution and use, see copyright notice in irrlicht.h and irrXML.h
-
-#ifndef __IRR_STRING_H_INCLUDED__
-#define __IRR_STRING_H_INCLUDED__
-
-#include "irrTypes.h"
-
-namespace irr
-{
-namespace core
-{
-
-//!	Very simple string class with some useful features.
-/**	string<c8> and string<wchar_t> work both with unicode AND ascii,
-so you can assign unicode to string<c8> and ascii to string<wchar_t> 
-(and the other way round) if your ever would want to. 
-Note that the conversation between both is not done using an encoding.
-
-Known bugs:
-Special characters like 'Ä', 'Ü' and 'Ö' are ignored in the
-methods make_upper, make_lower and equals_ignore_case.
-*/
-template <class T>
-class string
-{
-public:
-
-	//! Default constructor
-	string()
-	: array(0), allocated(1), used(1) 
-	{
-		array = new T[1];
-		array[0] = 0x0;
-	}
-
-
-
-	//! Constructor
-	string(const string<T>& other)
-	:  array(0), allocated(0), used(0)
-	{
-		*this = other;
-	}
-
-
-	//! Constructs a string from an int
-	string(int number)
-	: array(0), allocated(0), used(0) 
-	{
-		// store if negative and make positive
-
-		bool negative = false;
-		if (number < 0)
-		{
-			number *= -1;
-			negative = true;
-		}
-
-		// temporary buffer for 16 numbers
-
-		c8 tmpbuf[16];
-		tmpbuf[15] = 0;
-		s32 idx = 15;	
-
-		// special case '0'
-
-		if (!number) 
-		{
-			tmpbuf[14] = '0';
-			*this = &tmpbuf[14];
-			return;
-		}
-
-		// add numbers
-
-		while(number && idx)
-		{
-			idx--;	
-			tmpbuf[idx] = (c8)('0' + (number % 10));
-			number = number / 10;					
-		}
-
-		// add sign
-
-		if (negative)
-		{
-			idx--;
-			tmpbuf[idx] = '-';			
-		}
-
-		*this = &tmpbuf[idx];
-	}
-
-
-
-	//! Constructor for copying a string from a pointer with a given lenght
-	template <class B>
-	string(const B* c, s32 lenght)
-	: array(0), allocated(0), used(0)
-	{
-		if (!c)
-			return;
-
-        allocated = used = lenght+1;
-		array = new T[used];
-
-		for (s32 l = 0; l<lenght; ++l)
-			array[l] = (T)c[l];
-
-		array[lenght] = 0;
-	}
-
-
-
-	//! Constructor for unicode and ascii strings
-	template <class B>
-	string(const B* c)
-	: array(0), allocated(0), used(0)
-	{
-		*this = c;
-	}
-
-
-
-	//! destructor
-	~string()
-	{
-		delete [] array;
-	}
-
-
-
-	//! Assignment operator
-	string<T>& operator=(const string<T>& other) 
-	{
-		if (this == &other)
-			return *this;
-
-		delete [] array;
-		allocated = used = other.size()+1;
-		array = new T[used];
-
-		const T* p = other.c_str();
-		for (s32 i=0; i<used; ++i, ++p)
-			array[i] = *p;
-
-		return *this;
-	}
-
-
-
-	//! Assignment operator for strings, ascii and unicode
-	template <class B>
-	string<T>& operator=(const B* c) 
-	{
-		if (!c)
-		{
-			if (!array)
-			{
-				array = new T[1];
-				allocated = 1;
-				used = 1;
-			}
-			array[0] = 0x0;
-			return *this;
-		}
-
-		if ((void*)c == (void*)array)
-			return *this;
-
-		s32 len = 0;
-		const B* p = c;
-		while(*p)
-		{
-			++len;
-			++p;
-		}
-
-		// we'll take the old string for a while, because the new string could be
-		// a part of the current string.
-		T* oldArray = array;
-
-        allocated = used = len+1;
-		array = new T[used];
-
-		for (s32 l = 0; l<len+1; ++l)
-			array[l] = (T)c[l];
-
-		delete [] oldArray;
-		return *this;
-	}
-
-	//! Add operator for other strings
-	string<T> operator+(const string<T>& other) 
-	{ 
-		string<T> str(*this); 
-		str.append(other); 
-
-		return str; 
-	} 
-
-	//! Add operator for strings, ascii and unicode 
-	template <class B> 
-	string<T> operator+(const B* c) 
-	{ 
-		string<T> str(*this); 
-		str.append(c); 
-
-		return str; 
-	}
-
-
-
-	//! Direct access operator
-	T& operator [](const s32 index)  const
-	{
-		_IRR_DEBUG_BREAK_IF(index>=used) // bad index
-
-		return array[index];
-	}
-
-
-	//! Comparison operator
-	bool operator ==(const T* str) const
-	{
-		int i;
-		for(i=0; array[i] && str[i]; ++i)
-			if (array[i] != str[i])
-				return false;
-
-		return !array[i] && !str[i];
-	}
-
-
-
-	//! Comparison operator
-	bool operator ==(const string<T>& other) const
-	{
-		for(s32 i=0; array[i] && other.array[i]; ++i)
-			if (array[i] != other.array[i])
-				return false;
-
-		return used == other.used;
-	}
-
-
-
-	//! Is smaller operator
-	bool operator <(const string<T>& other) const
-	{
-		for(s32 i=0; array[i] && other.array[i]; ++i)
-			if (array[i] != other.array[i])
-				return (array[i] < other.array[i]);
-
-		return used < other.used;
-	}
-
-
-
-	//! Equals not operator
-	bool operator !=(const string<T>& other) const
-	{
-		return !(*this == other);
-	}
-
-
-    
-	//! Returns length of string
-	/** \return Returns length of the string in characters. */
-	s32 size() const
-	{
-		return used-1;
-	}
-
-
-
-	//! Returns character string
-	/** \return Returns pointer to C-style zero terminated string. */
-	const T* c_str() const
-	{
-		return array;
-	}
-
-
-
-	//! Makes the string lower case.
-	void make_lower()
-	{
-		const T A = (T)'A';
-		const T Z = (T)'Z';
-		const T diff = (T)'a' - A;
-
-		for (s32 i=0; i<used; ++i)
-		{
-			if (array[i]>=A && array[i]<=Z)
-				array[i] += diff;
-		}
-	}
-
-
-
-	//! Makes the string upper case.
-	void make_upper()
-	{
-		const T a = (T)'a';
-		const T z = (T)'z';
-		const T diff = (T)'A' - a;
-
-		for (s32 i=0; i<used; ++i)
-		{
-			if (array[i]>=a && array[i]<=z)
-				array[i] += diff;
-		}
-	}
-
-
-
-	//! Compares the string ignoring case.
-	/** \param other: Other string to compare.
-	\return Returns true if the string are equal ignoring case. */
-	bool equals_ignore_case(const string<T>& other) const
-	{
-		for(s32 i=0; array[i] && other[i]; ++i)
-			if (toLower(array[i]) != toLower(other[i]))
-				return false;
-
-		return used == other.used;
-	}
-
-
-	//! compares the first n characters of the strings
-	bool equalsn(const string<T>& other, int len)
-	{
-		int i;
-		for(i=0; array[i] && other[i] && i < len; ++i)
-			if (array[i] != other[i])
-				return false;
-
-		// if one (or both) of the strings was smaller then they
-		// are only equal if they have the same lenght
-		return (i == len) || (used == other.used);
-	}
-
-
-	//! compares the first n characters of the strings
-	bool equalsn(const T* str, int len)
-	{
-		int i;	
-		for(i=0; array[i] && str[i] && i < len; ++i)
-			if (array[i] != str[i])
-				return false;
-
-		// if one (or both) of the strings was smaller then they
-		// are only equal if they have the same lenght
-		return (i == len) || (array[i] == 0 && str[i] == 0);
-	}
-
-
-	//! Appends a character to this string
-	/** \param character: Character to append. */
-	void append(T character)
-	{
-		if (used + 1 > allocated)
-			reallocate((s32)used + 1);
-
-		used += 1;
-
-		array[used-2] = character;
-		array[used-1] = 0;
-	}
-
-	//! Appends a string to this string
-	/** \param other: String to append. */
-	void append(const string<T>& other)
-	{
-		--used;
-
-		s32 len = other.size();
-		
-		if (used + len + 1 > allocated)
-			reallocate((s32)used + (s32)len + 1);
-
-		for (s32 l=0; l<len+1; ++l)
-			array[l+used] = other[l];
-
-		used = used + len + 1;
-	}
-
-
-	//! Appends a string of the length l to this string.
-	/** \param other: other String to append to this string.
-	 \param length: How much characters of the other string to add to this one. */
-	void append(const string<T>& other, s32 length)
-	{
-		s32 len = other.size();
-
-		if (len < length)
-		{
-			append(other);
-			return;
-		}
-
-		len = length;
-		--used;
-		
-		if (used + len > allocated)
-			reallocate((s32)used + (s32)len);
-
-		for (s32 l=0; l<len; ++l)
-			array[l+used] = other[l];
-
-		used = used + len;
-	}
-
-
-	//! Reserves some memory.
-	/** \param count: Amount of characters to reserve. */
-	void reserve(s32 count)
-	{
-		if (count < allocated)
-			return;
-
-		reallocate(count);
-	}
-
-
-	//! finds first occurrence of character in string
-	/** \param c: Character to search for.
-	\return Returns position where the character has been found,
-	or -1 if not found. */
-	s32 findFirst(T c) const
-	{
-		for (s32 i=0; i<used; ++i)
-			if (array[i] == c)
-				return i;
-
-		return -1;
-	}
-
-	//! finds first occurrence of a character of a list in string
-	/** \param c: List of strings to find. For example if the method
-	should find the first occurance of 'a' or 'b', this parameter should be "ab".
-	\param count: Amount of characters in the list. Ususally, 
-	this should be strlen(ofParameter1)
-	\return Returns position where one of the character has been found,
-	or -1 if not found. */
-	s32 findFirstChar(T* c, int count) const
-	{
-		for (s32 i=0; i<used; ++i)
-			for (int j=0; j<count; ++j)
-				if (array[i] == c[j])
-					return i;
-
-		return -1;
-	}
-
-
-	//! Finds first position of a character not in a given list.
-	/** \param c: List of characters not to find. For example if the method
-	 should find the first occurance of a character not 'a' or 'b', this parameter should be "ab".
-	\param count: Amount of characters in the list. Ususally, 
-	this should be strlen(ofParameter1)
-	\return Returns position where the character has been found,
-	or -1 if not found. */
-	template <class B> 
-	s32 findFirstCharNotInList(B* c, int count) const
-	{
-		for (int i=0; i<used; ++i)
-		{
-            int j;
-			for (j=0; j<count; ++j)
-				if (array[i] == c[j])
-					break;
-
-			if (j==count)
-				return i;
-		}
-
-		return -1;
-	}
-
-	//! Finds last position of a character not in a given list.
-	/** \param c: List of characters not to find. For example if the method
-	 should find the first occurance of a character not 'a' or 'b', this parameter should be "ab".
-	\param count: Amount of characters in the list. Ususally, 
-	this should be strlen(ofParameter1)
-	\return Returns position where the character has been found,
-	or -1 if not found. */
-	template <class B> 
-	s32 findLastCharNotInList(B* c, int count) const
-	{
-		for (int i=used-2; i>=0; --i)
-		{
-            int j;
-			for (j=0; j<count; ++j)
-				if (array[i] == c[j])
-					break;
-
-			if (j==count)
-				return i;
-		}
-
-		return -1;
-	}
-
-	//! finds next occurrence of character in string
-	/** \param c: Character to search for.
-	\param startPos: Position in string to start searching. 
-	\return Returns position where the character has been found,
-	or -1 if not found. */
-	s32 findNext(T c, s32 startPos) const
-	{
-		for (s32 i=startPos; i<used; ++i)
-			if (array[i] == c)
-				return i;
-
-		return -1;
-	}
-
-
-	//! finds last occurrence of character in string
-	//! \param c: Character to search for.
-	//! \return Returns position where the character has been found,
-	//! or -1 if not found.
-	s32 findLast(T c) const
-	{
-		for (s32 i=used-1; i>=0; --i)
-			if (array[i] == c)
-				return i;
-
-		return -1;
-	}
-
-
-	//! Returns a substring
-	//! \param begin: Start of substring.
-	//! \param length: Length of substring.
-	string<T> subString(s32 begin, s32 length)
-	{
-		if (length <= 0)
-			return string<T>("");
-
-		string<T> o;
-		o.reserve(length+1);
-
-		for (s32 i=0; i<length; ++i)
-			o.array[i] = array[i+begin];
-
-		o.array[length] = 0;
-		o.used = o.allocated;
-
-		return o;
-	}
-
-
-	void operator += (T c)
-	{
-		append(c);
-	}
-
-	void operator += (const string<T>& other)
-	{
-		append(other);
-	}
-
-	void operator += (int i)
-	{
-		append(string<T>(i));
-	}
-
-	//! replaces all characters of a special type with another one
-	void replace(T toReplace, T replaceWith)
-	{
-		for (s32 i=0; i<used; ++i)
-			if (array[i] == toReplace)
-				array[i] = replaceWith;
-	}
-
-	//! trims the string.
-	/** Removes whitespace from begin and end of the string. */
-	void trim()
-	{
-		const char whitespace[] = " \t\n";
-		const int whitespacecount = 3;
-
-		// find start and end of real string without whitespace
-		int begin = findFirstCharNotInList(whitespace, whitespacecount);
-		if (begin == -1)
-			return;
-
-		int end = findLastCharNotInList(whitespace, whitespacecount);
-		if (end == -1)
-			return;
-
-		*this = subString(begin, (end +1) - begin);
-	}
-
-
-	//! Erases a character from the string. May be slow, because all elements 
-	//! following after the erased element have to be copied.
-	//! \param index: Index of element to be erased.
-	void erase(int index)
-	{
-		_IRR_DEBUG_BREAK_IF(index>=used || index<0) // access violation
-
-		for (int i=index+1; i<used; ++i)
-			array[i-1] = array[i];
-
-		--used;
-	}
-
-    	
-
-private:
-
-	//! Returns a character converted to lower case
-	T toLower(const T& t) const
-	{
-		if (t>=(T)'A' && t<=(T)'Z')
-			return t + ((T)'a' - (T)'A');
-		else
-			return t;
-	}
-
-	//! Reallocate the array, make it bigger or smaler
-	void reallocate(s32 new_size)
-	{
-		T* old_array = array;
-
-		array = new T[new_size];
-		allocated = new_size;
-		
-		s32 amount = used < new_size ? used : new_size;
-		for (s32 i=0; i<amount; ++i)
-			array[i] = old_array[i];
-		
-		delete [] old_array;
-	}
-
-
-	//--- member variables
-
-	T* array;
-	s32 allocated;
-	s32 used;
-};
-
-
-//! Typedef for character strings
-typedef string<irr::c8> stringc;
-
-//! Typedef for wide character strings
-typedef string<wchar_t> stringw;
-
-} // end namespace core
-} // end namespace irr
-
-#endif
-
diff --git a/contrib/irrXML/irrTypes.h b/contrib/irrXML/irrTypes.h
deleted file mode 100644
index 107f6649e..000000000
--- a/contrib/irrXML/irrTypes.h
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright (C) 2002-2005 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __IRR_TYPES_H_INCLUDED__
-#define __IRR_TYPES_H_INCLUDED__
-
-namespace irr
-{
-
-//! 8 bit unsigned variable.
-/** This is a typedef for unsigned char, it ensures portability of the engine. */
-typedef unsigned char		u8; 
-
-//! 8 bit signed variable.
-/** This is a typedef for signed char, it ensures portability of the engine. */
-typedef signed char			s8; 
-
-//! 8 bit character variable.
-/** This is a typedef for char, it ensures portability of the engine. */
-typedef char				c8; 
-
-
-
-//! 16 bit unsigned variable.
-/** This is a typedef for unsigned short, it ensures portability of the engine. */
-typedef unsigned short		u16;
-
-//! 16 bit signed variable.
-/** This is a typedef for signed short, it ensures portability of the engine. */
-typedef signed short		s16; 
-
-
-
-//! 32 bit unsigned variable.
-/** This is a typedef for unsigned int, it ensures portability of the engine. */
-typedef unsigned int		u32;
-
-//! 32 bit signed variable.
-/** This is a typedef for signed int, it ensures portability of the engine. */
-typedef signed int			s32; 
-
-
-
-// 64 bit signed variable.
-// This is a typedef for __int64, it ensures portability of the engine. 
-// This type is currently not used by the engine and not supported by compilers
-// other than Microsoft Compilers, so it is outcommented.
-//typedef __int64				s64; 
-
-
-
-//! 32 bit floating point variable.
-/** This is a typedef for float, it ensures portability of the engine. */
-typedef float				f32; 
-
-//! 64 bit floating point variable.
-/** This is a typedef for double, it ensures portability of the engine. */
-typedef double				f64; 
-
-
-} // end namespace
-
-
-// define the wchar_t type if not already built in.
-#ifdef _MSC_VER 
-#ifndef _WCHAR_T_DEFINED
-//! A 16 bit wide character type.
-/**
-	Defines the wchar_t-type.
-	In VS6, its not possible to tell
-	the standard compiler to treat wchar_t as a built-in type, and 
-	sometimes we just don't want to include the huge stdlib.h or wchar.h,
-	so we'll use this.
-*/
-typedef unsigned short wchar_t;
-#define _WCHAR_T_DEFINED
-#endif // wchar is not defined
-#endif // microsoft compiler
-
-//! define a break macro for debugging only in Win32 mode.
-#if !defined(_WIN64) && defined(WIN32) && defined(_MSC_VER) && defined(_DEBUG)
-#define _IRR_DEBUG_BREAK_IF( _CONDITION_ ) if (_CONDITION_) {_asm int 3}
-#else 
-#define _IRR_DEBUG_BREAK_IF( _CONDITION_ )
-#endif
-
-//! Defines a small statement to work around a microsoft compiler bug.
-/** The microsft compiler 7.0 - 7.1 has a bug:
-When you call unmanaged code that returns a bool type value of false from managed code, 
-the return value may appear as true. See 
-http://support.microsoft.com/default.aspx?kbid=823071 for details. 
-Compiler version defines: VC6.0 : 1200, VC7.0 : 1300, VC7.1 : 1310, VC8.0 : 1400*/
-#if !defined(_WIN64) && defined(WIN32) && defined(_MSC_VER) && (_MSC_VER > 1299) && (_MSC_VER < 1400)
-#define _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX __asm mov eax,100
-#else
-#define _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX
-#endif // _IRR_MANAGED_MARSHALLING_BUGFIX
-
-#endif // __IRR_TYPES_H_INCLUDED__
-
diff --git a/contrib/irrXML/irrXML.cpp b/contrib/irrXML/irrXML.cpp
deleted file mode 100644
index 3fd510302..000000000
--- a/contrib/irrXML/irrXML.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-// Copyright (C) 2002-2005 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine" and the "irrXML" project.
-// For conditions of distribution and use, see copyright notice in irrlicht.h and/or irrXML.h
-
-#include "irrXML.h"
-#include "irrString.h"
-#include "irrArray.h"
-#include "fast_atof.h"
-#include "CXMLReaderImpl.h"
-
-namespace irr
-{
-namespace io
-{
-
-//! Implementation of the file read callback for ordinary files
-class CFileReadCallBack : public IFileReadCallBack
-{
-public:
-
-	//! construct from filename
-	CFileReadCallBack(const char* filename)
-		: File(0), Size(0), Close(true)
-	{
-		// open file
-		File = fopen(filename, "rb");
-
-		if (File)
-			getFileSize();
-	}
-
-	//! construct from FILE pointer
-	CFileReadCallBack(FILE* file)
-		: File(file), Size(0), Close(false)
-	{
-		if (File)
-			getFileSize();
-	}
-
-	//! destructor
-	virtual ~CFileReadCallBack()
-	{
-		if (Close && File)
-			fclose(File);
-	}
-
-	//! Reads an amount of bytes from the file.
-	virtual int read(void* buffer, int sizeToRead)
-	{
-		if (!File)
-			return 0;
-
-		return (int)fread(buffer, 1, sizeToRead, File);
-	}
-
-	//! Returns size of file in bytes
-	virtual int getSize()
-	{
-		return Size;
-	}
-
-private:
-
-	//! retrieves the file size of the open file
-	void getFileSize()
-	{
-		fseek(File, 0, SEEK_END);
-		Size = ftell(File);
-		fseek(File, 0, SEEK_SET);
-	}
-
-	FILE* File;
-	int Size;
-	bool Close;
-
-}; // end class CFileReadCallBack
-
-
-
-// FACTORY FUNCTIONS:
-
-
-//! Creates an instance of an UFT-8 or ASCII character xml parser. 
-IrrXMLReader* createIrrXMLReader(const char* filename)
-{
-	return new CXMLReaderImpl<char, IXMLBase>(new CFileReadCallBack(filename)); 
-}
-
-
-//! Creates an instance of an UFT-8 or ASCII character xml parser. 
-IrrXMLReader* createIrrXMLReader(FILE* file)
-{
-	return new CXMLReaderImpl<char, IXMLBase>(new CFileReadCallBack(file)); 
-}
-
-
-//! Creates an instance of an UFT-8 or ASCII character xml parser. 
-IrrXMLReader* createIrrXMLReader(IFileReadCallBack* callback)
-{
-	return new CXMLReaderImpl<char, IXMLBase>(callback, false); 
-}
-
-
-//! Creates an instance of an UTF-16 xml parser. 
-IrrXMLReaderUTF16* createIrrXMLReaderUTF16(const char* filename)
-{
-	return new CXMLReaderImpl<char16, IXMLBase>(new CFileReadCallBack(filename)); 
-}
-
-
-//! Creates an instance of an UTF-16 xml parser. 
-IrrXMLReaderUTF16* createIrrXMLReaderUTF16(FILE* file)
-{
-	return new CXMLReaderImpl<char16, IXMLBase>(new CFileReadCallBack(file)); 
-}
-
-
-//! Creates an instance of an UTF-16 xml parser. 
-IrrXMLReaderUTF16* createIrrXMLReaderUTF16(IFileReadCallBack* callback)
-{
-	return new CXMLReaderImpl<char16, IXMLBase>(callback, false); 
-}
-
-
-//! Creates an instance of an UTF-32 xml parser. 
-IrrXMLReaderUTF32* createIrrXMLReaderUTF32(const char* filename)
-{
-	return new CXMLReaderImpl<char32, IXMLBase>(new CFileReadCallBack(filename)); 
-}
-
-
-//! Creates an instance of an UTF-32 xml parser. 
-IrrXMLReaderUTF32* createIrrXMLReaderUTF32(FILE* file)
-{
-	return new CXMLReaderImpl<char32, IXMLBase>(new CFileReadCallBack(file)); 
-}
-
-
-//! Creates an instance of an UTF-32 xml parser. 
-IrrXMLReaderUTF32* createIrrXMLReaderUTF32(IFileReadCallBack* callback)
-{
-	return new CXMLReaderImpl<char32, IXMLBase>(callback, false); 
-}
-
-
-} // end namespace io
-} // end namespace irr
diff --git a/contrib/irrXML/irrXML.h b/contrib/irrXML/irrXML.h
deleted file mode 100644
index 30b56c7b9..000000000
--- a/contrib/irrXML/irrXML.h
+++ /dev/null
@@ -1,540 +0,0 @@
-// Copyright (C) 2002-2005 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine" and the "irrXML" project.
-// For conditions of distribution and use, see copyright notice in irrlicht.h and/or irrXML.h
-
-#ifndef __IRR_XML_H_INCLUDED__
-#define __IRR_XML_H_INCLUDED__
-
-#include <stdio.h>
-
-/** \mainpage irrXML 1.2 API documentation
- <div align="center"><img src="logobig.png" ></div>
-
- \section intro Introduction
-
-  Welcome to the irrXML API documentation.
-  Here you'll find any information you'll need to develop applications with
-  irrXML. If you look for a tutorial on how to start, take a look at the \ref irrxmlexample,
-  at the homepage of irrXML at <A HREF="http://xml.irrlicht3d.org" >xml.irrlicht3d.org</A> 
-  or into the SDK in the directory \example.
- 
-  irrXML is intended to be a high speed and easy-to-use XML Parser for C++, and
-  this documentation is an important part of it. If you have any questions or
-  suggestions, just send a email to the author of the engine, Nikolaus Gebhardt
-  (niko (at) irrlicht3d.org). For more informations about this parser, see \ref history.
-
-  \section features Features
-
-  irrXML provides forward-only, read-only 
-     access to a stream of non validated XML data. It was fully implemented by
-	 Nikolaus Gebhardt. Its current features are:
-
-	 - It it fast as lighting and has very low memory usage. It was 
-	   developed with the intention of being used in 3D games, as it already has been.
-	 - irrXML is very small: It only consists of 60 KB of code and can be added easily
-	   to your existing project.
-	 - Of course, it is platform independent and works with lots of compilers.
-	 - It is able to parse ASCII, UTF-8, UTF-16 and UTF-32 text files, both in 
-	   little and big endian format. 
-	 - Independent of the input file format, the parser can return all strings in ASCII, UTF-8,
-	   UTF-16 and UTF-32 format. 
-	 - With its optional file access abstraction it has the advantage that it can read not
-	   only from files but from any type of data (memory, network, ...). For example when 
-	   used with the Irrlicht Engine, it directly reads from compressed .zip files. 
-	 - Just like the Irrlicht Engine for which it was originally created, it is extremely easy 
-	   to use.
-	 - It has no external dependencies, it does not even need the STL. 
-
-	 Although irrXML has some strenghts, it currently also has the following limitations:
-
-	 - The input xml file is not validated and assumed to be correct. 
-
-    \section irrxmlexample Example
-
-    The following code demonstrates the basic usage of irrXML. A simple xml
-	file like this is parsed:
-    \code
-	<?xml version="1.0"?>
-	<config>
-		<!-- This is a config file for the mesh viewer -->
-		<model file="dwarf.dea" />
-		<messageText caption="Irrlicht Engine Mesh Viewer">
-		Welcome to the Mesh Viewer of the &quot;Irrlicht Engine&quot;.
-		</messageText>
-	</config>
-	\endcode
-
-	The code for parsing this file would look like this:
-	\code
-	#include <irrXML.h>
-	using namespace irr; // irrXML is located in the namespace irr::io
-	using namespace io;
-
-	#include <string> // we use STL strings to store data in this example
-
-	void main()
-	{
-		// create the reader using one of the factory functions
-
-		IrrXMLReader* xml = createIrrXMLReader("config.xml");
-
-		// strings for storing the data we want to get out of the file
-		std::string modelFile;
-		std::string messageText;
-		std::string caption;
-
-		// parse the file until end reached
-
-		while(xml && xml->read())
-		{
-			switch(xml->getNodeType())
-			{
-			case EXN_TEXT:
-				// in this xml file, the only text which occurs is the messageText
-				messageText = xml->getNodeData();
-				break;
-			case EXN_ELEMENT:
-				{
-					if (!strcmp("model", xml->getNodeName()))
-						modelFile = xml->getAttributeValue("file");
-					else
-					if (!strcmp("messageText", xml->getNodeName()))
-						caption = xml->getAttributeValue("caption");
-				}
-				break;
-			}
-		}
-
-		// delete the xml parser after usage
-		delete xml;
-	}
-	\endcode
-
-	\section howto How to use
-
-	Simply add the source files in the /src directory of irrXML to your project. Done.
-
-	\section license License
-
-	The irrXML license is based on the zlib license. Basicly, this means you can do with
-	irrXML whatever you want:
-
-	Copyright (C) 2002-2005 Nikolaus Gebhardt
-
-	This software is provided 'as-is', without any express or implied
-	warranty.  In no event will the authors be held liable for any damages
-	arising from the use of this software.
-
-	Permission is granted to anyone to use this software for any purpose,
-	including commercial applications, and to alter it and redistribute it
-	freely, subject to the following restrictions:
-
-	1. The origin of this software must not be misrepresented; you must not
-		claim that you wrote the original software. If you use this software
-		in a product, an acknowledgment in the product documentation would be
-		appreciated but is not required.
-
-	2. Altered source versions must be plainly marked as such, and must not be
-		misrepresented as being the original software.
-
-	3. This notice may not be removed or altered from any source distribution.
-
-	\section history History
-
-	As lots of references in this documentation and the source show, this xml 
-	parser has originally been a part of the 
-	<A HREF="http://irrlicht.sourceforge.net" >Irrlicht Engine</A>. But because
-	the parser has become very useful with the latest release, people asked for a 
-	separate version of it, to be able to use it in non Irrlicht projects. With
-	irrXML 1.0, this has now been done.
-*/
-
-namespace irr
-{
-namespace io
-{
-	//! Enumeration of all supported source text file formats 
-	enum ETEXT_FORMAT
-	{
-		//! ASCII, file without byte order mark, or not a text file
-		ETF_ASCII,
-
-		//! UTF-8 format
-		ETF_UTF8,
-
-		//! UTF-16 format, big endian
-		ETF_UTF16_BE,
-
-		//! UTF-16 format, little endian
-		ETF_UTF16_LE,
-
-		//! UTF-32 format, big endian
-		ETF_UTF32_BE,
-
-		//! UTF-32 format, little endian
-		ETF_UTF32_LE,
-	};
-
-
-	//! Enumeration for all xml nodes which are parsed by IrrXMLReader
-	enum EXML_NODE
-	{
-		//! No xml node. This is usually the node if you did not read anything yet.
-		EXN_NONE,
-
-		//! A xml element, like <foo>
-		EXN_ELEMENT,
-
-		//! End of an xml element, like </foo>
-		EXN_ELEMENT_END,
-
-		//! Text within a xml element: <foo> this is the text. </foo>
-		EXN_TEXT,
-
-		//! An xml comment like &lt;!-- I am a comment --&gt; or a DTD definition.
-		EXN_COMMENT,
-
-		//! An xml cdata section like &lt;![CDATA[ this is some CDATA ]]&gt;
-		EXN_CDATA,
-
-		//! Unknown element.
-		EXN_UNKNOWN
-	};
-
-	//! Callback class for file read abstraction. 
-	/** With this, it is possible to make the xml parser read in other things 
-	than just files. The Irrlicht engine is using this for example to 
-	read xml from compressed .zip files. To make the parser read in 
-	any other data, derive a class from this interface, implement the 
-	two methods to read your data and give a pointer to an instance of
-	your implementation when calling createIrrXMLReader(), 
-	createIrrXMLReaderUTF16() or createIrrXMLReaderUTF32() */
-	class IFileReadCallBack
-	{
-	public:
-
-		//! virtual destructor
-		virtual ~IFileReadCallBack() {};
-
-		//! Reads an amount of bytes from the file.
-		/** \param buffer: Pointer to buffer where to read bytes will be written to.
-		\param sizeToRead: Amount of bytes to read from the file.
-		\return Returns how much bytes were read. */
-		virtual int read(void* buffer, int sizeToRead) = 0;
-
-		//! Returns size of file in bytes
-		virtual int getSize() = 0;
-	};
-
-	//! Empty class to be used as parent class for IrrXMLReader.
-	/** If you need another class as base class for the xml reader, you can do this by creating
-	the reader using for example new CXMLReaderImpl<char, YourBaseClass>(yourcallback);
-	The Irrlicht Engine for example needs IUnknown as base class for every object to
-	let it automaticly reference countend, hence it replaces IXMLBase with IUnknown.
-	See irrXML.cpp on how this can be done in detail. */
-	class IXMLBase
-	{
-	};	
-
-	//! Interface providing easy read access to a XML file.
-	/** You can create an instance of this reader using one of the factory functions
-	createIrrXMLReader(), createIrrXMLReaderUTF16() and createIrrXMLReaderUTF32().
-	If using the parser from the Irrlicht Engine, please use IFileSystem::createXMLReader() 
-	instead.
-	For a detailed intro how to use the parser, see \ref irrxmlexample and \ref features.
-
-	The typical usage of this parser looks like this:
-	\code
-	#include <irrXML.h>
-	using namespace irr; // irrXML is located in the namespace irr::io
-	using namespace io;
-
-	void main()
-	{
-		// create the reader using one of the factory functions
-		IrrXMLReader* xml = createIrrXMLReader("config.xml");
-
-		if (xml == 0)
-			return; // file could not be opened
-
-		// parse the file until end reached
-		while(xml->read())
-		{
-			// based on xml->getNodeType(), do something.
-		}
-
-		// delete the xml parser after usage
-		delete xml;
-	}
-	\endcode
-	See \ref irrxmlexample for a more detailed example.
-	*/
-	template<class char_type, class super_class>
-	class IIrrXMLReader : public super_class
-	{
-	public:
-
-		//! Destructor
-		virtual ~IIrrXMLReader() {};
-
-		//! Reads forward to the next xml node. 
-		/** \return Returns false, if there was no further node.  */
-		virtual bool read() = 0;
-
-		//! Returns the type of the current XML node.
-		virtual EXML_NODE getNodeType() const = 0;
-
-        //! Returns attribute count of the current XML node. 
-		/** This is usually
-		non null if the current node is EXN_ELEMENT, and the element has attributes.
-		\return Returns amount of attributes of this xml node. */
-		virtual int getAttributeCount() const = 0;
-
-		//! Returns name of an attribute. 
-		/** \param idx: Zero based index, should be something between 0 and getAttributeCount()-1.
-		\return Name of the attribute, 0 if an attribute with this index does not exist. */
-		virtual const char_type* getAttributeName(int idx) const = 0;
-
-		//! Returns the value of an attribute. 
-		/** \param idx: Zero based index, should be something between 0 and getAttributeCount()-1.
-		\return Value of the attribute, 0 if an attribute with this index does not exist. */
-		virtual const char_type* getAttributeValue(int idx) const = 0;
-
-		//! Returns the value of an attribute. 
-		/** \param name: Name of the attribute.
-		\return Value of the attribute, 0 if an attribute with this name does not exist. */
-		virtual const char_type* getAttributeValue(const char_type* name) const = 0;
-
-		//! Returns the value of an attribute in a safe way.
-		/** Like getAttributeValue(), but does not 
-		return 0 if the attribute does not exist. An empty string ("") is returned then.
-		\param name: Name of the attribute.
-		\return Value of the attribute, and "" if an attribute with this name does not exist */
-		virtual const char_type* getAttributeValueSafe(const char_type* name) const = 0;
-
-		//! Returns the value of an attribute as integer. 
-		/** \param name Name of the attribute.
-		\return Value of the attribute as integer, and 0 if an attribute with this name does not exist or
-		the value could not be interpreted as integer. */
-		virtual int getAttributeValueAsInt(const char_type* name) const = 0;
-
-		//! Returns the value of an attribute as integer. 
-		/** \param idx: Zero based index, should be something between 0 and getAttributeCount()-1.
-		\return Value of the attribute as integer, and 0 if an attribute with this index does not exist or
-		the value could not be interpreted as integer. */
-		virtual int getAttributeValueAsInt(int idx) const = 0;
-
-		//! Returns the value of an attribute as float. 
-		/** \param name: Name of the attribute.
-		\return Value of the attribute as float, and 0 if an attribute with this name does not exist or
-		the value could not be interpreted as float. */
-		virtual float getAttributeValueAsFloat(const char_type* name) const = 0;
-
-		//! Returns the value of an attribute as float. 
-		/** \param idx: Zero based index, should be something between 0 and getAttributeCount()-1.
-		\return Value of the attribute as float, and 0 if an attribute with this index does not exist or
-		the value could not be interpreted as float. */
-		virtual float getAttributeValueAsFloat(int idx) const = 0;
-
-		//! Returns the name of the current node. 
-		/** Only non null, if the node type is EXN_ELEMENT.
-		\return Name of the current node or 0 if the node has no name. */
-		virtual const char_type* getNodeName() const = 0;
-
-		//! Returns data of the current node. 
-		/** Only non null if the node has some
-		data and it is of type EXN_TEXT or EXN_UNKNOWN. */
-		virtual const char_type* getNodeData() const = 0;
-
-		//! Returns if an element is an empty element, like <foo />
-		virtual bool isEmptyElement() const = 0;
-
-		//! Returns format of the source xml file. 
-		/** It is not necessary to use
-		this method because the parser will convert the input file format
-		to the format wanted by the user when creating the parser. This
-		method is useful to get/display additional informations. */
-		virtual ETEXT_FORMAT getSourceFormat() const = 0;
-
-		//! Returns format of the strings returned by the parser. 
-		/** This will be UTF8 for example when you created a parser with
-		IrrXMLReaderUTF8() and UTF32 when it has been created using 
-		IrrXMLReaderUTF32. It should not be necessary to call this
-		method and only exists for informational purposes. */
-		virtual ETEXT_FORMAT getParserFormat() const = 0;
-	};
-
-
-	//! defines the utf-16 type.
-	/** Not using wchar_t for this because 
-	wchar_t has 16 bit on windows and 32 bit on other operating systems. */
-	typedef unsigned short char16;
-
-	//! defines the utf-32 type. 
-	/** Not using wchar_t for this because 
-	wchar_t has 16 bit on windows and 32 bit on other operating systems. */
-	typedef unsigned long char32;
-
-	//! A UTF-8 or ASCII character xml parser.
-	/** This means that all character data will be returned in 8 bit ASCII or UTF-8 by this parser. 
-	The file to read can be in any format, it will be converted to UTF-8 if it is not
-	in this format.
-	Create an instance of this with createIrrXMLReader(); 
-	See IIrrXMLReader for description on how to use it. */
-	typedef IIrrXMLReader<char, IXMLBase> IrrXMLReader;
-
-	//! A UTF-16 xml parser. 
-	/** This means that all character data will be returned in UTF-16 by this parser. 
-	The file to read can be in any format, it will be converted to UTF-16 if it is not
-	in this format.
-	Create an instance of this with createIrrXMLReaderUTF16(); 
-	See IIrrXMLReader for description on how to use it.  */
-	typedef IIrrXMLReader<char16, IXMLBase> IrrXMLReaderUTF16;
-
-	//! A UTF-32 xml parser. 
-	/** This means that all character data will be returned in UTF-32 by this parser. 
-	The file to read can be in any format, it will be converted to UTF-32 if it is not
-	in this format.
-	Create an instance of this with createIrrXMLReaderUTF32(); 
-	See IIrrXMLReader for description on how to use it. */
-	typedef IIrrXMLReader<char32, IXMLBase> IrrXMLReaderUTF32;
-
-
-	//! Creates an instance of an UFT-8 or ASCII character xml parser.
-	/** This means that all character data will be returned in 8 bit ASCII or UTF-8. 
-	The file to read can be in any format, it will be converted to UTF-8 if it is not in this format.
-	If you are using the Irrlicht Engine, it is better not to use this function but
-	IFileSystem::createXMLReaderUTF8() instead.
-	\param filename: Name of file to be opened.
-	\return Returns a pointer to the created xml parser. This pointer should be 
-	deleted using 'delete' after no longer needed. Returns 0 if an error occured
-	and the file could not be opened. */
-	IrrXMLReader* createIrrXMLReader(const char* filename);
-
-	//! Creates an instance of an UFT-8 or ASCII character xml parser.
-	/** This means that all character data will be returned in 8 bit ASCII or UTF-8. The file to read can 
-	be in any format, it will be converted to UTF-8 if it is not in this format.
-	If you are using the Irrlicht Engine, it is better not to use this function but
-	IFileSystem::createXMLReaderUTF8() instead.
-	\param file: Pointer to opened file, must have been opened in binary mode, e.g.
-	using fopen("foo.bar", "wb"); The file will not be closed after it has been read.
-	\return Returns a pointer to the created xml parser. This pointer should be 
-	deleted using 'delete' after no longer needed. Returns 0 if an error occured
-	and the file could not be opened. */
-	IrrXMLReader* createIrrXMLReader(FILE* file);
-
-	//! Creates an instance of an UFT-8 or ASCII character xml parser. 
-	/** This means that all character data will be returned in 8 bit ASCII or UTF-8. The file to read can 
-	 be in any format, it will be converted to UTF-8 if it is not in this format.
-	 If you are using the Irrlicht Engine, it is better not to use this function but
-	 IFileSystem::createXMLReaderUTF8() instead.
-	 \param callback: Callback for file read abstraction. Implement your own
-	 callback to make the xml parser read in other things than just files. See
-	 IFileReadCallBack for more information about this.
-	 \return Returns a pointer to the created xml parser. This pointer should be 
-	 deleted using 'delete' after no longer needed. Returns 0 if an error occured
-	 and the file could not be opened. */
-	IrrXMLReader* createIrrXMLReader(IFileReadCallBack* callback);
-
-	//! Creates an instance of an UFT-16 xml parser. 
-	/** This means that
-	all character data will be returned in UTF-16. The file to read can 
-	be in any format, it will be converted to UTF-16 if it is not in this format.
-	If you are using the Irrlicht Engine, it is better not to use this function but
-	IFileSystem::createXMLReader() instead.
-	\param filename: Name of file to be opened.
-	\return Returns a pointer to the created xml parser. This pointer should be 
-	deleted using 'delete' after no longer needed. Returns 0 if an error occured
-	and the file could not be opened. */
-	IrrXMLReaderUTF16* createIrrXMLReaderUTF16(const char* filename);
-
-	//! Creates an instance of an UFT-16 xml parser. 
-	/** This means that all character data will be returned in UTF-16. The file to read can 
-	be in any format, it will be converted to UTF-16 if it is not in this format.
-	If you are using the Irrlicht Engine, it is better not to use this function but
-	IFileSystem::createXMLReader() instead.
-	\param file: Pointer to opened file, must have been opened in binary mode, e.g.
-	using fopen("foo.bar", "wb"); The file will not be closed after it has been read.
-	\return Returns a pointer to the created xml parser. This pointer should be 
-	deleted using 'delete' after no longer needed. Returns 0 if an error occured
-	and the file could not be opened. */
-	IrrXMLReaderUTF16* createIrrXMLReaderUTF16(FILE* file);
-
-	//! Creates an instance of an UFT-16 xml parser. 
-	/** This means that all character data will be returned in UTF-16. The file to read can 
-	be in any format, it will be converted to UTF-16 if it is not in this format.
-	If you are using the Irrlicht Engine, it is better not to use this function but
-	IFileSystem::createXMLReader() instead.
-	\param callback: Callback for file read abstraction. Implement your own
-	callback to make the xml parser read in other things than just files. See
-	IFileReadCallBack for more information about this.
-	\return Returns a pointer to the created xml parser. This pointer should be 
-	deleted using 'delete' after no longer needed. Returns 0 if an error occured
-	and the file could not be opened. */
-	IrrXMLReaderUTF16* createIrrXMLReaderUTF16(IFileReadCallBack* callback);
-
-
-	//! Creates an instance of an UFT-32 xml parser. 
-	/** This means that all character data will be returned in UTF-32. The file to read can 
-	be in any format, it will be converted to UTF-32 if it is not in this format.
-	If you are using the Irrlicht Engine, it is better not to use this function but
-	IFileSystem::createXMLReader() instead.
-	\param filename: Name of file to be opened.
-	\return Returns a pointer to the created xml parser. This pointer should be 
-	deleted using 'delete' after no longer needed. Returns 0 if an error occured
-	and the file could not be opened. */
-	IrrXMLReaderUTF32* createIrrXMLReaderUTF32(const char* filename);
-
-	//! Creates an instance of an UFT-32 xml parser. 
-	/** This means that all character data will be returned in UTF-32. The file to read can 
-	be in any format, it will be converted to UTF-32 if it is not in this format.
-	if you are using the Irrlicht Engine, it is better not to use this function but
-	IFileSystem::createXMLReader() instead.
-	\param file: Pointer to opened file, must have been opened in binary mode, e.g.
-	using fopen("foo.bar", "wb"); The file will not be closed after it has been read.
-	\return Returns a pointer to the created xml parser. This pointer should be 
-	deleted using 'delete' after no longer needed. Returns 0 if an error occured
-	and the file could not be opened. */
-	IrrXMLReaderUTF32* createIrrXMLReaderUTF32(FILE* file);
-
-	//! Creates an instance of an UFT-32 xml parser. 
-	/** This means that
-	all character data will be returned in UTF-32. The file to read can 
-	be in any format, it will be converted to UTF-32 if it is not in this format.
-	If you are using the Irrlicht Engine, it is better not to use this function but
-	IFileSystem::createXMLReader() instead.
-	\param callback: Callback for file read abstraction. Implement your own
-	callback to make the xml parser read in other things than just files. See
-	IFileReadCallBack for more information about this.
-	\return Returns a pointer to the created xml parser. This pointer should be 
-	deleted using 'delete' after no longer needed. Returns 0 if an error occured
-	and the file could not be opened. */
-	IrrXMLReaderUTF32* createIrrXMLReaderUTF32(IFileReadCallBack* callback);
-	
-
-	/*! \file irrxml.h
-    \brief Header file of the irrXML, the Irrlicht XML parser.
-    
-    This file includes everything needed for using irrXML, 
-    the XML parser of the Irrlicht Engine. To use irrXML,
-	you only need to include this file in your project:
-
-	\code
-	#include <irrXML.h>
-	\endcode
-
-	It is also common to use the two namespaces in which irrXML is included, 
-	directly after #including irrXML.h:
-
-	\code
-	#include <irrXML.h>
-	using namespace irr;
-	using namespace io;
-	\endcode
-	*/
-
-} // end namespace io
-} // end namespace irr
-
-#endif // __IRR_XML_H_INCLUDED__
-
diff --git a/contrib/openddlparser/CMakeLists.txt b/contrib/openddlparser/CMakeLists.txt
index 9e903ca3f..6a38acf5f 100644
--- a/contrib/openddlparser/CMakeLists.txt
+++ b/contrib/openddlparser/CMakeLists.txt
@@ -6,20 +6,12 @@ SET ( OPENDDL_PARSER_VERSION_PATCH 0 )
 SET ( OPENDDL_PARSER_VERSION ${OPENDDL_PARSER_VERSION_MAJOR}.${OPENDDL_PARSER_VERSION_MINOR}.${OPENDDL_PARSER_VERSION_PATCH} )
 SET ( PROJECT_VERSION "${OPENDDL_PARSER_VERSION}" )
 
-option( DDL_USE_CPP11           "Set to ON to use C++11 features ( always on on windows )."                   ON )
 option( DDL_DEBUG_OUTPUT        "Set to ON to use output debug texts"                                         OFF )
 option( DDL_STATIC_LIBRARY		"Set to ON to build static libary of OpenDDL Parser."                         ON )
 option( COVERALLS               "Generate coveralls data"                                                     OFF )
 
-if ( DDL_USE_CPP11 )
-    if( CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX )
-        set( OPENDDL_CXXFLAGS -std=c++0x )
-    elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-        set( OPENDDL_CXXFLAGS --std=c++11 )
-    endif()
-else( DDL_USE_CPP11 )
-    add_definitions( -DOPENDDL_NO_USE_CPP11 )
-endif( DDL_USE_CPP11)
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 if( CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX )
     find_package(Threads)
@@ -31,6 +23,11 @@ if ( DDL_STATIC_LIBRARY )
 	add_definitions( -DOPENDDL_STATIC_LIBARY )
 endif()
 
+if (MSVC)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING")
+    add_definitions(-DGTEST_HAS_TR1_TUPLE=0)
+endif()
+
 add_definitions( -DOPENDDLPARSER_BUILD )
 add_definitions( -D_VARIADIC_MAX=10 )
 add_definitions( -DGTEST_HAS_PTHREAD=0 )
@@ -49,7 +46,7 @@ link_directories(
     ${CMAKE_HOME_DIRECTORY}/lib
 )
 
-set( CMAKE_MODULE_PATH  ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake )
+SET( CMAKE_MODULE_PATH  ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake )
 SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/lib )
 SET( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/lib )
 SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/bin )
@@ -97,6 +94,7 @@ SET ( openddl_parser_src
     include/openddlparser/OpenDDLStream.h
     include/openddlparser/DDLNode.h
     include/openddlparser/Value.h
+    include/openddlparser/TPoolAllocator.h
     README.md
 )
  
@@ -123,7 +121,6 @@ SET ( gtest_src
     ${GTEST_PATH}/src/gtest-test-part.cc
     ${GTEST_PATH}/src/gtest-typed-test.cc
     ${GTEST_PATH}/src/gtest.cc
-    ${GTEST_PATH}/src/gtest_main.cc
 )
 
 SET( openddl_parser_unittest_src  
@@ -137,7 +134,10 @@ SET( openddl_parser_unittest_src
     test/OpenDDLIntegrationTest.cpp
     test/ValueTest.cpp
     test/OpenDDLDefectsTest.cpp
+	test/OssFuzzTest.cpp
+    test/main.cpp
 )
+add_definitions(-DOPENDDL_TEST_DATA="${CMAKE_CURRENT_LIST_DIR}/test/TestData")
 
 SOURCE_GROUP( code  FILES ${openddl_parser_unittest_src} )
 SOURCE_GROUP( gtest FILES ${gtest_src} )
diff --git a/contrib/openddlparser/code/DDLNode.cpp b/contrib/openddlparser/code/DDLNode.cpp
index a7c557fc5..724c5d67b 100644
--- a/contrib/openddlparser/code/DDLNode.cpp
+++ b/contrib/openddlparser/code/DDLNode.cpp
@@ -1,7 +1,7 @@
 /*-----------------------------------------------------------------------------------------------
 The MIT License (MIT)
 
-Copyright (c) 2014-2015 Kim Kulling
+Copyright (c) 2014-2020 Kim Kulling
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
@@ -22,6 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 -----------------------------------------------------------------------------------------------*/
 #include <openddlparser/DDLNode.h>
 #include <openddlparser/OpenDDLParser.h>
+#include <openddlparser/OpenDDLStream.h>
 
 #include <algorithm>
 
@@ -29,77 +30,76 @@ BEGIN_ODDLPARSER_NS
 
 DDLNode::DllNodeList DDLNode::s_allocatedNodes;
 
-template<class T>
-inline
-static void releaseDataType( T *ptr ) {
-    if( ddl_nullptr == ptr ) {
+template <class T>
+inline static void releaseDataType(T *ptr) {
+    if (nullptr == ptr) {
         return;
     }
 
-    T *current( ddl_nullptr );
-    while( ptr ) {
+    T *current(nullptr);
+    while (ptr) {
         current = ptr;
         ptr = ptr->m_next;
         delete current;
     }
 }
 
-static void releaseReferencedNames( Reference *ref ) {
-    if( ddl_nullptr == ref ) {
+static void releaseReferencedNames(Reference *ref) {
+    if (nullptr == ref) {
         return;
     }
 
     delete ref;
 }
 
-DDLNode::DDLNode( const std::string &type, const std::string &name, size_t idx, DDLNode *parent )
-: m_type( type )
-, m_name( name )
-, m_parent( parent )
-, m_children()
-, m_properties( ddl_nullptr )
-, m_value( ddl_nullptr )
-, m_dtArrayList( ddl_nullptr )
-, m_references( ddl_nullptr )
-, m_idx( idx ) {
-    if( m_parent ) {
-        m_parent->m_children.push_back( this );
+DDLNode::DDLNode(const std::string &type, const std::string &name, size_t idx, DDLNode *parent) :
+        m_type(type),
+        m_name(name),
+        m_parent(parent),
+        m_children(),
+        m_properties(nullptr),
+        m_value(nullptr),
+        m_dtArrayList(nullptr),
+        m_references(nullptr),
+        m_idx(idx) {
+    if (m_parent) {
+        m_parent->m_children.push_back(this);
     }
 }
 
 DDLNode::~DDLNode() {
     delete m_properties;
     delete m_value;
-    releaseReferencedNames( m_references );
+    releaseReferencedNames(m_references);
 
     delete m_dtArrayList;
-    m_dtArrayList = ddl_nullptr;
-    if( s_allocatedNodes[ m_idx ] == this ) {
-        s_allocatedNodes[ m_idx ] = ddl_nullptr;
+    m_dtArrayList = nullptr;
+    if (s_allocatedNodes[m_idx] == this) {
+        s_allocatedNodes[m_idx] = nullptr;
     }
-    for ( size_t i = 0; i<m_children.size(); i++ ){
-        delete m_children[ i ];
+    for (size_t i = 0; i < m_children.size(); i++) {
+        delete m_children[i];
     }
 }
 
-void DDLNode::attachParent( DDLNode *parent ) {
-    if( m_parent == parent ) {
+void DDLNode::attachParent(DDLNode *parent) {
+    if (m_parent == parent) {
         return;
     }
 
     m_parent = parent;
-    if( ddl_nullptr != m_parent ) {
-        m_parent->m_children.push_back( this );
+    if (nullptr != m_parent) {
+        m_parent->m_children.push_back(this);
     }
 }
 
 void DDLNode::detachParent() {
-    if( ddl_nullptr != m_parent ) {
-        DDLNodeIt it = std::find( m_parent->m_children.begin(), m_parent->m_children.end(), this );
-        if( m_parent->m_children.end() != it ) {
-            m_parent->m_children.erase( it );
+    if (nullptr != m_parent) {
+        DDLNodeIt it = std::find(m_parent->m_children.begin(), m_parent->m_children.end(), this);
+        if (m_parent->m_children.end() != it) {
+            m_parent->m_children.erase(it);
         }
-        m_parent = ddl_nullptr;
+        m_parent = nullptr;
     }
 }
 
@@ -111,7 +111,7 @@ const DDLNode::DllNodeList &DDLNode::getChildNodeList() const {
     return m_children;
 }
 
-void DDLNode::setType( const std::string &type ) {
+void DDLNode::setType(const std::string &type) {
     m_type = type;
 }
 
@@ -119,7 +119,7 @@ const std::string &DDLNode::getType() const {
     return m_type;
 }
 
-void DDLNode::setName( const std::string &name ) {
+void DDLNode::setName(const std::string &name) {
     m_name = name;
 }
 
@@ -127,8 +127,8 @@ const std::string &DDLNode::getName() const {
     return m_name;
 }
 
-void DDLNode::setProperties( Property *prop ) {
-    if(m_properties!=ddl_nullptr)
+void DDLNode::setProperties(Property *prop) {
+    if (m_properties != nullptr)
         delete m_properties;
     m_properties = prop;
 }
@@ -137,37 +137,37 @@ Property *DDLNode::getProperties() const {
     return m_properties;
 }
 
-bool DDLNode::hasProperty( const std::string &name ) {
-    const Property *prop( findPropertyByName( name ) );
-    return ( ddl_nullptr != prop );
+bool DDLNode::hasProperty(const std::string &name) {
+    const Property *prop(findPropertyByName(name));
+    return (nullptr != prop);
 }
 
 bool DDLNode::hasProperties() const {
-    return( ddl_nullptr != m_properties );
+    return (nullptr != m_properties);
 }
 
-Property *DDLNode::findPropertyByName( const std::string &name ) {
-    if( name.empty() ) {
-        return ddl_nullptr;
+Property *DDLNode::findPropertyByName(const std::string &name) {
+    if (name.empty()) {
+        return nullptr;
     }
 
-    if( ddl_nullptr == m_properties ) {
-        return ddl_nullptr;
+    if (nullptr == m_properties) {
+        return nullptr;
     }
 
-    Property *current( m_properties );
-    while( ddl_nullptr != current ) {
-        int res = strncmp( current->m_key->m_buffer, name.c_str(), name.size() );
-        if( 0 == res ) {
+    Property *current(m_properties);
+    while (nullptr != current) {
+        int res = strncmp(current->m_key->m_buffer, name.c_str(), name.size());
+        if (0 == res) {
             return current;
         }
         current = current->m_next;
     }
 
-    return ddl_nullptr;
+    return nullptr;
 }
 
-void DDLNode::setValue( Value *val ) {
+void DDLNode::setValue(Value *val) {
     m_value = val;
 }
 
@@ -175,7 +175,7 @@ Value *DDLNode::getValue() const {
     return m_value;
 }
 
-void DDLNode::setDataArrayList( DataArrayList  *dtArrayList ) {
+void DDLNode::setDataArrayList(DataArrayList *dtArrayList) {
     m_dtArrayList = dtArrayList;
 }
 
@@ -183,7 +183,7 @@ DataArrayList *DDLNode::getDataArrayList() const {
     return m_dtArrayList;
 }
 
-void DDLNode::setReferences( Reference *refs ) {
+void DDLNode::setReferences(Reference *refs) {
     m_references = refs;
 }
 
@@ -191,22 +191,32 @@ Reference *DDLNode::getReferences() const {
     return m_references;
 }
 
-void DDLNode::dump(IOStreamBase &/*stream*/) {
-    // Todo!    
+void DDLNode::dump(IOStreamBase &stream) {
+    if (!stream.isOpen()) {
+        return;
+    }
+
+    const std::string &type = this->getType();
+    stream.write("type = " + type);
+    Value::Iterator it(getValue());
+    while (it.hasNext()) {
+        Value *v = it.getNext();
+        v->dump(stream);
+    }
 }
 
-DDLNode *DDLNode::create( const std::string &type, const std::string &name, DDLNode *parent ) {
-    const size_t idx( s_allocatedNodes.size() );
-    DDLNode *node = new DDLNode( type, name, idx, parent );
-    s_allocatedNodes.push_back( node );
-    
+DDLNode *DDLNode::create(const std::string &type, const std::string &name, DDLNode *parent) {
+    const size_t idx(s_allocatedNodes.size());
+    DDLNode *node = new DDLNode(type, name, idx, parent);
+    s_allocatedNodes.push_back(node);
+
     return node;
 }
 
 void DDLNode::releaseNodes() {
-    if( s_allocatedNodes.size() > 0 ) {
-        for( DDLNodeIt it = s_allocatedNodes.begin(); it != s_allocatedNodes.end(); it++ ) {
-            if( *it ) {
+    if (s_allocatedNodes.size() > 0) {
+        for (DDLNodeIt it = s_allocatedNodes.begin(); it != s_allocatedNodes.end(); it++) {
+            if (*it) {
                 delete *it;
             }
         }
diff --git a/contrib/openddlparser/code/OpenDDLCommon.cpp b/contrib/openddlparser/code/OpenDDLCommon.cpp
index 5c341a780..d853efae8 100644
--- a/contrib/openddlparser/code/OpenDDLCommon.cpp
+++ b/contrib/openddlparser/code/OpenDDLCommon.cpp
@@ -1,7 +1,7 @@
 /*-----------------------------------------------------------------------------------------------
 The MIT License (MIT)
 
-Copyright (c) 2014-2015 Kim Kulling
+Copyright (c) 2014-2020 Kim Kulling
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
@@ -20,17 +20,17 @@ COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 -----------------------------------------------------------------------------------------------*/
-#include <openddlparser/OpenDDLCommon.h>
 #include <openddlparser/DDLNode.h>
+#include <openddlparser/OpenDDLCommon.h>
 #include <openddlparser/Value.h>
 
 BEGIN_ODDLPARSER_NS
 
-Text::Text( const char *buffer, size_t numChars )
-: m_capacity( 0 )
-, m_len( 0 )
-, m_buffer( ddl_nullptr ) {
-    set( buffer, numChars );
+Text::Text(const char *buffer, size_t numChars) :
+        m_capacity(0),
+        m_len(0),
+        m_buffer(nullptr) {
+    set(buffer, numChars);
 }
 
 Text::~Text() {
@@ -39,103 +39,98 @@ Text::~Text() {
 
 void Text::clear() {
     delete[] m_buffer;
-    m_buffer = ddl_nullptr;
+    m_buffer = nullptr;
     m_capacity = 0;
     m_len = 0;
 }
 
-void Text::set( const char *buffer, size_t numChars ) {
+void Text::set(const char *buffer, size_t numChars) {
     clear();
-    if( numChars > 0 ) {
+    if (numChars > 0) {
         m_len = numChars;
         m_capacity = m_len + 1;
-        m_buffer = new char[ m_capacity ];
-        strncpy( m_buffer, buffer, numChars );
-        m_buffer[ numChars ] = '\0';
+        m_buffer = new char[m_capacity];
+        strncpy(m_buffer, buffer, numChars);
+        m_buffer[numChars] = '\0';
     }
 }
 
-bool Text::operator == ( const std::string &name ) const {
-    if( m_len != name.size() ) {
+bool Text::operator==(const std::string &name) const {
+    if (m_len != name.size()) {
         return false;
     }
-    const int res( strncmp( m_buffer, name.c_str(), name.size() ) );
+    const int res(strncmp(m_buffer, name.c_str(), name.size()));
 
-    return ( 0 == res );
+    return (0 == res);
 }
 
-bool Text::operator == ( const Text &rhs ) const {
-    if( m_len != rhs.m_len ) {
+bool Text::operator==(const Text &rhs) const {
+    if (m_len != rhs.m_len) {
         return false;
     }
 
-    const int res( strncmp( m_buffer, rhs.m_buffer, m_len ) );
+    const int res(strncmp(m_buffer, rhs.m_buffer, m_len));
 
-    return ( 0 == res );
+    return (0 == res);
 }
 
-Name::Name( NameType type, Text *id )
-: m_type( type )
-, m_id( id ) {
+Name::Name(NameType type, Text *id) :
+        m_type(type), m_id(id) {
     // empty
 }
 
 Name::~Name() {
     delete m_id;
-    m_id = ddl_nullptr;
+    m_id = nullptr;
 }
 
-Name::Name( const Name &name ){
-    m_type=name.m_type;
-    m_id=new Text(name.m_id->m_buffer,name.m_id->m_len);
+Name::Name(const Name &name) {
+    m_type = name.m_type;
+    m_id = new Text(name.m_id->m_buffer, name.m_id->m_len);
 }
 
-
-
-    Reference::Reference()
-: m_numRefs( 0 )
-, m_referencedName( ddl_nullptr ) {
+Reference::Reference() :
+        m_numRefs(0), m_referencedName(nullptr) {
     // empty
 }
 
-Reference::Reference( size_t numrefs, Name **names )
-: m_numRefs( numrefs )
-, m_referencedName( ddl_nullptr ) {
-    if ( numrefs > 0 ) {
-        m_referencedName = new Name *[ numrefs ];
-        for ( size_t i = 0; i < numrefs; i++ ) {
-            m_referencedName[ i ] = names[i];
+Reference::Reference(size_t numrefs, Name **names) :
+        m_numRefs(numrefs), m_referencedName(nullptr) {
+    if (numrefs > 0) {
+        m_referencedName = new Name *[numrefs];
+        for (size_t i = 0; i < numrefs; i++) {
+            m_referencedName[i] = names[i];
         }
     }
 }
 Reference::Reference(const Reference &ref) {
-    m_numRefs=ref.m_numRefs;
-    if(m_numRefs!=0){
-        m_referencedName = new Name*[m_numRefs];
-        for ( size_t i = 0; i < m_numRefs; i++ ) {
+    m_numRefs = ref.m_numRefs;
+    if (m_numRefs != 0) {
+        m_referencedName = new Name *[m_numRefs];
+        for (size_t i = 0; i < m_numRefs; i++) {
             m_referencedName[i] = new Name(*ref.m_referencedName[i]);
         }
     }
 }
 
 Reference::~Reference() {
-    for( size_t i = 0; i < m_numRefs; i++ ) {
-        delete m_referencedName[ i ];
+    for (size_t i = 0; i < m_numRefs; i++) {
+        delete m_referencedName[i];
     }
     m_numRefs = 0;
-    delete [] m_referencedName;
-    m_referencedName = ddl_nullptr;
+    delete[] m_referencedName;
+    m_referencedName = nullptr;
 }
 
 size_t Reference::sizeInBytes() {
-    if ( 0 == m_numRefs ) {
+    if (0 == m_numRefs) {
         return 0;
     }
 
-    size_t size( 0 );
-    for ( size_t i = 0; i < m_numRefs; i++ ) {
-        Name *name( m_referencedName[ i ] );
-        if ( ddl_nullptr != name ) {
+    size_t size(0);
+    for (size_t i = 0; i < m_numRefs; i++) {
+        Name *name(m_referencedName[i]);
+        if (nullptr != name) {
             size += name->m_id->m_len;
         }
     }
@@ -143,60 +138,53 @@ size_t Reference::sizeInBytes() {
     return size;
 }
 
-Property::Property( Text *id )
-: m_key( id )
-, m_value( ddl_nullptr )
-, m_ref( ddl_nullptr )
-, m_next( ddl_nullptr ) {
+Property::Property(Text *id) :
+        m_key(id), m_value(nullptr), m_ref(nullptr), m_next(nullptr) {
     // empty
 }
 
 Property::~Property() {
     delete m_key;
-    if(m_value!=ddl_nullptr)
+    if (m_value != nullptr)
         delete m_value;
-    if(m_ref!=ddl_nullptr)
-        delete(m_ref);
-    if(m_next!=ddl_nullptr)
+    if (m_ref != nullptr)
+        delete (m_ref);
+    if (m_next != nullptr)
         delete m_next;
 }
 
-DataArrayList::DataArrayList()
-: m_numItems( 0 )
-, m_dataList( ddl_nullptr )
-, m_next( ddl_nullptr )
-, m_refs(ddl_nullptr)
-, m_numRefs(0){
+DataArrayList::DataArrayList() :
+        m_numItems(0), m_dataList(nullptr), m_next(nullptr), m_refs(nullptr), m_numRefs(0) {
     // empty
 }
 
 DataArrayList::~DataArrayList() {
     delete m_dataList;
-    if(m_next!=ddl_nullptr)
+    if (m_next != nullptr)
         delete m_next;
-    if(m_refs!=ddl_nullptr)
+    if (m_refs != nullptr)
         delete m_refs;
 }
 
 size_t DataArrayList::size() {
-    size_t result( 0 );
-    if ( ddl_nullptr == m_next ) {
-        if ( m_dataList != ddl_nullptr ) {
+    size_t result(0);
+    if (nullptr == m_next) {
+        if (m_dataList != nullptr) {
             result = 1;
         }
         return result;
     }
 
-    DataArrayList *n( m_next );
-    while( ddl_nullptr != n ) {
+    DataArrayList *n(m_next);
+    while (nullptr != n) {
         result++;
         n = n->m_next;
     }
     return result;
 }
 
-Context::Context()
-: m_root( ddl_nullptr ) {
+Context::Context() :
+        m_root(nullptr) {
     // empty
 }
 
@@ -206,7 +194,7 @@ Context::~Context() {
 
 void Context::clear() {
     delete m_root;
-    m_root = ddl_nullptr;
+    m_root = nullptr;
 }
 
 END_ODDLPARSER_NS
diff --git a/contrib/openddlparser/code/OpenDDLExport.cpp b/contrib/openddlparser/code/OpenDDLExport.cpp
index e45fb041a..6d6f2458d 100644
--- a/contrib/openddlparser/code/OpenDDLExport.cpp
+++ b/contrib/openddlparser/code/OpenDDLExport.cpp
@@ -1,7 +1,7 @@
 /*-----------------------------------------------------------------------------------------------
 The MIT License (MIT)
 
-Copyright (c) 2014-2015 Kim Kulling
+Copyright (c) 2014-2020 Kim Kulling
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
@@ -20,10 +20,10 @@ COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 -----------------------------------------------------------------------------------------------*/
-#include <openddlparser/OpenDDLExport.h>
 #include <openddlparser/DDLNode.h>
-#include <openddlparser/Value.h>
+#include <openddlparser/OpenDDLExport.h>
 #include <openddlparser/OpenDDLParser.h>
+#include <openddlparser/Value.h>
 
 #include <sstream>
 
@@ -33,9 +33,8 @@ struct DDLNodeIterator {
     const DDLNode::DllNodeList &m_childs;
     size_t m_idx;
 
-    DDLNodeIterator( const DDLNode::DllNodeList &childs ) 
-    : m_childs( childs )
-    , m_idx( 0 ) {
+    DDLNodeIterator(const DDLNode::DllNodeList &childs) :
+            m_childs(childs), m_idx(0) {
         // empty
     }
 
@@ -43,10 +42,10 @@ struct DDLNodeIterator {
         // empty
     }
 
-    bool getNext( DDLNode **node ) {
-        if( m_childs.size() > (m_idx+1) ) {
+    bool getNext(DDLNode **node) {
+        if (m_childs.size() > (m_idx + 1)) {
             m_idx++;
-            *node = m_childs[ m_idx ];
+            *node = m_childs[m_idx];
             return true;
         }
 
@@ -55,65 +54,65 @@ struct DDLNodeIterator {
 
 private:
     DDLNodeIterator() ddl_no_copy;
-    DDLNodeIterator &operator = ( const DDLNodeIterator & ) ddl_no_copy;
+    DDLNodeIterator &operator=(const DDLNodeIterator &) ddl_no_copy;
 };
 
-static void writeLineEnd( std::string &statement ) {
+static void writeLineEnd(std::string &statement) {
     statement += "\n";
 }
 
-OpenDDLExport::OpenDDLExport( IOStreamBase *stream )
-: m_stream( stream ) {
-    if (ddl_nullptr == m_stream) {
+OpenDDLExport::OpenDDLExport(IOStreamBase *stream) :
+        m_stream(stream) {
+    if (nullptr == m_stream) {
         m_stream = new IOStreamBase();
     }
 }
 
 OpenDDLExport::~OpenDDLExport() {
-    if (ddl_nullptr != m_stream) {
+    if (nullptr != m_stream) {
         m_stream->close();
     }
     delete m_stream;
 }
 
-bool OpenDDLExport::exportContext( Context *ctx, const std::string &filename ) {
-    if( ddl_nullptr == ctx ) {
+bool OpenDDLExport::exportContext(Context *ctx, const std::string &filename) {
+    if (nullptr == ctx) {
         return false;
     }
 
-    DDLNode *root( ctx->m_root );
-    if ( ddl_nullptr == root ) {
+    DDLNode *root(ctx->m_root);
+    if (nullptr == root) {
         return true;
     }
 
     if (!filename.empty()) {
-        if (!m_stream->open( filename )) {
+        if (!m_stream->open(filename)) {
             return false;
         }
     }
 
-    const bool retValue( handleNode( root ) );
-    
+    const bool retValue(handleNode(root));
+
     return retValue;
 }
 
-bool OpenDDLExport::handleNode( DDLNode *node ) {
-    if( ddl_nullptr == node ) {
+bool OpenDDLExport::handleNode(DDLNode *node) {
+    if (nullptr == node) {
         return true;
     }
 
     const DDLNode::DllNodeList &childs = node->getChildNodeList();
-    if( childs.empty() ) {
+    if (childs.empty()) {
         return true;
     }
-    DDLNode *current( ddl_nullptr );
-    DDLNodeIterator it( childs );
+    DDLNode *current(nullptr);
+    DDLNodeIterator it(childs);
     std::string statement;
-    bool success( true );
-    while( it.getNext( &current ) ) {
-        if( ddl_nullptr != current ) {
-            success |= writeNode( current, statement );
-            if( !handleNode( current ) ) {
+    bool success(true);
+    while (it.getNext(&current)) {
+        if (nullptr != current) {
+            success |= writeNode(current, statement);
+            if (!handleNode(current)) {
                 success = false;
             }
         }
@@ -122,56 +121,57 @@ bool OpenDDLExport::handleNode( DDLNode *node ) {
     return success;
 }
 
-bool OpenDDLExport::writeToStream( const std::string &statement ) {
-    if (ddl_nullptr == m_stream ) {
+bool OpenDDLExport::writeToStream(const std::string &statement) {
+    if (nullptr == m_stream) {
         return false;
     }
 
-    if ( !statement.empty()) {
-        m_stream->write( statement );
+    if (!statement.empty()) {
+        m_stream->write(statement);
     }
 
     return true;
 }
 
-bool OpenDDLExport::writeNode( DDLNode *node, std::string &statement ) {
-    writeNodeHeader( node, statement );
+bool OpenDDLExport::writeNode(DDLNode *node, std::string &statement) {
+    bool success(true);
+    writeNodeHeader(node, statement);
     if (node->hasProperties()) {
-        writeProperties( node, statement );
+        success |= writeProperties(node, statement);
     }
-    writeLineEnd( statement );
+    writeLineEnd(statement);
 
     statement = "}";
-    DataArrayList *al( node->getDataArrayList() );
-    if ( ddl_nullptr != al ) {
-        writeValueType( al->m_dataList->m_type, al->m_numItems, statement );
-        writeValueArray( al, statement );
+    DataArrayList *al(node->getDataArrayList());
+    if (nullptr != al) {
+        writeValueType(al->m_dataList->m_type, al->m_numItems, statement);
+        writeValueArray(al, statement);
     }
-    Value *v( node->getValue() );
-    if (ddl_nullptr != v ) {
-        writeValueType( v->m_type, 1, statement );
+    Value *v(node->getValue());
+    if (nullptr != v) {
+        writeValueType(v->m_type, 1, statement);
         statement = "{";
-        writeLineEnd( statement );
-        writeValue( v, statement );
+        writeLineEnd(statement);
+        writeValue(v, statement);
         statement = "}";
-        writeLineEnd( statement );
+        writeLineEnd(statement);
     }
     statement = "}";
-    writeLineEnd( statement );
+    writeLineEnd(statement);
 
-    writeToStream( statement );
+    writeToStream(statement);
 
     return true;
 }
 
-bool OpenDDLExport::writeNodeHeader( DDLNode *node, std::string &statement ) {
-    if (ddl_nullptr == node) {
+bool OpenDDLExport::writeNodeHeader(DDLNode *node, std::string &statement) {
+    if (nullptr == node) {
         return false;
     }
 
     statement += node->getType();
-    const std::string &name( node->getName() );
-    if ( !name.empty() ) {
+    const std::string &name(node->getName());
+    if (!name.empty()) {
         statement += " ";
         statement += "$";
         statement += name;
@@ -180,30 +180,30 @@ bool OpenDDLExport::writeNodeHeader( DDLNode *node, std::string &statement ) {
     return true;
 }
 
-bool OpenDDLExport::writeProperties( DDLNode *node, std::string &statement ) {
-    if ( ddl_nullptr == node ) {
+bool OpenDDLExport::writeProperties(DDLNode *node, std::string &statement) {
+    if (nullptr == node) {
         return false;
     }
 
-    Property *prop( node->getProperties() );
+    Property *prop(node->getProperties());
     // if no properties are there, return
-    if ( ddl_nullptr == prop ) {
+    if (nullptr == prop) {
         return true;
     }
 
-    if ( ddl_nullptr != prop ) {
+    if (nullptr != prop) {
         // for instance (attrib = "position", bla=2)
         statement += "(";
-        bool first( true );
-        while ( ddl_nullptr != prop ) {
+        bool first(true);
+        while (nullptr != prop) {
             if (!first) {
                 statement += ", ";
             } else {
                 first = false;
             }
-            statement += std::string( prop->m_key->m_buffer );
+            statement += std::string(prop->m_key->m_buffer);
             statement += " = ";
-            writeValue( prop->m_value, statement );
+            writeValue(prop->m_value, statement);
             prop = prop->m_next;
         }
 
@@ -213,19 +213,19 @@ bool OpenDDLExport::writeProperties( DDLNode *node, std::string &statement ) {
     return true;
 }
 
-bool OpenDDLExport::writeValueType( Value::ValueType type, size_t numItems, std::string &statement ) {
-    if ( Value::ddl_types_max == type) {
+bool OpenDDLExport::writeValueType(Value::ValueType type, size_t numItems, std::string &statement) {
+    if (Value::ValueType::ddl_types_max == type) {
         return false;
     }
 
-    const std::string typeStr( getTypeToken( type ) );
+    const std::string typeStr(getTypeToken(type));
     statement += typeStr;
     // if we have an array to write
-    if ( numItems > 1 ) {
+    if (numItems > 1) {
         statement += "[";
-        char buffer[ 256 ];
-        ::memset( buffer, '\0', 256 * sizeof( char ) );
-        sprintf( buffer, "%d", static_cast<int>( numItems ) );
+        char buffer[256];
+        ::memset(buffer, '\0', 256 * sizeof(char));
+        sprintf(buffer, "%d", static_cast<int>(numItems));
         statement += buffer;
         statement += "]";
     }
@@ -233,115 +233,93 @@ bool OpenDDLExport::writeValueType( Value::ValueType type, size_t numItems, std:
     return true;
 }
 
-bool OpenDDLExport::writeValue( Value *val, std::string &statement ) {
-    if (ddl_nullptr == val) {
+bool OpenDDLExport::writeValue(Value *val, std::string &statement) {
+    if (nullptr == val) {
         return false;
     }
 
-    switch ( val->m_type ) {
-        case Value::ddl_bool:
-            if ( true == val->getBool() ) {
+    switch (val->m_type) {
+        case Value::ValueType::ddl_bool:
+            if (true == val->getBool()) {
                 statement += "true";
             } else {
                 statement += "false";
             }
             break;
-        case Value::ddl_int8: 
-            {
-                std::stringstream stream;
-                const int i = static_cast<int>( val->getInt8() );
-                stream << i;
-                statement += stream.str();
-            }
+        case Value::ValueType::ddl_int8 : {
+            std::stringstream stream;
+            const int i = static_cast<int>(val->getInt8());
+            stream << i;
+            statement += stream.str();
+        } break;
+        case Value::ValueType::ddl_int16: {
+            std::stringstream stream;
+            char buffer[256];
+            ::memset(buffer, '\0', 256 * sizeof(char));
+            sprintf(buffer, "%d", val->getInt16());
+            statement += buffer;
+        } break;
+        case Value::ValueType::ddl_int32: {
+            std::stringstream stream;
+            char buffer[256];
+            ::memset(buffer, '\0', 256 * sizeof(char));
+            const int i = static_cast<int>(val->getInt32());
+            sprintf(buffer, "%d", i);
+            statement += buffer;
+        } break;
+        case Value::ValueType::ddl_int64: {
+            std::stringstream stream;
+            const int i = static_cast<int>(val->getInt64());
+            stream << i;
+            statement += stream.str();
+        } break;
+        case Value::ValueType::ddl_unsigned_int8: {
+            std::stringstream stream;
+            const int i = static_cast<unsigned int>(val->getUnsignedInt8());
+            stream << i;
+            statement += stream.str();
+        } break;
+        case Value::ValueType::ddl_unsigned_int16: {
+            std::stringstream stream;
+            const int i = static_cast<unsigned int>(val->getUnsignedInt16());
+            stream << i;
+            statement += stream.str();
+        } break;
+        case Value::ValueType::ddl_unsigned_int32: {
+            std::stringstream stream;
+            const int i = static_cast<unsigned int>(val->getUnsignedInt32());
+            stream << i;
+            statement += stream.str();
+        } break;
+        case Value::ValueType::ddl_unsigned_int64: {
+            std::stringstream stream;
+            const int i = static_cast<unsigned int>(val->getUnsignedInt64());
+            stream << i;
+            statement += stream.str();
+        } break;
+        case Value::ValueType::ddl_half:
             break;
-        case Value::ddl_int16:
-            {
-                std::stringstream stream;
-                char buffer[ 256 ];
-                ::memset( buffer, '\0', 256 * sizeof( char ) );
-                sprintf( buffer, "%d", val->getInt16() );
-                statement += buffer;
-        }
+        case Value::ValueType::ddl_float: {
+            std::stringstream stream;
+            stream << val->getFloat();
+            statement += stream.str();
+        } break;
+        case Value::ValueType::ddl_double: {
+            std::stringstream stream;
+            stream << val->getDouble();
+            statement += stream.str();
+        } break;
+        case Value::ValueType::ddl_string: {
+            std::stringstream stream;
+            stream << val->getString();
+            statement += "\"";
+            statement += stream.str();
+            statement += "\"";
+        } break;
+        case Value::ValueType::ddl_ref:
             break;
-        case Value::ddl_int32:
-            {
-                std::stringstream stream;
-                char buffer[ 256 ];
-                ::memset( buffer, '\0', 256 * sizeof( char ) );
-                const int i = static_cast< int >( val->getInt32() );
-                sprintf( buffer, "%d", i );
-                statement += buffer;
-            }
-            break;
-        case Value::ddl_int64:
-            {
-                std::stringstream stream;
-                const int i = static_cast< int >( val->getInt64() );
-                stream << i;
-                statement += stream.str();
-            }
-            break;
-        case Value::ddl_unsigned_int8:
-            {
-                std::stringstream stream;
-                const int i = static_cast< unsigned int >( val->getUnsignedInt8() );
-                stream << i;
-                statement += stream.str();
-            }
-            break;
-        case Value::ddl_unsigned_int16:
-            {
-                std::stringstream stream;
-                const int i = static_cast< unsigned int >( val->getUnsignedInt16() );
-                stream << i;
-                statement += stream.str();
-            }
-            break;
-        case Value::ddl_unsigned_int32:
-            {
-                std::stringstream stream;
-                const int i = static_cast< unsigned int >( val->getUnsignedInt32() );
-                stream << i;
-                statement += stream.str();
-            }
-            break;
-        case Value::ddl_unsigned_int64:
-            {
-                std::stringstream stream;
-                const int i = static_cast< unsigned int >( val->getUnsignedInt64() );
-                stream << i;
-                statement += stream.str();
-            }
-            break;
-        case Value::ddl_half:
-            break;
-        case Value::ddl_float:
-            {
-                std::stringstream stream;
-                stream << val->getFloat();
-                statement += stream.str();
-            }
-            break;
-        case Value::ddl_double:
-            {
-                std::stringstream stream;
-                stream << val->getDouble();
-                statement += stream.str();
-            }
-            break;
-        case Value::ddl_string:
-            {
-                std::stringstream stream;
-                stream << val->getString();
-                statement += "\"";
-                statement += stream.str();
-                statement += "\"";
-             }
-            break;
-        case Value::ddl_ref:
-            break;
-        case Value::ddl_none:
-        case Value::ddl_types_max:
+        case Value::ValueType::ddl_none:
+        case Value::ValueType::ddl_types_max:
         default:
             break;
     }
@@ -349,8 +327,8 @@ bool OpenDDLExport::writeValue( Value *val, std::string &statement ) {
     return true;
 }
 
-bool OpenDDLExport::writeValueArray( DataArrayList *al, std::string &statement ) {
-    if (ddl_nullptr == al) {
+bool OpenDDLExport::writeValueArray(DataArrayList *al, std::string &statement) {
+    if (nullptr == al) {
         return false;
     }
 
@@ -358,17 +336,18 @@ bool OpenDDLExport::writeValueArray( DataArrayList *al, std::string &statement )
         return true;
     }
 
-    DataArrayList *nextDataArrayList = al ;
-    while (ddl_nullptr != nextDataArrayList) {
-        if (ddl_nullptr != nextDataArrayList) {
+    DataArrayList *nextDataArrayList = al;
+    Value *nextValue(nextDataArrayList->m_dataList);
+    while (nullptr != nextDataArrayList) {
+        if (nullptr != nextDataArrayList) {
             statement += "{ ";
-            Value *nextValue( nextDataArrayList->m_dataList );
-            size_t idx( 0 );
-            while (ddl_nullptr != nextValue) {
+            nextValue = nextDataArrayList->m_dataList;
+            size_t idx(0);
+            while (nullptr != nextValue) {
                 if (idx > 0) {
                     statement += ", ";
                 }
-                writeValue( nextValue, statement );
+                writeValue(nextValue, statement);
                 nextValue = nextValue->m_next;
                 idx++;
             }
@@ -381,4 +360,3 @@ bool OpenDDLExport::writeValueArray( DataArrayList *al, std::string &statement )
 }
 
 END_ODDLPARSER_NS
-
diff --git a/contrib/openddlparser/code/OpenDDLParser.cpp b/contrib/openddlparser/code/OpenDDLParser.cpp
index 91831ba27..024c26f41 100644
--- a/contrib/openddlparser/code/OpenDDLParser.cpp
+++ b/contrib/openddlparser/code/OpenDDLParser.cpp
@@ -1,7 +1,7 @@
 /*-----------------------------------------------------------------------------------------------
 The MIT License (MIT)
 
-Copyright (c) 2014-2015 Kim Kulling
+Copyright (c) 2014-2020 Kim Kulling
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
@@ -20,112 +20,106 @@ COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 -----------------------------------------------------------------------------------------------*/
-#include <openddlparser/OpenDDLParser.h>
 #include <openddlparser/OpenDDLExport.h>
+#include <openddlparser/OpenDDLParser.h>
 
+#include <math.h>
+#include <algorithm>
 #include <cassert>
 #include <iostream>
 #include <sstream>
-#include <algorithm>
-#include <memory>
-#include <math.h>
 
 #ifdef _WIN32
-#  include <windows.h>
+#include <windows.h>
 #endif // _WIN32
 
-
 BEGIN_ODDLPARSER_NS
 
 static const char *Version = "0.4.0";
 
 namespace Grammar {
-    static const char *OpenBracketToken   = "{";
-    static const char *CloseBracketToken  = "}";
-    static const char *OpenPropertyToken  = "(";
-    static const char *ClosePropertyToken = ")";
-    static const char *OpenArrayToken     = "[";
-    static const char *CloseArrayToken    = "]";
-    static const char *BoolTrue           = "true";
-    static const char *BoolFalse          = "false";
-    static const char *CommaSeparator     = ",";
 
-    static const char *PrimitiveTypeToken[ Value::ddl_types_max ] = {
-        "bool",
-        "int8",
-        "int16",
-        "int32",
-        "int64",
-        "unsigned_int8",
-        "unsigned_int16",
-        "unsigned_int32",
-        "unsigned_int64",
-        "half",
-        "float",
-        "double",
-        "string",
-        "ref"
-    };
+static const char *OpenBracketToken = "{";
+static const char *CloseBracketToken = "}";
+static const char *OpenPropertyToken = "(";
+static const char *ClosePropertyToken = ")";
+static const char *OpenArrayToken = "[";
+static const char *CloseArrayToken = "]";
+static const char *BoolTrue = "true";
+static const char *BoolFalse = "false";
+static const char *CommaSeparator = ",";
+
+static const char *PrimitiveTypeToken[(size_t)Value::ValueType::ddl_types_max] = {
+    "bool",
+    "int8",
+    "int16",
+    "int32",
+    "int64",
+    "unsigned_int8",
+    "unsigned_int16",
+    "unsigned_int32",
+    "unsigned_int64",
+    "half",
+    "float",
+    "double",
+    "string",
+    "ref"
+};
 } // Namespace Grammar
 
-const char *getTypeToken( Value::ValueType  type ) {
-    return Grammar::PrimitiveTypeToken[ type ];
+const char *getTypeToken(Value::ValueType type) {
+    return Grammar::PrimitiveTypeToken[(size_t)type];
 }
 
-static void logInvalidTokenError( char *in, const std::string &exp, OpenDDLParser::logCallback callback ) {
+static void logInvalidTokenError(char *in, const std::string &exp, OpenDDLParser::logCallback callback) {
     std::stringstream stream;
-    stream << "Invalid token \"" << *in << "\"" << " expected \"" << exp << "\"" << std::endl;
-    std::string full( in );
-    std::string part( full.substr( 0, 50 ) );
+    stream << "Invalid token \"" << *in << "\""
+           << " expected \"" << exp << "\"" << std::endl;
+    std::string full(in);
+    std::string part(full.substr(0, 50));
     stream << part;
-    callback( ddl_error_msg, stream.str() );
+    callback(ddl_error_msg, stream.str());
 }
 
-static bool isIntegerType( Value::ValueType integerType ) {
-    if( integerType != Value::ddl_int8 && integerType != Value::ddl_int16 &&
-            integerType != Value::ddl_int32 && integerType != Value::ddl_int64 ) {
-        return false;
-    }
-    
-    return true;
-}
-
-static bool isUnsignedIntegerType( Value::ValueType integerType ) {
-    if( integerType != Value::ddl_unsigned_int8 && integerType != Value::ddl_unsigned_int16 &&
-            integerType != Value::ddl_unsigned_int32 && integerType != Value::ddl_unsigned_int64 ) {
+static bool isIntegerType(Value::ValueType integerType) {
+    if (integerType != Value::ValueType::ddl_int8 && integerType != Value::ValueType::ddl_int16 &&
+            integerType != Value::ValueType::ddl_int32 && integerType != Value::ValueType::ddl_int64) {
         return false;
     }
 
     return true;
 }
 
-static DDLNode *createDDLNode( Text *id, OpenDDLParser *parser ) {
-    // Basic checks
-    if( ddl_nullptr == id || ddl_nullptr == parser ) {
-        return ddl_nullptr;
-    }
-    
-    // If the buffer is empty ( an empty node ) return nullptr
-    if ( ddl_nullptr == id->m_buffer ) {
-        return ddl_nullptr;
+static bool isUnsignedIntegerType(Value::ValueType integerType) {
+    if (integerType != Value::ValueType::ddl_unsigned_int8 && integerType != Value::ValueType::ddl_unsigned_int16 &&
+            integerType != Value::ValueType::ddl_unsigned_int32 && integerType != Value::ValueType::ddl_unsigned_int64) {
+        return false;
     }
 
-    const std::string type( id->m_buffer );
-    DDLNode *parent( parser->top() );
-    DDLNode *node = DDLNode::create( type, "", parent );
-    
+    return true;
+}
+
+static DDLNode *createDDLNode(Text *id, OpenDDLParser *parser) {
+    if (nullptr == id || nullptr == parser || id->m_buffer == nullptr) {
+        return nullptr;
+    }
+
+    const std::string type(id->m_buffer);
+    DDLNode *parent(parser->top());
+    DDLNode *node = DDLNode::create(type, "", parent);
+
     return node;
 }
 
-static void logMessage( LogSeverity severity, const std::string &msg ) {
+static void logMessage(LogSeverity severity, const std::string &msg) {
     std::string log;
-    if( ddl_debug_msg == severity ) {
+    if (ddl_debug_msg == severity) {
         log += "Debug:";
-    } else if( ddl_info_msg == severity ) {
+    } else if (ddl_info_msg == severity) {
         log += "Info :";
-    } else if( ddl_warn_msg == severity ) {
+    } else if (ddl_warn_msg == severity) {
         log += "Warn :";
-    } else if( ddl_error_msg == severity ) {
+    } else if (ddl_error_msg == severity) {
         log += "Error:";
     } else {
         log += "None :";
@@ -135,20 +129,18 @@ static void logMessage( LogSeverity severity, const std::string &msg ) {
     std::cout << log;
 }
 
-OpenDDLParser::OpenDDLParser()
-: m_logCallback( logMessage )
-, m_buffer()
-, m_stack()
-, m_context( ddl_nullptr ) {
+OpenDDLParser::OpenDDLParser() :
+        m_logCallback(logMessage),
+        m_buffer(),
+        m_stack(),
+        m_context(nullptr) {
     // empty
 }
 
-OpenDDLParser::OpenDDLParser( const char *buffer, size_t len )
-: m_logCallback( &logMessage )
-, m_buffer()
-, m_context( ddl_nullptr ) {
-    if( 0 != len ) {
-        setBuffer( buffer, len );
+OpenDDLParser::OpenDDLParser(const char *buffer, size_t len) :
+        m_logCallback(&logMessage), m_buffer(), m_context(nullptr) {
+    if (0 != len) {
+        setBuffer(buffer, len);
     }
 }
 
@@ -156,8 +148,8 @@ OpenDDLParser::~OpenDDLParser() {
     clear();
 }
 
-void OpenDDLParser::setLogCallback( logCallback callback ) {
-    if( ddl_nullptr != callback ) {
+void OpenDDLParser::setLogCallback(logCallback callback) {
+    if (nullptr != callback) {
         // install user-specific log callback
         m_logCallback = callback;
     } else {
@@ -170,28 +162,28 @@ OpenDDLParser::logCallback OpenDDLParser::getLogCallback() const {
     return m_logCallback;
 }
 
-void OpenDDLParser::setBuffer( const char *buffer, size_t len ) {
+void OpenDDLParser::setBuffer(const char *buffer, size_t len) {
     clear();
-    if( 0 == len ) {
+    if (0 == len) {
         return;
     }
 
-    m_buffer.resize( len );
-    ::memcpy(&m_buffer[ 0 ], buffer, len );
+    m_buffer.resize(len);
+    ::memcpy(&m_buffer[0], buffer, len);
 }
 
-void OpenDDLParser::setBuffer( const std::vector<char> &buffer ) {
+void OpenDDLParser::setBuffer(const std::vector<char> &buffer) {
     clear();
-    m_buffer.resize( buffer.size() );
-    std::copy( buffer.begin(), buffer.end(), m_buffer.begin() );
+    m_buffer.resize(buffer.size());
+    std::copy(buffer.begin(), buffer.end(), m_buffer.begin());
 }
 
 const char *OpenDDLParser::getBuffer() const {
-    if( m_buffer.empty() ) {
-        return ddl_nullptr;
+    if (m_buffer.empty()) {
+        return nullptr;
     }
 
-    return &m_buffer[ 0 ];
+    return &m_buffer[0];
 }
 
 size_t OpenDDLParser::getBufferSize() const {
@@ -199,266 +191,279 @@ size_t OpenDDLParser::getBufferSize() const {
 }
 
 void OpenDDLParser::clear() {
-    m_buffer.resize( 0 );
-    if( ddl_nullptr != m_context ) {
+    m_buffer.resize(0);
+    if (nullptr != m_context) {
         delete m_context;
-        m_context=ddl_nullptr;
+        m_context = nullptr;
     }
 
-//    DDLNode::releaseNodes();
+    //    DDLNode::releaseNodes();
 }
 
-bool OpenDDLParser::parse() {
-    if( m_buffer.empty() ) {
+bool OpenDDLParser::validate() {
+    if (m_buffer.empty()) {
+        return true;
+    }
+
+    if (!isCharacter(m_buffer[0]) && !isNumeric(m_buffer[0])) {
         return false;
     }
 
-    normalizeBuffer( m_buffer );
+    return true;
+}
+
+bool OpenDDLParser::parse() {
+    if (m_buffer.empty()) {
+        return false;
+    }
+
+    normalizeBuffer(m_buffer);
+    if (!validate()) {
+        return false;
+    }
 
     m_context = new Context;
-    m_context->m_root = DDLNode::create( "root", "", ddl_nullptr );
-    pushNode( m_context->m_root );
+    m_context->m_root = DDLNode::create("root", "", nullptr);
+    pushNode(m_context->m_root);
 
     // do the main parsing
-    char *current( &m_buffer[ 0 ] );
-    char *end( &m_buffer[m_buffer.size() - 1 ] + 1 );
-    size_t pos( current - &m_buffer[ 0 ] );
-    while( pos < m_buffer.size() ) {
-        current = parseNextNode( current, end );
-        if ( current == ddl_nullptr ) {
+    char *current(&m_buffer[0]);
+    char *end(&m_buffer[m_buffer.size() - 1] + 1);
+    size_t pos(current - &m_buffer[0]);
+    while (pos < m_buffer.size()) {
+        current = parseNextNode(current, end);
+        if (current == nullptr) {
             return false;
         }
-        pos = current - &m_buffer[ 0 ];
+        pos = current - &m_buffer[0];
     }
     return true;
 }
 
-bool OpenDDLParser::exportContext( Context *ctx, const std::string &filename ) {
-    if( ddl_nullptr == ctx ) {
+bool OpenDDLParser::exportContext(Context *ctx, const std::string &filename) {
+    if (nullptr == ctx) {
         return false;
     }
 
     OpenDDLExport myExporter;
-    return myExporter.exportContext( ctx, filename );
+    return myExporter.exportContext(ctx, filename);
 }
 
-char *OpenDDLParser::parseNextNode( char *in, char *end ) {
-    in = parseHeader( in, end );
-    in = parseStructure( in, end );
+char *OpenDDLParser::parseNextNode(char *in, char *end) {
+    in = parseHeader(in, end);
+    in = parseStructure(in, end);
 
     return in;
 }
 
 #ifdef DEBUG_HEADER_NAME
-static void dumpId( Identifier *id ) {
-    if( ddl_nullptr != id ) {
-        if ( ddl_nullptr != id->m_text.m_buffer ) {
+static void dumpId(Identifier *id) {
+    if (nullptr != id) {
+        if (nullptr != id->m_text.m_buffer) {
             std::cout << id->m_text.m_buffer << std::endl;
-	    }
+        }
     }
 }
 #endif
 
-char *OpenDDLParser::parseHeader( char *in, char *end ) {
-    if( ddl_nullptr == in || in == end ) {
+char *OpenDDLParser::parseHeader(char *in, char *end) {
+    if (nullptr == in || in == end) {
         return in;
     }
 
-    Text *id( ddl_nullptr );
-    in = OpenDDLParser::parseIdentifier( in, end, &id );
+    Text *id(nullptr);
+    in = OpenDDLParser::parseIdentifier(in, end, &id);
 
 #ifdef DEBUG_HEADER_NAME
-    dumpId( id );
+    dumpId(id);
 #endif // DEBUG_HEADER_NAME
 
-    in = lookForNextToken( in, end );
-    if( ddl_nullptr != id ) {
+    in = lookForNextToken(in, end);
+    if (nullptr != id) {
         // store the node
-        DDLNode *node( createDDLNode( id, this ) );
-        if( ddl_nullptr != node ) {
-            pushNode( node );
+        DDLNode *node(createDDLNode(id, this));
+        if (nullptr != node) {
+            pushNode(node);
         } else {
             std::cerr << "nullptr returned by creating DDLNode." << std::endl;
         }
         delete id;
 
-		Name *name_(ddl_nullptr);
-		in = OpenDDLParser::parseName(in, end, &name_);
-		std::unique_ptr<Name> name(name_);
-        if( ddl_nullptr != name && ddl_nullptr != node ) {
-            const std::string nodeName( name->m_id->m_buffer );
-            node->setName( nodeName );
+        Name *name(nullptr);
+        in = OpenDDLParser::parseName(in, end, &name);
+        if (nullptr != name && nullptr != node && nullptr != name->m_id->m_buffer) {
+            const std::string nodeName(name->m_id->m_buffer);
+            node->setName(nodeName);
+            delete name;
         }
 
+        Property *first(nullptr);
+        in = lookForNextToken(in, end);
+        if (*in == Grammar::OpenPropertyToken[0]) {
+            in++;
+            Property *prop(nullptr), *prev(nullptr);
+            while (*in != Grammar::ClosePropertyToken[0] && in != end) {
+                in = OpenDDLParser::parseProperty(in, end, &prop);
+                in = lookForNextToken(in, end);
 
-		std::unique_ptr<Property> first;
-		in = lookForNextToken(in, end);
-		if (*in == Grammar::OpenPropertyToken[0]) {
-			in++;
-			std::unique_ptr<Property> prop, prev;
-			while (*in != Grammar::ClosePropertyToken[0] && in != end) {
-				Property *prop_(ddl_nullptr);
-				in = OpenDDLParser::parseProperty(in, end, &prop_);
-				prop.reset(prop_);
-				in = lookForNextToken(in, end);
+                if (*in != Grammar::CommaSeparator[0] && *in != Grammar::ClosePropertyToken[0]) {
+                    logInvalidTokenError(in, Grammar::ClosePropertyToken, m_logCallback);
+                    return nullptr;
+                }
 
-				if (*in != Grammar::CommaSeparator[0] && *in != Grammar::ClosePropertyToken[0]) {
-					logInvalidTokenError(in, Grammar::ClosePropertyToken, m_logCallback);
-					return ddl_nullptr;
-				}
+                if (nullptr != prop && *in != Grammar::CommaSeparator[0]) {
+                    if (nullptr == first) {
+                        first = prop;
+                    }
+                    if (nullptr != prev) {
+                        prev->m_next = prop;
+                    }
+                    prev = prop;
+                }
+            }
+            ++in;
+        }
 
-				if (ddl_nullptr != prop && *in != Grammar::CommaSeparator[0]) {
-					if (ddl_nullptr == first) {
-						first = std::move(prop);
-					}
-					if (ddl_nullptr != prev) {
-						prev->m_next = prop.release();
-					}
-					prev = std::move(prop);
-				}
-			}
-			++in;
-		}
-
-		// set the properties
-		if (first && ddl_nullptr != node) {
-			node->setProperties(first.release());
-		}
+        // set the properties
+        if (nullptr != first && nullptr != node) {
+            node->setProperties(first);
+        }
     }
 
     return in;
 }
 
-char *OpenDDLParser::parseStructure( char *in, char *end ) {
-    if( ddl_nullptr == in || in == end ) {
+char *OpenDDLParser::parseStructure(char *in, char *end) {
+    if (nullptr == in || in == end) {
         return in;
     }
 
-    bool error( false );
-    in = lookForNextToken( in, end );
-    if( *in == *Grammar::OpenBracketToken) {
+    bool error(false);
+    in = lookForNextToken(in, end);
+    if (*in == *Grammar::OpenBracketToken) {
         // loop over all children ( data and nodes )
         do {
-            in = parseStructureBody( in, end, error );
-            if(in == ddl_nullptr){
-                return ddl_nullptr;
+            in = parseStructureBody(in, end, error);
+            if (in == nullptr) {
+                return nullptr;
             }
-        } while ( *in != *Grammar::CloseBracketToken);
+        } while (*in != *Grammar::CloseBracketToken);
         ++in;
     } else {
         ++in;
-        logInvalidTokenError( in, std::string( Grammar::OpenBracketToken ), m_logCallback );
-        return ddl_nullptr;
+        logInvalidTokenError(in, std::string(Grammar::OpenBracketToken), m_logCallback);
+        error = true;
+        return nullptr;
     }
-    in = lookForNextToken( in, end );
+    in = lookForNextToken(in, end);
 
     // pop node from stack after successful parsing
-    if( !error ) {
+    if (!error) {
         popNode();
     }
 
     return in;
 }
 
-static void setNodeValues( DDLNode *currentNode, Value *values ) {
-    if( ddl_nullptr != values ){
-        if( ddl_nullptr != currentNode ) {
-            currentNode->setValue( values );
+static void setNodeValues(DDLNode *currentNode, Value *values) {
+    if (nullptr != values) {
+        if (nullptr != currentNode) {
+            currentNode->setValue(values);
         }
     }
 }
 
-static void setNodeReferences( DDLNode *currentNode, Reference *refs ) {
-    if( ddl_nullptr != refs ) {
-        if( ddl_nullptr != currentNode ) {
-            currentNode->setReferences( refs );
+static void setNodeReferences(DDLNode *currentNode, Reference *refs) {
+    if (nullptr != refs) {
+        if (nullptr != currentNode) {
+            currentNode->setReferences(refs);
         }
     }
 }
 
-static void setNodeDataArrayList( DDLNode *currentNode, DataArrayList *dtArrayList ) {
-    if( ddl_nullptr != dtArrayList ) {
-        if( ddl_nullptr != currentNode ) {
-            currentNode->setDataArrayList( dtArrayList );
+static void setNodeDataArrayList(DDLNode *currentNode, DataArrayList *dtArrayList) {
+    if (nullptr != dtArrayList) {
+        if (nullptr != currentNode) {
+            currentNode->setDataArrayList(dtArrayList);
         }
     }
 }
 
-char *OpenDDLParser::parseStructureBody( char *in, char *end, bool &error ) {
-    if( !isNumeric( *in ) && !isCharacter( *in ) ) {
+char *OpenDDLParser::parseStructureBody(char *in, char *end, bool &error) {
+    if (!isNumeric(*in) && !isCharacter(*in)) {
         ++in;
     }
 
-    in = lookForNextToken( in, end );
-    Value::ValueType type( Value::ddl_none );
-    size_t arrayLen( 0 );
-    in = OpenDDLParser::parsePrimitiveDataType( in, end, type, arrayLen );
-    if( Value::ddl_none != type ) {
+    in = lookForNextToken(in, end);
+    Value::ValueType type(Value::ValueType::ddl_none);
+    size_t arrayLen(0);
+    in = OpenDDLParser::parsePrimitiveDataType(in, end, type, arrayLen);
+    if (Value::ValueType::ddl_none != type) {
         // parse a primitive data type
-        in = lookForNextToken( in, end );
-        if( *in == Grammar::OpenBracketToken[ 0 ] ) {
-            Reference *refs( ddl_nullptr );
-            DataArrayList *dtArrayList( ddl_nullptr );
-            Value *values( ddl_nullptr );
-            if( 1 == arrayLen ) {
-                size_t numRefs( 0 ), numValues( 0 );
-                in = parseDataList( in, end, type, &values, numValues, &refs, numRefs );
-                setNodeValues( top(), values );
-                setNodeReferences( top(), refs );
-            } else if( arrayLen > 1 ) {
-                in = parseDataArrayList( in, end, type, &dtArrayList );
-                setNodeDataArrayList( top(), dtArrayList );
+        in = lookForNextToken(in, end);
+        if (*in == Grammar::OpenBracketToken[0]) {
+            Reference *refs(nullptr);
+            DataArrayList *dtArrayList(nullptr);
+            Value *values(nullptr);
+            if (1 == arrayLen) {
+                size_t numRefs(0), numValues(0);
+                in = parseDataList(in, end, type, &values, numValues, &refs, numRefs);
+                setNodeValues(top(), values);
+                setNodeReferences(top(), refs);
+            } else if (arrayLen > 1) {
+                in = parseDataArrayList(in, end, type, &dtArrayList);
+                setNodeDataArrayList(top(), dtArrayList);
             } else {
                 std::cerr << "0 for array is invalid." << std::endl;
                 error = true;
             }
         }
 
-        in = lookForNextToken( in, end );
-        if( *in != '}' ) {
-            logInvalidTokenError( in, std::string( Grammar::CloseBracketToken ), m_logCallback );
-            return ddl_nullptr;
+        in = lookForNextToken(in, end);
+        if (*in != '}') {
+            logInvalidTokenError(in, std::string(Grammar::CloseBracketToken), m_logCallback);
+            return nullptr;
         } else {
             //in++;
         }
     } else {
         // parse a complex data type
-        in = parseNextNode( in, end );
+        in = parseNextNode(in, end);
     }
 
     return in;
 }
 
-void OpenDDLParser::pushNode( DDLNode *node ) {
-    if( ddl_nullptr == node ) {
+void OpenDDLParser::pushNode(DDLNode *node) {
+    if (nullptr == node) {
         return;
     }
 
-    m_stack.push_back( node );
+    m_stack.push_back(node);
 }
 
 DDLNode *OpenDDLParser::popNode() {
-    if( m_stack.empty() ) {
-        return ddl_nullptr;
+    if (m_stack.empty()) {
+        return nullptr;
     }
 
-    DDLNode *topNode( top() );
+    DDLNode *topNode(top());
     m_stack.pop_back();
     return topNode;
 }
 
 DDLNode *OpenDDLParser::top() {
-    if( m_stack.empty() ) {
-        return ddl_nullptr;
+    if (m_stack.empty()) {
+        return nullptr;
     }
 
-    DDLNode *top( m_stack.back() );
+    DDLNode *top(m_stack.back());
     return top;
 }
 
 DDLNode *OpenDDLParser::getRoot() const {
-    if( ddl_nullptr == m_context ) {
-        return ddl_nullptr;
+    if (nullptr == m_context) {
+        return nullptr;
     }
 
     return m_context->m_root;
@@ -468,16 +473,16 @@ Context *OpenDDLParser::getContext() const {
     return m_context;
 }
 
-void OpenDDLParser::normalizeBuffer( std::vector<char> &buffer) {
-    if( buffer.empty() ) {
+void OpenDDLParser::normalizeBuffer(std::vector<char> &buffer) {
+    if (buffer.empty()) {
         return;
     }
 
     std::vector<char> newBuffer;
-    const size_t len( buffer.size() );
-    char *end( &buffer[ len-1 ] + 1 );
-    for( size_t readIdx = 0; readIdx<len; ++readIdx ) {
-        char *c( &buffer[readIdx] );
+    const size_t len(buffer.size());
+    char *end(&buffer[len - 1] + 1);
+    for (size_t readIdx = 0; readIdx < len; ++readIdx) {
+        char *c(&buffer[readIdx]);
         // check for a comment
         if (isCommentOpenTag(c, end)) {
             ++readIdx;
@@ -485,14 +490,13 @@ void OpenDDLParser::normalizeBuffer( std::vector<char> &buffer) {
                 ++readIdx;
             }
             ++readIdx;
-            ++readIdx;
-        } else if( !isComment<char>( c, end ) && !isNewLine( *c ) ) {
-            newBuffer.push_back( buffer[ readIdx ] );
+        } else if (!isComment<char>(c, end) && !isNewLine(*c)) {
+            newBuffer.push_back(buffer[readIdx]);
         } else {
-            if( isComment<char>( c, end ) ) {
+            if (isComment<char>(c, end)) {
                 ++readIdx;
                 // skip the comment and the rest of the line
-                while( !isEndofLine( buffer[ readIdx ] ) ) {
+                while (!isEndofLine(buffer[readIdx])) {
                     ++readIdx;
                 }
             }
@@ -501,100 +505,101 @@ void OpenDDLParser::normalizeBuffer( std::vector<char> &buffer) {
     buffer = newBuffer;
 }
 
-char *OpenDDLParser::parseName( char *in, char *end, Name **name ) {
-    *name = ddl_nullptr;
-    if( ddl_nullptr == in || in == end ) {
+char *OpenDDLParser::parseName(char *in, char *end, Name **name) {
+    *name = nullptr;
+    if (nullptr == in || in == end) {
         return in;
     }
 
     // ignore blanks
-    in = lookForNextToken( in, end );
-    if( *in != '$' && *in != '%' ) {
+    in = lookForNextToken(in, end);
+    if (*in != '$' && *in != '%') {
         return in;
     }
 
-    NameType ntype( GlobalName );
-    if( *in == '%' ) {
+    NameType ntype(GlobalName);
+    if (*in == '%') {
         ntype = LocalName;
     }
     in++;
-    Name *currentName( ddl_nullptr );
-    Text *id( ddl_nullptr );
-    in = parseIdentifier( in, end, &id );
-    if( id ) {
-        currentName = new Name( ntype, id );
-        if( currentName ) {
-            *name = currentName;
-        }
+    Name *currentName(nullptr);
+    Text *id(nullptr);
+    in = parseIdentifier(in, end, &id);
+    if (id) {
+        currentName = new Name(ntype, id);
+        *name = currentName;
     }
 
     return in;
 }
 
-char *OpenDDLParser::parseIdentifier( char *in, char *end, Text **id ) {
-    *id = ddl_nullptr;
-    if( ddl_nullptr == in || in == end ) {
+char *OpenDDLParser::parseIdentifier(char *in, char *end, Text **id) {
+    *id = nullptr;
+    if (nullptr == in || in == end) {
         return in;
     }
 
     // ignore blanks
-    in = lookForNextToken( in, end );
+    in = lookForNextToken(in, end);
+    if (in == end) {
+        return in;
+    }
 
     // staring with a number is forbidden
-    if( isNumeric<const char>( *in ) ) {
+    if (isNumeric<const char>(*in)) {
         return in;
     }
 
     // get size of id
-    size_t idLen( 0 );
-    char *start( in );
-    while( !isSeparator( *in ) && 
-            !isNewLine( *in ) && ( in != end ) && 
-            *in != Grammar::OpenPropertyToken[ 0 ] &&
-            *in != Grammar::ClosePropertyToken[ 0 ] && 
-            *in != '$' ) {
+    size_t idLen(0);
+    char *start(in);
+    while (!isSeparator(*in) &&
+            !isNewLine(*in) && (in != end) &&
+            *in != Grammar::OpenPropertyToken[0] &&
+            *in != Grammar::ClosePropertyToken[0] &&
+            *in != '$') {
         ++in;
         ++idLen;
     }
 
-    const size_t len( idLen );
-    *id = new Text( start, len );
+    const size_t len(idLen);
+    *id = new Text(start, len);
 
     return in;
 }
 
-char *OpenDDLParser::parsePrimitiveDataType( char *in, char *end, Value::ValueType &type, size_t &len ) {
-    type = Value::ddl_none;
+char *OpenDDLParser::parsePrimitiveDataType(char *in, char *end, Value::ValueType &type, size_t &len) {
+    type = Value::ValueType::ddl_none;
     len = 0;
-    if( ddl_nullptr == in || in == end ) {
+    if (nullptr == in || in == end) {
         return in;
     }
 
-    size_t prim_len( 0 );
-    for( unsigned int i = 0; i < Value::ddl_types_max; i++ ) {
-        prim_len = strlen( Grammar::PrimitiveTypeToken[ i ] );
-        if( 0 == strncmp( in, Grammar::PrimitiveTypeToken[ i ], prim_len ) ) {
-            type = static_cast<Value::ValueType>( i );
+    size_t prim_len(0);
+    for (size_t i = 0; i < (size_t) Value::ValueType::ddl_types_max; i++) {
+        prim_len = strlen(Grammar::PrimitiveTypeToken[i]);
+        if (0 == strncmp(in, Grammar::PrimitiveTypeToken[i], prim_len)) {
+            type = static_cast<Value::ValueType>(i);
             break;
         }
     }
 
-    if( Value::ddl_none == type ) {
-        in = lookForNextToken( in, end );
+    if (Value::ValueType::ddl_none == type) {
+        in = lookForNextToken(in, end);
         return in;
     } else {
         in += prim_len;
     }
 
-    bool ok( true );
-    if( *in == Grammar::OpenArrayToken[ 0 ] ) {
+    bool ok(true);
+    if (*in == Grammar::OpenArrayToken[0]) {
         ok = false;
         ++in;
-        char *start( in );
-        while ( in != end ) {
+        char *start(in);
+        while (in != end) {
             ++in;
-            if( *in == Grammar::CloseArrayToken[ 0 ] ) {
-                len = ::atoi( start );
+            if (*in == Grammar::CloseArrayToken[0]) {
+                len = ::atoi(start);
                 ok = true;
                 ++in;
                 break;
@@ -603,29 +608,29 @@ char *OpenDDLParser::parsePrimitiveDataType( char *in, char *end, Value::ValueTy
     } else {
         len = 1;
     }
-    if( !ok ) {
-        type = Value::ddl_none;
+    if (!ok) {
+        type = Value::ValueType::ddl_none;
     }
 
     return in;
 }
 
-char *OpenDDLParser::parseReference( char *in, char *end, std::vector<Name*> &names ) {
-    if( ddl_nullptr == in || in == end ) {
+char *OpenDDLParser::parseReference(char *in, char *end, std::vector<Name *> &names) {
+    if (nullptr == in || in == end) {
         return in;
     }
 
-    Name *nextName( ddl_nullptr );
-    in = parseName( in, end, &nextName );
-    if( nextName ) {
-        names.push_back( nextName );
+    Name *nextName(nullptr);
+    in = parseName(in, end, &nextName);
+    if (nextName) {
+        names.push_back(nextName);
     }
-    while( Grammar::CommaSeparator[ 0 ] == *in ) {
-        in = getNextSeparator( in, end );
-        if( Grammar::CommaSeparator[ 0 ] == *in ) {
-            in = parseName( in, end, &nextName );
-            if( nextName ) {
-                names.push_back( nextName );
+    while (Grammar::CommaSeparator[0] == *in) {
+        in = getNextSeparator(in, end);
+        if (Grammar::CommaSeparator[0] == *in) {
+            in = parseName(in, end, &nextName);
+            if (nextName) {
+                names.push_back(nextName);
             }
         } else {
             break;
@@ -635,86 +640,86 @@ char *OpenDDLParser::parseReference( char *in, char *end, std::vector<Name*> &na
     return in;
 }
 
-char *OpenDDLParser::parseBooleanLiteral( char *in, char *end, Value **boolean ) {
-    *boolean = ddl_nullptr;
-    if( ddl_nullptr == in || in == end ) {
+char *OpenDDLParser::parseBooleanLiteral(char *in, char *end, Value **boolean) {
+    *boolean = nullptr;
+    if (nullptr == in || in == end) {
         return in;
     }
 
-    in = lookForNextToken( in, end );
-    char *start( in );
-    size_t len( 0 );
-    while( !isSeparator( *in ) && in != end ) {
+    in = lookForNextToken(in, end);
+    char *start(in);
+    size_t len(0);
+    while (!isSeparator(*in) && in != end) {
         ++in;
         ++len;
     }
     ++len;
-    int res = ::strncmp( Grammar::BoolTrue, start, strlen( Grammar::BoolTrue ) );
-    if( 0 != res ) {
-        res = ::strncmp( Grammar::BoolFalse, start, strlen( Grammar::BoolFalse ) );
-        if( 0 != res ) {
-            *boolean = ddl_nullptr;
+    int res = ::strncmp(Grammar::BoolTrue, start, strlen(Grammar::BoolTrue));
+    if (0 != res) {
+        res = ::strncmp(Grammar::BoolFalse, start, strlen(Grammar::BoolFalse));
+        if (0 != res) {
+            *boolean = nullptr;
             return in;
         }
-        *boolean = ValueAllocator::allocPrimData( Value::ddl_bool );
-        (*boolean)->setBool( false );
+        *boolean = ValueAllocator::allocPrimData(Value::ValueType::ddl_bool);
+        (*boolean)->setBool(false);
     } else {
-        *boolean = ValueAllocator::allocPrimData( Value::ddl_bool );
-        (*boolean)->setBool( true );
+        *boolean = ValueAllocator::allocPrimData(Value::ValueType::ddl_bool);
+        (*boolean)->setBool(true);
     }
 
     return in;
 }
 
-char *OpenDDLParser::parseIntegerLiteral( char *in, char *end, Value **integer, Value::ValueType integerType ) {
-    *integer = ddl_nullptr;
-    if( ddl_nullptr == in || in == end ) {
+char *OpenDDLParser::parseIntegerLiteral(char *in, char *end, Value **integer, Value::ValueType integerType) {
+    *integer = nullptr;
+    if (nullptr == in || in == end) {
         return in;
     }
 
-    if( !(isIntegerType( integerType ) || isUnsignedIntegerType(integerType)) ) {
+    if (!(isIntegerType(integerType) || isUnsignedIntegerType(integerType))) {
         return in;
     }
 
-    in = lookForNextToken( in, end );
-    char *start( in );
-    while( !isSeparator( *in ) && in != end ) {
+    in = lookForNextToken(in, end);
+    char *start(in);
+    while (!isSeparator(*in) && in != end) {
         ++in;
     }
 
-    if( isNumeric( *start ) ) {
+    if (isNumeric(*start)) {
 #ifdef OPENDDL_NO_USE_CPP11
-        const int64 value( atol( start ) ); // maybe not really 64bit as atoll is but exists without c++11
-        const uint64 uvalue( strtoul( start,ddl_nullptr,10 ) );
+        const int64 value(atol(start)); // maybe not really 64bit as atoll is but exists without c++11
+        const uint64 uvalue(strtoul(start, nullptr, 10));
 #else
-        const int64 value( atoll( start ) );
-        const uint64 uvalue( strtoull( start,ddl_nullptr,10 ) );
+        const int64 value(atoll(start));
+        const uint64 uvalue(strtoull(start, nullptr, 10));
 #endif
-        *integer = ValueAllocator::allocPrimData( integerType );
-        switch( integerType ) {
-            case Value::ddl_int8:
-                ( *integer )->setInt8( (int8) value );
+        *integer = ValueAllocator::allocPrimData(integerType);
+        switch (integerType) {
+            case Value::ValueType::ddl_int8:
+                (*integer)->setInt8((int8)value);
                 break;
-            case Value::ddl_int16:
-                ( *integer )->setInt16( ( int16 ) value );
+            case Value::ValueType::ddl_int16:
+                (*integer)->setInt16((int16)value);
                 break;
-            case Value::ddl_int32:
-                ( *integer )->setInt32( ( int32 ) value );
+            case Value::ValueType::ddl_int32:
+                (*integer)->setInt32((int32)value);
                 break;
-            case Value::ddl_int64:
-                ( *integer )->setInt64( ( int64 ) value );
+            case Value::ValueType::ddl_int64:
+                (*integer)->setInt64((int64)value);
                 break;
-            case Value::ddl_unsigned_int8:
-                ( *integer )->setUnsignedInt8( (uint8) uvalue );
+            case Value::ValueType::ddl_unsigned_int8:
+                (*integer)->setUnsignedInt8((uint8)uvalue);
                 break;
-            case Value::ddl_unsigned_int16:
-                ( *integer )->setUnsignedInt16( ( uint16 ) uvalue );
+            case Value::ValueType::ddl_unsigned_int16:
+                (*integer)->setUnsignedInt16((uint16)uvalue);
                 break;
-            case Value::ddl_unsigned_int32:
-                ( *integer )->setUnsignedInt32( ( uint32 ) uvalue );
+            case Value::ValueType::ddl_unsigned_int32:
+                (*integer)->setUnsignedInt32((uint32)uvalue);
                 break;
-            case Value::ddl_unsigned_int64:
-                ( *integer )->setUnsignedInt64( ( uint64 ) uvalue );
+            case Value::ValueType::ddl_unsigned_int64:
+                (*integer)->setUnsignedInt64((uint64)uvalue);
                 break;
             default:
                 break;
@@ -724,105 +729,105 @@ char *OpenDDLParser::parseIntegerLiteral( char *in, char *end, Value **integer,
     return in;
 }
 
-char *OpenDDLParser::parseFloatingLiteral( char *in, char *end, Value **floating, Value::ValueType floatType) {
-    *floating = ddl_nullptr;
-    if( ddl_nullptr == in || in == end ) {
+char *OpenDDLParser::parseFloatingLiteral(char *in, char *end, Value **floating, Value::ValueType floatType) {
+    *floating = nullptr;
+    if (nullptr == in || in == end) {
         return in;
     }
 
-    in = lookForNextToken( in, end );
-    char *start( in );
-    while( !isSeparator( *in ) && in != end ) {
+    in = lookForNextToken(in, end);
+    char *start(in);
+    while (!isSeparator(*in) && in != end) {
         ++in;
     }
 
     // parse the float value
-    bool ok( false );
-    if ( isHexLiteral( start, end ) ) {
-        parseHexaLiteral( start, end, floating );
+    bool ok(false);
+    if (isHexLiteral(start, end)) {
+        parseHexaLiteral(start, end, floating);
         return in;
     }
 
-    if( isNumeric( *start ) ) {
+    if (isNumeric(*start)) {
         ok = true;
     } else {
-        if( *start == '-' ) {
-            if( isNumeric( *(start+1) ) ) {
+        if (*start == '-') {
+            if (isNumeric(*(start + 1))) {
                 ok = true;
             }
         }
     }
 
-    if( ok ) {
-        if ( floatType == Value::ddl_double ) {
-            const double value( atof( start ) );
-            *floating = ValueAllocator::allocPrimData( Value::ddl_double );
-            ( *floating )->setDouble( value );
+    if (ok) {
+        if (floatType == Value::ValueType::ddl_double) {
+            const double value(atof(start));
+            *floating = ValueAllocator::allocPrimData(Value::ValueType::ddl_double);
+            (*floating)->setDouble(value);
         } else {
-            const float value( ( float ) atof( start ) );
-            *floating = ValueAllocator::allocPrimData( Value::ddl_float );
-            ( *floating )->setFloat( value );
+            const float value((float)atof(start));
+            *floating = ValueAllocator::allocPrimData(Value::ValueType::ddl_float);
+            (*floating)->setFloat(value);
         }
     }
 
     return in;
 }
 
-char *OpenDDLParser::parseStringLiteral( char *in, char *end, Value **stringData ) {
-    *stringData = ddl_nullptr;
-    if( ddl_nullptr == in || in == end ) {
+char *OpenDDLParser::parseStringLiteral(char *in, char *end, Value **stringData) {
+    *stringData = nullptr;
+    if (nullptr == in || in == end) {
         return in;
     }
 
-    in = lookForNextToken( in, end );
-    size_t len( 0 );
-    char *start( in );
-    if( *start == '\"' ) {
+    in = lookForNextToken(in, end);
+    size_t len(0);
+    char *start(in);
+    if (*start == '\"') {
         ++start;
         ++in;
-        while( *in != '\"' && in != end ) {
+        while (*in != '\"' && in != end) {
             ++in;
             ++len;
         }
 
-        *stringData = ValueAllocator::allocPrimData( Value::ddl_string, len );
-        ::strncpy( ( char* ) ( *stringData )->m_data, start, len );
-        ( *stringData )->m_data[len] = '\0';
+        *stringData = ValueAllocator::allocPrimData(Value::ValueType::ddl_string, len);
+        ::strncpy((char *)(*stringData)->m_data, start, len);
+        (*stringData)->m_data[len] = '\0';
         ++in;
     }
 
     return in;
 }
 
-static void createPropertyWithData( Text *id, Value *primData, Property **prop ) {
-    if( ddl_nullptr != primData ) {
-        ( *prop ) = new Property( id );
-        ( *prop )->m_value = primData;
+static void createPropertyWithData(Text *id, Value *primData, Property **prop) {
+    if (nullptr != primData) {
+        (*prop) = new Property(id);
+        (*prop)->m_value = primData;
     }
 }
 
-char *OpenDDLParser::parseHexaLiteral( char *in, char *end, Value **data ) {
-    *data = ddl_nullptr;
-    if( ddl_nullptr == in || in == end ) {
+char *OpenDDLParser::parseHexaLiteral(char *in, char *end, Value **data) {
+    *data = nullptr;
+    if (nullptr == in || in == end) {
         return in;
     }
 
-    in = lookForNextToken( in, end );
-    if( *in != '0' ) {
+    in = lookForNextToken(in, end);
+    if (*in != '0') {
         return in;
     }
 
     ++in;
-    if( *in != 'x' && *in != 'X' ) {
+    if (*in != 'x' && *in != 'X') {
         return in;
     }
 
     ++in;
-    bool ok( true );
-    char *start( in );
-    int pos( 0 );
-    while( !isSeparator( *in ) && in != end ) {
-        if( ( *in < '0' && *in > '9' ) || ( *in < 'a' && *in > 'f' ) || ( *in < 'A' && *in > 'F' ) ) {
+    bool ok(true);
+    char *start(in);
+    int pos(0);
+    while (!isSeparator(*in) && in != end) {
+        if ((*in < '0' && *in > '9') || (*in < 'a' && *in > 'f') || (*in < 'A' && *in > 'F')) {
             ok = false;
             break;
         }
@@ -830,57 +835,57 @@ char *OpenDDLParser::parseHexaLiteral( char *in, char *end, Value **data ) {
         ++in;
     }
 
-    if( !ok ) {
+    if (!ok) {
         return in;
     }
 
-    int value( 0 );
-    while( pos > 0 ) {
-        int v = hex2Decimal( *start );
+    int value(0);
+    while (pos > 0) {
+        int v = hex2Decimal(*start);
         --pos;
-        value = ( value << 4 ) | v;
+        value = (value << 4) | v;
         ++start;
     }
 
-    *data = ValueAllocator::allocPrimData( Value::ddl_unsigned_int64 );
-    if( ddl_nullptr != *data ) {
-        ( *data )->setUnsignedInt64( value );
+    *data = ValueAllocator::allocPrimData(Value::ValueType::ddl_unsigned_int64);
+    if (nullptr != *data) {
+        (*data)->setUnsignedInt64(value);
     }
 
     return in;
 }
 
-char *OpenDDLParser::parseProperty( char *in, char *end, Property **prop ) {
-    *prop = ddl_nullptr;
-    if( ddl_nullptr == in || in == end ) {
+char *OpenDDLParser::parseProperty(char *in, char *end, Property **prop) {
+    *prop = nullptr;
+    if (nullptr == in || in == end) {
         return in;
     }
 
-    in = lookForNextToken( in, end );
-    Text *id( ddl_nullptr );
-    in = parseIdentifier( in, end, &id );
-    if( ddl_nullptr != id ) {
-        in = lookForNextToken( in, end );
-        if( *in == '=' ) {
+    in = lookForNextToken(in, end);
+    Text *id = nullptr;
+    in = parseIdentifier(in, end, &id);
+    if (nullptr != id) {
+        in = lookForNextToken(in, end);
+        if (*in == '=') {
             ++in;
-            in = getNextToken( in, end );
-            Value *primData( ddl_nullptr );
-            if( isInteger( in, end ) ) {
-                in = parseIntegerLiteral( in, end, &primData );
-                createPropertyWithData( id, primData, prop );
-            } else if( isFloat( in, end ) ) {
-                in = parseFloatingLiteral( in, end, &primData );
-                createPropertyWithData( id, primData, prop );
-            } else if( isStringLiteral( *in ) ) { // string data
-                in = parseStringLiteral( in, end, &primData );
-                createPropertyWithData( id, primData, prop );
-            } else {                              // reference data
-                std::vector<Name*> names;
-                in = parseReference( in, end, names );
-                if( !names.empty() ) {
-                    Reference *ref = new Reference( names.size(), &names[ 0 ] );
-                    ( *prop ) = new Property( id );
-                    ( *prop )->m_ref = ref;
+            in = getNextToken(in, end);
+            Value *primData(nullptr);
+            if (isInteger(in, end)) {
+                in = parseIntegerLiteral(in, end, &primData);
+                createPropertyWithData(id, primData, prop);
+            } else if (isFloat(in, end)) {
+                in = parseFloatingLiteral(in, end, &primData);
+                createPropertyWithData(id, primData, prop);
+            } else if (isStringLiteral(*in)) { // string data
+                in = parseStringLiteral(in, end, &primData);
+                createPropertyWithData(id, primData, prop);
+            } else { // reference data
+                std::vector<Name *> names;
+                in = parseReference(in, end, names);
+                if (!names.empty()) {
+                    Reference *ref = new Reference(names.size(), &names[0]);
+                    (*prop) = new Property(id);
+                    (*prop)->m_ref = ref;
                 }
             }
         } else {
@@ -891,77 +896,77 @@ char *OpenDDLParser::parseProperty( char *in, char *end, Property **prop ) {
     return in;
 }
 
-char *OpenDDLParser::parseDataList( char *in, char *end, Value::ValueType type, Value **data, 
-                                    size_t &numValues, Reference **refs, size_t &numRefs ) {
-    *data = ddl_nullptr;
+char *OpenDDLParser::parseDataList(char *in, char *end, Value::ValueType type, Value **data,
+        size_t &numValues, Reference **refs, size_t &numRefs) {
+    *data = nullptr;
     numValues = numRefs = 0;
-    if( ddl_nullptr == in || in == end ) {
+    if (nullptr == in || in == end) {
         return in;
     }
 
-    in = lookForNextToken( in, end );
-    if( *in == '{' ) {
+    in = lookForNextToken(in, end);
+    if (*in == '{') {
         ++in;
-        Value *current( ddl_nullptr ), *prev( ddl_nullptr );
-        while( '}' != *in ) {
-            current = ddl_nullptr;
-            in = lookForNextToken( in, end );
-            if ( Value::ddl_ref == type ) {
-                std::vector<Name*> names;
-                in = parseReference( in, end, names );
-                if ( !names.empty() ) {
-                    Reference *ref = new Reference( names.size(), &names[ 0 ] );
+        Value *current(nullptr), *prev(nullptr);
+        while ('}' != *in) {
+            current = nullptr;
+            in = lookForNextToken(in, end);
+            if (Value::ValueType::ddl_ref == type) {
+                std::vector<Name *> names;
+                in = parseReference(in, end, names);
+                if (!names.empty()) {
+                    Reference *ref = new Reference(names.size(), &names[0]);
                     *refs = ref;
                     numRefs = names.size();
                 }
-            } else  if ( Value::ddl_none == type ) {
-                if (isInteger( in, end )) {
-                    in = parseIntegerLiteral( in, end, &current );
-                } else if (isFloat( in, end )) {
-                    in = parseFloatingLiteral( in, end, &current );
-                } else if (isStringLiteral( *in )) {
-                    in = parseStringLiteral( in, end, &current );
-                } else if (isHexLiteral( in, end )) {
-                    in = parseHexaLiteral( in, end, &current );
+            } else if (Value::ValueType::ddl_none == type) {
+                if (isInteger(in, end)) {
+                    in = parseIntegerLiteral(in, end, &current);
+                } else if (isFloat(in, end)) {
+                    in = parseFloatingLiteral(in, end, &current);
+                } else if (isStringLiteral(*in)) {
+                    in = parseStringLiteral(in, end, &current);
+                } else if (isHexLiteral(in, end)) {
+                    in = parseHexaLiteral(in, end, &current);
                 }
             } else {
-                switch(type){
-                    case Value::ddl_int8:
-                    case Value::ddl_int16:
-                    case Value::ddl_int32:
-                    case Value::ddl_int64:
-                    case Value::ddl_unsigned_int8:
-                    case Value::ddl_unsigned_int16:
-                    case Value::ddl_unsigned_int32:
-                    case Value::ddl_unsigned_int64:
-                        in = parseIntegerLiteral( in, end, &current, type);
+                switch (type) {
+                    case Value::ValueType::ddl_int8:
+                    case Value::ValueType::ddl_int16:
+                    case Value::ValueType::ddl_int32:
+                    case Value::ValueType::ddl_int64:
+                    case Value::ValueType::ddl_unsigned_int8:
+                    case Value::ValueType::ddl_unsigned_int16:
+                    case Value::ValueType::ddl_unsigned_int32:
+                    case Value::ValueType::ddl_unsigned_int64:
+                        in = parseIntegerLiteral(in, end, &current, type);
                         break;
-                    case Value::ddl_half:
-                    case Value::ddl_float:
-                    case Value::ddl_double:
-                        in = parseFloatingLiteral( in, end, &current, type);
+                    case Value::ValueType::ddl_half:
+                    case Value::ValueType::ddl_float:
+                    case Value::ValueType::ddl_double:
+                        in = parseFloatingLiteral(in, end, &current, type);
                         break;
-                    case Value::ddl_string:
-                        in = parseStringLiteral( in, end, &current );
+                    case Value::ValueType::ddl_string:
+                        in = parseStringLiteral(in, end, &current);
                         break;
                     default:
                         break;
                 }
             }
 
-            if( ddl_nullptr != current ) {
-                if( ddl_nullptr == *data ) {
+            if (nullptr != current) {
+                if (nullptr == *data) {
                     *data = current;
                     prev = current;
                 } else {
-                    prev->setNext( current );
+                    prev->setNext(current);
                     prev = current;
                 }
                 ++numValues;
             }
 
-            in = getNextSeparator( in, end );
-            if( ',' != *in && Grammar::CloseBracketToken[ 0 ] != *in && !isSpace( *in ) ) {
+            in = getNextSeparator(in, end);
+            if (',' != *in && Grammar::CloseBracketToken[0] != *in && !isSpace(*in)) {
                 break;
             }
         }
@@ -971,53 +976,53 @@ char *OpenDDLParser::parseDataList( char *in, char *end, Value::ValueType type,
     return in;
 }
 
-static DataArrayList *createDataArrayList( Value *currentValue, size_t numValues, 
-                                           Reference *refs, size_t numRefs ) {
-    DataArrayList *dataList( new DataArrayList );
+static DataArrayList *createDataArrayList(Value *currentValue, size_t numValues,
+        Reference *refs, size_t numRefs) {
+    DataArrayList *dataList(new DataArrayList);
     dataList->m_dataList = currentValue;
     dataList->m_numItems = numValues;
-    dataList->m_refs     = refs;
-    dataList->m_numRefs  = numRefs;
+    dataList->m_refs = refs;
+    dataList->m_numRefs = numRefs;
 
     return dataList;
 }
 
-char *OpenDDLParser::parseDataArrayList( char *in, char *end,Value::ValueType type, 
-                                         DataArrayList **dataArrayList ) {
-    if ( ddl_nullptr == dataArrayList ) {
+char *OpenDDLParser::parseDataArrayList(char *in, char *end, Value::ValueType type,
+        DataArrayList **dataArrayList) {
+    if (nullptr == dataArrayList) {
         return in;
     }
 
-    *dataArrayList = ddl_nullptr;
-    if( ddl_nullptr == in || in == end ) {
+    *dataArrayList = nullptr;
+    if (nullptr == in || in == end) {
         return in;
     }
 
-    in = lookForNextToken( in, end );
-    if( *in == Grammar::OpenBracketToken[ 0 ] ) {
+    in = lookForNextToken(in, end);
+    if (*in == Grammar::OpenBracketToken[0]) {
         ++in;
-        Value *currentValue( ddl_nullptr );
-        Reference *refs( ddl_nullptr );
-        DataArrayList *prev( ddl_nullptr ), *currentDataList( ddl_nullptr );
+        Value *currentValue(nullptr);
+        Reference *refs(nullptr);
+        DataArrayList *prev(nullptr), *currentDataList(nullptr);
         do {
-            size_t numRefs( 0 ), numValues( 0 );
-            currentValue = ddl_nullptr;
+            size_t numRefs(0), numValues(0);
+            currentValue = nullptr;
 
-            in = parseDataList( in, end, type, &currentValue, numValues, &refs, numRefs );
-            if( ddl_nullptr != currentValue || 0 != numRefs ) {
-                if( ddl_nullptr == prev ) {
-                    *dataArrayList = createDataArrayList( currentValue, numValues, refs, numRefs );
+            in = parseDataList(in, end, type, &currentValue, numValues, &refs, numRefs);
+            if (nullptr != currentValue || 0 != numRefs) {
+                if (nullptr == prev) {
+                    *dataArrayList = createDataArrayList(currentValue, numValues, refs, numRefs);
                     prev = *dataArrayList;
                 } else {
-                    currentDataList = createDataArrayList( currentValue, numValues, refs, numRefs );
-                    if( ddl_nullptr != prev ) {
+                    currentDataList = createDataArrayList(currentValue, numValues, refs, numRefs);
+                    if (nullptr != prev) {
                         prev->m_next = currentDataList;
                         prev = currentDataList;
                     }
                 }
             }
-        } while( Grammar::CommaSeparator[ 0 ] == *in && in != end );
-        in = lookForNextToken( in, end );
+        } while (Grammar::CommaSeparator[0] == *in && in != end);
+        in = lookForNextToken(in, end);
         ++in;
     }
 
diff --git a/contrib/openddlparser/code/OpenDDLStream.cpp b/contrib/openddlparser/code/OpenDDLStream.cpp
index 7ea8331bd..1a38dfa27 100644
--- a/contrib/openddlparser/code/OpenDDLStream.cpp
+++ b/contrib/openddlparser/code/OpenDDLStream.cpp
@@ -1,7 +1,7 @@
 /*-----------------------------------------------------------------------------------------------
 The MIT License (MIT)
 
-Copyright (c) 2014-2015 Kim Kulling
+Copyright (c) 2014-2020 Kim Kulling
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
@@ -37,22 +37,22 @@ std::string StreamFormatterBase::format(const std::string &statement) {
     return tmp;
 }
 
-IOStreamBase::IOStreamBase(StreamFormatterBase *formatter)
-    : m_formatter(formatter)
-    , m_file(ddl_nullptr) {
-    if (ddl_nullptr == m_formatter) {
+IOStreamBase::IOStreamBase(StreamFormatterBase *formatter) :
+        m_formatter(formatter),
+        m_file(nullptr) {
+    if (nullptr == m_formatter) {
         m_formatter = new StreamFormatterBase;
     }
 }
 
 IOStreamBase::~IOStreamBase() {
     delete m_formatter;
-    m_formatter = ddl_nullptr;
+    m_formatter = nullptr;
 }
 
 bool IOStreamBase::open(const std::string &name) {
     m_file = ::fopen(name.c_str(), "a");
-    if (m_file == ddl_nullptr) {
+    if (m_file == nullptr) {
         return false;
     }
 
@@ -60,33 +60,33 @@ bool IOStreamBase::open(const std::string &name) {
 }
 
 bool IOStreamBase::close() {
-    if (ddl_nullptr == m_file) {
+    if (nullptr == m_file) {
         return false;
     }
 
     ::fclose(m_file);
-    m_file = ddl_nullptr;
+    m_file = nullptr;
 
     return true;
 }
 
 bool IOStreamBase::isOpen() const {
-    return ( ddl_nullptr != m_file );
+    return (nullptr != m_file);
 }
 
-size_t IOStreamBase::read( size_t sizeToRead, std::string &statement ) {
-    if (ddl_nullptr == m_file) {
+size_t IOStreamBase::read(size_t sizeToRead, std::string &statement) {
+    if (nullptr == m_file) {
         return 0;
     }
-    
+
     statement.resize(sizeToRead);
-    const size_t readBytes = ::fread( &statement[0], 1, sizeToRead, m_file );
+    const size_t readBytes = ::fread(&statement[0], 1, sizeToRead, m_file);
 
     return readBytes;
 }
 
 size_t IOStreamBase::write(const std::string &statement) {
-    if (ddl_nullptr == m_file) {
+    if (nullptr == m_file) {
         return 0;
     }
     std::string formatStatement = m_formatter->format(statement);
diff --git a/contrib/openddlparser/code/Value.cpp b/contrib/openddlparser/code/Value.cpp
index b5a35e722..708a6878f 100644
--- a/contrib/openddlparser/code/Value.cpp
+++ b/contrib/openddlparser/code/Value.cpp
@@ -1,7 +1,7 @@
 /*-----------------------------------------------------------------------------------------------
 The MIT License (MIT)
 
-Copyright (c) 2014-2015 Kim Kulling
+Copyright (c) 2014-2020 Kim Kulling
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
@@ -20,30 +20,30 @@ COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 -----------------------------------------------------------------------------------------------*/
+#include <openddlparser/OpenDDLStream.h>
 #include <openddlparser/Value.h>
 
-#include <iostream>
 #include <cassert>
 
 BEGIN_ODDLPARSER_NS
 
-static Value::Iterator end( ddl_nullptr );
+static Value::Iterator end(nullptr);
 
-Value::Iterator::Iterator()
-: m_start( ddl_nullptr )
-, m_current( ddl_nullptr ) {
+Value::Iterator::Iterator() :
+        m_start(nullptr),
+        m_current(nullptr) {
     // empty
 }
 
-Value::Iterator::Iterator( Value *start )
-: m_start( start )
-, m_current( start ) {
+Value::Iterator::Iterator(Value *start) :
+        m_start(start),
+        m_current(start) {
     // empty
 }
 
-Value::Iterator::Iterator( const Iterator &rhs )
-: m_start( rhs.m_start )
-, m_current( rhs.m_current ) {
+Value::Iterator::Iterator(const Iterator &rhs) :
+        m_start(rhs.m_start),
+        m_current(rhs.m_current) {
     // empty
 }
 
@@ -52,36 +52,36 @@ Value::Iterator::~Iterator() {
 }
 
 bool Value::Iterator::hasNext() const {
-    if( ddl_nullptr == m_current ) {
+    if (nullptr == m_current) {
         return false;
     }
-    return ( ddl_nullptr != m_current->getNext() );
+    return (nullptr != m_current->getNext());
 }
 
 Value *Value::Iterator::getNext() {
-    if( !hasNext() ) {
-        return ddl_nullptr;
+    if (!hasNext()) {
+        return nullptr;
     }
 
-    Value *v( m_current->getNext() );
+    Value *v(m_current->getNext());
     m_current = v;
 
     return v;
 }
 
-const Value::Iterator Value::Iterator::operator++( int ) {
-    if( ddl_nullptr == m_current ) {
+const Value::Iterator Value::Iterator::operator++(int) {
+    if (nullptr == m_current) {
         return end;
     }
 
     m_current = m_current->getNext();
-    Iterator inst( m_current );
+    Iterator inst(m_current);
 
     return inst;
 }
 
-Value::Iterator &Value::Iterator::operator++( ) {
-    if( ddl_nullptr == m_current ) {
+Value::Iterator &Value::Iterator::operator++() {
+    if (nullptr == m_current) {
         return end;
     }
 
@@ -90,263 +90,261 @@ Value::Iterator &Value::Iterator::operator++( ) {
     return *this;
 }
 
-bool Value::Iterator::operator == ( const Iterator &rhs ) const {
-    return ( m_current == rhs.m_current );
+bool Value::Iterator::operator==(const Iterator &rhs) const {
+    return (m_current == rhs.m_current);
 }
 
-Value *Value::Iterator::operator->( ) const {
-    if(ddl_nullptr == m_current ) {
-        return ddl_nullptr;
+Value *Value::Iterator::operator->() const {
+    if (nullptr == m_current) {
+        return nullptr;
     }
     return m_current;
 }
 
-Value::Value( ValueType type )
-: m_type( type )
-, m_size( 0 )
-, m_data( ddl_nullptr )
-, m_next( ddl_nullptr ) {
+Value::Value(ValueType type) :
+        m_type(type),
+        m_size(0),
+        m_data(nullptr),
+        m_next(nullptr) {
     // empty
 }
 
 Value::~Value() {
-    if(m_data!=ddl_nullptr) {
-        if (m_type == ddl_ref ) {
-            Reference *tmp = (Reference *) m_data;
-            if (tmp != ddl_nullptr)
+    if (m_data != nullptr) {
+        if (m_type == ValueType::ddl_ref) {
+            Reference *tmp = (Reference *)m_data;
+            if (tmp != nullptr)
                 delete tmp;
-        }else
+        } else
             delete[] m_data;
-
     }
-    if(m_next!=ddl_nullptr)
+    if (m_next != nullptr)
         delete m_next;
 }
 
-void Value::setBool( bool value ) {
-    assert( ddl_bool == m_type );
-    ::memcpy( m_data, &value, m_size );
+void Value::setBool(bool value) {
+    assert(ValueType::ddl_bool == m_type);
+    ::memcpy(m_data, &value, m_size);
 }
 
 bool Value::getBool() {
-    assert( ddl_bool == m_type );
-    return ( *m_data == 1 );
+    assert(ValueType::ddl_bool == m_type);
+    return (*m_data == 1);
 }
 
-void Value::setInt8( int8 value ) {
-    assert( ddl_int8 == m_type );
-    ::memcpy( m_data, &value, m_size );
+void Value::setInt8(int8 value) {
+    assert(ValueType::ddl_int8 == m_type);
+    ::memcpy(m_data, &value, m_size);
 }
 
 int8 Value::getInt8() {
-    assert( ddl_int8 == m_type );
-    return ( int8 ) ( *m_data );
+    assert(ValueType::ddl_int8 == m_type);
+    return (int8)(*m_data);
 }
 
-void Value::setInt16( int16 value ) {
-    assert( ddl_int16 == m_type );
-    ::memcpy( m_data, &value, m_size );
+void Value::setInt16(int16 value) {
+    assert(ValueType::ddl_int16 == m_type);
+    ::memcpy(m_data, &value, m_size);
 }
 
 int16 Value::getInt16() {
-    assert( ddl_int16 == m_type );
+    assert(ValueType::ddl_int16 == m_type);
     int16 i;
-    ::memcpy( &i, m_data, m_size );
+    ::memcpy(&i, m_data, m_size);
     return i;
 }
 
-void Value::setInt32( int32 value ) {
-    assert( ddl_int32 == m_type );
-    ::memcpy( m_data, &value, m_size );
+void Value::setInt32(int32 value) {
+    assert(ValueType::ddl_int32 == m_type);
+    ::memcpy(m_data, &value, m_size);
 }
 
 int32 Value::getInt32() {
-    assert( ddl_int32 == m_type );
+    assert(ValueType::ddl_int32 == m_type);
     int32 i;
-    ::memcpy( &i, m_data, m_size );
+    ::memcpy(&i, m_data, m_size);
     return i;
 }
 
-void Value::setInt64( int64 value ) {
-    assert( ddl_int64 == m_type );
-    ::memcpy( m_data, &value, m_size );
+void Value::setInt64(int64 value) {
+    assert(ValueType::ddl_int64 == m_type);
+    ::memcpy(m_data, &value, m_size);
 }
 
 int64 Value::getInt64() {
-    assert( ddl_int64 == m_type );
+    assert(ValueType::ddl_int64 == m_type);
     int64 i;
-    ::memcpy( &i, m_data, m_size );
+    ::memcpy(&i, m_data, m_size);
     return i;
 }
 
-void Value::setUnsignedInt8( uint8 value ) {
-    assert( ddl_unsigned_int8 == m_type );
-    ::memcpy( m_data, &value, m_size );
+void Value::setUnsignedInt8(uint8 value) {
+    assert(ValueType::ddl_unsigned_int8 == m_type);
+    ::memcpy(m_data, &value, m_size);
 }
 
 uint8 Value::getUnsignedInt8() const {
-    assert( ddl_unsigned_int8 == m_type );
+    assert(ValueType::ddl_unsigned_int8 == m_type);
     uint8 i;
-    ::memcpy( &i, m_data, m_size );
+    ::memcpy(&i, m_data, m_size);
     return i;
 }
 
-void Value::setUnsignedInt16( uint16 value ) {
-    assert( ddl_unsigned_int16 == m_type );
-    ::memcpy( m_data, &value, m_size );
+void Value::setUnsignedInt16(uint16 value) {
+    assert(ValueType::ddl_unsigned_int16 == m_type);
+    ::memcpy(m_data, &value, m_size);
 }
 
 uint16 Value::getUnsignedInt16() const {
-    assert( ddl_unsigned_int16 == m_type );
+    assert(ValueType::ddl_unsigned_int16 == m_type);
     uint16 i;
-    ::memcpy( &i, m_data, m_size );
+    ::memcpy(&i, m_data, m_size);
     return i;
 }
 
-void Value::setUnsignedInt32( uint32 value ) {
-    assert( ddl_unsigned_int32 == m_type );
-    ::memcpy( m_data, &value, m_size );
+void Value::setUnsignedInt32(uint32 value) {
+    assert(ValueType::ddl_unsigned_int32 == m_type);
+    ::memcpy(m_data, &value, m_size);
 }
 
 uint32 Value::getUnsignedInt32() const {
-    assert( ddl_unsigned_int32 == m_type );
+    assert(ValueType::ddl_unsigned_int32 == m_type);
     uint32 i;
-    ::memcpy( &i, m_data, m_size );
+    ::memcpy(&i, m_data, m_size);
     return i;
 }
 
-void Value::setUnsignedInt64( uint64 value ) {
-    assert( ddl_unsigned_int64 == m_type );
-    ::memcpy( m_data, &value, m_size );
+void Value::setUnsignedInt64(uint64 value) {
+    assert(ValueType::ddl_unsigned_int64 == m_type);
+    ::memcpy(m_data, &value, m_size);
 }
 
 uint64 Value::getUnsignedInt64() const {
-    assert( ddl_unsigned_int64 == m_type );
+    assert(ValueType::ddl_unsigned_int64 == m_type);
     uint64 i;
-    ::memcpy( &i, m_data, m_size );
+    ::memcpy(&i, m_data, m_size);
     return i;
 }
 
-void Value::setFloat( float value ) {
-    assert( ddl_float == m_type );
-    ::memcpy( m_data, &value, m_size );
+void Value::setFloat(float value) {
+    assert(ValueType::ddl_float == m_type);
+    ::memcpy(m_data, &value, m_size);
 }
 
 float Value::getFloat() const {
-    if( m_type == ddl_float ) {
+    if (m_type == ValueType::ddl_float) {
         float v;
-        ::memcpy( &v, m_data, m_size );
-        return ( float ) v;
+        ::memcpy(&v, m_data, m_size);
+        return (float)v;
     } else {
         float tmp;
-        ::memcpy( &tmp, m_data, 4 );
-        return ( float ) tmp;
+        ::memcpy(&tmp, m_data, 4);
+        return (float)tmp;
     }
 }
 
-void Value::setDouble( double value ) {
-    assert( ddl_double == m_type );
-    ::memcpy( m_data, &value, m_size );
+void Value::setDouble(double value) {
+    assert(ValueType::ddl_double == m_type);
+    ::memcpy(m_data, &value, m_size);
 }
 
 double Value::getDouble() const {
-    if ( m_type == ddl_double ) {
+    if (m_type == ValueType::ddl_double) {
         double v;
-        ::memcpy( &v, m_data, m_size );
-        return ( float ) v;
-    }
-    else {
+        ::memcpy(&v, m_data, m_size);
+        return (float)v;
+    } else {
         double tmp;
-        ::memcpy( &tmp, m_data, 4 );
-        return ( double ) tmp;
+        ::memcpy(&tmp, m_data, 4);
+        return (double)tmp;
     }
 }
 
-void Value::setString( const std::string &str ) {
-    assert( ddl_string == m_type );
-    ::memcpy( m_data, str.c_str(), str.size() );
-    m_data[ str.size() ] = '\0';
+void Value::setString(const std::string &str) {
+    assert(ValueType::ddl_string == m_type);
+    ::memcpy(m_data, str.c_str(), str.size());
+    m_data[str.size()] = '\0';
 }
 
 const char *Value::getString() const {
-    assert( ddl_string == m_type );
-    return (const char*) m_data;
+    assert(ValueType::ddl_string == m_type);
+    return (const char *)m_data;
 }
 
-void Value::setRef( Reference *ref ) {
-    assert( ddl_ref == m_type );
+void Value::setRef(Reference *ref) {
+    assert(ValueType::ddl_ref == m_type);
 
-    if ( ddl_nullptr != ref ) {
-        const size_t sizeInBytes( ref->sizeInBytes() );
-        if ( sizeInBytes > 0 ) {
-            if ( ddl_nullptr != m_data ) {
-                delete [] m_data;
+    if (nullptr != ref) {
+        const size_t sizeInBytes(ref->sizeInBytes());
+        if (sizeInBytes > 0) {
+            if (nullptr != m_data) {
+                delete[] m_data;
             }
 
-            m_data = (unsigned char*) new Reference(*ref);
+            m_data = (unsigned char *)new Reference(*ref);
         }
     }
 }
 
 Reference *Value::getRef() const {
-    assert( ddl_ref == m_type );
+    assert(ValueType::ddl_ref == m_type);
 
-    return (Reference*) m_data;
+    return (Reference *)m_data;
 }
 
-void Value::dump( IOStreamBase &/*stream*/ ) {
-    switch( m_type ) {
-        case ddl_none:
-            std::cout << "None" << std::endl;
+void Value::dump(IOStreamBase &stream) {
+    switch (m_type) {
+        case ValueType::ddl_none:
+            stream.write("None\n");
             break;
-        case ddl_bool:
-            std::cout << getBool() << std::endl;
+        case ValueType::ddl_bool:
+            stream.write(std::to_string(getBool()) + "\n");
             break;
-        case ddl_int8:
-            std::cout << getInt8() << std::endl;
+        case ValueType::ddl_int8:
+            stream.write(std::to_string(getInt8()) + "\n");
             break;
-        case ddl_int16:
-            std::cout << getInt16() << std::endl;
+        case ValueType::ddl_int16:
+            stream.write(std::to_string(getInt16()) + "\n");
             break;
-        case ddl_int32:
-            std::cout << getInt32() << std::endl;
+        case ValueType::ddl_int32:
+            stream.write(std::to_string(getInt32()) + "\n");
             break;
-        case ddl_int64:
-            std::cout << getInt64() << std::endl;
+        case ValueType::ddl_int64:
+            stream.write(std::to_string(getInt64()) + "\n");
             break;
-        case ddl_unsigned_int8:
-            std::cout << "Not supported" << std::endl;
+        case ValueType::ddl_unsigned_int8:
+            stream.write("Not supported\n");
             break;
-        case ddl_unsigned_int16:
-            std::cout << "Not supported" << std::endl;
+        case ValueType::ddl_unsigned_int16:
+            stream.write("Not supported\n");
             break;
-        case ddl_unsigned_int32:
-            std::cout << "Not supported" << std::endl;
+        case ValueType::ddl_unsigned_int32:
+            stream.write("Not supported\n");
             break;
-        case ddl_unsigned_int64:
-            std::cout << "Not supported" << std::endl;
+        case ValueType::ddl_unsigned_int64:
+            stream.write("Not supported\n");
             break;
-        case ddl_half:
-            std::cout << "Not supported" << std::endl;
+        case ValueType::ddl_half:
+            stream.write("Not supported\n");
             break;
-        case ddl_float:
-            std::cout << getFloat() << std::endl;
+        case ValueType::ddl_float:
+            stream.write(std::to_string(getFloat()) + "\n");
             break;
-        case ddl_double:
-            std::cout << getDouble() << std::endl;
+        case ValueType::ddl_double:
+            stream.write(std::to_string(getDouble()) + "\n");
             break;
-        case ddl_string:
-            std::cout << getString() << std::endl;
+        case ValueType::ddl_string:
+            stream.write(std::string(getString()) + "\n");
             break;
-        case ddl_ref:
-            std::cout << "Not supported" << std::endl;
+        case ValueType::ddl_ref:
+            stream.write("Not supported\n");
             break;
         default:
             break;
     }
 }
 
-void Value::setNext( Value *next ) {
+void Value::setNext(Value *next) {
     m_next = next;
 }
 
@@ -354,86 +352,86 @@ Value *Value::getNext() const {
     return m_next;
 }
 
-size_t Value::size() const{
-    size_t result=1;
-    Value *n=m_next;
-    while( n!=ddl_nullptr) {
+size_t Value::size() const {
+    size_t result = 1;
+    Value *n = m_next;
+    while (n != nullptr) {
         result++;
-        n=n->m_next;
+        n = n->m_next;
     }
     return result;
 }
 
-Value *ValueAllocator::allocPrimData( Value::ValueType type, size_t len ) {
-    if( type == Value::ddl_none || Value::ddl_types_max == type ) {
-        return ddl_nullptr;
+Value *ValueAllocator::allocPrimData(Value::ValueType type, size_t len) {
+    if (type == Value::ValueType::ddl_none || Value::ValueType::ddl_types_max == type) {
+        return nullptr;
     }
 
-    Value *data = new Value( type );
-    switch( type ) {
-        case Value::ddl_bool:
-            data->m_size = sizeof( bool );
+    Value *data = new Value(type);
+    switch (type) {
+        case Value::ValueType::ddl_bool:
+            data->m_size = sizeof(bool);
             break;
-        case Value::ddl_int8:
-            data->m_size = sizeof( int8 );
+        case Value::ValueType::ddl_int8:
+            data->m_size = sizeof(int8);
             break;
-        case Value::ddl_int16:
-            data->m_size = sizeof( int16 );
+        case Value::ValueType::ddl_int16:
+            data->m_size = sizeof(int16);
             break;
-        case Value::ddl_int32:
-            data->m_size = sizeof( int32 );
+        case Value::ValueType::ddl_int32:
+            data->m_size = sizeof(int32);
             break;
-        case Value::ddl_int64:
-            data->m_size = sizeof( int64 );
+        case Value::ValueType::ddl_int64:
+            data->m_size = sizeof(int64);
             break;
-        case Value::ddl_unsigned_int8:
-            data->m_size = sizeof( uint8 );
+        case Value::ValueType::ddl_unsigned_int8:
+            data->m_size = sizeof(uint8);
             break;
-        case Value::ddl_unsigned_int16:
-            data->m_size = sizeof( uint16 );
+        case Value::ValueType::ddl_unsigned_int16:
+            data->m_size = sizeof(uint16);
             break;
-        case Value::ddl_unsigned_int32:
-            data->m_size = sizeof( uint32 );
+        case Value::ValueType::ddl_unsigned_int32:
+            data->m_size = sizeof(uint32);
             break;
-        case Value::ddl_unsigned_int64:
-            data->m_size = sizeof( uint64 );
+        case Value::ValueType::ddl_unsigned_int64:
+            data->m_size = sizeof(uint64);
             break;
-        case Value::ddl_half:
-            data->m_size = sizeof( short );
+        case Value::ValueType::ddl_half:
+            data->m_size = sizeof(short);
             break;
-        case Value::ddl_float:
-            data->m_size = sizeof( float );
+        case Value::ValueType::ddl_float:
+            data->m_size = sizeof(float);
             break;
-        case Value::ddl_double:
-            data->m_size = sizeof( double );
+        case Value::ValueType::ddl_double:
+            data->m_size = sizeof(double);
             break;
-        case Value::ddl_string:
-            data->m_size = sizeof( char )*(len+1);
+        case Value::ValueType::ddl_string:
+            data->m_size = sizeof(char) * (len + 1);
             break;
-        case Value::ddl_ref:
+        case Value::ValueType::ddl_ref:
             data->m_size = 0;
             break;
-        case Value::ddl_none:
-        case Value::ddl_types_max:
+        case Value::ValueType::ddl_none:
+        case Value::ValueType::ddl_types_max:
         default:
             break;
     }
 
-    if( data->m_size ) {
-        data->m_data = new unsigned char[ data->m_size ];
-        ::memset(data->m_data,0,data->m_size);
+    if (data->m_size) {
+        data->m_data = new unsigned char[data->m_size];
+        ::memset(data->m_data, 0, data->m_size);
     }
 
     return data;
 }
 
-void ValueAllocator::releasePrimData( Value **data ) {
-    if( !data ) {
+void ValueAllocator::releasePrimData(Value **data) {
+    if (!data) {
         return;
     }
 
     delete *data;
-    *data = ddl_nullptr;
+    *data = nullptr;
 }
 
 END_ODDLPARSER_NS
diff --git a/contrib/openddlparser/include/openddlparser/DDLNode.h b/contrib/openddlparser/include/openddlparser/DDLNode.h
index 915bd3041..593a5f145 100644
--- a/contrib/openddlparser/include/openddlparser/DDLNode.h
+++ b/contrib/openddlparser/include/openddlparser/DDLNode.h
@@ -1,7 +1,7 @@
 /*-----------------------------------------------------------------------------------------------
 The MIT License (MIT)
 
-Copyright (c) 2014-2015 Kim Kulling
+Copyright (c) 2014-2020 Kim Kulling
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
@@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <openddlparser/OpenDDLCommon.h>
 
-#include <vector>
 #include <string>
+#include <vector>
 
 BEGIN_ODDLPARSER_NS
 
@@ -53,10 +53,10 @@ public:
     friend class OpenDDLParser;
 
     /// @brief  The child-node-list type.
-    typedef std::vector<DDLNode*> DllNodeList;
+    typedef std::vector<DDLNode *> DllNodeList;
 
     /// @brief  The child-node-list iterator.
-    typedef std::vector<DDLNode*>::iterator DDLNodeIt;
+    typedef std::vector<DDLNode *>::iterator DDLNodeIt;
 
 public:
     ///	@brief  The class destructor.
@@ -64,7 +64,7 @@ public:
 
     ///	@brief  Will attach a parent node instance, an older one will be released.
     /// @param  parent      [in] The parent node instance.
-    void attachParent( DDLNode *parent );
+    void attachParent(DDLNode *parent);
 
     /// @brief  Will try to detach a parent node instance, if there is any.
     void detachParent();
@@ -79,7 +79,7 @@ public:
 
     /// Set the type of the DDLNode instance.
     /// @param  type    [in] The type.
-    void setType( const std::string &type );
+    void setType(const std::string &type);
 
     /// @brief  Returns the type of the DDLNode instance.
     /// @return The type of the DDLNode instance.
@@ -87,7 +87,7 @@ public:
 
     /// Set the name of the DDLNode instance.
     /// @param  name        [in] The name.
-    void setName( const std::string &name );
+    void setName(const std::string &name);
 
     /// @brief  Returns the name of the DDLNode instance.
     /// @return The name of the DDLNode instance.
@@ -95,7 +95,7 @@ public:
 
     /// @brief  Set a new property set.
     ///	@param  prop        [in] The first element of the property set.
-    void setProperties( Property *prop );
+    void setProperties(Property *prop);
 
     ///	@brief  Returns the first element of the assigned property set.
     ///	@return The first property of the assigned property set.
@@ -104,7 +104,7 @@ public:
     ///	@brief  Looks for a given property.
     /// @param  name        [in] The name for the property to look for.
     /// @return true, if a corresponding property is assigned to the node, false if not.
-    bool hasProperty( const std::string &name );
+    bool hasProperty(const std::string &name);
 
     ///	@brief  Will return true, if any properties are assigned to the node instance.
     ///	@return True, if properties are assigned.
@@ -113,11 +113,11 @@ public:
     ///	@brief  Search for a given property and returns it. Will return ddl_nullptr if no property was found.
     /// @param  name        [in] The name for the property to look for.
     /// @return The property or ddl_nullptr if no property was found.
-    Property *findPropertyByName( const std::string &name );
-    
+    Property *findPropertyByName(const std::string &name);
+
     /// @brief  Set a new value set.
     /// @param  val         [in] The first value instance of the value set.
-    void setValue( Value *val );
+    void setValue(Value *val);
 
     ///	@brief  Returns the first element of the assigned value set.
     ///	@return The first property of the assigned value set.
@@ -125,7 +125,7 @@ public:
 
     /// @brief  Set a new DataArrayList.
     /// @param  dtArrayList [in] The DataArrayList instance.
-    void setDataArrayList( DataArrayList *dtArrayList );
+    void setDataArrayList(DataArrayList *dtArrayList);
 
     ///	@brief  Returns the DataArrayList.
     ///	@return The DataArrayList.
@@ -133,7 +133,7 @@ public:
 
     /// @brief  Set a new Reference set.
     /// @param  refs        [in] The first value instance of the Reference set.
-    void setReferences( Reference  *refs );
+    void setReferences(Reference *refs);
 
     ///	@brief  Returns the first element of the assigned Reference set.
     ///	@return The first property of the assigned Reference set.
@@ -148,20 +148,20 @@ public:
     ///	@param  name        [in] The name for the new DDLNode instance.
     /// @param  parent      [in] The parent node instance or ddl_nullptr if no parent node is there.
     /// @return The new created node instance.
-    static DDLNode *create( const std::string &type, const std::string &name, DDLNode *parent = ddl_nullptr );
+    static DDLNode *create(const std::string &type, const std::string &name, DDLNode *parent = nullptr);
 
 private:
-    DDLNode( const std::string &type, const std::string &name, size_t idx, DDLNode *parent = ddl_nullptr );
+    DDLNode(const std::string &type, const std::string &name, size_t idx, DDLNode *parent = nullptr);
     DDLNode();
-    DDLNode( const DDLNode & ) ddl_no_copy;
-    DDLNode &operator = ( const DDLNode & ) ddl_no_copy;
+    DDLNode(const DDLNode &) ddl_no_copy;
+    DDLNode &operator=(const DDLNode &) ddl_no_copy;
     static void releaseNodes();
 
 private:
     std::string m_type;
     std::string m_name;
     DDLNode *m_parent;
-    std::vector<DDLNode*> m_children;
+    std::vector<DDLNode *> m_children;
     Property *m_properties;
     Value *m_value;
     DataArrayList *m_dtArrayList;
diff --git a/contrib/openddlparser/include/openddlparser/OpenDDLCommon.h b/contrib/openddlparser/include/openddlparser/OpenDDLCommon.h
index bec62cc9d..6ccc83b88 100644
--- a/contrib/openddlparser/include/openddlparser/OpenDDLCommon.h
+++ b/contrib/openddlparser/include/openddlparser/OpenDDLCommon.h
@@ -1,7 +1,7 @@
 /*-----------------------------------------------------------------------------------------------
 The MIT License (MIT)
 
-Copyright (c) 2014-2015 Kim Kulling
+Copyright (c) 2014-2020 Kim Kulling
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
@@ -23,49 +23,49 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #pragma once
 
 #include <cstddef>
-#include <vector>
 #include <string>
+#include <vector>
 
 #include <stdio.h>
 #include <string.h>
 #ifndef _WIN32
-#  include <inttypes.h>
+#include <inttypes.h>
 #endif
 
-#if defined(_MSC_VER) && !defined( OPENDDL_STATIC_LIBARY )
+#if defined(_MSC_VER) && !defined(OPENDDL_STATIC_LIBARY)
 
-#   define TAG_DLL_EXPORT __declspec(dllexport)
-#   define TAG_DLL_IMPORT __declspec(dllimport )
-#   ifdef OPENDDLPARSER_BUILD
-#       define DLL_ODDLPARSER_EXPORT TAG_DLL_EXPORT
-#   else
-#       define DLL_ODDLPARSER_EXPORT TAG_DLL_IMPORT
-#   endif // OPENDDLPARSER_BUILD
-#   pragma warning( disable : 4251 )
+#define TAG_DLL_EXPORT __declspec(dllexport)
+#define TAG_DLL_IMPORT __declspec(dllimport)
+#ifdef OPENDDLPARSER_BUILD
+#define DLL_ODDLPARSER_EXPORT TAG_DLL_EXPORT
 #else
-#   define DLL_ODDLPARSER_EXPORT
+#define DLL_ODDLPARSER_EXPORT TAG_DLL_IMPORT
+#endif // OPENDDLPARSER_BUILD
+#pragma warning(disable : 4251)
+#else
+#define DLL_ODDLPARSER_EXPORT
 #endif // _WIN32
 
 // Namespace declarations, override this to avoid any conflicts
 #define BEGIN_ODDLPARSER_NS namespace ODDLParser {
-#define END_ODDLPARSER_NS   } // namespace ODDLParser
-#define USE_ODDLPARSER_NS   using namespace ODDLParser;
+#define END_ODDLPARSER_NS } // namespace ODDLParser
+#define USE_ODDLPARSER_NS using namespace ODDLParser;
 
 BEGIN_ODDLPARSER_NS
 
 // We will use C++11 optional
 #ifndef OPENDDL_NO_USE_CPP11
-    // All C++11 constructs
-#   define ddl_nullptr nullptr
-#   define ddl_override override
-#   define ddl_final final
-#   define ddl_no_copy = delete
+// All C++11 constructs
+#define nullptr nullptr
+#define ddl_override override
+#define ddl_final final
+#define ddl_no_copy = delete
 #else
-    // Fall-back for older compilers
-#   define ddl_nullptr NULL
-#   define ddl_override
-#   define ddl_final
-#   define ddl_no_copy
+// Fall-back for older compilers
+#define nullptr NULL
+#define ddl_override
+#define ddl_final
+#define ddl_no_copy
 #endif // OPENDDL_NO_USE_CPP11
 
 // Forward declarations
@@ -80,36 +80,36 @@ struct DataArrayList;
 
 // Platform-specific typedefs
 #ifdef _WIN32
-typedef signed __int64    int64_impl;
-typedef unsigned __int64  uint64_impl;
+typedef signed __int64 int64_impl;
+typedef unsigned __int64 uint64_impl;
 #else
-typedef int64_t           int64_impl;
-typedef uint64_t          uint64_impl;
+typedef int64_t int64_impl;
+typedef uint64_t uint64_impl;
 #endif
 
 // OpenDDL-specific data typedefs
-typedef signed char       int8;    ///< Signed integer, 1 byte
-typedef signed short      int16;   ///< Signed integer, 2 byte
-typedef signed int        int32;   ///< Signed integer, 4 byte
-typedef int64_impl        int64;   ///< Signed integer, 8 byte
-typedef unsigned char     uint8;   ///< Unsigned integer, 1 byte
-typedef unsigned short    uint16;  ///< Unsigned integer, 2 byte
-typedef unsigned int      uint32;  ///< Unsigned integer, 4 byte
-typedef uint64_impl       uint64;  ///< Unsigned integer, 8 byte
+using int8 = signed char; ///< Signed integer, 1 byte
+using int16 = signed short; ///< Signed integer, 2 byte
+using int32 = signed int; ///< Signed integer, 4 byte
+using int64 = int64_impl; ///< Signed integer, 8 byte
+using uint8 = unsigned char; ///< Unsigned integer, 1 byte
+using uint16 = unsigned short ; ///< Unsigned integer, 2 byte
+using uint32 = unsigned int; ///< Unsigned integer, 4 byte
+using uint64 = uint64_impl ; ///< Unsigned integer, 8 byte
 
 ///	@brief  Stores a text.
 ///
 /// A text is stored in a simple character buffer. Texts buffer can be
 /// greater than the number of stored characters in them.
 struct DLL_ODDLPARSER_EXPORT Text {
-    size_t m_capacity;  ///< The capacity of the text.
-    size_t m_len;       ///< The length of the text.
-    char *m_buffer;     ///< The buffer with the text.
+    size_t m_capacity; ///< The capacity of the text.
+    size_t m_len; ///< The length of the text.
+    char *m_buffer; ///< The buffer with the text.
 
     ///	@brief  The constructor with a given text buffer.
     /// @param  buffer      [in] The buffer.
     /// @param  numChars    [in] The number of characters in the buffer.
-    Text( const char *buffer, size_t numChars );
+    Text(const char *buffer, size_t numChars);
 
     ///	@brief  The destructor.
     ~Text();
@@ -120,55 +120,54 @@ struct DLL_ODDLPARSER_EXPORT Text {
     ///	@brief  Set a new text.
     /// @param  buffer      [in] The buffer.
     /// @param  numChars    [in] The number of characters in the buffer.
-    void set( const char *buffer, size_t numChars );
+    void set(const char *buffer, size_t numChars);
 
     ///	@brief  The compare operator for std::strings.
-    bool operator == ( const std::string &name ) const;
+    bool operator==(const std::string &name) const;
 
     ///	@brief  The compare operator for Texts.
-    bool operator == ( const Text &rhs ) const;
+    bool operator==(const Text &rhs) const;
 
 private:
-    Text( const Text & ) ddl_no_copy;
-    Text &operator = ( const Text & ) ddl_no_copy;
+    Text(const Text &) ddl_no_copy;
+    Text &operator=(const Text &) ddl_no_copy;
 };
 
 ///	@brief  Description of the type of a name.
 enum NameType {
     GlobalName, ///< Name is global.
-    LocalName   ///< Name is local.
+    LocalName ///< Name is local.
 };
 
 ///	@brief  Stores an OpenDDL-specific name
 struct DLL_ODDLPARSER_EXPORT Name {
-    NameType    m_type; ///< The type of the name ( @see NameType ).
-    Text        *m_id;  ///< The id.
+    NameType m_type; ///< The type of the name ( @see NameType ).
+    Text *m_id; ///< The id.
 
     ///	@brief  The constructor with the type and the id.
     ///	@param  type    [in] The name type.
     ///	@param  id      [in] The id.
-    Name( NameType type, Text *id );
-    Name( const Name &name );
+    Name(NameType type, Text *id);
+    Name(const Name &name);
     ///	@brief  The destructor.
     ~Name();
 
 private:
-
-    Name &operator = ( const Name& ) ddl_no_copy;
+    Name &operator=(const Name &) ddl_no_copy;
 };
 
 ///	@brief  Stores a bundle of references.
 struct DLL_ODDLPARSER_EXPORT Reference {
-    size_t   m_numRefs;         ///< The number of stored references.
-    Name   **m_referencedName;  ///< The reference names.
+    size_t m_numRefs; ///< The number of stored references.
+    Name **m_referencedName; ///< The reference names.
 
     ///	@brief  The default constructor.
     Reference();
-    Reference( const Reference &ref );
+    Reference(const Reference &ref);
     ///	@brief  The constructor with an array of ref names.
     /// @param  numrefs     [in] The number of ref names.
     /// @param  names       [in] The ref names.
-    Reference( size_t numrefs, Name **names );
+    Reference(size_t numrefs, Name **names);
 
     ///	@brief  The destructor.
     ~Reference();
@@ -178,38 +177,38 @@ struct DLL_ODDLPARSER_EXPORT Reference {
     size_t sizeInBytes();
 
 private:
-    Reference &operator = ( const Reference & ) ddl_no_copy;
+    Reference &operator=(const Reference &) ddl_no_copy;
 };
 
 ///	@brief  Stores a property list.
 struct DLL_ODDLPARSER_EXPORT Property {
-    Text       *m_key;      ///< The identifier / key of the property.
-    Value      *m_value;    ///< The value assigned to its key / id ( ddl_nullptr if none ).
-    Reference  *m_ref;      ///< References assigned to its key / id ( ddl_nullptr if none ).
-    Property   *m_next;     ///< The next property ( ddl_nullptr if none ).
+    Text *m_key; ///< The identifier / key of the property.
+    Value *m_value; ///< The value assigned to its key / id ( ddl_nullptr if none ).
+    Reference *m_ref; ///< References assigned to its key / id ( ddl_nullptr if none ).
+    Property *m_next; ///< The next property ( ddl_nullptr if none ).
 
     ///	@brief  The default constructor.
     Property();
 
     ///	@brief  The constructor for initialization.
     /// @param  id      [in] The identifier
-    Property( Text *id );
+    Property(Text *id);
 
     ///	@brief  The destructor.
     ~Property();
 
 private:
-    Property( const Property & ) ddl_no_copy;
-    Property &operator = ( const Property & ) ddl_no_copy;
+    Property(const Property &) ddl_no_copy;
+    Property &operator=(const Property &) ddl_no_copy;
 };
 
 ///	@brief  Stores a data array list.
 struct DLL_ODDLPARSER_EXPORT DataArrayList {
-    size_t         m_numItems;  ///< The number of items in the list.
-    Value         *m_dataList;  ///< The data list ( a Value ).
-    DataArrayList *m_next;      ///< The next data array list ( ddl_nullptr if last ).
-    Reference     *m_refs;
-    size_t         m_numRefs;
+    size_t m_numItems; ///< The number of items in the list.
+    Value *m_dataList; ///< The data list ( a Value ).
+    DataArrayList *m_next; ///< The next data array list ( ddl_nullptr if last ).
+    Reference *m_refs;
+    size_t m_numRefs;
 
     ///	@brief  The default constructor for initialization.
     DataArrayList();
@@ -221,13 +220,13 @@ struct DLL_ODDLPARSER_EXPORT DataArrayList {
     size_t size();
 
 private:
-    DataArrayList( const DataArrayList & ) ddl_no_copy;
-    DataArrayList &operator = ( const DataArrayList & ) ddl_no_copy;
+    DataArrayList(const DataArrayList &) ddl_no_copy;
+    DataArrayList &operator=(const DataArrayList &) ddl_no_copy;
 };
 
 ///	@brief  Stores the context of a parsed OpenDDL declaration.
 struct DLL_ODDLPARSER_EXPORT Context {
-    DDLNode *m_root;    ///< The root node of the OpenDDL node tree.
+    DDLNode *m_root; ///< The root node of the OpenDDL node tree.
 
     ///	@brief  Constructor for initialization.
     Context();
@@ -239,8 +238,8 @@ struct DLL_ODDLPARSER_EXPORT Context {
     void clear();
 
 private:
-    Context( const Context & ) ddl_no_copy;
-    Context &operator = ( const Context & ) ddl_no_copy;
+    Context(const Context &) ddl_no_copy;
+    Context &operator=(const Context &) ddl_no_copy;
 };
 
 END_ODDLPARSER_NS
diff --git a/contrib/openddlparser/include/openddlparser/OpenDDLExport.h b/contrib/openddlparser/include/openddlparser/OpenDDLExport.h
index 020d662a0..945253594 100644
--- a/contrib/openddlparser/include/openddlparser/OpenDDLExport.h
+++ b/contrib/openddlparser/include/openddlparser/OpenDDLExport.h
@@ -1,7 +1,7 @@
 /*-----------------------------------------------------------------------------------------------
 The MIT License (MIT)
 
-Copyright (c) 2014-2015 Kim Kulling
+Copyright (c) 2014-2020 Kim Kulling
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
@@ -40,7 +40,7 @@ class IOStreamBase;
 class DLL_ODDLPARSER_EXPORT OpenDDLExport {
 public:
     ///	@brief  The class constructor
-    OpenDDLExport( IOStreamBase *stream = ddl_nullptr );
+    OpenDDLExport(IOStreamBase *stream = nullptr);
 
     ///	@brief  The class destructor.
     ~OpenDDLExport();
@@ -49,29 +49,29 @@ public:
     /// @param  ctx         [in] Pointer to the context.
     /// @param  filename    [in] The filename for the export.
     /// @return True in case of success, false in case of an error.
-    bool exportContext( Context *ctx, const std::string &filename );
+    bool exportContext(Context *ctx, const std::string &filename);
 
     ///	@brief  Handles a node export.
     /// @param  node        [in] The node to handle with.
     /// @return True in case of success, false in case of an error.
-    bool handleNode( DDLNode *node );
+    bool handleNode(DDLNode *node);
 
     ///	@brief  Writes the statement to the stream.
     /// @param  statement   [in]  The content to write.
     /// @return True in case of success, false in case of an error.
-    bool writeToStream( const std::string &statement );
+    bool writeToStream(const std::string &statement);
 
 protected:
-    bool writeNode( DDLNode *node, std::string &statement );
-    bool writeNodeHeader( DDLNode *node, std::string &statement );
-    bool writeProperties( DDLNode *node, std::string &statement );
-    bool writeValueType( Value::ValueType type, size_t numItems, std::string &statement );
-    bool writeValue( Value *val, std::string &statement );
-    bool writeValueArray( DataArrayList *al, std::string &statement );
+    bool writeNode(DDLNode *node, std::string &statement);
+    bool writeNodeHeader(DDLNode *node, std::string &statement);
+    bool writeProperties(DDLNode *node, std::string &statement);
+    bool writeValueType(Value::ValueType type, size_t numItems, std::string &statement);
+    bool writeValue(Value *val, std::string &statement);
+    bool writeValueArray(DataArrayList *al, std::string &statement);
 
 private:
-    OpenDDLExport( const OpenDDLExport & ) ddl_no_copy;
-    OpenDDLExport &operator = ( const OpenDDLExport  & ) ddl_no_copy;
+    OpenDDLExport(const OpenDDLExport &) ddl_no_copy;
+    OpenDDLExport &operator=(const OpenDDLExport &) ddl_no_copy;
 
 private:
     IOStreamBase *m_stream;
diff --git a/contrib/openddlparser/include/openddlparser/OpenDDLParser.h b/contrib/openddlparser/include/openddlparser/OpenDDLParser.h
index ef7f3a72e..5794add90 100644
--- a/contrib/openddlparser/include/openddlparser/OpenDDLParser.h
+++ b/contrib/openddlparser/include/openddlparser/OpenDDLParser.h
@@ -1,7 +1,7 @@
 /*-----------------------------------------------------------------------------------------------
 The MIT License (MIT)
 
-Copyright (c) 2014-2015 Kim Kulling
+Copyright (c) 2014-2020 Kim Kulling
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
@@ -22,13 +22,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 -----------------------------------------------------------------------------------------------*/
 #pragma once
 
-#include <openddlparser/OpenDDLCommon.h>
 #include <openddlparser/DDLNode.h>
+#include <openddlparser/OpenDDLCommon.h>
 #include <openddlparser/OpenDDLParserUtils.h>
 #include <openddlparser/Value.h>
 
-#include <vector>
 #include <string>
+#include <vector>
 
 BEGIN_ODDLPARSER_NS
 
@@ -39,14 +39,9 @@ struct Identifier;
 struct Reference;
 struct Property;
 
-template<class T>
-inline
-bool isEmbeddedCommentOpenTag( T *in, T *end ) {
-    if ( in == end ) {
-        return false;
-    }
-
-    if ( in == '/' && in+1 == '*' ) {
+template <class T>
+inline bool isEmbeddedCommentOpenTag(T *in, T *end) {
+    if (in == '/' && in + 1 == '*') {
         return true;
     }
 
@@ -58,11 +53,10 @@ bool isEmbeddedCommentOpenTag( T *in, T *end ) {
 /// @param  end     [in] The end position in the buffer.
 ///	@return Pointer showing to the next token or the end of the buffer.
 ///	@detail Will not increase buffer when already a valid buffer was found.
-template<class T>
-inline
-T *lookForNextToken( T *in, T *end ) {
-    while( ( in != end ) && ( isSpace( *in ) || isNewLine( *in ) || ',' == *in ) ) {
-        in++;
+template <class T>
+inline T *lookForNextToken(T *in, T *end) {
+    while ((in != end) && (isSpace(*in) || isNewLine(*in) || ',' == *in)) {
+        ++in;
     }
     return in;
 }
@@ -72,26 +66,25 @@ T *lookForNextToken( T *in, T *end ) {
 /// @param  end     [in] The end position in the buffer.
 ///	@return Pointer showing to the next token or the end of the buffer.
 ///	@detail Will  increase buffer by a minimum of one.
-template<class T>
-inline
-T *getNextToken( T *in, T *end ) {
-    T *tmp( in );
-    in = lookForNextToken( in, end );
-    if( tmp == in ) {
-        in++;
+template <class T>
+inline T *getNextToken(T *in, T *end) {
+    T *tmp(in);
+    in = lookForNextToken(in, end);
+    if (tmp == in) {
+        ++in;
     }
     return in;
 }
 
 ///	@brief  Defines the log severity.
 enum LogSeverity {
-    ddl_debug_msg = 0,  ///< Debug message, for debugging
-    ddl_info_msg,       ///< Info messages, normal mode
-    ddl_warn_msg,       ///< Parser warnings
-    ddl_error_msg       ///< Parser errors
+    ddl_debug_msg = 0, ///< Debug message, for debugging
+    ddl_info_msg, ///< Info messages, normal mode
+    ddl_warn_msg, ///< Parser warnings
+    ddl_error_msg ///< Parser errors
 };
 
-DLL_ODDLPARSER_EXPORT const char *getTypeToken( Value::ValueType  type );
+DLL_ODDLPARSER_EXPORT const char *getTypeToken(Value::ValueType type);
 
 //-------------------------------------------------------------------------------------------------
 ///	@class		OpenDDLParser
@@ -105,7 +98,7 @@ DLL_ODDLPARSER_EXPORT const char *getTypeToken( Value::ValueType  type );
 class DLL_ODDLPARSER_EXPORT OpenDDLParser {
 public:
     ///	@brief  The log callback function pointer.
-    typedef void( *logCallback )( LogSeverity severity, const std::string &msg );
+    typedef void (*logCallback)(LogSeverity severity, const std::string &msg);
 
 public:
     ///	@brief  The default class constructor.
@@ -114,14 +107,14 @@ public:
     ///	@brief  The class constructor.
     ///	@param  buffer      [in] The buffer
     ///	@param  len         [in] Size of the buffer
-    OpenDDLParser( const char *buffer, size_t len );
+    OpenDDLParser(const char *buffer, size_t len);
 
     ///	@brief  The class destructor.
     ~OpenDDLParser();
 
     ///	@brief  Setter for an own log callback function.
     /// @param  callback    [in] The own callback.
-    void setLogCallback( logCallback callback );
+    void setLogCallback(logCallback callback);
 
     ///	@brief  Getter for the log callback.
     /// @return The current log callback.
@@ -130,11 +123,11 @@ public:
     ///	@brief  Assigns a new buffer to parse.
     ///	@param  buffer      [in] The buffer
     ///	@param  len         [in] Size of the buffer
-    void setBuffer( const char *buffer, size_t len );
+    void setBuffer(const char *buffer, size_t len);
 
     ///	@brief  Assigns a new buffer to parse.
     /// @param  buffer      [in] The buffer as a std::vector.
-    void setBuffer( const std::vector<char> &buffer );
+    void setBuffer(const std::vector<char> &buffer);
 
     ///	@brief  Returns the buffer pointer.
     /// @return The buffer pointer.
@@ -147,12 +140,15 @@ public:
     ///	@brief  Clears all parser data, including buffer and active context.
     void clear();
 
+    bool validate();
+
     ///	@brief  Starts the parsing of the OpenDDL-file.
     /// @return True in case of success, false in case of an error.
     /// @remark In case of errors check log.
     bool parse();
 
-    bool exportContext( Context *ctx, const std::string &filename );
+    
+    bool exportContext(Context *ctx, const std::string &filename);
 
     ///	@brief  Returns the root node.
     /// @return The root node.
@@ -163,37 +159,37 @@ public:
     Context *getContext() const;
 
 public: // parser helpers
-    char *parseNextNode( char *current, char *end );
-    char *parseHeader( char *in, char *end );
-    char *parseStructure( char *in, char *end );
-    char *parseStructureBody( char *in, char *end, bool &error );
-    void pushNode( DDLNode *node );
+    char *parseNextNode(char *current, char *end);
+    char *parseHeader(char *in, char *end);
+    char *parseStructure(char *in, char *end);
+    char *parseStructureBody(char *in, char *end, bool &error);
+    void pushNode(DDLNode *node);
     DDLNode *popNode();
     DDLNode *top();
-    static void normalizeBuffer( std::vector<char> &buffer );
-    static char *parseName( char *in, char *end, Name **name );
-    static char *parseIdentifier( char *in, char *end, Text **id );
-    static char *parsePrimitiveDataType( char *in, char *end, Value::ValueType &type, size_t &len );
-    static char *parseReference( char *in, char *end, std::vector<Name*> &names );
-    static char *parseBooleanLiteral( char *in, char *end, Value **boolean );
-    static char *parseIntegerLiteral( char *in, char *end, Value **integer, Value::ValueType integerType = Value::ddl_int32 );
-    static char *parseFloatingLiteral( char *in, char *end, Value **floating, Value::ValueType floatType= Value::ddl_float );
-    static char *parseStringLiteral( char *in, char *end, Value **stringData );
-    static char *parseHexaLiteral( char *in, char *end, Value **data );
-    static char *parseProperty( char *in, char *end, Property **prop );
-    static char *parseDataList( char *in, char *end, Value::ValueType type, Value **data, size_t &numValues, Reference **refs, size_t &numRefs );
-    static char *parseDataArrayList( char *in, char *end, Value::ValueType type, DataArrayList **dataList );
+    static void normalizeBuffer(std::vector<char> &buffer);
+    static char *parseName(char *in, char *end, Name **name);
+    static char *parseIdentifier(char *in, char *end, Text **id);
+    static char *parsePrimitiveDataType(char *in, char *end, Value::ValueType &type, size_t &len);
+    static char *parseReference(char *in, char *end, std::vector<Name *> &names);
+    static char *parseBooleanLiteral(char *in, char *end, Value **boolean);
+    static char *parseIntegerLiteral(char *in, char *end, Value **integer, Value::ValueType integerType = Value::ValueType::ddl_int32);
+    static char *parseFloatingLiteral(char *in, char *end, Value **floating, Value::ValueType floatType = Value::ValueType::ddl_float);
+    static char *parseStringLiteral(char *in, char *end, Value **stringData);
+    static char *parseHexaLiteral(char *in, char *end, Value **data);
+    static char *parseProperty(char *in, char *end, Property **prop);
+    static char *parseDataList(char *in, char *end, Value::ValueType type, Value **data, size_t &numValues, Reference **refs, size_t &numRefs);
+    static char *parseDataArrayList(char *in, char *end, Value::ValueType type, DataArrayList **dataList);
     static const char *getVersion();
 
 private:
-    OpenDDLParser( const OpenDDLParser & ) ddl_no_copy;
-    OpenDDLParser &operator = ( const OpenDDLParser & ) ddl_no_copy;
+    OpenDDLParser(const OpenDDLParser &) ddl_no_copy;
+    OpenDDLParser &operator=(const OpenDDLParser &) ddl_no_copy;
 
 private:
     logCallback m_logCallback;
     std::vector<char> m_buffer;
 
-    typedef std::vector<DDLNode*> DDLNodeStack;
+    typedef std::vector<DDLNode *> DDLNodeStack;
     DDLNodeStack m_stack;
     Context *m_context;
 };
diff --git a/contrib/openddlparser/include/openddlparser/OpenDDLParserUtils.h b/contrib/openddlparser/include/openddlparser/OpenDDLParserUtils.h
index f0762ac67..5f177f252 100644
--- a/contrib/openddlparser/include/openddlparser/OpenDDLParserUtils.h
+++ b/contrib/openddlparser/include/openddlparser/OpenDDLParserUtils.h
@@ -1,7 +1,7 @@
 /*-----------------------------------------------------------------------------------------------
 The MIT License (MIT)
 
-Copyright (c) 2014-2015 Kim Kulling
+Copyright (c) 2014-2020 Kim Kulling
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
@@ -26,64 +26,318 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 BEGIN_ODDLPARSER_NS
 
-template<class T>
-inline
-bool isUpperCase( T in ) {
-    return ( in >= 'A' && in <= 'Z' );
+template <class T>
+inline bool isUpperCase(T in) {
+    return (in >= 'A' && in <= 'Z');
 }
 
-template<class T>
-inline
-bool isLowerCase( T in ) {
-    return ( in >= 'a' && in <= 'z' );
+template <class T>
+inline bool isLowerCase(T in) {
+    return (in >= 'a' && in <= 'z');
 }
 
-template<class T>
-inline
-bool isSpace( const T in ) {
-    return ( ' ' == in || '\t' == in );
+template <class T>
+inline bool isSpace(const T in) {
+    return (' ' == in || '\t' == in);
 }
 
-template<class T>
-inline
-bool isNewLine( const T in ) {
-    return ( '\n' == in || ( '\r' == in ) );
+template <class T>
+inline bool isNewLine(const T in) {
+    return ('\n' == in || ('\r' == in));
 }
 
-template<class T>
-inline
-bool isSeparator( T in ) {
-    if( isSpace( in ) || ',' == in || '{' == in || '}' == in || '[' == in || '(' == in || ')' == in ) {
+template <class T>
+inline bool isSeparator(T in) {
+    if (isSpace(in) || ',' == in || '{' == in || '}' == in || '[' == in || '(' == in || ')' == in) {
         return true;
     }
     return false;
 }
 
-template<class T>
-inline
-bool isNumeric( const T in ) {
-    return ( in >= '0' && in <= '9' );
+static const unsigned char chartype_table[256] = {
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0, // 0-15
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0, // 16-31
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0, // 32-47
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    0,
+    0,
+    0,
+    0,
+    0, // 48-63
+
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0, // 64-79
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0, // 80-95
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0, // 96-111
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0, // 112-127
+
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0, // > 127
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+};
+
+template <class T>
+inline bool isNumeric(const T in) {
+    return (chartype_table[static_cast<size_t>(in)] == 1);
 }
 
-template<class T>
-inline
-bool isNotEndOfToken( T *in, T *end ) {
-    return ( '}' != *in && ',' != *in && !isSpace( *in ) && ')' != *in && in != end );
+template <class T>
+inline bool isNotEndOfToken(T *in, T *end) {
+    return ('}' != *in && ',' != *in && !isSpace(*in) && ')' != *in && in != end);
 }
 
-template<class T>
-inline
-bool isInteger( T *in, T *end ) {
-    if( in != end ) {
-        if( *in == '-' ) {
+template <class T>
+inline bool isInteger(T *in, T *end) {
+    if (in != end) {
+        if (*in == '-') {
             ++in;
         }
     }
 
-    bool result( false );
-    while( isNotEndOfToken( in, end ) ) {
-        result = isNumeric( *in );
-        if( !result ) {
+    bool result(false);
+    while (isNotEndOfToken(in, end)) {
+        result = isNumeric(*in);
+        if (!result) {
             break;
         }
         ++in;
@@ -92,40 +346,39 @@ bool isInteger( T *in, T *end ) {
     return result;
 }
 
-template<class T>
-inline
-bool isFloat( T *in, T *end ) {
-    if( in != end ) {
-        if( *in == '-' ) {
+template <class T>
+inline bool isFloat(T *in, T *end) {
+    if (in != end) {
+        if (*in == '-') {
             ++in;
         }
     }
 
     // check for <1>.0f
-    bool result( false );
-    while( isNotEndOfToken( in, end ) ) {
-        if( *in == '.' ) {
+    bool result(false);
+    while (isNotEndOfToken(in, end)) {
+        if (*in == '.') {
             result = true;
             break;
         }
-        result = isNumeric( *in );
-        if( !result ) {
+        result = isNumeric(*in);
+        if (!result) {
             return false;
         }
         ++in;
     }
 
     // check for 1<.>0f
-    if( *in == '.' ) {
+    if (*in == '.') {
         ++in;
     } else {
         return false;
     }
 
     // check for 1.<0>f
-    while( isNotEndOfToken( in, end ) ) {
-        result = isNumeric( *in );
-        if( !result ) {
+    while (isNotEndOfToken(in, end)) {
+        result = isNumeric(*in);
+        if (!result) {
             return false;
         }
         ++in;
@@ -134,24 +387,21 @@ bool isFloat( T *in, T *end ) {
     return result;
 }
 
-template<class T>
-inline
-bool isCharacter( const T in ) {
-    return ( ( in >= 'a' && in <= 'z' ) || ( in >= 'A' && in <= 'Z' ) );
+template <class T>
+inline bool isCharacter(const T in) {
+    return ((in >= 'a' && in <= 'z') || (in >= 'A' && in <= 'Z'));
 }
 
-template<class T>
-inline
-bool isStringLiteral( const T in ) {
-    return ( in == '\"' );
+template <class T>
+inline bool isStringLiteral(const T in) {
+    return (in == '\"');
 }
 
-template<class T>
-inline
-bool isHexLiteral( T *in, T *end ) {
-    if( *in == '0' ) {
-        if( in + 1 != end ) {
-            if( *( in + 1 ) == 'x' || *( in + 1 ) == 'X' ) {
+template <class T>
+inline bool isHexLiteral(T *in, T *end) {
+    if (*in == '0') {
+        if (in + 1 != end) {
+            if (*(in + 1) == 'x' || *(in + 1) == 'X') {
                 return true;
             }
         }
@@ -160,13 +410,12 @@ bool isHexLiteral( T *in, T *end ) {
     return false;
 }
 
-template<class T>
-inline
-bool isReference( T *in, T *end ) {
-    if( *in == 'r' ) {
-        if( *(in+1) == 'e' ) {
-            if( *(in+2) == 'f' ) {
-                if( ( in + 2 ) != end ) {
+template <class T>
+inline bool isReference(T *in, T *end) {
+    if (*in == 'r') {
+        if (*(in + 1) == 'e') {
+            if (*(in + 2) == 'f') {
+                if ((in + 2) != end) {
                     return true;
                 }
             }
@@ -176,16 +425,14 @@ bool isReference( T *in, T *end ) {
     return false;
 }
 
-template<class T>
-inline
-bool isEndofLine( const T in ) {
-    return ( '\n' == in );
+template <class T>
+inline bool isEndofLine(const T in) {
+    return ('\n' == in);
 }
 
-template<class T>
-inline
-static T *getNextSeparator( T *in, T *end ) {
-    while( !isSeparator( *in ) || in == end ) {
+template <class T>
+inline static T *getNextSeparator(T *in, T *end) {
+    while (!isSeparator(*in) || in == end) {
         ++in;
     }
     return in;
@@ -193,30 +440,28 @@ static T *getNextSeparator( T *in, T *end ) {
 
 static const int ErrorHex2Decimal = 9999999;
 
-inline
-int hex2Decimal( char in ) {
-    if( isNumeric( in ) ) {
-        return ( in - 48 );
+inline int hex2Decimal(char in) {
+    if (isNumeric(in)) {
+        return (in - 48);
     }
 
-    char hexCodeLower( 'a' ), hexCodeUpper( 'A' );
-    for( int i = 0; i<16; i++ ) {
-        if( in == hexCodeLower + i || in == hexCodeUpper + i ) {
-            return ( i+10 );
+    char hexCodeLower('a'), hexCodeUpper('A');
+    for (int i = 0; i < 16; i++) {
+        if (in == hexCodeLower + i || in == hexCodeUpper + i) {
+            return (i + 10);
         }
     }
 
     return ErrorHex2Decimal;
 }
 
-template<class T>
-inline
-bool isComment( T *in, T *end ) {
-    if ( *in=='/' ) {
-        if ( in+1!=end ) {
-            if ( *( in+1 )=='/' ) {
-                char *drive( ( in+2 ) );
-                if ( (isUpperCase<T>( *drive )||isLowerCase<T>( *drive ))&&*( drive+1 )=='/' )  {
+template <class T>
+inline bool isComment(T *in, T *end) {
+    if (*in == '/') {
+        if (in + 1 != end) {
+            if (*(in + 1) == '/') {
+                char *drive((in + 2));
+                if ((isUpperCase<T>(*drive) || isLowerCase<T>(*drive)) && *(drive + 1) == '/') {
                     return false;
                 } else {
                     return true;
@@ -228,9 +473,8 @@ bool isComment( T *in, T *end ) {
     return false;
 }
 
-template<class T>
-inline
-bool isCommentOpenTag(T *in, T *end ) {
+template <class T>
+inline bool isCommentOpenTag(T *in, T *end) {
     if (*in == '/') {
         if (in + 1 != end) {
             if (*(in + 1) == '*') {
@@ -242,9 +486,8 @@ bool isCommentOpenTag(T *in, T *end ) {
     return false;
 }
 
-template<class T>
-inline
-bool isCommentCloseTag(T *in, T *end) {
+template <class T>
+inline bool isCommentCloseTag(T *in, T *end) {
     if (*in == '*') {
         if (in + 1 != end) {
             if (*(in + 1) == '/') {
@@ -257,4 +500,3 @@ bool isCommentCloseTag(T *in, T *end) {
 }
 
 END_ODDLPARSER_NS
-
diff --git a/contrib/openddlparser/include/openddlparser/OpenDDLStream.h b/contrib/openddlparser/include/openddlparser/OpenDDLStream.h
index 93370da03..93bde5f7c 100644
--- a/contrib/openddlparser/include/openddlparser/OpenDDLStream.h
+++ b/contrib/openddlparser/include/openddlparser/OpenDDLStream.h
@@ -1,7 +1,7 @@
 /*-----------------------------------------------------------------------------------------------
 The MIT License (MIT)
 
-Copyright (c) 2014-2015 Kim Kulling
+Copyright (c) 2014-2020 Kim Kulling
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
@@ -38,7 +38,7 @@ public:
     /// @brief  The class destructor, virtual.
     virtual ~StreamFormatterBase();
 
-    /// @brief  Will format the sring and return the new formatted result.
+    /// @brief  Will format the string and return the new formatted result.
     /// @param  statement   [in] The string to reformat.
     /// @return The reformatted result.
     virtual std::string format(const std::string &statement);
@@ -52,7 +52,7 @@ class DLL_ODDLPARSER_EXPORT IOStreamBase {
 public:
     /// @brief  The class constructor with the formatter.
     /// @param  formatter   [in] The formatter to use.
-    explicit IOStreamBase(StreamFormatterBase *formatter = ddl_nullptr);
+    explicit IOStreamBase(StreamFormatterBase *formatter = nullptr);
 
     /// @brief  The class destructor, virtual.
     virtual ~IOStreamBase();
@@ -74,7 +74,7 @@ public:
     /// @param  sizeToRead  [in] The size to read in bytes.
     /// @param  statement   [out] The read statements.
     /// @return The bytes read from the stream.
-    virtual size_t read( size_t sizeToRead, std::string &statement );
+    virtual size_t read(size_t sizeToRead, std::string &statement);
 
     /// @brief  Will write a string into the stream.
     /// @param  statement  [in] The string to write.
diff --git a/contrib/openddlparser/include/openddlparser/TPoolAllocator.h b/contrib/openddlparser/include/openddlparser/TPoolAllocator.h
new file mode 100644
index 000000000..6076c7324
--- /dev/null
+++ b/contrib/openddlparser/include/openddlparser/TPoolAllocator.h
@@ -0,0 +1,226 @@
+/*-----------------------------------------------------------------------------------------------
+The MIT License (MIT)
+
+Copyright (c) 2014-2019 Kim Kulling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+-----------------------------------------------------------------------------------------------*/
+#pragma once
+
+#include <openddlparser/OpenDDLCommon.h>
+#include <string>
+
+BEGIN_ODDLPARSER_NS
+
+//-------------------------------------------------------------------------------------------------
+///	@class		TPoolAllocator
+///	@ingroup	CPPCore
+///
+///	@brief  This class implements a simple pool-based allocation scheme.
+/// Initially you have to define its size. Each allocation will be done from this initially created
+/// pool. You have to release all pooled instances after the usage.
+/// This allocation scheme is fast and does no call any new-calls during the lifetime of the
+/// allocator.
+//-------------------------------------------------------------------------------------------------
+template <class T>
+class TPoolAllocator {
+public:
+    TPoolAllocator();
+    TPoolAllocator(size_t numItems);
+    ~TPoolAllocator();
+    T *alloc();
+    void release();
+    void reserve(size_t size);
+    void clear();
+    size_t capacity() const;
+    size_t reservedMem() const;
+    size_t freeMem() const;
+    void dumpAllocations(std::string &allocs);
+    void resize(size_t growSize);
+
+    CPPCORE_NONE_COPYING(TPoolAllocator)
+
+private:
+    struct Pool {
+        size_t m_poolsize;
+        T *m_pool;
+        size_t m_currentIdx;
+        Pool *m_next;
+
+        Pool() :
+                m_poolsize(0u), m_pool(nullptr), m_currentIdx(0u), m_next(nullptr) {
+            // empty
+        }
+
+        Pool(size_t numItems, Pool *prev) :
+                m_poolsize(numItems), m_pool(nullptr), m_currentIdx(0u), m_next(prev) {
+            m_pool = new T[m_poolsize];
+        }
+
+        ~Pool() {
+            delete[] m_pool;
+            m_pool = nullptr;
+        }
+
+        CPPCORE_NONE_COPYING(Pool)
+    };
+
+    Pool *getFreePool() {
+        Pool *current(m_freeList);
+        if (nullptr != m_freeList) {
+            m_freeList = m_freeList->m_next;
+        }
+        return current;
+    }
+
+    Pool *m_first;
+    Pool *m_current;
+    Pool *m_freeList;
+    size_t m_capacity;
+};
+
+template <class T>
+inline TPoolAllocator<T>::TPoolAllocator() :
+        m_first(nullptr), m_current(nullptr), m_freeList(nullptr), m_capacity(0L) {
+    // empty
+}
+
+template <class T>
+inline TPoolAllocator<T>::TPoolAllocator(size_t numItems) :
+        m_first(nullptr), m_current(nullptr), m_freeList(nullptr), m_capacity(0L) {
+    m_first = new Pool(numItems);
+    m_capacity += numItems;
+    m_current = m_first;
+}
+
+template <class T>
+inline TPoolAllocator<T>::~TPoolAllocator() {
+    clear();
+}
+
+template <class T>
+inline T *TPoolAllocator<T>::alloc() {
+    if (nullptr == m_current) {
+        return nullptr;
+    }
+
+    if (m_current->m_currentIdx == m_current->m_poolsize) {
+        resize(m_current->m_poolsize);
+    }
+
+    T *ptr(&m_current->m_pool[m_current->m_currentIdx]);
+    m_current->m_currentIdx++;
+
+    return ptr;
+}
+
+template <class T>
+inline void TPoolAllocator<T>::release() {
+    if (nullptr == m_current) {
+        return;
+    }
+
+    Pool *current(m_first);
+    while (nullptr != current) {
+        current->m_currentIdx = 0;
+        current = current->m_next;
+    }
+    m_freeList = m_first->m_next;
+    m_current = m_first;
+}
+
+template <class T>
+inline void TPoolAllocator<T>::reserve(size_t size) {
+    clear();
+
+    m_first = new Pool(size, nullptr);
+    m_current = m_first;
+
+    m_current->m_pool = new T[size];
+    m_current->m_poolsize = size;
+
+    m_capacity = size;
+}
+
+template <class T>
+inline void TPoolAllocator<T>::clear() {
+    if (nullptr == m_current) {
+        return;
+    }
+
+    Pool *next(m_first);
+    while (nullptr != next) {
+        Pool *current = next;
+        next = current->m_next;
+        delete current;
+    }
+    m_current = nullptr;
+    m_freeList = nullptr;
+}
+
+template <class T>
+inline size_t TPoolAllocator<T>::capacity() const {
+    return m_capacity;
+}
+
+template <class T>
+inline size_t TPoolAllocator<T>::reservedMem() const {
+    return m_capacity * sizeof(T);
+}
+
+template <class T>
+inline size_t TPoolAllocator<T>::freeMem() const {
+    if (nullptr == m_current) {
+        return 0L;
+    }
+
+    return (m_current->m_poolsize - m_current->m_currentIdx);
+}
+
+template <class T>
+inline void TPoolAllocator<T>::dumpAllocations(std::string &allocs) {
+    allocs.clear();
+    allocs += "Number allocations = ";
+    allocs += std::to_string(m_current->m_currentIdx);
+    allocs += "\n";
+}
+
+template <class T>
+inline void TPoolAllocator<T>::resize(size_t growSize) {
+    if (nullptr != m_current) {
+        if (growSize < m_current->m_poolsize) {
+            return;
+        }
+    }
+
+    if (nullptr == m_first) {
+        m_first = new Pool(growSize, nullptr);
+        m_current = m_first;
+        m_capacity += m_current->m_poolsize;
+    } else {
+        Pool *pool = getFreePool();
+        if (nullptr == pool) {
+            pool = new Pool(growSize, nullptr);
+            m_capacity += growSize;
+        }
+        m_current->m_next = pool;
+        m_current = m_current->m_next;
+    }
+}
+
+END_ODDLPARSER_NS
\ No newline at end of file
diff --git a/contrib/openddlparser/include/openddlparser/Value.h b/contrib/openddlparser/include/openddlparser/Value.h
index 77c6da06b..75af7816b 100644
--- a/contrib/openddlparser/include/openddlparser/Value.h
+++ b/contrib/openddlparser/include/openddlparser/Value.h
@@ -1,7 +1,7 @@
 /*-----------------------------------------------------------------------------------------------
 The MIT License (MIT)
 
-Copyright (c) 2014-2015 Kim Kulling
+Copyright (c) 2014-2020 Kim Kulling
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
@@ -101,7 +101,7 @@ public:
     };
 
     ///	@brief  This enum describes the data type stored in the value.
-    enum ValueType {
+    enum class ValueType {
         ddl_none = -1,          ///< Nothing specified
         ddl_bool = 0,           ///< A boolean type
         ddl_int8,               ///< Integer type, 8 bytes
diff --git a/contrib/poly2tri/poly2tri/sweep/sweep.cc b/contrib/poly2tri/poly2tri/sweep/sweep.cc
index 9e3666001..23aeb6b57 100644
--- a/contrib/poly2tri/poly2tri/sweep/sweep.cc
+++ b/contrib/poly2tri/poly2tri/sweep/sweep.cc
@@ -36,10 +36,10 @@
 
 namespace p2t {
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 #    pragma warning(push)
 #    pragma warning( disable : 4702 )
-#endif // _WIN32
+#endif // _MSC_VER
 
 // Triangulate simple polygon with holes
 void Sweep::Triangulate(SweepContext& tcx)
@@ -800,8 +800,8 @@ Sweep::~Sweep() {
 
 }
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 #    pragma warning( pop )
-#endif // _WIN32
+#endif // _MSC_VER
 
 }
diff --git a/contrib/pugixml/CMakeLists.txt b/contrib/pugixml/CMakeLists.txt
new file mode 100644
index 000000000..94541f6da
--- /dev/null
+++ b/contrib/pugixml/CMakeLists.txt
@@ -0,0 +1,87 @@
+cmake_minimum_required(VERSION 2.8.12)
+
+project(pugixml)
+
+option(BUILD_SHARED_LIBS "Build shared instead of static library" OFF)
+option(BUILD_TESTS "Build tests" OFF)
+option(BUILD_PKGCONFIG "Build in PKGCONFIG mode" OFF)
+
+set(BUILD_DEFINES "" CACHE STRING "Build defines")
+
+if(MSVC)
+	option(STATIC_CRT "Use static CRT libraries" OFF)
+
+	# Rewrite command line flags to use /MT if necessary
+	if(STATIC_CRT)
+		foreach(flag_var
+				CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
+				CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
+			if(${flag_var} MATCHES "/MD")
+				string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
+			endif(${flag_var} MATCHES "/MD")
+		endforeach(flag_var)
+	endif()
+endif()
+
+# Pre-defines standard install locations on *nix systems.
+include(GNUInstallDirs)
+mark_as_advanced(CLEAR CMAKE_INSTALL_LIBDIR CMAKE_INSTALL_INCLUDEDIR)
+
+set(HEADERS src/pugixml.hpp src/pugiconfig.hpp)
+set(SOURCES src/pugixml.cpp)
+
+if(DEFINED BUILD_DEFINES)
+	foreach(DEFINE ${BUILD_DEFINES})
+		add_definitions("-D" ${DEFINE})
+	endforeach()
+endif()
+#message(pugixml"   "${BUILD_SHARED_LIBS})
+#if(BUILD_SHARED_LIBS)
+#	add_library(pugixml SHARED ${HEADERS} ${SOURCES})
+#else()
+	add_library(pugixml STATIC ${HEADERS} ${SOURCES})
+#endif()
+
+# Export symbols for shared library builds
+if(BUILD_SHARED_LIBS AND MSVC)
+	target_compile_definitions(pugixml PRIVATE "PUGIXML_API=__declspec(dllexport)")
+endif()
+
+# Enable C++11 long long for compilers that are capable of it
+if(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS 3.1 AND ";${CMAKE_CXX_COMPILE_FEATURES};" MATCHES ";cxx_long_long_type;")
+	target_compile_features(pugixml PUBLIC cxx_long_long_type)
+endif()
+
+set_target_properties(pugixml PROPERTIES VERSION 1.9 SOVERSION 1)
+get_target_property(PUGIXML_VERSION_STRING pugixml VERSION)
+
+if(BUILD_PKGCONFIG)
+	# Install library into its own directory under LIBDIR
+	set(INSTALL_SUFFIX /pugixml-${PUGIXML_VERSION_STRING})
+endif()
+
+target_include_directories(pugixml PUBLIC
+	$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src>
+	$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}${INSTALL_SUFFIX}>)
+
+install(TARGETS pugixml EXPORT pugixml-config
+	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${INSTALL_SUFFIX}
+	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${INSTALL_SUFFIX}
+	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}${INSTALL_SUFFIX})
+install(EXPORT pugixml-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pugixml)
+
+if(BUILD_PKGCONFIG)
+	configure_file(scripts/pugixml.pc.in ${PROJECT_BINARY_DIR}/pugixml.pc @ONLY)
+	install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
+endif()
+
+if(BUILD_TESTS)
+	file(GLOB TEST_SOURCES tests/*.cpp)
+	file(GLOB FUZZ_SOURCES tests/fuzz_*.cpp)
+	list(REMOVE_ITEM TEST_SOURCES ${FUZZ_SOURCES})
+
+	add_executable(check ${TEST_SOURCES})
+	target_link_libraries(check pugixml)
+	add_custom_command(TARGET check POST_BUILD COMMAND check WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+endif()
diff --git a/contrib/pugixml/contrib/foreach.hpp b/contrib/pugixml/contrib/foreach.hpp
new file mode 100644
index 000000000..c42315194
--- /dev/null
+++ b/contrib/pugixml/contrib/foreach.hpp
@@ -0,0 +1,63 @@
+/*
+ * Boost.Foreach support for pugixml classes.
+ * This file is provided to the public domain.
+ * Written by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
+ */
+
+#ifndef HEADER_PUGIXML_FOREACH_HPP
+#define HEADER_PUGIXML_FOREACH_HPP
+
+#include <boost/range/iterator.hpp>
+
+#include "pugixml.hpp"
+
+/*
+ * These types add support for BOOST_FOREACH macro to xml_node and xml_document classes (child iteration only).
+ * Example usage:
+ * BOOST_FOREACH(xml_node n, doc) {}
+ */
+
+namespace boost
+{
+	template<> struct range_mutable_iterator<pugi::xml_node>
+	{
+		typedef pugi::xml_node::iterator type;
+	};
+
+	template<> struct range_const_iterator<pugi::xml_node>
+	{
+		typedef pugi::xml_node::iterator type;
+	};
+
+	template<> struct range_mutable_iterator<pugi::xml_document>
+	{
+		typedef pugi::xml_document::iterator type;
+	};
+
+	template<> struct range_const_iterator<pugi::xml_document>
+	{
+		typedef pugi::xml_document::iterator type;
+	};
+}
+
+/*
+ * These types add support for BOOST_FOREACH macro to xml_node and xml_document classes (child/attribute iteration).
+ * Example usage:
+ * BOOST_FOREACH(xml_node n, children(doc)) {}
+ * BOOST_FOREACH(xml_node n, attributes(doc)) {}
+ */
+
+namespace pugi
+{
+	inline xml_object_range<xml_node_iterator> children(const pugi::xml_node& node)
+	{
+		return node.children();
+	}
+
+	inline xml_object_range<xml_attribute_iterator> attributes(const pugi::xml_node& node)
+	{
+		return node.attributes();
+	}
+}
+
+#endif
diff --git a/contrib/pugixml/readme.txt b/contrib/pugixml/readme.txt
new file mode 100644
index 000000000..5beb08a90
--- /dev/null
+++ b/contrib/pugixml/readme.txt
@@ -0,0 +1,52 @@
+pugixml 1.9 - an XML processing library
+
+Copyright (C) 2006-2018, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
+Report bugs and download new versions at http://pugixml.org/
+
+This is the distribution of pugixml, which is a C++ XML processing library,
+which consists of a DOM-like interface with rich traversal/modification
+capabilities, an extremely fast XML parser which constructs the DOM tree from
+an XML file/buffer, and an XPath 1.0 implementation for complex data-driven
+tree queries. Full Unicode support is also available, with Unicode interface
+variants and conversions between different Unicode encodings (which happen
+automatically during parsing/saving).
+
+The distribution contains the following folders:
+
+	contrib/ - various contributions to pugixml
+
+	docs/ - documentation
+		docs/samples - pugixml usage examples
+		docs/quickstart.html - quick start guide
+		docs/manual.html - complete manual
+
+	scripts/ - project files for IDE/build systems
+
+	src/ - header and source files
+
+	readme.txt - this file.
+
+This library is distributed under the MIT License:
+
+Copyright (c) 2006-2018 Arseny Kapoulkine
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
diff --git a/contrib/pugixml/src/pugiconfig.hpp b/contrib/pugixml/src/pugiconfig.hpp
new file mode 100644
index 000000000..065b3c8bb
--- /dev/null
+++ b/contrib/pugixml/src/pugiconfig.hpp
@@ -0,0 +1,76 @@
+/**
+ * pugixml parser - version 1.9
+ * --------------------------------------------------------
+ * Copyright (C) 2006-2018, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
+ * Report bugs and download new versions at http://pugixml.org/
+ *
+ * This library is distributed under the MIT License. See notice at the end
+ * of this file.
+ *
+ * This work is based on the pugxml parser, which is:
+ * Copyright (C) 2003, by Kristen Wegner (kristen@tima.net)
+ */
+
+#ifndef HEADER_PUGICONFIG_HPP
+#define HEADER_PUGICONFIG_HPP
+
+// Uncomment this to enable wchar_t mode
+// #define PUGIXML_WCHAR_MODE
+
+// Uncomment this to enable compact mode
+// #define PUGIXML_COMPACT
+
+// Uncomment this to disable XPath
+// #define PUGIXML_NO_XPATH
+
+// Uncomment this to disable STL
+// #define PUGIXML_NO_STL
+
+// Uncomment this to disable exceptions
+// #define PUGIXML_NO_EXCEPTIONS
+
+// Set this to control attributes for public classes/functions, i.e.:
+//#ifdef _WIN32
+//#define PUGIXML_API __declspec(dllexport) // to export all public symbols from DLL
+//#define PUGIXML_CLASS __declspec(dllimport) // to import all classes from DLL
+//#endif
+// #define PUGIXML_FUNCTION __fastcall // to set calling conventions to all public functions to fastcall
+// In absence of PUGIXML_CLASS/PUGIXML_FUNCTION definitions PUGIXML_API is used instead
+
+// Tune these constants to adjust memory-related behavior
+// #define PUGIXML_MEMORY_PAGE_SIZE 32768
+// #define PUGIXML_MEMORY_OUTPUT_STACK 10240
+// #define PUGIXML_MEMORY_XPATH_PAGE_SIZE 4096
+
+// Uncomment this to switch to header-only version
+#define PUGIXML_HEADER_ONLY
+
+// Uncomment this to enable long long support
+//#define PUGIXML_HAS_LONG_LONG
+
+#endif
+
+/**
+ * Copyright (c) 2006-2018 Arseny Kapoulkine
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
diff --git a/contrib/pugixml/src/pugixml.cpp b/contrib/pugixml/src/pugixml.cpp
new file mode 100644
index 000000000..2afff09dd
--- /dev/null
+++ b/contrib/pugixml/src/pugixml.cpp
@@ -0,0 +1,12796 @@
+/**
+ * pugixml parser - version 1.9
+ * --------------------------------------------------------
+ * Copyright (C) 2006-2018, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
+ * Report bugs and download new versions at http://pugixml.org/
+ *
+ * This library is distributed under the MIT License. See notice at the end
+ * of this file.
+ *
+ * This work is based on the pugxml parser, which is:
+ * Copyright (C) 2003, by Kristen Wegner (kristen@tima.net)
+ */
+
+#ifndef SOURCE_PUGIXML_CPP
+#define SOURCE_PUGIXML_CPP
+
+#include "pugixml.hpp"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+#include <limits.h>
+
+#ifdef PUGIXML_WCHAR_MODE
+#	include <wchar.h>
+#endif
+
+#ifndef PUGIXML_NO_XPATH
+#	include <math.h>
+#	include <float.h>
+#endif
+
+#ifndef PUGIXML_NO_STL
+#	include <istream>
+#	include <ostream>
+#	include <string>
+#endif
+
+// For placement new
+#include <new>
+
+#ifdef _MSC_VER
+#	pragma warning(push)
+#	pragma warning(disable: 4127) // conditional expression is constant
+#	pragma warning(disable: 4324) // structure was padded due to __declspec(align())
+#	pragma warning(disable: 4702) // unreachable code
+#	pragma warning(disable: 4996) // this function or variable may be unsafe
+#endif
+
+#if defined(_MSC_VER) && defined(__c2__)
+#	pragma clang diagnostic push
+#	pragma clang diagnostic ignored "-Wdeprecated" // this function or variable may be unsafe
+#endif
+
+#ifdef __INTEL_COMPILER
+#	pragma warning(disable: 177) // function was declared but never referenced
+#	pragma warning(disable: 279) // controlling expression is constant
+#	pragma warning(disable: 1478 1786) // function was declared "deprecated"
+#	pragma warning(disable: 1684) // conversion from pointer to same-sized integral type
+#endif
+
+#if defined(__BORLANDC__) && defined(PUGIXML_HEADER_ONLY)
+#	pragma warn -8080 // symbol is declared but never used; disabling this inside push/pop bracket does not make the warning go away
+#endif
+
+#ifdef __BORLANDC__
+#	pragma option push
+#	pragma warn -8008 // condition is always false
+#	pragma warn -8066 // unreachable code
+#endif
+
+#ifdef __SNC__
+// Using diag_push/diag_pop does not disable the warnings inside templates due to a compiler bug
+#	pragma diag_suppress=178 // function was declared but never referenced
+#	pragma diag_suppress=237 // controlling expression is constant
+#endif
+
+#ifdef __TI_COMPILER_VERSION__
+#	pragma diag_suppress 179 // function was declared but never referenced
+#endif
+
+// Inlining controls
+#if defined(_MSC_VER) && _MSC_VER >= 1300
+#	define PUGI__NO_INLINE __declspec(noinline)
+#elif defined(__GNUC__)
+#	define PUGI__NO_INLINE __attribute__((noinline))
+#else
+#	define PUGI__NO_INLINE
+#endif
+
+// Branch weight controls
+#if defined(__GNUC__) && !defined(__c2__)
+#	define PUGI__UNLIKELY(cond) __builtin_expect(cond, 0)
+#else
+#	define PUGI__UNLIKELY(cond) (cond)
+#endif
+
+// Simple static assertion
+#define PUGI__STATIC_ASSERT(cond) { static const char condition_failed[(cond) ? 1 : -1] = {0}; (void)condition_failed[0]; }
+
+// Digital Mars C++ bug workaround for passing char loaded from memory via stack
+#ifdef __DMC__
+#	define PUGI__DMC_VOLATILE volatile
+#else
+#	define PUGI__DMC_VOLATILE
+#endif
+
+// Integer sanitizer workaround; we only apply this for clang since gcc8 has no_sanitize but not unsigned-integer-overflow and produces "attribute directive ignored" warnings
+#if defined(__clang__) && defined(__has_attribute)
+#	if __has_attribute(no_sanitize)
+#		define PUGI__UNSIGNED_OVERFLOW __attribute__((no_sanitize("unsigned-integer-overflow")))
+#	else
+#		define PUGI__UNSIGNED_OVERFLOW
+#	endif
+#else
+#	define PUGI__UNSIGNED_OVERFLOW
+#endif
+
+// Borland C++ bug workaround for not defining ::memcpy depending on header include order (can't always use std::memcpy because some compilers don't have it at all)
+#if defined(__BORLANDC__) && !defined(__MEM_H_USING_LIST)
+using std::memcpy;
+using std::memmove;
+using std::memset;
+#endif
+
+// Some MinGW/GCC versions have headers that erroneously omit LLONG_MIN/LLONG_MAX/ULLONG_MAX definitions from limits.h in some configurations
+#if defined(PUGIXML_HAS_LONG_LONG) && defined(__GNUC__) && !defined(LLONG_MAX) && !defined(LLONG_MIN) && !defined(ULLONG_MAX)
+#	define LLONG_MIN (-LLONG_MAX - 1LL)
+#	define LLONG_MAX __LONG_LONG_MAX__
+#	define ULLONG_MAX (LLONG_MAX * 2ULL + 1ULL)
+#endif
+
+// In some environments MSVC is a compiler but the CRT lacks certain MSVC-specific features
+#if defined(_MSC_VER) && !defined(__S3E__)
+#	define PUGI__MSVC_CRT_VERSION _MSC_VER
+#endif
+
+// Not all platforms have snprintf; we define a wrapper that uses snprintf if possible. This only works with buffers with a known size.
+#if __cplusplus >= 201103
+#	define PUGI__SNPRINTF(buf, ...) snprintf(buf, sizeof(buf), __VA_ARGS__)
+#elif defined(PUGI__MSVC_CRT_VERSION) && PUGI__MSVC_CRT_VERSION >= 1400
+#	define PUGI__SNPRINTF(buf, ...) _snprintf_s(buf, _countof(buf), _TRUNCATE, __VA_ARGS__)
+#else
+#	define PUGI__SNPRINTF sprintf
+#endif
+
+// We put implementation details into an anonymous namespace in source mode, but have to keep it in non-anonymous namespace in header-only mode to prevent binary bloat.
+#ifdef PUGIXML_HEADER_ONLY
+#	define PUGI__NS_BEGIN namespace pugi { namespace impl {
+#	define PUGI__NS_END } }
+#	define PUGI__FN inline
+#	define PUGI__FN_NO_INLINE inline
+#else
+#	if defined(_MSC_VER) && _MSC_VER < 1300 // MSVC6 seems to have an amusing bug with anonymous namespaces inside namespaces
+#		define PUGI__NS_BEGIN namespace pugi { namespace impl {
+#		define PUGI__NS_END } }
+#	else
+#		define PUGI__NS_BEGIN namespace pugi { namespace impl { namespace {
+#		define PUGI__NS_END } } }
+#	endif
+#	define PUGI__FN
+#	define PUGI__FN_NO_INLINE PUGI__NO_INLINE
+#endif
+
+// uintptr_t
+#if (defined(_MSC_VER) && _MSC_VER < 1600) || (defined(__BORLANDC__) && __BORLANDC__ < 0x561)
+namespace pugi
+{
+#	ifndef _UINTPTR_T_DEFINED
+	typedef size_t uintptr_t;
+#	endif
+
+	typedef unsigned __int8 uint8_t;
+	typedef unsigned __int16 uint16_t;
+	typedef unsigned __int32 uint32_t;
+}
+#else
+#	include <stdint.h>
+#endif
+
+// Memory allocation
+PUGI__NS_BEGIN
+	PUGI__FN void* default_allocate(size_t size)
+	{
+		return malloc(size);
+	}
+
+	PUGI__FN void default_deallocate(void* ptr)
+	{
+		free(ptr);
+	}
+
+	template <typename T>
+	struct xml_memory_management_function_storage
+	{
+		static allocation_function allocate;
+		static deallocation_function deallocate;
+	};
+
+	// Global allocation functions are stored in class statics so that in header mode linker deduplicates them
+	// Without a template<> we'll get multiple definitions of the same static
+	template <typename T> allocation_function xml_memory_management_function_storage<T>::allocate = default_allocate;
+	template <typename T> deallocation_function xml_memory_management_function_storage<T>::deallocate = default_deallocate;
+
+	typedef xml_memory_management_function_storage<int> xml_memory;
+PUGI__NS_END
+
+// String utilities
+PUGI__NS_BEGIN
+	// Get string length
+	PUGI__FN size_t strlength(const char_t* s)
+	{
+		assert(s);
+
+	#ifdef PUGIXML_WCHAR_MODE
+		return wcslen(s);
+	#else
+		return strlen(s);
+	#endif
+	}
+
+	// Compare two strings
+	PUGI__FN bool strequal(const char_t* src, const char_t* dst)
+	{
+		assert(src && dst);
+
+	#ifdef PUGIXML_WCHAR_MODE
+		return wcscmp(src, dst) == 0;
+	#else
+		return strcmp(src, dst) == 0;
+	#endif
+	}
+
+	// Compare lhs with [rhs_begin, rhs_end)
+	PUGI__FN bool strequalrange(const char_t* lhs, const char_t* rhs, size_t count)
+	{
+		for (size_t i = 0; i < count; ++i)
+			if (lhs[i] != rhs[i])
+				return false;
+
+		return lhs[count] == 0;
+	}
+
+	// Get length of wide string, even if CRT lacks wide character support
+	PUGI__FN size_t strlength_wide(const wchar_t* s)
+	{
+		assert(s);
+
+	#ifdef PUGIXML_WCHAR_MODE
+		return wcslen(s);
+	#else
+		const wchar_t* end = s;
+		while (*end) end++;
+		return static_cast<size_t>(end - s);
+	#endif
+	}
+PUGI__NS_END
+
+// auto_ptr-like object for exception recovery
+PUGI__NS_BEGIN
+	template <typename T> struct auto_deleter
+	{
+		typedef void (*D)(T*);
+
+		T* data;
+		D deleter;
+
+		auto_deleter(T* data_, D deleter_): data(data_), deleter(deleter_)
+		{
+		}
+
+		~auto_deleter()
+		{
+			if (data) deleter(data);
+		}
+
+		T* release()
+		{
+			T* result = data;
+			data = 0;
+			return result;
+		}
+	};
+PUGI__NS_END
+
+#ifdef PUGIXML_COMPACT
+PUGI__NS_BEGIN
+	class compact_hash_table
+	{
+	public:
+		compact_hash_table(): _items(0), _capacity(0), _count(0)
+		{
+		}
+
+		void clear()
+		{
+			if (_items)
+			{
+				xml_memory::deallocate(_items);
+				_items = 0;
+				_capacity = 0;
+				_count = 0;
+			}
+		}
+
+		void* find(const void* key)
+		{
+			if (_capacity == 0) return 0;
+
+			item_t* item = get_item(key);
+			assert(item);
+			assert(item->key == key || (item->key == 0 && item->value == 0));
+
+			return item->value;
+		}
+
+		void insert(const void* key, void* value)
+		{
+			assert(_capacity != 0 && _count < _capacity - _capacity / 4);
+
+			item_t* item = get_item(key);
+			assert(item);
+
+			if (item->key == 0)
+			{
+				_count++;
+				item->key = key;
+			}
+
+			item->value = value;
+		}
+
+		bool reserve(size_t extra = 16)
+		{
+			if (_count + extra >= _capacity - _capacity / 4)
+				return rehash(_count + extra);
+
+			return true;
+		}
+
+	private:
+		struct item_t
+		{
+			const void* key;
+			void* value;
+		};
+
+		item_t* _items;
+		size_t _capacity;
+
+		size_t _count;
+
+		bool rehash(size_t count);
+
+		item_t* get_item(const void* key)
+		{
+			assert(key);
+			assert(_capacity > 0);
+
+			size_t hashmod = _capacity - 1;
+			size_t bucket = hash(key) & hashmod;
+
+			for (size_t probe = 0; probe <= hashmod; ++probe)
+			{
+				item_t& probe_item = _items[bucket];
+
+				if (probe_item.key == key || probe_item.key == 0)
+					return &probe_item;
+
+				// hash collision, quadratic probing
+				bucket = (bucket + probe + 1) & hashmod;
+			}
+
+			assert(false && "Hash table is full"); // unreachable
+			return 0;
+		}
+
+		static PUGI__UNSIGNED_OVERFLOW unsigned int hash(const void* key)
+		{
+			unsigned int h = static_cast<unsigned int>(reinterpret_cast<uintptr_t>(key));
+
+			// MurmurHash3 32-bit finalizer
+			h ^= h >> 16;
+			h *= 0x85ebca6bu;
+			h ^= h >> 13;
+			h *= 0xc2b2ae35u;
+			h ^= h >> 16;
+
+			return h;
+		}
+	};
+
+	PUGI__FN_NO_INLINE bool compact_hash_table::rehash(size_t count)
+	{
+		size_t capacity = 32;
+		while (count >= capacity - capacity / 4)
+			capacity *= 2;
+
+		compact_hash_table rt;
+		rt._capacity = capacity;
+		rt._items = static_cast<item_t*>(xml_memory::allocate(sizeof(item_t) * capacity));
+
+		if (!rt._items)
+			return false;
+
+		memset(rt._items, 0, sizeof(item_t) * capacity);
+
+		for (size_t i = 0; i < _capacity; ++i)
+			if (_items[i].key)
+				rt.insert(_items[i].key, _items[i].value);
+
+		if (_items)
+			xml_memory::deallocate(_items);
+
+		_capacity = capacity;
+		_items = rt._items;
+
+		assert(_count == rt._count);
+
+		return true;
+	}
+
+PUGI__NS_END
+#endif
+
+PUGI__NS_BEGIN
+#ifdef PUGIXML_COMPACT
+	static const uintptr_t xml_memory_block_alignment = 4;
+#else
+	static const uintptr_t xml_memory_block_alignment = sizeof(void*);
+#endif
+
+	// extra metadata bits
+	static const uintptr_t xml_memory_page_contents_shared_mask = 64;
+	static const uintptr_t xml_memory_page_name_allocated_mask = 32;
+	static const uintptr_t xml_memory_page_value_allocated_mask = 16;
+	static const uintptr_t xml_memory_page_type_mask = 15;
+
+	// combined masks for string uniqueness
+	static const uintptr_t xml_memory_page_name_allocated_or_shared_mask = xml_memory_page_name_allocated_mask | xml_memory_page_contents_shared_mask;
+	static const uintptr_t xml_memory_page_value_allocated_or_shared_mask = xml_memory_page_value_allocated_mask | xml_memory_page_contents_shared_mask;
+
+#ifdef PUGIXML_COMPACT
+	#define PUGI__GETHEADER_IMPL(object, page, flags) // unused
+	#define PUGI__GETPAGE_IMPL(header) (header).get_page()
+#else
+	#define PUGI__GETHEADER_IMPL(object, page, flags) (((reinterpret_cast<char*>(object) - reinterpret_cast<char*>(page)) << 8) | (flags))
+	// this macro casts pointers through void* to avoid 'cast increases required alignment of target type' warnings
+	#define PUGI__GETPAGE_IMPL(header) static_cast<impl::xml_memory_page*>(const_cast<void*>(static_cast<const void*>(reinterpret_cast<const char*>(&header) - (header >> 8))))
+#endif
+
+	#define PUGI__GETPAGE(n) PUGI__GETPAGE_IMPL((n)->header)
+	#define PUGI__NODETYPE(n) static_cast<xml_node_type>((n)->header & impl::xml_memory_page_type_mask)
+
+	struct xml_allocator;
+
+	struct xml_memory_page
+	{
+		static xml_memory_page* construct(void* memory)
+		{
+			xml_memory_page* result = static_cast<xml_memory_page*>(memory);
+
+			result->allocator = 0;
+			result->prev = 0;
+			result->next = 0;
+			result->busy_size = 0;
+			result->freed_size = 0;
+
+		#ifdef PUGIXML_COMPACT
+			result->compact_string_base = 0;
+			result->compact_shared_parent = 0;
+			result->compact_page_marker = 0;
+		#endif
+
+			return result;
+		}
+
+		xml_allocator* allocator;
+
+		xml_memory_page* prev;
+		xml_memory_page* next;
+
+		size_t busy_size;
+		size_t freed_size;
+
+	#ifdef PUGIXML_COMPACT
+		char_t* compact_string_base;
+		void* compact_shared_parent;
+		uint32_t* compact_page_marker;
+	#endif
+	};
+
+	static const size_t xml_memory_page_size =
+	#ifdef PUGIXML_MEMORY_PAGE_SIZE
+		(PUGIXML_MEMORY_PAGE_SIZE)
+	#else
+		32768
+	#endif
+		- sizeof(xml_memory_page);
+
+	struct xml_memory_string_header
+	{
+		uint16_t page_offset; // offset from page->data
+		uint16_t full_size; // 0 if string occupies whole page
+	};
+
+	struct xml_allocator
+	{
+		xml_allocator(xml_memory_page* root): _root(root), _busy_size(root->busy_size)
+		{
+		#ifdef PUGIXML_COMPACT
+			_hash = 0;
+		#endif
+		}
+
+		xml_memory_page* allocate_page(size_t data_size)
+		{
+			size_t size = sizeof(xml_memory_page) + data_size;
+
+			// allocate block with some alignment, leaving memory for worst-case padding
+			void* memory = xml_memory::allocate(size);
+			if (!memory) return 0;
+
+			// prepare page structure
+			xml_memory_page* page = xml_memory_page::construct(memory);
+			assert(page);
+
+			page->allocator = _root->allocator;
+
+			return page;
+		}
+
+		static void deallocate_page(xml_memory_page* page)
+		{
+			xml_memory::deallocate(page);
+		}
+
+		void* allocate_memory_oob(size_t size, xml_memory_page*& out_page);
+
+		void* allocate_memory(size_t size, xml_memory_page*& out_page)
+		{
+			if (PUGI__UNLIKELY(_busy_size + size > xml_memory_page_size))
+				return allocate_memory_oob(size, out_page);
+
+			void* buf = reinterpret_cast<char*>(_root) + sizeof(xml_memory_page) + _busy_size;
+
+			_busy_size += size;
+
+			out_page = _root;
+
+			return buf;
+		}
+
+	#ifdef PUGIXML_COMPACT
+		void* allocate_object(size_t size, xml_memory_page*& out_page)
+		{
+			void* result = allocate_memory(size + sizeof(uint32_t), out_page);
+			if (!result) return 0;
+
+			// adjust for marker
+			ptrdiff_t offset = static_cast<char*>(result) - reinterpret_cast<char*>(out_page->compact_page_marker);
+
+			if (PUGI__UNLIKELY(static_cast<uintptr_t>(offset) >= 256 * xml_memory_block_alignment))
+			{
+				// insert new marker
+				uint32_t* marker = static_cast<uint32_t*>(result);
+
+				*marker = static_cast<uint32_t>(reinterpret_cast<char*>(marker) - reinterpret_cast<char*>(out_page));
+				out_page->compact_page_marker = marker;
+
+				// since we don't reuse the page space until we reallocate it, we can just pretend that we freed the marker block
+				// this will make sure deallocate_memory correctly tracks the size
+				out_page->freed_size += sizeof(uint32_t);
+
+				return marker + 1;
+			}
+			else
+			{
+				// roll back uint32_t part
+				_busy_size -= sizeof(uint32_t);
+
+				return result;
+			}
+		}
+	#else
+		void* allocate_object(size_t size, xml_memory_page*& out_page)
+		{
+			return allocate_memory(size, out_page);
+		}
+	#endif
+
+		void deallocate_memory(void* ptr, size_t size, xml_memory_page* page)
+		{
+			if (page == _root) page->busy_size = _busy_size;
+
+			assert(ptr >= reinterpret_cast<char*>(page) + sizeof(xml_memory_page) && ptr < reinterpret_cast<char*>(page) + sizeof(xml_memory_page) + page->busy_size);
+			(void)!ptr;
+
+			page->freed_size += size;
+			assert(page->freed_size <= page->busy_size);
+
+			if (page->freed_size == page->busy_size)
+			{
+				if (page->next == 0)
+				{
+					assert(_root == page);
+
+					// top page freed, just reset sizes
+					page->busy_size = 0;
+					page->freed_size = 0;
+
+				#ifdef PUGIXML_COMPACT
+					// reset compact state to maximize efficiency
+					page->compact_string_base = 0;
+					page->compact_shared_parent = 0;
+					page->compact_page_marker = 0;
+				#endif
+
+					_busy_size = 0;
+				}
+				else
+				{
+					assert(_root != page);
+					assert(page->prev);
+
+					// remove from the list
+					page->prev->next = page->next;
+					page->next->prev = page->prev;
+
+					// deallocate
+					deallocate_page(page);
+				}
+			}
+		}
+
+		char_t* allocate_string(size_t length)
+		{
+			static const size_t max_encoded_offset = (1 << 16) * xml_memory_block_alignment;
+
+			PUGI__STATIC_ASSERT(xml_memory_page_size <= max_encoded_offset);
+
+			// allocate memory for string and header block
+			size_t size = sizeof(xml_memory_string_header) + length * sizeof(char_t);
+
+			// round size up to block alignment boundary
+			size_t full_size = (size + (xml_memory_block_alignment - 1)) & ~(xml_memory_block_alignment - 1);
+
+			xml_memory_page* page;
+			xml_memory_string_header* header = static_cast<xml_memory_string_header*>(allocate_memory(full_size, page));
+
+			if (!header) return 0;
+
+			// setup header
+			ptrdiff_t page_offset = reinterpret_cast<char*>(header) - reinterpret_cast<char*>(page) - sizeof(xml_memory_page);
+
+			assert(page_offset % xml_memory_block_alignment == 0);
+			assert(page_offset >= 0 && static_cast<size_t>(page_offset) < max_encoded_offset);
+			header->page_offset = static_cast<uint16_t>(static_cast<size_t>(page_offset) / xml_memory_block_alignment);
+
+			// full_size == 0 for large strings that occupy the whole page
+			assert(full_size % xml_memory_block_alignment == 0);
+			assert(full_size < max_encoded_offset || (page->busy_size == full_size && page_offset == 0));
+			header->full_size = static_cast<uint16_t>(full_size < max_encoded_offset ? full_size / xml_memory_block_alignment : 0);
+
+			// round-trip through void* to avoid 'cast increases required alignment of target type' warning
+			// header is guaranteed a pointer-sized alignment, which should be enough for char_t
+			return static_cast<char_t*>(static_cast<void*>(header + 1));
+		}
+
+		void deallocate_string(char_t* string)
+		{
+			// this function casts pointers through void* to avoid 'cast increases required alignment of target type' warnings
+			// we're guaranteed the proper (pointer-sized) alignment on the input string if it was allocated via allocate_string
+
+			// get header
+			xml_memory_string_header* header = static_cast<xml_memory_string_header*>(static_cast<void*>(string)) - 1;
+			assert(header);
+
+			// deallocate
+			size_t page_offset = sizeof(xml_memory_page) + header->page_offset * xml_memory_block_alignment;
+			xml_memory_page* page = reinterpret_cast<xml_memory_page*>(static_cast<void*>(reinterpret_cast<char*>(header) - page_offset));
+
+			// if full_size == 0 then this string occupies the whole page
+			size_t full_size = header->full_size == 0 ? page->busy_size : header->full_size * xml_memory_block_alignment;
+
+			deallocate_memory(header, full_size, page);
+		}
+
+		bool reserve()
+		{
+		#ifdef PUGIXML_COMPACT
+			return _hash->reserve();
+		#else
+			return true;
+		#endif
+		}
+
+		xml_memory_page* _root;
+		size_t _busy_size;
+
+	#ifdef PUGIXML_COMPACT
+		compact_hash_table* _hash;
+	#endif
+	};
+
+	PUGI__FN_NO_INLINE void* xml_allocator::allocate_memory_oob(size_t size, xml_memory_page*& out_page)
+	{
+		const size_t large_allocation_threshold = xml_memory_page_size / 4;
+
+		xml_memory_page* page = allocate_page(size <= large_allocation_threshold ? xml_memory_page_size : size);
+		out_page = page;
+
+		if (!page) return 0;
+
+		if (size <= large_allocation_threshold)
+		{
+			_root->busy_size = _busy_size;
+
+			// insert page at the end of linked list
+			page->prev = _root;
+			_root->next = page;
+			_root = page;
+
+			_busy_size = size;
+		}
+		else
+		{
+			// insert page before the end of linked list, so that it is deleted as soon as possible
+			// the last page is not deleted even if it's empty (see deallocate_memory)
+			assert(_root->prev);
+
+			page->prev = _root->prev;
+			page->next = _root;
+
+			_root->prev->next = page;
+			_root->prev = page;
+
+			page->busy_size = size;
+		}
+
+		return reinterpret_cast<char*>(page) + sizeof(xml_memory_page);
+	}
+PUGI__NS_END
+
+#ifdef PUGIXML_COMPACT
+PUGI__NS_BEGIN
+	static const uintptr_t compact_alignment_log2 = 2;
+	static const uintptr_t compact_alignment = 1 << compact_alignment_log2;
+
+	class compact_header
+	{
+	public:
+		compact_header(xml_memory_page* page, unsigned int flags)
+		{
+			PUGI__STATIC_ASSERT(xml_memory_block_alignment == compact_alignment);
+
+			ptrdiff_t offset = (reinterpret_cast<char*>(this) - reinterpret_cast<char*>(page->compact_page_marker));
+			assert(offset % compact_alignment == 0 && static_cast<uintptr_t>(offset) < 256 * compact_alignment);
+
+			_page = static_cast<unsigned char>(offset >> compact_alignment_log2);
+			_flags = static_cast<unsigned char>(flags);
+		}
+
+		void operator&=(uintptr_t mod)
+		{
+			_flags &= static_cast<unsigned char>(mod);
+		}
+
+		void operator|=(uintptr_t mod)
+		{
+			_flags |= static_cast<unsigned char>(mod);
+		}
+
+		uintptr_t operator&(uintptr_t mod) const
+		{
+			return _flags & mod;
+		}
+
+		xml_memory_page* get_page() const
+		{
+			// round-trip through void* to silence 'cast increases required alignment of target type' warnings
+			const char* page_marker = reinterpret_cast<const char*>(this) - (_page << compact_alignment_log2);
+			const char* page = page_marker - *reinterpret_cast<const uint32_t*>(static_cast<const void*>(page_marker));
+
+			return const_cast<xml_memory_page*>(reinterpret_cast<const xml_memory_page*>(static_cast<const void*>(page)));
+		}
+
+	private:
+		unsigned char _page;
+		unsigned char _flags;
+	};
+
+	PUGI__FN xml_memory_page* compact_get_page(const void* object, int header_offset)
+	{
+		const compact_header* header = reinterpret_cast<const compact_header*>(static_cast<const char*>(object) - header_offset);
+
+		return header->get_page();
+	}
+
+	template <int header_offset, typename T> PUGI__FN_NO_INLINE T* compact_get_value(const void* object)
+	{
+		return static_cast<T*>(compact_get_page(object, header_offset)->allocator->_hash->find(object));
+	}
+
+	template <int header_offset, typename T> PUGI__FN_NO_INLINE void compact_set_value(const void* object, T* value)
+	{
+		compact_get_page(object, header_offset)->allocator->_hash->insert(object, value);
+	}
+
+	template <typename T, int header_offset, int start = -126> class compact_pointer
+	{
+	public:
+		compact_pointer(): _data(0)
+		{
+		}
+
+		void operator=(const compact_pointer& rhs)
+		{
+			*this = rhs + 0;
+		}
+
+		void operator=(T* value)
+		{
+			if (value)
+			{
+				// value is guaranteed to be compact-aligned; 'this' is not
+				// our decoding is based on 'this' aligned to compact alignment downwards (see operator T*)
+				// so for negative offsets (e.g. -3) we need to adjust the diff by compact_alignment - 1 to
+				// compensate for arithmetic shift rounding for negative values
+				ptrdiff_t diff = reinterpret_cast<char*>(value) - reinterpret_cast<char*>(this);
+				ptrdiff_t offset = ((diff + int(compact_alignment - 1)) >> compact_alignment_log2) - start;
+
+				if (static_cast<uintptr_t>(offset) <= 253)
+					_data = static_cast<unsigned char>(offset + 1);
+				else
+				{
+					compact_set_value<header_offset>(this, value);
+
+					_data = 255;
+				}
+			}
+			else
+				_data = 0;
+		}
+
+		operator T*() const
+		{
+			if (_data)
+			{
+				if (_data < 255)
+				{
+					uintptr_t base = reinterpret_cast<uintptr_t>(this) & ~(compact_alignment - 1);
+
+					return reinterpret_cast<T*>(base + (_data - 1 + start) * compact_alignment);
+				}
+				else
+					return compact_get_value<header_offset, T>(this);
+			}
+			else
+				return 0;
+		}
+
+		T* operator->() const
+		{
+			return *this;
+		}
+
+	private:
+		unsigned char _data;
+	};
+
+	template <typename T, int header_offset> class compact_pointer_parent
+	{
+	public:
+		compact_pointer_parent(): _data(0)
+		{
+		}
+
+		void operator=(const compact_pointer_parent& rhs)
+		{
+			*this = rhs + 0;
+		}
+
+		void operator=(T* value)
+		{
+			if (value)
+			{
+				// value is guaranteed to be compact-aligned; 'this' is not
+				// our decoding is based on 'this' aligned to compact alignment downwards (see operator T*)
+				// so for negative offsets (e.g. -3) we need to adjust the diff by compact_alignment - 1 to
+				// compensate for arithmetic shift behavior for negative values
+				ptrdiff_t diff = reinterpret_cast<char*>(value) - reinterpret_cast<char*>(this);
+				ptrdiff_t offset = ((diff + int(compact_alignment - 1)) >> compact_alignment_log2) + 65533;
+
+				if (static_cast<uintptr_t>(offset) <= 65533)
+				{
+					_data = static_cast<unsigned short>(offset + 1);
+				}
+				else
+				{
+					xml_memory_page* page = compact_get_page(this, header_offset);
+
+					if (PUGI__UNLIKELY(page->compact_shared_parent == 0))
+						page->compact_shared_parent = value;
+
+					if (page->compact_shared_parent == value)
+					{
+						_data = 65534;
+					}
+					else
+					{
+						compact_set_value<header_offset>(this, value);
+
+						_data = 65535;
+					}
+				}
+			}
+			else
+			{
+				_data = 0;
+			}
+		}
+
+		operator T*() const
+		{
+			if (_data)
+			{
+				if (_data < 65534)
+				{
+					uintptr_t base = reinterpret_cast<uintptr_t>(this) & ~(compact_alignment - 1);
+
+					return reinterpret_cast<T*>(base + (_data - 1 - 65533) * compact_alignment);
+				}
+				else if (_data == 65534)
+					return static_cast<T*>(compact_get_page(this, header_offset)->compact_shared_parent);
+				else
+					return compact_get_value<header_offset, T>(this);
+			}
+			else
+				return 0;
+		}
+
+		T* operator->() const
+		{
+			return *this;
+		}
+
+	private:
+		uint16_t _data;
+	};
+
+	template <int header_offset, int base_offset> class compact_string
+	{
+	public:
+		compact_string(): _data(0)
+		{
+		}
+
+		void operator=(const compact_string& rhs)
+		{
+			*this = rhs + 0;
+		}
+
+		void operator=(char_t* value)
+		{
+			if (value)
+			{
+				xml_memory_page* page = compact_get_page(this, header_offset);
+
+				if (PUGI__UNLIKELY(page->compact_string_base == 0))
+					page->compact_string_base = value;
+
+				ptrdiff_t offset = value - page->compact_string_base;
+
+				if (static_cast<uintptr_t>(offset) < (65535 << 7))
+				{
+					// round-trip through void* to silence 'cast increases required alignment of target type' warnings
+					uint16_t* base = reinterpret_cast<uint16_t*>(static_cast<void*>(reinterpret_cast<char*>(this) - base_offset));
+
+					if (*base == 0)
+					{
+						*base = static_cast<uint16_t>((offset >> 7) + 1);
+						_data = static_cast<unsigned char>((offset & 127) + 1);
+					}
+					else
+					{
+						ptrdiff_t remainder = offset - ((*base - 1) << 7);
+
+						if (static_cast<uintptr_t>(remainder) <= 253)
+						{
+							_data = static_cast<unsigned char>(remainder + 1);
+						}
+						else
+						{
+							compact_set_value<header_offset>(this, value);
+
+							_data = 255;
+						}
+					}
+				}
+				else
+				{
+					compact_set_value<header_offset>(this, value);
+
+					_data = 255;
+				}
+			}
+			else
+			{
+				_data = 0;
+			}
+		}
+
+		operator char_t*() const
+		{
+			if (_data)
+			{
+				if (_data < 255)
+				{
+					xml_memory_page* page = compact_get_page(this, header_offset);
+
+					// round-trip through void* to silence 'cast increases required alignment of target type' warnings
+					const uint16_t* base = reinterpret_cast<const uint16_t*>(static_cast<const void*>(reinterpret_cast<const char*>(this) - base_offset));
+					assert(*base);
+
+					ptrdiff_t offset = ((*base - 1) << 7) + (_data - 1);
+
+					return page->compact_string_base + offset;
+				}
+				else
+				{
+					return compact_get_value<header_offset, char_t>(this);
+				}
+			}
+			else
+				return 0;
+		}
+
+	private:
+		unsigned char _data;
+	};
+PUGI__NS_END
+#endif
+
+#ifdef PUGIXML_COMPACT
+namespace pugi
+{
+	struct xml_attribute_struct
+	{
+		xml_attribute_struct(impl::xml_memory_page* page): header(page, 0), namevalue_base(0)
+		{
+			PUGI__STATIC_ASSERT(sizeof(xml_attribute_struct) == 8);
+		}
+
+		impl::compact_header header;
+
+		uint16_t namevalue_base;
+
+		impl::compact_string<4, 2> name;
+		impl::compact_string<5, 3> value;
+
+		impl::compact_pointer<xml_attribute_struct, 6> prev_attribute_c;
+		impl::compact_pointer<xml_attribute_struct, 7, 0> next_attribute;
+	};
+
+	struct xml_node_struct
+	{
+		xml_node_struct(impl::xml_memory_page* page, xml_node_type type): header(page, type), namevalue_base(0)
+		{
+			PUGI__STATIC_ASSERT(sizeof(xml_node_struct) == 12);
+		}
+
+		impl::compact_header header;
+
+		uint16_t namevalue_base;
+
+		impl::compact_string<4, 2> name;
+		impl::compact_string<5, 3> value;
+
+		impl::compact_pointer_parent<xml_node_struct, 6> parent;
+
+		impl::compact_pointer<xml_node_struct, 8, 0> first_child;
+
+		impl::compact_pointer<xml_node_struct,  9>    prev_sibling_c;
+		impl::compact_pointer<xml_node_struct, 10, 0> next_sibling;
+
+		impl::compact_pointer<xml_attribute_struct, 11, 0> first_attribute;
+	};
+}
+#else
+namespace pugi
+{
+	struct xml_attribute_struct
+	{
+		xml_attribute_struct(impl::xml_memory_page* page): name(0), value(0), prev_attribute_c(0), next_attribute(0)
+		{
+			header = PUGI__GETHEADER_IMPL(this, page, 0);
+		}
+
+		uintptr_t header;
+
+		char_t*	name;
+		char_t*	value;
+
+		xml_attribute_struct* prev_attribute_c;
+		xml_attribute_struct* next_attribute;
+	};
+
+	struct xml_node_struct
+	{
+		xml_node_struct(impl::xml_memory_page* page, xml_node_type type): name(0), value(0), parent(0), first_child(0), prev_sibling_c(0), next_sibling(0), first_attribute(0)
+		{
+			header = PUGI__GETHEADER_IMPL(this, page, type);
+		}
+
+		uintptr_t header;
+
+		char_t* name;
+		char_t* value;
+
+		xml_node_struct* parent;
+
+		xml_node_struct* first_child;
+
+		xml_node_struct* prev_sibling_c;
+		xml_node_struct* next_sibling;
+
+		xml_attribute_struct* first_attribute;
+	};
+}
+#endif
+
+PUGI__NS_BEGIN
+	struct xml_extra_buffer
+	{
+		char_t* buffer;
+		xml_extra_buffer* next;
+	};
+
+	struct xml_document_struct: public xml_node_struct, public xml_allocator
+	{
+		xml_document_struct(xml_memory_page* page): xml_node_struct(page, node_document), xml_allocator(page), buffer(0), extra_buffers(0)
+		{
+		}
+
+		const char_t* buffer;
+
+		xml_extra_buffer* extra_buffers;
+
+	#ifdef PUGIXML_COMPACT
+		compact_hash_table hash;
+	#endif
+	};
+
+	template <typename Object> inline xml_allocator& get_allocator(const Object* object)
+	{
+		assert(object);
+
+		return *PUGI__GETPAGE(object)->allocator;
+	}
+
+	template <typename Object> inline xml_document_struct& get_document(const Object* object)
+	{
+		assert(object);
+
+		return *static_cast<xml_document_struct*>(PUGI__GETPAGE(object)->allocator);
+	}
+PUGI__NS_END
+
+// Low-level DOM operations
+PUGI__NS_BEGIN
+	inline xml_attribute_struct* allocate_attribute(xml_allocator& alloc)
+	{
+		xml_memory_page* page;
+		void* memory = alloc.allocate_object(sizeof(xml_attribute_struct), page);
+		if (!memory) return 0;
+
+		return new (memory) xml_attribute_struct(page);
+	}
+
+	inline xml_node_struct* allocate_node(xml_allocator& alloc, xml_node_type type)
+	{
+		xml_memory_page* page;
+		void* memory = alloc.allocate_object(sizeof(xml_node_struct), page);
+		if (!memory) return 0;
+
+		return new (memory) xml_node_struct(page, type);
+	}
+
+	inline void destroy_attribute(xml_attribute_struct* a, xml_allocator& alloc)
+	{
+		if (a->header & impl::xml_memory_page_name_allocated_mask)
+			alloc.deallocate_string(a->name);
+
+		if (a->header & impl::xml_memory_page_value_allocated_mask)
+			alloc.deallocate_string(a->value);
+
+		alloc.deallocate_memory(a, sizeof(xml_attribute_struct), PUGI__GETPAGE(a));
+	}
+
+	inline void destroy_node(xml_node_struct* n, xml_allocator& alloc)
+	{
+		if (n->header & impl::xml_memory_page_name_allocated_mask)
+			alloc.deallocate_string(n->name);
+
+		if (n->header & impl::xml_memory_page_value_allocated_mask)
+			alloc.deallocate_string(n->value);
+
+		for (xml_attribute_struct* attr = n->first_attribute; attr; )
+		{
+			xml_attribute_struct* next = attr->next_attribute;
+
+			destroy_attribute(attr, alloc);
+
+			attr = next;
+		}
+
+		for (xml_node_struct* child = n->first_child; child; )
+		{
+			xml_node_struct* next = child->next_sibling;
+
+			destroy_node(child, alloc);
+
+			child = next;
+		}
+
+		alloc.deallocate_memory(n, sizeof(xml_node_struct), PUGI__GETPAGE(n));
+	}
+
+	inline void append_node(xml_node_struct* child, xml_node_struct* node)
+	{
+		child->parent = node;
+
+		xml_node_struct* head = node->first_child;
+
+		if (head)
+		{
+			xml_node_struct* tail = head->prev_sibling_c;
+
+			tail->next_sibling = child;
+			child->prev_sibling_c = tail;
+			head->prev_sibling_c = child;
+		}
+		else
+		{
+			node->first_child = child;
+			child->prev_sibling_c = child;
+		}
+	}
+
+	inline void prepend_node(xml_node_struct* child, xml_node_struct* node)
+	{
+		child->parent = node;
+
+		xml_node_struct* head = node->first_child;
+
+		if (head)
+		{
+			child->prev_sibling_c = head->prev_sibling_c;
+			head->prev_sibling_c = child;
+		}
+		else
+			child->prev_sibling_c = child;
+
+		child->next_sibling = head;
+		node->first_child = child;
+	}
+
+	inline void insert_node_after(xml_node_struct* child, xml_node_struct* node)
+	{
+		xml_node_struct* parent = node->parent;
+
+		child->parent = parent;
+
+		if (node->next_sibling)
+			node->next_sibling->prev_sibling_c = child;
+		else
+			parent->first_child->prev_sibling_c = child;
+
+		child->next_sibling = node->next_sibling;
+		child->prev_sibling_c = node;
+
+		node->next_sibling = child;
+	}
+
+	inline void insert_node_before(xml_node_struct* child, xml_node_struct* node)
+	{
+		xml_node_struct* parent = node->parent;
+
+		child->parent = parent;
+
+		if (node->prev_sibling_c->next_sibling)
+			node->prev_sibling_c->next_sibling = child;
+		else
+			parent->first_child = child;
+
+		child->prev_sibling_c = node->prev_sibling_c;
+		child->next_sibling = node;
+
+		node->prev_sibling_c = child;
+	}
+
+	inline void remove_node(xml_node_struct* node)
+	{
+		xml_node_struct* parent = node->parent;
+
+		if (node->next_sibling)
+			node->next_sibling->prev_sibling_c = node->prev_sibling_c;
+		else
+			parent->first_child->prev_sibling_c = node->prev_sibling_c;
+
+		if (node->prev_sibling_c->next_sibling)
+			node->prev_sibling_c->next_sibling = node->next_sibling;
+		else
+			parent->first_child = node->next_sibling;
+
+		node->parent = 0;
+		node->prev_sibling_c = 0;
+		node->next_sibling = 0;
+	}
+
+	inline void append_attribute(xml_attribute_struct* attr, xml_node_struct* node)
+	{
+		xml_attribute_struct* head = node->first_attribute;
+
+		if (head)
+		{
+			xml_attribute_struct* tail = head->prev_attribute_c;
+
+			tail->next_attribute = attr;
+			attr->prev_attribute_c = tail;
+			head->prev_attribute_c = attr;
+		}
+		else
+		{
+			node->first_attribute = attr;
+			attr->prev_attribute_c = attr;
+		}
+	}
+
+	inline void prepend_attribute(xml_attribute_struct* attr, xml_node_struct* node)
+	{
+		xml_attribute_struct* head = node->first_attribute;
+
+		if (head)
+		{
+			attr->prev_attribute_c = head->prev_attribute_c;
+			head->prev_attribute_c = attr;
+		}
+		else
+			attr->prev_attribute_c = attr;
+
+		attr->next_attribute = head;
+		node->first_attribute = attr;
+	}
+
+	inline void insert_attribute_after(xml_attribute_struct* attr, xml_attribute_struct* place, xml_node_struct* node)
+	{
+		if (place->next_attribute)
+			place->next_attribute->prev_attribute_c = attr;
+		else
+			node->first_attribute->prev_attribute_c = attr;
+
+		attr->next_attribute = place->next_attribute;
+		attr->prev_attribute_c = place;
+		place->next_attribute = attr;
+	}
+
+	inline void insert_attribute_before(xml_attribute_struct* attr, xml_attribute_struct* place, xml_node_struct* node)
+	{
+		if (place->prev_attribute_c->next_attribute)
+			place->prev_attribute_c->next_attribute = attr;
+		else
+			node->first_attribute = attr;
+
+		attr->prev_attribute_c = place->prev_attribute_c;
+		attr->next_attribute = place;
+		place->prev_attribute_c = attr;
+	}
+
+	inline void remove_attribute(xml_attribute_struct* attr, xml_node_struct* node)
+	{
+		if (attr->next_attribute)
+			attr->next_attribute->prev_attribute_c = attr->prev_attribute_c;
+		else
+			node->first_attribute->prev_attribute_c = attr->prev_attribute_c;
+
+		if (attr->prev_attribute_c->next_attribute)
+			attr->prev_attribute_c->next_attribute = attr->next_attribute;
+		else
+			node->first_attribute = attr->next_attribute;
+
+		attr->prev_attribute_c = 0;
+		attr->next_attribute = 0;
+	}
+
+	PUGI__FN_NO_INLINE xml_node_struct* append_new_node(xml_node_struct* node, xml_allocator& alloc, xml_node_type type = node_element)
+	{
+		if (!alloc.reserve()) return 0;
+
+		xml_node_struct* child = allocate_node(alloc, type);
+		if (!child) return 0;
+
+		append_node(child, node);
+
+		return child;
+	}
+
+	PUGI__FN_NO_INLINE xml_attribute_struct* append_new_attribute(xml_node_struct* node, xml_allocator& alloc)
+	{
+		if (!alloc.reserve()) return 0;
+
+		xml_attribute_struct* attr = allocate_attribute(alloc);
+		if (!attr) return 0;
+
+		append_attribute(attr, node);
+
+		return attr;
+	}
+PUGI__NS_END
+
+// Helper classes for code generation
+PUGI__NS_BEGIN
+	struct opt_false
+	{
+		enum { value = 0 };
+	};
+
+	struct opt_true
+	{
+		enum { value = 1 };
+	};
+PUGI__NS_END
+
+// Unicode utilities
+PUGI__NS_BEGIN
+	inline uint16_t endian_swap(uint16_t value)
+	{
+		return static_cast<uint16_t>(((value & 0xff) << 8) | (value >> 8));
+	}
+
+	inline uint32_t endian_swap(uint32_t value)
+	{
+		return ((value & 0xff) << 24) | ((value & 0xff00) << 8) | ((value & 0xff0000) >> 8) | (value >> 24);
+	}
+
+	struct utf8_counter
+	{
+		typedef size_t value_type;
+
+		static value_type low(value_type result, uint32_t ch)
+		{
+			// U+0000..U+007F
+			if (ch < 0x80) return result + 1;
+			// U+0080..U+07FF
+			else if (ch < 0x800) return result + 2;
+			// U+0800..U+FFFF
+			else return result + 3;
+		}
+
+		static value_type high(value_type result, uint32_t)
+		{
+			// U+10000..U+10FFFF
+			return result + 4;
+		}
+	};
+
+	struct utf8_writer
+	{
+		typedef uint8_t* value_type;
+
+		static value_type low(value_type result, uint32_t ch)
+		{
+			// U+0000..U+007F
+			if (ch < 0x80)
+			{
+				*result = static_cast<uint8_t>(ch);
+				return result + 1;
+			}
+			// U+0080..U+07FF
+			else if (ch < 0x800)
+			{
+				result[0] = static_cast<uint8_t>(0xC0 | (ch >> 6));
+				result[1] = static_cast<uint8_t>(0x80 | (ch & 0x3F));
+				return result + 2;
+			}
+			// U+0800..U+FFFF
+			else
+			{
+				result[0] = static_cast<uint8_t>(0xE0 | (ch >> 12));
+				result[1] = static_cast<uint8_t>(0x80 | ((ch >> 6) & 0x3F));
+				result[2] = static_cast<uint8_t>(0x80 | (ch & 0x3F));
+				return result + 3;
+			}
+		}
+
+		static value_type high(value_type result, uint32_t ch)
+		{
+			// U+10000..U+10FFFF
+			result[0] = static_cast<uint8_t>(0xF0 | (ch >> 18));
+			result[1] = static_cast<uint8_t>(0x80 | ((ch >> 12) & 0x3F));
+			result[2] = static_cast<uint8_t>(0x80 | ((ch >> 6) & 0x3F));
+			result[3] = static_cast<uint8_t>(0x80 | (ch & 0x3F));
+			return result + 4;
+		}
+
+		static value_type any(value_type result, uint32_t ch)
+		{
+			return (ch < 0x10000) ? low(result, ch) : high(result, ch);
+		}
+	};
+
+	struct utf16_counter
+	{
+		typedef size_t value_type;
+
+		static value_type low(value_type result, uint32_t)
+		{
+			return result + 1;
+		}
+
+		static value_type high(value_type result, uint32_t)
+		{
+			return result + 2;
+		}
+	};
+
+	struct utf16_writer
+	{
+		typedef uint16_t* value_type;
+
+		static value_type low(value_type result, uint32_t ch)
+		{
+			*result = static_cast<uint16_t>(ch);
+
+			return result + 1;
+		}
+
+		static value_type high(value_type result, uint32_t ch)
+		{
+			uint32_t msh = static_cast<uint32_t>(ch - 0x10000) >> 10;
+			uint32_t lsh = static_cast<uint32_t>(ch - 0x10000) & 0x3ff;
+
+			result[0] = static_cast<uint16_t>(0xD800 + msh);
+			result[1] = static_cast<uint16_t>(0xDC00 + lsh);
+
+			return result + 2;
+		}
+
+		static value_type any(value_type result, uint32_t ch)
+		{
+			return (ch < 0x10000) ? low(result, ch) : high(result, ch);
+		}
+	};
+
+	struct utf32_counter
+	{
+		typedef size_t value_type;
+
+		static value_type low(value_type result, uint32_t)
+		{
+			return result + 1;
+		}
+
+		static value_type high(value_type result, uint32_t)
+		{
+			return result + 1;
+		}
+	};
+
+	struct utf32_writer
+	{
+		typedef uint32_t* value_type;
+
+		static value_type low(value_type result, uint32_t ch)
+		{
+			*result = ch;
+
+			return result + 1;
+		}
+
+		static value_type high(value_type result, uint32_t ch)
+		{
+			*result = ch;
+
+			return result + 1;
+		}
+
+		static value_type any(value_type result, uint32_t ch)
+		{
+			*result = ch;
+
+			return result + 1;
+		}
+	};
+
+	struct latin1_writer
+	{
+		typedef uint8_t* value_type;
+
+		static value_type low(value_type result, uint32_t ch)
+		{
+			*result = static_cast<uint8_t>(ch > 255 ? '?' : ch);
+
+			return result + 1;
+		}
+
+		static value_type high(value_type result, uint32_t ch)
+		{
+			(void)ch;
+
+			*result = '?';
+
+			return result + 1;
+		}
+	};
+
+	struct utf8_decoder
+	{
+		typedef uint8_t type;
+
+		template <typename Traits> static inline typename Traits::value_type process(const uint8_t* data, size_t size, typename Traits::value_type result, Traits)
+		{
+			const uint8_t utf8_byte_mask = 0x3f;
+
+			while (size)
+			{
+				uint8_t lead = *data;
+
+				// 0xxxxxxx -> U+0000..U+007F
+				if (lead < 0x80)
+				{
+					result = Traits::low(result, lead);
+					data += 1;
+					size -= 1;
+
+					// process aligned single-byte (ascii) blocks
+					if ((reinterpret_cast<uintptr_t>(data) & 3) == 0)
+					{
+						// round-trip through void* to silence 'cast increases required alignment of target type' warnings
+						while (size >= 4 && (*static_cast<const uint32_t*>(static_cast<const void*>(data)) & 0x80808080) == 0)
+						{
+							result = Traits::low(result, data[0]);
+							result = Traits::low(result, data[1]);
+							result = Traits::low(result, data[2]);
+							result = Traits::low(result, data[3]);
+							data += 4;
+							size -= 4;
+						}
+					}
+				}
+				// 110xxxxx -> U+0080..U+07FF
+				else if (static_cast<unsigned int>(lead - 0xC0) < 0x20 && size >= 2 && (data[1] & 0xc0) == 0x80)
+				{
+					result = Traits::low(result, ((lead & ~0xC0) << 6) | (data[1] & utf8_byte_mask));
+					data += 2;
+					size -= 2;
+				}
+				// 1110xxxx -> U+0800-U+FFFF
+				else if (static_cast<unsigned int>(lead - 0xE0) < 0x10 && size >= 3 && (data[1] & 0xc0) == 0x80 && (data[2] & 0xc0) == 0x80)
+				{
+					result = Traits::low(result, ((lead & ~0xE0) << 12) | ((data[1] & utf8_byte_mask) << 6) | (data[2] & utf8_byte_mask));
+					data += 3;
+					size -= 3;
+				}
+				// 11110xxx -> U+10000..U+10FFFF
+				else if (static_cast<unsigned int>(lead - 0xF0) < 0x08 && size >= 4 && (data[1] & 0xc0) == 0x80 && (data[2] & 0xc0) == 0x80 && (data[3] & 0xc0) == 0x80)
+				{
+					result = Traits::high(result, ((lead & ~0xF0) << 18) | ((data[1] & utf8_byte_mask) << 12) | ((data[2] & utf8_byte_mask) << 6) | (data[3] & utf8_byte_mask));
+					data += 4;
+					size -= 4;
+				}
+				// 10xxxxxx or 11111xxx -> invalid
+				else
+				{
+					data += 1;
+					size -= 1;
+				}
+			}
+
+			return result;
+		}
+	};
+
+	template <typename opt_swap> struct utf16_decoder
+	{
+		typedef uint16_t type;
+
+		template <typename Traits> static inline typename Traits::value_type process(const uint16_t* data, size_t size, typename Traits::value_type result, Traits)
+		{
+			while (size)
+			{
+				uint16_t lead = opt_swap::value ? endian_swap(*data) : *data;
+
+				// U+0000..U+D7FF
+				if (lead < 0xD800)
+				{
+					result = Traits::low(result, lead);
+					data += 1;
+					size -= 1;
+				}
+				// U+E000..U+FFFF
+				else if (static_cast<unsigned int>(lead - 0xE000) < 0x2000)
+				{
+					result = Traits::low(result, lead);
+					data += 1;
+					size -= 1;
+				}
+				// surrogate pair lead
+				else if (static_cast<unsigned int>(lead - 0xD800) < 0x400 && size >= 2)
+				{
+					uint16_t next = opt_swap::value ? endian_swap(data[1]) : data[1];
+
+					if (static_cast<unsigned int>(next - 0xDC00) < 0x400)
+					{
+						result = Traits::high(result, 0x10000 + ((lead & 0x3ff) << 10) + (next & 0x3ff));
+						data += 2;
+						size -= 2;
+					}
+					else
+					{
+						data += 1;
+						size -= 1;
+					}
+				}
+				else
+				{
+					data += 1;
+					size -= 1;
+				}
+			}
+
+			return result;
+		}
+	};
+
+	template <typename opt_swap> struct utf32_decoder
+	{
+		typedef uint32_t type;
+
+		template <typename Traits> static inline typename Traits::value_type process(const uint32_t* data, size_t size, typename Traits::value_type result, Traits)
+		{
+			while (size)
+			{
+				uint32_t lead = opt_swap::value ? endian_swap(*data) : *data;
+
+				// U+0000..U+FFFF
+				if (lead < 0x10000)
+				{
+					result = Traits::low(result, lead);
+					data += 1;
+					size -= 1;
+				}
+				// U+10000..U+10FFFF
+				else
+				{
+					result = Traits::high(result, lead);
+					data += 1;
+					size -= 1;
+				}
+			}
+
+			return result;
+		}
+	};
+
+	struct latin1_decoder
+	{
+		typedef uint8_t type;
+
+		template <typename Traits> static inline typename Traits::value_type process(const uint8_t* data, size_t size, typename Traits::value_type result, Traits)
+		{
+			while (size)
+			{
+				result = Traits::low(result, *data);
+				data += 1;
+				size -= 1;
+			}
+
+			return result;
+		}
+	};
+
+	template <size_t size> struct wchar_selector;
+
+	template <> struct wchar_selector<2>
+	{
+		typedef uint16_t type;
+		typedef utf16_counter counter;
+		typedef utf16_writer writer;
+		typedef utf16_decoder<opt_false> decoder;
+	};
+
+	template <> struct wchar_selector<4>
+	{
+		typedef uint32_t type;
+		typedef utf32_counter counter;
+		typedef utf32_writer writer;
+		typedef utf32_decoder<opt_false> decoder;
+	};
+
+	typedef wchar_selector<sizeof(wchar_t)>::counter wchar_counter;
+	typedef wchar_selector<sizeof(wchar_t)>::writer wchar_writer;
+
+	struct wchar_decoder
+	{
+		typedef wchar_t type;
+
+		template <typename Traits> static inline typename Traits::value_type process(const wchar_t* data, size_t size, typename Traits::value_type result, Traits traits)
+		{
+			typedef wchar_selector<sizeof(wchar_t)>::decoder decoder;
+
+			return decoder::process(reinterpret_cast<const typename decoder::type*>(data), size, result, traits);
+		}
+	};
+
+#ifdef PUGIXML_WCHAR_MODE
+	PUGI__FN void convert_wchar_endian_swap(wchar_t* result, const wchar_t* data, size_t length)
+	{
+		for (size_t i = 0; i < length; ++i)
+			result[i] = static_cast<wchar_t>(endian_swap(static_cast<wchar_selector<sizeof(wchar_t)>::type>(data[i])));
+	}
+#endif
+PUGI__NS_END
+
+PUGI__NS_BEGIN
+	enum chartype_t
+	{
+		ct_parse_pcdata = 1,	// \0, &, \r, <
+		ct_parse_attr = 2,		// \0, &, \r, ', "
+		ct_parse_attr_ws = 4,	// \0, &, \r, ', ", \n, tab
+		ct_space = 8,			// \r, \n, space, tab
+		ct_parse_cdata = 16,	// \0, ], >, \r
+		ct_parse_comment = 32,	// \0, -, >, \r
+		ct_symbol = 64,			// Any symbol > 127, a-z, A-Z, 0-9, _, :, -, .
+		ct_start_symbol = 128	// Any symbol > 127, a-z, A-Z, _, :
+	};
+
+	static const unsigned char chartype_table[256] =
+	{
+		55,  0,   0,   0,   0,   0,   0,   0,      0,   12,  12,  0,   0,   63,  0,   0,   // 0-15
+		0,   0,   0,   0,   0,   0,   0,   0,      0,   0,   0,   0,   0,   0,   0,   0,   // 16-31
+		8,   0,   6,   0,   0,   0,   7,   6,      0,   0,   0,   0,   0,   96,  64,  0,   // 32-47
+		64,  64,  64,  64,  64,  64,  64,  64,     64,  64,  192, 0,   1,   0,   48,  0,   // 48-63
+		0,   192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192, // 64-79
+		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 0,   0,   16,  0,   192, // 80-95
+		0,   192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192, // 96-111
+		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 0, 0, 0, 0, 0,           // 112-127
+
+		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192, // 128+
+		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192,
+		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192,
+		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192,
+		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192,
+		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192,
+		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192,
+		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192
+	};
+
+	enum chartypex_t
+	{
+		ctx_special_pcdata = 1,   // Any symbol >= 0 and < 32 (except \t, \r, \n), &, <, >
+		ctx_special_attr = 2,     // Any symbol >= 0 and < 32 (except \t), &, <, >, "
+		ctx_start_symbol = 4,	  // Any symbol > 127, a-z, A-Z, _
+		ctx_digit = 8,			  // 0-9
+		ctx_symbol = 16			  // Any symbol > 127, a-z, A-Z, 0-9, _, -, .
+	};
+
+	static const unsigned char chartypex_table[256] =
+	{
+		3,  3,  3,  3,  3,  3,  3,  3,     3,  0,  2,  3,  3,  2,  3,  3,     // 0-15
+		3,  3,  3,  3,  3,  3,  3,  3,     3,  3,  3,  3,  3,  3,  3,  3,     // 16-31
+		0,  0,  2,  0,  0,  0,  3,  0,     0,  0,  0,  0,  0, 16, 16,  0,     // 32-47
+		24, 24, 24, 24, 24, 24, 24, 24,    24, 24, 0,  0,  3,  0,  3,  0,     // 48-63
+
+		0,  20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,    // 64-79
+		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 0,  0,  0,  0,  20,    // 80-95
+		0,  20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,    // 96-111
+		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 0,  0,  0,  0,  0,     // 112-127
+
+		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,    // 128+
+		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,
+		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,
+		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,
+		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,
+		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,
+		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,
+		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20
+	};
+
+#ifdef PUGIXML_WCHAR_MODE
+	#define PUGI__IS_CHARTYPE_IMPL(c, ct, table) ((static_cast<unsigned int>(c) < 128 ? table[static_cast<unsigned int>(c)] : table[128]) & (ct))
+#else
+	#define PUGI__IS_CHARTYPE_IMPL(c, ct, table) (table[static_cast<unsigned char>(c)] & (ct))
+#endif
+
+	#define PUGI__IS_CHARTYPE(c, ct) PUGI__IS_CHARTYPE_IMPL(c, ct, chartype_table)
+	#define PUGI__IS_CHARTYPEX(c, ct) PUGI__IS_CHARTYPE_IMPL(c, ct, chartypex_table)
+
+	PUGI__FN bool is_little_endian()
+	{
+		unsigned int ui = 1;
+
+		return *reinterpret_cast<unsigned char*>(&ui) == 1;
+	}
+
+	PUGI__FN xml_encoding get_wchar_encoding()
+	{
+		PUGI__STATIC_ASSERT(sizeof(wchar_t) == 2 || sizeof(wchar_t) == 4);
+
+		if (sizeof(wchar_t) == 2)
+			return is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
+		else
+			return is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
+	}
+
+	PUGI__FN bool parse_declaration_encoding(const uint8_t* data, size_t size, const uint8_t*& out_encoding, size_t& out_length)
+	{
+	#define PUGI__SCANCHAR(ch) { if (offset >= size || data[offset] != ch) return false; offset++; }
+	#define PUGI__SCANCHARTYPE(ct) { while (offset < size && PUGI__IS_CHARTYPE(data[offset], ct)) offset++; }
+
+		// check if we have a non-empty XML declaration
+		if (size < 6 || !((data[0] == '<') & (data[1] == '?') & (data[2] == 'x') & (data[3] == 'm') & (data[4] == 'l') && PUGI__IS_CHARTYPE(data[5], ct_space)))
+			return false;
+
+		// scan XML declaration until the encoding field
+		for (size_t i = 6; i + 1 < size; ++i)
+		{
+			// declaration can not contain ? in quoted values
+			if (data[i] == '?')
+				return false;
+
+			if (data[i] == 'e' && data[i + 1] == 'n')
+			{
+				size_t offset = i;
+
+				// encoding follows the version field which can't contain 'en' so this has to be the encoding if XML is well formed
+				PUGI__SCANCHAR('e'); PUGI__SCANCHAR('n'); PUGI__SCANCHAR('c'); PUGI__SCANCHAR('o');
+				PUGI__SCANCHAR('d'); PUGI__SCANCHAR('i'); PUGI__SCANCHAR('n'); PUGI__SCANCHAR('g');
+
+				// S? = S?
+				PUGI__SCANCHARTYPE(ct_space);
+				PUGI__SCANCHAR('=');
+				PUGI__SCANCHARTYPE(ct_space);
+
+				// the only two valid delimiters are ' and "
+				uint8_t delimiter = (offset < size && data[offset] == '"') ? '"' : '\'';
+
+				PUGI__SCANCHAR(delimiter);
+
+				size_t start = offset;
+
+				out_encoding = data + offset;
+
+				PUGI__SCANCHARTYPE(ct_symbol);
+
+				out_length = offset - start;
+
+				PUGI__SCANCHAR(delimiter);
+
+				return true;
+			}
+		}
+
+		return false;
+
+	#undef PUGI__SCANCHAR
+	#undef PUGI__SCANCHARTYPE
+	}
+
+	PUGI__FN xml_encoding guess_buffer_encoding(const uint8_t* data, size_t size)
+	{
+		// skip encoding autodetection if input buffer is too small
+		if (size < 4) return encoding_utf8;
+
+		uint8_t d0 = data[0], d1 = data[1], d2 = data[2], d3 = data[3];
+
+		// look for BOM in first few bytes
+		if (d0 == 0 && d1 == 0 && d2 == 0xfe && d3 == 0xff) return encoding_utf32_be;
+		if (d0 == 0xff && d1 == 0xfe && d2 == 0 && d3 == 0) return encoding_utf32_le;
+		if (d0 == 0xfe && d1 == 0xff) return encoding_utf16_be;
+		if (d0 == 0xff && d1 == 0xfe) return encoding_utf16_le;
+		if (d0 == 0xef && d1 == 0xbb && d2 == 0xbf) return encoding_utf8;
+
+		// look for <, <? or <?xm in various encodings
+		if (d0 == 0 && d1 == 0 && d2 == 0 && d3 == 0x3c) return encoding_utf32_be;
+		if (d0 == 0x3c && d1 == 0 && d2 == 0 && d3 == 0) return encoding_utf32_le;
+		if (d0 == 0 && d1 == 0x3c && d2 == 0 && d3 == 0x3f) return encoding_utf16_be;
+		if (d0 == 0x3c && d1 == 0 && d2 == 0x3f && d3 == 0) return encoding_utf16_le;
+
+		// look for utf16 < followed by node name (this may fail, but is better than utf8 since it's zero terminated so early)
+		if (d0 == 0 && d1 == 0x3c) return encoding_utf16_be;
+		if (d0 == 0x3c && d1 == 0) return encoding_utf16_le;
+
+		// no known BOM detected; parse declaration
+		const uint8_t* enc = 0;
+		size_t enc_length = 0;
+
+		if (d0 == 0x3c && d1 == 0x3f && d2 == 0x78 && d3 == 0x6d && parse_declaration_encoding(data, size, enc, enc_length))
+		{
+			// iso-8859-1 (case-insensitive)
+			if (enc_length == 10
+				&& (enc[0] | ' ') == 'i' && (enc[1] | ' ') == 's' && (enc[2] | ' ') == 'o'
+				&& enc[3] == '-' && enc[4] == '8' && enc[5] == '8' && enc[6] == '5' && enc[7] == '9'
+				&& enc[8] == '-' && enc[9] == '1')
+				return encoding_latin1;
+
+			// latin1 (case-insensitive)
+			if (enc_length == 6
+				&& (enc[0] | ' ') == 'l' && (enc[1] | ' ') == 'a' && (enc[2] | ' ') == 't'
+				&& (enc[3] | ' ') == 'i' && (enc[4] | ' ') == 'n'
+				&& enc[5] == '1')
+				return encoding_latin1;
+		}
+
+		return encoding_utf8;
+	}
+
+	PUGI__FN xml_encoding get_buffer_encoding(xml_encoding encoding, const void* contents, size_t size)
+	{
+		// replace wchar encoding with utf implementation
+		if (encoding == encoding_wchar) return get_wchar_encoding();
+
+		// replace utf16 encoding with utf16 with specific endianness
+		if (encoding == encoding_utf16) return is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
+
+		// replace utf32 encoding with utf32 with specific endianness
+		if (encoding == encoding_utf32) return is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
+
+		// only do autodetection if no explicit encoding is requested
+		if (encoding != encoding_auto) return encoding;
+
+		// try to guess encoding (based on XML specification, Appendix F.1)
+		const uint8_t* data = static_cast<const uint8_t*>(contents);
+
+		return guess_buffer_encoding(data, size);
+	}
+
+	PUGI__FN bool get_mutable_buffer(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, bool is_mutable)
+	{
+		size_t length = size / sizeof(char_t);
+
+		if (is_mutable)
+		{
+			out_buffer = static_cast<char_t*>(const_cast<void*>(contents));
+			out_length = length;
+		}
+		else
+		{
+			char_t* buffer = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
+			if (!buffer) return false;
+
+			if (contents)
+				memcpy(buffer, contents, length * sizeof(char_t));
+			else
+				assert(length == 0);
+
+			buffer[length] = 0;
+
+			out_buffer = buffer;
+			out_length = length + 1;
+		}
+
+		return true;
+	}
+
+#ifdef PUGIXML_WCHAR_MODE
+	PUGI__FN bool need_endian_swap_utf(xml_encoding le, xml_encoding re)
+	{
+		return (le == encoding_utf16_be && re == encoding_utf16_le) || (le == encoding_utf16_le && re == encoding_utf16_be) ||
+			   (le == encoding_utf32_be && re == encoding_utf32_le) || (le == encoding_utf32_le && re == encoding_utf32_be);
+	}
+
+	PUGI__FN bool convert_buffer_endian_swap(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, bool is_mutable)
+	{
+		const char_t* data = static_cast<const char_t*>(contents);
+		size_t length = size / sizeof(char_t);
+
+		if (is_mutable)
+		{
+			char_t* buffer = const_cast<char_t*>(data);
+
+			convert_wchar_endian_swap(buffer, data, length);
+
+			out_buffer = buffer;
+			out_length = length;
+		}
+		else
+		{
+			char_t* buffer = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
+			if (!buffer) return false;
+
+			convert_wchar_endian_swap(buffer, data, length);
+			buffer[length] = 0;
+
+			out_buffer = buffer;
+			out_length = length + 1;
+		}
+
+		return true;
+	}
+
+	template <typename D> PUGI__FN bool convert_buffer_generic(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, D)
+	{
+		const typename D::type* data = static_cast<const typename D::type*>(contents);
+		size_t data_length = size / sizeof(typename D::type);
+
+		// first pass: get length in wchar_t units
+		size_t length = D::process(data, data_length, 0, wchar_counter());
+
+		// allocate buffer of suitable length
+		char_t* buffer = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
+		if (!buffer) return false;
+
+		// second pass: convert utf16 input to wchar_t
+		wchar_writer::value_type obegin = reinterpret_cast<wchar_writer::value_type>(buffer);
+		wchar_writer::value_type oend = D::process(data, data_length, obegin, wchar_writer());
+
+		assert(oend == obegin + length);
+		*oend = 0;
+
+		out_buffer = buffer;
+		out_length = length + 1;
+
+		return true;
+	}
+
+	PUGI__FN bool convert_buffer(char_t*& out_buffer, size_t& out_length, xml_encoding encoding, const void* contents, size_t size, bool is_mutable)
+	{
+		// get native encoding
+		xml_encoding wchar_encoding = get_wchar_encoding();
+
+		// fast path: no conversion required
+		if (encoding == wchar_encoding)
+			return get_mutable_buffer(out_buffer, out_length, contents, size, is_mutable);
+
+		// only endian-swapping is required
+		if (need_endian_swap_utf(encoding, wchar_encoding))
+			return convert_buffer_endian_swap(out_buffer, out_length, contents, size, is_mutable);
+
+		// source encoding is utf8
+		if (encoding == encoding_utf8)
+			return convert_buffer_generic(out_buffer, out_length, contents, size, utf8_decoder());
+
+		// source encoding is utf16
+		if (encoding == encoding_utf16_be || encoding == encoding_utf16_le)
+		{
+			xml_encoding native_encoding = is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
+
+			return (native_encoding == encoding) ?
+				convert_buffer_generic(out_buffer, out_length, contents, size, utf16_decoder<opt_false>()) :
+				convert_buffer_generic(out_buffer, out_length, contents, size, utf16_decoder<opt_true>());
+		}
+
+		// source encoding is utf32
+		if (encoding == encoding_utf32_be || encoding == encoding_utf32_le)
+		{
+			xml_encoding native_encoding = is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
+
+			return (native_encoding == encoding) ?
+				convert_buffer_generic(out_buffer, out_length, contents, size, utf32_decoder<opt_false>()) :
+				convert_buffer_generic(out_buffer, out_length, contents, size, utf32_decoder<opt_true>());
+		}
+
+		// source encoding is latin1
+		if (encoding == encoding_latin1)
+			return convert_buffer_generic(out_buffer, out_length, contents, size, latin1_decoder());
+
+		assert(false && "Invalid encoding"); // unreachable
+		return false;
+	}
+#else
+	template <typename D> PUGI__FN bool convert_buffer_generic(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, D)
+	{
+		const typename D::type* data = static_cast<const typename D::type*>(contents);
+		size_t data_length = size / sizeof(typename D::type);
+
+		// first pass: get length in utf8 units
+		size_t length = D::process(data, data_length, 0, utf8_counter());
+
+		// allocate buffer of suitable length
+		char_t* buffer = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
+		if (!buffer) return false;
+
+		// second pass: convert utf16 input to utf8
+		uint8_t* obegin = reinterpret_cast<uint8_t*>(buffer);
+		uint8_t* oend = D::process(data, data_length, obegin, utf8_writer());
+
+		assert(oend == obegin + length);
+		*oend = 0;
+
+		out_buffer = buffer;
+		out_length = length + 1;
+
+		return true;
+	}
+
+	PUGI__FN size_t get_latin1_7bit_prefix_length(const uint8_t* data, size_t size)
+	{
+		for (size_t i = 0; i < size; ++i)
+			if (data[i] > 127)
+				return i;
+
+		return size;
+	}
+
+	PUGI__FN bool convert_buffer_latin1(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, bool is_mutable)
+	{
+		const uint8_t* data = static_cast<const uint8_t*>(contents);
+		size_t data_length = size;
+
+		// get size of prefix that does not need utf8 conversion
+		size_t prefix_length = get_latin1_7bit_prefix_length(data, data_length);
+		assert(prefix_length <= data_length);
+
+		const uint8_t* postfix = data + prefix_length;
+		size_t postfix_length = data_length - prefix_length;
+
+		// if no conversion is needed, just return the original buffer
+		if (postfix_length == 0) return get_mutable_buffer(out_buffer, out_length, contents, size, is_mutable);
+
+		// first pass: get length in utf8 units
+		size_t length = prefix_length + latin1_decoder::process(postfix, postfix_length, 0, utf8_counter());
+
+		// allocate buffer of suitable length
+		char_t* buffer = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
+		if (!buffer) return false;
+
+		// second pass: convert latin1 input to utf8
+		memcpy(buffer, data, prefix_length);
+
+		uint8_t* obegin = reinterpret_cast<uint8_t*>(buffer);
+		uint8_t* oend = latin1_decoder::process(postfix, postfix_length, obegin + prefix_length, utf8_writer());
+
+		assert(oend == obegin + length);
+		*oend = 0;
+
+		out_buffer = buffer;
+		out_length = length + 1;
+
+		return true;
+	}
+
+	PUGI__FN bool convert_buffer(char_t*& out_buffer, size_t& out_length, xml_encoding encoding, const void* contents, size_t size, bool is_mutable)
+	{
+		// fast path: no conversion required
+		if (encoding == encoding_utf8)
+			return get_mutable_buffer(out_buffer, out_length, contents, size, is_mutable);
+
+		// source encoding is utf16
+		if (encoding == encoding_utf16_be || encoding == encoding_utf16_le)
+		{
+			xml_encoding native_encoding = is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
+
+			return (native_encoding == encoding) ?
+				convert_buffer_generic(out_buffer, out_length, contents, size, utf16_decoder<opt_false>()) :
+				convert_buffer_generic(out_buffer, out_length, contents, size, utf16_decoder<opt_true>());
+		}
+
+		// source encoding is utf32
+		if (encoding == encoding_utf32_be || encoding == encoding_utf32_le)
+		{
+			xml_encoding native_encoding = is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
+
+			return (native_encoding == encoding) ?
+				convert_buffer_generic(out_buffer, out_length, contents, size, utf32_decoder<opt_false>()) :
+				convert_buffer_generic(out_buffer, out_length, contents, size, utf32_decoder<opt_true>());
+		}
+
+		// source encoding is latin1
+		if (encoding == encoding_latin1)
+			return convert_buffer_latin1(out_buffer, out_length, contents, size, is_mutable);
+
+		assert(false && "Invalid encoding"); // unreachable
+		return false;
+	}
+#endif
+
+	PUGI__FN size_t as_utf8_begin(const wchar_t* str, size_t length)
+	{
+		// get length in utf8 characters
+		return wchar_decoder::process(str, length, 0, utf8_counter());
+	}
+
+	PUGI__FN void as_utf8_end(char* buffer, size_t size, const wchar_t* str, size_t length)
+	{
+		// convert to utf8
+		uint8_t* begin = reinterpret_cast<uint8_t*>(buffer);
+		uint8_t* end = wchar_decoder::process(str, length, begin, utf8_writer());
+
+		assert(begin + size == end);
+		(void)!end;
+		(void)!size;
+	}
+
+#ifndef PUGIXML_NO_STL
+	PUGI__FN std::string as_utf8_impl(const wchar_t* str, size_t length)
+	{
+		// first pass: get length in utf8 characters
+		size_t size = as_utf8_begin(str, length);
+
+		// allocate resulting string
+		std::string result;
+		result.resize(size);
+
+		// second pass: convert to utf8
+		if (size > 0) as_utf8_end(&result[0], size, str, length);
+
+		return result;
+	}
+
+	PUGI__FN std::basic_string<wchar_t> as_wide_impl(const char* str, size_t size)
+	{
+		const uint8_t* data = reinterpret_cast<const uint8_t*>(str);
+
+		// first pass: get length in wchar_t units
+		size_t length = utf8_decoder::process(data, size, 0, wchar_counter());
+
+		// allocate resulting string
+		std::basic_string<wchar_t> result;
+		result.resize(length);
+
+		// second pass: convert to wchar_t
+		if (length > 0)
+		{
+			wchar_writer::value_type begin = reinterpret_cast<wchar_writer::value_type>(&result[0]);
+			wchar_writer::value_type end = utf8_decoder::process(data, size, begin, wchar_writer());
+
+			assert(begin + length == end);
+			(void)!end;
+		}
+
+		return result;
+	}
+#endif
+
+	template <typename Header>
+	inline bool strcpy_insitu_allow(size_t length, const Header& header, uintptr_t header_mask, char_t* target)
+	{
+		// never reuse shared memory
+		if (header & xml_memory_page_contents_shared_mask) return false;
+
+		size_t target_length = strlength(target);
+
+		// always reuse document buffer memory if possible
+		if ((header & header_mask) == 0) return target_length >= length;
+
+		// reuse heap memory if waste is not too great
+		const size_t reuse_threshold = 32;
+
+		return target_length >= length && (target_length < reuse_threshold || target_length - length < target_length / 2);
+	}
+
+	template <typename String, typename Header>
+	PUGI__FN bool strcpy_insitu(String& dest, Header& header, uintptr_t header_mask, const char_t* source, size_t source_length)
+	{
+		if (source_length == 0)
+		{
+			// empty string and null pointer are equivalent, so just deallocate old memory
+			xml_allocator* alloc = PUGI__GETPAGE_IMPL(header)->allocator;
+
+			if (header & header_mask) alloc->deallocate_string(dest);
+
+			// mark the string as not allocated
+			dest = 0;
+			header &= ~header_mask;
+
+			return true;
+		}
+		else if (dest && strcpy_insitu_allow(source_length, header, header_mask, dest))
+		{
+			// we can reuse old buffer, so just copy the new data (including zero terminator)
+			memcpy(dest, source, source_length * sizeof(char_t));
+			dest[source_length] = 0;
+
+			return true;
+		}
+		else
+		{
+			xml_allocator* alloc = PUGI__GETPAGE_IMPL(header)->allocator;
+
+			if (!alloc->reserve()) return false;
+
+			// allocate new buffer
+			char_t* buf = alloc->allocate_string(source_length + 1);
+			if (!buf) return false;
+
+			// copy the string (including zero terminator)
+			memcpy(buf, source, source_length * sizeof(char_t));
+			buf[source_length] = 0;
+
+			// deallocate old buffer (*after* the above to protect against overlapping memory and/or allocation failures)
+			if (header & header_mask) alloc->deallocate_string(dest);
+
+			// the string is now allocated, so set the flag
+			dest = buf;
+			header |= header_mask;
+
+			return true;
+		}
+	}
+
+	struct gap
+	{
+		char_t* end;
+		size_t size;
+
+		gap(): end(0), size(0)
+		{
+		}
+
+		// Push new gap, move s count bytes further (skipping the gap).
+		// Collapse previous gap.
+		void push(char_t*& s, size_t count)
+		{
+			if (end) // there was a gap already; collapse it
+			{
+				// Move [old_gap_end, new_gap_start) to [old_gap_start, ...)
+				assert(s >= end);
+				memmove(end - size, end, reinterpret_cast<char*>(s) - reinterpret_cast<char*>(end));
+			}
+
+			s += count; // end of current gap
+
+			// "merge" two gaps
+			end = s;
+			size += count;
+		}
+
+		// Collapse all gaps, return past-the-end pointer
+		char_t* flush(char_t* s)
+		{
+			if (end)
+			{
+				// Move [old_gap_end, current_pos) to [old_gap_start, ...)
+				assert(s >= end);
+				memmove(end - size, end, reinterpret_cast<char*>(s) - reinterpret_cast<char*>(end));
+
+				return s - size;
+			}
+			else return s;
+		}
+	};
+
+	PUGI__FN char_t* strconv_escape(char_t* s, gap& g)
+	{
+		char_t* stre = s + 1;
+
+		switch (*stre)
+		{
+			case '#':	// &#...
+			{
+				unsigned int ucsc = 0;
+
+				if (stre[1] == 'x') // &#x... (hex code)
+				{
+					stre += 2;
+
+					char_t ch = *stre;
+
+					if (ch == ';') return stre;
+
+					for (;;)
+					{
+						if (static_cast<unsigned int>(ch - '0') <= 9)
+							ucsc = 16 * ucsc + (ch - '0');
+						else if (static_cast<unsigned int>((ch | ' ') - 'a') <= 5)
+							ucsc = 16 * ucsc + ((ch | ' ') - 'a' + 10);
+						else if (ch == ';')
+							break;
+						else // cancel
+							return stre;
+
+						ch = *++stre;
+					}
+
+					++stre;
+				}
+				else	// &#... (dec code)
+				{
+					char_t ch = *++stre;
+
+					if (ch == ';') return stre;
+
+					for (;;)
+					{
+						if (static_cast<unsigned int>(ch - '0') <= 9)
+							ucsc = 10 * ucsc + (ch - '0');
+						else if (ch == ';')
+							break;
+						else // cancel
+							return stre;
+
+						ch = *++stre;
+					}
+
+					++stre;
+				}
+
+			#ifdef PUGIXML_WCHAR_MODE
+				s = reinterpret_cast<char_t*>(wchar_writer::any(reinterpret_cast<wchar_writer::value_type>(s), ucsc));
+			#else
+				s = reinterpret_cast<char_t*>(utf8_writer::any(reinterpret_cast<uint8_t*>(s), ucsc));
+			#endif
+
+				g.push(s, stre - s);
+				return stre;
+			}
+
+			case 'a':	// &a
+			{
+				++stre;
+
+				if (*stre == 'm') // &am
+				{
+					if (*++stre == 'p' && *++stre == ';') // &amp;
+					{
+						*s++ = '&';
+						++stre;
+
+						g.push(s, stre - s);
+						return stre;
+					}
+				}
+				else if (*stre == 'p') // &ap
+				{
+					if (*++stre == 'o' && *++stre == 's' && *++stre == ';') // &apos;
+					{
+						*s++ = '\'';
+						++stre;
+
+						g.push(s, stre - s);
+						return stre;
+					}
+				}
+				break;
+			}
+
+			case 'g': // &g
+			{
+				if (*++stre == 't' && *++stre == ';') // &gt;
+				{
+					*s++ = '>';
+					++stre;
+
+					g.push(s, stre - s);
+					return stre;
+				}
+				break;
+			}
+
+			case 'l': // &l
+			{
+				if (*++stre == 't' && *++stre == ';') // &lt;
+				{
+					*s++ = '<';
+					++stre;
+
+					g.push(s, stre - s);
+					return stre;
+				}
+				break;
+			}
+
+			case 'q': // &q
+			{
+				if (*++stre == 'u' && *++stre == 'o' && *++stre == 't' && *++stre == ';') // &quot;
+				{
+					*s++ = '"';
+					++stre;
+
+					g.push(s, stre - s);
+					return stre;
+				}
+				break;
+			}
+
+			default:
+				break;
+		}
+
+		return stre;
+	}
+
+	// Parser utilities
+	#define PUGI__ENDSWITH(c, e)        ((c) == (e) || ((c) == 0 && endch == (e)))
+	#define PUGI__SKIPWS()              { while (PUGI__IS_CHARTYPE(*s, ct_space)) ++s; }
+	#define PUGI__OPTSET(OPT)           ( optmsk & (OPT) )
+	#define PUGI__PUSHNODE(TYPE)        { cursor = append_new_node(cursor, *alloc, TYPE); if (!cursor) PUGI__THROW_ERROR(status_out_of_memory, s); }
+	#define PUGI__POPNODE()             { cursor = cursor->parent; }
+	#define PUGI__SCANFOR(X)            { while (*s != 0 && !(X)) ++s; }
+	#define PUGI__SCANWHILE(X)          { while (X) ++s; }
+	#define PUGI__SCANWHILE_UNROLL(X)   { for (;;) { char_t ss = s[0]; if (PUGI__UNLIKELY(!(X))) { break; } ss = s[1]; if (PUGI__UNLIKELY(!(X))) { s += 1; break; } ss = s[2]; if (PUGI__UNLIKELY(!(X))) { s += 2; break; } ss = s[3]; if (PUGI__UNLIKELY(!(X))) { s += 3; break; } s += 4; } }
+	#define PUGI__ENDSEG()              { ch = *s; *s = 0; ++s; }
+	#define PUGI__THROW_ERROR(err, m)   return error_offset = m, error_status = err, static_cast<char_t*>(0)
+	#define PUGI__CHECK_ERROR(err, m)   { if (*s == 0) PUGI__THROW_ERROR(err, m); }
+
+	PUGI__FN char_t* strconv_comment(char_t* s, char_t endch)
+	{
+		gap g;
+
+		while (true)
+		{
+			PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_comment));
+
+			if (*s == '\r') // Either a single 0x0d or 0x0d 0x0a pair
+			{
+				*s++ = '\n'; // replace first one with 0x0a
+
+				if (*s == '\n') g.push(s, 1);
+			}
+			else if (s[0] == '-' && s[1] == '-' && PUGI__ENDSWITH(s[2], '>')) // comment ends here
+			{
+				*g.flush(s) = 0;
+
+				return s + (s[2] == '>' ? 3 : 2);
+			}
+			else if (*s == 0)
+			{
+				return 0;
+			}
+			else ++s;
+		}
+	}
+
+	PUGI__FN char_t* strconv_cdata(char_t* s, char_t endch)
+	{
+		gap g;
+
+		while (true)
+		{
+			PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_cdata));
+
+			if (*s == '\r') // Either a single 0x0d or 0x0d 0x0a pair
+			{
+				*s++ = '\n'; // replace first one with 0x0a
+
+				if (*s == '\n') g.push(s, 1);
+			}
+			else if (s[0] == ']' && s[1] == ']' && PUGI__ENDSWITH(s[2], '>')) // CDATA ends here
+			{
+				*g.flush(s) = 0;
+
+				return s + 1;
+			}
+			else if (*s == 0)
+			{
+				return 0;
+			}
+			else ++s;
+		}
+	}
+
+	typedef char_t* (*strconv_pcdata_t)(char_t*);
+
+	template <typename opt_trim, typename opt_eol, typename opt_escape> struct strconv_pcdata_impl
+	{
+		static char_t* parse(char_t* s)
+		{
+			gap g;
+
+			char_t* begin = s;
+
+			while (true)
+			{
+				PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_pcdata));
+
+				if (*s == '<') // PCDATA ends here
+				{
+					char_t* end = g.flush(s);
+
+					if (opt_trim::value)
+						while (end > begin && PUGI__IS_CHARTYPE(end[-1], ct_space))
+							--end;
+
+					*end = 0;
+
+					return s + 1;
+				}
+				else if (opt_eol::value && *s == '\r') // Either a single 0x0d or 0x0d 0x0a pair
+				{
+					*s++ = '\n'; // replace first one with 0x0a
+
+					if (*s == '\n') g.push(s, 1);
+				}
+				else if (opt_escape::value && *s == '&')
+				{
+					s = strconv_escape(s, g);
+				}
+				else if (*s == 0)
+				{
+					char_t* end = g.flush(s);
+
+					if (opt_trim::value)
+						while (end > begin && PUGI__IS_CHARTYPE(end[-1], ct_space))
+							--end;
+
+					*end = 0;
+
+					return s;
+				}
+				else ++s;
+			}
+		}
+	};
+
+	PUGI__FN strconv_pcdata_t get_strconv_pcdata(unsigned int optmask)
+	{
+		PUGI__STATIC_ASSERT(parse_escapes == 0x10 && parse_eol == 0x20 && parse_trim_pcdata == 0x0800);
+
+		switch (((optmask >> 4) & 3) | ((optmask >> 9) & 4)) // get bitmask for flags (eol escapes trim)
+		{
+		case 0: return strconv_pcdata_impl<opt_false, opt_false, opt_false>::parse;
+		case 1: return strconv_pcdata_impl<opt_false, opt_false, opt_true>::parse;
+		case 2: return strconv_pcdata_impl<opt_false, opt_true, opt_false>::parse;
+		case 3: return strconv_pcdata_impl<opt_false, opt_true, opt_true>::parse;
+		case 4: return strconv_pcdata_impl<opt_true, opt_false, opt_false>::parse;
+		case 5: return strconv_pcdata_impl<opt_true, opt_false, opt_true>::parse;
+		case 6: return strconv_pcdata_impl<opt_true, opt_true, opt_false>::parse;
+		case 7: return strconv_pcdata_impl<opt_true, opt_true, opt_true>::parse;
+		default: assert(false); return 0; // unreachable
+		}
+	}
+
+	typedef char_t* (*strconv_attribute_t)(char_t*, char_t);
+
+	template <typename opt_escape> struct strconv_attribute_impl
+	{
+		static char_t* parse_wnorm(char_t* s, char_t end_quote)
+		{
+			gap g;
+
+			// trim leading whitespaces
+			if (PUGI__IS_CHARTYPE(*s, ct_space))
+			{
+				char_t* str = s;
+
+				do ++str;
+				while (PUGI__IS_CHARTYPE(*str, ct_space));
+
+				g.push(s, str - s);
+			}
+
+			while (true)
+			{
+				PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_attr_ws | ct_space));
+
+				if (*s == end_quote)
+				{
+					char_t* str = g.flush(s);
+
+					do *str-- = 0;
+					while (PUGI__IS_CHARTYPE(*str, ct_space));
+
+					return s + 1;
+				}
+				else if (PUGI__IS_CHARTYPE(*s, ct_space))
+				{
+					*s++ = ' ';
+
+					if (PUGI__IS_CHARTYPE(*s, ct_space))
+					{
+						char_t* str = s + 1;
+						while (PUGI__IS_CHARTYPE(*str, ct_space)) ++str;
+
+						g.push(s, str - s);
+					}
+				}
+				else if (opt_escape::value && *s == '&')
+				{
+					s = strconv_escape(s, g);
+				}
+				else if (!*s)
+				{
+					return 0;
+				}
+				else ++s;
+			}
+		}
+
+		static char_t* parse_wconv(char_t* s, char_t end_quote)
+		{
+			gap g;
+
+			while (true)
+			{
+				PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_attr_ws));
+
+				if (*s == end_quote)
+				{
+					*g.flush(s) = 0;
+
+					return s + 1;
+				}
+				else if (PUGI__IS_CHARTYPE(*s, ct_space))
+				{
+					if (*s == '\r')
+					{
+						*s++ = ' ';
+
+						if (*s == '\n') g.push(s, 1);
+					}
+					else *s++ = ' ';
+				}
+				else if (opt_escape::value && *s == '&')
+				{
+					s = strconv_escape(s, g);
+				}
+				else if (!*s)
+				{
+					return 0;
+				}
+				else ++s;
+			}
+		}
+
+		static char_t* parse_eol(char_t* s, char_t end_quote)
+		{
+			gap g;
+
+			while (true)
+			{
+				PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_attr));
+
+				if (*s == end_quote)
+				{
+					*g.flush(s) = 0;
+
+					return s + 1;
+				}
+				else if (*s == '\r')
+				{
+					*s++ = '\n';
+
+					if (*s == '\n') g.push(s, 1);
+				}
+				else if (opt_escape::value && *s == '&')
+				{
+					s = strconv_escape(s, g);
+				}
+				else if (!*s)
+				{
+					return 0;
+				}
+				else ++s;
+			}
+		}
+
+		static char_t* parse_simple(char_t* s, char_t end_quote)
+		{
+			gap g;
+
+			while (true)
+			{
+				PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_attr));
+
+				if (*s == end_quote)
+				{
+					*g.flush(s) = 0;
+
+					return s + 1;
+				}
+				else if (opt_escape::value && *s == '&')
+				{
+					s = strconv_escape(s, g);
+				}
+				else if (!*s)
+				{
+					return 0;
+				}
+				else ++s;
+			}
+		}
+	};
+
+	PUGI__FN strconv_attribute_t get_strconv_attribute(unsigned int optmask)
+	{
+		PUGI__STATIC_ASSERT(parse_escapes == 0x10 && parse_eol == 0x20 && parse_wconv_attribute == 0x40 && parse_wnorm_attribute == 0x80);
+
+		switch ((optmask >> 4) & 15) // get bitmask for flags (wconv wnorm eol escapes)
+		{
+		case 0:  return strconv_attribute_impl<opt_false>::parse_simple;
+		case 1:  return strconv_attribute_impl<opt_true>::parse_simple;
+		case 2:  return strconv_attribute_impl<opt_false>::parse_eol;
+		case 3:  return strconv_attribute_impl<opt_true>::parse_eol;
+		case 4:  return strconv_attribute_impl<opt_false>::parse_wconv;
+		case 5:  return strconv_attribute_impl<opt_true>::parse_wconv;
+		case 6:  return strconv_attribute_impl<opt_false>::parse_wconv;
+		case 7:  return strconv_attribute_impl<opt_true>::parse_wconv;
+		case 8:  return strconv_attribute_impl<opt_false>::parse_wnorm;
+		case 9:  return strconv_attribute_impl<opt_true>::parse_wnorm;
+		case 10: return strconv_attribute_impl<opt_false>::parse_wnorm;
+		case 11: return strconv_attribute_impl<opt_true>::parse_wnorm;
+		case 12: return strconv_attribute_impl<opt_false>::parse_wnorm;
+		case 13: return strconv_attribute_impl<opt_true>::parse_wnorm;
+		case 14: return strconv_attribute_impl<opt_false>::parse_wnorm;
+		case 15: return strconv_attribute_impl<opt_true>::parse_wnorm;
+		default: assert(false); return 0; // unreachable
+		}
+	}
+
+	inline xml_parse_result make_parse_result(xml_parse_status status, ptrdiff_t offset = 0)
+	{
+		xml_parse_result result;
+		result.status = status;
+		result.offset = offset;
+
+		return result;
+	}
+
+	struct xml_parser
+	{
+		xml_allocator* alloc;
+		char_t* error_offset;
+		xml_parse_status error_status;
+
+		xml_parser(xml_allocator* alloc_): alloc(alloc_), error_offset(0), error_status(status_ok)
+		{
+		}
+
+		// DOCTYPE consists of nested sections of the following possible types:
+		// <!-- ... -->, <? ... ?>, "...", '...'
+		// <![...]]>
+		// <!...>
+		// First group can not contain nested groups
+		// Second group can contain nested groups of the same type
+		// Third group can contain all other groups
+		char_t* parse_doctype_primitive(char_t* s)
+		{
+			if (*s == '"' || *s == '\'')
+			{
+				// quoted string
+				char_t ch = *s++;
+				PUGI__SCANFOR(*s == ch);
+				if (!*s) PUGI__THROW_ERROR(status_bad_doctype, s);
+
+				s++;
+			}
+			else if (s[0] == '<' && s[1] == '?')
+			{
+				// <? ... ?>
+				s += 2;
+				PUGI__SCANFOR(s[0] == '?' && s[1] == '>'); // no need for ENDSWITH because ?> can't terminate proper doctype
+				if (!*s) PUGI__THROW_ERROR(status_bad_doctype, s);
+
+				s += 2;
+			}
+			else if (s[0] == '<' && s[1] == '!' && s[2] == '-' && s[3] == '-')
+			{
+				s += 4;
+				PUGI__SCANFOR(s[0] == '-' && s[1] == '-' && s[2] == '>'); // no need for ENDSWITH because --> can't terminate proper doctype
+				if (!*s) PUGI__THROW_ERROR(status_bad_doctype, s);
+
+				s += 3;
+			}
+			else PUGI__THROW_ERROR(status_bad_doctype, s);
+
+			return s;
+		}
+
+		char_t* parse_doctype_ignore(char_t* s)
+		{
+			size_t depth = 0;
+
+			assert(s[0] == '<' && s[1] == '!' && s[2] == '[');
+			s += 3;
+
+			while (*s)
+			{
+				if (s[0] == '<' && s[1] == '!' && s[2] == '[')
+				{
+					// nested ignore section
+					s += 3;
+					depth++;
+				}
+				else if (s[0] == ']' && s[1] == ']' && s[2] == '>')
+				{
+					// ignore section end
+					s += 3;
+
+					if (depth == 0)
+						return s;
+
+					depth--;
+				}
+				else s++;
+			}
+
+			PUGI__THROW_ERROR(status_bad_doctype, s);
+		}
+
+		char_t* parse_doctype_group(char_t* s, char_t endch)
+		{
+			size_t depth = 0;
+
+			assert((s[0] == '<' || s[0] == 0) && s[1] == '!');
+			s += 2;
+
+			while (*s)
+			{
+				if (s[0] == '<' && s[1] == '!' && s[2] != '-')
+				{
+					if (s[2] == '[')
+					{
+						// ignore
+						s = parse_doctype_ignore(s);
+						if (!s) return s;
+					}
+					else
+					{
+						// some control group
+						s += 2;
+						depth++;
+					}
+				}
+				else if (s[0] == '<' || s[0] == '"' || s[0] == '\'')
+				{
+					// unknown tag (forbidden), or some primitive group
+					s = parse_doctype_primitive(s);
+					if (!s) return s;
+				}
+				else if (*s == '>')
+				{
+					if (depth == 0)
+						return s;
+
+					depth--;
+					s++;
+				}
+				else s++;
+			}
+
+			if (depth != 0 || endch != '>') PUGI__THROW_ERROR(status_bad_doctype, s);
+
+			return s;
+		}
+
+		char_t* parse_exclamation(char_t* s, xml_node_struct* cursor, unsigned int optmsk, char_t endch)
+		{
+			// parse node contents, starting with exclamation mark
+			++s;
+
+			if (*s == '-') // '<!-...'
+			{
+				++s;
+
+				if (*s == '-') // '<!--...'
+				{
+					++s;
+
+					if (PUGI__OPTSET(parse_comments))
+					{
+						PUGI__PUSHNODE(node_comment); // Append a new node on the tree.
+						cursor->value = s; // Save the offset.
+					}
+
+					if (PUGI__OPTSET(parse_eol) && PUGI__OPTSET(parse_comments))
+					{
+						s = strconv_comment(s, endch);
+
+						if (!s) PUGI__THROW_ERROR(status_bad_comment, cursor->value);
+					}
+					else
+					{
+						// Scan for terminating '-->'.
+						PUGI__SCANFOR(s[0] == '-' && s[1] == '-' && PUGI__ENDSWITH(s[2], '>'));
+						PUGI__CHECK_ERROR(status_bad_comment, s);
+
+						if (PUGI__OPTSET(parse_comments))
+							*s = 0; // Zero-terminate this segment at the first terminating '-'.
+
+						s += (s[2] == '>' ? 3 : 2); // Step over the '\0->'.
+					}
+				}
+				else PUGI__THROW_ERROR(status_bad_comment, s);
+			}
+			else if (*s == '[')
+			{
+				// '<![CDATA[...'
+				if (*++s=='C' && *++s=='D' && *++s=='A' && *++s=='T' && *++s=='A' && *++s == '[')
+				{
+					++s;
+
+					if (PUGI__OPTSET(parse_cdata))
+					{
+						PUGI__PUSHNODE(node_cdata); // Append a new node on the tree.
+						cursor->value = s; // Save the offset.
+
+						if (PUGI__OPTSET(parse_eol))
+						{
+							s = strconv_cdata(s, endch);
+
+							if (!s) PUGI__THROW_ERROR(status_bad_cdata, cursor->value);
+						}
+						else
+						{
+							// Scan for terminating ']]>'.
+							PUGI__SCANFOR(s[0] == ']' && s[1] == ']' && PUGI__ENDSWITH(s[2], '>'));
+							PUGI__CHECK_ERROR(status_bad_cdata, s);
+
+							*s++ = 0; // Zero-terminate this segment.
+						}
+					}
+					else // Flagged for discard, but we still have to scan for the terminator.
+					{
+						// Scan for terminating ']]>'.
+						PUGI__SCANFOR(s[0] == ']' && s[1] == ']' && PUGI__ENDSWITH(s[2], '>'));
+						PUGI__CHECK_ERROR(status_bad_cdata, s);
+
+						++s;
+					}
+
+					s += (s[1] == '>' ? 2 : 1); // Step over the last ']>'.
+				}
+				else PUGI__THROW_ERROR(status_bad_cdata, s);
+			}
+			else if (s[0] == 'D' && s[1] == 'O' && s[2] == 'C' && s[3] == 'T' && s[4] == 'Y' && s[5] == 'P' && PUGI__ENDSWITH(s[6], 'E'))
+			{
+				s -= 2;
+
+				if (cursor->parent) PUGI__THROW_ERROR(status_bad_doctype, s);
+
+				char_t* mark = s + 9;
+
+				s = parse_doctype_group(s, endch);
+				if (!s) return s;
+
+				assert((*s == 0 && endch == '>') || *s == '>');
+				if (*s) *s++ = 0;
+
+				if (PUGI__OPTSET(parse_doctype))
+				{
+					while (PUGI__IS_CHARTYPE(*mark, ct_space)) ++mark;
+
+					PUGI__PUSHNODE(node_doctype);
+
+					cursor->value = mark;
+				}
+			}
+			else if (*s == 0 && endch == '-') PUGI__THROW_ERROR(status_bad_comment, s);
+			else if (*s == 0 && endch == '[') PUGI__THROW_ERROR(status_bad_cdata, s);
+			else PUGI__THROW_ERROR(status_unrecognized_tag, s);
+
+			return s;
+		}
+
+		char_t* parse_question(char_t* s, xml_node_struct*& ref_cursor, unsigned int optmsk, char_t endch)
+		{
+			// load into registers
+			xml_node_struct* cursor = ref_cursor;
+			char_t ch = 0;
+
+			// parse node contents, starting with question mark
+			++s;
+
+			// read PI target
+			char_t* target = s;
+
+			if (!PUGI__IS_CHARTYPE(*s, ct_start_symbol)) PUGI__THROW_ERROR(status_bad_pi, s);
+
+			PUGI__SCANWHILE(PUGI__IS_CHARTYPE(*s, ct_symbol));
+			PUGI__CHECK_ERROR(status_bad_pi, s);
+
+			// determine node type; stricmp / strcasecmp is not portable
+			bool declaration = (target[0] | ' ') == 'x' && (target[1] | ' ') == 'm' && (target[2] | ' ') == 'l' && target + 3 == s;
+
+			if (declaration ? PUGI__OPTSET(parse_declaration) : PUGI__OPTSET(parse_pi))
+			{
+				if (declaration)
+				{
+					// disallow non top-level declarations
+					if (cursor->parent) PUGI__THROW_ERROR(status_bad_pi, s);
+
+					PUGI__PUSHNODE(node_declaration);
+				}
+				else
+				{
+					PUGI__PUSHNODE(node_pi);
+				}
+
+				cursor->name = target;
+
+				PUGI__ENDSEG();
+
+				// parse value/attributes
+				if (ch == '?')
+				{
+					// empty node
+					if (!PUGI__ENDSWITH(*s, '>')) PUGI__THROW_ERROR(status_bad_pi, s);
+					s += (*s == '>');
+
+					PUGI__POPNODE();
+				}
+				else if (PUGI__IS_CHARTYPE(ch, ct_space))
+				{
+					PUGI__SKIPWS();
+
+					// scan for tag end
+					char_t* value = s;
+
+					PUGI__SCANFOR(s[0] == '?' && PUGI__ENDSWITH(s[1], '>'));
+					PUGI__CHECK_ERROR(status_bad_pi, s);
+
+					if (declaration)
+					{
+						// replace ending ? with / so that 'element' terminates properly
+						*s = '/';
+
+						// we exit from this function with cursor at node_declaration, which is a signal to parse() to go to LOC_ATTRIBUTES
+						s = value;
+					}
+					else
+					{
+						// store value and step over >
+						cursor->value = value;
+
+						PUGI__POPNODE();
+
+						PUGI__ENDSEG();
+
+						s += (*s == '>');
+					}
+				}
+				else PUGI__THROW_ERROR(status_bad_pi, s);
+			}
+			else
+			{
+				// scan for tag end
+				PUGI__SCANFOR(s[0] == '?' && PUGI__ENDSWITH(s[1], '>'));
+				PUGI__CHECK_ERROR(status_bad_pi, s);
+
+				s += (s[1] == '>' ? 2 : 1);
+			}
+
+			// store from registers
+			ref_cursor = cursor;
+
+			return s;
+		}
+
+		char_t* parse_tree(char_t* s, xml_node_struct* root, unsigned int optmsk, char_t endch)
+		{
+			strconv_attribute_t strconv_attribute = get_strconv_attribute(optmsk);
+			strconv_pcdata_t strconv_pcdata = get_strconv_pcdata(optmsk);
+
+			char_t ch = 0;
+			xml_node_struct* cursor = root;
+			char_t* mark = s;
+
+			while (*s != 0)
+			{
+				if (*s == '<')
+				{
+					++s;
+
+				LOC_TAG:
+					if (PUGI__IS_CHARTYPE(*s, ct_start_symbol)) // '<#...'
+					{
+						PUGI__PUSHNODE(node_element); // Append a new node to the tree.
+
+						cursor->name = s;
+
+						PUGI__SCANWHILE_UNROLL(PUGI__IS_CHARTYPE(ss, ct_symbol)); // Scan for a terminator.
+						PUGI__ENDSEG(); // Save char in 'ch', terminate & step over.
+
+						if (ch == '>')
+						{
+							// end of tag
+						}
+						else if (PUGI__IS_CHARTYPE(ch, ct_space))
+						{
+						LOC_ATTRIBUTES:
+							while (true)
+							{
+								PUGI__SKIPWS(); // Eat any whitespace.
+
+								if (PUGI__IS_CHARTYPE(*s, ct_start_symbol)) // <... #...
+								{
+									xml_attribute_struct* a = append_new_attribute(cursor, *alloc); // Make space for this attribute.
+									if (!a) PUGI__THROW_ERROR(status_out_of_memory, s);
+
+									a->name = s; // Save the offset.
+
+									PUGI__SCANWHILE_UNROLL(PUGI__IS_CHARTYPE(ss, ct_symbol)); // Scan for a terminator.
+									PUGI__ENDSEG(); // Save char in 'ch', terminate & step over.
+
+									if (PUGI__IS_CHARTYPE(ch, ct_space))
+									{
+										PUGI__SKIPWS(); // Eat any whitespace.
+
+										ch = *s;
+										++s;
+									}
+
+									if (ch == '=') // '<... #=...'
+									{
+										PUGI__SKIPWS(); // Eat any whitespace.
+
+										if (*s == '"' || *s == '\'') // '<... #="...'
+										{
+											ch = *s; // Save quote char to avoid breaking on "''" -or- '""'.
+											++s; // Step over the quote.
+											a->value = s; // Save the offset.
+
+											s = strconv_attribute(s, ch);
+
+											if (!s) PUGI__THROW_ERROR(status_bad_attribute, a->value);
+
+											// After this line the loop continues from the start;
+											// Whitespaces, / and > are ok, symbols and EOF are wrong,
+											// everything else will be detected
+											if (PUGI__IS_CHARTYPE(*s, ct_start_symbol)) PUGI__THROW_ERROR(status_bad_attribute, s);
+										}
+										else PUGI__THROW_ERROR(status_bad_attribute, s);
+									}
+									else PUGI__THROW_ERROR(status_bad_attribute, s);
+								}
+								else if (*s == '/')
+								{
+									++s;
+
+									if (*s == '>')
+									{
+										PUGI__POPNODE();
+										s++;
+										break;
+									}
+									else if (*s == 0 && endch == '>')
+									{
+										PUGI__POPNODE();
+										break;
+									}
+									else PUGI__THROW_ERROR(status_bad_start_element, s);
+								}
+								else if (*s == '>')
+								{
+									++s;
+
+									break;
+								}
+								else if (*s == 0 && endch == '>')
+								{
+									break;
+								}
+								else PUGI__THROW_ERROR(status_bad_start_element, s);
+							}
+
+							// !!!
+						}
+						else if (ch == '/') // '<#.../'
+						{
+							if (!PUGI__ENDSWITH(*s, '>')) PUGI__THROW_ERROR(status_bad_start_element, s);
+
+							PUGI__POPNODE(); // Pop.
+
+							s += (*s == '>');
+						}
+						else if (ch == 0)
+						{
+							// we stepped over null terminator, backtrack & handle closing tag
+							--s;
+
+							if (endch != '>') PUGI__THROW_ERROR(status_bad_start_element, s);
+						}
+						else PUGI__THROW_ERROR(status_bad_start_element, s);
+					}
+					else if (*s == '/')
+					{
+						++s;
+
+						mark = s;
+
+						char_t* name = cursor->name;
+						if (!name) PUGI__THROW_ERROR(status_end_element_mismatch, mark);
+
+						while (PUGI__IS_CHARTYPE(*s, ct_symbol))
+						{
+							if (*s++ != *name++) PUGI__THROW_ERROR(status_end_element_mismatch, mark);
+						}
+
+						if (*name)
+						{
+							if (*s == 0 && name[0] == endch && name[1] == 0) PUGI__THROW_ERROR(status_bad_end_element, s);
+							else PUGI__THROW_ERROR(status_end_element_mismatch, mark);
+						}
+
+						PUGI__POPNODE(); // Pop.
+
+						PUGI__SKIPWS();
+
+						if (*s == 0)
+						{
+							if (endch != '>') PUGI__THROW_ERROR(status_bad_end_element, s);
+						}
+						else
+						{
+							if (*s != '>') PUGI__THROW_ERROR(status_bad_end_element, s);
+							++s;
+						}
+					}
+					else if (*s == '?') // '<?...'
+					{
+						s = parse_question(s, cursor, optmsk, endch);
+						if (!s) return s;
+
+						assert(cursor);
+						if (PUGI__NODETYPE(cursor) == node_declaration) goto LOC_ATTRIBUTES;
+					}
+					else if (*s == '!') // '<!...'
+					{
+						s = parse_exclamation(s, cursor, optmsk, endch);
+						if (!s) return s;
+					}
+					else if (*s == 0 && endch == '?') PUGI__THROW_ERROR(status_bad_pi, s);
+					else PUGI__THROW_ERROR(status_unrecognized_tag, s);
+				}
+				else
+				{
+					mark = s; // Save this offset while searching for a terminator.
+
+					PUGI__SKIPWS(); // Eat whitespace if no genuine PCDATA here.
+
+					if (*s == '<' || !*s)
+					{
+						// We skipped some whitespace characters because otherwise we would take the tag branch instead of PCDATA one
+						assert(mark != s);
+
+						if (!PUGI__OPTSET(parse_ws_pcdata | parse_ws_pcdata_single) || PUGI__OPTSET(parse_trim_pcdata))
+						{
+							continue;
+						}
+						else if (PUGI__OPTSET(parse_ws_pcdata_single))
+						{
+							if (s[0] != '<' || s[1] != '/' || cursor->first_child) continue;
+						}
+					}
+
+					if (!PUGI__OPTSET(parse_trim_pcdata))
+						s = mark;
+
+					if (cursor->parent || PUGI__OPTSET(parse_fragment))
+					{
+						if (PUGI__OPTSET(parse_embed_pcdata) && cursor->parent && !cursor->first_child && !cursor->value)
+						{
+							cursor->value = s; // Save the offset.
+						}
+						else
+						{
+							PUGI__PUSHNODE(node_pcdata); // Append a new node on the tree.
+
+							cursor->value = s; // Save the offset.
+
+							PUGI__POPNODE(); // Pop since this is a standalone.
+						}
+
+						s = strconv_pcdata(s);
+
+						if (!*s) break;
+					}
+					else
+					{
+						PUGI__SCANFOR(*s == '<'); // '...<'
+						if (!*s) break;
+
+						++s;
+					}
+
+					// We're after '<'
+					goto LOC_TAG;
+				}
+			}
+
+			// check that last tag is closed
+			if (cursor != root) PUGI__THROW_ERROR(status_end_element_mismatch, s);
+
+			return s;
+		}
+
+	#ifdef PUGIXML_WCHAR_MODE
+		static char_t* parse_skip_bom(char_t* s)
+		{
+			unsigned int bom = 0xfeff;
+			return (s[0] == static_cast<wchar_t>(bom)) ? s + 1 : s;
+		}
+	#else
+		static char_t* parse_skip_bom(char_t* s)
+		{
+			return (s[0] == '\xef' && s[1] == '\xbb' && s[2] == '\xbf') ? s + 3 : s;
+		}
+	#endif
+
+		static bool has_element_node_siblings(xml_node_struct* node)
+		{
+			while (node)
+			{
+				if (PUGI__NODETYPE(node) == node_element) return true;
+
+				node = node->next_sibling;
+			}
+
+			return false;
+		}
+
+		static xml_parse_result parse(char_t* buffer, size_t length, xml_document_struct* xmldoc, xml_node_struct* root, unsigned int optmsk)
+		{
+			// early-out for empty documents
+			if (length == 0)
+				return make_parse_result(PUGI__OPTSET(parse_fragment) ? status_ok : status_no_document_element);
+
+			// get last child of the root before parsing
+			xml_node_struct* last_root_child = root->first_child ? root->first_child->prev_sibling_c + 0 : 0;
+
+			// create parser on stack
+			xml_parser parser(static_cast<xml_allocator*>(xmldoc));
+
+			// save last character and make buffer zero-terminated (speeds up parsing)
+			char_t endch = buffer[length - 1];
+			buffer[length - 1] = 0;
+
+			// skip BOM to make sure it does not end up as part of parse output
+			char_t* buffer_data = parse_skip_bom(buffer);
+
+			// perform actual parsing
+			parser.parse_tree(buffer_data, root, optmsk, endch);
+
+			xml_parse_result result = make_parse_result(parser.error_status, parser.error_offset ? parser.error_offset - buffer : 0);
+			assert(result.offset >= 0 && static_cast<size_t>(result.offset) <= length);
+
+			if (result)
+			{
+				// since we removed last character, we have to handle the only possible false positive (stray <)
+				if (endch == '<')
+					return make_parse_result(status_unrecognized_tag, length - 1);
+
+				// check if there are any element nodes parsed
+				xml_node_struct* first_root_child_parsed = last_root_child ? last_root_child->next_sibling + 0 : root->first_child+ 0;
+
+				if (!PUGI__OPTSET(parse_fragment) && !has_element_node_siblings(first_root_child_parsed))
+					return make_parse_result(status_no_document_element, length - 1);
+			}
+			else
+			{
+				// roll back offset if it occurs on a null terminator in the source buffer
+				if (result.offset > 0 && static_cast<size_t>(result.offset) == length - 1 && endch == 0)
+					result.offset--;
+			}
+
+			return result;
+		}
+	};
+
+	// Output facilities
+	PUGI__FN xml_encoding get_write_native_encoding()
+	{
+	#ifdef PUGIXML_WCHAR_MODE
+		return get_wchar_encoding();
+	#else
+		return encoding_utf8;
+	#endif
+	}
+
+	PUGI__FN xml_encoding get_write_encoding(xml_encoding encoding)
+	{
+		// replace wchar encoding with utf implementation
+		if (encoding == encoding_wchar) return get_wchar_encoding();
+
+		// replace utf16 encoding with utf16 with specific endianness
+		if (encoding == encoding_utf16) return is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
+
+		// replace utf32 encoding with utf32 with specific endianness
+		if (encoding == encoding_utf32) return is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
+
+		// only do autodetection if no explicit encoding is requested
+		if (encoding != encoding_auto) return encoding;
+
+		// assume utf8 encoding
+		return encoding_utf8;
+	}
+
+	template <typename D, typename T> PUGI__FN size_t convert_buffer_output_generic(typename T::value_type dest, const char_t* data, size_t length, D, T)
+	{
+		PUGI__STATIC_ASSERT(sizeof(char_t) == sizeof(typename D::type));
+
+		typename T::value_type end = D::process(reinterpret_cast<const typename D::type*>(data), length, dest, T());
+
+		return static_cast<size_t>(end - dest) * sizeof(*dest);
+	}
+
+	template <typename D, typename T> PUGI__FN size_t convert_buffer_output_generic(typename T::value_type dest, const char_t* data, size_t length, D, T, bool opt_swap)
+	{
+		PUGI__STATIC_ASSERT(sizeof(char_t) == sizeof(typename D::type));
+
+		typename T::value_type end = D::process(reinterpret_cast<const typename D::type*>(data), length, dest, T());
+
+		if (opt_swap)
+		{
+			for (typename T::value_type i = dest; i != end; ++i)
+				*i = endian_swap(*i);
+		}
+
+		return static_cast<size_t>(end - dest) * sizeof(*dest);
+	}
+
+#ifdef PUGIXML_WCHAR_MODE
+	PUGI__FN size_t get_valid_length(const char_t* data, size_t length)
+	{
+		if (length < 1) return 0;
+
+		// discard last character if it's the lead of a surrogate pair
+		return (sizeof(wchar_t) == 2 && static_cast<unsigned int>(static_cast<uint16_t>(data[length - 1]) - 0xD800) < 0x400) ? length - 1 : length;
+	}
+
+	PUGI__FN size_t convert_buffer_output(char_t* r_char, uint8_t* r_u8, uint16_t* r_u16, uint32_t* r_u32, const char_t* data, size_t length, xml_encoding encoding)
+	{
+		// only endian-swapping is required
+		if (need_endian_swap_utf(encoding, get_wchar_encoding()))
+		{
+			convert_wchar_endian_swap(r_char, data, length);
+
+			return length * sizeof(char_t);
+		}
+
+		// convert to utf8
+		if (encoding == encoding_utf8)
+			return convert_buffer_output_generic(r_u8, data, length, wchar_decoder(), utf8_writer());
+
+		// convert to utf16
+		if (encoding == encoding_utf16_be || encoding == encoding_utf16_le)
+		{
+			xml_encoding native_encoding = is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
+
+			return convert_buffer_output_generic(r_u16, data, length, wchar_decoder(), utf16_writer(), native_encoding != encoding);
+		}
+
+		// convert to utf32
+		if (encoding == encoding_utf32_be || encoding == encoding_utf32_le)
+		{
+			xml_encoding native_encoding = is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
+
+			return convert_buffer_output_generic(r_u32, data, length, wchar_decoder(), utf32_writer(), native_encoding != encoding);
+		}
+
+		// convert to latin1
+		if (encoding == encoding_latin1)
+			return convert_buffer_output_generic(r_u8, data, length, wchar_decoder(), latin1_writer());
+
+		assert(false && "Invalid encoding"); // unreachable
+		return 0;
+	}
+#else
+	PUGI__FN size_t get_valid_length(const char_t* data, size_t length)
+	{
+		if (length < 5) return 0;
+
+		for (size_t i = 1; i <= 4; ++i)
+		{
+			uint8_t ch = static_cast<uint8_t>(data[length - i]);
+
+			// either a standalone character or a leading one
+			if ((ch & 0xc0) != 0x80) return length - i;
+		}
+
+		// there are four non-leading characters at the end, sequence tail is broken so might as well process the whole chunk
+		return length;
+	}
+
+	PUGI__FN size_t convert_buffer_output(char_t* /* r_char */, uint8_t* r_u8, uint16_t* r_u16, uint32_t* r_u32, const char_t* data, size_t length, xml_encoding encoding)
+	{
+		if (encoding == encoding_utf16_be || encoding == encoding_utf16_le)
+		{
+			xml_encoding native_encoding = is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
+
+			return convert_buffer_output_generic(r_u16, data, length, utf8_decoder(), utf16_writer(), native_encoding != encoding);
+		}
+
+		if (encoding == encoding_utf32_be || encoding == encoding_utf32_le)
+		{
+			xml_encoding native_encoding = is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
+
+			return convert_buffer_output_generic(r_u32, data, length, utf8_decoder(), utf32_writer(), native_encoding != encoding);
+		}
+
+		if (encoding == encoding_latin1)
+			return convert_buffer_output_generic(r_u8, data, length, utf8_decoder(), latin1_writer());
+
+		assert(false && "Invalid encoding"); // unreachable
+		return 0;
+	}
+#endif
+
+	class xml_buffered_writer
+	{
+		xml_buffered_writer(const xml_buffered_writer&);
+		xml_buffered_writer& operator=(const xml_buffered_writer&);
+
+	public:
+		xml_buffered_writer(xml_writer& writer_, xml_encoding user_encoding): writer(writer_), bufsize(0), encoding(get_write_encoding(user_encoding))
+		{
+			PUGI__STATIC_ASSERT(bufcapacity >= 8);
+		}
+
+		size_t flush()
+		{
+			flush(buffer, bufsize);
+			bufsize = 0;
+			return 0;
+		}
+
+		void flush(const char_t* data, size_t size)
+		{
+			if (size == 0) return;
+
+			// fast path, just write data
+			if (encoding == get_write_native_encoding())
+				writer.write(data, size * sizeof(char_t));
+			else
+			{
+				// convert chunk
+				size_t result = convert_buffer_output(scratch.data_char, scratch.data_u8, scratch.data_u16, scratch.data_u32, data, size, encoding);
+				assert(result <= sizeof(scratch));
+
+				// write data
+				writer.write(scratch.data_u8, result);
+			}
+		}
+
+		void write_direct(const char_t* data, size_t length)
+		{
+			// flush the remaining buffer contents
+			flush();
+
+			// handle large chunks
+			if (length > bufcapacity)
+			{
+				if (encoding == get_write_native_encoding())
+				{
+					// fast path, can just write data chunk
+					writer.write(data, length * sizeof(char_t));
+					return;
+				}
+
+				// need to convert in suitable chunks
+				while (length > bufcapacity)
+				{
+					// get chunk size by selecting such number of characters that are guaranteed to fit into scratch buffer
+					// and form a complete codepoint sequence (i.e. discard start of last codepoint if necessary)
+					size_t chunk_size = get_valid_length(data, bufcapacity);
+					assert(chunk_size);
+
+					// convert chunk and write
+					flush(data, chunk_size);
+
+					// iterate
+					data += chunk_size;
+					length -= chunk_size;
+				}
+
+				// small tail is copied below
+				bufsize = 0;
+			}
+
+			memcpy(buffer + bufsize, data, length * sizeof(char_t));
+			bufsize += length;
+		}
+
+		void write_buffer(const char_t* data, size_t length)
+		{
+			size_t offset = bufsize;
+
+			if (offset + length <= bufcapacity)
+			{
+				memcpy(buffer + offset, data, length * sizeof(char_t));
+				bufsize = offset + length;
+			}
+			else
+			{
+				write_direct(data, length);
+			}
+		}
+
+		void write_string(const char_t* data)
+		{
+			// write the part of the string that fits in the buffer
+			size_t offset = bufsize;
+
+			while (*data && offset < bufcapacity)
+				buffer[offset++] = *data++;
+
+			// write the rest
+			if (offset < bufcapacity)
+			{
+				bufsize = offset;
+			}
+			else
+			{
+				// backtrack a bit if we have split the codepoint
+				size_t length = offset - bufsize;
+				size_t extra = length - get_valid_length(data - length, length);
+
+				bufsize = offset - extra;
+
+				write_direct(data - extra, strlength(data) + extra);
+			}
+		}
+
+		void write(char_t d0)
+		{
+			size_t offset = bufsize;
+			if (offset > bufcapacity - 1) offset = flush();
+
+			buffer[offset + 0] = d0;
+			bufsize = offset + 1;
+		}
+
+		void write(char_t d0, char_t d1)
+		{
+			size_t offset = bufsize;
+			if (offset > bufcapacity - 2) offset = flush();
+
+			buffer[offset + 0] = d0;
+			buffer[offset + 1] = d1;
+			bufsize = offset + 2;
+		}
+
+		void write(char_t d0, char_t d1, char_t d2)
+		{
+			size_t offset = bufsize;
+			if (offset > bufcapacity - 3) offset = flush();
+
+			buffer[offset + 0] = d0;
+			buffer[offset + 1] = d1;
+			buffer[offset + 2] = d2;
+			bufsize = offset + 3;
+		}
+
+		void write(char_t d0, char_t d1, char_t d2, char_t d3)
+		{
+			size_t offset = bufsize;
+			if (offset > bufcapacity - 4) offset = flush();
+
+			buffer[offset + 0] = d0;
+			buffer[offset + 1] = d1;
+			buffer[offset + 2] = d2;
+			buffer[offset + 3] = d3;
+			bufsize = offset + 4;
+		}
+
+		void write(char_t d0, char_t d1, char_t d2, char_t d3, char_t d4)
+		{
+			size_t offset = bufsize;
+			if (offset > bufcapacity - 5) offset = flush();
+
+			buffer[offset + 0] = d0;
+			buffer[offset + 1] = d1;
+			buffer[offset + 2] = d2;
+			buffer[offset + 3] = d3;
+			buffer[offset + 4] = d4;
+			bufsize = offset + 5;
+		}
+
+		void write(char_t d0, char_t d1, char_t d2, char_t d3, char_t d4, char_t d5)
+		{
+			size_t offset = bufsize;
+			if (offset > bufcapacity - 6) offset = flush();
+
+			buffer[offset + 0] = d0;
+			buffer[offset + 1] = d1;
+			buffer[offset + 2] = d2;
+			buffer[offset + 3] = d3;
+			buffer[offset + 4] = d4;
+			buffer[offset + 5] = d5;
+			bufsize = offset + 6;
+		}
+
+		// utf8 maximum expansion: x4 (-> utf32)
+		// utf16 maximum expansion: x2 (-> utf32)
+		// utf32 maximum expansion: x1
+		enum
+		{
+			bufcapacitybytes =
+			#ifdef PUGIXML_MEMORY_OUTPUT_STACK
+				PUGIXML_MEMORY_OUTPUT_STACK
+			#else
+				10240
+			#endif
+			,
+			bufcapacity = bufcapacitybytes / (sizeof(char_t) + 4)
+		};
+
+		char_t buffer[bufcapacity];
+
+		union
+		{
+			uint8_t data_u8[4 * bufcapacity];
+			uint16_t data_u16[2 * bufcapacity];
+			uint32_t data_u32[bufcapacity];
+			char_t data_char[bufcapacity];
+		} scratch;
+
+		xml_writer& writer;
+		size_t bufsize;
+		xml_encoding encoding;
+	};
+
+	PUGI__FN void text_output_escaped(xml_buffered_writer& writer, const char_t* s, chartypex_t type)
+	{
+		while (*s)
+		{
+			const char_t* prev = s;
+
+			// While *s is a usual symbol
+			PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPEX(ss, type));
+
+			writer.write_buffer(prev, static_cast<size_t>(s - prev));
+
+			switch (*s)
+			{
+				case 0: break;
+				case '&':
+					writer.write('&', 'a', 'm', 'p', ';');
+					++s;
+					break;
+				case '<':
+					writer.write('&', 'l', 't', ';');
+					++s;
+					break;
+				case '>':
+					writer.write('&', 'g', 't', ';');
+					++s;
+					break;
+				case '"':
+					writer.write('&', 'q', 'u', 'o', 't', ';');
+					++s;
+					break;
+				default: // s is not a usual symbol
+				{
+					unsigned int ch = static_cast<unsigned int>(*s++);
+					assert(ch < 32);
+
+					writer.write('&', '#', static_cast<char_t>((ch / 10) + '0'), static_cast<char_t>((ch % 10) + '0'), ';');
+				}
+			}
+		}
+	}
+
+	PUGI__FN void text_output(xml_buffered_writer& writer, const char_t* s, chartypex_t type, unsigned int flags)
+	{
+		if (flags & format_no_escapes)
+			writer.write_string(s);
+		else
+			text_output_escaped(writer, s, type);
+	}
+
+	PUGI__FN void text_output_cdata(xml_buffered_writer& writer, const char_t* s)
+	{
+		do
+		{
+			writer.write('<', '!', '[', 'C', 'D');
+			writer.write('A', 'T', 'A', '[');
+
+			const char_t* prev = s;
+
+			// look for ]]> sequence - we can't output it as is since it terminates CDATA
+			while (*s && !(s[0] == ']' && s[1] == ']' && s[2] == '>')) ++s;
+
+			// skip ]] if we stopped at ]]>, > will go to the next CDATA section
+			if (*s) s += 2;
+
+			writer.write_buffer(prev, static_cast<size_t>(s - prev));
+
+			writer.write(']', ']', '>');
+		}
+		while (*s);
+	}
+
+	PUGI__FN void text_output_indent(xml_buffered_writer& writer, const char_t* indent, size_t indent_length, unsigned int depth)
+	{
+		switch (indent_length)
+		{
+		case 1:
+		{
+			for (unsigned int i = 0; i < depth; ++i)
+				writer.write(indent[0]);
+			break;
+		}
+
+		case 2:
+		{
+			for (unsigned int i = 0; i < depth; ++i)
+				writer.write(indent[0], indent[1]);
+			break;
+		}
+
+		case 3:
+		{
+			for (unsigned int i = 0; i < depth; ++i)
+				writer.write(indent[0], indent[1], indent[2]);
+			break;
+		}
+
+		case 4:
+		{
+			for (unsigned int i = 0; i < depth; ++i)
+				writer.write(indent[0], indent[1], indent[2], indent[3]);
+			break;
+		}
+
+		default:
+		{
+			for (unsigned int i = 0; i < depth; ++i)
+				writer.write_buffer(indent, indent_length);
+		}
+		}
+	}
+
+	PUGI__FN void node_output_comment(xml_buffered_writer& writer, const char_t* s)
+	{
+		writer.write('<', '!', '-', '-');
+
+		while (*s)
+		{
+			const char_t* prev = s;
+
+			// look for -\0 or -- sequence - we can't output it since -- is illegal in comment body
+			while (*s && !(s[0] == '-' && (s[1] == '-' || s[1] == 0))) ++s;
+
+			writer.write_buffer(prev, static_cast<size_t>(s - prev));
+
+			if (*s)
+			{
+				assert(*s == '-');
+
+				writer.write('-', ' ');
+				++s;
+			}
+		}
+
+		writer.write('-', '-', '>');
+	}
+
+	PUGI__FN void node_output_pi_value(xml_buffered_writer& writer, const char_t* s)
+	{
+		while (*s)
+		{
+			const char_t* prev = s;
+
+			// look for ?> sequence - we can't output it since ?> terminates PI
+			while (*s && !(s[0] == '?' && s[1] == '>')) ++s;
+
+			writer.write_buffer(prev, static_cast<size_t>(s - prev));
+
+			if (*s)
+			{
+				assert(s[0] == '?' && s[1] == '>');
+
+				writer.write('?', ' ', '>');
+				s += 2;
+			}
+		}
+	}
+
+	PUGI__FN void node_output_attributes(xml_buffered_writer& writer, xml_node_struct* node, const char_t* indent, size_t indent_length, unsigned int flags, unsigned int depth)
+	{
+		const char_t* default_name = PUGIXML_TEXT(":anonymous");
+
+		for (xml_attribute_struct* a = node->first_attribute; a; a = a->next_attribute)
+		{
+			if ((flags & (format_indent_attributes | format_raw)) == format_indent_attributes)
+			{
+				writer.write('\n');
+
+				text_output_indent(writer, indent, indent_length, depth + 1);
+			}
+			else
+			{
+				writer.write(' ');
+			}
+
+			writer.write_string(a->name ? a->name + 0 : default_name);
+			writer.write('=', '"');
+
+			if (a->value)
+				text_output(writer, a->value, ctx_special_attr, flags);
+
+			writer.write('"');
+		}
+	}
+
+	PUGI__FN bool node_output_start(xml_buffered_writer& writer, xml_node_struct* node, const char_t* indent, size_t indent_length, unsigned int flags, unsigned int depth)
+	{
+		const char_t* default_name = PUGIXML_TEXT(":anonymous");
+		const char_t* name = node->name ? node->name + 0 : default_name;
+
+		writer.write('<');
+		writer.write_string(name);
+
+		if (node->first_attribute)
+			node_output_attributes(writer, node, indent, indent_length, flags, depth);
+
+		// element nodes can have value if parse_embed_pcdata was used
+		if (!node->value)
+		{
+			if (!node->first_child)
+			{
+				if (flags & format_no_empty_element_tags)
+				{
+					writer.write('>', '<', '/');
+					writer.write_string(name);
+					writer.write('>');
+
+					return false;
+				}
+				else
+				{
+					if ((flags & format_raw) == 0)
+						writer.write(' ');
+
+					writer.write('/', '>');
+
+					return false;
+				}
+			}
+			else
+			{
+				writer.write('>');
+
+				return true;
+			}
+		}
+		else
+		{
+			writer.write('>');
+
+			text_output(writer, node->value, ctx_special_pcdata, flags);
+
+			if (!node->first_child)
+			{
+				writer.write('<', '/');
+				writer.write_string(name);
+				writer.write('>');
+
+				return false;
+			}
+			else
+			{
+				return true;
+			}
+		}
+	}
+
+	PUGI__FN void node_output_end(xml_buffered_writer& writer, xml_node_struct* node)
+	{
+		const char_t* default_name = PUGIXML_TEXT(":anonymous");
+		const char_t* name = node->name ? node->name + 0 : default_name;
+
+		writer.write('<', '/');
+		writer.write_string(name);
+		writer.write('>');
+	}
+
+	PUGI__FN void node_output_simple(xml_buffered_writer& writer, xml_node_struct* node, unsigned int flags)
+	{
+		const char_t* default_name = PUGIXML_TEXT(":anonymous");
+
+		switch (PUGI__NODETYPE(node))
+		{
+			case node_pcdata:
+				text_output(writer, node->value ? node->value + 0 : PUGIXML_TEXT(""), ctx_special_pcdata, flags);
+				break;
+
+			case node_cdata:
+				text_output_cdata(writer, node->value ? node->value + 0 : PUGIXML_TEXT(""));
+				break;
+
+			case node_comment:
+				node_output_comment(writer, node->value ? node->value + 0 : PUGIXML_TEXT(""));
+				break;
+
+			case node_pi:
+				writer.write('<', '?');
+				writer.write_string(node->name ? node->name + 0 : default_name);
+
+				if (node->value)
+				{
+					writer.write(' ');
+					node_output_pi_value(writer, node->value);
+				}
+
+				writer.write('?', '>');
+				break;
+
+			case node_declaration:
+				writer.write('<', '?');
+				writer.write_string(node->name ? node->name + 0 : default_name);
+				node_output_attributes(writer, node, PUGIXML_TEXT(""), 0, flags | format_raw, 0);
+				writer.write('?', '>');
+				break;
+
+			case node_doctype:
+				writer.write('<', '!', 'D', 'O', 'C');
+				writer.write('T', 'Y', 'P', 'E');
+
+				if (node->value)
+				{
+					writer.write(' ');
+					writer.write_string(node->value);
+				}
+
+				writer.write('>');
+				break;
+
+			default:
+				assert(false && "Invalid node type"); // unreachable
+		}
+	}
+
+	enum indent_flags_t
+	{
+		indent_newline = 1,
+		indent_indent = 2
+	};
+
+	PUGI__FN void node_output(xml_buffered_writer& writer, xml_node_struct* root, const char_t* indent, unsigned int flags, unsigned int depth)
+	{
+		size_t indent_length = ((flags & (format_indent | format_indent_attributes)) && (flags & format_raw) == 0) ? strlength(indent) : 0;
+		unsigned int indent_flags = indent_indent;
+
+		xml_node_struct* node = root;
+
+		do
+		{
+			assert(node);
+
+			// begin writing current node
+			if (PUGI__NODETYPE(node) == node_pcdata || PUGI__NODETYPE(node) == node_cdata)
+			{
+				node_output_simple(writer, node, flags);
+
+				indent_flags = 0;
+			}
+			else
+			{
+				if ((indent_flags & indent_newline) && (flags & format_raw) == 0)
+					writer.write('\n');
+
+				if ((indent_flags & indent_indent) && indent_length)
+					text_output_indent(writer, indent, indent_length, depth);
+
+				if (PUGI__NODETYPE(node) == node_element)
+				{
+					indent_flags = indent_newline | indent_indent;
+
+					if (node_output_start(writer, node, indent, indent_length, flags, depth))
+					{
+						// element nodes can have value if parse_embed_pcdata was used
+						if (node->value)
+							indent_flags = 0;
+
+						node = node->first_child;
+						depth++;
+						continue;
+					}
+				}
+				else if (PUGI__NODETYPE(node) == node_document)
+				{
+					indent_flags = indent_indent;
+
+					if (node->first_child)
+					{
+						node = node->first_child;
+						continue;
+					}
+				}
+				else
+				{
+					node_output_simple(writer, node, flags);
+
+					indent_flags = indent_newline | indent_indent;
+				}
+			}
+
+			// continue to the next node
+			while (node != root)
+			{
+				if (node->next_sibling)
+				{
+					node = node->next_sibling;
+					break;
+				}
+
+				node = node->parent;
+
+				// write closing node
+				if (PUGI__NODETYPE(node) == node_element)
+				{
+					depth--;
+
+					if ((indent_flags & indent_newline) && (flags & format_raw) == 0)
+						writer.write('\n');
+
+					if ((indent_flags & indent_indent) && indent_length)
+						text_output_indent(writer, indent, indent_length, depth);
+
+					node_output_end(writer, node);
+
+					indent_flags = indent_newline | indent_indent;
+				}
+			}
+		}
+		while (node != root);
+
+		if ((indent_flags & indent_newline) && (flags & format_raw) == 0)
+			writer.write('\n');
+	}
+
+	PUGI__FN bool has_declaration(xml_node_struct* node)
+	{
+		for (xml_node_struct* child = node->first_child; child; child = child->next_sibling)
+		{
+			xml_node_type type = PUGI__NODETYPE(child);
+
+			if (type == node_declaration) return true;
+			if (type == node_element) return false;
+		}
+
+		return false;
+	}
+
+	PUGI__FN bool is_attribute_of(xml_attribute_struct* attr, xml_node_struct* node)
+	{
+		for (xml_attribute_struct* a = node->first_attribute; a; a = a->next_attribute)
+			if (a == attr)
+				return true;
+
+		return false;
+	}
+
+	PUGI__FN bool allow_insert_attribute(xml_node_type parent)
+	{
+		return parent == node_element || parent == node_declaration;
+	}
+
+	PUGI__FN bool allow_insert_child(xml_node_type parent, xml_node_type child)
+	{
+		if (parent != node_document && parent != node_element) return false;
+		if (child == node_document || child == node_null) return false;
+		if (parent != node_document && (child == node_declaration || child == node_doctype)) return false;
+
+		return true;
+	}
+
+	PUGI__FN bool allow_move(xml_node parent, xml_node child)
+	{
+		// check that child can be a child of parent
+		if (!allow_insert_child(parent.type(), child.type()))
+			return false;
+
+		// check that node is not moved between documents
+		if (parent.root() != child.root())
+			return false;
+
+		// check that new parent is not in the child subtree
+		xml_node cur = parent;
+
+		while (cur)
+		{
+			if (cur == child)
+				return false;
+
+			cur = cur.parent();
+		}
+
+		return true;
+	}
+
+	template <typename String, typename Header>
+	PUGI__FN void node_copy_string(String& dest, Header& header, uintptr_t header_mask, char_t* source, Header& source_header, xml_allocator* alloc)
+	{
+		assert(!dest && (header & header_mask) == 0);
+
+		if (source)
+		{
+			if (alloc && (source_header & header_mask) == 0)
+			{
+				dest = source;
+
+				// since strcpy_insitu can reuse document buffer memory we need to mark both source and dest as shared
+				header |= xml_memory_page_contents_shared_mask;
+				source_header |= xml_memory_page_contents_shared_mask;
+			}
+			else
+				strcpy_insitu(dest, header, header_mask, source, strlength(source));
+		}
+	}
+
+	PUGI__FN void node_copy_contents(xml_node_struct* dn, xml_node_struct* sn, xml_allocator* shared_alloc)
+	{
+		node_copy_string(dn->name, dn->header, xml_memory_page_name_allocated_mask, sn->name, sn->header, shared_alloc);
+		node_copy_string(dn->value, dn->header, xml_memory_page_value_allocated_mask, sn->value, sn->header, shared_alloc);
+
+		for (xml_attribute_struct* sa = sn->first_attribute; sa; sa = sa->next_attribute)
+		{
+			xml_attribute_struct* da = append_new_attribute(dn, get_allocator(dn));
+
+			if (da)
+			{
+				node_copy_string(da->name, da->header, xml_memory_page_name_allocated_mask, sa->name, sa->header, shared_alloc);
+				node_copy_string(da->value, da->header, xml_memory_page_value_allocated_mask, sa->value, sa->header, shared_alloc);
+			}
+		}
+	}
+
+	PUGI__FN void node_copy_tree(xml_node_struct* dn, xml_node_struct* sn)
+	{
+		xml_allocator& alloc = get_allocator(dn);
+		xml_allocator* shared_alloc = (&alloc == &get_allocator(sn)) ? &alloc : 0;
+
+		node_copy_contents(dn, sn, shared_alloc);
+
+		xml_node_struct* dit = dn;
+		xml_node_struct* sit = sn->first_child;
+
+		while (sit && sit != sn)
+		{
+			// when a tree is copied into one of the descendants, we need to skip that subtree to avoid an infinite loop
+			if (sit != dn)
+			{
+				xml_node_struct* copy = append_new_node(dit, alloc, PUGI__NODETYPE(sit));
+
+				if (copy)
+				{
+					node_copy_contents(copy, sit, shared_alloc);
+
+					if (sit->first_child)
+					{
+						dit = copy;
+						sit = sit->first_child;
+						continue;
+					}
+				}
+			}
+
+			// continue to the next node
+			do
+			{
+				if (sit->next_sibling)
+				{
+					sit = sit->next_sibling;
+					break;
+				}
+
+				sit = sit->parent;
+				dit = dit->parent;
+			}
+			while (sit != sn);
+		}
+	}
+
+	PUGI__FN void node_copy_attribute(xml_attribute_struct* da, xml_attribute_struct* sa)
+	{
+		xml_allocator& alloc = get_allocator(da);
+		xml_allocator* shared_alloc = (&alloc == &get_allocator(sa)) ? &alloc : 0;
+
+		node_copy_string(da->name, da->header, xml_memory_page_name_allocated_mask, sa->name, sa->header, shared_alloc);
+		node_copy_string(da->value, da->header, xml_memory_page_value_allocated_mask, sa->value, sa->header, shared_alloc);
+	}
+
+	inline bool is_text_node(xml_node_struct* node)
+	{
+		xml_node_type type = PUGI__NODETYPE(node);
+
+		return type == node_pcdata || type == node_cdata;
+	}
+
+	// get value with conversion functions
+	template <typename U> PUGI__FN PUGI__UNSIGNED_OVERFLOW U string_to_integer(const char_t* value, U minv, U maxv)
+	{
+		U result = 0;
+		const char_t* s = value;
+
+		while (PUGI__IS_CHARTYPE(*s, ct_space))
+			s++;
+
+		bool negative = (*s == '-');
+
+		s += (*s == '+' || *s == '-');
+
+		bool overflow = false;
+
+		if (s[0] == '0' && (s[1] | ' ') == 'x')
+		{
+			s += 2;
+
+			// since overflow detection relies on length of the sequence skip leading zeros
+			while (*s == '0')
+				s++;
+
+			const char_t* start = s;
+
+			for (;;)
+			{
+				if (static_cast<unsigned>(*s - '0') < 10)
+					result = result * 16 + (*s - '0');
+				else if (static_cast<unsigned>((*s | ' ') - 'a') < 6)
+					result = result * 16 + ((*s | ' ') - 'a' + 10);
+				else
+					break;
+
+				s++;
+			}
+
+			size_t digits = static_cast<size_t>(s - start);
+
+			overflow = digits > sizeof(U) * 2;
+		}
+		else
+		{
+			// since overflow detection relies on length of the sequence skip leading zeros
+			while (*s == '0')
+				s++;
+
+			const char_t* start = s;
+
+			for (;;)
+			{
+				if (static_cast<unsigned>(*s - '0') < 10)
+					result = result * 10 + (*s - '0');
+				else
+					break;
+
+				s++;
+			}
+
+			size_t digits = static_cast<size_t>(s - start);
+
+			PUGI__STATIC_ASSERT(sizeof(U) == 8 || sizeof(U) == 4 || sizeof(U) == 2);
+
+			const size_t max_digits10 = sizeof(U) == 8 ? 20 : sizeof(U) == 4 ? 10 : 5;
+			const char_t max_lead = sizeof(U) == 8 ? '1' : sizeof(U) == 4 ? '4' : '6';
+			const size_t high_bit = sizeof(U) * 8 - 1;
+
+			overflow = digits >= max_digits10 && !(digits == max_digits10 && (*start < max_lead || (*start == max_lead && result >> high_bit)));
+		}
+
+		if (negative)
+		{
+			// Workaround for crayc++ CC-3059: Expected no overflow in routine.
+		#ifdef _CRAYC
+			return (overflow || result > ~minv + 1) ? minv : ~result + 1;
+		#else
+			return (overflow || result > 0 - minv) ? minv : 0 - result;
+		#endif
+		}
+		else
+			return (overflow || result > maxv) ? maxv : result;
+	}
+
+	PUGI__FN int get_value_int(const char_t* value)
+	{
+		return string_to_integer<unsigned int>(value, static_cast<unsigned int>(INT_MIN), INT_MAX);
+	}
+
+	PUGI__FN unsigned int get_value_uint(const char_t* value)
+	{
+		return string_to_integer<unsigned int>(value, 0, UINT_MAX);
+	}
+
+	PUGI__FN double get_value_double(const char_t* value)
+	{
+	#ifdef PUGIXML_WCHAR_MODE
+		return wcstod(value, 0);
+	#else
+		return strtod(value, 0);
+	#endif
+	}
+
+	PUGI__FN float get_value_float(const char_t* value)
+	{
+	#ifdef PUGIXML_WCHAR_MODE
+		return static_cast<float>(wcstod(value, 0));
+	#else
+		return static_cast<float>(strtod(value, 0));
+	#endif
+	}
+
+	PUGI__FN bool get_value_bool(const char_t* value)
+	{
+		// only look at first char
+		char_t first = *value;
+
+		// 1*, t* (true), T* (True), y* (yes), Y* (YES)
+		return (first == '1' || first == 't' || first == 'T' || first == 'y' || first == 'Y');
+	}
+
+#ifdef PUGIXML_HAS_LONG_LONG
+	PUGI__FN long long get_value_llong(const char_t* value)
+	{
+		return string_to_integer<unsigned long long>(value, static_cast<unsigned long long>(LLONG_MIN), LLONG_MAX);
+	}
+
+	PUGI__FN unsigned long long get_value_ullong(const char_t* value)
+	{
+		return string_to_integer<unsigned long long>(value, 0, ULLONG_MAX);
+	}
+#endif
+
+	template <typename U> PUGI__FN PUGI__UNSIGNED_OVERFLOW char_t* integer_to_string(char_t* begin, char_t* end, U value, bool negative)
+	{
+		char_t* result = end - 1;
+		U rest = negative ? 0 - value : value;
+
+		do
+		{
+			*result-- = static_cast<char_t>('0' + (rest % 10));
+			rest /= 10;
+		}
+		while (rest);
+
+		assert(result >= begin);
+		(void)begin;
+
+		*result = '-';
+
+		return result + !negative;
+	}
+
+	// set value with conversion functions
+	template <typename String, typename Header>
+	PUGI__FN bool set_value_ascii(String& dest, Header& header, uintptr_t header_mask, char* buf)
+	{
+	#ifdef PUGIXML_WCHAR_MODE
+		char_t wbuf[128];
+		assert(strlen(buf) < sizeof(wbuf) / sizeof(wbuf[0]));
+
+		size_t offset = 0;
+		for (; buf[offset]; ++offset) wbuf[offset] = buf[offset];
+
+		return strcpy_insitu(dest, header, header_mask, wbuf, offset);
+	#else
+		return strcpy_insitu(dest, header, header_mask, buf, strlen(buf));
+	#endif
+	}
+
+	template <typename U, typename String, typename Header>
+	PUGI__FN bool set_value_integer(String& dest, Header& header, uintptr_t header_mask, U value, bool negative)
+	{
+		char_t buf[64];
+		char_t* end = buf + sizeof(buf) / sizeof(buf[0]);
+		char_t* begin = integer_to_string(buf, end, value, negative);
+
+		return strcpy_insitu(dest, header, header_mask, begin, end - begin);
+	}
+
+	template <typename String, typename Header>
+	PUGI__FN bool set_value_convert(String& dest, Header& header, uintptr_t header_mask, float value)
+	{
+		char buf[128];
+		PUGI__SNPRINTF(buf, "%.9g", value);
+
+		return set_value_ascii(dest, header, header_mask, buf);
+	}
+
+	template <typename String, typename Header>
+	PUGI__FN bool set_value_convert(String& dest, Header& header, uintptr_t header_mask, double value)
+	{
+		char buf[128];
+		PUGI__SNPRINTF(buf, "%.17g", value);
+
+		return set_value_ascii(dest, header, header_mask, buf);
+	}
+
+	template <typename String, typename Header>
+	PUGI__FN bool set_value_bool(String& dest, Header& header, uintptr_t header_mask, bool value)
+	{
+		return strcpy_insitu(dest, header, header_mask, value ? PUGIXML_TEXT("true") : PUGIXML_TEXT("false"), value ? 4 : 5);
+	}
+
+	PUGI__FN xml_parse_result load_buffer_impl(xml_document_struct* doc, xml_node_struct* root, void* contents, size_t size, unsigned int options, xml_encoding encoding, bool is_mutable, bool own, char_t** out_buffer)
+	{
+		// check input buffer
+		if (!contents && size) return make_parse_result(status_io_error);
+
+		// get actual encoding
+		xml_encoding buffer_encoding = impl::get_buffer_encoding(encoding, contents, size);
+
+		// get private buffer
+		char_t* buffer = 0;
+		size_t length = 0;
+
+		if (!impl::convert_buffer(buffer, length, buffer_encoding, contents, size, is_mutable)) return impl::make_parse_result(status_out_of_memory);
+
+		// delete original buffer if we performed a conversion
+		if (own && buffer != contents && contents) impl::xml_memory::deallocate(contents);
+
+		// grab onto buffer if it's our buffer, user is responsible for deallocating contents himself
+		if (own || buffer != contents) *out_buffer = buffer;
+
+		// store buffer for offset_debug
+		doc->buffer = buffer;
+
+		// parse
+		xml_parse_result res = impl::xml_parser::parse(buffer, length, doc, root, options);
+
+		// remember encoding
+		res.encoding = buffer_encoding;
+
+		return res;
+	}
+
+	// we need to get length of entire file to load it in memory; the only (relatively) sane way to do it is via seek/tell trick
+	PUGI__FN xml_parse_status get_file_size(FILE* file, size_t& out_result)
+	{
+	#if defined(PUGI__MSVC_CRT_VERSION) && PUGI__MSVC_CRT_VERSION >= 1400 && !defined(_WIN32_WCE)
+		// there are 64-bit versions of fseek/ftell, let's use them
+		typedef __int64 length_type;
+
+		_fseeki64(file, 0, SEEK_END);
+		length_type length = _ftelli64(file);
+		_fseeki64(file, 0, SEEK_SET);
+	#elif defined(__MINGW32__) && !defined(__NO_MINGW_LFS) && (!defined(__STRICT_ANSI__) || defined(__MINGW64_VERSION_MAJOR))
+		// there are 64-bit versions of fseek/ftell, let's use them
+		typedef off64_t length_type;
+
+		fseeko64(file, 0, SEEK_END);
+		length_type length = ftello64(file);
+		fseeko64(file, 0, SEEK_SET);
+	#else
+		// if this is a 32-bit OS, long is enough; if this is a unix system, long is 64-bit, which is enough; otherwise we can't do anything anyway.
+		typedef long length_type;
+
+		fseek(file, 0, SEEK_END);
+		length_type length = ftell(file);
+		fseek(file, 0, SEEK_SET);
+	#endif
+
+		// check for I/O errors
+		if (length < 0) return status_io_error;
+
+		// check for overflow
+		size_t result = static_cast<size_t>(length);
+
+		if (static_cast<length_type>(result) != length) return status_out_of_memory;
+
+		// finalize
+		out_result = result;
+
+		return status_ok;
+	}
+
+	// This function assumes that buffer has extra sizeof(char_t) writable bytes after size
+	PUGI__FN size_t zero_terminate_buffer(void* buffer, size_t size, xml_encoding encoding)
+	{
+		// We only need to zero-terminate if encoding conversion does not do it for us
+	#ifdef PUGIXML_WCHAR_MODE
+		xml_encoding wchar_encoding = get_wchar_encoding();
+
+		if (encoding == wchar_encoding || need_endian_swap_utf(encoding, wchar_encoding))
+		{
+			size_t length = size / sizeof(char_t);
+
+			static_cast<char_t*>(buffer)[length] = 0;
+			return (length + 1) * sizeof(char_t);
+		}
+	#else
+		if (encoding == encoding_utf8)
+		{
+			static_cast<char*>(buffer)[size] = 0;
+			return size + 1;
+		}
+	#endif
+
+		return size;
+	}
+
+	PUGI__FN xml_parse_result load_file_impl(xml_document_struct* doc, FILE* file, unsigned int options, xml_encoding encoding, char_t** out_buffer)
+	{
+		if (!file) return make_parse_result(status_file_not_found);
+
+		// get file size (can result in I/O errors)
+		size_t size = 0;
+		xml_parse_status size_status = get_file_size(file, size);
+		if (size_status != status_ok) return make_parse_result(size_status);
+
+		size_t max_suffix_size = sizeof(char_t);
+
+		// allocate buffer for the whole file
+		char* contents = static_cast<char*>(xml_memory::allocate(size + max_suffix_size));
+		if (!contents) return make_parse_result(status_out_of_memory);
+
+		// read file in memory
+		size_t read_size = fread(contents, 1, size, file);
+
+		if (read_size != size)
+		{
+			xml_memory::deallocate(contents);
+			return make_parse_result(status_io_error);
+		}
+
+		xml_encoding real_encoding = get_buffer_encoding(encoding, contents, size);
+
+		return load_buffer_impl(doc, doc, contents, zero_terminate_buffer(contents, size, real_encoding), options, real_encoding, true, true, out_buffer);
+	}
+
+	PUGI__FN void close_file(FILE* file)
+	{
+		fclose(file);
+	}
+
+#ifndef PUGIXML_NO_STL
+	template <typename T> struct xml_stream_chunk
+	{
+		static xml_stream_chunk* create()
+		{
+			void* memory = xml_memory::allocate(sizeof(xml_stream_chunk));
+			if (!memory) return 0;
+
+			return new (memory) xml_stream_chunk();
+		}
+
+		static void destroy(xml_stream_chunk* chunk)
+		{
+			// free chunk chain
+			while (chunk)
+			{
+				xml_stream_chunk* next_ = chunk->next;
+
+				xml_memory::deallocate(chunk);
+
+				chunk = next_;
+			}
+		}
+
+		xml_stream_chunk(): next(0), size(0)
+		{
+		}
+
+		xml_stream_chunk* next;
+		size_t size;
+
+		T data[xml_memory_page_size / sizeof(T)];
+	};
+
+	template <typename T> PUGI__FN xml_parse_status load_stream_data_noseek(std::basic_istream<T>& stream, void** out_buffer, size_t* out_size)
+	{
+		auto_deleter<xml_stream_chunk<T> > chunks(0, xml_stream_chunk<T>::destroy);
+
+		// read file to a chunk list
+		size_t total = 0;
+		xml_stream_chunk<T>* last = 0;
+
+		while (!stream.eof())
+		{
+			// allocate new chunk
+			xml_stream_chunk<T>* chunk = xml_stream_chunk<T>::create();
+			if (!chunk) return status_out_of_memory;
+
+			// append chunk to list
+			if (last) last = last->next = chunk;
+			else chunks.data = last = chunk;
+
+			// read data to chunk
+			stream.read(chunk->data, static_cast<std::streamsize>(sizeof(chunk->data) / sizeof(T)));
+			chunk->size = static_cast<size_t>(stream.gcount()) * sizeof(T);
+
+			// read may set failbit | eofbit in case gcount() is less than read length, so check for other I/O errors
+			if (stream.bad() || (!stream.eof() && stream.fail())) return status_io_error;
+
+			// guard against huge files (chunk size is small enough to make this overflow check work)
+			if (total + chunk->size < total) return status_out_of_memory;
+			total += chunk->size;
+		}
+
+		size_t max_suffix_size = sizeof(char_t);
+
+		// copy chunk list to a contiguous buffer
+		char* buffer = static_cast<char*>(xml_memory::allocate(total + max_suffix_size));
+		if (!buffer) return status_out_of_memory;
+
+		char* write = buffer;
+
+		for (xml_stream_chunk<T>* chunk = chunks.data; chunk; chunk = chunk->next)
+		{
+			assert(write + chunk->size <= buffer + total);
+			memcpy(write, chunk->data, chunk->size);
+			write += chunk->size;
+		}
+
+		assert(write == buffer + total);
+
+		// return buffer
+		*out_buffer = buffer;
+		*out_size = total;
+
+		return status_ok;
+	}
+
+	template <typename T> PUGI__FN xml_parse_status load_stream_data_seek(std::basic_istream<T>& stream, void** out_buffer, size_t* out_size)
+	{
+		// get length of remaining data in stream
+		typename std::basic_istream<T>::pos_type pos = stream.tellg();
+		stream.seekg(0, std::ios::end);
+		std::streamoff length = stream.tellg() - pos;
+		stream.seekg(pos);
+
+		if (stream.fail() || pos < 0) return status_io_error;
+
+		// guard against huge files
+		size_t read_length = static_cast<size_t>(length);
+
+		if (static_cast<std::streamsize>(read_length) != length || length < 0) return status_out_of_memory;
+
+		size_t max_suffix_size = sizeof(char_t);
+
+		// read stream data into memory (guard against stream exceptions with buffer holder)
+		auto_deleter<void> buffer(xml_memory::allocate(read_length * sizeof(T) + max_suffix_size), xml_memory::deallocate);
+		if (!buffer.data) return status_out_of_memory;
+
+		stream.read(static_cast<T*>(buffer.data), static_cast<std::streamsize>(read_length));
+
+		// read may set failbit | eofbit in case gcount() is less than read_length (i.e. line ending conversion), so check for other I/O errors
+		if (stream.bad() || (!stream.eof() && stream.fail())) return status_io_error;
+
+		// return buffer
+		size_t actual_length = static_cast<size_t>(stream.gcount());
+		assert(actual_length <= read_length);
+
+		*out_buffer = buffer.release();
+		*out_size = actual_length * sizeof(T);
+
+		return status_ok;
+	}
+
+	template <typename T> PUGI__FN xml_parse_result load_stream_impl(xml_document_struct* doc, std::basic_istream<T>& stream, unsigned int options, xml_encoding encoding, char_t** out_buffer)
+	{
+		void* buffer = 0;
+		size_t size = 0;
+		xml_parse_status status = status_ok;
+
+		// if stream has an error bit set, bail out (otherwise tellg() can fail and we'll clear error bits)
+		if (stream.fail()) return make_parse_result(status_io_error);
+
+		// load stream to memory (using seek-based implementation if possible, since it's faster and takes less memory)
+		if (stream.tellg() < 0)
+		{
+			stream.clear(); // clear error flags that could be set by a failing tellg
+			status = load_stream_data_noseek(stream, &buffer, &size);
+		}
+		else
+			status = load_stream_data_seek(stream, &buffer, &size);
+
+		if (status != status_ok) return make_parse_result(status);
+
+		xml_encoding real_encoding = get_buffer_encoding(encoding, buffer, size);
+
+		return load_buffer_impl(doc, doc, buffer, zero_terminate_buffer(buffer, size, real_encoding), options, real_encoding, true, true, out_buffer);
+	}
+#endif
+
+#if defined(PUGI__MSVC_CRT_VERSION) || defined(__BORLANDC__) || (defined(__MINGW32__) && (!defined(__STRICT_ANSI__) || defined(__MINGW64_VERSION_MAJOR)))
+	PUGI__FN FILE* open_file_wide(const wchar_t* path, const wchar_t* mode)
+	{
+		return _wfopen(path, mode);
+	}
+#else
+	PUGI__FN char* convert_path_heap(const wchar_t* str)
+	{
+		assert(str);
+
+		// first pass: get length in utf8 characters
+		size_t length = strlength_wide(str);
+		size_t size = as_utf8_begin(str, length);
+
+		// allocate resulting string
+		char* result = static_cast<char*>(xml_memory::allocate(size + 1));
+		if (!result) return 0;
+
+		// second pass: convert to utf8
+		as_utf8_end(result, size, str, length);
+
+		// zero-terminate
+		result[size] = 0;
+
+		return result;
+	}
+
+	PUGI__FN FILE* open_file_wide(const wchar_t* path, const wchar_t* mode)
+	{
+		// there is no standard function to open wide paths, so our best bet is to try utf8 path
+		char* path_utf8 = convert_path_heap(path);
+		if (!path_utf8) return 0;
+
+		// convert mode to ASCII (we mirror _wfopen interface)
+		char mode_ascii[4] = {0};
+		for (size_t i = 0; mode[i]; ++i) mode_ascii[i] = static_cast<char>(mode[i]);
+
+		// try to open the utf8 path
+		FILE* result = fopen(path_utf8, mode_ascii);
+
+		// free dummy buffer
+		xml_memory::deallocate(path_utf8);
+
+		return result;
+	}
+#endif
+
+	PUGI__FN bool save_file_impl(const xml_document& doc, FILE* file, const char_t* indent, unsigned int flags, xml_encoding encoding)
+	{
+		if (!file) return false;
+
+		xml_writer_file writer(file);
+		doc.save(writer, indent, flags, encoding);
+
+		return ferror(file) == 0;
+	}
+
+	struct name_null_sentry
+	{
+		xml_node_struct* node;
+		char_t* name;
+
+		name_null_sentry(xml_node_struct* node_): node(node_), name(node_->name)
+		{
+			node->name = 0;
+		}
+
+		~name_null_sentry()
+		{
+			node->name = name;
+		}
+	};
+PUGI__NS_END
+
+namespace pugi
+{
+	PUGI__FN xml_writer_file::xml_writer_file(void* file_): file(file_)
+	{
+	}
+
+	PUGI__FN void xml_writer_file::write(const void* data, size_t size)
+	{
+		size_t result = fwrite(data, 1, size, static_cast<FILE*>(file));
+		(void)!result; // unfortunately we can't do proper error handling here
+	}
+
+#ifndef PUGIXML_NO_STL
+	PUGI__FN xml_writer_stream::xml_writer_stream(std::basic_ostream<char, std::char_traits<char> >& stream): narrow_stream(&stream), wide_stream(0)
+	{
+	}
+
+	PUGI__FN xml_writer_stream::xml_writer_stream(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& stream): narrow_stream(0), wide_stream(&stream)
+	{
+	}
+
+	PUGI__FN void xml_writer_stream::write(const void* data, size_t size)
+	{
+		if (narrow_stream)
+		{
+			assert(!wide_stream);
+			narrow_stream->write(reinterpret_cast<const char*>(data), static_cast<std::streamsize>(size));
+		}
+		else
+		{
+			assert(wide_stream);
+			assert(size % sizeof(wchar_t) == 0);
+
+			wide_stream->write(reinterpret_cast<const wchar_t*>(data), static_cast<std::streamsize>(size / sizeof(wchar_t)));
+		}
+	}
+#endif
+
+	PUGI__FN xml_tree_walker::xml_tree_walker(): _depth(0)
+	{
+	}
+
+	PUGI__FN xml_tree_walker::~xml_tree_walker()
+	{
+	}
+
+	PUGI__FN int xml_tree_walker::depth() const
+	{
+		return _depth;
+	}
+
+	PUGI__FN bool xml_tree_walker::begin(xml_node&)
+	{
+		return true;
+	}
+
+	PUGI__FN bool xml_tree_walker::end(xml_node&)
+	{
+		return true;
+	}
+
+	PUGI__FN xml_attribute::xml_attribute(): _attr(0)
+	{
+	}
+
+	PUGI__FN xml_attribute::xml_attribute(xml_attribute_struct* attr): _attr(attr)
+	{
+	}
+
+	PUGI__FN static void unspecified_bool_xml_attribute(xml_attribute***)
+	{
+	}
+
+	PUGI__FN xml_attribute::operator xml_attribute::unspecified_bool_type() const
+	{
+		return _attr ? unspecified_bool_xml_attribute : 0;
+	}
+
+	PUGI__FN bool xml_attribute::operator!() const
+	{
+		return !_attr;
+	}
+
+	PUGI__FN bool xml_attribute::operator==(const xml_attribute& r) const
+	{
+		return (_attr == r._attr);
+	}
+
+	PUGI__FN bool xml_attribute::operator!=(const xml_attribute& r) const
+	{
+		return (_attr != r._attr);
+	}
+
+	PUGI__FN bool xml_attribute::operator<(const xml_attribute& r) const
+	{
+		return (_attr < r._attr);
+	}
+
+	PUGI__FN bool xml_attribute::operator>(const xml_attribute& r) const
+	{
+		return (_attr > r._attr);
+	}
+
+	PUGI__FN bool xml_attribute::operator<=(const xml_attribute& r) const
+	{
+		return (_attr <= r._attr);
+	}
+
+	PUGI__FN bool xml_attribute::operator>=(const xml_attribute& r) const
+	{
+		return (_attr >= r._attr);
+	}
+
+	PUGI__FN xml_attribute xml_attribute::next_attribute() const
+	{
+		return _attr ? xml_attribute(_attr->next_attribute) : xml_attribute();
+	}
+
+	PUGI__FN xml_attribute xml_attribute::previous_attribute() const
+	{
+		return _attr && _attr->prev_attribute_c->next_attribute ? xml_attribute(_attr->prev_attribute_c) : xml_attribute();
+	}
+
+	PUGI__FN const char_t* xml_attribute::as_string(const char_t* def) const
+	{
+		return (_attr && _attr->value) ? _attr->value + 0 : def;
+	}
+
+	PUGI__FN int xml_attribute::as_int(int def) const
+	{
+		return (_attr && _attr->value) ? impl::get_value_int(_attr->value) : def;
+	}
+
+	PUGI__FN unsigned int xml_attribute::as_uint(unsigned int def) const
+	{
+		return (_attr && _attr->value) ? impl::get_value_uint(_attr->value) : def;
+	}
+
+	PUGI__FN double xml_attribute::as_double(double def) const
+	{
+		return (_attr && _attr->value) ? impl::get_value_double(_attr->value) : def;
+	}
+
+	PUGI__FN float xml_attribute::as_float(float def) const
+	{
+		return (_attr && _attr->value) ? impl::get_value_float(_attr->value) : def;
+	}
+
+	PUGI__FN bool xml_attribute::as_bool(bool def) const
+	{
+		return (_attr && _attr->value) ? impl::get_value_bool(_attr->value) : def;
+	}
+
+#ifdef PUGIXML_HAS_LONG_LONG
+	PUGI__FN long long xml_attribute::as_llong(long long def) const
+	{
+		return (_attr && _attr->value) ? impl::get_value_llong(_attr->value) : def;
+	}
+
+	PUGI__FN unsigned long long xml_attribute::as_ullong(unsigned long long def) const
+	{
+		return (_attr && _attr->value) ? impl::get_value_ullong(_attr->value) : def;
+	}
+#endif
+
+	PUGI__FN bool xml_attribute::empty() const
+	{
+		return !_attr;
+	}
+
+	PUGI__FN const char_t* xml_attribute::name() const
+	{
+		return (_attr && _attr->name) ? _attr->name + 0 : PUGIXML_TEXT("");
+	}
+
+	PUGI__FN const char_t* xml_attribute::value() const
+	{
+		return (_attr && _attr->value) ? _attr->value + 0 : PUGIXML_TEXT("");
+	}
+
+	PUGI__FN size_t xml_attribute::hash_value() const
+	{
+		return static_cast<size_t>(reinterpret_cast<uintptr_t>(_attr) / sizeof(xml_attribute_struct));
+	}
+
+	PUGI__FN xml_attribute_struct* xml_attribute::internal_object() const
+	{
+		return _attr;
+	}
+
+	PUGI__FN xml_attribute& xml_attribute::operator=(const char_t* rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_attribute& xml_attribute::operator=(int rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_attribute& xml_attribute::operator=(unsigned int rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_attribute& xml_attribute::operator=(long rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_attribute& xml_attribute::operator=(unsigned long rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_attribute& xml_attribute::operator=(double rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_attribute& xml_attribute::operator=(float rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_attribute& xml_attribute::operator=(bool rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+
+#ifdef PUGIXML_HAS_LONG_LONG
+	PUGI__FN xml_attribute& xml_attribute::operator=(long long rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_attribute& xml_attribute::operator=(unsigned long long rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+#endif
+
+	PUGI__FN bool xml_attribute::set_name(const char_t* rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::strcpy_insitu(_attr->name, _attr->header, impl::xml_memory_page_name_allocated_mask, rhs, impl::strlength(rhs));
+	}
+
+	PUGI__FN bool xml_attribute::set_value(const char_t* rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::strcpy_insitu(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, impl::strlength(rhs));
+	}
+
+	PUGI__FN bool xml_attribute::set_value(int rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::set_value_integer<unsigned int>(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0);
+	}
+
+	PUGI__FN bool xml_attribute::set_value(unsigned int rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::set_value_integer<unsigned int>(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, false);
+	}
+
+	PUGI__FN bool xml_attribute::set_value(long rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::set_value_integer<unsigned long>(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0);
+	}
+
+	PUGI__FN bool xml_attribute::set_value(unsigned long rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::set_value_integer<unsigned long>(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, false);
+	}
+
+	PUGI__FN bool xml_attribute::set_value(double rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::set_value_convert(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs);
+	}
+
+	PUGI__FN bool xml_attribute::set_value(float rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::set_value_convert(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs);
+	}
+
+	PUGI__FN bool xml_attribute::set_value(bool rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::set_value_bool(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs);
+	}
+
+#ifdef PUGIXML_HAS_LONG_LONG
+	PUGI__FN bool xml_attribute::set_value(long long rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::set_value_integer<unsigned long long>(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0);
+	}
+
+	PUGI__FN bool xml_attribute::set_value(unsigned long long rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::set_value_integer<unsigned long long>(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, false);
+	}
+#endif
+
+#ifdef __BORLANDC__
+	PUGI__FN bool operator&&(const xml_attribute& lhs, bool rhs)
+	{
+		return (bool)lhs && rhs;
+	}
+
+	PUGI__FN bool operator||(const xml_attribute& lhs, bool rhs)
+	{
+		return (bool)lhs || rhs;
+	}
+#endif
+
+	PUGI__FN xml_node::xml_node(): _root(0)
+	{
+	}
+
+	PUGI__FN xml_node::xml_node(xml_node_struct* p): _root(p)
+	{
+	}
+
+	PUGI__FN static void unspecified_bool_xml_node(xml_node***)
+	{
+	}
+
+	PUGI__FN xml_node::operator xml_node::unspecified_bool_type() const
+	{
+		return _root ? unspecified_bool_xml_node : 0;
+	}
+
+	PUGI__FN bool xml_node::operator!() const
+	{
+		return !_root;
+	}
+
+	PUGI__FN xml_node::iterator xml_node::begin() const
+	{
+		return iterator(_root ? _root->first_child + 0 : 0, _root);
+	}
+
+	PUGI__FN xml_node::iterator xml_node::end() const
+	{
+		return iterator(0, _root);
+	}
+
+	PUGI__FN xml_node::attribute_iterator xml_node::attributes_begin() const
+	{
+		return attribute_iterator(_root ? _root->first_attribute + 0 : 0, _root);
+	}
+
+	PUGI__FN xml_node::attribute_iterator xml_node::attributes_end() const
+	{
+		return attribute_iterator(0, _root);
+	}
+
+	PUGI__FN xml_object_range<xml_node_iterator> xml_node::children() const
+	{
+		return xml_object_range<xml_node_iterator>(begin(), end());
+	}
+
+	PUGI__FN xml_object_range<xml_named_node_iterator> xml_node::children(const char_t* name_) const
+	{
+		return xml_object_range<xml_named_node_iterator>(xml_named_node_iterator(child(name_)._root, _root, name_), xml_named_node_iterator(0, _root, name_));
+	}
+
+	PUGI__FN xml_object_range<xml_attribute_iterator> xml_node::attributes() const
+	{
+		return xml_object_range<xml_attribute_iterator>(attributes_begin(), attributes_end());
+	}
+
+	PUGI__FN bool xml_node::operator==(const xml_node& r) const
+	{
+		return (_root == r._root);
+	}
+
+	PUGI__FN bool xml_node::operator!=(const xml_node& r) const
+	{
+		return (_root != r._root);
+	}
+
+	PUGI__FN bool xml_node::operator<(const xml_node& r) const
+	{
+		return (_root < r._root);
+	}
+
+	PUGI__FN bool xml_node::operator>(const xml_node& r) const
+	{
+		return (_root > r._root);
+	}
+
+	PUGI__FN bool xml_node::operator<=(const xml_node& r) const
+	{
+		return (_root <= r._root);
+	}
+
+	PUGI__FN bool xml_node::operator>=(const xml_node& r) const
+	{
+		return (_root >= r._root);
+	}
+
+	PUGI__FN bool xml_node::empty() const
+	{
+		return !_root;
+	}
+
+	PUGI__FN const char_t* xml_node::name() const
+	{
+		return (_root && _root->name) ? _root->name + 0 : PUGIXML_TEXT("");
+	}
+
+	PUGI__FN xml_node_type xml_node::type() const
+	{
+		return _root ? PUGI__NODETYPE(_root) : node_null;
+	}
+
+	PUGI__FN const char_t* xml_node::value() const
+	{
+		return (_root && _root->value) ? _root->value + 0 : PUGIXML_TEXT("");
+	}
+
+	PUGI__FN xml_node xml_node::child(const char_t* name_) const
+	{
+		if (!_root) return xml_node();
+
+		for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling)
+			if (i->name && impl::strequal(name_, i->name)) return xml_node(i);
+
+		return xml_node();
+	}
+
+	PUGI__FN xml_attribute xml_node::attribute(const char_t* name_) const
+	{
+		if (!_root) return xml_attribute();
+
+		for (xml_attribute_struct* i = _root->first_attribute; i; i = i->next_attribute)
+			if (i->name && impl::strequal(name_, i->name))
+				return xml_attribute(i);
+
+		return xml_attribute();
+	}
+
+	PUGI__FN xml_node xml_node::next_sibling(const char_t* name_) const
+	{
+		if (!_root) return xml_node();
+
+		for (xml_node_struct* i = _root->next_sibling; i; i = i->next_sibling)
+			if (i->name && impl::strequal(name_, i->name)) return xml_node(i);
+
+		return xml_node();
+	}
+
+	PUGI__FN xml_node xml_node::next_sibling() const
+	{
+		return _root ? xml_node(_root->next_sibling) : xml_node();
+	}
+
+	PUGI__FN xml_node xml_node::previous_sibling(const char_t* name_) const
+	{
+		if (!_root) return xml_node();
+
+		for (xml_node_struct* i = _root->prev_sibling_c; i->next_sibling; i = i->prev_sibling_c)
+			if (i->name && impl::strequal(name_, i->name)) return xml_node(i);
+
+		return xml_node();
+	}
+
+	PUGI__FN xml_attribute xml_node::attribute(const char_t* name_, xml_attribute& hint_) const
+	{
+		xml_attribute_struct* hint = hint_._attr;
+
+		// if hint is not an attribute of node, behavior is not defined
+		assert(!hint || (_root && impl::is_attribute_of(hint, _root)));
+
+		if (!_root) return xml_attribute();
+
+		// optimistically search from hint up until the end
+		for (xml_attribute_struct* i = hint; i; i = i->next_attribute)
+			if (i->name && impl::strequal(name_, i->name))
+			{
+				// update hint to maximize efficiency of searching for consecutive attributes
+				hint_._attr = i->next_attribute;
+
+				return xml_attribute(i);
+			}
+
+		// wrap around and search from the first attribute until the hint
+		// 'j' null pointer check is technically redundant, but it prevents a crash in case the assertion above fails
+		for (xml_attribute_struct* j = _root->first_attribute; j && j != hint; j = j->next_attribute)
+			if (j->name && impl::strequal(name_, j->name))
+			{
+				// update hint to maximize efficiency of searching for consecutive attributes
+				hint_._attr = j->next_attribute;
+
+				return xml_attribute(j);
+			}
+
+		return xml_attribute();
+	}
+
+	PUGI__FN xml_node xml_node::previous_sibling() const
+	{
+		if (!_root) return xml_node();
+
+		if (_root->prev_sibling_c->next_sibling) return xml_node(_root->prev_sibling_c);
+		else return xml_node();
+	}
+
+	PUGI__FN xml_node xml_node::parent() const
+	{
+		return _root ? xml_node(_root->parent) : xml_node();
+	}
+
+	PUGI__FN xml_node xml_node::root() const
+	{
+		return _root ? xml_node(&impl::get_document(_root)) : xml_node();
+	}
+
+	PUGI__FN xml_text xml_node::text() const
+	{
+		return xml_text(_root);
+	}
+
+	PUGI__FN const char_t* xml_node::child_value() const
+	{
+		if (!_root) return PUGIXML_TEXT("");
+
+		// element nodes can have value if parse_embed_pcdata was used
+		if (PUGI__NODETYPE(_root) == node_element && _root->value)
+			return _root->value;
+
+		for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling)
+			if (impl::is_text_node(i) && i->value)
+				return i->value;
+
+		return PUGIXML_TEXT("");
+	}
+
+	PUGI__FN const char_t* xml_node::child_value(const char_t* name_) const
+	{
+		return child(name_).child_value();
+	}
+
+	PUGI__FN xml_attribute xml_node::first_attribute() const
+	{
+		return _root ? xml_attribute(_root->first_attribute) : xml_attribute();
+	}
+
+	PUGI__FN xml_attribute xml_node::last_attribute() const
+	{
+		return _root && _root->first_attribute ? xml_attribute(_root->first_attribute->prev_attribute_c) : xml_attribute();
+	}
+
+	PUGI__FN xml_node xml_node::first_child() const
+	{
+		return _root ? xml_node(_root->first_child) : xml_node();
+	}
+
+	PUGI__FN xml_node xml_node::last_child() const
+	{
+		return _root && _root->first_child ? xml_node(_root->first_child->prev_sibling_c) : xml_node();
+	}
+
+	PUGI__FN bool xml_node::set_name(const char_t* rhs)
+	{
+		xml_node_type type_ = _root ? PUGI__NODETYPE(_root) : node_null;
+
+		if (type_ != node_element && type_ != node_pi && type_ != node_declaration)
+			return false;
+
+		return impl::strcpy_insitu(_root->name, _root->header, impl::xml_memory_page_name_allocated_mask, rhs, impl::strlength(rhs));
+	}
+
+	PUGI__FN bool xml_node::set_value(const char_t* rhs)
+	{
+		xml_node_type type_ = _root ? PUGI__NODETYPE(_root) : node_null;
+
+		if (type_ != node_pcdata && type_ != node_cdata && type_ != node_comment && type_ != node_pi && type_ != node_doctype)
+			return false;
+
+		return impl::strcpy_insitu(_root->value, _root->header, impl::xml_memory_page_value_allocated_mask, rhs, impl::strlength(rhs));
+	}
+
+	PUGI__FN xml_attribute xml_node::append_attribute(const char_t* name_)
+	{
+		if (!impl::allow_insert_attribute(type())) return xml_attribute();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_attribute();
+
+		xml_attribute a(impl::allocate_attribute(alloc));
+		if (!a) return xml_attribute();
+
+		impl::append_attribute(a._attr, _root);
+
+		a.set_name(name_);
+
+		return a;
+	}
+
+	PUGI__FN xml_attribute xml_node::prepend_attribute(const char_t* name_)
+	{
+		if (!impl::allow_insert_attribute(type())) return xml_attribute();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_attribute();
+
+		xml_attribute a(impl::allocate_attribute(alloc));
+		if (!a) return xml_attribute();
+
+		impl::prepend_attribute(a._attr, _root);
+
+		a.set_name(name_);
+
+		return a;
+	}
+
+	PUGI__FN xml_attribute xml_node::insert_attribute_after(const char_t* name_, const xml_attribute& attr)
+	{
+		if (!impl::allow_insert_attribute(type())) return xml_attribute();
+		if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_attribute();
+
+		xml_attribute a(impl::allocate_attribute(alloc));
+		if (!a) return xml_attribute();
+
+		impl::insert_attribute_after(a._attr, attr._attr, _root);
+
+		a.set_name(name_);
+
+		return a;
+	}
+
+	PUGI__FN xml_attribute xml_node::insert_attribute_before(const char_t* name_, const xml_attribute& attr)
+	{
+		if (!impl::allow_insert_attribute(type())) return xml_attribute();
+		if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_attribute();
+
+		xml_attribute a(impl::allocate_attribute(alloc));
+		if (!a) return xml_attribute();
+
+		impl::insert_attribute_before(a._attr, attr._attr, _root);
+
+		a.set_name(name_);
+
+		return a;
+	}
+
+	PUGI__FN xml_attribute xml_node::append_copy(const xml_attribute& proto)
+	{
+		if (!proto) return xml_attribute();
+		if (!impl::allow_insert_attribute(type())) return xml_attribute();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_attribute();
+
+		xml_attribute a(impl::allocate_attribute(alloc));
+		if (!a) return xml_attribute();
+
+		impl::append_attribute(a._attr, _root);
+		impl::node_copy_attribute(a._attr, proto._attr);
+
+		return a;
+	}
+
+	PUGI__FN xml_attribute xml_node::prepend_copy(const xml_attribute& proto)
+	{
+		if (!proto) return xml_attribute();
+		if (!impl::allow_insert_attribute(type())) return xml_attribute();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_attribute();
+
+		xml_attribute a(impl::allocate_attribute(alloc));
+		if (!a) return xml_attribute();
+
+		impl::prepend_attribute(a._attr, _root);
+		impl::node_copy_attribute(a._attr, proto._attr);
+
+		return a;
+	}
+
+	PUGI__FN xml_attribute xml_node::insert_copy_after(const xml_attribute& proto, const xml_attribute& attr)
+	{
+		if (!proto) return xml_attribute();
+		if (!impl::allow_insert_attribute(type())) return xml_attribute();
+		if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_attribute();
+
+		xml_attribute a(impl::allocate_attribute(alloc));
+		if (!a) return xml_attribute();
+
+		impl::insert_attribute_after(a._attr, attr._attr, _root);
+		impl::node_copy_attribute(a._attr, proto._attr);
+
+		return a;
+	}
+
+	PUGI__FN xml_attribute xml_node::insert_copy_before(const xml_attribute& proto, const xml_attribute& attr)
+	{
+		if (!proto) return xml_attribute();
+		if (!impl::allow_insert_attribute(type())) return xml_attribute();
+		if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_attribute();
+
+		xml_attribute a(impl::allocate_attribute(alloc));
+		if (!a) return xml_attribute();
+
+		impl::insert_attribute_before(a._attr, attr._attr, _root);
+		impl::node_copy_attribute(a._attr, proto._attr);
+
+		return a;
+	}
+
+	PUGI__FN xml_node xml_node::append_child(xml_node_type type_)
+	{
+		if (!impl::allow_insert_child(type(), type_)) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		xml_node n(impl::allocate_node(alloc, type_));
+		if (!n) return xml_node();
+
+		impl::append_node(n._root, _root);
+
+		if (type_ == node_declaration) n.set_name(PUGIXML_TEXT("xml"));
+
+		return n;
+	}
+
+	PUGI__FN xml_node xml_node::prepend_child(xml_node_type type_)
+	{
+		if (!impl::allow_insert_child(type(), type_)) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		xml_node n(impl::allocate_node(alloc, type_));
+		if (!n) return xml_node();
+
+		impl::prepend_node(n._root, _root);
+
+		if (type_ == node_declaration) n.set_name(PUGIXML_TEXT("xml"));
+
+		return n;
+	}
+
+	PUGI__FN xml_node xml_node::insert_child_before(xml_node_type type_, const xml_node& node)
+	{
+		if (!impl::allow_insert_child(type(), type_)) return xml_node();
+		if (!node._root || node._root->parent != _root) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		xml_node n(impl::allocate_node(alloc, type_));
+		if (!n) return xml_node();
+
+		impl::insert_node_before(n._root, node._root);
+
+		if (type_ == node_declaration) n.set_name(PUGIXML_TEXT("xml"));
+
+		return n;
+	}
+
+	PUGI__FN xml_node xml_node::insert_child_after(xml_node_type type_, const xml_node& node)
+	{
+		if (!impl::allow_insert_child(type(), type_)) return xml_node();
+		if (!node._root || node._root->parent != _root) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		xml_node n(impl::allocate_node(alloc, type_));
+		if (!n) return xml_node();
+
+		impl::insert_node_after(n._root, node._root);
+
+		if (type_ == node_declaration) n.set_name(PUGIXML_TEXT("xml"));
+
+		return n;
+	}
+
+	PUGI__FN xml_node xml_node::append_child(const char_t* name_)
+	{
+		xml_node result = append_child(node_element);
+
+		result.set_name(name_);
+
+		return result;
+	}
+
+	PUGI__FN xml_node xml_node::prepend_child(const char_t* name_)
+	{
+		xml_node result = prepend_child(node_element);
+
+		result.set_name(name_);
+
+		return result;
+	}
+
+	PUGI__FN xml_node xml_node::insert_child_after(const char_t* name_, const xml_node& node)
+	{
+		xml_node result = insert_child_after(node_element, node);
+
+		result.set_name(name_);
+
+		return result;
+	}
+
+	PUGI__FN xml_node xml_node::insert_child_before(const char_t* name_, const xml_node& node)
+	{
+		xml_node result = insert_child_before(node_element, node);
+
+		result.set_name(name_);
+
+		return result;
+	}
+
+	PUGI__FN xml_node xml_node::append_copy(const xml_node& proto)
+	{
+		xml_node_type type_ = proto.type();
+		if (!impl::allow_insert_child(type(), type_)) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		xml_node n(impl::allocate_node(alloc, type_));
+		if (!n) return xml_node();
+
+		impl::append_node(n._root, _root);
+		impl::node_copy_tree(n._root, proto._root);
+
+		return n;
+	}
+
+	PUGI__FN xml_node xml_node::prepend_copy(const xml_node& proto)
+	{
+		xml_node_type type_ = proto.type();
+		if (!impl::allow_insert_child(type(), type_)) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		xml_node n(impl::allocate_node(alloc, type_));
+		if (!n) return xml_node();
+
+		impl::prepend_node(n._root, _root);
+		impl::node_copy_tree(n._root, proto._root);
+
+		return n;
+	}
+
+	PUGI__FN xml_node xml_node::insert_copy_after(const xml_node& proto, const xml_node& node)
+	{
+		xml_node_type type_ = proto.type();
+		if (!impl::allow_insert_child(type(), type_)) return xml_node();
+		if (!node._root || node._root->parent != _root) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		xml_node n(impl::allocate_node(alloc, type_));
+		if (!n) return xml_node();
+
+		impl::insert_node_after(n._root, node._root);
+		impl::node_copy_tree(n._root, proto._root);
+
+		return n;
+	}
+
+	PUGI__FN xml_node xml_node::insert_copy_before(const xml_node& proto, const xml_node& node)
+	{
+		xml_node_type type_ = proto.type();
+		if (!impl::allow_insert_child(type(), type_)) return xml_node();
+		if (!node._root || node._root->parent != _root) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		xml_node n(impl::allocate_node(alloc, type_));
+		if (!n) return xml_node();
+
+		impl::insert_node_before(n._root, node._root);
+		impl::node_copy_tree(n._root, proto._root);
+
+		return n;
+	}
+
+	PUGI__FN xml_node xml_node::append_move(const xml_node& moved)
+	{
+		if (!impl::allow_move(*this, moved)) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		// disable document_buffer_order optimization since moving nodes around changes document order without changing buffer pointers
+		impl::get_document(_root).header |= impl::xml_memory_page_contents_shared_mask;
+
+		impl::remove_node(moved._root);
+		impl::append_node(moved._root, _root);
+
+		return moved;
+	}
+
+	PUGI__FN xml_node xml_node::prepend_move(const xml_node& moved)
+	{
+		if (!impl::allow_move(*this, moved)) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		// disable document_buffer_order optimization since moving nodes around changes document order without changing buffer pointers
+		impl::get_document(_root).header |= impl::xml_memory_page_contents_shared_mask;
+
+		impl::remove_node(moved._root);
+		impl::prepend_node(moved._root, _root);
+
+		return moved;
+	}
+
+	PUGI__FN xml_node xml_node::insert_move_after(const xml_node& moved, const xml_node& node)
+	{
+		if (!impl::allow_move(*this, moved)) return xml_node();
+		if (!node._root || node._root->parent != _root) return xml_node();
+		if (moved._root == node._root) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		// disable document_buffer_order optimization since moving nodes around changes document order without changing buffer pointers
+		impl::get_document(_root).header |= impl::xml_memory_page_contents_shared_mask;
+
+		impl::remove_node(moved._root);
+		impl::insert_node_after(moved._root, node._root);
+
+		return moved;
+	}
+
+	PUGI__FN xml_node xml_node::insert_move_before(const xml_node& moved, const xml_node& node)
+	{
+		if (!impl::allow_move(*this, moved)) return xml_node();
+		if (!node._root || node._root->parent != _root) return xml_node();
+		if (moved._root == node._root) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		// disable document_buffer_order optimization since moving nodes around changes document order without changing buffer pointers
+		impl::get_document(_root).header |= impl::xml_memory_page_contents_shared_mask;
+
+		impl::remove_node(moved._root);
+		impl::insert_node_before(moved._root, node._root);
+
+		return moved;
+	}
+
+	PUGI__FN bool xml_node::remove_attribute(const char_t* name_)
+	{
+		return remove_attribute(attribute(name_));
+	}
+
+	PUGI__FN bool xml_node::remove_attribute(const xml_attribute& a)
+	{
+		if (!_root || !a._attr) return false;
+		if (!impl::is_attribute_of(a._attr, _root)) return false;
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return false;
+
+		impl::remove_attribute(a._attr, _root);
+		impl::destroy_attribute(a._attr, alloc);
+
+		return true;
+	}
+
+	PUGI__FN bool xml_node::remove_child(const char_t* name_)
+	{
+		return remove_child(child(name_));
+	}
+
+	PUGI__FN bool xml_node::remove_child(const xml_node& n)
+	{
+		if (!_root || !n._root || n._root->parent != _root) return false;
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return false;
+
+		impl::remove_node(n._root);
+		impl::destroy_node(n._root, alloc);
+
+		return true;
+	}
+
+	PUGI__FN xml_parse_result xml_node::append_buffer(const void* contents, size_t size, unsigned int options, xml_encoding encoding)
+	{
+		// append_buffer is only valid for elements/documents
+		if (!impl::allow_insert_child(type(), node_element)) return impl::make_parse_result(status_append_invalid_root);
+
+		// get document node
+		impl::xml_document_struct* doc = &impl::get_document(_root);
+
+		// disable document_buffer_order optimization since in a document with multiple buffers comparing buffer pointers does not make sense
+		doc->header |= impl::xml_memory_page_contents_shared_mask;
+
+		// get extra buffer element (we'll store the document fragment buffer there so that we can deallocate it later)
+		impl::xml_memory_page* page = 0;
+		impl::xml_extra_buffer* extra = static_cast<impl::xml_extra_buffer*>(doc->allocate_memory(sizeof(impl::xml_extra_buffer) + sizeof(void*), page));
+		(void)page;
+
+		if (!extra) return impl::make_parse_result(status_out_of_memory);
+
+	#ifdef PUGIXML_COMPACT
+		// align the memory block to a pointer boundary; this is required for compact mode where memory allocations are only 4b aligned
+		// note that this requires up to sizeof(void*)-1 additional memory, which the allocation above takes into account
+		extra = reinterpret_cast<impl::xml_extra_buffer*>((reinterpret_cast<uintptr_t>(extra) + (sizeof(void*) - 1)) & ~(sizeof(void*) - 1));
+	#endif
+
+		// add extra buffer to the list
+		extra->buffer = 0;
+		extra->next = doc->extra_buffers;
+		doc->extra_buffers = extra;
+
+		// name of the root has to be NULL before parsing - otherwise closing node mismatches will not be detected at the top level
+		impl::name_null_sentry sentry(_root);
+
+		return impl::load_buffer_impl(doc, _root, const_cast<void*>(contents), size, options, encoding, false, false, &extra->buffer);
+	}
+
+	PUGI__FN xml_node xml_node::find_child_by_attribute(const char_t* name_, const char_t* attr_name, const char_t* attr_value) const
+	{
+		if (!_root) return xml_node();
+
+		for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling)
+			if (i->name && impl::strequal(name_, i->name))
+			{
+				for (xml_attribute_struct* a = i->first_attribute; a; a = a->next_attribute)
+					if (a->name && impl::strequal(attr_name, a->name) && impl::strequal(attr_value, a->value ? a->value + 0 : PUGIXML_TEXT("")))
+						return xml_node(i);
+			}
+
+		return xml_node();
+	}
+
+	PUGI__FN xml_node xml_node::find_child_by_attribute(const char_t* attr_name, const char_t* attr_value) const
+	{
+		if (!_root) return xml_node();
+
+		for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling)
+			for (xml_attribute_struct* a = i->first_attribute; a; a = a->next_attribute)
+				if (a->name && impl::strequal(attr_name, a->name) && impl::strequal(attr_value, a->value ? a->value + 0 : PUGIXML_TEXT("")))
+					return xml_node(i);
+
+		return xml_node();
+	}
+
+#ifndef PUGIXML_NO_STL
+	PUGI__FN string_t xml_node::path(char_t delimiter) const
+	{
+		if (!_root) return string_t();
+
+		size_t offset = 0;
+
+		for (xml_node_struct* i = _root; i; i = i->parent)
+		{
+			offset += (i != _root);
+			offset += i->name ? impl::strlength(i->name) : 0;
+		}
+
+		string_t result;
+		result.resize(offset);
+
+		for (xml_node_struct* j = _root; j; j = j->parent)
+		{
+			if (j != _root)
+				result[--offset] = delimiter;
+
+			if (j->name)
+			{
+				size_t length = impl::strlength(j->name);
+
+				offset -= length;
+				memcpy(&result[offset], j->name, length * sizeof(char_t));
+			}
+		}
+
+		assert(offset == 0);
+
+		return result;
+	}
+#endif
+
+	PUGI__FN xml_node xml_node::first_element_by_path(const char_t* path_, char_t delimiter) const
+	{
+		xml_node found = *this; // Current search context.
+
+		if (!_root || !path_[0]) return found;
+
+		if (path_[0] == delimiter)
+		{
+			// Absolute path; e.g. '/foo/bar'
+			found = found.root();
+			++path_;
+		}
+
+		const char_t* path_segment = path_;
+
+		while (*path_segment == delimiter) ++path_segment;
+
+		const char_t* path_segment_end = path_segment;
+
+		while (*path_segment_end && *path_segment_end != delimiter) ++path_segment_end;
+
+		if (path_segment == path_segment_end) return found;
+
+		const char_t* next_segment = path_segment_end;
+
+		while (*next_segment == delimiter) ++next_segment;
+
+		if (*path_segment == '.' && path_segment + 1 == path_segment_end)
+			return found.first_element_by_path(next_segment, delimiter);
+		else if (*path_segment == '.' && *(path_segment+1) == '.' && path_segment + 2 == path_segment_end)
+			return found.parent().first_element_by_path(next_segment, delimiter);
+		else
+		{
+			for (xml_node_struct* j = found._root->first_child; j; j = j->next_sibling)
+			{
+				if (j->name && impl::strequalrange(j->name, path_segment, static_cast<size_t>(path_segment_end - path_segment)))
+				{
+					xml_node subsearch = xml_node(j).first_element_by_path(next_segment, delimiter);
+
+					if (subsearch) return subsearch;
+				}
+			}
+
+			return xml_node();
+		}
+	}
+
+	PUGI__FN bool xml_node::traverse(xml_tree_walker& walker)
+	{
+		walker._depth = -1;
+
+		xml_node arg_begin(_root);
+		if (!walker.begin(arg_begin)) return false;
+
+		xml_node_struct* cur = _root ? _root->first_child + 0 : 0;
+
+		if (cur)
+		{
+			++walker._depth;
+
+			do
+			{
+				xml_node arg_for_each(cur);
+				if (!walker.for_each(arg_for_each))
+					return false;
+
+				if (cur->first_child)
+				{
+					++walker._depth;
+					cur = cur->first_child;
+				}
+				else if (cur->next_sibling)
+					cur = cur->next_sibling;
+				else
+				{
+					while (!cur->next_sibling && cur != _root && cur->parent)
+					{
+						--walker._depth;
+						cur = cur->parent;
+					}
+
+					if (cur != _root)
+						cur = cur->next_sibling;
+				}
+			}
+			while (cur && cur != _root);
+		}
+
+		assert(walker._depth == -1);
+
+		xml_node arg_end(_root);
+		return walker.end(arg_end);
+	}
+
+	PUGI__FN size_t xml_node::hash_value() const
+	{
+		return static_cast<size_t>(reinterpret_cast<uintptr_t>(_root) / sizeof(xml_node_struct));
+	}
+
+	PUGI__FN xml_node_struct* xml_node::internal_object() const
+	{
+		return _root;
+	}
+
+	PUGI__FN void xml_node::print(xml_writer& writer, const char_t* indent, unsigned int flags, xml_encoding encoding, unsigned int depth) const
+	{
+		if (!_root) return;
+
+		impl::xml_buffered_writer buffered_writer(writer, encoding);
+
+		impl::node_output(buffered_writer, _root, indent, flags, depth);
+
+		buffered_writer.flush();
+	}
+
+#ifndef PUGIXML_NO_STL
+	PUGI__FN void xml_node::print(std::basic_ostream<char, std::char_traits<char> >& stream, const char_t* indent, unsigned int flags, xml_encoding encoding, unsigned int depth) const
+	{
+		xml_writer_stream writer(stream);
+
+		print(writer, indent, flags, encoding, depth);
+	}
+
+	PUGI__FN void xml_node::print(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& stream, const char_t* indent, unsigned int flags, unsigned int depth) const
+	{
+		xml_writer_stream writer(stream);
+
+		print(writer, indent, flags, encoding_wchar, depth);
+	}
+#endif
+
+	PUGI__FN ptrdiff_t xml_node::offset_debug() const
+	{
+		if (!_root) return -1;
+
+		impl::xml_document_struct& doc = impl::get_document(_root);
+
+		// we can determine the offset reliably only if there is exactly once parse buffer
+		if (!doc.buffer || doc.extra_buffers) return -1;
+
+		switch (type())
+		{
+		case node_document:
+			return 0;
+
+		case node_element:
+		case node_declaration:
+		case node_pi:
+			return _root->name && (_root->header & impl::xml_memory_page_name_allocated_or_shared_mask) == 0 ? _root->name - doc.buffer : -1;
+
+		case node_pcdata:
+		case node_cdata:
+		case node_comment:
+		case node_doctype:
+			return _root->value && (_root->header & impl::xml_memory_page_value_allocated_or_shared_mask) == 0 ? _root->value - doc.buffer : -1;
+
+		default:
+			assert(false && "Invalid node type"); // unreachable
+			return -1;
+		}
+	}
+
+#ifdef __BORLANDC__
+	PUGI__FN bool operator&&(const xml_node& lhs, bool rhs)
+	{
+		return (bool)lhs && rhs;
+	}
+
+	PUGI__FN bool operator||(const xml_node& lhs, bool rhs)
+	{
+		return (bool)lhs || rhs;
+	}
+#endif
+
+	PUGI__FN xml_text::xml_text(xml_node_struct* root): _root(root)
+	{
+	}
+
+	PUGI__FN xml_node_struct* xml_text::_data() const
+	{
+		if (!_root || impl::is_text_node(_root)) return _root;
+
+		// element nodes can have value if parse_embed_pcdata was used
+		if (PUGI__NODETYPE(_root) == node_element && _root->value)
+			return _root;
+
+		for (xml_node_struct* node = _root->first_child; node; node = node->next_sibling)
+			if (impl::is_text_node(node))
+				return node;
+
+		return 0;
+	}
+
+	PUGI__FN xml_node_struct* xml_text::_data_new()
+	{
+		xml_node_struct* d = _data();
+		if (d) return d;
+
+		return xml_node(_root).append_child(node_pcdata).internal_object();
+	}
+
+	PUGI__FN xml_text::xml_text(): _root(0)
+	{
+	}
+
+	PUGI__FN static void unspecified_bool_xml_text(xml_text***)
+	{
+	}
+
+	PUGI__FN xml_text::operator xml_text::unspecified_bool_type() const
+	{
+		return _data() ? unspecified_bool_xml_text : 0;
+	}
+
+	PUGI__FN bool xml_text::operator!() const
+	{
+		return !_data();
+	}
+
+	PUGI__FN bool xml_text::empty() const
+	{
+		return _data() == 0;
+	}
+
+	PUGI__FN const char_t* xml_text::get() const
+	{
+		xml_node_struct* d = _data();
+
+		return (d && d->value) ? d->value + 0 : PUGIXML_TEXT("");
+	}
+
+	PUGI__FN const char_t* xml_text::as_string(const char_t* def) const
+	{
+		xml_node_struct* d = _data();
+
+		return (d && d->value) ? d->value + 0 : def;
+	}
+
+	PUGI__FN int xml_text::as_int(int def) const
+	{
+		xml_node_struct* d = _data();
+
+		return (d && d->value) ? impl::get_value_int(d->value) : def;
+	}
+
+	PUGI__FN unsigned int xml_text::as_uint(unsigned int def) const
+	{
+		xml_node_struct* d = _data();
+
+		return (d && d->value) ? impl::get_value_uint(d->value) : def;
+	}
+
+	PUGI__FN double xml_text::as_double(double def) const
+	{
+		xml_node_struct* d = _data();
+
+		return (d && d->value) ? impl::get_value_double(d->value) : def;
+	}
+
+	PUGI__FN float xml_text::as_float(float def) const
+	{
+		xml_node_struct* d = _data();
+
+		return (d && d->value) ? impl::get_value_float(d->value) : def;
+	}
+
+	PUGI__FN bool xml_text::as_bool(bool def) const
+	{
+		xml_node_struct* d = _data();
+
+		return (d && d->value) ? impl::get_value_bool(d->value) : def;
+	}
+
+#ifdef PUGIXML_HAS_LONG_LONG
+	PUGI__FN long long xml_text::as_llong(long long def) const
+	{
+		xml_node_struct* d = _data();
+
+		return (d && d->value) ? impl::get_value_llong(d->value) : def;
+	}
+
+	PUGI__FN unsigned long long xml_text::as_ullong(unsigned long long def) const
+	{
+		xml_node_struct* d = _data();
+
+		return (d && d->value) ? impl::get_value_ullong(d->value) : def;
+	}
+#endif
+
+	PUGI__FN bool xml_text::set(const char_t* rhs)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::strcpy_insitu(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, impl::strlength(rhs)) : false;
+	}
+
+	PUGI__FN bool xml_text::set(int rhs)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::set_value_integer<unsigned int>(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0) : false;
+	}
+
+	PUGI__FN bool xml_text::set(unsigned int rhs)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::set_value_integer<unsigned int>(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, false) : false;
+	}
+
+	PUGI__FN bool xml_text::set(long rhs)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::set_value_integer<unsigned long>(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0) : false;
+	}
+
+	PUGI__FN bool xml_text::set(unsigned long rhs)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::set_value_integer<unsigned long>(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, false) : false;
+	}
+
+	PUGI__FN bool xml_text::set(float rhs)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::set_value_convert(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs) : false;
+	}
+
+	PUGI__FN bool xml_text::set(double rhs)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::set_value_convert(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs) : false;
+	}
+
+	PUGI__FN bool xml_text::set(bool rhs)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::set_value_bool(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs) : false;
+	}
+
+#ifdef PUGIXML_HAS_LONG_LONG
+	PUGI__FN bool xml_text::set(long long rhs)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::set_value_integer<unsigned long long>(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0) : false;
+	}
+
+	PUGI__FN bool xml_text::set(unsigned long long rhs)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::set_value_integer<unsigned long long>(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, false) : false;
+	}
+#endif
+
+	PUGI__FN xml_text& xml_text::operator=(const char_t* rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_text& xml_text::operator=(int rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_text& xml_text::operator=(unsigned int rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_text& xml_text::operator=(long rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_text& xml_text::operator=(unsigned long rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_text& xml_text::operator=(double rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_text& xml_text::operator=(float rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_text& xml_text::operator=(bool rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+
+#ifdef PUGIXML_HAS_LONG_LONG
+	PUGI__FN xml_text& xml_text::operator=(long long rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_text& xml_text::operator=(unsigned long long rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+#endif
+
+	PUGI__FN xml_node xml_text::data() const
+	{
+		return xml_node(_data());
+	}
+
+#ifdef __BORLANDC__
+	PUGI__FN bool operator&&(const xml_text& lhs, bool rhs)
+	{
+		return (bool)lhs && rhs;
+	}
+
+	PUGI__FN bool operator||(const xml_text& lhs, bool rhs)
+	{
+		return (bool)lhs || rhs;
+	}
+#endif
+
+	PUGI__FN xml_node_iterator::xml_node_iterator()
+	{
+	}
+
+	PUGI__FN xml_node_iterator::xml_node_iterator(const xml_node& node): _wrap(node), _parent(node.parent())
+	{
+	}
+
+	PUGI__FN xml_node_iterator::xml_node_iterator(xml_node_struct* ref, xml_node_struct* parent): _wrap(ref), _parent(parent)
+	{
+	}
+
+	PUGI__FN bool xml_node_iterator::operator==(const xml_node_iterator& rhs) const
+	{
+		return _wrap._root == rhs._wrap._root && _parent._root == rhs._parent._root;
+	}
+
+	PUGI__FN bool xml_node_iterator::operator!=(const xml_node_iterator& rhs) const
+	{
+		return _wrap._root != rhs._wrap._root || _parent._root != rhs._parent._root;
+	}
+
+	PUGI__FN xml_node& xml_node_iterator::operator*() const
+	{
+		assert(_wrap._root);
+		return _wrap;
+	}
+
+	PUGI__FN xml_node* xml_node_iterator::operator->() const
+	{
+		assert(_wrap._root);
+		return const_cast<xml_node*>(&_wrap); // BCC5 workaround
+	}
+
+	PUGI__FN const xml_node_iterator& xml_node_iterator::operator++()
+	{
+		assert(_wrap._root);
+		_wrap._root = _wrap._root->next_sibling;
+		return *this;
+	}
+
+	PUGI__FN xml_node_iterator xml_node_iterator::operator++(int)
+	{
+		xml_node_iterator temp = *this;
+		++*this;
+		return temp;
+	}
+
+	PUGI__FN const xml_node_iterator& xml_node_iterator::operator--()
+	{
+		_wrap = _wrap._root ? _wrap.previous_sibling() : _parent.last_child();
+		return *this;
+	}
+
+	PUGI__FN xml_node_iterator xml_node_iterator::operator--(int)
+	{
+		xml_node_iterator temp = *this;
+		--*this;
+		return temp;
+	}
+
+	PUGI__FN xml_attribute_iterator::xml_attribute_iterator()
+	{
+	}
+
+	PUGI__FN xml_attribute_iterator::xml_attribute_iterator(const xml_attribute& attr, const xml_node& parent): _wrap(attr), _parent(parent)
+	{
+	}
+
+	PUGI__FN xml_attribute_iterator::xml_attribute_iterator(xml_attribute_struct* ref, xml_node_struct* parent): _wrap(ref), _parent(parent)
+	{
+	}
+
+	PUGI__FN bool xml_attribute_iterator::operator==(const xml_attribute_iterator& rhs) const
+	{
+		return _wrap._attr == rhs._wrap._attr && _parent._root == rhs._parent._root;
+	}
+
+	PUGI__FN bool xml_attribute_iterator::operator!=(const xml_attribute_iterator& rhs) const
+	{
+		return _wrap._attr != rhs._wrap._attr || _parent._root != rhs._parent._root;
+	}
+
+	PUGI__FN xml_attribute& xml_attribute_iterator::operator*() const
+	{
+		assert(_wrap._attr);
+		return _wrap;
+	}
+
+	PUGI__FN xml_attribute* xml_attribute_iterator::operator->() const
+	{
+		assert(_wrap._attr);
+		return const_cast<xml_attribute*>(&_wrap); // BCC5 workaround
+	}
+
+	PUGI__FN const xml_attribute_iterator& xml_attribute_iterator::operator++()
+	{
+		assert(_wrap._attr);
+		_wrap._attr = _wrap._attr->next_attribute;
+		return *this;
+	}
+
+	PUGI__FN xml_attribute_iterator xml_attribute_iterator::operator++(int)
+	{
+		xml_attribute_iterator temp = *this;
+		++*this;
+		return temp;
+	}
+
+	PUGI__FN const xml_attribute_iterator& xml_attribute_iterator::operator--()
+	{
+		_wrap = _wrap._attr ? _wrap.previous_attribute() : _parent.last_attribute();
+		return *this;
+	}
+
+	PUGI__FN xml_attribute_iterator xml_attribute_iterator::operator--(int)
+	{
+		xml_attribute_iterator temp = *this;
+		--*this;
+		return temp;
+	}
+
+	PUGI__FN xml_named_node_iterator::xml_named_node_iterator(): _name(0)
+	{
+	}
+
+	PUGI__FN xml_named_node_iterator::xml_named_node_iterator(const xml_node& node, const char_t* name): _wrap(node), _parent(node.parent()), _name(name)
+	{
+	}
+
+	PUGI__FN xml_named_node_iterator::xml_named_node_iterator(xml_node_struct* ref, xml_node_struct* parent, const char_t* name): _wrap(ref), _parent(parent), _name(name)
+	{
+	}
+
+	PUGI__FN bool xml_named_node_iterator::operator==(const xml_named_node_iterator& rhs) const
+	{
+		return _wrap._root == rhs._wrap._root && _parent._root == rhs._parent._root;
+	}
+
+	PUGI__FN bool xml_named_node_iterator::operator!=(const xml_named_node_iterator& rhs) const
+	{
+		return _wrap._root != rhs._wrap._root || _parent._root != rhs._parent._root;
+	}
+
+	PUGI__FN xml_node& xml_named_node_iterator::operator*() const
+	{
+		assert(_wrap._root);
+		return _wrap;
+	}
+
+	PUGI__FN xml_node* xml_named_node_iterator::operator->() const
+	{
+		assert(_wrap._root);
+		return const_cast<xml_node*>(&_wrap); // BCC5 workaround
+	}
+
+	PUGI__FN const xml_named_node_iterator& xml_named_node_iterator::operator++()
+	{
+		assert(_wrap._root);
+		_wrap = _wrap.next_sibling(_name);
+		return *this;
+	}
+
+	PUGI__FN xml_named_node_iterator xml_named_node_iterator::operator++(int)
+	{
+		xml_named_node_iterator temp = *this;
+		++*this;
+		return temp;
+	}
+
+	PUGI__FN const xml_named_node_iterator& xml_named_node_iterator::operator--()
+	{
+		if (_wrap._root)
+			_wrap = _wrap.previous_sibling(_name);
+		else
+		{
+			_wrap = _parent.last_child();
+
+			if (!impl::strequal(_wrap.name(), _name))
+				_wrap = _wrap.previous_sibling(_name);
+		}
+
+		return *this;
+	}
+
+	PUGI__FN xml_named_node_iterator xml_named_node_iterator::operator--(int)
+	{
+		xml_named_node_iterator temp = *this;
+		--*this;
+		return temp;
+	}
+
+	PUGI__FN xml_parse_result::xml_parse_result(): status(status_internal_error), offset(0), encoding(encoding_auto)
+	{
+	}
+
+	PUGI__FN xml_parse_result::operator bool() const
+	{
+		return status == status_ok;
+	}
+
+	PUGI__FN const char* xml_parse_result::description() const
+	{
+		switch (status)
+		{
+		case status_ok: return "No error";
+
+		case status_file_not_found: return "File was not found";
+		case status_io_error: return "Error reading from file/stream";
+		case status_out_of_memory: return "Could not allocate memory";
+		case status_internal_error: return "Internal error occurred";
+
+		case status_unrecognized_tag: return "Could not determine tag type";
+
+		case status_bad_pi: return "Error parsing document declaration/processing instruction";
+		case status_bad_comment: return "Error parsing comment";
+		case status_bad_cdata: return "Error parsing CDATA section";
+		case status_bad_doctype: return "Error parsing document type declaration";
+		case status_bad_pcdata: return "Error parsing PCDATA section";
+		case status_bad_start_element: return "Error parsing start element tag";
+		case status_bad_attribute: return "Error parsing element attribute";
+		case status_bad_end_element: return "Error parsing end element tag";
+		case status_end_element_mismatch: return "Start-end tags mismatch";
+
+		case status_append_invalid_root: return "Unable to append nodes: root is not an element or document";
+
+		case status_no_document_element: return "No document element found";
+
+		default: return "Unknown error";
+		}
+	}
+
+	PUGI__FN xml_document::xml_document(): _buffer(0)
+	{
+		_create();
+	}
+
+	PUGI__FN xml_document::~xml_document()
+	{
+		_destroy();
+	}
+
+#ifdef PUGIXML_HAS_MOVE
+	PUGI__FN xml_document::xml_document(xml_document&& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT: _buffer(0)
+	{
+		_create();
+		_move(rhs);
+	}
+
+	PUGI__FN xml_document& xml_document::operator=(xml_document&& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT
+	{
+		if (this == &rhs) return *this;
+
+		_destroy();
+		_create();
+		_move(rhs);
+
+		return *this;
+	}
+#endif
+
+	PUGI__FN void xml_document::reset()
+	{
+		_destroy();
+		_create();
+	}
+
+	PUGI__FN void xml_document::reset(const xml_document& proto)
+	{
+		reset();
+
+		for (xml_node cur = proto.first_child(); cur; cur = cur.next_sibling())
+			append_copy(cur);
+	}
+
+	PUGI__FN void xml_document::_create()
+	{
+		assert(!_root);
+
+	#ifdef PUGIXML_COMPACT
+		// space for page marker for the first page (uint32_t), rounded up to pointer size; assumes pointers are at least 32-bit
+		const size_t page_offset = sizeof(void*);
+	#else
+		const size_t page_offset = 0;
+	#endif
+
+		// initialize sentinel page
+		PUGI__STATIC_ASSERT(sizeof(impl::xml_memory_page) + sizeof(impl::xml_document_struct) + page_offset <= sizeof(_memory));
+
+		// prepare page structure
+		impl::xml_memory_page* page = impl::xml_memory_page::construct(_memory);
+		assert(page);
+
+		page->busy_size = impl::xml_memory_page_size;
+
+		// setup first page marker
+	#ifdef PUGIXML_COMPACT
+		// round-trip through void* to avoid 'cast increases required alignment of target type' warning
+		page->compact_page_marker = reinterpret_cast<uint32_t*>(static_cast<void*>(reinterpret_cast<char*>(page) + sizeof(impl::xml_memory_page)));
+		*page->compact_page_marker = sizeof(impl::xml_memory_page);
+	#endif
+
+		// allocate new root
+		_root = new (reinterpret_cast<char*>(page) + sizeof(impl::xml_memory_page) + page_offset) impl::xml_document_struct(page);
+		_root->prev_sibling_c = _root;
+
+		// setup sentinel page
+		page->allocator = static_cast<impl::xml_document_struct*>(_root);
+
+		// setup hash table pointer in allocator
+	#ifdef PUGIXML_COMPACT
+		page->allocator->_hash = &static_cast<impl::xml_document_struct*>(_root)->hash;
+	#endif
+
+		// verify the document allocation
+		assert(reinterpret_cast<char*>(_root) + sizeof(impl::xml_document_struct) <= _memory + sizeof(_memory));
+	}
+
+	PUGI__FN void xml_document::_destroy()
+	{
+		assert(_root);
+
+		// destroy static storage
+		if (_buffer)
+		{
+			impl::xml_memory::deallocate(_buffer);
+			_buffer = 0;
+		}
+
+		// destroy extra buffers (note: no need to destroy linked list nodes, they're allocated using document allocator)
+		for (impl::xml_extra_buffer* extra = static_cast<impl::xml_document_struct*>(_root)->extra_buffers; extra; extra = extra->next)
+		{
+			if (extra->buffer) impl::xml_memory::deallocate(extra->buffer);
+		}
+
+		// destroy dynamic storage, leave sentinel page (it's in static memory)
+		impl::xml_memory_page* root_page = PUGI__GETPAGE(_root);
+		assert(root_page && !root_page->prev);
+		assert(reinterpret_cast<char*>(root_page) >= _memory && reinterpret_cast<char*>(root_page) < _memory + sizeof(_memory));
+
+		for (impl::xml_memory_page* page = root_page->next; page; )
+		{
+			impl::xml_memory_page* next = page->next;
+
+			impl::xml_allocator::deallocate_page(page);
+
+			page = next;
+		}
+
+	#ifdef PUGIXML_COMPACT
+		// destroy hash table
+		static_cast<impl::xml_document_struct*>(_root)->hash.clear();
+	#endif
+
+		_root = 0;
+	}
+
+#ifdef PUGIXML_HAS_MOVE
+	PUGI__FN void xml_document::_move(xml_document& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT
+	{
+		impl::xml_document_struct* doc = static_cast<impl::xml_document_struct*>(_root);
+		impl::xml_document_struct* other = static_cast<impl::xml_document_struct*>(rhs._root);
+
+		// save first child pointer for later; this needs hash access
+		xml_node_struct* other_first_child = other->first_child;
+
+	#ifdef PUGIXML_COMPACT
+		// reserve space for the hash table up front; this is the only operation that can fail
+		// if it does, we have no choice but to throw (if we have exceptions)
+		if (other_first_child)
+		{
+			size_t other_children = 0;
+			for (xml_node_struct* node = other_first_child; node; node = node->next_sibling)
+				other_children++;
+
+			// in compact mode, each pointer assignment could result in a hash table request
+			// during move, we have to relocate document first_child and parents of all children
+			// normally there's just one child and its parent has a pointerless encoding but
+			// we assume the worst here
+			if (!other->_hash->reserve(other_children + 1))
+			{
+			#ifdef PUGIXML_NO_EXCEPTIONS
+				return;
+			#else
+				throw std::bad_alloc();
+			#endif
+			}
+		}
+	#endif
+
+		// move allocation state
+		doc->_root = other->_root;
+		doc->_busy_size = other->_busy_size;
+
+		// move buffer state
+		doc->buffer = other->buffer;
+		doc->extra_buffers = other->extra_buffers;
+		_buffer = rhs._buffer;
+
+	#ifdef PUGIXML_COMPACT
+		// move compact hash; note that the hash table can have pointers to other but they will be "inactive", similarly to nodes removed with remove_child
+		doc->hash = other->hash;
+		doc->_hash = &doc->hash;
+
+		// make sure we don't access other hash up until the end when we reinitialize other document
+		other->_hash = 0;
+	#endif
+
+		// move page structure
+		impl::xml_memory_page* doc_page = PUGI__GETPAGE(doc);
+		assert(doc_page && !doc_page->prev && !doc_page->next);
+
+		impl::xml_memory_page* other_page = PUGI__GETPAGE(other);
+		assert(other_page && !other_page->prev);
+
+		// relink pages since root page is embedded into xml_document
+		if (impl::xml_memory_page* page = other_page->next)
+		{
+			assert(page->prev == other_page);
+
+			page->prev = doc_page;
+
+			doc_page->next = page;
+			other_page->next = 0;
+		}
+
+		// make sure pages point to the correct document state
+		for (impl::xml_memory_page* page = doc_page->next; page; page = page->next)
+		{
+			assert(page->allocator == other);
+
+			page->allocator = doc;
+
+		#ifdef PUGIXML_COMPACT
+			// this automatically migrates most children between documents and prevents ->parent assignment from allocating
+			if (page->compact_shared_parent == other)
+				page->compact_shared_parent = doc;
+		#endif
+		}
+
+		// move tree structure
+		assert(!doc->first_child);
+
+		doc->first_child = other_first_child;
+
+		for (xml_node_struct* node = other_first_child; node; node = node->next_sibling)
+		{
+		#ifdef PUGIXML_COMPACT
+			// most children will have migrated when we reassigned compact_shared_parent
+			assert(node->parent == other || node->parent == doc);
+
+			node->parent = doc;
+		#else
+			assert(node->parent == other);
+			node->parent = doc;
+		#endif
+		}
+
+		// reset other document
+		new (other) impl::xml_document_struct(PUGI__GETPAGE(other));
+		rhs._buffer = 0;
+	}
+#endif
+
+#ifndef PUGIXML_NO_STL
+	PUGI__FN xml_parse_result xml_document::load(std::basic_istream<char, std::char_traits<char> >& stream, unsigned int options, xml_encoding encoding)
+	{
+		reset();
+
+		return impl::load_stream_impl(static_cast<impl::xml_document_struct*>(_root), stream, options, encoding, &_buffer);
+	}
+
+	PUGI__FN xml_parse_result xml_document::load(std::basic_istream<wchar_t, std::char_traits<wchar_t> >& stream, unsigned int options)
+	{
+		reset();
+
+		return impl::load_stream_impl(static_cast<impl::xml_document_struct*>(_root), stream, options, encoding_wchar, &_buffer);
+	}
+#endif
+
+	PUGI__FN xml_parse_result xml_document::load_string(const char_t* contents, unsigned int options)
+	{
+		// Force native encoding (skip autodetection)
+	#ifdef PUGIXML_WCHAR_MODE
+		xml_encoding encoding = encoding_wchar;
+	#else
+		xml_encoding encoding = encoding_utf8;
+	#endif
+
+		return load_buffer(contents, impl::strlength(contents) * sizeof(char_t), options, encoding);
+	}
+
+	PUGI__FN xml_parse_result xml_document::load(const char_t* contents, unsigned int options)
+	{
+		return load_string(contents, options);
+	}
+
+	PUGI__FN xml_parse_result xml_document::load_file(const char* path_, unsigned int options, xml_encoding encoding)
+	{
+		reset();
+
+		using impl::auto_deleter; // MSVC7 workaround
+		auto_deleter<FILE> file(fopen(path_, "rb"), impl::close_file);
+
+		return impl::load_file_impl(static_cast<impl::xml_document_struct*>(_root), file.data, options, encoding, &_buffer);
+	}
+
+	PUGI__FN xml_parse_result xml_document::load_file(const wchar_t* path_, unsigned int options, xml_encoding encoding)
+	{
+		reset();
+
+		using impl::auto_deleter; // MSVC7 workaround
+		auto_deleter<FILE> file(impl::open_file_wide(path_, L"rb"), impl::close_file);
+
+		return impl::load_file_impl(static_cast<impl::xml_document_struct*>(_root), file.data, options, encoding, &_buffer);
+	}
+
+	PUGI__FN xml_parse_result xml_document::load_buffer(const void* contents, size_t size, unsigned int options, xml_encoding encoding)
+	{
+		reset();
+
+		return impl::load_buffer_impl(static_cast<impl::xml_document_struct*>(_root), _root, const_cast<void*>(contents), size, options, encoding, false, false, &_buffer);
+	}
+
+	PUGI__FN xml_parse_result xml_document::load_buffer_inplace(void* contents, size_t size, unsigned int options, xml_encoding encoding)
+	{
+		reset();
+
+		return impl::load_buffer_impl(static_cast<impl::xml_document_struct*>(_root), _root, contents, size, options, encoding, true, false, &_buffer);
+	}
+
+	PUGI__FN xml_parse_result xml_document::load_buffer_inplace_own(void* contents, size_t size, unsigned int options, xml_encoding encoding)
+	{
+		reset();
+
+		return impl::load_buffer_impl(static_cast<impl::xml_document_struct*>(_root), _root, contents, size, options, encoding, true, true, &_buffer);
+	}
+
+	PUGI__FN void xml_document::save(xml_writer& writer, const char_t* indent, unsigned int flags, xml_encoding encoding) const
+	{
+		impl::xml_buffered_writer buffered_writer(writer, encoding);
+
+		if ((flags & format_write_bom) && encoding != encoding_latin1)
+		{
+			// BOM always represents the codepoint U+FEFF, so just write it in native encoding
+		#ifdef PUGIXML_WCHAR_MODE
+			unsigned int bom = 0xfeff;
+			buffered_writer.write(static_cast<wchar_t>(bom));
+		#else
+			buffered_writer.write('\xef', '\xbb', '\xbf');
+		#endif
+		}
+
+		if (!(flags & format_no_declaration) && !impl::has_declaration(_root))
+		{
+			buffered_writer.write_string(PUGIXML_TEXT("<?xml version=\"1.0\""));
+			if (encoding == encoding_latin1) buffered_writer.write_string(PUGIXML_TEXT(" encoding=\"ISO-8859-1\""));
+			buffered_writer.write('?', '>');
+			if (!(flags & format_raw)) buffered_writer.write('\n');
+		}
+
+		impl::node_output(buffered_writer, _root, indent, flags, 0);
+
+		buffered_writer.flush();
+	}
+
+#ifndef PUGIXML_NO_STL
+	PUGI__FN void xml_document::save(std::basic_ostream<char, std::char_traits<char> >& stream, const char_t* indent, unsigned int flags, xml_encoding encoding) const
+	{
+		xml_writer_stream writer(stream);
+
+		save(writer, indent, flags, encoding);
+	}
+
+	PUGI__FN void xml_document::save(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& stream, const char_t* indent, unsigned int flags) const
+	{
+		xml_writer_stream writer(stream);
+
+		save(writer, indent, flags, encoding_wchar);
+	}
+#endif
+
+	PUGI__FN bool xml_document::save_file(const char* path_, const char_t* indent, unsigned int flags, xml_encoding encoding) const
+	{
+		using impl::auto_deleter; // MSVC7 workaround
+		auto_deleter<FILE> file(fopen(path_, (flags & format_save_file_text) ? "w" : "wb"), impl::close_file);
+
+		return impl::save_file_impl(*this, file.data, indent, flags, encoding);
+	}
+
+	PUGI__FN bool xml_document::save_file(const wchar_t* path_, const char_t* indent, unsigned int flags, xml_encoding encoding) const
+	{
+		using impl::auto_deleter; // MSVC7 workaround
+		auto_deleter<FILE> file(impl::open_file_wide(path_, (flags & format_save_file_text) ? L"w" : L"wb"), impl::close_file);
+
+		return impl::save_file_impl(*this, file.data, indent, flags, encoding);
+	}
+
+	PUGI__FN xml_node xml_document::document_element() const
+	{
+		assert(_root);
+
+		for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling)
+			if (PUGI__NODETYPE(i) == node_element)
+				return xml_node(i);
+
+		return xml_node();
+	}
+
+#ifndef PUGIXML_NO_STL
+	PUGI__FN std::string PUGIXML_FUNCTION as_utf8(const wchar_t* str)
+	{
+		assert(str);
+
+		return impl::as_utf8_impl(str, impl::strlength_wide(str));
+	}
+
+	PUGI__FN std::string PUGIXML_FUNCTION as_utf8(const std::basic_string<wchar_t>& str)
+	{
+		return impl::as_utf8_impl(str.c_str(), str.size());
+	}
+
+	PUGI__FN std::basic_string<wchar_t> PUGIXML_FUNCTION as_wide(const char* str)
+	{
+		assert(str);
+
+		return impl::as_wide_impl(str, strlen(str));
+	}
+
+	PUGI__FN std::basic_string<wchar_t> PUGIXML_FUNCTION as_wide(const std::string& str)
+	{
+		return impl::as_wide_impl(str.c_str(), str.size());
+	}
+#endif
+
+	PUGI__FN void PUGIXML_FUNCTION set_memory_management_functions(allocation_function allocate, deallocation_function deallocate)
+	{
+		impl::xml_memory::allocate = allocate;
+		impl::xml_memory::deallocate = deallocate;
+	}
+
+	PUGI__FN allocation_function PUGIXML_FUNCTION get_memory_allocation_function()
+	{
+		return impl::xml_memory::allocate;
+	}
+
+	PUGI__FN deallocation_function PUGIXML_FUNCTION get_memory_deallocation_function()
+	{
+		return impl::xml_memory::deallocate;
+	}
+}
+
+#if !defined(PUGIXML_NO_STL) && (defined(_MSC_VER) || defined(__ICC))
+namespace std
+{
+	// Workarounds for (non-standard) iterator category detection for older versions (MSVC7/IC8 and earlier)
+	PUGI__FN std::bidirectional_iterator_tag _Iter_cat(const pugi::xml_node_iterator&)
+	{
+		return std::bidirectional_iterator_tag();
+	}
+
+	PUGI__FN std::bidirectional_iterator_tag _Iter_cat(const pugi::xml_attribute_iterator&)
+	{
+		return std::bidirectional_iterator_tag();
+	}
+
+	PUGI__FN std::bidirectional_iterator_tag _Iter_cat(const pugi::xml_named_node_iterator&)
+	{
+		return std::bidirectional_iterator_tag();
+	}
+}
+#endif
+
+#if !defined(PUGIXML_NO_STL) && defined(__SUNPRO_CC)
+namespace std
+{
+	// Workarounds for (non-standard) iterator category detection
+	PUGI__FN std::bidirectional_iterator_tag __iterator_category(const pugi::xml_node_iterator&)
+	{
+		return std::bidirectional_iterator_tag();
+	}
+
+	PUGI__FN std::bidirectional_iterator_tag __iterator_category(const pugi::xml_attribute_iterator&)
+	{
+		return std::bidirectional_iterator_tag();
+	}
+
+	PUGI__FN std::bidirectional_iterator_tag __iterator_category(const pugi::xml_named_node_iterator&)
+	{
+		return std::bidirectional_iterator_tag();
+	}
+}
+#endif
+
+#ifndef PUGIXML_NO_XPATH
+// STL replacements
+PUGI__NS_BEGIN
+	struct equal_to
+	{
+		template <typename T> bool operator()(const T& lhs, const T& rhs) const
+		{
+			return lhs == rhs;
+		}
+	};
+
+	struct not_equal_to
+	{
+		template <typename T> bool operator()(const T& lhs, const T& rhs) const
+		{
+			return lhs != rhs;
+		}
+	};
+
+	struct less
+	{
+		template <typename T> bool operator()(const T& lhs, const T& rhs) const
+		{
+			return lhs < rhs;
+		}
+	};
+
+	struct less_equal
+	{
+		template <typename T> bool operator()(const T& lhs, const T& rhs) const
+		{
+			return lhs <= rhs;
+		}
+	};
+
+	template <typename T> void swap(T& lhs, T& rhs)
+	{
+		T temp = lhs;
+		lhs = rhs;
+		rhs = temp;
+	}
+
+	template <typename I, typename Pred> I min_element(I begin, I end, const Pred& pred)
+	{
+		I result = begin;
+
+		for (I it = begin + 1; it != end; ++it)
+			if (pred(*it, *result))
+				result = it;
+
+		return result;
+	}
+
+	template <typename I> void reverse(I begin, I end)
+	{
+		while (end - begin > 1) swap(*begin++, *--end);
+	}
+
+	template <typename I> I unique(I begin, I end)
+	{
+		// fast skip head
+		while (end - begin > 1 && *begin != *(begin + 1)) begin++;
+
+		if (begin == end) return begin;
+
+		// last written element
+		I write = begin++;
+
+		// merge unique elements
+		while (begin != end)
+		{
+			if (*begin != *write)
+				*++write = *begin++;
+			else
+				begin++;
+		}
+
+		// past-the-end (write points to live element)
+		return write + 1;
+	}
+
+	template <typename T, typename Pred> void insertion_sort(T* begin, T* end, const Pred& pred)
+	{
+		if (begin == end)
+			return;
+
+		for (T* it = begin + 1; it != end; ++it)
+		{
+			T val = *it;
+			T* hole = it;
+
+			// move hole backwards
+			while (hole > begin && pred(val, *(hole - 1)))
+			{
+				*hole = *(hole - 1);
+				hole--;
+			}
+
+			// fill hole with element
+			*hole = val;
+		}
+	}
+
+	template <typename I, typename Pred> I median3(I first, I middle, I last, const Pred& pred)
+	{
+		if (pred(*middle, *first)) swap(middle, first);
+		if (pred(*last, *middle)) swap(last, middle);
+		if (pred(*middle, *first)) swap(middle, first);
+
+		return middle;
+	}
+
+	template <typename T, typename Pred> void partition3(T* begin, T* end, T pivot, const Pred& pred, T** out_eqbeg, T** out_eqend)
+	{
+		// invariant: array is split into 4 groups: = < ? > (each variable denotes the boundary between the groups)
+		T* eq = begin;
+		T* lt = begin;
+		T* gt = end;
+
+		while (lt < gt)
+		{
+			if (pred(*lt, pivot))
+				lt++;
+			else if (*lt == pivot)
+				swap(*eq++, *lt++);
+			else
+				swap(*lt, *--gt);
+		}
+
+		// we now have just 4 groups: = < >; move equal elements to the middle
+		T* eqbeg = gt;
+
+		for (T* it = begin; it != eq; ++it)
+			swap(*it, *--eqbeg);
+
+		*out_eqbeg = eqbeg;
+		*out_eqend = gt;
+	}
+
+	template <typename I, typename Pred> void sort(I begin, I end, const Pred& pred)
+	{
+		// sort large chunks
+		while (end - begin > 16)
+		{
+			// find median element
+			I middle = begin + (end - begin) / 2;
+			I median = median3(begin, middle, end - 1, pred);
+
+			// partition in three chunks (< = >)
+			I eqbeg, eqend;
+			partition3(begin, end, *median, pred, &eqbeg, &eqend);
+
+			// loop on larger half
+			if (eqbeg - begin > end - eqend)
+			{
+				sort(eqend, end, pred);
+				end = eqbeg;
+			}
+			else
+			{
+				sort(begin, eqbeg, pred);
+				begin = eqend;
+			}
+		}
+
+		// insertion sort small chunk
+		insertion_sort(begin, end, pred);
+	}
+PUGI__NS_END
+
+// Allocator used for AST and evaluation stacks
+PUGI__NS_BEGIN
+	static const size_t xpath_memory_page_size =
+	#ifdef PUGIXML_MEMORY_XPATH_PAGE_SIZE
+		PUGIXML_MEMORY_XPATH_PAGE_SIZE
+	#else
+		4096
+	#endif
+		;
+
+	static const uintptr_t xpath_memory_block_alignment = sizeof(double) > sizeof(void*) ? sizeof(double) : sizeof(void*);
+
+	struct xpath_memory_block
+	{
+		xpath_memory_block* next;
+		size_t capacity;
+
+		union
+		{
+			char data[xpath_memory_page_size];
+			double alignment;
+		};
+	};
+
+	struct xpath_allocator
+	{
+		xpath_memory_block* _root;
+		size_t _root_size;
+		bool* _error;
+
+		xpath_allocator(xpath_memory_block* root, bool* error = 0): _root(root), _root_size(0), _error(error)
+		{
+		}
+
+		void* allocate(size_t size)
+		{
+			// round size up to block alignment boundary
+			size = (size + xpath_memory_block_alignment - 1) & ~(xpath_memory_block_alignment - 1);
+
+			if (_root_size + size <= _root->capacity)
+			{
+				void* buf = &_root->data[0] + _root_size;
+				_root_size += size;
+				return buf;
+			}
+			else
+			{
+				// make sure we have at least 1/4th of the page free after allocation to satisfy subsequent allocation requests
+				size_t block_capacity_base = sizeof(_root->data);
+				size_t block_capacity_req = size + block_capacity_base / 4;
+				size_t block_capacity = (block_capacity_base > block_capacity_req) ? block_capacity_base : block_capacity_req;
+
+				size_t block_size = block_capacity + offsetof(xpath_memory_block, data);
+
+				xpath_memory_block* block = static_cast<xpath_memory_block*>(xml_memory::allocate(block_size));
+				if (!block)
+				{
+					if (_error) *_error = true;
+					return 0;
+				}
+
+				block->next = _root;
+				block->capacity = block_capacity;
+
+				_root = block;
+				_root_size = size;
+
+				return block->data;
+			}
+		}
+
+		void* reallocate(void* ptr, size_t old_size, size_t new_size)
+		{
+			// round size up to block alignment boundary
+			old_size = (old_size + xpath_memory_block_alignment - 1) & ~(xpath_memory_block_alignment - 1);
+			new_size = (new_size + xpath_memory_block_alignment - 1) & ~(xpath_memory_block_alignment - 1);
+
+			// we can only reallocate the last object
+			assert(ptr == 0 || static_cast<char*>(ptr) + old_size == &_root->data[0] + _root_size);
+
+			// try to reallocate the object inplace
+			if (ptr && _root_size - old_size + new_size <= _root->capacity)
+			{
+				_root_size = _root_size - old_size + new_size;
+				return ptr;
+			}
+
+			// allocate a new block
+			void* result = allocate(new_size);
+			if (!result) return 0;
+
+			// we have a new block
+			if (ptr)
+			{
+				// copy old data (we only support growing)
+				assert(new_size >= old_size);
+				memcpy(result, ptr, old_size);
+
+				// free the previous page if it had no other objects
+				assert(_root->data == result);
+				assert(_root->next);
+
+				if (_root->next->data == ptr)
+				{
+					// deallocate the whole page, unless it was the first one
+					xpath_memory_block* next = _root->next->next;
+
+					if (next)
+					{
+						xml_memory::deallocate(_root->next);
+						_root->next = next;
+					}
+				}
+			}
+
+			return result;
+		}
+
+		void revert(const xpath_allocator& state)
+		{
+			// free all new pages
+			xpath_memory_block* cur = _root;
+
+			while (cur != state._root)
+			{
+				xpath_memory_block* next = cur->next;
+
+				xml_memory::deallocate(cur);
+
+				cur = next;
+			}
+
+			// restore state
+			_root = state._root;
+			_root_size = state._root_size;
+		}
+
+		void release()
+		{
+			xpath_memory_block* cur = _root;
+			assert(cur);
+
+			while (cur->next)
+			{
+				xpath_memory_block* next = cur->next;
+
+				xml_memory::deallocate(cur);
+
+				cur = next;
+			}
+		}
+	};
+
+	struct xpath_allocator_capture
+	{
+		xpath_allocator_capture(xpath_allocator* alloc): _target(alloc), _state(*alloc)
+		{
+		}
+
+		~xpath_allocator_capture()
+		{
+			_target->revert(_state);
+		}
+
+		xpath_allocator* _target;
+		xpath_allocator _state;
+	};
+
+	struct xpath_stack
+	{
+		xpath_allocator* result;
+		xpath_allocator* temp;
+	};
+
+	struct xpath_stack_data
+	{
+		xpath_memory_block blocks[2];
+		xpath_allocator result;
+		xpath_allocator temp;
+		xpath_stack stack;
+		bool oom;
+
+		xpath_stack_data(): result(blocks + 0, &oom), temp(blocks + 1, &oom), oom(false)
+		{
+			blocks[0].next = blocks[1].next = 0;
+			blocks[0].capacity = blocks[1].capacity = sizeof(blocks[0].data);
+
+			stack.result = &result;
+			stack.temp = &temp;
+		}
+
+		~xpath_stack_data()
+		{
+			result.release();
+			temp.release();
+		}
+	};
+PUGI__NS_END
+
+// String class
+PUGI__NS_BEGIN
+	class xpath_string
+	{
+		const char_t* _buffer;
+		bool _uses_heap;
+		size_t _length_heap;
+
+		static char_t* duplicate_string(const char_t* string, size_t length, xpath_allocator* alloc)
+		{
+			char_t* result = static_cast<char_t*>(alloc->allocate((length + 1) * sizeof(char_t)));
+			if (!result) return 0;
+
+			memcpy(result, string, length * sizeof(char_t));
+			result[length] = 0;
+
+			return result;
+		}
+
+		xpath_string(const char_t* buffer, bool uses_heap_, size_t length_heap): _buffer(buffer), _uses_heap(uses_heap_), _length_heap(length_heap)
+		{
+		}
+
+	public:
+		static xpath_string from_const(const char_t* str)
+		{
+			return xpath_string(str, false, 0);
+		}
+
+		static xpath_string from_heap_preallocated(const char_t* begin, const char_t* end)
+		{
+			assert(begin <= end && *end == 0);
+
+			return xpath_string(begin, true, static_cast<size_t>(end - begin));
+		}
+
+		static xpath_string from_heap(const char_t* begin, const char_t* end, xpath_allocator* alloc)
+		{
+			assert(begin <= end);
+
+			if (begin == end)
+				return xpath_string();
+
+			size_t length = static_cast<size_t>(end - begin);
+			const char_t* data = duplicate_string(begin, length, alloc);
+
+			return data ? xpath_string(data, true, length) : xpath_string();
+		}
+
+		xpath_string(): _buffer(PUGIXML_TEXT("")), _uses_heap(false), _length_heap(0)
+		{
+		}
+
+		void append(const xpath_string& o, xpath_allocator* alloc)
+		{
+			// skip empty sources
+			if (!*o._buffer) return;
+
+			// fast append for constant empty target and constant source
+			if (!*_buffer && !_uses_heap && !o._uses_heap)
+			{
+				_buffer = o._buffer;
+			}
+			else
+			{
+				// need to make heap copy
+				size_t target_length = length();
+				size_t source_length = o.length();
+				size_t result_length = target_length + source_length;
+
+				// allocate new buffer
+				char_t* result = static_cast<char_t*>(alloc->reallocate(_uses_heap ? const_cast<char_t*>(_buffer) : 0, (target_length + 1) * sizeof(char_t), (result_length + 1) * sizeof(char_t)));
+				if (!result) return;
+
+				// append first string to the new buffer in case there was no reallocation
+				if (!_uses_heap) memcpy(result, _buffer, target_length * sizeof(char_t));
+
+				// append second string to the new buffer
+				memcpy(result + target_length, o._buffer, source_length * sizeof(char_t));
+				result[result_length] = 0;
+
+				// finalize
+				_buffer = result;
+				_uses_heap = true;
+				_length_heap = result_length;
+			}
+		}
+
+		const char_t* c_str() const
+		{
+			return _buffer;
+		}
+
+		size_t length() const
+		{
+			return _uses_heap ? _length_heap : strlength(_buffer);
+		}
+
+		char_t* data(xpath_allocator* alloc)
+		{
+			// make private heap copy
+			if (!_uses_heap)
+			{
+				size_t length_ = strlength(_buffer);
+				const char_t* data_ = duplicate_string(_buffer, length_, alloc);
+
+				if (!data_) return 0;
+
+				_buffer = data_;
+				_uses_heap = true;
+				_length_heap = length_;
+			}
+
+			return const_cast<char_t*>(_buffer);
+		}
+
+		bool empty() const
+		{
+			return *_buffer == 0;
+		}
+
+		bool operator==(const xpath_string& o) const
+		{
+			return strequal(_buffer, o._buffer);
+		}
+
+		bool operator!=(const xpath_string& o) const
+		{
+			return !strequal(_buffer, o._buffer);
+		}
+
+		bool uses_heap() const
+		{
+			return _uses_heap;
+		}
+	};
+PUGI__NS_END
+
+PUGI__NS_BEGIN
+	PUGI__FN bool starts_with(const char_t* string, const char_t* pattern)
+	{
+		while (*pattern && *string == *pattern)
+		{
+			string++;
+			pattern++;
+		}
+
+		return *pattern == 0;
+	}
+
+	PUGI__FN const char_t* find_char(const char_t* s, char_t c)
+	{
+	#ifdef PUGIXML_WCHAR_MODE
+		return wcschr(s, c);
+	#else
+		return strchr(s, c);
+	#endif
+	}
+
+	PUGI__FN const char_t* find_substring(const char_t* s, const char_t* p)
+	{
+	#ifdef PUGIXML_WCHAR_MODE
+		// MSVC6 wcsstr bug workaround (if s is empty it always returns 0)
+		return (*p == 0) ? s : wcsstr(s, p);
+	#else
+		return strstr(s, p);
+	#endif
+	}
+
+	// Converts symbol to lower case, if it is an ASCII one
+	PUGI__FN char_t tolower_ascii(char_t ch)
+	{
+		return static_cast<unsigned int>(ch - 'A') < 26 ? static_cast<char_t>(ch | ' ') : ch;
+	}
+
+	PUGI__FN xpath_string string_value(const xpath_node& na, xpath_allocator* alloc)
+	{
+		if (na.attribute())
+			return xpath_string::from_const(na.attribute().value());
+		else
+		{
+			xml_node n = na.node();
+
+			switch (n.type())
+			{
+			case node_pcdata:
+			case node_cdata:
+			case node_comment:
+			case node_pi:
+				return xpath_string::from_const(n.value());
+
+			case node_document:
+			case node_element:
+			{
+				xpath_string result;
+
+				// element nodes can have value if parse_embed_pcdata was used
+				if (n.value()[0])
+					result.append(xpath_string::from_const(n.value()), alloc);
+
+				xml_node cur = n.first_child();
+
+				while (cur && cur != n)
+				{
+					if (cur.type() == node_pcdata || cur.type() == node_cdata)
+						result.append(xpath_string::from_const(cur.value()), alloc);
+
+					if (cur.first_child())
+						cur = cur.first_child();
+					else if (cur.next_sibling())
+						cur = cur.next_sibling();
+					else
+					{
+						while (!cur.next_sibling() && cur != n)
+							cur = cur.parent();
+
+						if (cur != n) cur = cur.next_sibling();
+					}
+				}
+
+				return result;
+			}
+
+			default:
+				return xpath_string();
+			}
+		}
+	}
+
+	PUGI__FN bool node_is_before_sibling(xml_node_struct* ln, xml_node_struct* rn)
+	{
+		assert(ln->parent == rn->parent);
+
+		// there is no common ancestor (the shared parent is null), nodes are from different documents
+		if (!ln->parent) return ln < rn;
+
+		// determine sibling order
+		xml_node_struct* ls = ln;
+		xml_node_struct* rs = rn;
+
+		while (ls && rs)
+		{
+			if (ls == rn) return true;
+			if (rs == ln) return false;
+
+			ls = ls->next_sibling;
+			rs = rs->next_sibling;
+		}
+
+		// if rn sibling chain ended ln must be before rn
+		return !rs;
+	}
+
+	PUGI__FN bool node_is_before(xml_node_struct* ln, xml_node_struct* rn)
+	{
+		// find common ancestor at the same depth, if any
+		xml_node_struct* lp = ln;
+		xml_node_struct* rp = rn;
+
+		while (lp && rp && lp->parent != rp->parent)
+		{
+			lp = lp->parent;
+			rp = rp->parent;
+		}
+
+		// parents are the same!
+		if (lp && rp) return node_is_before_sibling(lp, rp);
+
+		// nodes are at different depths, need to normalize heights
+		bool left_higher = !lp;
+
+		while (lp)
+		{
+			lp = lp->parent;
+			ln = ln->parent;
+		}
+
+		while (rp)
+		{
+			rp = rp->parent;
+			rn = rn->parent;
+		}
+
+		// one node is the ancestor of the other
+		if (ln == rn) return left_higher;
+
+		// find common ancestor... again
+		while (ln->parent != rn->parent)
+		{
+			ln = ln->parent;
+			rn = rn->parent;
+		}
+
+		return node_is_before_sibling(ln, rn);
+	}
+
+	PUGI__FN bool node_is_ancestor(xml_node_struct* parent, xml_node_struct* node)
+	{
+		while (node && node != parent) node = node->parent;
+
+		return parent && node == parent;
+	}
+
+	PUGI__FN const void* document_buffer_order(const xpath_node& xnode)
+	{
+		xml_node_struct* node = xnode.node().internal_object();
+
+		if (node)
+		{
+			if ((get_document(node).header & xml_memory_page_contents_shared_mask) == 0)
+			{
+				if (node->name && (node->header & impl::xml_memory_page_name_allocated_or_shared_mask) == 0) return node->name;
+				if (node->value && (node->header & impl::xml_memory_page_value_allocated_or_shared_mask) == 0) return node->value;
+			}
+
+			return 0;
+		}
+
+		xml_attribute_struct* attr = xnode.attribute().internal_object();
+
+		if (attr)
+		{
+			if ((get_document(attr).header & xml_memory_page_contents_shared_mask) == 0)
+			{
+				if ((attr->header & impl::xml_memory_page_name_allocated_or_shared_mask) == 0) return attr->name;
+				if ((attr->header & impl::xml_memory_page_value_allocated_or_shared_mask) == 0) return attr->value;
+			}
+
+			return 0;
+		}
+
+		return 0;
+	}
+
+	struct document_order_comparator
+	{
+		bool operator()(const xpath_node& lhs, const xpath_node& rhs) const
+		{
+			// optimized document order based check
+			const void* lo = document_buffer_order(lhs);
+			const void* ro = document_buffer_order(rhs);
+
+			if (lo && ro) return lo < ro;
+
+			// slow comparison
+			xml_node ln = lhs.node(), rn = rhs.node();
+
+			// compare attributes
+			if (lhs.attribute() && rhs.attribute())
+			{
+				// shared parent
+				if (lhs.parent() == rhs.parent())
+				{
+					// determine sibling order
+					for (xml_attribute a = lhs.attribute(); a; a = a.next_attribute())
+						if (a == rhs.attribute())
+							return true;
+
+					return false;
+				}
+
+				// compare attribute parents
+				ln = lhs.parent();
+				rn = rhs.parent();
+			}
+			else if (lhs.attribute())
+			{
+				// attributes go after the parent element
+				if (lhs.parent() == rhs.node()) return false;
+
+				ln = lhs.parent();
+			}
+			else if (rhs.attribute())
+			{
+				// attributes go after the parent element
+				if (rhs.parent() == lhs.node()) return true;
+
+				rn = rhs.parent();
+			}
+
+			if (ln == rn) return false;
+
+			if (!ln || !rn) return ln < rn;
+
+			return node_is_before(ln.internal_object(), rn.internal_object());
+		}
+	};
+
+	struct duplicate_comparator
+	{
+		bool operator()(const xpath_node& lhs, const xpath_node& rhs) const
+		{
+			if (lhs.attribute()) return rhs.attribute() ? lhs.attribute() < rhs.attribute() : true;
+			else return rhs.attribute() ? false : lhs.node() < rhs.node();
+		}
+	};
+
+	PUGI__FN double gen_nan()
+	{
+	#if defined(__STDC_IEC_559__) || ((FLT_RADIX - 0 == 2) && (FLT_MAX_EXP - 0 == 128) && (FLT_MANT_DIG - 0 == 24))
+		PUGI__STATIC_ASSERT(sizeof(float) == sizeof(uint32_t));
+		typedef uint32_t UI; // BCC5 workaround
+		union { float f; UI i; } u;
+		u.i = 0x7fc00000;
+		return u.f;
+	#else
+		// fallback
+		const volatile double zero = 0.0;
+		return zero / zero;
+	#endif
+	}
+
+	PUGI__FN bool is_nan(double value)
+	{
+	#if defined(PUGI__MSVC_CRT_VERSION) || defined(__BORLANDC__)
+		return !!_isnan(value);
+	#elif defined(fpclassify) && defined(FP_NAN)
+		return fpclassify(value) == FP_NAN;
+	#else
+		// fallback
+		const volatile double v = value;
+		return v != v;
+	#endif
+	}
+
+	PUGI__FN const char_t* convert_number_to_string_special(double value)
+	{
+	#if defined(PUGI__MSVC_CRT_VERSION) || defined(__BORLANDC__)
+		if (_finite(value)) return (value == 0) ? PUGIXML_TEXT("0") : 0;
+		if (_isnan(value)) return PUGIXML_TEXT("NaN");
+		return value > 0 ? PUGIXML_TEXT("Infinity") : PUGIXML_TEXT("-Infinity");
+	#elif defined(fpclassify) && defined(FP_NAN) && defined(FP_INFINITE) && defined(FP_ZERO)
+		switch (fpclassify(value))
+		{
+		case FP_NAN:
+			return PUGIXML_TEXT("NaN");
+
+		case FP_INFINITE:
+			return value > 0 ? PUGIXML_TEXT("Infinity") : PUGIXML_TEXT("-Infinity");
+
+		case FP_ZERO:
+			return PUGIXML_TEXT("0");
+
+		default:
+			return 0;
+		}
+	#else
+		// fallback
+		const volatile double v = value;
+
+		if (v == 0) return PUGIXML_TEXT("0");
+		if (v != v) return PUGIXML_TEXT("NaN");
+		if (v * 2 == v) return value > 0 ? PUGIXML_TEXT("Infinity") : PUGIXML_TEXT("-Infinity");
+		return 0;
+	#endif
+	}
+
+	PUGI__FN bool convert_number_to_boolean(double value)
+	{
+		return (value != 0 && !is_nan(value));
+	}
+
+	PUGI__FN void truncate_zeros(char* begin, char* end)
+	{
+		while (begin != end && end[-1] == '0') end--;
+
+		*end = 0;
+	}
+
+	// gets mantissa digits in the form of 0.xxxxx with 0. implied and the exponent
+#if defined(PUGI__MSVC_CRT_VERSION) && PUGI__MSVC_CRT_VERSION >= 1400 && !defined(_WIN32_WCE)
+	PUGI__FN void convert_number_to_mantissa_exponent(double value, char (&buffer)[32], char** out_mantissa, int* out_exponent)
+	{
+		// get base values
+		int sign, exponent;
+		_ecvt_s(buffer, sizeof(buffer), value, DBL_DIG + 1, &exponent, &sign);
+
+		// truncate redundant zeros
+		truncate_zeros(buffer, buffer + strlen(buffer));
+
+		// fill results
+		*out_mantissa = buffer;
+		*out_exponent = exponent;
+	}
+#else
+	PUGI__FN void convert_number_to_mantissa_exponent(double value, char (&buffer)[32], char** out_mantissa, int* out_exponent)
+	{
+		// get a scientific notation value with IEEE DBL_DIG decimals
+		PUGI__SNPRINTF(buffer, "%.*e", DBL_DIG, value);
+
+		// get the exponent (possibly negative)
+		char* exponent_string = strchr(buffer, 'e');
+		assert(exponent_string);
+
+		int exponent = atoi(exponent_string + 1);
+
+		// extract mantissa string: skip sign
+		char* mantissa = buffer[0] == '-' ? buffer + 1 : buffer;
+		assert(mantissa[0] != '0' && mantissa[1] == '.');
+
+		// divide mantissa by 10 to eliminate integer part
+		mantissa[1] = mantissa[0];
+		mantissa++;
+		exponent++;
+
+		// remove extra mantissa digits and zero-terminate mantissa
+		truncate_zeros(mantissa, exponent_string);
+
+		// fill results
+		*out_mantissa = mantissa;
+		*out_exponent = exponent;
+	}
+#endif
+
+	PUGI__FN xpath_string convert_number_to_string(double value, xpath_allocator* alloc)
+	{
+		// try special number conversion
+		const char_t* special = convert_number_to_string_special(value);
+		if (special) return xpath_string::from_const(special);
+
+		// get mantissa + exponent form
+		char mantissa_buffer[32];
+
+		char* mantissa;
+		int exponent;
+		convert_number_to_mantissa_exponent(value, mantissa_buffer, &mantissa, &exponent);
+
+		// allocate a buffer of suitable length for the number
+		size_t result_size = strlen(mantissa_buffer) + (exponent > 0 ? exponent : -exponent) + 4;
+		char_t* result = static_cast<char_t*>(alloc->allocate(sizeof(char_t) * result_size));
+		if (!result) return xpath_string();
+
+		// make the number!
+		char_t* s = result;
+
+		// sign
+		if (value < 0) *s++ = '-';
+
+		// integer part
+		if (exponent <= 0)
+		{
+			*s++ = '0';
+		}
+		else
+		{
+			while (exponent > 0)
+			{
+				assert(*mantissa == 0 || static_cast<unsigned int>(*mantissa - '0') <= 9);
+				*s++ = *mantissa ? *mantissa++ : '0';
+				exponent--;
+			}
+		}
+
+		// fractional part
+		if (*mantissa)
+		{
+			// decimal point
+			*s++ = '.';
+
+			// extra zeroes from negative exponent
+			while (exponent < 0)
+			{
+				*s++ = '0';
+				exponent++;
+			}
+
+			// extra mantissa digits
+			while (*mantissa)
+			{
+				assert(static_cast<unsigned int>(*mantissa - '0') <= 9);
+				*s++ = *mantissa++;
+			}
+		}
+
+		// zero-terminate
+		assert(s < result + result_size);
+		*s = 0;
+
+		return xpath_string::from_heap_preallocated(result, s);
+	}
+
+	PUGI__FN bool check_string_to_number_format(const char_t* string)
+	{
+		// parse leading whitespace
+		while (PUGI__IS_CHARTYPE(*string, ct_space)) ++string;
+
+		// parse sign
+		if (*string == '-') ++string;
+
+		if (!*string) return false;
+
+		// if there is no integer part, there should be a decimal part with at least one digit
+		if (!PUGI__IS_CHARTYPEX(string[0], ctx_digit) && (string[0] != '.' || !PUGI__IS_CHARTYPEX(string[1], ctx_digit))) return false;
+
+		// parse integer part
+		while (PUGI__IS_CHARTYPEX(*string, ctx_digit)) ++string;
+
+		// parse decimal part
+		if (*string == '.')
+		{
+			++string;
+
+			while (PUGI__IS_CHARTYPEX(*string, ctx_digit)) ++string;
+		}
+
+		// parse trailing whitespace
+		while (PUGI__IS_CHARTYPE(*string, ct_space)) ++string;
+
+		return *string == 0;
+	}
+
+	PUGI__FN double convert_string_to_number(const char_t* string)
+	{
+		// check string format
+		if (!check_string_to_number_format(string)) return gen_nan();
+
+		// parse string
+	#ifdef PUGIXML_WCHAR_MODE
+		return wcstod(string, 0);
+	#else
+		return strtod(string, 0);
+	#endif
+	}
+
+	PUGI__FN bool convert_string_to_number_scratch(char_t (&buffer)[32], const char_t* begin, const char_t* end, double* out_result)
+	{
+		size_t length = static_cast<size_t>(end - begin);
+		char_t* scratch = buffer;
+
+		if (length >= sizeof(buffer) / sizeof(buffer[0]))
+		{
+			// need to make dummy on-heap copy
+			scratch = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
+			if (!scratch) return false;
+		}
+
+		// copy string to zero-terminated buffer and perform conversion
+		memcpy(scratch, begin, length * sizeof(char_t));
+		scratch[length] = 0;
+
+		*out_result = convert_string_to_number(scratch);
+
+		// free dummy buffer
+		if (scratch != buffer) xml_memory::deallocate(scratch);
+
+		return true;
+	}
+
+	PUGI__FN double round_nearest(double value)
+	{
+		return floor(value + 0.5);
+	}
+
+	PUGI__FN double round_nearest_nzero(double value)
+	{
+		// same as round_nearest, but returns -0 for [-0.5, -0]
+		// ceil is used to differentiate between +0 and -0 (we return -0 for [-0.5, -0] and +0 for +0)
+		return (value >= -0.5 && value <= 0) ? ceil(value) : floor(value + 0.5);
+	}
+
+	PUGI__FN const char_t* qualified_name(const xpath_node& node)
+	{
+		return node.attribute() ? node.attribute().name() : node.node().name();
+	}
+
+	PUGI__FN const char_t* local_name(const xpath_node& node)
+	{
+		const char_t* name = qualified_name(node);
+		const char_t* p = find_char(name, ':');
+
+		return p ? p + 1 : name;
+	}
+
+	struct namespace_uri_predicate
+	{
+		const char_t* prefix;
+		size_t prefix_length;
+
+		namespace_uri_predicate(const char_t* name)
+		{
+			const char_t* pos = find_char(name, ':');
+
+			prefix = pos ? name : 0;
+			prefix_length = pos ? static_cast<size_t>(pos - name) : 0;
+		}
+
+		bool operator()(xml_attribute a) const
+		{
+			const char_t* name = a.name();
+
+			if (!starts_with(name, PUGIXML_TEXT("xmlns"))) return false;
+
+			return prefix ? name[5] == ':' && strequalrange(name + 6, prefix, prefix_length) : name[5] == 0;
+		}
+	};
+
+	PUGI__FN const char_t* namespace_uri(xml_node node)
+	{
+		namespace_uri_predicate pred = node.name();
+
+		xml_node p = node;
+
+		while (p)
+		{
+			xml_attribute a = p.find_attribute(pred);
+
+			if (a) return a.value();
+
+			p = p.parent();
+		}
+
+		return PUGIXML_TEXT("");
+	}
+
+	PUGI__FN const char_t* namespace_uri(xml_attribute attr, xml_node parent)
+	{
+		namespace_uri_predicate pred = attr.name();
+
+		// Default namespace does not apply to attributes
+		if (!pred.prefix) return PUGIXML_TEXT("");
+
+		xml_node p = parent;
+
+		while (p)
+		{
+			xml_attribute a = p.find_attribute(pred);
+
+			if (a) return a.value();
+
+			p = p.parent();
+		}
+
+		return PUGIXML_TEXT("");
+	}
+
+	PUGI__FN const char_t* namespace_uri(const xpath_node& node)
+	{
+		return node.attribute() ? namespace_uri(node.attribute(), node.parent()) : namespace_uri(node.node());
+	}
+
+	PUGI__FN char_t* normalize_space(char_t* buffer)
+	{
+		char_t* write = buffer;
+
+		for (char_t* it = buffer; *it; )
+		{
+			char_t ch = *it++;
+
+			if (PUGI__IS_CHARTYPE(ch, ct_space))
+			{
+				// replace whitespace sequence with single space
+				while (PUGI__IS_CHARTYPE(*it, ct_space)) it++;
+
+				// avoid leading spaces
+				if (write != buffer) *write++ = ' ';
+			}
+			else *write++ = ch;
+		}
+
+		// remove trailing space
+		if (write != buffer && PUGI__IS_CHARTYPE(write[-1], ct_space)) write--;
+
+		// zero-terminate
+		*write = 0;
+
+		return write;
+	}
+
+	PUGI__FN char_t* translate(char_t* buffer, const char_t* from, const char_t* to, size_t to_length)
+	{
+		char_t* write = buffer;
+
+		while (*buffer)
+		{
+			PUGI__DMC_VOLATILE char_t ch = *buffer++;
+
+			const char_t* pos = find_char(from, ch);
+
+			if (!pos)
+				*write++ = ch; // do not process
+			else if (static_cast<size_t>(pos - from) < to_length)
+				*write++ = to[pos - from]; // replace
+		}
+
+		// zero-terminate
+		*write = 0;
+
+		return write;
+	}
+
+	PUGI__FN unsigned char* translate_table_generate(xpath_allocator* alloc, const char_t* from, const char_t* to)
+	{
+		unsigned char table[128] = {0};
+
+		while (*from)
+		{
+			unsigned int fc = static_cast<unsigned int>(*from);
+			unsigned int tc = static_cast<unsigned int>(*to);
+
+			if (fc >= 128 || tc >= 128)
+				return 0;
+
+			// code=128 means "skip character"
+			if (!table[fc])
+				table[fc] = static_cast<unsigned char>(tc ? tc : 128);
+
+			from++;
+			if (tc) to++;
+		}
+
+		for (int i = 0; i < 128; ++i)
+			if (!table[i])
+				table[i] = static_cast<unsigned char>(i);
+
+		void* result = alloc->allocate(sizeof(table));
+		if (!result) return 0;
+
+		memcpy(result, table, sizeof(table));
+
+		return static_cast<unsigned char*>(result);
+	}
+
+	PUGI__FN char_t* translate_table(char_t* buffer, const unsigned char* table)
+	{
+		char_t* write = buffer;
+
+		while (*buffer)
+		{
+			char_t ch = *buffer++;
+			unsigned int index = static_cast<unsigned int>(ch);
+
+			if (index < 128)
+			{
+				unsigned char code = table[index];
+
+				// code=128 means "skip character" (table size is 128 so 128 can be a special value)
+				// this code skips these characters without extra branches
+				*write = static_cast<char_t>(code);
+				write += 1 - (code >> 7);
+			}
+			else
+			{
+				*write++ = ch;
+			}
+		}
+
+		// zero-terminate
+		*write = 0;
+
+		return write;
+	}
+
+	inline bool is_xpath_attribute(const char_t* name)
+	{
+		return !(starts_with(name, PUGIXML_TEXT("xmlns")) && (name[5] == 0 || name[5] == ':'));
+	}
+
+	struct xpath_variable_boolean: xpath_variable
+	{
+		xpath_variable_boolean(): xpath_variable(xpath_type_boolean), value(false)
+		{
+		}
+
+		bool value;
+		char_t name[1];
+	};
+
+	struct xpath_variable_number: xpath_variable
+	{
+		xpath_variable_number(): xpath_variable(xpath_type_number), value(0)
+		{
+		}
+
+		double value;
+		char_t name[1];
+	};
+
+	struct xpath_variable_string: xpath_variable
+	{
+		xpath_variable_string(): xpath_variable(xpath_type_string), value(0)
+		{
+		}
+
+		~xpath_variable_string()
+		{
+			if (value) xml_memory::deallocate(value);
+		}
+
+		char_t* value;
+		char_t name[1];
+	};
+
+	struct xpath_variable_node_set: xpath_variable
+	{
+		xpath_variable_node_set(): xpath_variable(xpath_type_node_set)
+		{
+		}
+
+		xpath_node_set value;
+		char_t name[1];
+	};
+
+	static const xpath_node_set dummy_node_set;
+
+	PUGI__FN PUGI__UNSIGNED_OVERFLOW unsigned int hash_string(const char_t* str)
+	{
+		// Jenkins one-at-a-time hash (http://en.wikipedia.org/wiki/Jenkins_hash_function#one-at-a-time)
+		unsigned int result = 0;
+
+		while (*str)
+		{
+			result += static_cast<unsigned int>(*str++);
+			result += result << 10;
+			result ^= result >> 6;
+		}
+
+		result += result << 3;
+		result ^= result >> 11;
+		result += result << 15;
+
+		return result;
+	}
+
+	template <typename T> PUGI__FN T* new_xpath_variable(const char_t* name)
+	{
+		size_t length = strlength(name);
+		if (length == 0) return 0; // empty variable names are invalid
+
+		// $$ we can't use offsetof(T, name) because T is non-POD, so we just allocate additional length characters
+		void* memory = xml_memory::allocate(sizeof(T) + length * sizeof(char_t));
+		if (!memory) return 0;
+
+		T* result = new (memory) T();
+
+		memcpy(result->name, name, (length + 1) * sizeof(char_t));
+
+		return result;
+	}
+
+	PUGI__FN xpath_variable* new_xpath_variable(xpath_value_type type, const char_t* name)
+	{
+		switch (type)
+		{
+		case xpath_type_node_set:
+			return new_xpath_variable<xpath_variable_node_set>(name);
+
+		case xpath_type_number:
+			return new_xpath_variable<xpath_variable_number>(name);
+
+		case xpath_type_string:
+			return new_xpath_variable<xpath_variable_string>(name);
+
+		case xpath_type_boolean:
+			return new_xpath_variable<xpath_variable_boolean>(name);
+
+		default:
+			return 0;
+		}
+	}
+
+	template <typename T> PUGI__FN void delete_xpath_variable(T* var)
+	{
+		var->~T();
+		xml_memory::deallocate(var);
+	}
+
+	PUGI__FN void delete_xpath_variable(xpath_value_type type, xpath_variable* var)
+	{
+		switch (type)
+		{
+		case xpath_type_node_set:
+			delete_xpath_variable(static_cast<xpath_variable_node_set*>(var));
+			break;
+
+		case xpath_type_number:
+			delete_xpath_variable(static_cast<xpath_variable_number*>(var));
+			break;
+
+		case xpath_type_string:
+			delete_xpath_variable(static_cast<xpath_variable_string*>(var));
+			break;
+
+		case xpath_type_boolean:
+			delete_xpath_variable(static_cast<xpath_variable_boolean*>(var));
+			break;
+
+		default:
+			assert(false && "Invalid variable type"); // unreachable
+		}
+	}
+
+	PUGI__FN bool copy_xpath_variable(xpath_variable* lhs, const xpath_variable* rhs)
+	{
+		switch (rhs->type())
+		{
+		case xpath_type_node_set:
+			return lhs->set(static_cast<const xpath_variable_node_set*>(rhs)->value);
+
+		case xpath_type_number:
+			return lhs->set(static_cast<const xpath_variable_number*>(rhs)->value);
+
+		case xpath_type_string:
+			return lhs->set(static_cast<const xpath_variable_string*>(rhs)->value);
+
+		case xpath_type_boolean:
+			return lhs->set(static_cast<const xpath_variable_boolean*>(rhs)->value);
+
+		default:
+			assert(false && "Invalid variable type"); // unreachable
+			return false;
+		}
+	}
+
+	PUGI__FN bool get_variable_scratch(char_t (&buffer)[32], xpath_variable_set* set, const char_t* begin, const char_t* end, xpath_variable** out_result)
+	{
+		size_t length = static_cast<size_t>(end - begin);
+		char_t* scratch = buffer;
+
+		if (length >= sizeof(buffer) / sizeof(buffer[0]))
+		{
+			// need to make dummy on-heap copy
+			scratch = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
+			if (!scratch) return false;
+		}
+
+		// copy string to zero-terminated buffer and perform lookup
+		memcpy(scratch, begin, length * sizeof(char_t));
+		scratch[length] = 0;
+
+		*out_result = set->get(scratch);
+
+		// free dummy buffer
+		if (scratch != buffer) xml_memory::deallocate(scratch);
+
+		return true;
+	}
+PUGI__NS_END
+
+// Internal node set class
+PUGI__NS_BEGIN
+	PUGI__FN xpath_node_set::type_t xpath_get_order(const xpath_node* begin, const xpath_node* end)
+	{
+		if (end - begin < 2)
+			return xpath_node_set::type_sorted;
+
+		document_order_comparator cmp;
+
+		bool first = cmp(begin[0], begin[1]);
+
+		for (const xpath_node* it = begin + 1; it + 1 < end; ++it)
+			if (cmp(it[0], it[1]) != first)
+				return xpath_node_set::type_unsorted;
+
+		return first ? xpath_node_set::type_sorted : xpath_node_set::type_sorted_reverse;
+	}
+
+	PUGI__FN xpath_node_set::type_t xpath_sort(xpath_node* begin, xpath_node* end, xpath_node_set::type_t type, bool rev)
+	{
+		xpath_node_set::type_t order = rev ? xpath_node_set::type_sorted_reverse : xpath_node_set::type_sorted;
+
+		if (type == xpath_node_set::type_unsorted)
+		{
+			xpath_node_set::type_t sorted = xpath_get_order(begin, end);
+
+			if (sorted == xpath_node_set::type_unsorted)
+			{
+				sort(begin, end, document_order_comparator());
+
+				type = xpath_node_set::type_sorted;
+			}
+			else
+				type = sorted;
+		}
+
+		if (type != order) reverse(begin, end);
+
+		return order;
+	}
+
+	PUGI__FN xpath_node xpath_first(const xpath_node* begin, const xpath_node* end, xpath_node_set::type_t type)
+	{
+		if (begin == end) return xpath_node();
+
+		switch (type)
+		{
+		case xpath_node_set::type_sorted:
+			return *begin;
+
+		case xpath_node_set::type_sorted_reverse:
+			return *(end - 1);
+
+		case xpath_node_set::type_unsorted:
+			return *min_element(begin, end, document_order_comparator());
+
+		default:
+			assert(false && "Invalid node set type"); // unreachable
+			return xpath_node();
+		}
+	}
+
+	class xpath_node_set_raw
+	{
+		xpath_node_set::type_t _type;
+
+		xpath_node* _begin;
+		xpath_node* _end;
+		xpath_node* _eos;
+
+	public:
+		xpath_node_set_raw(): _type(xpath_node_set::type_unsorted), _begin(0), _end(0), _eos(0)
+		{
+		}
+
+		xpath_node* begin() const
+		{
+			return _begin;
+		}
+
+		xpath_node* end() const
+		{
+			return _end;
+		}
+
+		bool empty() const
+		{
+			return _begin == _end;
+		}
+
+		size_t size() const
+		{
+			return static_cast<size_t>(_end - _begin);
+		}
+
+		xpath_node first() const
+		{
+			return xpath_first(_begin, _end, _type);
+		}
+
+		void push_back_grow(const xpath_node& node, xpath_allocator* alloc);
+
+		void push_back(const xpath_node& node, xpath_allocator* alloc)
+		{
+			if (_end != _eos)
+				*_end++ = node;
+			else
+				push_back_grow(node, alloc);
+		}
+
+		void append(const xpath_node* begin_, const xpath_node* end_, xpath_allocator* alloc)
+		{
+			if (begin_ == end_) return;
+
+			size_t size_ = static_cast<size_t>(_end - _begin);
+			size_t capacity = static_cast<size_t>(_eos - _begin);
+			size_t count = static_cast<size_t>(end_ - begin_);
+
+			if (size_ + count > capacity)
+			{
+				// reallocate the old array or allocate a new one
+				xpath_node* data = static_cast<xpath_node*>(alloc->reallocate(_begin, capacity * sizeof(xpath_node), (size_ + count) * sizeof(xpath_node)));
+				if (!data) return;
+
+				// finalize
+				_begin = data;
+				_end = data + size_;
+				_eos = data + size_ + count;
+			}
+
+			memcpy(_end, begin_, count * sizeof(xpath_node));
+			_end += count;
+		}
+
+		void sort_do()
+		{
+			_type = xpath_sort(_begin, _end, _type, false);
+		}
+
+		void truncate(xpath_node* pos)
+		{
+			assert(_begin <= pos && pos <= _end);
+
+			_end = pos;
+		}
+
+		void remove_duplicates()
+		{
+			if (_type == xpath_node_set::type_unsorted)
+				sort(_begin, _end, duplicate_comparator());
+
+			_end = unique(_begin, _end);
+		}
+
+		xpath_node_set::type_t type() const
+		{
+			return _type;
+		}
+
+		void set_type(xpath_node_set::type_t value)
+		{
+			_type = value;
+		}
+	};
+
+	PUGI__FN_NO_INLINE void xpath_node_set_raw::push_back_grow(const xpath_node& node, xpath_allocator* alloc)
+	{
+		size_t capacity = static_cast<size_t>(_eos - _begin);
+
+		// get new capacity (1.5x rule)
+		size_t new_capacity = capacity + capacity / 2 + 1;
+
+		// reallocate the old array or allocate a new one
+		xpath_node* data = static_cast<xpath_node*>(alloc->reallocate(_begin, capacity * sizeof(xpath_node), new_capacity * sizeof(xpath_node)));
+		if (!data) return;
+
+		// finalize
+		_begin = data;
+		_end = data + capacity;
+		_eos = data + new_capacity;
+
+		// push
+		*_end++ = node;
+	}
+PUGI__NS_END
+
+PUGI__NS_BEGIN
+	struct xpath_context
+	{
+		xpath_node n;
+		size_t position, size;
+
+		xpath_context(const xpath_node& n_, size_t position_, size_t size_): n(n_), position(position_), size(size_)
+		{
+		}
+	};
+
+	enum lexeme_t
+	{
+		lex_none = 0,
+		lex_equal,
+		lex_not_equal,
+		lex_less,
+		lex_greater,
+		lex_less_or_equal,
+		lex_greater_or_equal,
+		lex_plus,
+		lex_minus,
+		lex_multiply,
+		lex_union,
+		lex_var_ref,
+		lex_open_brace,
+		lex_close_brace,
+		lex_quoted_string,
+		lex_number,
+		lex_slash,
+		lex_double_slash,
+		lex_open_square_brace,
+		lex_close_square_brace,
+		lex_string,
+		lex_comma,
+		lex_axis_attribute,
+		lex_dot,
+		lex_double_dot,
+		lex_double_colon,
+		lex_eof
+	};
+
+	struct xpath_lexer_string
+	{
+		const char_t* begin;
+		const char_t* end;
+
+		xpath_lexer_string(): begin(0), end(0)
+		{
+		}
+
+		bool operator==(const char_t* other) const
+		{
+			size_t length = static_cast<size_t>(end - begin);
+
+			return strequalrange(other, begin, length);
+		}
+	};
+
+	class xpath_lexer
+	{
+		const char_t* _cur;
+		const char_t* _cur_lexeme_pos;
+		xpath_lexer_string _cur_lexeme_contents;
+
+		lexeme_t _cur_lexeme;
+
+	public:
+		explicit xpath_lexer(const char_t* query): _cur(query)
+		{
+			next();
+		}
+
+		const char_t* state() const
+		{
+			return _cur;
+		}
+
+		void next()
+		{
+			const char_t* cur = _cur;
+
+			while (PUGI__IS_CHARTYPE(*cur, ct_space)) ++cur;
+
+			// save lexeme position for error reporting
+			_cur_lexeme_pos = cur;
+
+			switch (*cur)
+			{
+			case 0:
+				_cur_lexeme = lex_eof;
+				break;
+
+			case '>':
+				if (*(cur+1) == '=')
+				{
+					cur += 2;
+					_cur_lexeme = lex_greater_or_equal;
+				}
+				else
+				{
+					cur += 1;
+					_cur_lexeme = lex_greater;
+				}
+				break;
+
+			case '<':
+				if (*(cur+1) == '=')
+				{
+					cur += 2;
+					_cur_lexeme = lex_less_or_equal;
+				}
+				else
+				{
+					cur += 1;
+					_cur_lexeme = lex_less;
+				}
+				break;
+
+			case '!':
+				if (*(cur+1) == '=')
+				{
+					cur += 2;
+					_cur_lexeme = lex_not_equal;
+				}
+				else
+				{
+					_cur_lexeme = lex_none;
+				}
+				break;
+
+			case '=':
+				cur += 1;
+				_cur_lexeme = lex_equal;
+
+				break;
+
+			case '+':
+				cur += 1;
+				_cur_lexeme = lex_plus;
+
+				break;
+
+			case '-':
+				cur += 1;
+				_cur_lexeme = lex_minus;
+
+				break;
+
+			case '*':
+				cur += 1;
+				_cur_lexeme = lex_multiply;
+
+				break;
+
+			case '|':
+				cur += 1;
+				_cur_lexeme = lex_union;
+
+				break;
+
+			case '$':
+				cur += 1;
+
+				if (PUGI__IS_CHARTYPEX(*cur, ctx_start_symbol))
+				{
+					_cur_lexeme_contents.begin = cur;
+
+					while (PUGI__IS_CHARTYPEX(*cur, ctx_symbol)) cur++;
+
+					if (cur[0] == ':' && PUGI__IS_CHARTYPEX(cur[1], ctx_symbol)) // qname
+					{
+						cur++; // :
+
+						while (PUGI__IS_CHARTYPEX(*cur, ctx_symbol)) cur++;
+					}
+
+					_cur_lexeme_contents.end = cur;
+
+					_cur_lexeme = lex_var_ref;
+				}
+				else
+				{
+					_cur_lexeme = lex_none;
+				}
+
+				break;
+
+			case '(':
+				cur += 1;
+				_cur_lexeme = lex_open_brace;
+
+				break;
+
+			case ')':
+				cur += 1;
+				_cur_lexeme = lex_close_brace;
+
+				break;
+
+			case '[':
+				cur += 1;
+				_cur_lexeme = lex_open_square_brace;
+
+				break;
+
+			case ']':
+				cur += 1;
+				_cur_lexeme = lex_close_square_brace;
+
+				break;
+
+			case ',':
+				cur += 1;
+				_cur_lexeme = lex_comma;
+
+				break;
+
+			case '/':
+				if (*(cur+1) == '/')
+				{
+					cur += 2;
+					_cur_lexeme = lex_double_slash;
+				}
+				else
+				{
+					cur += 1;
+					_cur_lexeme = lex_slash;
+				}
+				break;
+
+			case '.':
+				if (*(cur+1) == '.')
+				{
+					cur += 2;
+					_cur_lexeme = lex_double_dot;
+				}
+				else if (PUGI__IS_CHARTYPEX(*(cur+1), ctx_digit))
+				{
+					_cur_lexeme_contents.begin = cur; // .
+
+					++cur;
+
+					while (PUGI__IS_CHARTYPEX(*cur, ctx_digit)) cur++;
+
+					_cur_lexeme_contents.end = cur;
+
+					_cur_lexeme = lex_number;
+				}
+				else
+				{
+					cur += 1;
+					_cur_lexeme = lex_dot;
+				}
+				break;
+
+			case '@':
+				cur += 1;
+				_cur_lexeme = lex_axis_attribute;
+
+				break;
+
+			case '"':
+			case '\'':
+			{
+				char_t terminator = *cur;
+
+				++cur;
+
+				_cur_lexeme_contents.begin = cur;
+				while (*cur && *cur != terminator) cur++;
+				_cur_lexeme_contents.end = cur;
+
+				if (!*cur)
+					_cur_lexeme = lex_none;
+				else
+				{
+					cur += 1;
+					_cur_lexeme = lex_quoted_string;
+				}
+
+				break;
+			}
+
+			case ':':
+				if (*(cur+1) == ':')
+				{
+					cur += 2;
+					_cur_lexeme = lex_double_colon;
+				}
+				else
+				{
+					_cur_lexeme = lex_none;
+				}
+				break;
+
+			default:
+				if (PUGI__IS_CHARTYPEX(*cur, ctx_digit))
+				{
+					_cur_lexeme_contents.begin = cur;
+
+					while (PUGI__IS_CHARTYPEX(*cur, ctx_digit)) cur++;
+
+					if (*cur == '.')
+					{
+						cur++;
+
+						while (PUGI__IS_CHARTYPEX(*cur, ctx_digit)) cur++;
+					}
+
+					_cur_lexeme_contents.end = cur;
+
+					_cur_lexeme = lex_number;
+				}
+				else if (PUGI__IS_CHARTYPEX(*cur, ctx_start_symbol))
+				{
+					_cur_lexeme_contents.begin = cur;
+
+					while (PUGI__IS_CHARTYPEX(*cur, ctx_symbol)) cur++;
+
+					if (cur[0] == ':')
+					{
+						if (cur[1] == '*') // namespace test ncname:*
+						{
+							cur += 2; // :*
+						}
+						else if (PUGI__IS_CHARTYPEX(cur[1], ctx_symbol)) // namespace test qname
+						{
+							cur++; // :
+
+							while (PUGI__IS_CHARTYPEX(*cur, ctx_symbol)) cur++;
+						}
+					}
+
+					_cur_lexeme_contents.end = cur;
+
+					_cur_lexeme = lex_string;
+				}
+				else
+				{
+					_cur_lexeme = lex_none;
+				}
+			}
+
+			_cur = cur;
+		}
+
+		lexeme_t current() const
+		{
+			return _cur_lexeme;
+		}
+
+		const char_t* current_pos() const
+		{
+			return _cur_lexeme_pos;
+		}
+
+		const xpath_lexer_string& contents() const
+		{
+			assert(_cur_lexeme == lex_var_ref || _cur_lexeme == lex_number || _cur_lexeme == lex_string || _cur_lexeme == lex_quoted_string);
+
+			return _cur_lexeme_contents;
+		}
+	};
+
+	enum ast_type_t
+	{
+		ast_unknown,
+		ast_op_or,						// left or right
+		ast_op_and,						// left and right
+		ast_op_equal,					// left = right
+		ast_op_not_equal,				// left != right
+		ast_op_less,					// left < right
+		ast_op_greater,					// left > right
+		ast_op_less_or_equal,			// left <= right
+		ast_op_greater_or_equal,		// left >= right
+		ast_op_add,						// left + right
+		ast_op_subtract,				// left - right
+		ast_op_multiply,				// left * right
+		ast_op_divide,					// left / right
+		ast_op_mod,						// left % right
+		ast_op_negate,					// left - right
+		ast_op_union,					// left | right
+		ast_predicate,					// apply predicate to set; next points to next predicate
+		ast_filter,						// select * from left where right
+		ast_string_constant,			// string constant
+		ast_number_constant,			// number constant
+		ast_variable,					// variable
+		ast_func_last,					// last()
+		ast_func_position,				// position()
+		ast_func_count,					// count(left)
+		ast_func_id,					// id(left)
+		ast_func_local_name_0,			// local-name()
+		ast_func_local_name_1,			// local-name(left)
+		ast_func_namespace_uri_0,		// namespace-uri()
+		ast_func_namespace_uri_1,		// namespace-uri(left)
+		ast_func_name_0,				// name()
+		ast_func_name_1,				// name(left)
+		ast_func_string_0,				// string()
+		ast_func_string_1,				// string(left)
+		ast_func_concat,				// concat(left, right, siblings)
+		ast_func_starts_with,			// starts_with(left, right)
+		ast_func_contains,				// contains(left, right)
+		ast_func_substring_before,		// substring-before(left, right)
+		ast_func_substring_after,		// substring-after(left, right)
+		ast_func_substring_2,			// substring(left, right)
+		ast_func_substring_3,			// substring(left, right, third)
+		ast_func_string_length_0,		// string-length()
+		ast_func_string_length_1,		// string-length(left)
+		ast_func_normalize_space_0,		// normalize-space()
+		ast_func_normalize_space_1,		// normalize-space(left)
+		ast_func_translate,				// translate(left, right, third)
+		ast_func_boolean,				// boolean(left)
+		ast_func_not,					// not(left)
+		ast_func_true,					// true()
+		ast_func_false,					// false()
+		ast_func_lang,					// lang(left)
+		ast_func_number_0,				// number()
+		ast_func_number_1,				// number(left)
+		ast_func_sum,					// sum(left)
+		ast_func_floor,					// floor(left)
+		ast_func_ceiling,				// ceiling(left)
+		ast_func_round,					// round(left)
+		ast_step,						// process set left with step
+		ast_step_root,					// select root node
+
+		ast_opt_translate_table,		// translate(left, right, third) where right/third are constants
+		ast_opt_compare_attribute		// @name = 'string'
+	};
+
+	enum axis_t
+	{
+		axis_ancestor,
+		axis_ancestor_or_self,
+		axis_attribute,
+		axis_child,
+		axis_descendant,
+		axis_descendant_or_self,
+		axis_following,
+		axis_following_sibling,
+		axis_namespace,
+		axis_parent,
+		axis_preceding,
+		axis_preceding_sibling,
+		axis_self
+	};
+
+	enum nodetest_t
+	{
+		nodetest_none,
+		nodetest_name,
+		nodetest_type_node,
+		nodetest_type_comment,
+		nodetest_type_pi,
+		nodetest_type_text,
+		nodetest_pi,
+		nodetest_all,
+		nodetest_all_in_namespace
+	};
+
+	enum predicate_t
+	{
+		predicate_default,
+		predicate_posinv,
+		predicate_constant,
+		predicate_constant_one
+	};
+
+	enum nodeset_eval_t
+	{
+		nodeset_eval_all,
+		nodeset_eval_any,
+		nodeset_eval_first
+	};
+
+	template <axis_t N> struct axis_to_type
+	{
+		static const axis_t axis;
+	};
+
+	template <axis_t N> const axis_t axis_to_type<N>::axis = N;
+
+	class xpath_ast_node
+	{
+	private:
+		// node type
+		char _type;
+		char _rettype;
+
+		// for ast_step
+		char _axis;
+
+		// for ast_step/ast_predicate/ast_filter
+		char _test;
+
+		// tree node structure
+		xpath_ast_node* _left;
+		xpath_ast_node* _right;
+		xpath_ast_node* _next;
+
+		union
+		{
+			// value for ast_string_constant
+			const char_t* string;
+			// value for ast_number_constant
+			double number;
+			// variable for ast_variable
+			xpath_variable* variable;
+			// node test for ast_step (node name/namespace/node type/pi target)
+			const char_t* nodetest;
+			// table for ast_opt_translate_table
+			const unsigned char* table;
+		} _data;
+
+		xpath_ast_node(const xpath_ast_node&);
+		xpath_ast_node& operator=(const xpath_ast_node&);
+
+		template <class Comp> static bool compare_eq(xpath_ast_node* lhs, xpath_ast_node* rhs, const xpath_context& c, const xpath_stack& stack, const Comp& comp)
+		{
+			xpath_value_type lt = lhs->rettype(), rt = rhs->rettype();
+
+			if (lt != xpath_type_node_set && rt != xpath_type_node_set)
+			{
+				if (lt == xpath_type_boolean || rt == xpath_type_boolean)
+					return comp(lhs->eval_boolean(c, stack), rhs->eval_boolean(c, stack));
+				else if (lt == xpath_type_number || rt == xpath_type_number)
+					return comp(lhs->eval_number(c, stack), rhs->eval_number(c, stack));
+				else if (lt == xpath_type_string || rt == xpath_type_string)
+				{
+					xpath_allocator_capture cr(stack.result);
+
+					xpath_string ls = lhs->eval_string(c, stack);
+					xpath_string rs = rhs->eval_string(c, stack);
+
+					return comp(ls, rs);
+				}
+			}
+			else if (lt == xpath_type_node_set && rt == xpath_type_node_set)
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				xpath_node_set_raw ls = lhs->eval_node_set(c, stack, nodeset_eval_all);
+				xpath_node_set_raw rs = rhs->eval_node_set(c, stack, nodeset_eval_all);
+
+				for (const xpath_node* li = ls.begin(); li != ls.end(); ++li)
+					for (const xpath_node* ri = rs.begin(); ri != rs.end(); ++ri)
+					{
+						xpath_allocator_capture cri(stack.result);
+
+						if (comp(string_value(*li, stack.result), string_value(*ri, stack.result)))
+							return true;
+					}
+
+				return false;
+			}
+			else
+			{
+				if (lt == xpath_type_node_set)
+				{
+					swap(lhs, rhs);
+					swap(lt, rt);
+				}
+
+				if (lt == xpath_type_boolean)
+					return comp(lhs->eval_boolean(c, stack), rhs->eval_boolean(c, stack));
+				else if (lt == xpath_type_number)
+				{
+					xpath_allocator_capture cr(stack.result);
+
+					double l = lhs->eval_number(c, stack);
+					xpath_node_set_raw rs = rhs->eval_node_set(c, stack, nodeset_eval_all);
+
+					for (const xpath_node* ri = rs.begin(); ri != rs.end(); ++ri)
+					{
+						xpath_allocator_capture cri(stack.result);
+
+						if (comp(l, convert_string_to_number(string_value(*ri, stack.result).c_str())))
+							return true;
+					}
+
+					return false;
+				}
+				else if (lt == xpath_type_string)
+				{
+					xpath_allocator_capture cr(stack.result);
+
+					xpath_string l = lhs->eval_string(c, stack);
+					xpath_node_set_raw rs = rhs->eval_node_set(c, stack, nodeset_eval_all);
+
+					for (const xpath_node* ri = rs.begin(); ri != rs.end(); ++ri)
+					{
+						xpath_allocator_capture cri(stack.result);
+
+						if (comp(l, string_value(*ri, stack.result)))
+							return true;
+					}
+
+					return false;
+				}
+			}
+
+			assert(false && "Wrong types"); // unreachable
+			return false;
+		}
+
+		static bool eval_once(xpath_node_set::type_t type, nodeset_eval_t eval)
+		{
+			return type == xpath_node_set::type_sorted ? eval != nodeset_eval_all : eval == nodeset_eval_any;
+		}
+
+		template <class Comp> static bool compare_rel(xpath_ast_node* lhs, xpath_ast_node* rhs, const xpath_context& c, const xpath_stack& stack, const Comp& comp)
+		{
+			xpath_value_type lt = lhs->rettype(), rt = rhs->rettype();
+
+			if (lt != xpath_type_node_set && rt != xpath_type_node_set)
+				return comp(lhs->eval_number(c, stack), rhs->eval_number(c, stack));
+			else if (lt == xpath_type_node_set && rt == xpath_type_node_set)
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				xpath_node_set_raw ls = lhs->eval_node_set(c, stack, nodeset_eval_all);
+				xpath_node_set_raw rs = rhs->eval_node_set(c, stack, nodeset_eval_all);
+
+				for (const xpath_node* li = ls.begin(); li != ls.end(); ++li)
+				{
+					xpath_allocator_capture cri(stack.result);
+
+					double l = convert_string_to_number(string_value(*li, stack.result).c_str());
+
+					for (const xpath_node* ri = rs.begin(); ri != rs.end(); ++ri)
+					{
+						xpath_allocator_capture crii(stack.result);
+
+						if (comp(l, convert_string_to_number(string_value(*ri, stack.result).c_str())))
+							return true;
+					}
+				}
+
+				return false;
+			}
+			else if (lt != xpath_type_node_set && rt == xpath_type_node_set)
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				double l = lhs->eval_number(c, stack);
+				xpath_node_set_raw rs = rhs->eval_node_set(c, stack, nodeset_eval_all);
+
+				for (const xpath_node* ri = rs.begin(); ri != rs.end(); ++ri)
+				{
+					xpath_allocator_capture cri(stack.result);
+
+					if (comp(l, convert_string_to_number(string_value(*ri, stack.result).c_str())))
+						return true;
+				}
+
+				return false;
+			}
+			else if (lt == xpath_type_node_set && rt != xpath_type_node_set)
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				xpath_node_set_raw ls = lhs->eval_node_set(c, stack, nodeset_eval_all);
+				double r = rhs->eval_number(c, stack);
+
+				for (const xpath_node* li = ls.begin(); li != ls.end(); ++li)
+				{
+					xpath_allocator_capture cri(stack.result);
+
+					if (comp(convert_string_to_number(string_value(*li, stack.result).c_str()), r))
+						return true;
+				}
+
+				return false;
+			}
+			else
+			{
+				assert(false && "Wrong types"); // unreachable
+				return false;
+			}
+		}
+
+		static void apply_predicate_boolean(xpath_node_set_raw& ns, size_t first, xpath_ast_node* expr, const xpath_stack& stack, bool once)
+		{
+			assert(ns.size() >= first);
+			assert(expr->rettype() != xpath_type_number);
+
+			size_t i = 1;
+			size_t size = ns.size() - first;
+
+			xpath_node* last = ns.begin() + first;
+
+			// remove_if... or well, sort of
+			for (xpath_node* it = last; it != ns.end(); ++it, ++i)
+			{
+				xpath_context c(*it, i, size);
+
+				if (expr->eval_boolean(c, stack))
+				{
+					*last++ = *it;
+
+					if (once) break;
+				}
+			}
+
+			ns.truncate(last);
+		}
+
+		static void apply_predicate_number(xpath_node_set_raw& ns, size_t first, xpath_ast_node* expr, const xpath_stack& stack, bool once)
+		{
+			assert(ns.size() >= first);
+			assert(expr->rettype() == xpath_type_number);
+
+			size_t i = 1;
+			size_t size = ns.size() - first;
+
+			xpath_node* last = ns.begin() + first;
+
+			// remove_if... or well, sort of
+			for (xpath_node* it = last; it != ns.end(); ++it, ++i)
+			{
+				xpath_context c(*it, i, size);
+
+				if (expr->eval_number(c, stack) == i)
+				{
+					*last++ = *it;
+
+					if (once) break;
+				}
+			}
+
+			ns.truncate(last);
+		}
+
+		static void apply_predicate_number_const(xpath_node_set_raw& ns, size_t first, xpath_ast_node* expr, const xpath_stack& stack)
+		{
+			assert(ns.size() >= first);
+			assert(expr->rettype() == xpath_type_number);
+
+			size_t size = ns.size() - first;
+
+			xpath_node* last = ns.begin() + first;
+
+			xpath_context c(xpath_node(), 1, size);
+
+			double er = expr->eval_number(c, stack);
+
+			if (er >= 1.0 && er <= size)
+			{
+				size_t eri = static_cast<size_t>(er);
+
+				if (er == eri)
+				{
+					xpath_node r = last[eri - 1];
+
+					*last++ = r;
+				}
+			}
+
+			ns.truncate(last);
+		}
+
+		void apply_predicate(xpath_node_set_raw& ns, size_t first, const xpath_stack& stack, bool once)
+		{
+			if (ns.size() == first) return;
+
+			assert(_type == ast_filter || _type == ast_predicate);
+
+			if (_test == predicate_constant || _test == predicate_constant_one)
+				apply_predicate_number_const(ns, first, _right, stack);
+			else if (_right->rettype() == xpath_type_number)
+				apply_predicate_number(ns, first, _right, stack, once);
+			else
+				apply_predicate_boolean(ns, first, _right, stack, once);
+		}
+
+		void apply_predicates(xpath_node_set_raw& ns, size_t first, const xpath_stack& stack, nodeset_eval_t eval)
+		{
+			if (ns.size() == first) return;
+
+			bool last_once = eval_once(ns.type(), eval);
+
+			for (xpath_ast_node* pred = _right; pred; pred = pred->_next)
+				pred->apply_predicate(ns, first, stack, !pred->_next && last_once);
+		}
+
+		bool step_push(xpath_node_set_raw& ns, xml_attribute_struct* a, xml_node_struct* parent, xpath_allocator* alloc)
+		{
+			assert(a);
+
+			const char_t* name = a->name ? a->name + 0 : PUGIXML_TEXT("");
+
+			switch (_test)
+			{
+			case nodetest_name:
+				if (strequal(name, _data.nodetest) && is_xpath_attribute(name))
+				{
+					ns.push_back(xpath_node(xml_attribute(a), xml_node(parent)), alloc);
+					return true;
+				}
+				break;
+
+			case nodetest_type_node:
+			case nodetest_all:
+				if (is_xpath_attribute(name))
+				{
+					ns.push_back(xpath_node(xml_attribute(a), xml_node(parent)), alloc);
+					return true;
+				}
+				break;
+
+			case nodetest_all_in_namespace:
+				if (starts_with(name, _data.nodetest) && is_xpath_attribute(name))
+				{
+					ns.push_back(xpath_node(xml_attribute(a), xml_node(parent)), alloc);
+					return true;
+				}
+				break;
+
+			default:
+				;
+			}
+
+			return false;
+		}
+
+		bool step_push(xpath_node_set_raw& ns, xml_node_struct* n, xpath_allocator* alloc)
+		{
+			assert(n);
+
+			xml_node_type type = PUGI__NODETYPE(n);
+
+			switch (_test)
+			{
+			case nodetest_name:
+				if (type == node_element && n->name && strequal(n->name, _data.nodetest))
+				{
+					ns.push_back(xml_node(n), alloc);
+					return true;
+				}
+				break;
+
+			case nodetest_type_node:
+				ns.push_back(xml_node(n), alloc);
+				return true;
+
+			case nodetest_type_comment:
+				if (type == node_comment)
+				{
+					ns.push_back(xml_node(n), alloc);
+					return true;
+				}
+				break;
+
+			case nodetest_type_text:
+				if (type == node_pcdata || type == node_cdata)
+				{
+					ns.push_back(xml_node(n), alloc);
+					return true;
+				}
+				break;
+
+			case nodetest_type_pi:
+				if (type == node_pi)
+				{
+					ns.push_back(xml_node(n), alloc);
+					return true;
+				}
+				break;
+
+			case nodetest_pi:
+				if (type == node_pi && n->name && strequal(n->name, _data.nodetest))
+				{
+					ns.push_back(xml_node(n), alloc);
+					return true;
+				}
+				break;
+
+			case nodetest_all:
+				if (type == node_element)
+				{
+					ns.push_back(xml_node(n), alloc);
+					return true;
+				}
+				break;
+
+			case nodetest_all_in_namespace:
+				if (type == node_element && n->name && starts_with(n->name, _data.nodetest))
+				{
+					ns.push_back(xml_node(n), alloc);
+					return true;
+				}
+				break;
+
+			default:
+				assert(false && "Unknown axis"); // unreachable
+			}
+
+			return false;
+		}
+
+		template <class T> void step_fill(xpath_node_set_raw& ns, xml_node_struct* n, xpath_allocator* alloc, bool once, T)
+		{
+			const axis_t axis = T::axis;
+
+			switch (axis)
+			{
+			case axis_attribute:
+			{
+				for (xml_attribute_struct* a = n->first_attribute; a; a = a->next_attribute)
+					if (step_push(ns, a, n, alloc) & once)
+						return;
+
+				break;
+			}
+
+			case axis_child:
+			{
+				for (xml_node_struct* c = n->first_child; c; c = c->next_sibling)
+					if (step_push(ns, c, alloc) & once)
+						return;
+
+				break;
+			}
+
+			case axis_descendant:
+			case axis_descendant_or_self:
+			{
+				if (axis == axis_descendant_or_self)
+					if (step_push(ns, n, alloc) & once)
+						return;
+
+				xml_node_struct* cur = n->first_child;
+
+				while (cur)
+				{
+					if (step_push(ns, cur, alloc) & once)
+						return;
+
+					if (cur->first_child)
+						cur = cur->first_child;
+					else
+					{
+						while (!cur->next_sibling)
+						{
+							cur = cur->parent;
+
+							if (cur == n) return;
+						}
+
+						cur = cur->next_sibling;
+					}
+				}
+
+				break;
+			}
+
+			case axis_following_sibling:
+			{
+				for (xml_node_struct* c = n->next_sibling; c; c = c->next_sibling)
+					if (step_push(ns, c, alloc) & once)
+						return;
+
+				break;
+			}
+
+			case axis_preceding_sibling:
+			{
+				for (xml_node_struct* c = n->prev_sibling_c; c->next_sibling; c = c->prev_sibling_c)
+					if (step_push(ns, c, alloc) & once)
+						return;
+
+				break;
+			}
+
+			case axis_following:
+			{
+				xml_node_struct* cur = n;
+
+				// exit from this node so that we don't include descendants
+				while (!cur->next_sibling)
+				{
+					cur = cur->parent;
+
+					if (!cur) return;
+				}
+
+				cur = cur->next_sibling;
+
+				while (cur)
+				{
+					if (step_push(ns, cur, alloc) & once)
+						return;
+
+					if (cur->first_child)
+						cur = cur->first_child;
+					else
+					{
+						while (!cur->next_sibling)
+						{
+							cur = cur->parent;
+
+							if (!cur) return;
+						}
+
+						cur = cur->next_sibling;
+					}
+				}
+
+				break;
+			}
+
+			case axis_preceding:
+			{
+				xml_node_struct* cur = n;
+
+				// exit from this node so that we don't include descendants
+				while (!cur->prev_sibling_c->next_sibling)
+				{
+					cur = cur->parent;
+
+					if (!cur) return;
+				}
+
+				cur = cur->prev_sibling_c;
+
+				while (cur)
+				{
+					if (cur->first_child)
+						cur = cur->first_child->prev_sibling_c;
+					else
+					{
+						// leaf node, can't be ancestor
+						if (step_push(ns, cur, alloc) & once)
+							return;
+
+						while (!cur->prev_sibling_c->next_sibling)
+						{
+							cur = cur->parent;
+
+							if (!cur) return;
+
+							if (!node_is_ancestor(cur, n))
+								if (step_push(ns, cur, alloc) & once)
+									return;
+						}
+
+						cur = cur->prev_sibling_c;
+					}
+				}
+
+				break;
+			}
+
+			case axis_ancestor:
+			case axis_ancestor_or_self:
+			{
+				if (axis == axis_ancestor_or_self)
+					if (step_push(ns, n, alloc) & once)
+						return;
+
+				xml_node_struct* cur = n->parent;
+
+				while (cur)
+				{
+					if (step_push(ns, cur, alloc) & once)
+						return;
+
+					cur = cur->parent;
+				}
+
+				break;
+			}
+
+			case axis_self:
+			{
+				step_push(ns, n, alloc);
+
+				break;
+			}
+
+			case axis_parent:
+			{
+				if (n->parent)
+					step_push(ns, n->parent, alloc);
+
+				break;
+			}
+
+			default:
+				assert(false && "Unimplemented axis"); // unreachable
+			}
+		}
+
+		template <class T> void step_fill(xpath_node_set_raw& ns, xml_attribute_struct* a, xml_node_struct* p, xpath_allocator* alloc, bool once, T v)
+		{
+			const axis_t axis = T::axis;
+
+			switch (axis)
+			{
+			case axis_ancestor:
+			case axis_ancestor_or_self:
+			{
+				if (axis == axis_ancestor_or_self && _test == nodetest_type_node) // reject attributes based on principal node type test
+					if (step_push(ns, a, p, alloc) & once)
+						return;
+
+				xml_node_struct* cur = p;
+
+				while (cur)
+				{
+					if (step_push(ns, cur, alloc) & once)
+						return;
+
+					cur = cur->parent;
+				}
+
+				break;
+			}
+
+			case axis_descendant_or_self:
+			case axis_self:
+			{
+				if (_test == nodetest_type_node) // reject attributes based on principal node type test
+					step_push(ns, a, p, alloc);
+
+				break;
+			}
+
+			case axis_following:
+			{
+				xml_node_struct* cur = p;
+
+				while (cur)
+				{
+					if (cur->first_child)
+						cur = cur->first_child;
+					else
+					{
+						while (!cur->next_sibling)
+						{
+							cur = cur->parent;
+
+							if (!cur) return;
+						}
+
+						cur = cur->next_sibling;
+					}
+
+					if (step_push(ns, cur, alloc) & once)
+						return;
+				}
+
+				break;
+			}
+
+			case axis_parent:
+			{
+				step_push(ns, p, alloc);
+
+				break;
+			}
+
+			case axis_preceding:
+			{
+				// preceding:: axis does not include attribute nodes and attribute ancestors (they are the same as parent's ancestors), so we can reuse node preceding
+				step_fill(ns, p, alloc, once, v);
+				break;
+			}
+
+			default:
+				assert(false && "Unimplemented axis"); // unreachable
+			}
+		}
+
+		template <class T> void step_fill(xpath_node_set_raw& ns, const xpath_node& xn, xpath_allocator* alloc, bool once, T v)
+		{
+			const axis_t axis = T::axis;
+			const bool axis_has_attributes = (axis == axis_ancestor || axis == axis_ancestor_or_self || axis == axis_descendant_or_self || axis == axis_following || axis == axis_parent || axis == axis_preceding || axis == axis_self);
+
+			if (xn.node())
+				step_fill(ns, xn.node().internal_object(), alloc, once, v);
+			else if (axis_has_attributes && xn.attribute() && xn.parent())
+				step_fill(ns, xn.attribute().internal_object(), xn.parent().internal_object(), alloc, once, v);
+		}
+
+		template <class T> xpath_node_set_raw step_do(const xpath_context& c, const xpath_stack& stack, nodeset_eval_t eval, T v)
+		{
+			const axis_t axis = T::axis;
+			const bool axis_reverse = (axis == axis_ancestor || axis == axis_ancestor_or_self || axis == axis_preceding || axis == axis_preceding_sibling);
+			const xpath_node_set::type_t axis_type = axis_reverse ? xpath_node_set::type_sorted_reverse : xpath_node_set::type_sorted;
+
+			bool once =
+				(axis == axis_attribute && _test == nodetest_name) ||
+				(!_right && eval_once(axis_type, eval)) ||
+				(_right && !_right->_next && _right->_test == predicate_constant_one);
+
+			xpath_node_set_raw ns;
+			ns.set_type(axis_type);
+
+			if (_left)
+			{
+				xpath_node_set_raw s = _left->eval_node_set(c, stack, nodeset_eval_all);
+
+				// self axis preserves the original order
+				if (axis == axis_self) ns.set_type(s.type());
+
+				for (const xpath_node* it = s.begin(); it != s.end(); ++it)
+				{
+					size_t size = ns.size();
+
+					// in general, all axes generate elements in a particular order, but there is no order guarantee if axis is applied to two nodes
+					if (axis != axis_self && size != 0) ns.set_type(xpath_node_set::type_unsorted);
+
+					step_fill(ns, *it, stack.result, once, v);
+					if (_right) apply_predicates(ns, size, stack, eval);
+				}
+			}
+			else
+			{
+				step_fill(ns, c.n, stack.result, once, v);
+				if (_right) apply_predicates(ns, 0, stack, eval);
+			}
+
+			// child, attribute and self axes always generate unique set of nodes
+			// for other axis, if the set stayed sorted, it stayed unique because the traversal algorithms do not visit the same node twice
+			if (axis != axis_child && axis != axis_attribute && axis != axis_self && ns.type() == xpath_node_set::type_unsorted)
+				ns.remove_duplicates();
+
+			return ns;
+		}
+
+	public:
+		xpath_ast_node(ast_type_t type, xpath_value_type rettype_, const char_t* value):
+			_type(static_cast<char>(type)), _rettype(static_cast<char>(rettype_)), _axis(0), _test(0), _left(0), _right(0), _next(0)
+		{
+			assert(type == ast_string_constant);
+			_data.string = value;
+		}
+
+		xpath_ast_node(ast_type_t type, xpath_value_type rettype_, double value):
+			_type(static_cast<char>(type)), _rettype(static_cast<char>(rettype_)), _axis(0), _test(0), _left(0), _right(0), _next(0)
+		{
+			assert(type == ast_number_constant);
+			_data.number = value;
+		}
+
+		xpath_ast_node(ast_type_t type, xpath_value_type rettype_, xpath_variable* value):
+			_type(static_cast<char>(type)), _rettype(static_cast<char>(rettype_)), _axis(0), _test(0), _left(0), _right(0), _next(0)
+		{
+			assert(type == ast_variable);
+			_data.variable = value;
+		}
+
+		xpath_ast_node(ast_type_t type, xpath_value_type rettype_, xpath_ast_node* left = 0, xpath_ast_node* right = 0):
+			_type(static_cast<char>(type)), _rettype(static_cast<char>(rettype_)), _axis(0), _test(0), _left(left), _right(right), _next(0)
+		{
+		}
+
+		xpath_ast_node(ast_type_t type, xpath_ast_node* left, axis_t axis, nodetest_t test, const char_t* contents):
+			_type(static_cast<char>(type)), _rettype(xpath_type_node_set), _axis(static_cast<char>(axis)), _test(static_cast<char>(test)), _left(left), _right(0), _next(0)
+		{
+			assert(type == ast_step);
+			_data.nodetest = contents;
+		}
+
+		xpath_ast_node(ast_type_t type, xpath_ast_node* left, xpath_ast_node* right, predicate_t test):
+			_type(static_cast<char>(type)), _rettype(xpath_type_node_set), _axis(0), _test(static_cast<char>(test)), _left(left), _right(right), _next(0)
+		{
+			assert(type == ast_filter || type == ast_predicate);
+		}
+
+		void set_next(xpath_ast_node* value)
+		{
+			_next = value;
+		}
+
+		void set_right(xpath_ast_node* value)
+		{
+			_right = value;
+		}
+
+		bool eval_boolean(const xpath_context& c, const xpath_stack& stack)
+		{
+			switch (_type)
+			{
+			case ast_op_or:
+				return _left->eval_boolean(c, stack) || _right->eval_boolean(c, stack);
+
+			case ast_op_and:
+				return _left->eval_boolean(c, stack) && _right->eval_boolean(c, stack);
+
+			case ast_op_equal:
+				return compare_eq(_left, _right, c, stack, equal_to());
+
+			case ast_op_not_equal:
+				return compare_eq(_left, _right, c, stack, not_equal_to());
+
+			case ast_op_less:
+				return compare_rel(_left, _right, c, stack, less());
+
+			case ast_op_greater:
+				return compare_rel(_right, _left, c, stack, less());
+
+			case ast_op_less_or_equal:
+				return compare_rel(_left, _right, c, stack, less_equal());
+
+			case ast_op_greater_or_equal:
+				return compare_rel(_right, _left, c, stack, less_equal());
+
+			case ast_func_starts_with:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				xpath_string lr = _left->eval_string(c, stack);
+				xpath_string rr = _right->eval_string(c, stack);
+
+				return starts_with(lr.c_str(), rr.c_str());
+			}
+
+			case ast_func_contains:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				xpath_string lr = _left->eval_string(c, stack);
+				xpath_string rr = _right->eval_string(c, stack);
+
+				return find_substring(lr.c_str(), rr.c_str()) != 0;
+			}
+
+			case ast_func_boolean:
+				return _left->eval_boolean(c, stack);
+
+			case ast_func_not:
+				return !_left->eval_boolean(c, stack);
+
+			case ast_func_true:
+				return true;
+
+			case ast_func_false:
+				return false;
+
+			case ast_func_lang:
+			{
+				if (c.n.attribute()) return false;
+
+				xpath_allocator_capture cr(stack.result);
+
+				xpath_string lang = _left->eval_string(c, stack);
+
+				for (xml_node n = c.n.node(); n; n = n.parent())
+				{
+					xml_attribute a = n.attribute(PUGIXML_TEXT("xml:lang"));
+
+					if (a)
+					{
+						const char_t* value = a.value();
+
+						// strnicmp / strncasecmp is not portable
+						for (const char_t* lit = lang.c_str(); *lit; ++lit)
+						{
+							if (tolower_ascii(*lit) != tolower_ascii(*value)) return false;
+							++value;
+						}
+
+						return *value == 0 || *value == '-';
+					}
+				}
+
+				return false;
+			}
+
+			case ast_opt_compare_attribute:
+			{
+				const char_t* value = (_right->_type == ast_string_constant) ? _right->_data.string : _right->_data.variable->get_string();
+
+				xml_attribute attr = c.n.node().attribute(_left->_data.nodetest);
+
+				return attr && strequal(attr.value(), value) && is_xpath_attribute(attr.name());
+			}
+
+			case ast_variable:
+			{
+				assert(_rettype == _data.variable->type());
+
+				if (_rettype == xpath_type_boolean)
+					return _data.variable->get_boolean();
+			}
+
+			// fallthrough
+			default:
+			{
+				switch (_rettype)
+				{
+				case xpath_type_number:
+					return convert_number_to_boolean(eval_number(c, stack));
+
+				case xpath_type_string:
+				{
+					xpath_allocator_capture cr(stack.result);
+
+					return !eval_string(c, stack).empty();
+				}
+
+				case xpath_type_node_set:
+				{
+					xpath_allocator_capture cr(stack.result);
+
+					return !eval_node_set(c, stack, nodeset_eval_any).empty();
+				}
+
+				default:
+					assert(false && "Wrong expression for return type boolean"); // unreachable
+					return false;
+				}
+			}
+			}
+		}
+
+		double eval_number(const xpath_context& c, const xpath_stack& stack)
+		{
+			switch (_type)
+			{
+			case ast_op_add:
+				return _left->eval_number(c, stack) + _right->eval_number(c, stack);
+
+			case ast_op_subtract:
+				return _left->eval_number(c, stack) - _right->eval_number(c, stack);
+
+			case ast_op_multiply:
+				return _left->eval_number(c, stack) * _right->eval_number(c, stack);
+
+			case ast_op_divide:
+				return _left->eval_number(c, stack) / _right->eval_number(c, stack);
+
+			case ast_op_mod:
+				return fmod(_left->eval_number(c, stack), _right->eval_number(c, stack));
+
+			case ast_op_negate:
+				return -_left->eval_number(c, stack);
+
+			case ast_number_constant:
+				return _data.number;
+
+			case ast_func_last:
+				return static_cast<double>(c.size);
+
+			case ast_func_position:
+				return static_cast<double>(c.position);
+
+			case ast_func_count:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				return static_cast<double>(_left->eval_node_set(c, stack, nodeset_eval_all).size());
+			}
+
+			case ast_func_string_length_0:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				return static_cast<double>(string_value(c.n, stack.result).length());
+			}
+
+			case ast_func_string_length_1:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				return static_cast<double>(_left->eval_string(c, stack).length());
+			}
+
+			case ast_func_number_0:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				return convert_string_to_number(string_value(c.n, stack.result).c_str());
+			}
+
+			case ast_func_number_1:
+				return _left->eval_number(c, stack);
+
+			case ast_func_sum:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				double r = 0;
+
+				xpath_node_set_raw ns = _left->eval_node_set(c, stack, nodeset_eval_all);
+
+				for (const xpath_node* it = ns.begin(); it != ns.end(); ++it)
+				{
+					xpath_allocator_capture cri(stack.result);
+
+					r += convert_string_to_number(string_value(*it, stack.result).c_str());
+				}
+
+				return r;
+			}
+
+			case ast_func_floor:
+			{
+				double r = _left->eval_number(c, stack);
+
+				return r == r ? floor(r) : r;
+			}
+
+			case ast_func_ceiling:
+			{
+				double r = _left->eval_number(c, stack);
+
+				return r == r ? ceil(r) : r;
+			}
+
+			case ast_func_round:
+				return round_nearest_nzero(_left->eval_number(c, stack));
+
+			case ast_variable:
+			{
+				assert(_rettype == _data.variable->type());
+
+				if (_rettype == xpath_type_number)
+					return _data.variable->get_number();
+			}
+
+			// fallthrough
+			default:
+			{
+				switch (_rettype)
+				{
+				case xpath_type_boolean:
+					return eval_boolean(c, stack) ? 1 : 0;
+
+				case xpath_type_string:
+				{
+					xpath_allocator_capture cr(stack.result);
+
+					return convert_string_to_number(eval_string(c, stack).c_str());
+				}
+
+				case xpath_type_node_set:
+				{
+					xpath_allocator_capture cr(stack.result);
+
+					return convert_string_to_number(eval_string(c, stack).c_str());
+				}
+
+				default:
+					assert(false && "Wrong expression for return type number"); // unreachable
+					return 0;
+				}
+
+			}
+			}
+		}
+
+		xpath_string eval_string_concat(const xpath_context& c, const xpath_stack& stack)
+		{
+			assert(_type == ast_func_concat);
+
+			xpath_allocator_capture ct(stack.temp);
+
+			// count the string number
+			size_t count = 1;
+			for (xpath_ast_node* nc = _right; nc; nc = nc->_next) count++;
+
+			// allocate a buffer for temporary string objects
+			xpath_string* buffer = static_cast<xpath_string*>(stack.temp->allocate(count * sizeof(xpath_string)));
+			if (!buffer) return xpath_string();
+
+			// evaluate all strings to temporary stack
+			xpath_stack swapped_stack = {stack.temp, stack.result};
+
+			buffer[0] = _left->eval_string(c, swapped_stack);
+
+			size_t pos = 1;
+			for (xpath_ast_node* n = _right; n; n = n->_next, ++pos) buffer[pos] = n->eval_string(c, swapped_stack);
+			assert(pos == count);
+
+			// get total length
+			size_t length = 0;
+			for (size_t i = 0; i < count; ++i) length += buffer[i].length();
+
+			// create final string
+			char_t* result = static_cast<char_t*>(stack.result->allocate((length + 1) * sizeof(char_t)));
+			if (!result) return xpath_string();
+
+			char_t* ri = result;
+
+			for (size_t j = 0; j < count; ++j)
+				for (const char_t* bi = buffer[j].c_str(); *bi; ++bi)
+					*ri++ = *bi;
+
+			*ri = 0;
+
+			return xpath_string::from_heap_preallocated(result, ri);
+		}
+
+		xpath_string eval_string(const xpath_context& c, const xpath_stack& stack)
+		{
+			switch (_type)
+			{
+			case ast_string_constant:
+				return xpath_string::from_const(_data.string);
+
+			case ast_func_local_name_0:
+			{
+				xpath_node na = c.n;
+
+				return xpath_string::from_const(local_name(na));
+			}
+
+			case ast_func_local_name_1:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				xpath_node_set_raw ns = _left->eval_node_set(c, stack, nodeset_eval_first);
+				xpath_node na = ns.first();
+
+				return xpath_string::from_const(local_name(na));
+			}
+
+			case ast_func_name_0:
+			{
+				xpath_node na = c.n;
+
+				return xpath_string::from_const(qualified_name(na));
+			}
+
+			case ast_func_name_1:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				xpath_node_set_raw ns = _left->eval_node_set(c, stack, nodeset_eval_first);
+				xpath_node na = ns.first();
+
+				return xpath_string::from_const(qualified_name(na));
+			}
+
+			case ast_func_namespace_uri_0:
+			{
+				xpath_node na = c.n;
+
+				return xpath_string::from_const(namespace_uri(na));
+			}
+
+			case ast_func_namespace_uri_1:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				xpath_node_set_raw ns = _left->eval_node_set(c, stack, nodeset_eval_first);
+				xpath_node na = ns.first();
+
+				return xpath_string::from_const(namespace_uri(na));
+			}
+
+			case ast_func_string_0:
+				return string_value(c.n, stack.result);
+
+			case ast_func_string_1:
+				return _left->eval_string(c, stack);
+
+			case ast_func_concat:
+				return eval_string_concat(c, stack);
+
+			case ast_func_substring_before:
+			{
+				xpath_allocator_capture cr(stack.temp);
+
+				xpath_stack swapped_stack = {stack.temp, stack.result};
+
+				xpath_string s = _left->eval_string(c, swapped_stack);
+				xpath_string p = _right->eval_string(c, swapped_stack);
+
+				const char_t* pos = find_substring(s.c_str(), p.c_str());
+
+				return pos ? xpath_string::from_heap(s.c_str(), pos, stack.result) : xpath_string();
+			}
+
+			case ast_func_substring_after:
+			{
+				xpath_allocator_capture cr(stack.temp);
+
+				xpath_stack swapped_stack = {stack.temp, stack.result};
+
+				xpath_string s = _left->eval_string(c, swapped_stack);
+				xpath_string p = _right->eval_string(c, swapped_stack);
+
+				const char_t* pos = find_substring(s.c_str(), p.c_str());
+				if (!pos) return xpath_string();
+
+				const char_t* rbegin = pos + p.length();
+				const char_t* rend = s.c_str() + s.length();
+
+				return s.uses_heap() ? xpath_string::from_heap(rbegin, rend, stack.result) : xpath_string::from_const(rbegin);
+			}
+
+			case ast_func_substring_2:
+			{
+				xpath_allocator_capture cr(stack.temp);
+
+				xpath_stack swapped_stack = {stack.temp, stack.result};
+
+				xpath_string s = _left->eval_string(c, swapped_stack);
+				size_t s_length = s.length();
+
+				double first = round_nearest(_right->eval_number(c, stack));
+
+				if (is_nan(first)) return xpath_string(); // NaN
+				else if (first >= s_length + 1) return xpath_string();
+
+				size_t pos = first < 1 ? 1 : static_cast<size_t>(first);
+				assert(1 <= pos && pos <= s_length + 1);
+
+				const char_t* rbegin = s.c_str() + (pos - 1);
+				const char_t* rend = s.c_str() + s.length();
+
+				return s.uses_heap() ? xpath_string::from_heap(rbegin, rend, stack.result) : xpath_string::from_const(rbegin);
+			}
+
+			case ast_func_substring_3:
+			{
+				xpath_allocator_capture cr(stack.temp);
+
+				xpath_stack swapped_stack = {stack.temp, stack.result};
+
+				xpath_string s = _left->eval_string(c, swapped_stack);
+				size_t s_length = s.length();
+
+				double first = round_nearest(_right->eval_number(c, stack));
+				double last = first + round_nearest(_right->_next->eval_number(c, stack));
+
+				if (is_nan(first) || is_nan(last)) return xpath_string();
+				else if (first >= s_length + 1) return xpath_string();
+				else if (first >= last) return xpath_string();
+				else if (last < 1) return xpath_string();
+
+				size_t pos = first < 1 ? 1 : static_cast<size_t>(first);
+				size_t end = last >= s_length + 1 ? s_length + 1 : static_cast<size_t>(last);
+
+				assert(1 <= pos && pos <= end && end <= s_length + 1);
+				const char_t* rbegin = s.c_str() + (pos - 1);
+				const char_t* rend = s.c_str() + (end - 1);
+
+				return (end == s_length + 1 && !s.uses_heap()) ? xpath_string::from_const(rbegin) : xpath_string::from_heap(rbegin, rend, stack.result);
+			}
+
+			case ast_func_normalize_space_0:
+			{
+				xpath_string s = string_value(c.n, stack.result);
+
+				char_t* begin = s.data(stack.result);
+				if (!begin) return xpath_string();
+
+				char_t* end = normalize_space(begin);
+
+				return xpath_string::from_heap_preallocated(begin, end);
+			}
+
+			case ast_func_normalize_space_1:
+			{
+				xpath_string s = _left->eval_string(c, stack);
+
+				char_t* begin = s.data(stack.result);
+				if (!begin) return xpath_string();
+
+				char_t* end = normalize_space(begin);
+
+				return xpath_string::from_heap_preallocated(begin, end);
+			}
+
+			case ast_func_translate:
+			{
+				xpath_allocator_capture cr(stack.temp);
+
+				xpath_stack swapped_stack = {stack.temp, stack.result};
+
+				xpath_string s = _left->eval_string(c, stack);
+				xpath_string from = _right->eval_string(c, swapped_stack);
+				xpath_string to = _right->_next->eval_string(c, swapped_stack);
+
+				char_t* begin = s.data(stack.result);
+				if (!begin) return xpath_string();
+
+				char_t* end = translate(begin, from.c_str(), to.c_str(), to.length());
+
+				return xpath_string::from_heap_preallocated(begin, end);
+			}
+
+			case ast_opt_translate_table:
+			{
+				xpath_string s = _left->eval_string(c, stack);
+
+				char_t* begin = s.data(stack.result);
+				if (!begin) return xpath_string();
+
+				char_t* end = translate_table(begin, _data.table);
+
+				return xpath_string::from_heap_preallocated(begin, end);
+			}
+
+			case ast_variable:
+			{
+				assert(_rettype == _data.variable->type());
+
+				if (_rettype == xpath_type_string)
+					return xpath_string::from_const(_data.variable->get_string());
+			}
+
+			// fallthrough
+			default:
+			{
+				switch (_rettype)
+				{
+				case xpath_type_boolean:
+					return xpath_string::from_const(eval_boolean(c, stack) ? PUGIXML_TEXT("true") : PUGIXML_TEXT("false"));
+
+				case xpath_type_number:
+					return convert_number_to_string(eval_number(c, stack), stack.result);
+
+				case xpath_type_node_set:
+				{
+					xpath_allocator_capture cr(stack.temp);
+
+					xpath_stack swapped_stack = {stack.temp, stack.result};
+
+					xpath_node_set_raw ns = eval_node_set(c, swapped_stack, nodeset_eval_first);
+					return ns.empty() ? xpath_string() : string_value(ns.first(), stack.result);
+				}
+
+				default:
+					assert(false && "Wrong expression for return type string"); // unreachable
+					return xpath_string();
+				}
+			}
+			}
+		}
+
+		xpath_node_set_raw eval_node_set(const xpath_context& c, const xpath_stack& stack, nodeset_eval_t eval)
+		{
+			switch (_type)
+			{
+			case ast_op_union:
+			{
+				xpath_allocator_capture cr(stack.temp);
+
+				xpath_stack swapped_stack = {stack.temp, stack.result};
+
+				xpath_node_set_raw ls = _left->eval_node_set(c, swapped_stack, eval);
+				xpath_node_set_raw rs = _right->eval_node_set(c, stack, eval);
+
+				// we can optimize merging two sorted sets, but this is a very rare operation, so don't bother
+				rs.set_type(xpath_node_set::type_unsorted);
+
+				rs.append(ls.begin(), ls.end(), stack.result);
+				rs.remove_duplicates();
+
+				return rs;
+			}
+
+			case ast_filter:
+			{
+				xpath_node_set_raw set = _left->eval_node_set(c, stack, _test == predicate_constant_one ? nodeset_eval_first : nodeset_eval_all);
+
+				// either expression is a number or it contains position() call; sort by document order
+				if (_test != predicate_posinv) set.sort_do();
+
+				bool once = eval_once(set.type(), eval);
+
+				apply_predicate(set, 0, stack, once);
+
+				return set;
+			}
+
+			case ast_func_id:
+				return xpath_node_set_raw();
+
+			case ast_step:
+			{
+				switch (_axis)
+				{
+				case axis_ancestor:
+					return step_do(c, stack, eval, axis_to_type<axis_ancestor>());
+
+				case axis_ancestor_or_self:
+					return step_do(c, stack, eval, axis_to_type<axis_ancestor_or_self>());
+
+				case axis_attribute:
+					return step_do(c, stack, eval, axis_to_type<axis_attribute>());
+
+				case axis_child:
+					return step_do(c, stack, eval, axis_to_type<axis_child>());
+
+				case axis_descendant:
+					return step_do(c, stack, eval, axis_to_type<axis_descendant>());
+
+				case axis_descendant_or_self:
+					return step_do(c, stack, eval, axis_to_type<axis_descendant_or_self>());
+
+				case axis_following:
+					return step_do(c, stack, eval, axis_to_type<axis_following>());
+
+				case axis_following_sibling:
+					return step_do(c, stack, eval, axis_to_type<axis_following_sibling>());
+
+				case axis_namespace:
+					// namespaced axis is not supported
+					return xpath_node_set_raw();
+
+				case axis_parent:
+					return step_do(c, stack, eval, axis_to_type<axis_parent>());
+
+				case axis_preceding:
+					return step_do(c, stack, eval, axis_to_type<axis_preceding>());
+
+				case axis_preceding_sibling:
+					return step_do(c, stack, eval, axis_to_type<axis_preceding_sibling>());
+
+				case axis_self:
+					return step_do(c, stack, eval, axis_to_type<axis_self>());
+
+				default:
+					assert(false && "Unknown axis"); // unreachable
+					return xpath_node_set_raw();
+				}
+			}
+
+			case ast_step_root:
+			{
+				assert(!_right); // root step can't have any predicates
+
+				xpath_node_set_raw ns;
+
+				ns.set_type(xpath_node_set::type_sorted);
+
+				if (c.n.node()) ns.push_back(c.n.node().root(), stack.result);
+				else if (c.n.attribute()) ns.push_back(c.n.parent().root(), stack.result);
+
+				return ns;
+			}
+
+			case ast_variable:
+			{
+				assert(_rettype == _data.variable->type());
+
+				if (_rettype == xpath_type_node_set)
+				{
+					const xpath_node_set& s = _data.variable->get_node_set();
+
+					xpath_node_set_raw ns;
+
+					ns.set_type(s.type());
+					ns.append(s.begin(), s.end(), stack.result);
+
+					return ns;
+				}
+			}
+
+			// fallthrough
+			default:
+				assert(false && "Wrong expression for return type node set"); // unreachable
+				return xpath_node_set_raw();
+			}
+		}
+
+		void optimize(xpath_allocator* alloc)
+		{
+			if (_left)
+				_left->optimize(alloc);
+
+			if (_right)
+				_right->optimize(alloc);
+
+			if (_next)
+				_next->optimize(alloc);
+
+			optimize_self(alloc);
+		}
+
+		void optimize_self(xpath_allocator* alloc)
+		{
+			// Rewrite [position()=expr] with [expr]
+			// Note that this step has to go before classification to recognize [position()=1]
+			if ((_type == ast_filter || _type == ast_predicate) &&
+				_right->_type == ast_op_equal && _right->_left->_type == ast_func_position && _right->_right->_rettype == xpath_type_number)
+			{
+				_right = _right->_right;
+			}
+
+			// Classify filter/predicate ops to perform various optimizations during evaluation
+			if (_type == ast_filter || _type == ast_predicate)
+			{
+				assert(_test == predicate_default);
+
+				if (_right->_type == ast_number_constant && _right->_data.number == 1.0)
+					_test = predicate_constant_one;
+				else if (_right->_rettype == xpath_type_number && (_right->_type == ast_number_constant || _right->_type == ast_variable || _right->_type == ast_func_last))
+					_test = predicate_constant;
+				else if (_right->_rettype != xpath_type_number && _right->is_posinv_expr())
+					_test = predicate_posinv;
+			}
+
+			// Rewrite descendant-or-self::node()/child::foo with descendant::foo
+			// The former is a full form of //foo, the latter is much faster since it executes the node test immediately
+			// Do a similar kind of rewrite for self/descendant/descendant-or-self axes
+			// Note that we only rewrite positionally invariant steps (//foo[1] != /descendant::foo[1])
+			if (_type == ast_step && (_axis == axis_child || _axis == axis_self || _axis == axis_descendant || _axis == axis_descendant_or_self) && _left &&
+				_left->_type == ast_step && _left->_axis == axis_descendant_or_self && _left->_test == nodetest_type_node && !_left->_right &&
+				is_posinv_step())
+			{
+				if (_axis == axis_child || _axis == axis_descendant)
+					_axis = axis_descendant;
+				else
+					_axis = axis_descendant_or_self;
+
+				_left = _left->_left;
+			}
+
+			// Use optimized lookup table implementation for translate() with constant arguments
+			if (_type == ast_func_translate && _right->_type == ast_string_constant && _right->_next->_type == ast_string_constant)
+			{
+				unsigned char* table = translate_table_generate(alloc, _right->_data.string, _right->_next->_data.string);
+
+				if (table)
+				{
+					_type = ast_opt_translate_table;
+					_data.table = table;
+				}
+			}
+
+			// Use optimized path for @attr = 'value' or @attr = $value
+			if (_type == ast_op_equal &&
+				_left->_type == ast_step && _left->_axis == axis_attribute && _left->_test == nodetest_name && !_left->_left && !_left->_right &&
+				(_right->_type == ast_string_constant || (_right->_type == ast_variable && _right->_rettype == xpath_type_string)))
+			{
+				_type = ast_opt_compare_attribute;
+			}
+		}
+
+		bool is_posinv_expr() const
+		{
+			switch (_type)
+			{
+			case ast_func_position:
+			case ast_func_last:
+				return false;
+
+			case ast_string_constant:
+			case ast_number_constant:
+			case ast_variable:
+				return true;
+
+			case ast_step:
+			case ast_step_root:
+				return true;
+
+			case ast_predicate:
+			case ast_filter:
+				return true;
+
+			default:
+				if (_left && !_left->is_posinv_expr()) return false;
+
+				for (xpath_ast_node* n = _right; n; n = n->_next)
+					if (!n->is_posinv_expr()) return false;
+
+				return true;
+			}
+		}
+
+		bool is_posinv_step() const
+		{
+			assert(_type == ast_step);
+
+			for (xpath_ast_node* n = _right; n; n = n->_next)
+			{
+				assert(n->_type == ast_predicate);
+
+				if (n->_test != predicate_posinv)
+					return false;
+			}
+
+			return true;
+		}
+
+		xpath_value_type rettype() const
+		{
+			return static_cast<xpath_value_type>(_rettype);
+		}
+	};
+
+	struct xpath_parser
+	{
+		xpath_allocator* _alloc;
+		xpath_lexer _lexer;
+
+		const char_t* _query;
+		xpath_variable_set* _variables;
+
+		xpath_parse_result* _result;
+
+		char_t _scratch[32];
+
+		xpath_ast_node* error(const char* message)
+		{
+			_result->error = message;
+			_result->offset = _lexer.current_pos() - _query;
+
+			return 0;
+		}
+
+		xpath_ast_node* error_oom()
+		{
+			assert(_alloc->_error);
+			*_alloc->_error = true;
+
+			return 0;
+		}
+
+		void* alloc_node()
+		{
+			return _alloc->allocate(sizeof(xpath_ast_node));
+		}
+
+		xpath_ast_node* alloc_node(ast_type_t type, xpath_value_type rettype, const char_t* value)
+		{
+			void* memory = alloc_node();
+			return memory ? new (memory) xpath_ast_node(type, rettype, value) : 0;
+		}
+
+		xpath_ast_node* alloc_node(ast_type_t type, xpath_value_type rettype, double value)
+		{
+			void* memory = alloc_node();
+			return memory ? new (memory) xpath_ast_node(type, rettype, value) : 0;
+		}
+
+		xpath_ast_node* alloc_node(ast_type_t type, xpath_value_type rettype, xpath_variable* value)
+		{
+			void* memory = alloc_node();
+			return memory ? new (memory) xpath_ast_node(type, rettype, value) : 0;
+		}
+
+		xpath_ast_node* alloc_node(ast_type_t type, xpath_value_type rettype, xpath_ast_node* left = 0, xpath_ast_node* right = 0)
+		{
+			void* memory = alloc_node();
+			return memory ? new (memory) xpath_ast_node(type, rettype, left, right) : 0;
+		}
+
+		xpath_ast_node* alloc_node(ast_type_t type, xpath_ast_node* left, axis_t axis, nodetest_t test, const char_t* contents)
+		{
+			void* memory = alloc_node();
+			return memory ? new (memory) xpath_ast_node(type, left, axis, test, contents) : 0;
+		}
+
+		xpath_ast_node* alloc_node(ast_type_t type, xpath_ast_node* left, xpath_ast_node* right, predicate_t test)
+		{
+			void* memory = alloc_node();
+			return memory ? new (memory) xpath_ast_node(type, left, right, test) : 0;
+		}
+
+		const char_t* alloc_string(const xpath_lexer_string& value)
+		{
+			if (!value.begin)
+				return PUGIXML_TEXT("");
+
+			size_t length = static_cast<size_t>(value.end - value.begin);
+
+			char_t* c = static_cast<char_t*>(_alloc->allocate((length + 1) * sizeof(char_t)));
+			if (!c) return 0;
+
+			memcpy(c, value.begin, length * sizeof(char_t));
+			c[length] = 0;
+
+			return c;
+		}
+
+		xpath_ast_node* parse_function(const xpath_lexer_string& name, size_t argc, xpath_ast_node* args[2])
+		{
+			switch (name.begin[0])
+			{
+			case 'b':
+				if (name == PUGIXML_TEXT("boolean") && argc == 1)
+					return alloc_node(ast_func_boolean, xpath_type_boolean, args[0]);
+
+				break;
+
+			case 'c':
+				if (name == PUGIXML_TEXT("count") && argc == 1)
+				{
+					if (args[0]->rettype() != xpath_type_node_set) return error("Function has to be applied to node set");
+					return alloc_node(ast_func_count, xpath_type_number, args[0]);
+				}
+				else if (name == PUGIXML_TEXT("contains") && argc == 2)
+					return alloc_node(ast_func_contains, xpath_type_boolean, args[0], args[1]);
+				else if (name == PUGIXML_TEXT("concat") && argc >= 2)
+					return alloc_node(ast_func_concat, xpath_type_string, args[0], args[1]);
+				else if (name == PUGIXML_TEXT("ceiling") && argc == 1)
+					return alloc_node(ast_func_ceiling, xpath_type_number, args[0]);
+
+				break;
+
+			case 'f':
+				if (name == PUGIXML_TEXT("false") && argc == 0)
+					return alloc_node(ast_func_false, xpath_type_boolean);
+				else if (name == PUGIXML_TEXT("floor") && argc == 1)
+					return alloc_node(ast_func_floor, xpath_type_number, args[0]);
+
+				break;
+
+			case 'i':
+				if (name == PUGIXML_TEXT("id") && argc == 1)
+					return alloc_node(ast_func_id, xpath_type_node_set, args[0]);
+
+				break;
+
+			case 'l':
+				if (name == PUGIXML_TEXT("last") && argc == 0)
+					return alloc_node(ast_func_last, xpath_type_number);
+				else if (name == PUGIXML_TEXT("lang") && argc == 1)
+					return alloc_node(ast_func_lang, xpath_type_boolean, args[0]);
+				else if (name == PUGIXML_TEXT("local-name") && argc <= 1)
+				{
+					if (argc == 1 && args[0]->rettype() != xpath_type_node_set) return error("Function has to be applied to node set");
+					return alloc_node(argc == 0 ? ast_func_local_name_0 : ast_func_local_name_1, xpath_type_string, args[0]);
+				}
+
+				break;
+
+			case 'n':
+				if (name == PUGIXML_TEXT("name") && argc <= 1)
+				{
+					if (argc == 1 && args[0]->rettype() != xpath_type_node_set) return error("Function has to be applied to node set");
+					return alloc_node(argc == 0 ? ast_func_name_0 : ast_func_name_1, xpath_type_string, args[0]);
+				}
+				else if (name == PUGIXML_TEXT("namespace-uri") && argc <= 1)
+				{
+					if (argc == 1 && args[0]->rettype() != xpath_type_node_set) return error("Function has to be applied to node set");
+					return alloc_node(argc == 0 ? ast_func_namespace_uri_0 : ast_func_namespace_uri_1, xpath_type_string, args[0]);
+				}
+				else if (name == PUGIXML_TEXT("normalize-space") && argc <= 1)
+					return alloc_node(argc == 0 ? ast_func_normalize_space_0 : ast_func_normalize_space_1, xpath_type_string, args[0], args[1]);
+				else if (name == PUGIXML_TEXT("not") && argc == 1)
+					return alloc_node(ast_func_not, xpath_type_boolean, args[0]);
+				else if (name == PUGIXML_TEXT("number") && argc <= 1)
+					return alloc_node(argc == 0 ? ast_func_number_0 : ast_func_number_1, xpath_type_number, args[0]);
+
+				break;
+
+			case 'p':
+				if (name == PUGIXML_TEXT("position") && argc == 0)
+					return alloc_node(ast_func_position, xpath_type_number);
+
+				break;
+
+			case 'r':
+				if (name == PUGIXML_TEXT("round") && argc == 1)
+					return alloc_node(ast_func_round, xpath_type_number, args[0]);
+
+				break;
+
+			case 's':
+				if (name == PUGIXML_TEXT("string") && argc <= 1)
+					return alloc_node(argc == 0 ? ast_func_string_0 : ast_func_string_1, xpath_type_string, args[0]);
+				else if (name == PUGIXML_TEXT("string-length") && argc <= 1)
+					return alloc_node(argc == 0 ? ast_func_string_length_0 : ast_func_string_length_1, xpath_type_number, args[0]);
+				else if (name == PUGIXML_TEXT("starts-with") && argc == 2)
+					return alloc_node(ast_func_starts_with, xpath_type_boolean, args[0], args[1]);
+				else if (name == PUGIXML_TEXT("substring-before") && argc == 2)
+					return alloc_node(ast_func_substring_before, xpath_type_string, args[0], args[1]);
+				else if (name == PUGIXML_TEXT("substring-after") && argc == 2)
+					return alloc_node(ast_func_substring_after, xpath_type_string, args[0], args[1]);
+				else if (name == PUGIXML_TEXT("substring") && (argc == 2 || argc == 3))
+					return alloc_node(argc == 2 ? ast_func_substring_2 : ast_func_substring_3, xpath_type_string, args[0], args[1]);
+				else if (name == PUGIXML_TEXT("sum") && argc == 1)
+				{
+					if (args[0]->rettype() != xpath_type_node_set) return error("Function has to be applied to node set");
+					return alloc_node(ast_func_sum, xpath_type_number, args[0]);
+				}
+
+				break;
+
+			case 't':
+				if (name == PUGIXML_TEXT("translate") && argc == 3)
+					return alloc_node(ast_func_translate, xpath_type_string, args[0], args[1]);
+				else if (name == PUGIXML_TEXT("true") && argc == 0)
+					return alloc_node(ast_func_true, xpath_type_boolean);
+
+				break;
+
+			default:
+				break;
+			}
+
+			return error("Unrecognized function or wrong parameter count");
+		}
+
+		axis_t parse_axis_name(const xpath_lexer_string& name, bool& specified)
+		{
+			specified = true;
+
+			switch (name.begin[0])
+			{
+			case 'a':
+				if (name == PUGIXML_TEXT("ancestor"))
+					return axis_ancestor;
+				else if (name == PUGIXML_TEXT("ancestor-or-self"))
+					return axis_ancestor_or_self;
+				else if (name == PUGIXML_TEXT("attribute"))
+					return axis_attribute;
+
+				break;
+
+			case 'c':
+				if (name == PUGIXML_TEXT("child"))
+					return axis_child;
+
+				break;
+
+			case 'd':
+				if (name == PUGIXML_TEXT("descendant"))
+					return axis_descendant;
+				else if (name == PUGIXML_TEXT("descendant-or-self"))
+					return axis_descendant_or_self;
+
+				break;
+
+			case 'f':
+				if (name == PUGIXML_TEXT("following"))
+					return axis_following;
+				else if (name == PUGIXML_TEXT("following-sibling"))
+					return axis_following_sibling;
+
+				break;
+
+			case 'n':
+				if (name == PUGIXML_TEXT("namespace"))
+					return axis_namespace;
+
+				break;
+
+			case 'p':
+				if (name == PUGIXML_TEXT("parent"))
+					return axis_parent;
+				else if (name == PUGIXML_TEXT("preceding"))
+					return axis_preceding;
+				else if (name == PUGIXML_TEXT("preceding-sibling"))
+					return axis_preceding_sibling;
+
+				break;
+
+			case 's':
+				if (name == PUGIXML_TEXT("self"))
+					return axis_self;
+
+				break;
+
+			default:
+				break;
+			}
+
+			specified = false;
+			return axis_child;
+		}
+
+		nodetest_t parse_node_test_type(const xpath_lexer_string& name)
+		{
+			switch (name.begin[0])
+			{
+			case 'c':
+				if (name == PUGIXML_TEXT("comment"))
+					return nodetest_type_comment;
+
+				break;
+
+			case 'n':
+				if (name == PUGIXML_TEXT("node"))
+					return nodetest_type_node;
+
+				break;
+
+			case 'p':
+				if (name == PUGIXML_TEXT("processing-instruction"))
+					return nodetest_type_pi;
+
+				break;
+
+			case 't':
+				if (name == PUGIXML_TEXT("text"))
+					return nodetest_type_text;
+
+				break;
+
+			default:
+				break;
+			}
+
+			return nodetest_none;
+		}
+
+		// PrimaryExpr ::= VariableReference | '(' Expr ')' | Literal | Number | FunctionCall
+		xpath_ast_node* parse_primary_expression()
+		{
+			switch (_lexer.current())
+			{
+			case lex_var_ref:
+			{
+				xpath_lexer_string name = _lexer.contents();
+
+				if (!_variables)
+					return error("Unknown variable: variable set is not provided");
+
+				xpath_variable* var = 0;
+				if (!get_variable_scratch(_scratch, _variables, name.begin, name.end, &var))
+					return error_oom();
+
+				if (!var)
+					return error("Unknown variable: variable set does not contain the given name");
+
+				_lexer.next();
+
+				return alloc_node(ast_variable, var->type(), var);
+			}
+
+			case lex_open_brace:
+			{
+				_lexer.next();
+
+				xpath_ast_node* n = parse_expression();
+				if (!n) return 0;
+
+				if (_lexer.current() != lex_close_brace)
+					return error("Expected ')' to match an opening '('");
+
+				_lexer.next();
+
+				return n;
+			}
+
+			case lex_quoted_string:
+			{
+				const char_t* value = alloc_string(_lexer.contents());
+				if (!value) return 0;
+
+				_lexer.next();
+
+				return alloc_node(ast_string_constant, xpath_type_string, value);
+			}
+
+			case lex_number:
+			{
+				double value = 0;
+
+				if (!convert_string_to_number_scratch(_scratch, _lexer.contents().begin, _lexer.contents().end, &value))
+					return error_oom();
+
+				_lexer.next();
+
+				return alloc_node(ast_number_constant, xpath_type_number, value);
+			}
+
+			case lex_string:
+			{
+				xpath_ast_node* args[2] = {0};
+				size_t argc = 0;
+
+				xpath_lexer_string function = _lexer.contents();
+				_lexer.next();
+
+				xpath_ast_node* last_arg = 0;
+
+				if (_lexer.current() != lex_open_brace)
+					return error("Unrecognized function call");
+				_lexer.next();
+
+				while (_lexer.current() != lex_close_brace)
+				{
+					if (argc > 0)
+					{
+						if (_lexer.current() != lex_comma)
+							return error("No comma between function arguments");
+						_lexer.next();
+					}
+
+					xpath_ast_node* n = parse_expression();
+					if (!n) return 0;
+
+					if (argc < 2) args[argc] = n;
+					else last_arg->set_next(n);
+
+					argc++;
+					last_arg = n;
+				}
+
+				_lexer.next();
+
+				return parse_function(function, argc, args);
+			}
+
+			default:
+				return error("Unrecognizable primary expression");
+			}
+		}
+
+		// FilterExpr ::= PrimaryExpr | FilterExpr Predicate
+		// Predicate ::= '[' PredicateExpr ']'
+		// PredicateExpr ::= Expr
+		xpath_ast_node* parse_filter_expression()
+		{
+			xpath_ast_node* n = parse_primary_expression();
+			if (!n) return 0;
+
+			while (_lexer.current() == lex_open_square_brace)
+			{
+				_lexer.next();
+
+				if (n->rettype() != xpath_type_node_set)
+					return error("Predicate has to be applied to node set");
+
+				xpath_ast_node* expr = parse_expression();
+				if (!expr) return 0;
+
+				n = alloc_node(ast_filter, n, expr, predicate_default);
+				if (!n) return 0;
+
+				if (_lexer.current() != lex_close_square_brace)
+					return error("Expected ']' to match an opening '['");
+
+				_lexer.next();
+			}
+
+			return n;
+		}
+
+		// Step ::= AxisSpecifier NodeTest Predicate* | AbbreviatedStep
+		// AxisSpecifier ::= AxisName '::' | '@'?
+		// NodeTest ::= NameTest | NodeType '(' ')' | 'processing-instruction' '(' Literal ')'
+		// NameTest ::= '*' | NCName ':' '*' | QName
+		// AbbreviatedStep ::= '.' | '..'
+		xpath_ast_node* parse_step(xpath_ast_node* set)
+		{
+			if (set && set->rettype() != xpath_type_node_set)
+				return error("Step has to be applied to node set");
+
+			bool axis_specified = false;
+			axis_t axis = axis_child; // implied child axis
+
+			if (_lexer.current() == lex_axis_attribute)
+			{
+				axis = axis_attribute;
+				axis_specified = true;
+
+				_lexer.next();
+			}
+			else if (_lexer.current() == lex_dot)
+			{
+				_lexer.next();
+
+				if (_lexer.current() == lex_open_square_brace)
+					return error("Predicates are not allowed after an abbreviated step");
+
+				return alloc_node(ast_step, set, axis_self, nodetest_type_node, 0);
+			}
+			else if (_lexer.current() == lex_double_dot)
+			{
+				_lexer.next();
+
+				if (_lexer.current() == lex_open_square_brace)
+					return error("Predicates are not allowed after an abbreviated step");
+
+				return alloc_node(ast_step, set, axis_parent, nodetest_type_node, 0);
+			}
+
+			nodetest_t nt_type = nodetest_none;
+			xpath_lexer_string nt_name;
+
+			if (_lexer.current() == lex_string)
+			{
+				// node name test
+				nt_name = _lexer.contents();
+				_lexer.next();
+
+				// was it an axis name?
+				if (_lexer.current() == lex_double_colon)
+				{
+					// parse axis name
+					if (axis_specified)
+						return error("Two axis specifiers in one step");
+
+					axis = parse_axis_name(nt_name, axis_specified);
+
+					if (!axis_specified)
+						return error("Unknown axis");
+
+					// read actual node test
+					_lexer.next();
+
+					if (_lexer.current() == lex_multiply)
+					{
+						nt_type = nodetest_all;
+						nt_name = xpath_lexer_string();
+						_lexer.next();
+					}
+					else if (_lexer.current() == lex_string)
+					{
+						nt_name = _lexer.contents();
+						_lexer.next();
+					}
+					else
+					{
+						return error("Unrecognized node test");
+					}
+				}
+
+				if (nt_type == nodetest_none)
+				{
+					// node type test or processing-instruction
+					if (_lexer.current() == lex_open_brace)
+					{
+						_lexer.next();
+
+						if (_lexer.current() == lex_close_brace)
+						{
+							_lexer.next();
+
+							nt_type = parse_node_test_type(nt_name);
+
+							if (nt_type == nodetest_none)
+								return error("Unrecognized node type");
+
+							nt_name = xpath_lexer_string();
+						}
+						else if (nt_name == PUGIXML_TEXT("processing-instruction"))
+						{
+							if (_lexer.current() != lex_quoted_string)
+								return error("Only literals are allowed as arguments to processing-instruction()");
+
+							nt_type = nodetest_pi;
+							nt_name = _lexer.contents();
+							_lexer.next();
+
+							if (_lexer.current() != lex_close_brace)
+								return error("Unmatched brace near processing-instruction()");
+							_lexer.next();
+						}
+						else
+						{
+							return error("Unmatched brace near node type test");
+						}
+					}
+					// QName or NCName:*
+					else
+					{
+						if (nt_name.end - nt_name.begin > 2 && nt_name.end[-2] == ':' && nt_name.end[-1] == '*') // NCName:*
+						{
+							nt_name.end--; // erase *
+
+							nt_type = nodetest_all_in_namespace;
+						}
+						else
+						{
+							nt_type = nodetest_name;
+						}
+					}
+				}
+			}
+			else if (_lexer.current() == lex_multiply)
+			{
+				nt_type = nodetest_all;
+				_lexer.next();
+			}
+			else
+			{
+				return error("Unrecognized node test");
+			}
+
+			const char_t* nt_name_copy = alloc_string(nt_name);
+			if (!nt_name_copy) return 0;
+
+			xpath_ast_node* n = alloc_node(ast_step, set, axis, nt_type, nt_name_copy);
+			if (!n) return 0;
+
+			xpath_ast_node* last = 0;
+
+			while (_lexer.current() == lex_open_square_brace)
+			{
+				_lexer.next();
+
+				xpath_ast_node* expr = parse_expression();
+				if (!expr) return 0;
+
+				xpath_ast_node* pred = alloc_node(ast_predicate, 0, expr, predicate_default);
+				if (!pred) return 0;
+
+				if (_lexer.current() != lex_close_square_brace)
+					return error("Expected ']' to match an opening '['");
+				_lexer.next();
+
+				if (last) last->set_next(pred);
+				else n->set_right(pred);
+
+				last = pred;
+			}
+
+			return n;
+		}
+
+		// RelativeLocationPath ::= Step | RelativeLocationPath '/' Step | RelativeLocationPath '//' Step
+		xpath_ast_node* parse_relative_location_path(xpath_ast_node* set)
+		{
+			xpath_ast_node* n = parse_step(set);
+			if (!n) return 0;
+
+			while (_lexer.current() == lex_slash || _lexer.current() == lex_double_slash)
+			{
+				lexeme_t l = _lexer.current();
+				_lexer.next();
+
+				if (l == lex_double_slash)
+				{
+					n = alloc_node(ast_step, n, axis_descendant_or_self, nodetest_type_node, 0);
+					if (!n) return 0;
+				}
+
+				n = parse_step(n);
+				if (!n) return 0;
+			}
+
+			return n;
+		}
+
+		// LocationPath ::= RelativeLocationPath | AbsoluteLocationPath
+		// AbsoluteLocationPath ::= '/' RelativeLocationPath? | '//' RelativeLocationPath
+		xpath_ast_node* parse_location_path()
+		{
+			if (_lexer.current() == lex_slash)
+			{
+				_lexer.next();
+
+				xpath_ast_node* n = alloc_node(ast_step_root, xpath_type_node_set);
+				if (!n) return 0;
+
+				// relative location path can start from axis_attribute, dot, double_dot, multiply and string lexemes; any other lexeme means standalone root path
+				lexeme_t l = _lexer.current();
+
+				if (l == lex_string || l == lex_axis_attribute || l == lex_dot || l == lex_double_dot || l == lex_multiply)
+					return parse_relative_location_path(n);
+				else
+					return n;
+			}
+			else if (_lexer.current() == lex_double_slash)
+			{
+				_lexer.next();
+
+				xpath_ast_node* n = alloc_node(ast_step_root, xpath_type_node_set);
+				if (!n) return 0;
+
+				n = alloc_node(ast_step, n, axis_descendant_or_self, nodetest_type_node, 0);
+				if (!n) return 0;
+
+				return parse_relative_location_path(n);
+			}
+
+			// else clause moved outside of if because of bogus warning 'control may reach end of non-void function being inlined' in gcc 4.0.1
+			return parse_relative_location_path(0);
+		}
+
+		// PathExpr ::= LocationPath
+		//				| FilterExpr
+		//				| FilterExpr '/' RelativeLocationPath
+		//				| FilterExpr '//' RelativeLocationPath
+		// UnionExpr ::= PathExpr | UnionExpr '|' PathExpr
+		// UnaryExpr ::= UnionExpr | '-' UnaryExpr
+		xpath_ast_node* parse_path_or_unary_expression()
+		{
+			// Clarification.
+			// PathExpr begins with either LocationPath or FilterExpr.
+			// FilterExpr begins with PrimaryExpr
+			// PrimaryExpr begins with '$' in case of it being a variable reference,
+			// '(' in case of it being an expression, string literal, number constant or
+			// function call.
+			if (_lexer.current() == lex_var_ref || _lexer.current() == lex_open_brace ||
+				_lexer.current() == lex_quoted_string || _lexer.current() == lex_number ||
+				_lexer.current() == lex_string)
+			{
+				if (_lexer.current() == lex_string)
+				{
+					// This is either a function call, or not - if not, we shall proceed with location path
+					const char_t* state = _lexer.state();
+
+					while (PUGI__IS_CHARTYPE(*state, ct_space)) ++state;
+
+					if (*state != '(')
+						return parse_location_path();
+
+					// This looks like a function call; however this still can be a node-test. Check it.
+					if (parse_node_test_type(_lexer.contents()) != nodetest_none)
+						return parse_location_path();
+				}
+
+				xpath_ast_node* n = parse_filter_expression();
+				if (!n) return 0;
+
+				if (_lexer.current() == lex_slash || _lexer.current() == lex_double_slash)
+				{
+					lexeme_t l = _lexer.current();
+					_lexer.next();
+
+					if (l == lex_double_slash)
+					{
+						if (n->rettype() != xpath_type_node_set)
+							return error("Step has to be applied to node set");
+
+						n = alloc_node(ast_step, n, axis_descendant_or_self, nodetest_type_node, 0);
+						if (!n) return 0;
+					}
+
+					// select from location path
+					return parse_relative_location_path(n);
+				}
+
+				return n;
+			}
+			else if (_lexer.current() == lex_minus)
+			{
+				_lexer.next();
+
+				// precedence 7+ - only parses union expressions
+				xpath_ast_node* n = parse_expression(7);
+				if (!n) return 0;
+
+				return alloc_node(ast_op_negate, xpath_type_number, n);
+			}
+			else
+			{
+				return parse_location_path();
+			}
+		}
+
+		struct binary_op_t
+		{
+			ast_type_t asttype;
+			xpath_value_type rettype;
+			int precedence;
+
+			binary_op_t(): asttype(ast_unknown), rettype(xpath_type_none), precedence(0)
+			{
+			}
+
+			binary_op_t(ast_type_t asttype_, xpath_value_type rettype_, int precedence_): asttype(asttype_), rettype(rettype_), precedence(precedence_)
+			{
+			}
+
+			static binary_op_t parse(xpath_lexer& lexer)
+			{
+				switch (lexer.current())
+				{
+				case lex_string:
+					if (lexer.contents() == PUGIXML_TEXT("or"))
+						return binary_op_t(ast_op_or, xpath_type_boolean, 1);
+					else if (lexer.contents() == PUGIXML_TEXT("and"))
+						return binary_op_t(ast_op_and, xpath_type_boolean, 2);
+					else if (lexer.contents() == PUGIXML_TEXT("div"))
+						return binary_op_t(ast_op_divide, xpath_type_number, 6);
+					else if (lexer.contents() == PUGIXML_TEXT("mod"))
+						return binary_op_t(ast_op_mod, xpath_type_number, 6);
+					else
+						return binary_op_t();
+
+				case lex_equal:
+					return binary_op_t(ast_op_equal, xpath_type_boolean, 3);
+
+				case lex_not_equal:
+					return binary_op_t(ast_op_not_equal, xpath_type_boolean, 3);
+
+				case lex_less:
+					return binary_op_t(ast_op_less, xpath_type_boolean, 4);
+
+				case lex_greater:
+					return binary_op_t(ast_op_greater, xpath_type_boolean, 4);
+
+				case lex_less_or_equal:
+					return binary_op_t(ast_op_less_or_equal, xpath_type_boolean, 4);
+
+				case lex_greater_or_equal:
+					return binary_op_t(ast_op_greater_or_equal, xpath_type_boolean, 4);
+
+				case lex_plus:
+					return binary_op_t(ast_op_add, xpath_type_number, 5);
+
+				case lex_minus:
+					return binary_op_t(ast_op_subtract, xpath_type_number, 5);
+
+				case lex_multiply:
+					return binary_op_t(ast_op_multiply, xpath_type_number, 6);
+
+				case lex_union:
+					return binary_op_t(ast_op_union, xpath_type_node_set, 7);
+
+				default:
+					return binary_op_t();
+				}
+			}
+		};
+
+		xpath_ast_node* parse_expression_rec(xpath_ast_node* lhs, int limit)
+		{
+			binary_op_t op = binary_op_t::parse(_lexer);
+
+			while (op.asttype != ast_unknown && op.precedence >= limit)
+			{
+				_lexer.next();
+
+				xpath_ast_node* rhs = parse_path_or_unary_expression();
+				if (!rhs) return 0;
+
+				binary_op_t nextop = binary_op_t::parse(_lexer);
+
+				while (nextop.asttype != ast_unknown && nextop.precedence > op.precedence)
+				{
+					rhs = parse_expression_rec(rhs, nextop.precedence);
+					if (!rhs) return 0;
+
+					nextop = binary_op_t::parse(_lexer);
+				}
+
+				if (op.asttype == ast_op_union && (lhs->rettype() != xpath_type_node_set || rhs->rettype() != xpath_type_node_set))
+					return error("Union operator has to be applied to node sets");
+
+				lhs = alloc_node(op.asttype, op.rettype, lhs, rhs);
+				if (!lhs) return 0;
+
+				op = binary_op_t::parse(_lexer);
+			}
+
+			return lhs;
+		}
+
+		// Expr ::= OrExpr
+		// OrExpr ::= AndExpr | OrExpr 'or' AndExpr
+		// AndExpr ::= EqualityExpr | AndExpr 'and' EqualityExpr
+		// EqualityExpr ::= RelationalExpr
+		//					| EqualityExpr '=' RelationalExpr
+		//					| EqualityExpr '!=' RelationalExpr
+		// RelationalExpr ::= AdditiveExpr
+		//					  | RelationalExpr '<' AdditiveExpr
+		//					  | RelationalExpr '>' AdditiveExpr
+		//					  | RelationalExpr '<=' AdditiveExpr
+		//					  | RelationalExpr '>=' AdditiveExpr
+		// AdditiveExpr ::= MultiplicativeExpr
+		//					| AdditiveExpr '+' MultiplicativeExpr
+		//					| AdditiveExpr '-' MultiplicativeExpr
+		// MultiplicativeExpr ::= UnaryExpr
+		//						  | MultiplicativeExpr '*' UnaryExpr
+		//						  | MultiplicativeExpr 'div' UnaryExpr
+		//						  | MultiplicativeExpr 'mod' UnaryExpr
+		xpath_ast_node* parse_expression(int limit = 0)
+		{
+			xpath_ast_node* n = parse_path_or_unary_expression();
+			if (!n) return 0;
+
+			return parse_expression_rec(n, limit);
+		}
+
+		xpath_parser(const char_t* query, xpath_variable_set* variables, xpath_allocator* alloc, xpath_parse_result* result): _alloc(alloc), _lexer(query), _query(query), _variables(variables), _result(result)
+		{
+		}
+
+		xpath_ast_node* parse()
+		{
+			xpath_ast_node* n = parse_expression();
+			if (!n) return 0;
+
+			// check if there are unparsed tokens left
+			if (_lexer.current() != lex_eof)
+				return error("Incorrect query");
+
+			return n;
+		}
+
+		static xpath_ast_node* parse(const char_t* query, xpath_variable_set* variables, xpath_allocator* alloc, xpath_parse_result* result)
+		{
+			xpath_parser parser(query, variables, alloc, result);
+
+			return parser.parse();
+		}
+	};
+
+	struct xpath_query_impl
+	{
+		static xpath_query_impl* create()
+		{
+			void* memory = xml_memory::allocate(sizeof(xpath_query_impl));
+			if (!memory) return 0;
+
+			return new (memory) xpath_query_impl();
+		}
+
+		static void destroy(xpath_query_impl* impl)
+		{
+			// free all allocated pages
+			impl->alloc.release();
+
+			// free allocator memory (with the first page)
+			xml_memory::deallocate(impl);
+		}
+
+		xpath_query_impl(): root(0), alloc(&block, &oom), oom(false)
+		{
+			block.next = 0;
+			block.capacity = sizeof(block.data);
+		}
+
+		xpath_ast_node* root;
+		xpath_allocator alloc;
+		xpath_memory_block block;
+		bool oom;
+	};
+
+	PUGI__FN impl::xpath_ast_node* evaluate_node_set_prepare(xpath_query_impl* impl)
+	{
+		if (!impl) return 0;
+
+		if (impl->root->rettype() != xpath_type_node_set)
+		{
+		#ifdef PUGIXML_NO_EXCEPTIONS
+			return 0;
+		#else
+			xpath_parse_result res;
+			res.error = "Expression does not evaluate to node set";
+
+			throw xpath_exception(res);
+		#endif
+		}
+
+		return impl->root;
+	}
+PUGI__NS_END
+
+namespace pugi
+{
+#ifndef PUGIXML_NO_EXCEPTIONS
+	PUGI__FN xpath_exception::xpath_exception(const xpath_parse_result& result_): _result(result_)
+	{
+		assert(_result.error);
+	}
+
+	PUGI__FN const char* xpath_exception::what() const throw()
+	{
+		return _result.error;
+	}
+
+	PUGI__FN const xpath_parse_result& xpath_exception::result() const
+	{
+		return _result;
+	}
+#endif
+
+	PUGI__FN xpath_node::xpath_node()
+	{
+	}
+
+	PUGI__FN xpath_node::xpath_node(const xml_node& node_): _node(node_)
+	{
+	}
+
+	PUGI__FN xpath_node::xpath_node(const xml_attribute& attribute_, const xml_node& parent_): _node(attribute_ ? parent_ : xml_node()), _attribute(attribute_)
+	{
+	}
+
+	PUGI__FN xml_node xpath_node::node() const
+	{
+		return _attribute ? xml_node() : _node;
+	}
+
+	PUGI__FN xml_attribute xpath_node::attribute() const
+	{
+		return _attribute;
+	}
+
+	PUGI__FN xml_node xpath_node::parent() const
+	{
+		return _attribute ? _node : _node.parent();
+	}
+
+	PUGI__FN static void unspecified_bool_xpath_node(xpath_node***)
+	{
+	}
+
+	PUGI__FN xpath_node::operator xpath_node::unspecified_bool_type() const
+	{
+		return (_node || _attribute) ? unspecified_bool_xpath_node : 0;
+	}
+
+	PUGI__FN bool xpath_node::operator!() const
+	{
+		return !(_node || _attribute);
+	}
+
+	PUGI__FN bool xpath_node::operator==(const xpath_node& n) const
+	{
+		return _node == n._node && _attribute == n._attribute;
+	}
+
+	PUGI__FN bool xpath_node::operator!=(const xpath_node& n) const
+	{
+		return _node != n._node || _attribute != n._attribute;
+	}
+
+#ifdef __BORLANDC__
+	PUGI__FN bool operator&&(const xpath_node& lhs, bool rhs)
+	{
+		return (bool)lhs && rhs;
+	}
+
+	PUGI__FN bool operator||(const xpath_node& lhs, bool rhs)
+	{
+		return (bool)lhs || rhs;
+	}
+#endif
+
+	PUGI__FN void xpath_node_set::_assign(const_iterator begin_, const_iterator end_, type_t type_)
+	{
+		assert(begin_ <= end_);
+
+		size_t size_ = static_cast<size_t>(end_ - begin_);
+
+		if (size_ <= 1)
+		{
+			// deallocate old buffer
+			if (_begin != &_storage) impl::xml_memory::deallocate(_begin);
+
+			// use internal buffer
+			if (begin_ != end_) _storage = *begin_;
+
+			_begin = &_storage;
+			_end = &_storage + size_;
+			_type = type_;
+		}
+		else
+		{
+			// make heap copy
+			xpath_node* storage = static_cast<xpath_node*>(impl::xml_memory::allocate(size_ * sizeof(xpath_node)));
+
+			if (!storage)
+			{
+			#ifdef PUGIXML_NO_EXCEPTIONS
+				return;
+			#else
+				throw std::bad_alloc();
+			#endif
+			}
+
+			memcpy(storage, begin_, size_ * sizeof(xpath_node));
+
+			// deallocate old buffer
+			if (_begin != &_storage) impl::xml_memory::deallocate(_begin);
+
+			// finalize
+			_begin = storage;
+			_end = storage + size_;
+			_type = type_;
+		}
+	}
+
+#ifdef PUGIXML_HAS_MOVE
+	PUGI__FN void xpath_node_set::_move(xpath_node_set& rhs) PUGIXML_NOEXCEPT
+	{
+		_type = rhs._type;
+		_storage = rhs._storage;
+		_begin = (rhs._begin == &rhs._storage) ? &_storage : rhs._begin;
+		_end = _begin + (rhs._end - rhs._begin);
+
+		rhs._type = type_unsorted;
+		rhs._begin = &rhs._storage;
+		rhs._end = rhs._begin;
+	}
+#endif
+
+	PUGI__FN xpath_node_set::xpath_node_set(): _type(type_unsorted), _begin(&_storage), _end(&_storage)
+	{
+	}
+
+	PUGI__FN xpath_node_set::xpath_node_set(const_iterator begin_, const_iterator end_, type_t type_): _type(type_unsorted), _begin(&_storage), _end(&_storage)
+	{
+		_assign(begin_, end_, type_);
+	}
+
+	PUGI__FN xpath_node_set::~xpath_node_set()
+	{
+		if (_begin != &_storage)
+			impl::xml_memory::deallocate(_begin);
+	}
+
+	PUGI__FN xpath_node_set::xpath_node_set(const xpath_node_set& ns): _type(type_unsorted), _begin(&_storage), _end(&_storage)
+	{
+		_assign(ns._begin, ns._end, ns._type);
+	}
+
+	PUGI__FN xpath_node_set& xpath_node_set::operator=(const xpath_node_set& ns)
+	{
+		if (this == &ns) return *this;
+
+		_assign(ns._begin, ns._end, ns._type);
+
+		return *this;
+	}
+
+#ifdef PUGIXML_HAS_MOVE
+	PUGI__FN xpath_node_set::xpath_node_set(xpath_node_set&& rhs) PUGIXML_NOEXCEPT: _type(type_unsorted), _begin(&_storage), _end(&_storage)
+	{
+		_move(rhs);
+	}
+
+	PUGI__FN xpath_node_set& xpath_node_set::operator=(xpath_node_set&& rhs) PUGIXML_NOEXCEPT
+	{
+		if (this == &rhs) return *this;
+
+		if (_begin != &_storage)
+			impl::xml_memory::deallocate(_begin);
+
+		_move(rhs);
+
+		return *this;
+	}
+#endif
+
+	PUGI__FN xpath_node_set::type_t xpath_node_set::type() const
+	{
+		return _type;
+	}
+
+	PUGI__FN size_t xpath_node_set::size() const
+	{
+		return _end - _begin;
+	}
+
+	PUGI__FN bool xpath_node_set::empty() const
+	{
+		return _begin == _end;
+	}
+
+	PUGI__FN const xpath_node& xpath_node_set::operator[](size_t index) const
+	{
+		assert(index < size());
+		return _begin[index];
+	}
+
+	PUGI__FN xpath_node_set::const_iterator xpath_node_set::begin() const
+	{
+		return _begin;
+	}
+
+	PUGI__FN xpath_node_set::const_iterator xpath_node_set::end() const
+	{
+		return _end;
+	}
+
+	PUGI__FN void xpath_node_set::sort(bool reverse)
+	{
+		_type = impl::xpath_sort(_begin, _end, _type, reverse);
+	}
+
+	PUGI__FN xpath_node xpath_node_set::first() const
+	{
+		return impl::xpath_first(_begin, _end, _type);
+	}
+
+	PUGI__FN xpath_parse_result::xpath_parse_result(): error("Internal error"), offset(0)
+	{
+	}
+
+	PUGI__FN xpath_parse_result::operator bool() const
+	{
+		return error == 0;
+	}
+
+	PUGI__FN const char* xpath_parse_result::description() const
+	{
+		return error ? error : "No error";
+	}
+
+	PUGI__FN xpath_variable::xpath_variable(xpath_value_type type_): _type(type_), _next(0)
+	{
+	}
+
+	PUGI__FN const char_t* xpath_variable::name() const
+	{
+		switch (_type)
+		{
+		case xpath_type_node_set:
+			return static_cast<const impl::xpath_variable_node_set*>(this)->name;
+
+		case xpath_type_number:
+			return static_cast<const impl::xpath_variable_number*>(this)->name;
+
+		case xpath_type_string:
+			return static_cast<const impl::xpath_variable_string*>(this)->name;
+
+		case xpath_type_boolean:
+			return static_cast<const impl::xpath_variable_boolean*>(this)->name;
+
+		default:
+			assert(false && "Invalid variable type"); // unreachable
+			return 0;
+		}
+	}
+
+	PUGI__FN xpath_value_type xpath_variable::type() const
+	{
+		return _type;
+	}
+
+	PUGI__FN bool xpath_variable::get_boolean() const
+	{
+		return (_type == xpath_type_boolean) ? static_cast<const impl::xpath_variable_boolean*>(this)->value : false;
+	}
+
+	PUGI__FN double xpath_variable::get_number() const
+	{
+		return (_type == xpath_type_number) ? static_cast<const impl::xpath_variable_number*>(this)->value : impl::gen_nan();
+	}
+
+	PUGI__FN const char_t* xpath_variable::get_string() const
+	{
+		const char_t* value = (_type == xpath_type_string) ? static_cast<const impl::xpath_variable_string*>(this)->value : 0;
+		return value ? value : PUGIXML_TEXT("");
+	}
+
+	PUGI__FN const xpath_node_set& xpath_variable::get_node_set() const
+	{
+		return (_type == xpath_type_node_set) ? static_cast<const impl::xpath_variable_node_set*>(this)->value : impl::dummy_node_set;
+	}
+
+	PUGI__FN bool xpath_variable::set(bool value)
+	{
+		if (_type != xpath_type_boolean) return false;
+
+		static_cast<impl::xpath_variable_boolean*>(this)->value = value;
+		return true;
+	}
+
+	PUGI__FN bool xpath_variable::set(double value)
+	{
+		if (_type != xpath_type_number) return false;
+
+		static_cast<impl::xpath_variable_number*>(this)->value = value;
+		return true;
+	}
+
+	PUGI__FN bool xpath_variable::set(const char_t* value)
+	{
+		if (_type != xpath_type_string) return false;
+
+		impl::xpath_variable_string* var = static_cast<impl::xpath_variable_string*>(this);
+
+		// duplicate string
+		size_t size = (impl::strlength(value) + 1) * sizeof(char_t);
+
+		char_t* copy = static_cast<char_t*>(impl::xml_memory::allocate(size));
+		if (!copy) return false;
+
+		memcpy(copy, value, size);
+
+		// replace old string
+		if (var->value) impl::xml_memory::deallocate(var->value);
+		var->value = copy;
+
+		return true;
+	}
+
+	PUGI__FN bool xpath_variable::set(const xpath_node_set& value)
+	{
+		if (_type != xpath_type_node_set) return false;
+
+		static_cast<impl::xpath_variable_node_set*>(this)->value = value;
+		return true;
+	}
+
+	PUGI__FN xpath_variable_set::xpath_variable_set()
+	{
+		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
+			_data[i] = 0;
+	}
+
+	PUGI__FN xpath_variable_set::~xpath_variable_set()
+	{
+		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
+			_destroy(_data[i]);
+	}
+
+	PUGI__FN xpath_variable_set::xpath_variable_set(const xpath_variable_set& rhs)
+	{
+		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
+			_data[i] = 0;
+
+		_assign(rhs);
+	}
+
+	PUGI__FN xpath_variable_set& xpath_variable_set::operator=(const xpath_variable_set& rhs)
+	{
+		if (this == &rhs) return *this;
+
+		_assign(rhs);
+
+		return *this;
+	}
+
+#ifdef PUGIXML_HAS_MOVE
+	PUGI__FN xpath_variable_set::xpath_variable_set(xpath_variable_set&& rhs) PUGIXML_NOEXCEPT
+	{
+		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
+		{
+			_data[i] = rhs._data[i];
+			rhs._data[i] = 0;
+		}
+	}
+
+	PUGI__FN xpath_variable_set& xpath_variable_set::operator=(xpath_variable_set&& rhs) PUGIXML_NOEXCEPT
+	{
+		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
+		{
+			_destroy(_data[i]);
+
+			_data[i] = rhs._data[i];
+			rhs._data[i] = 0;
+		}
+
+		return *this;
+	}
+#endif
+
+	PUGI__FN void xpath_variable_set::_assign(const xpath_variable_set& rhs)
+	{
+		xpath_variable_set temp;
+
+		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
+			if (rhs._data[i] && !_clone(rhs._data[i], &temp._data[i]))
+				return;
+
+		_swap(temp);
+	}
+
+	PUGI__FN void xpath_variable_set::_swap(xpath_variable_set& rhs)
+	{
+		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
+		{
+			xpath_variable* chain = _data[i];
+
+			_data[i] = rhs._data[i];
+			rhs._data[i] = chain;
+		}
+	}
+
+	PUGI__FN xpath_variable* xpath_variable_set::_find(const char_t* name) const
+	{
+		const size_t hash_size = sizeof(_data) / sizeof(_data[0]);
+		size_t hash = impl::hash_string(name) % hash_size;
+
+		// look for existing variable
+		for (xpath_variable* var = _data[hash]; var; var = var->_next)
+			if (impl::strequal(var->name(), name))
+				return var;
+
+		return 0;
+	}
+
+	PUGI__FN bool xpath_variable_set::_clone(xpath_variable* var, xpath_variable** out_result)
+	{
+		xpath_variable* last = 0;
+
+		while (var)
+		{
+			// allocate storage for new variable
+			xpath_variable* nvar = impl::new_xpath_variable(var->_type, var->name());
+			if (!nvar) return false;
+
+			// link the variable to the result immediately to handle failures gracefully
+			if (last)
+				last->_next = nvar;
+			else
+				*out_result = nvar;
+
+			last = nvar;
+
+			// copy the value; this can fail due to out-of-memory conditions
+			if (!impl::copy_xpath_variable(nvar, var)) return false;
+
+			var = var->_next;
+		}
+
+		return true;
+	}
+
+	PUGI__FN void xpath_variable_set::_destroy(xpath_variable* var)
+	{
+		while (var)
+		{
+			xpath_variable* next = var->_next;
+
+			impl::delete_xpath_variable(var->_type, var);
+
+			var = next;
+		}
+	}
+
+	PUGI__FN xpath_variable* xpath_variable_set::add(const char_t* name, xpath_value_type type)
+	{
+		const size_t hash_size = sizeof(_data) / sizeof(_data[0]);
+		size_t hash = impl::hash_string(name) % hash_size;
+
+		// look for existing variable
+		for (xpath_variable* var = _data[hash]; var; var = var->_next)
+			if (impl::strequal(var->name(), name))
+				return var->type() == type ? var : 0;
+
+		// add new variable
+		xpath_variable* result = impl::new_xpath_variable(type, name);
+
+		if (result)
+		{
+			result->_next = _data[hash];
+
+			_data[hash] = result;
+		}
+
+		return result;
+	}
+
+	PUGI__FN bool xpath_variable_set::set(const char_t* name, bool value)
+	{
+		xpath_variable* var = add(name, xpath_type_boolean);
+		return var ? var->set(value) : false;
+	}
+
+	PUGI__FN bool xpath_variable_set::set(const char_t* name, double value)
+	{
+		xpath_variable* var = add(name, xpath_type_number);
+		return var ? var->set(value) : false;
+	}
+
+	PUGI__FN bool xpath_variable_set::set(const char_t* name, const char_t* value)
+	{
+		xpath_variable* var = add(name, xpath_type_string);
+		return var ? var->set(value) : false;
+	}
+
+	PUGI__FN bool xpath_variable_set::set(const char_t* name, const xpath_node_set& value)
+	{
+		xpath_variable* var = add(name, xpath_type_node_set);
+		return var ? var->set(value) : false;
+	}
+
+	PUGI__FN xpath_variable* xpath_variable_set::get(const char_t* name)
+	{
+		return _find(name);
+	}
+
+	PUGI__FN const xpath_variable* xpath_variable_set::get(const char_t* name) const
+	{
+		return _find(name);
+	}
+
+	PUGI__FN xpath_query::xpath_query(const char_t* query, xpath_variable_set* variables): _impl(0)
+	{
+		impl::xpath_query_impl* qimpl = impl::xpath_query_impl::create();
+
+		if (!qimpl)
+		{
+		#ifdef PUGIXML_NO_EXCEPTIONS
+			_result.error = "Out of memory";
+		#else
+			throw std::bad_alloc();
+		#endif
+		}
+		else
+		{
+			using impl::auto_deleter; // MSVC7 workaround
+			auto_deleter<impl::xpath_query_impl> impl(qimpl, impl::xpath_query_impl::destroy);
+
+			qimpl->root = impl::xpath_parser::parse(query, variables, &qimpl->alloc, &_result);
+
+			if (qimpl->root)
+			{
+				qimpl->root->optimize(&qimpl->alloc);
+
+				_impl = impl.release();
+				_result.error = 0;
+			}
+			else
+			{
+			#ifdef PUGIXML_NO_EXCEPTIONS
+				if (qimpl->oom) _result.error = "Out of memory";
+			#else
+				if (qimpl->oom) throw std::bad_alloc();
+				throw xpath_exception(_result);
+			#endif
+			}
+		}
+	}
+
+	PUGI__FN xpath_query::xpath_query(): _impl(0)
+	{
+	}
+
+	PUGI__FN xpath_query::~xpath_query()
+	{
+		if (_impl)
+			impl::xpath_query_impl::destroy(static_cast<impl::xpath_query_impl*>(_impl));
+	}
+
+#ifdef PUGIXML_HAS_MOVE
+	PUGI__FN xpath_query::xpath_query(xpath_query&& rhs) PUGIXML_NOEXCEPT
+	{
+		_impl = rhs._impl;
+		_result = rhs._result;
+		rhs._impl = 0;
+		rhs._result = xpath_parse_result();
+	}
+
+	PUGI__FN xpath_query& xpath_query::operator=(xpath_query&& rhs) PUGIXML_NOEXCEPT
+	{
+		if (this == &rhs) return *this;
+
+		if (_impl)
+			impl::xpath_query_impl::destroy(static_cast<impl::xpath_query_impl*>(_impl));
+
+		_impl = rhs._impl;
+		_result = rhs._result;
+		rhs._impl = 0;
+		rhs._result = xpath_parse_result();
+
+		return *this;
+	}
+#endif
+
+	PUGI__FN xpath_value_type xpath_query::return_type() const
+	{
+		if (!_impl) return xpath_type_none;
+
+		return static_cast<impl::xpath_query_impl*>(_impl)->root->rettype();
+	}
+
+	PUGI__FN bool xpath_query::evaluate_boolean(const xpath_node& n) const
+	{
+		if (!_impl) return false;
+
+		impl::xpath_context c(n, 1, 1);
+		impl::xpath_stack_data sd;
+
+		bool r = static_cast<impl::xpath_query_impl*>(_impl)->root->eval_boolean(c, sd.stack);
+
+		if (sd.oom)
+		{
+		#ifdef PUGIXML_NO_EXCEPTIONS
+			return false;
+		#else
+			throw std::bad_alloc();
+		#endif
+		}
+
+		return r;
+	}
+
+	PUGI__FN double xpath_query::evaluate_number(const xpath_node& n) const
+	{
+		if (!_impl) return impl::gen_nan();
+
+		impl::xpath_context c(n, 1, 1);
+		impl::xpath_stack_data sd;
+
+		double r = static_cast<impl::xpath_query_impl*>(_impl)->root->eval_number(c, sd.stack);
+
+		if (sd.oom)
+		{
+		#ifdef PUGIXML_NO_EXCEPTIONS
+			return impl::gen_nan();
+		#else
+			throw std::bad_alloc();
+		#endif
+		}
+
+		return r;
+	}
+
+#ifndef PUGIXML_NO_STL
+	PUGI__FN string_t xpath_query::evaluate_string(const xpath_node& n) const
+	{
+		if (!_impl) return string_t();
+
+		impl::xpath_context c(n, 1, 1);
+		impl::xpath_stack_data sd;
+
+		impl::xpath_string r = static_cast<impl::xpath_query_impl*>(_impl)->root->eval_string(c, sd.stack);
+
+		if (sd.oom)
+		{
+		#ifdef PUGIXML_NO_EXCEPTIONS
+			return string_t();
+		#else
+			throw std::bad_alloc();
+		#endif
+		}
+
+		return string_t(r.c_str(), r.length());
+	}
+#endif
+
+	PUGI__FN size_t xpath_query::evaluate_string(char_t* buffer, size_t capacity, const xpath_node& n) const
+	{
+		impl::xpath_context c(n, 1, 1);
+		impl::xpath_stack_data sd;
+
+		impl::xpath_string r = _impl ? static_cast<impl::xpath_query_impl*>(_impl)->root->eval_string(c, sd.stack) : impl::xpath_string();
+
+		if (sd.oom)
+		{
+		#ifdef PUGIXML_NO_EXCEPTIONS
+			r = impl::xpath_string();
+		#else
+			throw std::bad_alloc();
+		#endif
+		}
+
+		size_t full_size = r.length() + 1;
+
+		if (capacity > 0)
+		{
+			size_t size = (full_size < capacity) ? full_size : capacity;
+			assert(size > 0);
+
+			memcpy(buffer, r.c_str(), (size - 1) * sizeof(char_t));
+			buffer[size - 1] = 0;
+		}
+
+		return full_size;
+	}
+
+	PUGI__FN xpath_node_set xpath_query::evaluate_node_set(const xpath_node& n) const
+	{
+		impl::xpath_ast_node* root = impl::evaluate_node_set_prepare(static_cast<impl::xpath_query_impl*>(_impl));
+		if (!root) return xpath_node_set();
+
+		impl::xpath_context c(n, 1, 1);
+		impl::xpath_stack_data sd;
+
+		impl::xpath_node_set_raw r = root->eval_node_set(c, sd.stack, impl::nodeset_eval_all);
+
+		if (sd.oom)
+		{
+		#ifdef PUGIXML_NO_EXCEPTIONS
+			return xpath_node_set();
+		#else
+			throw std::bad_alloc();
+		#endif
+		}
+
+		return xpath_node_set(r.begin(), r.end(), r.type());
+	}
+
+	PUGI__FN xpath_node xpath_query::evaluate_node(const xpath_node& n) const
+	{
+		impl::xpath_ast_node* root = impl::evaluate_node_set_prepare(static_cast<impl::xpath_query_impl*>(_impl));
+		if (!root) return xpath_node();
+
+		impl::xpath_context c(n, 1, 1);
+		impl::xpath_stack_data sd;
+
+		impl::xpath_node_set_raw r = root->eval_node_set(c, sd.stack, impl::nodeset_eval_first);
+
+		if (sd.oom)
+		{
+		#ifdef PUGIXML_NO_EXCEPTIONS
+			return xpath_node();
+		#else
+			throw std::bad_alloc();
+		#endif
+		}
+
+		return r.first();
+	}
+
+	PUGI__FN const xpath_parse_result& xpath_query::result() const
+	{
+		return _result;
+	}
+
+	PUGI__FN static void unspecified_bool_xpath_query(xpath_query***)
+	{
+	}
+
+	PUGI__FN xpath_query::operator xpath_query::unspecified_bool_type() const
+	{
+		return _impl ? unspecified_bool_xpath_query : 0;
+	}
+
+	PUGI__FN bool xpath_query::operator!() const
+	{
+		return !_impl;
+	}
+
+	PUGI__FN xpath_node xml_node::select_node(const char_t* query, xpath_variable_set* variables) const
+	{
+		xpath_query q(query, variables);
+		return q.evaluate_node(*this);
+	}
+
+	PUGI__FN xpath_node xml_node::select_node(const xpath_query& query) const
+	{
+		return query.evaluate_node(*this);
+	}
+
+	PUGI__FN xpath_node_set xml_node::select_nodes(const char_t* query, xpath_variable_set* variables) const
+	{
+		xpath_query q(query, variables);
+		return q.evaluate_node_set(*this);
+	}
+
+	PUGI__FN xpath_node_set xml_node::select_nodes(const xpath_query& query) const
+	{
+		return query.evaluate_node_set(*this);
+	}
+
+	PUGI__FN xpath_node xml_node::select_single_node(const char_t* query, xpath_variable_set* variables) const
+	{
+		xpath_query q(query, variables);
+		return q.evaluate_node(*this);
+	}
+
+	PUGI__FN xpath_node xml_node::select_single_node(const xpath_query& query) const
+	{
+		return query.evaluate_node(*this);
+	}
+}
+
+#endif
+
+#ifdef __BORLANDC__
+#	pragma option pop
+#endif
+
+// Intel C++ does not properly keep warning state for function templates,
+// so popping warning state at the end of translation unit leads to warnings in the middle.
+#if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
+#	pragma warning(pop)
+#endif
+
+#if defined(_MSC_VER) && defined(__c2__)
+#	pragma clang diagnostic pop
+#endif
+
+// Undefine all local macros (makes sure we're not leaking macros in header-only mode)
+#undef PUGI__NO_INLINE
+#undef PUGI__UNLIKELY
+#undef PUGI__STATIC_ASSERT
+#undef PUGI__DMC_VOLATILE
+#undef PUGI__UNSIGNED_OVERFLOW
+#undef PUGI__MSVC_CRT_VERSION
+#undef PUGI__SNPRINTF
+#undef PUGI__NS_BEGIN
+#undef PUGI__NS_END
+#undef PUGI__FN
+#undef PUGI__FN_NO_INLINE
+#undef PUGI__GETHEADER_IMPL
+#undef PUGI__GETPAGE_IMPL
+#undef PUGI__GETPAGE
+#undef PUGI__NODETYPE
+#undef PUGI__IS_CHARTYPE_IMPL
+#undef PUGI__IS_CHARTYPE
+#undef PUGI__IS_CHARTYPEX
+#undef PUGI__ENDSWITH
+#undef PUGI__SKIPWS
+#undef PUGI__OPTSET
+#undef PUGI__PUSHNODE
+#undef PUGI__POPNODE
+#undef PUGI__SCANFOR
+#undef PUGI__SCANWHILE
+#undef PUGI__SCANWHILE_UNROLL
+#undef PUGI__ENDSEG
+#undef PUGI__THROW_ERROR
+#undef PUGI__CHECK_ERROR
+
+#endif
+
+/**
+ * Copyright (c) 2006-2018 Arseny Kapoulkine
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
diff --git a/contrib/pugixml/src/pugixml.hpp b/contrib/pugixml/src/pugixml.hpp
new file mode 100644
index 000000000..1775600f1
--- /dev/null
+++ b/contrib/pugixml/src/pugixml.hpp
@@ -0,0 +1,1468 @@
+/**
+ * pugixml parser - version 1.9
+ * --------------------------------------------------------
+ * Copyright (C) 2006-2018, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
+ * Report bugs and download new versions at http://pugixml.org/
+ *
+ * This library is distributed under the MIT License. See notice at the end
+ * of this file.
+ *
+ * This work is based on the pugxml parser, which is:
+ * Copyright (C) 2003, by Kristen Wegner (kristen@tima.net)
+ */
+
+#ifndef PUGIXML_VERSION
+// Define version macro; evaluates to major * 100 + minor so that it's safe to use in less-than comparisons
+#	define PUGIXML_VERSION 190
+#endif
+
+// Include user configuration file (this can define various configuration macros)
+#include "pugiconfig.hpp"
+
+#ifndef HEADER_PUGIXML_HPP
+#define HEADER_PUGIXML_HPP
+
+// Include stddef.h for size_t and ptrdiff_t
+#include <stddef.h>
+
+// Include exception header for XPath
+#if !defined(PUGIXML_NO_XPATH) && !defined(PUGIXML_NO_EXCEPTIONS)
+#	include <exception>
+#endif
+
+// Include STL headers
+#ifndef PUGIXML_NO_STL
+#	include <iterator>
+#	include <iosfwd>
+#	include <string>
+#endif
+
+// Macro for deprecated features
+#ifndef PUGIXML_DEPRECATED
+#	if defined(__GNUC__)
+#		define PUGIXML_DEPRECATED __attribute__((deprecated))
+#	elif defined(_MSC_VER) && _MSC_VER >= 1300
+#		define PUGIXML_DEPRECATED __declspec(deprecated)
+#	else
+#		define PUGIXML_DEPRECATED
+#	endif
+#endif
+
+// If no API is defined, assume default
+#ifndef PUGIXML_API
+#	define PUGIXML_API
+#endif
+
+// If no API for classes is defined, assume default
+#ifndef PUGIXML_CLASS
+#	define PUGIXML_CLASS PUGIXML_API
+#endif
+
+// If no API for functions is defined, assume default
+#ifndef PUGIXML_FUNCTION
+#	define PUGIXML_FUNCTION PUGIXML_API
+#endif
+
+// If the platform is known to have long long support, enable long long functions
+#ifndef PUGIXML_HAS_LONG_LONG
+#	if __cplusplus >= 201103
+#		define PUGIXML_HAS_LONG_LONG
+#	elif defined(_MSC_VER) && _MSC_VER >= 1400
+#		define PUGIXML_HAS_LONG_LONG
+#	endif
+#endif
+
+// If the platform is known to have move semantics support, compile move ctor/operator implementation
+#ifndef PUGIXML_HAS_MOVE
+#	if __cplusplus >= 201103
+#		define PUGIXML_HAS_MOVE
+#	elif defined(_MSC_VER) && _MSC_VER >= 1600
+#		define PUGIXML_HAS_MOVE
+#	endif
+#endif
+
+// If C++ is 2011 or higher, add 'noexcept' specifiers
+#ifndef PUGIXML_NOEXCEPT
+#	if __cplusplus >= 201103
+#		define PUGIXML_NOEXCEPT noexcept
+#	elif defined(_MSC_VER) && _MSC_VER >= 1900
+#		define PUGIXML_NOEXCEPT noexcept
+#	else
+#		define PUGIXML_NOEXCEPT
+#	endif
+#endif
+
+// Some functions can not be noexcept in compact mode
+#ifdef PUGIXML_COMPACT
+#	define PUGIXML_NOEXCEPT_IF_NOT_COMPACT
+#else
+#	define PUGIXML_NOEXCEPT_IF_NOT_COMPACT PUGIXML_NOEXCEPT
+#endif
+
+// If C++ is 2011 or higher, add 'override' qualifiers
+#ifndef PUGIXML_OVERRIDE
+#	if __cplusplus >= 201103
+#		define PUGIXML_OVERRIDE override
+#	elif defined(_MSC_VER) && _MSC_VER >= 1700
+#		define PUGIXML_OVERRIDE override
+#	else
+#		define PUGIXML_OVERRIDE
+#	endif
+#endif
+
+// Character interface macros
+#ifdef PUGIXML_WCHAR_MODE
+#	define PUGIXML_TEXT(t) L ## t
+#	define PUGIXML_CHAR wchar_t
+#else
+#	define PUGIXML_TEXT(t) t
+#	define PUGIXML_CHAR char
+#endif
+
+namespace pugi
+{
+	// Character type used for all internal storage and operations; depends on PUGIXML_WCHAR_MODE
+	typedef PUGIXML_CHAR char_t;
+
+#ifndef PUGIXML_NO_STL
+	// String type used for operations that work with STL string; depends on PUGIXML_WCHAR_MODE
+	typedef std::basic_string<PUGIXML_CHAR, std::char_traits<PUGIXML_CHAR>, std::allocator<PUGIXML_CHAR> > string_t;
+#endif
+}
+
+// The PugiXML namespace
+namespace pugi
+{
+	// Tree node types
+	enum xml_node_type
+	{
+		node_null,			// Empty (null) node handle
+		node_document,		// A document tree's absolute root
+		node_element,		// Element tag, i.e. '<node/>'
+		node_pcdata,		// Plain character data, i.e. 'text'
+		node_cdata,			// Character data, i.e. '<![CDATA[text]]>'
+		node_comment,		// Comment tag, i.e. '<!-- text -->'
+		node_pi,			// Processing instruction, i.e. '<?name?>'
+		node_declaration,	// Document declaration, i.e. '<?xml version="1.0"?>'
+		node_doctype		// Document type declaration, i.e. '<!DOCTYPE doc>'
+	};
+
+	// Parsing options
+
+	// Minimal parsing mode (equivalent to turning all other flags off).
+	// Only elements and PCDATA sections are added to the DOM tree, no text conversions are performed.
+	const unsigned int parse_minimal = 0x0000;
+
+	// This flag determines if processing instructions (node_pi) are added to the DOM tree. This flag is off by default.
+	const unsigned int parse_pi = 0x0001;
+
+	// This flag determines if comments (node_comment) are added to the DOM tree. This flag is off by default.
+	const unsigned int parse_comments = 0x0002;
+
+	// This flag determines if CDATA sections (node_cdata) are added to the DOM tree. This flag is on by default.
+	const unsigned int parse_cdata = 0x0004;
+
+	// This flag determines if plain character data (node_pcdata) that consist only of whitespace are added to the DOM tree.
+	// This flag is off by default; turning it on usually results in slower parsing and more memory consumption.
+	const unsigned int parse_ws_pcdata = 0x0008;
+
+	// This flag determines if character and entity references are expanded during parsing. This flag is on by default.
+	const unsigned int parse_escapes = 0x0010;
+
+	// This flag determines if EOL characters are normalized (converted to #xA) during parsing. This flag is on by default.
+	const unsigned int parse_eol = 0x0020;
+
+	// This flag determines if attribute values are normalized using CDATA normalization rules during parsing. This flag is on by default.
+	const unsigned int parse_wconv_attribute = 0x0040;
+
+	// This flag determines if attribute values are normalized using NMTOKENS normalization rules during parsing. This flag is off by default.
+	const unsigned int parse_wnorm_attribute = 0x0080;
+
+	// This flag determines if document declaration (node_declaration) is added to the DOM tree. This flag is off by default.
+	const unsigned int parse_declaration = 0x0100;
+
+	// This flag determines if document type declaration (node_doctype) is added to the DOM tree. This flag is off by default.
+	const unsigned int parse_doctype = 0x0200;
+
+	// This flag determines if plain character data (node_pcdata) that is the only child of the parent node and that consists only
+	// of whitespace is added to the DOM tree.
+	// This flag is off by default; turning it on may result in slower parsing and more memory consumption.
+	const unsigned int parse_ws_pcdata_single = 0x0400;
+
+	// This flag determines if leading and trailing whitespace is to be removed from plain character data. This flag is off by default.
+	const unsigned int parse_trim_pcdata = 0x0800;
+
+	// This flag determines if plain character data that does not have a parent node is added to the DOM tree, and if an empty document
+	// is a valid document. This flag is off by default.
+	const unsigned int parse_fragment = 0x1000;
+
+	// This flag determines if plain character data is be stored in the parent element's value. This significantly changes the structure of
+	// the document; this flag is only recommended for parsing documents with many PCDATA nodes in memory-constrained environments.
+	// This flag is off by default.
+	const unsigned int parse_embed_pcdata = 0x2000;
+
+	// The default parsing mode.
+	// Elements, PCDATA and CDATA sections are added to the DOM tree, character/reference entities are expanded,
+	// End-of-Line characters are normalized, attribute values are normalized using CDATA normalization rules.
+	const unsigned int parse_default = parse_cdata | parse_escapes | parse_wconv_attribute | parse_eol;
+
+	// The full parsing mode.
+	// Nodes of all types are added to the DOM tree, character/reference entities are expanded,
+	// End-of-Line characters are normalized, attribute values are normalized using CDATA normalization rules.
+	const unsigned int parse_full = parse_default | parse_pi | parse_comments | parse_declaration | parse_doctype;
+
+	// These flags determine the encoding of input data for XML document
+	enum xml_encoding
+	{
+		encoding_auto,		// Auto-detect input encoding using BOM or < / <? detection; use UTF8 if BOM is not found
+		encoding_utf8,		// UTF8 encoding
+		encoding_utf16_le,	// Little-endian UTF16
+		encoding_utf16_be,	// Big-endian UTF16
+		encoding_utf16,		// UTF16 with native endianness
+		encoding_utf32_le,	// Little-endian UTF32
+		encoding_utf32_be,	// Big-endian UTF32
+		encoding_utf32,		// UTF32 with native endianness
+		encoding_wchar,		// The same encoding wchar_t has (either UTF16 or UTF32)
+		encoding_latin1
+	};
+
+	// Formatting flags
+
+	// Indent the nodes that are written to output stream with as many indentation strings as deep the node is in DOM tree. This flag is on by default.
+	const unsigned int format_indent = 0x01;
+
+	// Write encoding-specific BOM to the output stream. This flag is off by default.
+	const unsigned int format_write_bom = 0x02;
+
+	// Use raw output mode (no indentation and no line breaks are written). This flag is off by default.
+	const unsigned int format_raw = 0x04;
+
+	// Omit default XML declaration even if there is no declaration in the document. This flag is off by default.
+	const unsigned int format_no_declaration = 0x08;
+
+	// Don't escape attribute values and PCDATA contents. This flag is off by default.
+	const unsigned int format_no_escapes = 0x10;
+
+	// Open file using text mode in xml_document::save_file. This enables special character (i.e. new-line) conversions on some systems. This flag is off by default.
+	const unsigned int format_save_file_text = 0x20;
+
+	// Write every attribute on a new line with appropriate indentation. This flag is off by default.
+	const unsigned int format_indent_attributes = 0x40;
+
+	// Don't output empty element tags, instead writing an explicit start and end tag even if there are no children. This flag is off by default.
+	const unsigned int format_no_empty_element_tags = 0x80;
+
+	// The default set of formatting flags.
+	// Nodes are indented depending on their depth in DOM tree, a default declaration is output if document has none.
+	const unsigned int format_default = format_indent;
+
+	// Forward declarations
+	struct xml_attribute_struct;
+	struct xml_node_struct;
+
+	class xml_node_iterator;
+	class xml_attribute_iterator;
+	class xml_named_node_iterator;
+
+	class xml_tree_walker;
+
+	struct xml_parse_result;
+
+	class xml_node;
+
+	class xml_text;
+
+	#ifndef PUGIXML_NO_XPATH
+	class xpath_node;
+	class xpath_node_set;
+	class xpath_query;
+	class xpath_variable_set;
+	#endif
+
+	// Range-based for loop support
+	template <typename It> class xml_object_range
+	{
+	public:
+		typedef It const_iterator;
+		typedef It iterator;
+
+		xml_object_range(It b, It e): _begin(b), _end(e)
+		{
+		}
+
+		It begin() const { return _begin; }
+		It end() const { return _end; }
+
+	private:
+		It _begin, _end;
+	};
+
+	// Writer interface for node printing (see xml_node::print)
+	class PUGIXML_CLASS xml_writer
+	{
+	public:
+		virtual ~xml_writer() {}
+
+		// Write memory chunk into stream/file/whatever
+		virtual void write(const void* data, size_t size) = 0;
+	};
+
+	// xml_writer implementation for FILE*
+	class PUGIXML_CLASS xml_writer_file: public xml_writer
+	{
+	public:
+		// Construct writer from a FILE* object; void* is used to avoid header dependencies on stdio
+		xml_writer_file(void* file);
+
+		virtual void write(const void* data, size_t size) PUGIXML_OVERRIDE;
+
+	private:
+		void* file;
+	};
+
+	#ifndef PUGIXML_NO_STL
+	// xml_writer implementation for streams
+	class PUGIXML_CLASS xml_writer_stream: public xml_writer
+	{
+	public:
+		// Construct writer from an output stream object
+		xml_writer_stream(std::basic_ostream<char, std::char_traits<char> >& stream);
+		xml_writer_stream(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& stream);
+
+		virtual void write(const void* data, size_t size) PUGIXML_OVERRIDE;
+
+	private:
+		std::basic_ostream<char, std::char_traits<char> >* narrow_stream;
+		std::basic_ostream<wchar_t, std::char_traits<wchar_t> >* wide_stream;
+	};
+	#endif
+
+	// A light-weight handle for manipulating attributes in DOM tree
+	class PUGIXML_CLASS xml_attribute
+	{
+		friend class xml_attribute_iterator;
+		friend class xml_node;
+
+	private:
+		xml_attribute_struct* _attr;
+
+		typedef void (*unspecified_bool_type)(xml_attribute***);
+
+	public:
+		// Default constructor. Constructs an empty attribute.
+		xml_attribute();
+
+		// Constructs attribute from internal pointer
+		explicit xml_attribute(xml_attribute_struct* attr);
+
+		// Safe bool conversion operator
+		operator unspecified_bool_type() const;
+
+		// Borland C++ workaround
+		bool operator!() const;
+
+		// Comparison operators (compares wrapped attribute pointers)
+		bool operator==(const xml_attribute& r) const;
+		bool operator!=(const xml_attribute& r) const;
+		bool operator<(const xml_attribute& r) const;
+		bool operator>(const xml_attribute& r) const;
+		bool operator<=(const xml_attribute& r) const;
+		bool operator>=(const xml_attribute& r) const;
+
+		// Check if attribute is empty
+		bool empty() const;
+
+		// Get attribute name/value, or "" if attribute is empty
+		const char_t* name() const;
+		const char_t* value() const;
+
+		// Get attribute value, or the default value if attribute is empty
+		const char_t* as_string(const char_t* def = PUGIXML_TEXT("")) const;
+
+		// Get attribute value as a number, or the default value if conversion did not succeed or attribute is empty
+		int as_int(int def = 0) const;
+		unsigned int as_uint(unsigned int def = 0) const;
+		double as_double(double def = 0) const;
+		float as_float(float def = 0) const;
+
+	#ifdef PUGIXML_HAS_LONG_LONG
+		long long as_llong(long long def = 0) const;
+		unsigned long long as_ullong(unsigned long long def = 0) const;
+	#endif
+
+		// Get attribute value as bool (returns true if first character is in '1tTyY' set), or the default value if attribute is empty
+		bool as_bool(bool def = false) const;
+
+		// Set attribute name/value (returns false if attribute is empty or there is not enough memory)
+		bool set_name(const char_t* rhs);
+		bool set_value(const char_t* rhs);
+
+		// Set attribute value with type conversion (numbers are converted to strings, boolean is converted to "true"/"false")
+		bool set_value(int rhs);
+		bool set_value(unsigned int rhs);
+		bool set_value(long rhs);
+		bool set_value(unsigned long rhs);
+		bool set_value(double rhs);
+		bool set_value(float rhs);
+		bool set_value(bool rhs);
+
+	#ifdef PUGIXML_HAS_LONG_LONG
+		bool set_value(long long rhs);
+		bool set_value(unsigned long long rhs);
+	#endif
+
+		// Set attribute value (equivalent to set_value without error checking)
+		xml_attribute& operator=(const char_t* rhs);
+		xml_attribute& operator=(int rhs);
+		xml_attribute& operator=(unsigned int rhs);
+		xml_attribute& operator=(long rhs);
+		xml_attribute& operator=(unsigned long rhs);
+		xml_attribute& operator=(double rhs);
+		xml_attribute& operator=(float rhs);
+		xml_attribute& operator=(bool rhs);
+
+	#ifdef PUGIXML_HAS_LONG_LONG
+		xml_attribute& operator=(long long rhs);
+		xml_attribute& operator=(unsigned long long rhs);
+	#endif
+
+		// Get next/previous attribute in the attribute list of the parent node
+		xml_attribute next_attribute() const;
+		xml_attribute previous_attribute() const;
+
+		// Get hash value (unique for handles to the same object)
+		size_t hash_value() const;
+
+		// Get internal pointer
+		xml_attribute_struct* internal_object() const;
+	};
+
+#ifdef __BORLANDC__
+	// Borland C++ workaround
+	bool PUGIXML_FUNCTION operator&&(const xml_attribute& lhs, bool rhs);
+	bool PUGIXML_FUNCTION operator||(const xml_attribute& lhs, bool rhs);
+#endif
+
+	// A light-weight handle for manipulating nodes in DOM tree
+	class PUGIXML_CLASS xml_node
+	{
+		friend class xml_attribute_iterator;
+		friend class xml_node_iterator;
+		friend class xml_named_node_iterator;
+
+	protected:
+		xml_node_struct* _root;
+
+		typedef void (*unspecified_bool_type)(xml_node***);
+
+	public:
+		// Default constructor. Constructs an empty node.
+		xml_node();
+
+		// Constructs node from internal pointer
+		explicit xml_node(xml_node_struct* p);
+
+		// Safe bool conversion operator
+		operator unspecified_bool_type() const;
+
+		// Borland C++ workaround
+		bool operator!() const;
+
+		// Comparison operators (compares wrapped node pointers)
+		bool operator==(const xml_node& r) const;
+		bool operator!=(const xml_node& r) const;
+		bool operator<(const xml_node& r) const;
+		bool operator>(const xml_node& r) const;
+		bool operator<=(const xml_node& r) const;
+		bool operator>=(const xml_node& r) const;
+
+		// Check if node is empty.
+		bool empty() const;
+
+		// Get node type
+		xml_node_type type() const;
+
+		// Get node name, or "" if node is empty or it has no name
+		const char_t* name() const;
+
+		// Get node value, or "" if node is empty or it has no value
+		// Note: For <node>text</node> node.value() does not return "text"! Use child_value() or text() methods to access text inside nodes.
+		const char_t* value() const;
+
+		// Get attribute list
+		xml_attribute first_attribute() const;
+		xml_attribute last_attribute() const;
+
+		// Get children list
+		xml_node first_child() const;
+		xml_node last_child() const;
+
+		// Get next/previous sibling in the children list of the parent node
+		xml_node next_sibling() const;
+		xml_node previous_sibling() const;
+
+		// Get parent node
+		xml_node parent() const;
+
+		// Get root of DOM tree this node belongs to
+		xml_node root() const;
+
+		// Get text object for the current node
+		xml_text text() const;
+
+		// Get child, attribute or next/previous sibling with the specified name
+		xml_node child(const char_t* name) const;
+		xml_attribute attribute(const char_t* name) const;
+		xml_node next_sibling(const char_t* name) const;
+		xml_node previous_sibling(const char_t* name) const;
+
+		// Get attribute, starting the search from a hint (and updating hint so that searching for a sequence of attributes is fast)
+		xml_attribute attribute(const char_t* name, xml_attribute& hint) const;
+
+		// Get child value of current node; that is, value of the first child node of type PCDATA/CDATA
+		const char_t* child_value() const;
+
+		// Get child value of child with specified name. Equivalent to child(name).child_value().
+		const char_t* child_value(const char_t* name) const;
+
+		// Set node name/value (returns false if node is empty, there is not enough memory, or node can not have name/value)
+		bool set_name(const char_t* rhs);
+		bool set_value(const char_t* rhs);
+
+		// Add attribute with specified name. Returns added attribute, or empty attribute on errors.
+		xml_attribute append_attribute(const char_t* name);
+		xml_attribute prepend_attribute(const char_t* name);
+		xml_attribute insert_attribute_after(const char_t* name, const xml_attribute& attr);
+		xml_attribute insert_attribute_before(const char_t* name, const xml_attribute& attr);
+
+		// Add a copy of the specified attribute. Returns added attribute, or empty attribute on errors.
+		xml_attribute append_copy(const xml_attribute& proto);
+		xml_attribute prepend_copy(const xml_attribute& proto);
+		xml_attribute insert_copy_after(const xml_attribute& proto, const xml_attribute& attr);
+		xml_attribute insert_copy_before(const xml_attribute& proto, const xml_attribute& attr);
+
+		// Add child node with specified type. Returns added node, or empty node on errors.
+		xml_node append_child(xml_node_type type = node_element);
+		xml_node prepend_child(xml_node_type type = node_element);
+		xml_node insert_child_after(xml_node_type type, const xml_node& node);
+		xml_node insert_child_before(xml_node_type type, const xml_node& node);
+
+		// Add child element with specified name. Returns added node, or empty node on errors.
+		xml_node append_child(const char_t* name);
+		xml_node prepend_child(const char_t* name);
+		xml_node insert_child_after(const char_t* name, const xml_node& node);
+		xml_node insert_child_before(const char_t* name, const xml_node& node);
+
+		// Add a copy of the specified node as a child. Returns added node, or empty node on errors.
+		xml_node append_copy(const xml_node& proto);
+		xml_node prepend_copy(const xml_node& proto);
+		xml_node insert_copy_after(const xml_node& proto, const xml_node& node);
+		xml_node insert_copy_before(const xml_node& proto, const xml_node& node);
+
+		// Move the specified node to become a child of this node. Returns moved node, or empty node on errors.
+		xml_node append_move(const xml_node& moved);
+		xml_node prepend_move(const xml_node& moved);
+		xml_node insert_move_after(const xml_node& moved, const xml_node& node);
+		xml_node insert_move_before(const xml_node& moved, const xml_node& node);
+
+		// Remove specified attribute
+		bool remove_attribute(const xml_attribute& a);
+		bool remove_attribute(const char_t* name);
+
+		// Remove specified child
+		bool remove_child(const xml_node& n);
+		bool remove_child(const char_t* name);
+
+		// Parses buffer as an XML document fragment and appends all nodes as children of the current node.
+		// Copies/converts the buffer, so it may be deleted or changed after the function returns.
+		// Note: append_buffer allocates memory that has the lifetime of the owning document; removing the appended nodes does not immediately reclaim that memory.
+		xml_parse_result append_buffer(const void* contents, size_t size, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
+
+		// Find attribute using predicate. Returns first attribute for which predicate returned true.
+		template <typename Predicate> xml_attribute find_attribute(Predicate pred) const
+		{
+			if (!_root) return xml_attribute();
+
+			for (xml_attribute attrib = first_attribute(); attrib; attrib = attrib.next_attribute())
+				if (pred(attrib))
+					return attrib;
+
+			return xml_attribute();
+		}
+
+		// Find child node using predicate. Returns first child for which predicate returned true.
+		template <typename Predicate> xml_node find_child(Predicate pred) const
+		{
+			if (!_root) return xml_node();
+
+			for (xml_node node = first_child(); node; node = node.next_sibling())
+				if (pred(node))
+					return node;
+
+			return xml_node();
+		}
+
+		// Find node from subtree using predicate. Returns first node from subtree (depth-first), for which predicate returned true.
+		template <typename Predicate> xml_node find_node(Predicate pred) const
+		{
+			if (!_root) return xml_node();
+
+			xml_node cur = first_child();
+
+			while (cur._root && cur._root != _root)
+			{
+				if (pred(cur)) return cur;
+
+				if (cur.first_child()) cur = cur.first_child();
+				else if (cur.next_sibling()) cur = cur.next_sibling();
+				else
+				{
+					while (!cur.next_sibling() && cur._root != _root) cur = cur.parent();
+
+					if (cur._root != _root) cur = cur.next_sibling();
+				}
+			}
+
+			return xml_node();
+		}
+
+		// Find child node by attribute name/value
+		xml_node find_child_by_attribute(const char_t* name, const char_t* attr_name, const char_t* attr_value) const;
+		xml_node find_child_by_attribute(const char_t* attr_name, const char_t* attr_value) const;
+
+	#ifndef PUGIXML_NO_STL
+		// Get the absolute node path from root as a text string.
+		string_t path(char_t delimiter = '/') const;
+	#endif
+
+		// Search for a node by path consisting of node names and . or .. elements.
+		xml_node first_element_by_path(const char_t* path, char_t delimiter = '/') const;
+
+		// Recursively traverse subtree with xml_tree_walker
+		bool traverse(xml_tree_walker& walker);
+
+	#ifndef PUGIXML_NO_XPATH
+		// Select single node by evaluating XPath query. Returns first node from the resulting node set.
+		xpath_node select_node(const char_t* query, xpath_variable_set* variables = 0) const;
+		xpath_node select_node(const xpath_query& query) const;
+
+		// Select node set by evaluating XPath query
+		xpath_node_set select_nodes(const char_t* query, xpath_variable_set* variables = 0) const;
+		xpath_node_set select_nodes(const xpath_query& query) const;
+
+		// (deprecated: use select_node instead) Select single node by evaluating XPath query.
+		PUGIXML_DEPRECATED xpath_node select_single_node(const char_t* query, xpath_variable_set* variables = 0) const;
+		PUGIXML_DEPRECATED xpath_node select_single_node(const xpath_query& query) const;
+
+	#endif
+
+		// Print subtree using a writer object
+		void print(xml_writer& writer, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto, unsigned int depth = 0) const;
+
+	#ifndef PUGIXML_NO_STL
+		// Print subtree to stream
+		void print(std::basic_ostream<char, std::char_traits<char> >& os, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto, unsigned int depth = 0) const;
+		void print(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& os, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, unsigned int depth = 0) const;
+	#endif
+
+		// Child nodes iterators
+		typedef xml_node_iterator iterator;
+
+		iterator begin() const;
+		iterator end() const;
+
+		// Attribute iterators
+		typedef xml_attribute_iterator attribute_iterator;
+
+		attribute_iterator attributes_begin() const;
+		attribute_iterator attributes_end() const;
+
+		// Range-based for support
+		xml_object_range<xml_node_iterator> children() const;
+		xml_object_range<xml_named_node_iterator> children(const char_t* name) const;
+		xml_object_range<xml_attribute_iterator> attributes() const;
+
+		// Get node offset in parsed file/string (in char_t units) for debugging purposes
+		ptrdiff_t offset_debug() const;
+
+		// Get hash value (unique for handles to the same object)
+		size_t hash_value() const;
+
+		// Get internal pointer
+		xml_node_struct* internal_object() const;
+	};
+
+#ifdef __BORLANDC__
+	// Borland C++ workaround
+	bool PUGIXML_FUNCTION operator&&(const xml_node& lhs, bool rhs);
+	bool PUGIXML_FUNCTION operator||(const xml_node& lhs, bool rhs);
+#endif
+
+	// A helper for working with text inside PCDATA nodes
+	class PUGIXML_CLASS xml_text
+	{
+		friend class xml_node;
+
+		xml_node_struct* _root;
+
+		typedef void (*unspecified_bool_type)(xml_text***);
+
+		explicit xml_text(xml_node_struct* root);
+
+		xml_node_struct* _data_new();
+		xml_node_struct* _data() const;
+
+	public:
+		// Default constructor. Constructs an empty object.
+		xml_text();
+
+		// Safe bool conversion operator
+		operator unspecified_bool_type() const;
+
+		// Borland C++ workaround
+		bool operator!() const;
+
+		// Check if text object is empty
+		bool empty() const;
+
+		// Get text, or "" if object is empty
+		const char_t* get() const;
+
+		// Get text, or the default value if object is empty
+		const char_t* as_string(const char_t* def = PUGIXML_TEXT("")) const;
+
+		// Get text as a number, or the default value if conversion did not succeed or object is empty
+		int as_int(int def = 0) const;
+		unsigned int as_uint(unsigned int def = 0) const;
+		double as_double(double def = 0) const;
+		float as_float(float def = 0) const;
+
+	#ifdef PUGIXML_HAS_LONG_LONG
+		long long as_llong(long long def = 0) const;
+		unsigned long long as_ullong(unsigned long long def = 0) const;
+	#endif
+
+		// Get text as bool (returns true if first character is in '1tTyY' set), or the default value if object is empty
+		bool as_bool(bool def = false) const;
+
+		// Set text (returns false if object is empty or there is not enough memory)
+		bool set(const char_t* rhs);
+
+		// Set text with type conversion (numbers are converted to strings, boolean is converted to "true"/"false")
+		bool set(int rhs);
+		bool set(unsigned int rhs);
+		bool set(long rhs);
+		bool set(unsigned long rhs);
+		bool set(double rhs);
+		bool set(float rhs);
+		bool set(bool rhs);
+
+	#ifdef PUGIXML_HAS_LONG_LONG
+		bool set(long long rhs);
+		bool set(unsigned long long rhs);
+	#endif
+
+		// Set text (equivalent to set without error checking)
+		xml_text& operator=(const char_t* rhs);
+		xml_text& operator=(int rhs);
+		xml_text& operator=(unsigned int rhs);
+		xml_text& operator=(long rhs);
+		xml_text& operator=(unsigned long rhs);
+		xml_text& operator=(double rhs);
+		xml_text& operator=(float rhs);
+		xml_text& operator=(bool rhs);
+
+	#ifdef PUGIXML_HAS_LONG_LONG
+		xml_text& operator=(long long rhs);
+		xml_text& operator=(unsigned long long rhs);
+	#endif
+
+		// Get the data node (node_pcdata or node_cdata) for this object
+		xml_node data() const;
+	};
+
+#ifdef __BORLANDC__
+	// Borland C++ workaround
+	bool PUGIXML_FUNCTION operator&&(const xml_text& lhs, bool rhs);
+	bool PUGIXML_FUNCTION operator||(const xml_text& lhs, bool rhs);
+#endif
+
+	// Child node iterator (a bidirectional iterator over a collection of xml_node)
+	class PUGIXML_CLASS xml_node_iterator
+	{
+		friend class xml_node;
+
+	private:
+		mutable xml_node _wrap;
+		xml_node _parent;
+
+		xml_node_iterator(xml_node_struct* ref, xml_node_struct* parent);
+
+	public:
+		// Iterator traits
+		typedef ptrdiff_t difference_type;
+		typedef xml_node value_type;
+		typedef xml_node* pointer;
+		typedef xml_node& reference;
+
+	#ifndef PUGIXML_NO_STL
+		typedef std::bidirectional_iterator_tag iterator_category;
+	#endif
+
+		// Default constructor
+		xml_node_iterator();
+
+		// Construct an iterator which points to the specified node
+		xml_node_iterator(const xml_node& node);
+
+		// Iterator operators
+		bool operator==(const xml_node_iterator& rhs) const;
+		bool operator!=(const xml_node_iterator& rhs) const;
+
+		xml_node& operator*() const;
+		xml_node* operator->() const;
+
+		const xml_node_iterator& operator++();
+		xml_node_iterator operator++(int);
+
+		const xml_node_iterator& operator--();
+		xml_node_iterator operator--(int);
+	};
+
+	// Attribute iterator (a bidirectional iterator over a collection of xml_attribute)
+	class PUGIXML_CLASS xml_attribute_iterator
+	{
+		friend class xml_node;
+
+	private:
+		mutable xml_attribute _wrap;
+		xml_node _parent;
+
+		xml_attribute_iterator(xml_attribute_struct* ref, xml_node_struct* parent);
+
+	public:
+		// Iterator traits
+		typedef ptrdiff_t difference_type;
+		typedef xml_attribute value_type;
+		typedef xml_attribute* pointer;
+		typedef xml_attribute& reference;
+
+	#ifndef PUGIXML_NO_STL
+		typedef std::bidirectional_iterator_tag iterator_category;
+	#endif
+
+		// Default constructor
+		xml_attribute_iterator();
+
+		// Construct an iterator which points to the specified attribute
+		xml_attribute_iterator(const xml_attribute& attr, const xml_node& parent);
+
+		// Iterator operators
+		bool operator==(const xml_attribute_iterator& rhs) const;
+		bool operator!=(const xml_attribute_iterator& rhs) const;
+
+		xml_attribute& operator*() const;
+		xml_attribute* operator->() const;
+
+		const xml_attribute_iterator& operator++();
+		xml_attribute_iterator operator++(int);
+
+		const xml_attribute_iterator& operator--();
+		xml_attribute_iterator operator--(int);
+	};
+
+	// Named node range helper
+	class PUGIXML_CLASS xml_named_node_iterator
+	{
+		friend class xml_node;
+
+	public:
+		// Iterator traits
+		typedef ptrdiff_t difference_type;
+		typedef xml_node value_type;
+		typedef xml_node* pointer;
+		typedef xml_node& reference;
+
+	#ifndef PUGIXML_NO_STL
+		typedef std::bidirectional_iterator_tag iterator_category;
+	#endif
+
+		// Default constructor
+		xml_named_node_iterator();
+
+		// Construct an iterator which points to the specified node
+		xml_named_node_iterator(const xml_node& node, const char_t* name);
+
+		// Iterator operators
+		bool operator==(const xml_named_node_iterator& rhs) const;
+		bool operator!=(const xml_named_node_iterator& rhs) const;
+
+		xml_node& operator*() const;
+		xml_node* operator->() const;
+
+		const xml_named_node_iterator& operator++();
+		xml_named_node_iterator operator++(int);
+
+		const xml_named_node_iterator& operator--();
+		xml_named_node_iterator operator--(int);
+
+	private:
+		mutable xml_node _wrap;
+		xml_node _parent;
+		const char_t* _name;
+
+		xml_named_node_iterator(xml_node_struct* ref, xml_node_struct* parent, const char_t* name);
+	};
+
+	// Abstract tree walker class (see xml_node::traverse)
+	class PUGIXML_CLASS xml_tree_walker
+	{
+		friend class xml_node;
+
+	private:
+		int _depth;
+
+	protected:
+		// Get current traversal depth
+		int depth() const;
+
+	public:
+		xml_tree_walker();
+		virtual ~xml_tree_walker();
+
+		// Callback that is called when traversal begins
+		virtual bool begin(xml_node& node);
+
+		// Callback that is called for each node traversed
+		virtual bool for_each(xml_node& node) = 0;
+
+		// Callback that is called when traversal ends
+		virtual bool end(xml_node& node);
+	};
+
+	// Parsing status, returned as part of xml_parse_result object
+	enum xml_parse_status
+	{
+		status_ok = 0,				// No error
+
+		status_file_not_found,		// File was not found during load_file()
+		status_io_error,			// Error reading from file/stream
+		status_out_of_memory,		// Could not allocate memory
+		status_internal_error,		// Internal error occurred
+
+		status_unrecognized_tag,	// Parser could not determine tag type
+
+		status_bad_pi,				// Parsing error occurred while parsing document declaration/processing instruction
+		status_bad_comment,			// Parsing error occurred while parsing comment
+		status_bad_cdata,			// Parsing error occurred while parsing CDATA section
+		status_bad_doctype,			// Parsing error occurred while parsing document type declaration
+		status_bad_pcdata,			// Parsing error occurred while parsing PCDATA section
+		status_bad_start_element,	// Parsing error occurred while parsing start element tag
+		status_bad_attribute,		// Parsing error occurred while parsing element attribute
+		status_bad_end_element,		// Parsing error occurred while parsing end element tag
+		status_end_element_mismatch,// There was a mismatch of start-end tags (closing tag had incorrect name, some tag was not closed or there was an excessive closing tag)
+
+		status_append_invalid_root,	// Unable to append nodes since root type is not node_element or node_document (exclusive to xml_node::append_buffer)
+
+		status_no_document_element	// Parsing resulted in a document without element nodes
+	};
+
+	// Parsing result
+	struct PUGIXML_CLASS xml_parse_result
+	{
+		// Parsing status (see xml_parse_status)
+		xml_parse_status status;
+
+		// Last parsed offset (in char_t units from start of input data)
+		ptrdiff_t offset;
+
+		// Source document encoding
+		xml_encoding encoding;
+
+		// Default constructor, initializes object to failed state
+		xml_parse_result();
+
+		// Cast to bool operator
+		operator bool() const;
+
+		// Get error description
+		const char* description() const;
+	};
+
+	// Document class (DOM tree root)
+	class PUGIXML_CLASS xml_document: public xml_node
+	{
+	private:
+		char_t* _buffer;
+
+		char _memory[192];
+
+		// Non-copyable semantics
+		xml_document(const xml_document&);
+		xml_document& operator=(const xml_document&);
+
+		void _create();
+		void _destroy();
+		void _move(xml_document& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT;
+
+	public:
+		// Default constructor, makes empty document
+		xml_document();
+
+		// Destructor, invalidates all node/attribute handles to this document
+		~xml_document();
+
+	#ifdef PUGIXML_HAS_MOVE
+		// Move semantics support
+		xml_document(xml_document&& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT;
+		xml_document& operator=(xml_document&& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT;
+	#endif
+
+		// Removes all nodes, leaving the empty document
+		void reset();
+
+		// Removes all nodes, then copies the entire contents of the specified document
+		void reset(const xml_document& proto);
+
+	#ifndef PUGIXML_NO_STL
+		// Load document from stream.
+		xml_parse_result load(std::basic_istream<char, std::char_traits<char> >& stream, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
+		xml_parse_result load(std::basic_istream<wchar_t, std::char_traits<wchar_t> >& stream, unsigned int options = parse_default);
+	#endif
+
+		// (deprecated: use load_string instead) Load document from zero-terminated string. No encoding conversions are applied.
+		PUGIXML_DEPRECATED xml_parse_result load(const char_t* contents, unsigned int options = parse_default);
+
+		// Load document from zero-terminated string. No encoding conversions are applied.
+		xml_parse_result load_string(const char_t* contents, unsigned int options = parse_default);
+
+		// Load document from file
+		xml_parse_result load_file(const char* path, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
+		xml_parse_result load_file(const wchar_t* path, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
+
+		// Load document from buffer. Copies/converts the buffer, so it may be deleted or changed after the function returns.
+		xml_parse_result load_buffer(const void* contents, size_t size, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
+
+		// Load document from buffer, using the buffer for in-place parsing (the buffer is modified and used for storage of document data).
+		// You should ensure that buffer data will persist throughout the document's lifetime, and free the buffer memory manually once document is destroyed.
+		xml_parse_result load_buffer_inplace(void* contents, size_t size, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
+
+		// Load document from buffer, using the buffer for in-place parsing (the buffer is modified and used for storage of document data).
+		// You should allocate the buffer with pugixml allocation function; document will free the buffer when it is no longer needed (you can't use it anymore).
+		xml_parse_result load_buffer_inplace_own(void* contents, size_t size, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
+
+		// Save XML document to writer (semantics is slightly different from xml_node::print, see documentation for details).
+		void save(xml_writer& writer, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto) const;
+
+	#ifndef PUGIXML_NO_STL
+		// Save XML document to stream (semantics is slightly different from xml_node::print, see documentation for details).
+		void save(std::basic_ostream<char, std::char_traits<char> >& stream, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto) const;
+		void save(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& stream, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default) const;
+	#endif
+
+		// Save XML to file
+		bool save_file(const char* path, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto) const;
+		bool save_file(const wchar_t* path, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto) const;
+
+		// Get document element
+		xml_node document_element() const;
+	};
+
+#ifndef PUGIXML_NO_XPATH
+	// XPath query return type
+	enum xpath_value_type
+	{
+		xpath_type_none,	  // Unknown type (query failed to compile)
+		xpath_type_node_set,  // Node set (xpath_node_set)
+		xpath_type_number,	  // Number
+		xpath_type_string,	  // String
+		xpath_type_boolean	  // Boolean
+	};
+
+	// XPath parsing result
+	struct PUGIXML_CLASS xpath_parse_result
+	{
+		// Error message (0 if no error)
+		const char* error;
+
+		// Last parsed offset (in char_t units from string start)
+		ptrdiff_t offset;
+
+		// Default constructor, initializes object to failed state
+		xpath_parse_result();
+
+		// Cast to bool operator
+		operator bool() const;
+
+		// Get error description
+		const char* description() const;
+	};
+
+	// A single XPath variable
+	class PUGIXML_CLASS xpath_variable
+	{
+		friend class xpath_variable_set;
+
+	protected:
+		xpath_value_type _type;
+		xpath_variable* _next;
+
+		xpath_variable(xpath_value_type type);
+
+		// Non-copyable semantics
+		xpath_variable(const xpath_variable&);
+		xpath_variable& operator=(const xpath_variable&);
+
+	public:
+		// Get variable name
+		const char_t* name() const;
+
+		// Get variable type
+		xpath_value_type type() const;
+
+		// Get variable value; no type conversion is performed, default value (false, NaN, empty string, empty node set) is returned on type mismatch error
+		bool get_boolean() const;
+		double get_number() const;
+		const char_t* get_string() const;
+		const xpath_node_set& get_node_set() const;
+
+		// Set variable value; no type conversion is performed, false is returned on type mismatch error
+		bool set(bool value);
+		bool set(double value);
+		bool set(const char_t* value);
+		bool set(const xpath_node_set& value);
+	};
+
+	// A set of XPath variables
+	class PUGIXML_CLASS xpath_variable_set
+	{
+	private:
+		xpath_variable* _data[64];
+
+		void _assign(const xpath_variable_set& rhs);
+		void _swap(xpath_variable_set& rhs);
+
+		xpath_variable* _find(const char_t* name) const;
+
+		static bool _clone(xpath_variable* var, xpath_variable** out_result);
+		static void _destroy(xpath_variable* var);
+
+	public:
+		// Default constructor/destructor
+		xpath_variable_set();
+		~xpath_variable_set();
+
+		// Copy constructor/assignment operator
+		xpath_variable_set(const xpath_variable_set& rhs);
+		xpath_variable_set& operator=(const xpath_variable_set& rhs);
+
+	#ifdef PUGIXML_HAS_MOVE
+		// Move semantics support
+		xpath_variable_set(xpath_variable_set&& rhs) PUGIXML_NOEXCEPT;
+		xpath_variable_set& operator=(xpath_variable_set&& rhs) PUGIXML_NOEXCEPT;
+	#endif
+
+		// Add a new variable or get the existing one, if the types match
+		xpath_variable* add(const char_t* name, xpath_value_type type);
+
+		// Set value of an existing variable; no type conversion is performed, false is returned if there is no such variable or if types mismatch
+		bool set(const char_t* name, bool value);
+		bool set(const char_t* name, double value);
+		bool set(const char_t* name, const char_t* value);
+		bool set(const char_t* name, const xpath_node_set& value);
+
+		// Get existing variable by name
+		xpath_variable* get(const char_t* name);
+		const xpath_variable* get(const char_t* name) const;
+	};
+
+	// A compiled XPath query object
+	class PUGIXML_CLASS xpath_query
+	{
+	private:
+		void* _impl;
+		xpath_parse_result _result;
+
+		typedef void (*unspecified_bool_type)(xpath_query***);
+
+		// Non-copyable semantics
+		xpath_query(const xpath_query&);
+		xpath_query& operator=(const xpath_query&);
+
+	public:
+		// Construct a compiled object from XPath expression.
+		// If PUGIXML_NO_EXCEPTIONS is not defined, throws xpath_exception on compilation errors.
+		explicit xpath_query(const char_t* query, xpath_variable_set* variables = 0);
+
+		// Constructor
+		xpath_query();
+
+		// Destructor
+		~xpath_query();
+
+	#ifdef PUGIXML_HAS_MOVE
+		// Move semantics support
+		xpath_query(xpath_query&& rhs) PUGIXML_NOEXCEPT;
+		xpath_query& operator=(xpath_query&& rhs) PUGIXML_NOEXCEPT;
+	#endif
+
+		// Get query expression return type
+		xpath_value_type return_type() const;
+
+		// Evaluate expression as boolean value in the specified context; performs type conversion if necessary.
+		// If PUGIXML_NO_EXCEPTIONS is not defined, throws std::bad_alloc on out of memory errors.
+		bool evaluate_boolean(const xpath_node& n) const;
+
+		// Evaluate expression as double value in the specified context; performs type conversion if necessary.
+		// If PUGIXML_NO_EXCEPTIONS is not defined, throws std::bad_alloc on out of memory errors.
+		double evaluate_number(const xpath_node& n) const;
+
+	#ifndef PUGIXML_NO_STL
+		// Evaluate expression as string value in the specified context; performs type conversion if necessary.
+		// If PUGIXML_NO_EXCEPTIONS is not defined, throws std::bad_alloc on out of memory errors.
+		string_t evaluate_string(const xpath_node& n) const;
+	#endif
+
+		// Evaluate expression as string value in the specified context; performs type conversion if necessary.
+		// At most capacity characters are written to the destination buffer, full result size is returned (includes terminating zero).
+		// If PUGIXML_NO_EXCEPTIONS is not defined, throws std::bad_alloc on out of memory errors.
+		// If PUGIXML_NO_EXCEPTIONS is defined, returns empty  set instead.
+		size_t evaluate_string(char_t* buffer, size_t capacity, const xpath_node& n) const;
+
+		// Evaluate expression as node set in the specified context.
+		// If PUGIXML_NO_EXCEPTIONS is not defined, throws xpath_exception on type mismatch and std::bad_alloc on out of memory errors.
+		// If PUGIXML_NO_EXCEPTIONS is defined, returns empty node set instead.
+		xpath_node_set evaluate_node_set(const xpath_node& n) const;
+
+		// Evaluate expression as node set in the specified context.
+		// Return first node in document order, or empty node if node set is empty.
+		// If PUGIXML_NO_EXCEPTIONS is not defined, throws xpath_exception on type mismatch and std::bad_alloc on out of memory errors.
+		// If PUGIXML_NO_EXCEPTIONS is defined, returns empty node instead.
+		xpath_node evaluate_node(const xpath_node& n) const;
+
+		// Get parsing result (used to get compilation errors in PUGIXML_NO_EXCEPTIONS mode)
+		const xpath_parse_result& result() const;
+
+		// Safe bool conversion operator
+		operator unspecified_bool_type() const;
+
+		// Borland C++ workaround
+		bool operator!() const;
+	};
+
+	#ifndef PUGIXML_NO_EXCEPTIONS
+
+#ifdef _MSC_VER
+#   pragma warning(push)
+#   pragma warning( disable: 4275 )
+#endif
+	// XPath exception class
+	class PUGIXML_CLASS xpath_exception: public std::exception
+	{
+	private:
+		xpath_parse_result _result;
+
+	public:
+		// Construct exception from parse result
+		explicit xpath_exception(const xpath_parse_result& result);
+
+		// Get error message
+		virtual const char* what() const throw() PUGIXML_OVERRIDE;
+
+		// Get parse result
+		const xpath_parse_result& result() const;
+	};
+	#endif
+#ifdef _MSC_VER
+#   pragma warning(pop)
+#endif
+	// XPath node class (either xml_node or xml_attribute)
+	class PUGIXML_CLASS xpath_node
+	{
+	private:
+		xml_node _node;
+		xml_attribute _attribute;
+
+		typedef void (*unspecified_bool_type)(xpath_node***);
+
+	public:
+		// Default constructor; constructs empty XPath node
+		xpath_node();
+
+		// Construct XPath node from XML node/attribute
+		xpath_node(const xml_node& node);
+		xpath_node(const xml_attribute& attribute, const xml_node& parent);
+
+		// Get node/attribute, if any
+		xml_node node() const;
+		xml_attribute attribute() const;
+
+		// Get parent of contained node/attribute
+		xml_node parent() const;
+
+		// Safe bool conversion operator
+		operator unspecified_bool_type() const;
+
+		// Borland C++ workaround
+		bool operator!() const;
+
+		// Comparison operators
+		bool operator==(const xpath_node& n) const;
+		bool operator!=(const xpath_node& n) const;
+	};
+
+#ifdef __BORLANDC__
+	// Borland C++ workaround
+	bool PUGIXML_FUNCTION operator&&(const xpath_node& lhs, bool rhs);
+	bool PUGIXML_FUNCTION operator||(const xpath_node& lhs, bool rhs);
+#endif
+
+	// A fixed-size collection of XPath nodes
+	class PUGIXML_CLASS xpath_node_set
+	{
+	public:
+		// Collection type
+		enum type_t
+		{
+			type_unsorted,			// Not ordered
+			type_sorted,			// Sorted by document order (ascending)
+			type_sorted_reverse		// Sorted by document order (descending)
+		};
+
+		// Constant iterator type
+		typedef const xpath_node* const_iterator;
+
+		// We define non-constant iterator to be the same as constant iterator so that various generic algorithms (i.e. boost foreach) work
+		typedef const xpath_node* iterator;
+
+		// Default constructor. Constructs empty set.
+		xpath_node_set();
+
+		// Constructs a set from iterator range; data is not checked for duplicates and is not sorted according to provided type, so be careful
+		xpath_node_set(const_iterator begin, const_iterator end, type_t type = type_unsorted);
+
+		// Destructor
+		~xpath_node_set();
+
+		// Copy constructor/assignment operator
+		xpath_node_set(const xpath_node_set& ns);
+		xpath_node_set& operator=(const xpath_node_set& ns);
+
+	#ifdef PUGIXML_HAS_MOVE
+		// Move semantics support
+		xpath_node_set(xpath_node_set&& rhs) PUGIXML_NOEXCEPT;
+		xpath_node_set& operator=(xpath_node_set&& rhs) PUGIXML_NOEXCEPT;
+	#endif
+
+		// Get collection type
+		type_t type() const;
+
+		// Get collection size
+		size_t size() const;
+
+		// Indexing operator
+		const xpath_node& operator[](size_t index) const;
+
+		// Collection iterators
+		const_iterator begin() const;
+		const_iterator end() const;
+
+		// Sort the collection in ascending/descending order by document order
+		void sort(bool reverse = false);
+
+		// Get first node in the collection by document order
+		xpath_node first() const;
+
+		// Check if collection is empty
+		bool empty() const;
+
+	private:
+		type_t _type;
+
+		xpath_node _storage;
+
+		xpath_node* _begin;
+		xpath_node* _end;
+
+		void _assign(const_iterator begin, const_iterator end, type_t type);
+		void _move(xpath_node_set& rhs) PUGIXML_NOEXCEPT;
+	};
+#endif
+
+#ifndef PUGIXML_NO_STL
+	// Convert wide string to UTF8
+	std::basic_string<char, std::char_traits<char>, std::allocator<char> > PUGIXML_FUNCTION as_utf8(const wchar_t* str);
+	std::basic_string<char, std::char_traits<char>, std::allocator<char> > PUGIXML_FUNCTION as_utf8(const std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> >& str);
+
+	// Convert UTF8 to wide string
+	std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> > PUGIXML_FUNCTION as_wide(const char* str);
+	std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> > PUGIXML_FUNCTION as_wide(const std::basic_string<char, std::char_traits<char>, std::allocator<char> >& str);
+#endif
+
+	// Memory allocation function interface; returns pointer to allocated memory or NULL on failure
+	typedef void* (*allocation_function)(size_t size);
+
+	// Memory deallocation function interface
+	typedef void (*deallocation_function)(void* ptr);
+
+	// Override default memory management functions. All subsequent allocations/deallocations will be performed via supplied functions.
+	void PUGIXML_FUNCTION set_memory_management_functions(allocation_function allocate, deallocation_function deallocate);
+
+	// Get current memory management functions
+	allocation_function PUGIXML_FUNCTION get_memory_allocation_function();
+	deallocation_function PUGIXML_FUNCTION get_memory_deallocation_function();
+}
+
+#if !defined(PUGIXML_NO_STL) && (defined(_MSC_VER) || defined(__ICC))
+namespace std
+{
+	// Workarounds for (non-standard) iterator category detection for older versions (MSVC7/IC8 and earlier)
+	std::bidirectional_iterator_tag PUGIXML_FUNCTION _Iter_cat(const pugi::xml_node_iterator&);
+	std::bidirectional_iterator_tag PUGIXML_FUNCTION _Iter_cat(const pugi::xml_attribute_iterator&);
+	std::bidirectional_iterator_tag PUGIXML_FUNCTION _Iter_cat(const pugi::xml_named_node_iterator&);
+}
+#endif
+
+#if !defined(PUGIXML_NO_STL) && defined(__SUNPRO_CC)
+namespace std
+{
+	// Workarounds for (non-standard) iterator category detection
+	std::bidirectional_iterator_tag PUGIXML_FUNCTION __iterator_category(const pugi::xml_node_iterator&);
+	std::bidirectional_iterator_tag PUGIXML_FUNCTION __iterator_category(const pugi::xml_attribute_iterator&);
+	std::bidirectional_iterator_tag PUGIXML_FUNCTION __iterator_category(const pugi::xml_named_node_iterator&);
+}
+#endif
+
+#endif
+
+// Make sure implementation is included in header-only mode
+// Use macro expansion in #include to work around QMake (QTBUG-11923)
+#if defined(PUGIXML_HEADER_ONLY) && !defined(PUGIXML_SOURCE)
+#	define PUGIXML_SOURCE "pugixml.cpp"
+#	include PUGIXML_SOURCE
+#endif
+
+/**
+ * Copyright (c) 2006-2018 Arseny Kapoulkine
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
diff --git a/contrib/rapidjson/include/rapidjson/document.h b/contrib/rapidjson/include/rapidjson/document.h
index 473d846e3..17df30725 100644
--- a/contrib/rapidjson/include/rapidjson/document.h
+++ b/contrib/rapidjson/include/rapidjson/document.h
@@ -31,7 +31,7 @@
 #include <limits>
 
 RAPIDJSON_DIAG_PUSH
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !(__clang__)
 RAPIDJSON_DIAG_OFF(4127) // conditional expression is constant
 RAPIDJSON_DIAG_OFF(4244) // conversion from kXxxFlags to 'uint16_t', possible loss of data
 #endif
diff --git a/contrib/rapidjson/include/rapidjson/encodings.h b/contrib/rapidjson/include/rapidjson/encodings.h
index 0df1c3435..de4d9d216 100644
--- a/contrib/rapidjson/include/rapidjson/encodings.h
+++ b/contrib/rapidjson/include/rapidjson/encodings.h
@@ -17,7 +17,7 @@
 
 #include "rapidjson.h"
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(__clang__)
 RAPIDJSON_DIAG_PUSH
 RAPIDJSON_DIAG_OFF(4244) // conversion from 'type1' to 'type2', possible loss of data
 RAPIDJSON_DIAG_OFF(4702)  // unreachable code
@@ -709,7 +709,7 @@ struct Transcoder<Encoding, Encoding> {
 
 RAPIDJSON_NAMESPACE_END
 
-#if defined(__GNUC__) || defined(_MSC_VER)
+#if defined(__GNUC__) || (defined(_MSC_VER) && !defined(__clang__))
 RAPIDJSON_DIAG_POP
 #endif
 
diff --git a/contrib/rapidjson/include/rapidjson/internal/meta.h b/contrib/rapidjson/include/rapidjson/internal/meta.h
index 5a9aaa428..bcbfc7709 100644
--- a/contrib/rapidjson/include/rapidjson/internal/meta.h
+++ b/contrib/rapidjson/include/rapidjson/internal/meta.h
@@ -21,7 +21,7 @@
 RAPIDJSON_DIAG_PUSH
 RAPIDJSON_DIAG_OFF(effc++)
 #endif
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && !defined(__clang__)
 RAPIDJSON_DIAG_PUSH
 RAPIDJSON_DIAG_OFF(6334)
 #endif
@@ -174,7 +174,7 @@ template <typename T> struct RemoveSfinaeTag<SfinaeTag&(*)(T)> { typedef T Type;
 RAPIDJSON_NAMESPACE_END
 //@endcond
 
-#if defined(__GNUC__) || defined(_MSC_VER)
+#if defined(__GNUC__) || (defined(_MSC_VER) && !defined(__clang__))
 RAPIDJSON_DIAG_POP
 #endif
 
diff --git a/contrib/rapidjson/include/rapidjson/reader.h b/contrib/rapidjson/include/rapidjson/reader.h
index 120c31115..4b172e953 100644
--- a/contrib/rapidjson/include/rapidjson/reader.h
+++ b/contrib/rapidjson/include/rapidjson/reader.h
@@ -37,7 +37,7 @@
 #include <arm_neon.h>
 #endif
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(__clang__)
 RAPIDJSON_DIAG_PUSH
 RAPIDJSON_DIAG_OFF(4127)  // conditional expression is constant
 RAPIDJSON_DIAG_OFF(4702)  // unreachable code
@@ -2214,7 +2214,7 @@ RAPIDJSON_DIAG_POP
 RAPIDJSON_DIAG_POP
 #endif
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(__clang__)
 RAPIDJSON_DIAG_POP
 #endif
 
diff --git a/contrib/rapidjson/include/rapidjson/writer.h b/contrib/rapidjson/include/rapidjson/writer.h
index e610ebb60..53d1a5d7f 100644
--- a/contrib/rapidjson/include/rapidjson/writer.h
+++ b/contrib/rapidjson/include/rapidjson/writer.h
@@ -36,7 +36,7 @@
 #include <arm_neon.h>
 #endif
 
-#ifdef _MSC_VER
+#if defined (_MSC_VER) && !defined(__clang__)
 RAPIDJSON_DIAG_PUSH
 RAPIDJSON_DIAG_OFF(4127) // conditional expression is constant
 #endif
@@ -700,11 +700,11 @@ inline bool Writer<StringBuffer>::ScanWriteUnescapedString(StringStream& is, siz
 
 RAPIDJSON_NAMESPACE_END
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(__clang__)
 RAPIDJSON_DIAG_POP
 #endif
 
-#ifdef __clang__
+#if defined(__clang__)
 RAPIDJSON_DIAG_POP
 #endif
 
diff --git a/contrib/unzip/crypt.c b/contrib/unzip/crypt.c
new file mode 100644
index 000000000..c3cc5d991
--- /dev/null
+++ b/contrib/unzip/crypt.c
@@ -0,0 +1,167 @@
+/* crypt.c -- base code for traditional PKWARE encryption
+   Version 1.01e, February 12th, 2005
+
+   Copyright (C) 1998-2005 Gilles Vollant
+   Modifications for Info-ZIP crypting
+     Copyright (C) 2003 Terry Thorsen
+
+   This code is a modified version of crypting code in Info-ZIP distribution
+
+   Copyright (C) 1990-2000 Info-ZIP.  All rights reserved.
+
+   This program is distributed under the terms of the same license as zlib.
+   See the accompanying LICENSE file for the full text of the license.
+
+   This encryption code is a direct transcription of the algorithm from
+   Roger Schlafly, described by Phil Katz in the file appnote.txt. This
+   file (appnote.txt) is distributed with the PKZIP program (even in the
+   version without encryption capabilities).
+
+   If you don't need crypting in your application, just define symbols
+   NOCRYPT and NOUNCRYPT.
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <time.h>
+
+#ifdef _WIN32
+#  include <windows.h>
+#  include <wincrypt.h>
+#else
+#  include <sys/stat.h>
+#  include <fcntl.h>
+#  include <unistd.h>
+#endif
+
+#include "zlib.h"
+
+#include "crypt.h"
+
+#ifdef _WIN32
+#   pragma warning(push)
+#   pragma warning(disable : 4244)
+#endif // _WIN32
+
+/***************************************************************************/
+
+#define CRC32(c, b) ((*(pcrc_32_tab+(((uint32_t)(c) ^ (b)) & 0xff))) ^ ((c) >> 8))
+
+#ifndef ZCR_SEED2
+#  define ZCR_SEED2 3141592654UL     /* use PI as default pattern */
+#endif
+
+/***************************************************************************/
+
+uint8_t decrypt_byte(uint32_t *pkeys)
+{
+    unsigned temp;  /* POTENTIAL BUG:  temp*(temp^1) may overflow in an
+                     * unpredictable manner on 16-bit systems; not a problem
+                     * with any known compiler so far, though */
+
+    temp = ((uint32_t)(*(pkeys+2)) & 0xffff) | 2;
+    return (uint8_t)(((temp * (temp ^ 1)) >> 8) & 0xff);
+}
+
+uint8_t update_keys(uint32_t *pkeys, const z_crc_t *pcrc_32_tab, int32_t c)
+{
+    (*(pkeys+0)) = (uint32_t)CRC32((*(pkeys+0)), c);
+    (*(pkeys+1)) += (*(pkeys+0)) & 0xff;
+    (*(pkeys+1)) = (*(pkeys+1)) * 134775813L + 1;
+    {
+        register int32_t keyshift = (int32_t)((*(pkeys + 1)) >> 24);
+        (*(pkeys+2)) = (uint32_t)CRC32((*(pkeys+2)), keyshift);
+    }
+    return c;
+}
+
+void init_keys(const char *passwd, uint32_t *pkeys, const z_crc_t *pcrc_32_tab)
+{
+    *(pkeys+0) = 305419896L;
+    *(pkeys+1) = 591751049L;
+    *(pkeys+2) = 878082192L;
+    while (*passwd != 0)
+    {
+        update_keys(pkeys, pcrc_32_tab, *passwd);
+        passwd += 1;
+    }
+}
+
+/***************************************************************************/
+
+int cryptrand(unsigned char *buf, unsigned int len)
+{
+    static unsigned calls = 0;
+    int rlen = 0;
+#ifdef _WIN32
+    HCRYPTPROV provider;
+    unsigned __int64 pentium_tsc[1];
+    int result = 0;
+
+
+    if (CryptAcquireContext(&provider, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT | CRYPT_SILENT))
+    {
+        result = CryptGenRandom(provider, len, buf);
+        CryptReleaseContext(provider, 0);
+        if (result)
+            return len;
+    }
+
+    for (rlen = 0; rlen < (int)len; ++rlen)
+    {
+        if (rlen % 8 == 0)
+            QueryPerformanceCounter((LARGE_INTEGER *)pentium_tsc);
+        buf[rlen] = ((unsigned char*)pentium_tsc)[rlen % 8];
+    }
+#else
+    int frand = open("/dev/urandom", O_RDONLY);
+    if (frand != -1)
+    {
+        rlen = (int)read(frand, buf, len);
+        close(frand);
+    }
+#endif
+    if (rlen < (int)len)
+    {
+        /* Ensure different random header each time */
+        if (++calls == 1)
+            srand((unsigned)(time(NULL) ^ ZCR_SEED2));
+
+        while (rlen < (int)len)
+            buf[rlen++] = (rand() >> 7) & 0xff;
+    }
+    return rlen;
+}
+
+int crypthead(const char *passwd, uint8_t *buf, int buf_size, uint32_t *pkeys, 
+              const z_crc_t *pcrc_32_tab, uint8_t verify1, uint8_t verify2)
+{
+    uint8_t n = 0;                      /* index in random header */
+    uint8_t header[RAND_HEAD_LEN-2];    /* random header */
+    uint16_t t = 0;                     /* temporary */
+
+    if (buf_size < RAND_HEAD_LEN)
+        return 0;
+
+    init_keys(passwd, pkeys, pcrc_32_tab);
+
+    /* First generate RAND_HEAD_LEN-2 random bytes. */
+    cryptrand(header, RAND_HEAD_LEN-2);
+
+    /* Encrypt random header (last two bytes is high word of crc) */
+    init_keys(passwd, pkeys, pcrc_32_tab);
+
+    for (n = 0; n < RAND_HEAD_LEN-2; n++)
+        buf[n] = (uint8_t)zencode(pkeys, pcrc_32_tab, header[n], t);
+
+    buf[n++] = (uint8_t)zencode(pkeys, pcrc_32_tab, verify1, t);
+    buf[n++] = (uint8_t)zencode(pkeys, pcrc_32_tab, verify2, t);
+    return n;
+}
+
+#ifdef _WIN32
+#   pragma warning(pop)
+#endif // _WIN32
+
+/***************************************************************************/
diff --git a/contrib/unzip/crypt.h b/contrib/unzip/crypt.h
index e92bdc636..e627b3bee 100644
--- a/contrib/unzip/crypt.h
+++ b/contrib/unzip/crypt.h
@@ -1,133 +1,61 @@
-/* crypt.h -- base code for crypt/uncrypt ZIPfile
-
-
+/* crypt.h -- base code for traditional PKWARE encryption
    Version 1.01e, February 12th, 2005
 
    Copyright (C) 1998-2005 Gilles Vollant
+   Modifications for Info-ZIP crypting
+     Copyright (C) 2003 Terry Thorsen
 
-   This code is a modified version of crypting code in Infozip distribution
+   This code is a modified version of crypting code in Info-ZIP distribution
 
-   The encryption/decryption parts of this source code (as opposed to the
-   non-echoing password parts) were originally written in Europe.  The
-   whole source package can be freely distributed, including from the USA.
-   (Prior to January 2000, re-export from the US was a violation of US law.)
+   Copyright (C) 1990-2000 Info-ZIP.  All rights reserved.
 
-   This encryption code is a direct transcription of the algorithm from
-   Roger Schlafly, described by Phil Katz in the file appnote.txt.  This
-   file (appnote.txt) is distributed with the PKZIP program (even in the
-   version without encryption capabilities).
-
-   If you don't need crypting in your application, just define symbols
-   NOCRYPT and NOUNCRYPT.
-
-   This code support the "Traditional PKWARE Encryption".
-
-   The new AES encryption added on Zip format by Winzip (see the page
-   http://www.winzip.com/aes_info.htm ) and PKWare PKZip 5.x Strong
-   Encryption is not supported.
+   This program is distributed under the terms of the same license as zlib.
+   See the accompanying LICENSE file for the full text of the license.
 */
 
-#define CRC32(c, b) ((*(pcrc_32_tab+(((int)(c) ^ (b)) & 0xff))) ^ ((c) >> 8))
+#ifndef _MINICRYPT_H
+#define _MINICRYPT_H
 
-/***********************************************************************
- * Return the next byte in the pseudo-random sequence
- */
-static int decrypt_byte(unsigned long* pkeys, const z_crc_t* t)
-{
-    unsigned temp;  /* POTENTIAL BUG:  temp*(temp^1) may overflow in an
-                     * unpredictable manner on 16-bit systems; not a problem
-                     * with any known compiler so far, though */
+#if ZLIB_VERNUM < 0x1270
+typedef unsigned long z_crc_t;
+#endif
 
-    temp = ((unsigned)(*(pkeys+2)) & 0xffff) | 2;
-    (void)t;
-    return (int)(((temp * (temp ^ 1)) >> 8) & 0xff);
-}
-
-/***********************************************************************
- * Update the encryption keys with the next byte of plain text
- */
-static int update_keys(unsigned long* pkeys,const z_crc_t* pcrc_32_tab,int c)
-{
-    (*(pkeys+0)) = CRC32((*(pkeys+0)), c);
-    (*(pkeys+1)) += (*(pkeys+0)) & 0xff;
-    (*(pkeys+1)) = (*(pkeys+1)) * 134775813L + 1;
-    {
-      register int keyshift = (int)((*(pkeys+1)) >> 24);
-      (*(pkeys+2)) = CRC32((*(pkeys+2)), keyshift);
-    }
-    return c;
-}
-
-
-/***********************************************************************
- * Initialize the encryption keys and the random header according to
- * the given password.
- */
-static void init_keys(const char* passwd,unsigned long* pkeys,const z_crc_t* pcrc_32_tab)
-{
-    *(pkeys+0) = 305419896L;
-    *(pkeys+1) = 591751049L;
-    *(pkeys+2) = 878082192L;
-    while (*passwd != '\0') {
-        update_keys(pkeys,pcrc_32_tab,(int)*passwd);
-        passwd++;
-    }
-}
-
-#define zdecode(pkeys,pcrc_32_tab,c) \
-    (update_keys(pkeys,pcrc_32_tab,c ^= decrypt_byte(pkeys,pcrc_32_tab)))
-
-#define zencode(pkeys,pcrc_32_tab,c,t) \
-    (t=decrypt_byte(pkeys,pcrc_32_tab), update_keys(pkeys,pcrc_32_tab,c), t^(c))
-
-#ifdef INCLUDECRYPTINGCODE_IFCRYPTALLOWED
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 #define RAND_HEAD_LEN  12
-   /* "last resort" source for second part of crypt seed pattern */
-#  ifndef ZCR_SEED2
-#    define ZCR_SEED2 3141592654UL     /* use PI as default pattern */
-#  endif
 
-static int crypthead(passwd, buf, bufSize, pkeys, pcrc_32_tab, crcForCrypting)
-    const char *passwd;         /* password string */
-    unsigned char *buf;         /* where to write header */
-    int bufSize;
-    unsigned long* pkeys;
-    const unsigned long* pcrc_32_tab;
-    unsigned long crcForCrypting;
-{
-    int n;                       /* index in random header */
-    int t;                       /* temporary */
-    int c;                       /* random byte */
-    unsigned char header[RAND_HEAD_LEN-2]; /* random header */
-    static unsigned calls = 0;   /* ensure different random header each time */
+/***************************************************************************/
 
-    if (bufSize<RAND_HEAD_LEN)
-      return 0;
+#define zdecode(pkeys,pcrc_32_tab,c) \
+    (update_keys(pkeys,pcrc_32_tab, c ^= decrypt_byte(pkeys)))
 
-    /* First generate RAND_HEAD_LEN-2 random bytes. We encrypt the
-     * output of rand() to get less predictability, since rand() is
-     * often poorly implemented.
-     */
-    if (++calls == 1)
-    {
-        srand((unsigned)(time(NULL) ^ ZCR_SEED2));
-    }
-    init_keys(passwd, pkeys, pcrc_32_tab);
-    for (n = 0; n < RAND_HEAD_LEN-2; n++)
-    {
-        c = (rand() >> 7) & 0xff;
-        header[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, c, t);
-    }
-    /* Encrypt random header (last two bytes is high word of crc) */
-    init_keys(passwd, pkeys, pcrc_32_tab);
-    for (n = 0; n < RAND_HEAD_LEN-2; n++)
-    {
-        buf[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, header[n], t);
-    }
-    buf[n++] = zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 16) & 0xff, t);
-    buf[n++] = zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 24) & 0xff, t);
-    return n;
+#define zencode(pkeys,pcrc_32_tab,c,t) \
+    (t = decrypt_byte(pkeys), update_keys(pkeys,pcrc_32_tab,c), t^(c))
+
+/***************************************************************************/
+
+/* Return the next byte in the pseudo-random sequence */
+uint8_t decrypt_byte(uint32_t *pkeys);
+
+/* Update the encryption keys with the next byte of plain text */
+uint8_t update_keys(uint32_t *pkeys, const z_crc_t *pcrc_32_tab, int32_t c);
+
+/* Initialize the encryption keys and the random header according to the given password. */
+void init_keys(const char *passwd, uint32_t *pkeys, const z_crc_t *pcrc_32_tab);
+
+/* Generate cryptographically secure random numbers */
+int cryptrand(unsigned char *buf, unsigned int len);
+
+/* Create encryption header */
+int crypthead(const char *passwd, uint8_t *buf, int buf_size, uint32_t *pkeys, 
+    const z_crc_t *pcrc_32_tab, uint8_t verify1, uint8_t verify2);
+
+/***************************************************************************/
+
+#ifdef __cplusplus
 }
+#endif
 
 #endif
diff --git a/contrib/unzip/ioapi.c b/contrib/unzip/ioapi.c
index e1ef46088..30a296d0f 100644
--- a/contrib/unzip/ioapi.c
+++ b/contrib/unzip/ioapi.c
@@ -1,175 +1,340 @@
 /* ioapi.c -- IO base function header for compress/uncompress .zip
-   files using zlib + zip or unzip API
+   part of the MiniZip project
 
-   Version 1.01e, February 12th, 2005
+   Copyright (C) 1998-2010 Gilles Vollant
+     http://www.winimage.com/zLibDll/minizip.html
+   Modifications for Zip64 support
+     Copyright (C) 2009-2010 Mathias Svensson
+     http://result42.com
 
-   Copyright (C) 1998-2005 Gilles Vollant
+   This program is distributed under the terms of the same license as zlib.
+   See the accompanying LICENSE file for the full text of the license.
 */
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "zlib.h"
+#if defined unix || defined __APPLE__
+#include <sys/types.h>
+#include <unistd.h>
+#endif
+
 #include "ioapi.h"
 
 #ifdef _WIN32
-#    pragma warning(push)
-#    pragma warning(disable : 4131 4100)
+#   define snprintf _snprintf
+#   pragma warning(push)
+#   pragma warning(disable : 4131 4100)
+#   ifdef __clang__
+#       pragma clang diagnostic push
+#       pragma clang diagnostic ignored "-Wunused-parameter"
+#   endif
 #endif // _WIN32
 
-/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
 
-#ifndef SEEK_CUR
-#define SEEK_CUR    1
-#endif
+voidpf call_zopen64(const zlib_filefunc64_32_def *pfilefunc, const void *filename, int mode)
+{
+    if (pfilefunc->zfile_func64.zopen64_file != NULL)
+        return (*(pfilefunc->zfile_func64.zopen64_file)) (pfilefunc->zfile_func64.opaque, filename, mode);
+    return (*(pfilefunc->zopen32_file))(pfilefunc->zfile_func64.opaque, (const char*)filename, mode);
+}
 
-#ifndef SEEK_END
-#define SEEK_END    2
-#endif
+voidpf call_zopendisk64(const zlib_filefunc64_32_def *pfilefunc, voidpf filestream, uint32_t number_disk, int mode)
+{
+    if (pfilefunc->zfile_func64.zopendisk64_file != NULL)
+        return (*(pfilefunc->zfile_func64.zopendisk64_file)) (pfilefunc->zfile_func64.opaque, filestream, number_disk, mode);
+    return (*(pfilefunc->zopendisk32_file))(pfilefunc->zfile_func64.opaque, filestream, number_disk, mode);
+}
 
-#ifndef SEEK_SET
-#define SEEK_SET    0
-#endif
+long call_zseek64(const zlib_filefunc64_32_def *pfilefunc, voidpf filestream, uint64_t offset, int origin)
+{
+    uint32_t offset_truncated = 0;
+    if (pfilefunc->zfile_func64.zseek64_file != NULL)
+        return (*(pfilefunc->zfile_func64.zseek64_file)) (pfilefunc->zfile_func64.opaque,filestream,offset,origin);
+    offset_truncated = (uint32_t)offset;
+    if (offset_truncated != offset)
+        return -1;
+    return (*(pfilefunc->zseek32_file))(pfilefunc->zfile_func64.opaque,filestream, offset_truncated, origin);
+}
 
-voidpf ZCALLBACK fopen_file_func OF((
-   voidpf opaque,
-   const char* filename,
-   int mode));
+uint64_t call_ztell64(const zlib_filefunc64_32_def *pfilefunc, voidpf filestream)
+{
+    uint64_t position;
+    if (pfilefunc->zfile_func64.zseek64_file != NULL)
+        return (*(pfilefunc->zfile_func64.ztell64_file)) (pfilefunc->zfile_func64.opaque, filestream);
+    position = (*(pfilefunc->ztell32_file))(pfilefunc->zfile_func64.opaque, filestream);
+    if ((position) == UINT32_MAX)
+        return (uint64_t)-1;
+    return position;
+}
 
-uLong ZCALLBACK fread_file_func OF((
-   voidpf opaque,
-   voidpf stream,
-   void* buf,
-   uLong size));
+void fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def *p_filefunc64_32, const zlib_filefunc_def *p_filefunc32)
+{
+    p_filefunc64_32->zfile_func64.zopen64_file = NULL;
+    p_filefunc64_32->zfile_func64.zopendisk64_file = NULL;
+    p_filefunc64_32->zopen32_file = p_filefunc32->zopen_file;
+    p_filefunc64_32->zopendisk32_file = p_filefunc32->zopendisk_file;
+    p_filefunc64_32->zfile_func64.zerror_file = p_filefunc32->zerror_file;
+    p_filefunc64_32->zfile_func64.zread_file = p_filefunc32->zread_file;
+    p_filefunc64_32->zfile_func64.zwrite_file = p_filefunc32->zwrite_file;
+    p_filefunc64_32->zfile_func64.ztell64_file = NULL;
+    p_filefunc64_32->zfile_func64.zseek64_file = NULL;
+    p_filefunc64_32->zfile_func64.zclose_file = p_filefunc32->zclose_file;
+    p_filefunc64_32->zfile_func64.zerror_file = p_filefunc32->zerror_file;
+    p_filefunc64_32->zfile_func64.opaque = p_filefunc32->opaque;
+    p_filefunc64_32->zseek32_file = p_filefunc32->zseek_file;
+    p_filefunc64_32->ztell32_file = p_filefunc32->ztell_file;
+}
 
-uLong ZCALLBACK fwrite_file_func OF((
-   voidpf opaque,
-   voidpf stream,
-   const void* buf,
-   uLong size));
+static voidpf   ZCALLBACK fopen_file_func(voidpf opaque, const char *filename, int mode);
+static uint32_t ZCALLBACK fread_file_func(voidpf opaque, voidpf stream, void* buf, uint32_t size);
+static uint32_t ZCALLBACK fwrite_file_func(voidpf opaque, voidpf stream, const void *buf, uint32_t size);
+static uint64_t ZCALLBACK ftell64_file_func(voidpf opaque, voidpf stream);
+static long     ZCALLBACK fseek64_file_func(voidpf opaque, voidpf stream, uint64_t offset, int origin);
+static int      ZCALLBACK fclose_file_func(voidpf opaque, voidpf stream);
+static int      ZCALLBACK ferror_file_func(voidpf opaque, voidpf stream);
 
-long ZCALLBACK ftell_file_func OF((
-   voidpf opaque,
-   voidpf stream));
+typedef struct
+{
+    FILE *file;
+    int filenameLength;
+    void *filename;
+} FILE_IOPOSIX;
 
-long ZCALLBACK fseek_file_func OF((
-   voidpf opaque,
-   voidpf stream,
-   uLong offset,
-   int origin));
+static voidpf file_build_ioposix(FILE *file, const char *filename)
+{
+    FILE_IOPOSIX *ioposix = NULL;
+    if (file == NULL)
+        return NULL;
+    ioposix = (FILE_IOPOSIX*)malloc(sizeof(FILE_IOPOSIX));
+    ioposix->file = file;
+    ioposix->filenameLength = (int)strlen(filename) + 1;
+    ioposix->filename = (char*)malloc(ioposix->filenameLength * sizeof(char));
+    memcpy((char*)ioposix->filename, filename, ioposix->filenameLength);
+    return (voidpf)ioposix;
+}
 
-int ZCALLBACK fclose_file_func OF((
-   voidpf opaque,
-   voidpf stream));
-
-int ZCALLBACK ferror_file_func OF((
-   voidpf opaque,
-   voidpf stream));
-
-
-voidpf ZCALLBACK fopen_file_func (opaque, filename, mode)
-   voidpf opaque;
-   const char* filename;
-   int mode;
+static voidpf ZCALLBACK fopen_file_func(voidpf opaque, const char *filename, int mode)
 {
     FILE* file = NULL;
-    const char* mode_fopen = NULL;
-    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
+    const char *mode_fopen = NULL;
+    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER) == ZLIB_FILEFUNC_MODE_READ)
         mode_fopen = "rb";
-    else
-    if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
+    else if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
         mode_fopen = "r+b";
-    else
-    if (mode & ZLIB_FILEFUNC_MODE_CREATE)
+    else if (mode & ZLIB_FILEFUNC_MODE_CREATE)
         mode_fopen = "wb";
 
-    if ((filename!=NULL) && (mode_fopen != NULL))
+    if ((filename != NULL) && (mode_fopen != NULL))
+    {
         file = fopen(filename, mode_fopen);
+        return file_build_ioposix(file, filename);
+    }
     return file;
 }
 
-
-uLong ZCALLBACK fread_file_func (opaque, stream, buf, size)
-   voidpf opaque;
-   voidpf stream;
-   void* buf;
-   uLong size;
+static voidpf ZCALLBACK fopen64_file_func(voidpf opaque, const void *filename, int mode)
 {
-    uLong ret;
-    ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
+    FILE* file = NULL;
+    const char *mode_fopen = NULL;
+    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER) == ZLIB_FILEFUNC_MODE_READ)
+        mode_fopen = "rb";
+    else if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
+        mode_fopen = "r+b";
+    else if (mode & ZLIB_FILEFUNC_MODE_CREATE)
+        mode_fopen = "wb";
+
+    if ((filename != NULL) && (mode_fopen != NULL))
+    {
+        file = fopen64((const char*)filename, mode_fopen);
+        return file_build_ioposix(file, (const char*)filename);
+    }
+    return file;
+}
+
+static voidpf ZCALLBACK fopendisk64_file_func(voidpf opaque, voidpf stream, uint32_t number_disk, int mode)
+{
+    FILE_IOPOSIX *ioposix = NULL;
+    char *diskFilename = NULL;
+    voidpf ret = NULL;
+    int i = 0;
+
+    if (stream == NULL)
+        return NULL;
+    ioposix = (FILE_IOPOSIX*)stream;
+    diskFilename = (char*)malloc(ioposix->filenameLength * sizeof(char));
+    strncpy(diskFilename, (const char*)ioposix->filename, ioposix->filenameLength);
+    for (i = ioposix->filenameLength - 1; i >= 0; i -= 1)
+    {
+        if (diskFilename[i] != '.')
+            continue;
+        snprintf(&diskFilename[i], ioposix->filenameLength - i, ".z%02u", number_disk + 1);
+        break;
+    }
+    if (i >= 0)
+        ret = fopen64_file_func(opaque, diskFilename, mode);
+    free(diskFilename);
     return ret;
 }
 
-
-uLong ZCALLBACK fwrite_file_func (opaque, stream, buf, size)
-   voidpf opaque;
-   voidpf stream;
-   const void* buf;
-   uLong size;
+static voidpf ZCALLBACK fopendisk_file_func(voidpf opaque, voidpf stream, uint32_t number_disk, int mode)
 {
-    uLong ret;
-    ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);
+    FILE_IOPOSIX *ioposix = NULL;
+    char *diskFilename = NULL;
+    voidpf ret = NULL;
+    int i = 0;
+
+    if (stream == NULL)
+        return NULL;
+    ioposix = (FILE_IOPOSIX*)stream;
+    diskFilename = (char*)malloc(ioposix->filenameLength * sizeof(char));
+    strncpy(diskFilename, (const char*)ioposix->filename, ioposix->filenameLength);
+    for (i = ioposix->filenameLength - 1; i >= 0; i -= 1)
+    {
+        if (diskFilename[i] != '.')
+            continue;
+        snprintf(&diskFilename[i], ioposix->filenameLength - i, ".z%02u", number_disk + 1);
+        break;
+    }
+    if (i >= 0)
+        ret = fopen_file_func(opaque, diskFilename, mode);
+    free(diskFilename);
     return ret;
 }
 
-long ZCALLBACK ftell_file_func (opaque, stream)
-   voidpf opaque;
-   voidpf stream;
+static uint32_t ZCALLBACK fread_file_func(voidpf opaque, voidpf stream, void* buf, uint32_t size)
 {
-    long ret;
-    ret = ftell((FILE *)stream);
+    FILE_IOPOSIX *ioposix = NULL;
+    uint32_t read = (uint32_t)-1;
+    if (stream == NULL)
+        return read;
+    ioposix = (FILE_IOPOSIX*)stream;
+    read = (uint32_t)fread(buf, 1, (size_t)size, ioposix->file);
+    return read;
+}
+
+static uint32_t ZCALLBACK fwrite_file_func(voidpf opaque, voidpf stream, const void *buf, uint32_t size)
+{
+    FILE_IOPOSIX *ioposix = NULL;
+    uint32_t written = (uint32_t)-1;
+    if (stream == NULL)
+        return written;
+    ioposix = (FILE_IOPOSIX*)stream;
+    written = (uint32_t)fwrite(buf, 1, (size_t)size, ioposix->file);
+    return written;
+}
+
+static long ZCALLBACK ftell_file_func(voidpf opaque, voidpf stream)
+{
+    FILE_IOPOSIX *ioposix = NULL;
+    long ret = -1;
+    if (stream == NULL)
+        return ret;
+    ioposix = (FILE_IOPOSIX*)stream;
+    ret = ftell(ioposix->file);
     return ret;
 }
 
-long ZCALLBACK fseek_file_func (opaque, stream, offset, origin)
-   voidpf opaque;
-   voidpf stream;
-   uLong offset;
-   int origin;
+static uint64_t ZCALLBACK ftell64_file_func(voidpf opaque, voidpf stream)
 {
-    int fseek_origin=0;
-    long ret;
+    FILE_IOPOSIX *ioposix = NULL;
+    uint64_t ret = (uint64_t)-1;
+    if (stream == NULL)
+        return ret;
+    ioposix = (FILE_IOPOSIX*)stream;
+    ret = ftello64(ioposix->file);
+    return ret;
+}
+
+static long ZCALLBACK fseek_file_func(voidpf opaque, voidpf stream, uint32_t offset, int origin)
+{
+    FILE_IOPOSIX *ioposix = NULL;
+    int fseek_origin = 0;
+    long ret = 0;
+
+    if (stream == NULL)
+        return -1;
+    ioposix = (FILE_IOPOSIX*)stream;
+
     switch (origin)
     {
-    case ZLIB_FILEFUNC_SEEK_CUR :
-        fseek_origin = SEEK_CUR;
-        break;
-    case ZLIB_FILEFUNC_SEEK_END :
-        fseek_origin = SEEK_END;
-        break;
-    case ZLIB_FILEFUNC_SEEK_SET :
-        fseek_origin = SEEK_SET;
-        break;
-    default: return -1;
+        case ZLIB_FILEFUNC_SEEK_CUR:
+            fseek_origin = SEEK_CUR;
+            break;
+        case ZLIB_FILEFUNC_SEEK_END:
+            fseek_origin = SEEK_END;
+            break;
+        case ZLIB_FILEFUNC_SEEK_SET:
+            fseek_origin = SEEK_SET;
+            break;
+        default:
+            return -1;
     }
-    ret = 0;
-    fseek((FILE *)stream, offset, fseek_origin);
+    if (fseek(ioposix->file, offset, fseek_origin) != 0)
+        ret = -1;
     return ret;
 }
 
-int ZCALLBACK fclose_file_func (opaque, stream)
-   voidpf opaque;
-   voidpf stream;
+static long ZCALLBACK fseek64_file_func(voidpf opaque, voidpf stream, uint64_t offset, int origin)
 {
-    int ret;
-    ret = fclose((FILE *)stream);
+    FILE_IOPOSIX *ioposix = NULL;
+    int fseek_origin = 0;
+    long ret = 0;
+
+    if (stream == NULL)
+        return -1;
+    ioposix = (FILE_IOPOSIX*)stream;
+
+    switch (origin)
+    {
+        case ZLIB_FILEFUNC_SEEK_CUR:
+            fseek_origin = SEEK_CUR;
+            break;
+        case ZLIB_FILEFUNC_SEEK_END:
+            fseek_origin = SEEK_END;
+            break;
+        case ZLIB_FILEFUNC_SEEK_SET:
+            fseek_origin = SEEK_SET;
+            break;
+        default:
+            return -1;
+    }
+
+    if (fseeko64(ioposix->file, offset, fseek_origin) != 0)
+        ret = -1;
+
     return ret;
 }
 
-int ZCALLBACK ferror_file_func (opaque, stream)
-   voidpf opaque;
-   voidpf stream;
+static int ZCALLBACK fclose_file_func(voidpf opaque, voidpf stream)
 {
-    int ret;
-    ret = ferror((FILE *)stream);
+    FILE_IOPOSIX *ioposix = NULL;
+    int ret = -1;
+    if (stream == NULL)
+        return ret;
+    ioposix = (FILE_IOPOSIX*)stream;
+    if (ioposix->filename != NULL)
+        free(ioposix->filename);
+    ret = fclose(ioposix->file);
+    free(ioposix);
     return ret;
 }
 
-void fill_fopen_filefunc (pzlib_filefunc_def)
-  zlib_filefunc_def* pzlib_filefunc_def;
+static int ZCALLBACK ferror_file_func(voidpf opaque, voidpf stream)
+{
+    FILE_IOPOSIX *ioposix = NULL;
+    int ret = -1;
+    if (stream == NULL)
+        return ret;
+    ioposix = (FILE_IOPOSIX*)stream;
+    ret = ferror(ioposix->file);
+    return ret;
+}
+
+void fill_fopen_filefunc(zlib_filefunc_def *pzlib_filefunc_def)
 {
     pzlib_filefunc_def->zopen_file = fopen_file_func;
+    pzlib_filefunc_def->zopendisk_file = fopendisk_file_func;
     pzlib_filefunc_def->zread_file = fread_file_func;
     pzlib_filefunc_def->zwrite_file = fwrite_file_func;
     pzlib_filefunc_def->ztell_file = ftell_file_func;
@@ -179,6 +344,22 @@ void fill_fopen_filefunc (pzlib_filefunc_def)
     pzlib_filefunc_def->opaque = NULL;
 }
 
+void fill_fopen64_filefunc(zlib_filefunc64_def *pzlib_filefunc_def)
+{
+    pzlib_filefunc_def->zopen64_file = fopen64_file_func;
+    pzlib_filefunc_def->zopendisk64_file = fopendisk64_file_func;
+    pzlib_filefunc_def->zread_file = fread_file_func;
+    pzlib_filefunc_def->zwrite_file = fwrite_file_func;
+    pzlib_filefunc_def->ztell64_file = ftell64_file_func;
+    pzlib_filefunc_def->zseek64_file = fseek64_file_func;
+    pzlib_filefunc_def->zclose_file = fclose_file_func;
+    pzlib_filefunc_def->zerror_file = ferror_file_func;
+    pzlib_filefunc_def->opaque = NULL;
+}
+
 #ifdef _WIN32
-#    pragma warning(pop)
+#   pragma warning(pop)
+#   ifdef __clang__
+#       pragma clang diagnostic pop
+#   endif
 #endif // _WIN32
diff --git a/contrib/unzip/ioapi.h b/contrib/unzip/ioapi.h
index 7d457baab..0e49543e5 100644
--- a/contrib/unzip/ioapi.h
+++ b/contrib/unzip/ioapi.h
@@ -1,33 +1,43 @@
 /* ioapi.h -- IO base function header for compress/uncompress .zip
-   files using zlib + zip or unzip API
+   part of the MiniZip project
 
-   Version 1.01e, February 12th, 2005
+   Copyright (C) 1998-2010 Gilles Vollant
+     http://www.winimage.com/zLibDll/minizip.html
+   Modifications for Zip64 support
+     Copyright (C) 2009-2010 Mathias Svensson
+     http://result42.com
 
-   Copyright (C) 1998-2005 Gilles Vollant
+   This program is distributed under the terms of the same license as zlib.
+   See the accompanying LICENSE file for the full text of the license.
 */
 
-#ifndef _ZLIBIOAPI_H
-#define _ZLIBIOAPI_H
+#ifndef _ZLIBIOAPI64_H
+#define _ZLIBIOAPI64_H
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
 
-#define ZLIB_FILEFUNC_SEEK_CUR (1)
-#define ZLIB_FILEFUNC_SEEK_END (2)
-#define ZLIB_FILEFUNC_SEEK_SET (0)
+#include "zlib.h"
 
-#define ZLIB_FILEFUNC_MODE_READ      (1)
-#define ZLIB_FILEFUNC_MODE_WRITE     (2)
-#define ZLIB_FILEFUNC_MODE_READWRITEFILTER (3)
-
-#define ZLIB_FILEFUNC_MODE_EXISTING (4)
-#define ZLIB_FILEFUNC_MODE_CREATE   (8)
-
-
-#ifndef ZCALLBACK
-
-#if (defined(WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)
-#define ZCALLBACK CALLBACK
+#if defined(USE_FILE32API)
+#   define fopen64 fopen
+#   define ftello64 ftell
+#   define fseeko64 fseek
 #else
-#define ZCALLBACK
+#if defined(_MSC_VER)
+#   define fopen64 fopen
+#   if (_MSC_VER >= 1400) && (!(defined(NO_MSCVER_FILE64_FUNC)))
+#       define ftello64 _ftelli64
+#       define fseeko64 _fseeki64
+#   else /* old MSC */
+#       define ftello64 ftell
+#       define fseeko64 fseek
+#   endif
+#else
+#   define fopen64 fopen
+#   define ftello64 ftello
+#   define fseeko64 fseeko
 #endif
 #endif
 
@@ -35,41 +45,101 @@
 extern "C" {
 #endif
 
-typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode));
-typedef uLong  (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));
-typedef uLong  (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
-typedef long   (ZCALLBACK *tell_file_func) OF((voidpf opaque, voidpf stream));
-typedef long   (ZCALLBACK *seek_file_func) OF((voidpf opaque, voidpf stream, uLong offset, int origin));
-typedef int    (ZCALLBACK *close_file_func) OF((voidpf opaque, voidpf stream));
-typedef int    (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream));
+#define ZLIB_FILEFUNC_SEEK_CUR (1)
+#define ZLIB_FILEFUNC_SEEK_END (2)
+#define ZLIB_FILEFUNC_SEEK_SET (0)
 
+#define ZLIB_FILEFUNC_MODE_READ             (1)
+#define ZLIB_FILEFUNC_MODE_WRITE            (2)
+#define ZLIB_FILEFUNC_MODE_READWRITEFILTER  (3)
+#define ZLIB_FILEFUNC_MODE_EXISTING         (4)
+#define ZLIB_FILEFUNC_MODE_CREATE           (8)
+
+#ifndef ZCALLBACK
+#  if (defined(WIN32) || defined(_WIN32) || defined (WINDOWS) || \
+       defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)
+#    define ZCALLBACK CALLBACK
+#  else
+#    define ZCALLBACK
+#  endif
+#endif
+
+typedef voidpf   (ZCALLBACK *open_file_func)     (voidpf opaque, const char *filename, int mode);
+typedef voidpf   (ZCALLBACK *opendisk_file_func) (voidpf opaque, voidpf stream, uint32_t number_disk, int mode);
+typedef uint32_t (ZCALLBACK *read_file_func)     (voidpf opaque, voidpf stream, void* buf, uint32_t size);
+typedef uint32_t (ZCALLBACK *write_file_func)    (voidpf opaque, voidpf stream, const void *buf, uint32_t size);
+typedef int      (ZCALLBACK *close_file_func)    (voidpf opaque, voidpf stream);
+typedef int      (ZCALLBACK *error_file_func)    (voidpf opaque, voidpf stream);
+
+typedef long     (ZCALLBACK *tell_file_func)     (voidpf opaque, voidpf stream);
+typedef long     (ZCALLBACK *seek_file_func)     (voidpf opaque, voidpf stream, uint32_t offset, int origin);
+
+/* here is the "old" 32 bits structure structure */
 typedef struct zlib_filefunc_def_s
 {
     open_file_func      zopen_file;
+    opendisk_file_func  zopendisk_file;
     read_file_func      zread_file;
     write_file_func     zwrite_file;
     tell_file_func      ztell_file;
     seek_file_func      zseek_file;
     close_file_func     zclose_file;
-    testerror_file_func zerror_file;
+    error_file_func     zerror_file;
     voidpf              opaque;
 } zlib_filefunc_def;
 
+typedef uint64_t (ZCALLBACK *tell64_file_func)    (voidpf opaque, voidpf stream);
+typedef long     (ZCALLBACK *seek64_file_func)    (voidpf opaque, voidpf stream, uint64_t offset, int origin);
+typedef voidpf   (ZCALLBACK *open64_file_func)    (voidpf opaque, const void *filename, int mode);
+typedef voidpf   (ZCALLBACK *opendisk64_file_func)(voidpf opaque, voidpf stream, uint32_t number_disk, int mode);
 
+typedef struct zlib_filefunc64_def_s
+{
+    open64_file_func     zopen64_file;
+    opendisk64_file_func zopendisk64_file;
+    read_file_func       zread_file;
+    write_file_func      zwrite_file;
+    tell64_file_func     ztell64_file;
+    seek64_file_func     zseek64_file;
+    close_file_func      zclose_file;
+    error_file_func      zerror_file;
+    voidpf               opaque;
+} zlib_filefunc64_def;
 
-void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
+void fill_fopen_filefunc(zlib_filefunc_def *pzlib_filefunc_def);
+void fill_fopen64_filefunc(zlib_filefunc64_def *pzlib_filefunc_def);
 
-#define ZREAD(filefunc,filestream,buf,size) ((*((filefunc).zread_file))((filefunc).opaque,filestream,buf,size))
-#define ZWRITE(filefunc,filestream,buf,size) ((*((filefunc).zwrite_file))((filefunc).opaque,filestream,buf,size))
-#define ZTELL(filefunc,filestream) ((*((filefunc).ztell_file))((filefunc).opaque,filestream))
-#define ZSEEK(filefunc,filestream,pos,mode) ((*((filefunc).zseek_file))((filefunc).opaque,filestream,pos,mode))
-#define ZCLOSE(filefunc,filestream) ((*((filefunc).zclose_file))((filefunc).opaque,filestream))
-#define ZERROR(filefunc,filestream) ((*((filefunc).zerror_file))((filefunc).opaque,filestream))
+/* now internal definition, only for zip.c and unzip.h */
+typedef struct zlib_filefunc64_32_def_s
+{
+    zlib_filefunc64_def zfile_func64;
+    open_file_func      zopen32_file;
+    opendisk_file_func  zopendisk32_file;
+    tell_file_func      ztell32_file;
+    seek_file_func      zseek32_file;
+} zlib_filefunc64_32_def;
 
+#define ZREAD64(filefunc,filestream,buf,size)       ((*((filefunc).zfile_func64.zread_file))        ((filefunc).zfile_func64.opaque,filestream,buf,size))
+#define ZWRITE64(filefunc,filestream,buf,size)      ((*((filefunc).zfile_func64.zwrite_file))       ((filefunc).zfile_func64.opaque,filestream,buf,size))
+/*#define ZTELL64(filefunc,filestream)                ((*((filefunc).ztell64_file))                   ((filefunc).opaque,filestream))*/
+/*#define ZSEEK64(filefunc,filestream,pos,mode)       ((*((filefunc).zseek64_file))                   ((filefunc).opaque,filestream,pos,mode))*/
+#define ZCLOSE64(filefunc,filestream)               ((*((filefunc).zfile_func64.zclose_file))       ((filefunc).zfile_func64.opaque,filestream))
+#define ZERROR64(filefunc,filestream)               ((*((filefunc).zfile_func64.zerror_file))       ((filefunc).zfile_func64.opaque,filestream))
+
+voidpf   call_zopen64(const zlib_filefunc64_32_def *pfilefunc,const void*filename, int mode);
+voidpf   call_zopendisk64(const zlib_filefunc64_32_def *pfilefunc, voidpf filestream, uint32_t number_disk, int mode);
+long     call_zseek64(const zlib_filefunc64_32_def *pfilefunc, voidpf filestream, uint64_t offset, int origin);
+uint64_t call_ztell64(const zlib_filefunc64_32_def *pfilefunc, voidpf filestream);
+
+void fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def *p_filefunc64_32, const zlib_filefunc_def *p_filefunc32);
+
+#define ZOPEN64(filefunc,filename,mode)             (call_zopen64((&(filefunc)),(filename),(mode)))
+#define ZOPENDISK64(filefunc,filestream,diskn,mode) (call_zopendisk64((&(filefunc)),(filestream),(diskn),(mode)))
+#define ZTELL64(filefunc,filestream)                (call_ztell64((&(filefunc)),(filestream)))
+#define ZSEEK64(filefunc,filestream,pos,mode)       (call_zseek64((&(filefunc)),(filestream),(pos),(mode)))
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif
-
diff --git a/contrib/unzip/unzip.c b/contrib/unzip/unzip.c
index 3937f821e..f1eddeeda 100644
--- a/contrib/unzip/unzip.c
+++ b/contrib/unzip/unzip.c
@@ -1,1061 +1,1040 @@
 /* unzip.c -- IO for uncompress .zip files using zlib
-   Version 1.01e, February 12th, 2005
+   Version 1.1, February 14h, 2010
+   part of the MiniZip project
 
-   Copyright (C) 1998-2005 Gilles Vollant
+   Copyright (C) 1998-2010 Gilles Vollant
+     http://www.winimage.com/zLibDll/minizip.html
+   Modifications of Unzip for Zip64
+     Copyright (C) 2007-2008 Even Rouault
+   Modifications for Zip64 support on both zip and unzip
+     Copyright (C) 2009-2010 Mathias Svensson
+     http://result42.com
+   Modifications for AES, PKWARE disk spanning
+     Copyright (C) 2010-2014 Nathan Moinvaziri
 
-   Read unzip.h for more info
+   This program is distributed under the terms of the same license as zlib.
+   See the accompanying LICENSE file for the full text of the license.
 */
 
-/* Decryption code comes from crypt.c by Info-ZIP but has been greatly reduced in terms of
-compatibility with older software. The following is from the original crypt.c. Code
-woven in by Terry Thorsen 1/2003.
-*/
-/*
-  Copyright (c) 1990-2000 Info-ZIP.  All rights reserved.
-
-  See the accompanying file LICENSE, version 2000-Apr-09 or later
-  (the contents of which are also included in zip.h) for terms of use.
-  If, for some reason, all these files are missing, the Info-ZIP license
-  also may be found at:  ftp://ftp.info-zip.org/pub/infozip/license.html
-*/
-/*
-  crypt.c (full version) by Info-ZIP.      Last revised:  [see crypt.h]
-
-  The encryption/decryption parts of this source code (as opposed to the
-  non-echoing password parts) were originally written in Europe.  The
-  whole source package can be freely distributed, including from the USA.
-  (Prior to January 2000, re-export from the US was a violation of US law.)
- */
-
-/*
-  This encryption code is a direct transcription of the algorithm from
-  Roger Schlafly, described by Phil Katz in the file appnote.txt.  This
-  file (appnote.txt) is distributed with the PKZIP program (even in the
-  version without encryption capabilities).
- */
-
-
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <string.h>
+#include <errno.h>
+
 #include "zlib.h"
 #include "unzip.h"
 
-#if ZLIB_VERNUM < 0x1270
-typedef unsigned long z_crc_t;
+#ifdef HAVE_AES
+#  define AES_METHOD          (99)
+#  define AES_PWVERIFYSIZE    (2)
+#  define AES_MAXSALTLENGTH   (16)
+#  define AES_AUTHCODESIZE    (10)
+#  define AES_HEADERSIZE      (11)
+#  define AES_KEYSIZE(mode)   (64 + (mode * 64))
+
+#  include "aes/aes.h"
+#  include "aes/fileenc.h"
+#endif
+#ifdef HAVE_APPLE_COMPRESSION
+#  include <compression.h>
 #endif
 
-#ifdef STDC
-#  include <stddef.h>
-#  include <string.h>
-#  include <stdlib.h>
-#endif
-#ifdef NO_ERRNO_H
-    extern int errno;
-#else
-#   include <errno.h>
+#ifndef NOUNCRYPT
+#  include "crypt.h"
 #endif
 
+#define DISKHEADERMAGIC             (0x08074b50)
+#define LOCALHEADERMAGIC            (0x04034b50)
+#define CENTRALHEADERMAGIC          (0x02014b50)
+#define ENDHEADERMAGIC              (0x06054b50)
+#define ZIP64ENDHEADERMAGIC         (0x06064b50)
+#define ZIP64ENDLOCHEADERMAGIC      (0x07064b50)
 
-#ifndef local
-#  define local static
+#define SIZECENTRALDIRITEM          (0x2e)
+#define SIZECENTRALHEADERLOCATOR    (0x14)
+#define SIZEZIPLOCALHEADER          (0x1e)
+
+#ifndef BUFREADCOMMENT
+#  define BUFREADCOMMENT            (0x400)
 #endif
-/* compile with -Dlocal if your debugger can't find static symbols */
-
-
-#ifndef CASESENSITIVITYDEFAULT_NO
-#  if !defined(unix) && !defined(CASESENSITIVITYDEFAULT_YES)
-#    define CASESENSITIVITYDEFAULT_NO
-#  endif
-#endif
-
 
 #ifndef UNZ_BUFSIZE
-#define UNZ_BUFSIZE (16384)
+#  define UNZ_BUFSIZE               (UINT16_MAX)
 #endif
-
 #ifndef UNZ_MAXFILENAMEINZIP
-#define UNZ_MAXFILENAMEINZIP (256)
+#  define UNZ_MAXFILENAMEINZIP      (256)
 #endif
 
 #ifndef ALLOC
-# define ALLOC(size) (malloc(size))
+#  define ALLOC(size) (malloc(size))
 #endif
 #ifndef TRYFREE
-# define TRYFREE(p) {if (p) free(p);}
+#  define TRYFREE(p) {if (p) free(p);}
 #endif
 
-#define SIZECENTRALDIRITEM (0x2e)
-#define SIZEZIPLOCALHEADER (0x1e)
-
-
 #ifdef _WIN32
-#    pragma warning(push)
-#    pragma warning(disable : 4131 4244 4189 4245)
+#   pragma warning(push)
+#   pragma warning(disable : 4131 4244 4189 4245)
 #endif // _WIN32
 
 const char unz_copyright[] =
    " unzip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
 
-/* unz_file_info_interntal contain internal info about a file in zipfile*/
-typedef struct unz_file_info_internal_s
+/* unz_file_info_internal contain internal info about a file in zipfile*/
+typedef struct unz_file_info64_internal_s
 {
-    uLong offset_curfile;/* relative offset of local header 4 bytes */
-} unz_file_info_internal;
-
-
-/* file_in_zip_read_info_s contain internal information about a file in zipfile,
-    when reading and decompress it */
-typedef struct
-{
-    char  *read_buffer;         /* internal buffer for compressed data */
-    z_stream stream;            /* zLib stream structure for inflate */
-
-    uLong pos_in_zipfile;       /* position in byte on the zipfile, for fseek*/
-    uLong stream_initialised;   /* flag set if stream structure is initialised*/
-
-    uLong offset_local_extrafield;/* offset of the local extra field */
-    uInt  size_local_extrafield;/* size of the local extra field */
-    uLong pos_local_extrafield;   /* position in the local extra field in read*/
-
-    uLong crc32;                /* crc32 of all data uncompressed */
-    uLong crc32_wait;           /* crc32 we must obtain after decompress all */
-    uLong rest_read_compressed; /* number of byte to be decompressed */
-    uLong rest_read_uncompressed;/*number of byte to be obtained after decomp*/
-    zlib_filefunc_def z_filefunc;
-    voidpf filestream;        /* io structore of the zipfile */
-    uLong compression_method;   /* compression method (0==store) */
-    uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
-    int   raw;
-} file_in_zip_read_info_s;
-
-
-/* unz_s contain internal information about the zipfile
-*/
-typedef struct
-{
-    zlib_filefunc_def z_filefunc;
-    voidpf filestream;        /* io structore of the zipfile */
-    unz_global_info gi;       /* public global information */
-    uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
-    uLong num_file;             /* number of the current file in the zipfile*/
-    uLong pos_in_central_dir;   /* pos of the current file in the central dir*/
-    uLong current_file_ok;      /* flag about the usability of the current file*/
-    uLong central_pos;          /* position of the beginning of the central dir*/
-
-    uLong size_central_dir;     /* size of the central directory  */
-    uLong offset_central_dir;   /* offset of start of central directory with
-                                   respect to the starting disk number */
-
-    unz_file_info cur_file_info; /* public info about the current file in zip*/
-    unz_file_info_internal cur_file_info_internal; /* private info about it*/
-    file_in_zip_read_info_s* pfile_in_zip_read; /* structure about the current
-                                        file if we are decompressing it */
-    int encrypted;
-#    ifndef NOUNCRYPT
-    unsigned long keys[3];     /* keys defining the pseudo-random sequence */
-    const z_crc_t* pcrc_32_tab;
-#    endif
-} unz_s;
-
-
-#ifndef NOUNCRYPT
-#include "crypt.h"
+    uint64_t offset_curfile;            /* relative offset of local header 8 bytes */
+    uint64_t byte_before_the_zipfile;   /* byte before the zipfile, (>0 for sfx) */
+#ifdef HAVE_AES
+    uint8_t  aes_encryption_mode;
+    uint16_t aes_compression_method;
+    uint16_t aes_version;
 #endif
+} unz_file_info64_internal;
 
-/* ===========================================================================
-     Read a byte from a gz_stream; update next_in and avail_in. Return EOF
-   for end of file.
-   IN assertion: the stream s has been sucessfully opened for reading.
-*/
-
-
-local int unzlocal_getByte OF((
-    const zlib_filefunc_def* pzlib_filefunc_def,
-    voidpf filestream,
-    int *pi));
-
-local int unzlocal_getByte(pzlib_filefunc_def,filestream,pi)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
-    int *pi;
+/* file_in_zip_read_info_s contain internal information about a file in zipfile */
+typedef struct
 {
-    unsigned char c;
-    int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1);
-    if (err==1)
+    uint8_t *read_buffer;               /* internal buffer for compressed data */
+    z_stream stream;                    /* zLib stream structure for inflate */
+#ifdef HAVE_BZIP2
+    bz_stream bstream;                  /* bzLib stream structure for bziped */
+#endif
+#ifdef HAVE_APPLE_COMPRESSION
+    compression_stream astream;         /* libcompression stream structure */
+#endif
+#ifdef HAVE_AES
+    fcrypt_ctx aes_ctx;
+#endif
+    uint64_t pos_in_zipfile;            /* position in byte on the zipfile, for fseek */
+    uint8_t  stream_initialised;        /* flag set if stream structure is initialised */
+
+    uint64_t offset_local_extrafield;   /* offset of the local extra field */
+    uint16_t size_local_extrafield;     /* size of the local extra field */
+    uint64_t pos_local_extrafield;      /* position in the local extra field in read */
+    uint64_t total_out_64;
+
+    uint32_t crc32;                     /* crc32 of all data uncompressed */
+    uint32_t crc32_wait;                /* crc32 we must obtain after decompress all */
+    uint64_t rest_read_compressed;      /* number of byte to be decompressed */
+    uint64_t rest_read_uncompressed;    /* number of byte to be obtained after decomp */
+
+    zlib_filefunc64_32_def z_filefunc;
+
+    voidpf   filestream;                /* io structore of the zipfile */
+    uint16_t compression_method;        /* compression method (0==store) */
+    uint64_t byte_before_the_zipfile;   /* byte before the zipfile, (>0 for sfx) */
+    int      raw;
+} file_in_zip64_read_info_s;
+
+/* unz64_s contain internal information about the zipfile */
+typedef struct
+{
+    zlib_filefunc64_32_def z_filefunc;
+
+    voidpf filestream;                  /* io structure of the current zipfile */
+    voidpf filestream_with_CD;          /* io structure of the disk with the central directory */
+
+    unz_global_info64 gi;               /* public global information */
+
+    uint64_t byte_before_the_zipfile;   /* byte before the zipfile, (>0 for sfx) */
+    uint64_t num_file;                  /* number of the current file in the zipfile */
+    uint64_t pos_in_central_dir;        /* pos of the current file in the central dir */
+    uint64_t current_file_ok;           /* flag about the usability of the current file */
+    uint64_t central_pos;               /* position of the beginning of the central dir */
+    uint32_t number_disk;               /* number of the current disk, used for spanning ZIP */
+    uint64_t size_central_dir;          /* size of the central directory */
+    uint64_t offset_central_dir;        /* offset of start of central directory with
+                                           respect to the starting disk number */
+
+    unz_file_info64 cur_file_info;      /* public info about the current file in zip*/
+    unz_file_info64_internal cur_file_info_internal;
+                                        /* private info about it*/
+    file_in_zip64_read_info_s *pfile_in_zip_read;
+                                        /* structure about the current file if we are decompressing it */
+    int is_zip64;                       /* is the current file zip64 */
+#ifndef NOUNCRYPT
+    uint32_t keys[3];                   /* keys defining the pseudo-random sequence */
+    const z_crc_t *pcrc_32_tab;
+#endif
+} unz64_s;
+
+/* Read a byte from a gz_stream; Return EOF for end of file. */
+static int unzReadUInt8(const zlib_filefunc64_32_def *pzlib_filefunc_def, voidpf filestream, uint8_t *value)
+{
+    uint8_t c = 0;
+    if (ZREAD64(*pzlib_filefunc_def, filestream, &c, 1) == 1)
     {
-        *pi = (int)c;
+        *value = (uint8_t)c;
         return UNZ_OK;
     }
-    else
-    {
-        if (ZERROR(*pzlib_filefunc_def,filestream))
-            return UNZ_ERRNO;
-        else
-            return UNZ_EOF;
-    }
+    *value = 0;
+    if (ZERROR64(*pzlib_filefunc_def, filestream))
+        return UNZ_ERRNO;
+    return UNZ_EOF;
 }
 
-
-/* ===========================================================================
-   Reads a long in LSB order from the given gz_stream. Sets
-*/
-local int unzlocal_getShort OF((
-    const zlib_filefunc_def* pzlib_filefunc_def,
-    voidpf filestream,
-    uLong *pX));
-
-local int unzlocal_getShort (pzlib_filefunc_def,filestream,pX)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
-    uLong *pX;
+static int unzReadUInt16(const zlib_filefunc64_32_def *pzlib_filefunc_def, voidpf filestream, uint16_t *value)
 {
-    uLong x ;
-    int i = 0;
-    int err;
+    uint16_t x;
+    uint8_t c = 0;
+    int err = UNZ_OK;
 
-    err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
-    x = (uLong)i;
+    err = unzReadUInt8(pzlib_filefunc_def, filestream, &c);
+    x = (uint16_t)c;
+    if (err == UNZ_OK)
+        err = unzReadUInt8(pzlib_filefunc_def, filestream, &c);
+    x |= ((uint16_t)c) << 8;
 
-    if (err==UNZ_OK)
-        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<8;
-
-    if (err==UNZ_OK)
-        *pX = x;
+    if (err == UNZ_OK)
+        *value = x;
     else
-        *pX = 0;
+        *value = 0;
     return err;
 }
 
-local int unzlocal_getLong OF((
-    const zlib_filefunc_def* pzlib_filefunc_def,
-    voidpf filestream,
-    uLong *pX));
-
-local int unzlocal_getLong (pzlib_filefunc_def,filestream,pX)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
-    uLong *pX;
+static int unzReadUInt32(const zlib_filefunc64_32_def *pzlib_filefunc_def, voidpf filestream, uint32_t *value)
 {
-    uLong x ;
-    int i = 0;
-    int err;
+    uint32_t x = 0;
+    uint8_t c = 0;
+    int err = UNZ_OK;
 
-    err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
-    x = (uLong)i;
+    err = unzReadUInt8(pzlib_filefunc_def, filestream, &c);
+    x = (uint32_t)c;
+    if (err == UNZ_OK)
+        err = unzReadUInt8(pzlib_filefunc_def, filestream, &c);
+    x |= ((uint32_t)c) << 8;
+    if (err == UNZ_OK)
+        err = unzReadUInt8(pzlib_filefunc_def, filestream, &c);
+    x |= ((uint32_t)c) << 16;
+    if (err == UNZ_OK)
+        err = unzReadUInt8(pzlib_filefunc_def, filestream, &c);
+    x += ((uint32_t)c) << 24;
 
-    if (err==UNZ_OK)
-        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<8;
-
-    if (err==UNZ_OK)
-        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<16;
-
-    if (err==UNZ_OK)
-        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<24;
-
-    if (err==UNZ_OK)
-        *pX = x;
+    if (err == UNZ_OK)
+        *value = x;
     else
-        *pX = 0;
+        *value = 0;
     return err;
 }
 
-
-/* My own strcmpi / strcasecmp */
-local int strcmpcasenosensitive_internal (fileName1,fileName2)
-    const char* fileName1;
-    const char* fileName2;
+static int unzReadUInt64(const zlib_filefunc64_32_def *pzlib_filefunc_def, voidpf filestream, uint64_t *value)
 {
-    for (;;)
-    {
-        char c1=*(fileName1++);
-        char c2=*(fileName2++);
-        if ((c1>='a') && (c1<='z'))
-            c1 -= 0x20;
-        if ((c2>='a') && (c2<='z'))
-            c2 -= 0x20;
-        if (c1=='\0')
-            return ((c2=='\0') ? 0 : -1);
-        if (c2=='\0')
-            return 1;
-        if (c1<c2)
-            return -1;
-        if (c1>c2)
-            return 1;
-    }
+    uint64_t x = 0;
+    uint8_t i = 0;
+    int err = UNZ_OK;
+
+    err = unzReadUInt8(pzlib_filefunc_def, filestream, &i);
+    x = (uint64_t)i;
+    if (err == UNZ_OK)
+        err = unzReadUInt8(pzlib_filefunc_def, filestream, &i);
+    x |= ((uint64_t)i) << 8;
+    if (err == UNZ_OK)
+        err = unzReadUInt8(pzlib_filefunc_def, filestream, &i);
+    x |= ((uint64_t)i) << 16;
+    if (err == UNZ_OK)
+        err = unzReadUInt8(pzlib_filefunc_def, filestream, &i);
+    x |= ((uint64_t)i) << 24;
+    if (err == UNZ_OK)
+        err = unzReadUInt8(pzlib_filefunc_def, filestream, &i);
+    x |= ((uint64_t)i) << 32;
+    if (err == UNZ_OK)
+        err = unzReadUInt8(pzlib_filefunc_def, filestream, &i);
+    x |= ((uint64_t)i) << 40;
+    if (err == UNZ_OK)
+        err = unzReadUInt8(pzlib_filefunc_def, filestream, &i);
+    x |= ((uint64_t)i) << 48;
+    if (err == UNZ_OK)
+        err = unzReadUInt8(pzlib_filefunc_def, filestream, &i);
+    x |= ((uint64_t)i) << 56;
+
+    if (err == UNZ_OK)
+        *value = x;
+    else
+        *value = 0;
+    return err;
 }
 
-
-#ifdef  CASESENSITIVITYDEFAULT_NO
-#define CASESENSITIVITYDEFAULTVALUE 2
-#else
-#define CASESENSITIVITYDEFAULTVALUE 1
-#endif
-
-#ifndef STRCMPCASENOSENTIVEFUNCTION
-#define STRCMPCASENOSENTIVEFUNCTION strcmpcasenosensitive_internal
-#endif
-
-/*
-   Compare two filename (fileName1,fileName2).
-   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
-   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
-                                                                or strcasecmp)
-   If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
-        (like 1 on Unix, 2 on Windows)
-
-*/
-extern int ZEXPORT unzStringFileNameCompare (fileName1,fileName2,iCaseSensitivity)
-    const char* fileName1;
-    const char* fileName2;
-    int iCaseSensitivity;
+/* Locate the Central directory of a zip file (at the end, just before the global comment) */
+static uint64_t unzSearchCentralDir(const zlib_filefunc64_32_def *pzlib_filefunc_def, voidpf filestream)
 {
-    if (iCaseSensitivity==0)
-        iCaseSensitivity=CASESENSITIVITYDEFAULTVALUE;
+    uint8_t buf[BUFREADCOMMENT + 4];
+    uint64_t file_size = 0;
+    uint64_t back_read = 4;
+    uint64_t max_back = UINT16_MAX; /* maximum size of global comment */
+    uint64_t pos_found = 0;
+    uint32_t read_size = 0;
+    uint64_t read_pos = 0;
+    uint32_t i = 0;
 
-    if (iCaseSensitivity==1)
-        return strcmp(fileName1,fileName2);
-
-    return STRCMPCASENOSENTIVEFUNCTION(fileName1,fileName2);
-}
-
-#ifndef BUFREADCOMMENT
-#define BUFREADCOMMENT (0x400)
-#endif
-
-/*
-  Locate the Central directory of a zipfile (at the end, just before
-    the global comment)
-*/
-local uLong unzlocal_SearchCentralDir OF((
-    const zlib_filefunc_def* pzlib_filefunc_def,
-    voidpf filestream));
-
-local uLong unzlocal_SearchCentralDir(pzlib_filefunc_def,filestream)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
-{
-    unsigned char* buf;
-    uLong uSizeFile;
-    uLong uBackRead;
-    uLong uMaxBack=0xffff; /* maximum size of global comment */
-    uLong uPosFound=0;
-
-    if (ZSEEK(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
+    if (ZSEEK64(*pzlib_filefunc_def, filestream, 0, ZLIB_FILEFUNC_SEEK_END) != 0)
         return 0;
 
+    file_size = ZTELL64(*pzlib_filefunc_def, filestream);
 
-    uSizeFile = ZTELL(*pzlib_filefunc_def,filestream);
+    if (max_back > file_size)
+        max_back = file_size;
 
-    if (uMaxBack>uSizeFile)
-        uMaxBack = uSizeFile;
-
-    buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
-    if (buf==NULL)
-        return 0;
-
-    uBackRead = 4;
-    while (uBackRead<uMaxBack)
+    while (back_read < max_back)
     {
-        uLong uReadSize,uReadPos ;
-        int i;
-        if (uBackRead+BUFREADCOMMENT>uMaxBack)
-            uBackRead = uMaxBack;
+        if (back_read + BUFREADCOMMENT > max_back)
+            back_read = max_back;
         else
-            uBackRead+=BUFREADCOMMENT;
-        uReadPos = uSizeFile-uBackRead ;
+            back_read += BUFREADCOMMENT;
 
-        uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
-                     (BUFREADCOMMENT+4) : (uSizeFile-uReadPos);
-        if (ZSEEK(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+        read_pos = file_size - back_read;
+        read_size = ((BUFREADCOMMENT + 4) < (file_size - read_pos)) ?
+                     (BUFREADCOMMENT + 4) : (uint32_t)(file_size - read_pos);
+
+        if (ZSEEK64(*pzlib_filefunc_def, filestream, read_pos, ZLIB_FILEFUNC_SEEK_SET) != 0)
+            break;
+        if (ZREAD64(*pzlib_filefunc_def, filestream, buf, read_size) != read_size)
             break;
 
-        if (ZREAD(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
-            break;
-
-        for (i=(int)uReadSize-3; (i--)>0;)
-            if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
-                ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
+        for (i = read_size - 3; (i--) > 0;)
+            if (((*(buf+i)) == (ENDHEADERMAGIC & 0xff)) &&
+                ((*(buf+i+1)) == (ENDHEADERMAGIC >> 8 & 0xff)) &&
+                ((*(buf+i+2)) == (ENDHEADERMAGIC >> 16 & 0xff)) &&
+                ((*(buf+i+3)) == (ENDHEADERMAGIC >> 24 & 0xff)))
             {
-                uPosFound = uReadPos+i;
+                pos_found = read_pos+i;
                 break;
             }
 
-        if (uPosFound!=0)
+        if (pos_found != 0)
             break;
     }
-    TRYFREE(buf);
-    return uPosFound;
+
+    return pos_found;
 }
 
-/*
-  Open a Zip file. path contain the full pathname (by example,
-     on a Windows NT computer "c:\\test\\zlib114.zip" or on an Unix computer
-     "zlib/zlib114.zip".
-     If the zipfile cannot be opened (file doesn't exist or in not valid), the
-       return value is NULL.
-     Else, the return value is a unzFile Handle, usable with other function
-       of this unzip package.
-*/
-extern unzFile ZEXPORT unzOpen2 (path, pzlib_filefunc_def)
-    const char *path;
-    zlib_filefunc_def* pzlib_filefunc_def;
+/* Locate the Central directory 64 of a zipfile (at the end, just before the global comment) */
+static uint64_t unzSearchCentralDir64(const zlib_filefunc64_32_def *pzlib_filefunc_def, voidpf filestream,
+    const uint64_t endcentraloffset)
 {
-    unz_s us;
-    unz_s *s;
-    uLong central_pos,uL;
+    uint64_t offset = 0;
+    uint32_t value32 = 0;
 
-    uLong number_disk;          /* number of the current dist, used for
-                                   spaning ZIP, unsupported, always 0*/
-    uLong number_disk_with_CD;  /* number the the disk with central dir, used
-                                   for spaning ZIP, unsupported, always 0*/
-    uLong number_entry_CD;      /* total number of entries in
-                                   the central dir
-                                   (same than number_entry on nospan) */
+    /* Zip64 end of central directory locator */
+    if (ZSEEK64(*pzlib_filefunc_def, filestream, endcentraloffset - SIZECENTRALHEADERLOCATOR, ZLIB_FILEFUNC_SEEK_SET) != 0)
+        return 0;
 
-    int err=UNZ_OK;
+    /* Read locator signature */
+    if (unzReadUInt32(pzlib_filefunc_def, filestream, &value32) != UNZ_OK)
+        return 0;
+    if (value32 != ZIP64ENDLOCHEADERMAGIC)
+        return 0;
+    /* Number of the disk with the start of the zip64 end of  central directory */
+    if (unzReadUInt32(pzlib_filefunc_def, filestream, &value32) != UNZ_OK)
+        return 0;
+    /* Relative offset of the zip64 end of central directory record */
+    if (unzReadUInt64(pzlib_filefunc_def, filestream, &offset) != UNZ_OK)
+        return 0;
+    /* Total number of disks */
+    if (unzReadUInt32(pzlib_filefunc_def, filestream, &value32) != UNZ_OK)
+        return 0;
+    /* Goto end of central directory record */
+    if (ZSEEK64(*pzlib_filefunc_def, filestream, offset, ZLIB_FILEFUNC_SEEK_SET) != 0)
+        return 0;
+     /* The signature */
+    if (unzReadUInt32(pzlib_filefunc_def, filestream, &value32) != UNZ_OK)
+        return 0;
+    if (value32 != ZIP64ENDHEADERMAGIC)
+        return 0;
 
-    if (unz_copyright[0]!=' ')
+    return offset;
+}
+
+static unzFile unzOpenInternal(const void *path, zlib_filefunc64_32_def *pzlib_filefunc64_32_def)
+{
+    unz64_s us;
+    unz64_s *s = NULL;
+    uint64_t central_pos = 0;
+    uint64_t central_pos64 = 0;
+    uint64_t number_entry_CD = 0;
+    uint16_t value16 = 0;
+    uint32_t value32 = 0;
+    uint64_t value64 = 0;
+    voidpf filestream = NULL;
+    int err = UNZ_OK;
+
+    if (unz_copyright[0] != ' ')
         return NULL;
 
-    if (pzlib_filefunc_def==NULL)
-        fill_fopen_filefunc(&us.z_filefunc);
+    us.filestream = NULL;
+    us.filestream_with_CD = NULL;
+    us.z_filefunc.zseek32_file = NULL;
+    us.z_filefunc.ztell32_file = NULL;
+
+    if (pzlib_filefunc64_32_def == NULL)
+        fill_fopen64_filefunc(&us.z_filefunc.zfile_func64);
     else
-        us.z_filefunc = *pzlib_filefunc_def;
+        us.z_filefunc = *pzlib_filefunc64_32_def;
 
-    us.filestream= (*(us.z_filefunc.zopen_file))(us.z_filefunc.opaque,
-                                                 path,
-                                                 ZLIB_FILEFUNC_MODE_READ |
-                                                 ZLIB_FILEFUNC_MODE_EXISTING);
-    if (us.filestream==NULL)
+    us.filestream = ZOPEN64(us.z_filefunc, path, ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_EXISTING);
+
+    if (us.filestream == NULL)
         return NULL;
 
-    central_pos = unzlocal_SearchCentralDir(&us.z_filefunc,us.filestream);
-    if (central_pos==0)
-        err=UNZ_ERRNO;
+    us.filestream_with_CD = us.filestream;
+    us.is_zip64 = 0;
 
-    if (ZSEEK(us.z_filefunc, us.filestream,
-                                      central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
-        err=UNZ_ERRNO;
-
-    /* the signature, already checked */
-    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
-        err=UNZ_ERRNO;
-
-    /* number of this disk */
-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_disk)!=UNZ_OK)
-        err=UNZ_ERRNO;
-
-    /* number of the disk with the start of the central directory */
-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_disk_with_CD)!=UNZ_OK)
-        err=UNZ_ERRNO;
-
-    /* total number of entries in the central dir on this disk */
-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&us.gi.number_entry)!=UNZ_OK)
-        err=UNZ_ERRNO;
-
-    /* total number of entries in the central dir */
-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_entry_CD)!=UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if ((number_entry_CD!=us.gi.number_entry) ||
-        (number_disk_with_CD!=0) ||
-        (number_disk!=0))
-        err=UNZ_BADZIPFILE;
-
-    /* size of the central directory */
-    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&us.size_central_dir)!=UNZ_OK)
-        err=UNZ_ERRNO;
-
-    /* offset of start of central directory with respect to the
-          starting disk number */
-    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&us.offset_central_dir)!=UNZ_OK)
-        err=UNZ_ERRNO;
-
-    /* zipfile comment length */
-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&us.gi.size_comment)!=UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if ((central_pos<us.offset_central_dir+us.size_central_dir) &&
-        (err==UNZ_OK))
-        err=UNZ_BADZIPFILE;
-
-    if (err!=UNZ_OK)
+    /* Search for end of central directory header */
+    central_pos = unzSearchCentralDir(&us.z_filefunc, us.filestream);
+    if (central_pos)
     {
-        ZCLOSE(us.z_filefunc, us.filestream);
+        if (ZSEEK64(us.z_filefunc, us.filestream, central_pos, ZLIB_FILEFUNC_SEEK_SET) != 0)
+            err = UNZ_ERRNO;
+
+        /* The signature, already checked */
+        if (unzReadUInt32(&us.z_filefunc, us.filestream, &value32) != UNZ_OK)
+            err = UNZ_ERRNO;
+        /* Number of this disk */
+        if (unzReadUInt16(&us.z_filefunc, us.filestream, &value16) != UNZ_OK)
+            err = UNZ_ERRNO;
+        us.number_disk = value16;
+        /* Number of the disk with the start of the central directory */
+        if (unzReadUInt16(&us.z_filefunc, us.filestream, &value16) != UNZ_OK)
+            err = UNZ_ERRNO;
+        us.gi.number_disk_with_CD = value16;
+        /* Total number of entries in the central directory on this disk */
+        if (unzReadUInt16(&us.z_filefunc, us.filestream, &value16) != UNZ_OK)
+            err = UNZ_ERRNO;
+        us.gi.number_entry = value16;
+        /* Total number of entries in the central directory */
+        if (unzReadUInt16(&us.z_filefunc, us.filestream, &value16) != UNZ_OK)
+            err = UNZ_ERRNO;
+        number_entry_CD = value16;
+        if (number_entry_CD != us.gi.number_entry)
+            err = UNZ_BADZIPFILE;
+        /* Size of the central directory */
+        if (unzReadUInt32(&us.z_filefunc, us.filestream, &value32) != UNZ_OK)
+            err = UNZ_ERRNO;
+        us.size_central_dir = value32;
+        /* Offset of start of central directory with respect to the starting disk number */
+        if (unzReadUInt32(&us.z_filefunc, us.filestream, &value32) != UNZ_OK)
+            err = UNZ_ERRNO;
+        us.offset_central_dir = value32;
+        /* Zipfile comment length */
+        if (unzReadUInt16(&us.z_filefunc, us.filestream, &us.gi.size_comment) != UNZ_OK)
+            err = UNZ_ERRNO;
+
+        if (err == UNZ_OK)
+        {
+            /* Search for Zip64 end of central directory header */
+            central_pos64 = unzSearchCentralDir64(&us.z_filefunc, us.filestream, central_pos);
+            if (central_pos64)
+            {
+                central_pos = central_pos64;
+                us.is_zip64 = 1;
+
+                if (ZSEEK64(us.z_filefunc, us.filestream, central_pos, ZLIB_FILEFUNC_SEEK_SET) != 0)
+                    err = UNZ_ERRNO;
+
+                /* the signature, already checked */
+                if (unzReadUInt32(&us.z_filefunc, us.filestream, &value32) != UNZ_OK)
+                    err = UNZ_ERRNO;
+                /* size of zip64 end of central directory record */
+                if (unzReadUInt64(&us.z_filefunc, us.filestream, &value64) != UNZ_OK)
+                    err = UNZ_ERRNO;
+                /* version made by */
+                if (unzReadUInt16(&us.z_filefunc, us.filestream, &value16) != UNZ_OK)
+                    err = UNZ_ERRNO;
+                /* version needed to extract */
+                if (unzReadUInt16(&us.z_filefunc, us.filestream, &value16) != UNZ_OK)
+                    err = UNZ_ERRNO;
+                /* number of this disk */
+                if (unzReadUInt32(&us.z_filefunc, us.filestream, &us.number_disk) != UNZ_OK)
+                    err = UNZ_ERRNO;
+                /* number of the disk with the start of the central directory */
+                if (unzReadUInt32(&us.z_filefunc, us.filestream, &us.gi.number_disk_with_CD) != UNZ_OK)
+                    err = UNZ_ERRNO;
+                /* total number of entries in the central directory on this disk */
+                if (unzReadUInt64(&us.z_filefunc, us.filestream, &us.gi.number_entry) != UNZ_OK)
+                    err = UNZ_ERRNO;
+                /* total number of entries in the central directory */
+                if (unzReadUInt64(&us.z_filefunc, us.filestream, &number_entry_CD) != UNZ_OK)
+                    err = UNZ_ERRNO;
+                if (number_entry_CD != us.gi.number_entry)
+                    err = UNZ_BADZIPFILE;
+                /* size of the central directory */
+                if (unzReadUInt64(&us.z_filefunc, us.filestream, &us.size_central_dir) != UNZ_OK)
+                    err = UNZ_ERRNO;
+                /* offset of start of central directory with respect to the starting disk number */
+                if (unzReadUInt64(&us.z_filefunc, us.filestream, &us.offset_central_dir) != UNZ_OK)
+                    err = UNZ_ERRNO;
+            }
+            else if ((us.gi.number_entry == UINT16_MAX) || (us.size_central_dir == UINT16_MAX) || (us.offset_central_dir == UINT32_MAX))
+                err = UNZ_BADZIPFILE;
+        }
+    }
+    else
+        err = UNZ_ERRNO;
+
+    if ((err == UNZ_OK) && (central_pos < us.offset_central_dir + us.size_central_dir))
+        err = UNZ_BADZIPFILE;
+
+    if (err != UNZ_OK)
+    {
+        ZCLOSE64(us.z_filefunc, us.filestream);
         return NULL;
     }
 
-    us.byte_before_the_zipfile = central_pos -
-                            (us.offset_central_dir+us.size_central_dir);
+    if (us.gi.number_disk_with_CD == 0)
+    {
+        /* If there is only one disk open another stream so we don't have to seek between the CD
+           and the file headers constantly */
+        filestream = ZOPEN64(us.z_filefunc, path, ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_EXISTING);
+        if (filestream != NULL)
+            us.filestream = filestream;
+    }
+
+    /* Hack for zip files that have no respect for zip64
+    if ((central_pos > 0xffffffff) && (us.offset_central_dir < 0xffffffff))
+        us.offset_central_dir = central_pos - us.size_central_dir;*/
+
+    us.byte_before_the_zipfile = central_pos - (us.offset_central_dir + us.size_central_dir);
     us.central_pos = central_pos;
     us.pfile_in_zip_read = NULL;
-    us.encrypted = 0;
 
-
-    s=(unz_s*)ALLOC(sizeof(unz_s));
-    *s=us;
-    unzGoToFirstFile((unzFile)s);
+    s = (unz64_s*)ALLOC(sizeof(unz64_s));
+    if (s != NULL)
+    {
+        *s = us;
+        unzGoToFirstFile((unzFile)s);
+    }
     return (unzFile)s;
 }
 
-
-extern unzFile ZEXPORT unzOpen (path)
-    const char *path;
+extern unzFile ZEXPORT unzOpen2(const char *path, zlib_filefunc_def *pzlib_filefunc32_def)
 {
-    return unzOpen2(path, NULL);
+    if (pzlib_filefunc32_def != NULL)
+    {
+        zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
+        fill_zlib_filefunc64_32_def_from_filefunc32(&zlib_filefunc64_32_def_fill, pzlib_filefunc32_def);
+        return unzOpenInternal(path, &zlib_filefunc64_32_def_fill);
+    }
+    return unzOpenInternal(path, NULL);
 }
 
-/*
-  Close a ZipFile opened with unzipOpen.
-  If there is files inside the .Zip opened with unzipOpenCurrentFile (see later),
-    these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
-  return UNZ_OK if there is no problem. */
-extern int ZEXPORT unzClose (file)
-    unzFile file;
+extern unzFile ZEXPORT unzOpen2_64(const void *path, zlib_filefunc64_def *pzlib_filefunc_def)
 {
-    unz_s* s;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
+    if (pzlib_filefunc_def != NULL)
+    {
+        zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
+        zlib_filefunc64_32_def_fill.zfile_func64 = *pzlib_filefunc_def;
+        zlib_filefunc64_32_def_fill.ztell32_file = NULL;
+        zlib_filefunc64_32_def_fill.zseek32_file = NULL;
+        return unzOpenInternal(path, &zlib_filefunc64_32_def_fill);
+    }
+    return unzOpenInternal(path, NULL);
+}
 
-    if (s->pfile_in_zip_read!=NULL)
+extern unzFile ZEXPORT unzOpen(const char *path)
+{
+    return unzOpenInternal(path, NULL);
+}
+
+extern unzFile ZEXPORT unzOpen64(const void *path)
+{
+    return unzOpenInternal(path, NULL);
+}
+
+extern int ZEXPORT unzClose(unzFile file)
+{
+    unz64_s *s;
+    if (file == NULL)
+        return UNZ_PARAMERROR;
+    s = (unz64_s*)file;
+
+    if (s->pfile_in_zip_read != NULL)
         unzCloseCurrentFile(file);
 
-    ZCLOSE(s->z_filefunc, s->filestream);
+    if ((s->filestream != NULL) && (s->filestream != s->filestream_with_CD))
+        ZCLOSE64(s->z_filefunc, s->filestream);
+    if (s->filestream_with_CD != NULL)
+        ZCLOSE64(s->z_filefunc, s->filestream_with_CD);
+
+    s->filestream = NULL;
+    s->filestream_with_CD = NULL;
     TRYFREE(s);
     return UNZ_OK;
 }
 
-
-/*
-  Write info about the ZipFile in the *pglobal_info structure.
-  No preparation of the structure is needed
-  return UNZ_OK if there is no problem. */
-extern int ZEXPORT unzGetGlobalInfo (file,pglobal_info)
-    unzFile file;
-    unz_global_info *pglobal_info;
+/* Goto to the next available disk for spanned archives */
+static int unzGoToNextDisk(unzFile file)
 {
-    unz_s* s;
-    if (file==NULL)
+    unz64_s *s;
+    uint32_t number_disk_next = 0;
+
+    s = (unz64_s*)file;
+    if (s == NULL)
         return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    *pglobal_info=s->gi;
-    return UNZ_OK;
-}
+    number_disk_next = s->number_disk;
 
-
-/*
-   Translate date/time from Dos format to tm_unz (readable more easilty)
-*/
-local void unzlocal_DosDateToTmuDate (ulDosDate, ptm)
-    uLong ulDosDate;
-    tm_unz* ptm;
-{
-    uLong uDate;
-    uDate = (uLong)(ulDosDate>>16);
-    ptm->tm_mday = (uInt)(uDate&0x1f) ;
-    ptm->tm_mon =  (uInt)((((uDate)&0x1E0)/0x20)-1) ;
-    ptm->tm_year = (uInt)(((uDate&0x0FE00)/0x0200)+1980) ;
-
-    ptm->tm_hour = (uInt) ((ulDosDate &0xF800)/0x800);
-    ptm->tm_min =  (uInt) ((ulDosDate&0x7E0)/0x20) ;
-    ptm->tm_sec =  (uInt) (2*(ulDosDate&0x1f)) ;
-}
-
-/*
-  Get Info about the current file in the zipfile, with internal only info
-*/
-local int unzlocal_GetCurrentFileInfoInternal OF((unzFile file,
-                                                  unz_file_info *pfile_info,
-                                                  unz_file_info_internal
-                                                  *pfile_info_internal,
-                                                  char *szFileName,
-                                                  uLong fileNameBufferSize,
-                                                  void *extraField,
-                                                  uLong extraFieldBufferSize,
-                                                  char *szComment,
-                                                  uLong commentBufferSize));
-
-local int unzlocal_GetCurrentFileInfoInternal (file,
-                                              pfile_info,
-                                              pfile_info_internal,
-                                              szFileName, fileNameBufferSize,
-                                              extraField, extraFieldBufferSize,
-                                              szComment,  commentBufferSize)
-    unzFile file;
-    unz_file_info *pfile_info;
-    unz_file_info_internal *pfile_info_internal;
-    char *szFileName;
-    uLong fileNameBufferSize;
-    void *extraField;
-    uLong extraFieldBufferSize;
-    char *szComment;
-    uLong commentBufferSize;
-{
-    unz_s* s;
-    unz_file_info file_info;
-    unz_file_info_internal file_info_internal;
-    int err=UNZ_OK;
-    uLong uMagic;
-    long lSeek=0;
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    if (ZSEEK(s->z_filefunc, s->filestream,
-              s->pos_in_central_dir+s->byte_before_the_zipfile,
-              ZLIB_FILEFUNC_SEEK_SET)!=0)
-        err=UNZ_ERRNO;
-
-
-    /* we check the magic */
-    if (err==UNZ_OK)
-    {
-        if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
-        {
-            err=UNZ_ERRNO;
-        }
-        else if (uMagic!=0x02014b50)
-        {
-            err=UNZ_BADZIPFILE;
-        }
-    }
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version_needed) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.flag) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.compression_method) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.dosDate) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    unzlocal_DosDateToTmuDate(file_info.dosDate,&file_info.tmu_date);
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.crc) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_filename) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_extra) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_comment) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.disk_num_start) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.internal_fa) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.external_fa) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    lSeek+=file_info.size_filename;
-    if ((err==UNZ_OK) && (szFileName!=NULL))
-    {
-        uLong uSizeRead ;
-        if (file_info.size_filename<fileNameBufferSize)
-        {
-            *(szFileName+file_info.size_filename)='\0';
-            uSizeRead = file_info.size_filename;
-        }
-        else
-            uSizeRead = fileNameBufferSize;
-
-        if ((file_info.size_filename>0) && (fileNameBufferSize>0))
-            if (ZREAD(s->z_filefunc, s->filestream,szFileName,uSizeRead)!=uSizeRead)
-                err=UNZ_ERRNO;
-        lSeek -= uSizeRead;
-    }
-
-
-    if ((err==UNZ_OK) && (extraField!=NULL))
-    {
-        uLong uSizeRead ;
-        if (file_info.size_file_extra<extraFieldBufferSize)
-            uSizeRead = file_info.size_file_extra;
-        else
-            uSizeRead = extraFieldBufferSize;
-
-        if (lSeek!=0)
-        {
-            if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
-                lSeek=0;
-            else
-                err=UNZ_ERRNO;
-        }
-        if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0))
-            if (ZREAD(s->z_filefunc, s->filestream,extraField,uSizeRead)!=uSizeRead)
-                err=UNZ_ERRNO;
-        lSeek += file_info.size_file_extra - uSizeRead;
-    }
+    if ((s->pfile_in_zip_read != NULL) && (s->pfile_in_zip_read->rest_read_uncompressed > 0))
+        /* We are currently reading a file and we need the next sequential disk */
+        number_disk_next += 1;
     else
-    {
-        lSeek+=file_info.size_file_extra;
-    }
+        /* Goto the disk for the current file */
+        number_disk_next = s->cur_file_info.disk_num_start;
 
-    if ((err==UNZ_OK) && (szComment!=NULL))
+    if (number_disk_next != s->number_disk)
     {
-        uLong uSizeRead ;
-        if (file_info.size_file_comment<commentBufferSize)
+        /* Switch disks */
+        if ((s->filestream != NULL) && (s->filestream != s->filestream_with_CD))
+            ZCLOSE64(s->z_filefunc, s->filestream);
+
+        if (number_disk_next == s->gi.number_disk_with_CD)
         {
-            *(szComment+file_info.size_file_comment)='\0';
-            uSizeRead = file_info.size_file_comment;
+            s->filestream = s->filestream_with_CD;
         }
         else
         {
-            uSizeRead = commentBufferSize;
+            s->filestream = ZOPENDISK64(s->z_filefunc, s->filestream_with_CD, number_disk_next,
+                ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_EXISTING);
         }
 
-        if (lSeek!=0)
-        {
-            if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)!=0)
-                err=UNZ_ERRNO;
-        }
-        if ((file_info.size_file_comment>0) && (commentBufferSize>0))
-            if (ZREAD(s->z_filefunc, s->filestream,szComment,uSizeRead)!=uSizeRead)
-                err=UNZ_ERRNO;
+        if (s->filestream == NULL)
+            return UNZ_ERRNO;
+
+        s->number_disk = number_disk_next;
     }
-    else
-    {
-    }
-
-    if ((err==UNZ_OK) && (pfile_info!=NULL))
-        *pfile_info=file_info;
-
-    if ((err==UNZ_OK) && (pfile_info_internal!=NULL))
-        *pfile_info_internal=file_info_internal;
-
-    return err;
-}
-
-
-
-/*
-  Write info about the ZipFile in the *pglobal_info structure.
-  No preparation of the structure is needed
-  return UNZ_OK if there is no problem.
-*/
-extern int ZEXPORT unzGetCurrentFileInfo (file,
-                                          pfile_info,
-                                          szFileName, fileNameBufferSize,
-                                          extraField, extraFieldBufferSize,
-                                          szComment,  commentBufferSize)
-    unzFile file;
-    unz_file_info *pfile_info;
-    char *szFileName;
-    uLong fileNameBufferSize;
-    void *extraField;
-    uLong extraFieldBufferSize;
-    char *szComment;
-    uLong commentBufferSize;
-{
-    return unzlocal_GetCurrentFileInfoInternal(file,pfile_info,NULL,
-                                                szFileName,fileNameBufferSize,
-                                                extraField,extraFieldBufferSize,
-                                                szComment,commentBufferSize);
-}
-
-/*
-  Set the current file of the zipfile to the first file.
-  return UNZ_OK if there is no problem
-*/
-extern int ZEXPORT unzGoToFirstFile (file)
-    unzFile file;
-{
-    int err=UNZ_OK;
-    unz_s* s;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    s->pos_in_central_dir=s->offset_central_dir;
-    s->num_file=0;
-    err=unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
-                                             &s->cur_file_info_internal,
-                                             NULL,0,NULL,0,NULL,0);
-    s->current_file_ok = (err == UNZ_OK);
-    return err;
-}
-
-/*
-  Set the current file of the zipfile to the next file.
-  return UNZ_OK if there is no problem
-  return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
-*/
-extern int ZEXPORT unzGoToNextFile (file)
-    unzFile file;
-{
-    unz_s* s;
-    int err;
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    if (!s->current_file_ok)
-        return UNZ_END_OF_LIST_OF_FILE;
-    if (s->gi.number_entry != 0xffff)    /* 2^16 files overflow hack */
-      if (s->num_file+1==s->gi.number_entry)
-        return UNZ_END_OF_LIST_OF_FILE;
-
-    s->pos_in_central_dir += SIZECENTRALDIRITEM + s->cur_file_info.size_filename +
-            s->cur_file_info.size_file_extra + s->cur_file_info.size_file_comment ;
-    s->num_file++;
-    err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
-                                               &s->cur_file_info_internal,
-                                               NULL,0,NULL,0,NULL,0);
-    s->current_file_ok = (err == UNZ_OK);
-    return err;
-}
-
-
-/*
-  Try locate the file szFileName in the zipfile.
-  For the iCaseSensitivity signification, see unzipStringFileNameCompare
-
-  return value :
-  UNZ_OK if the file is found. It becomes the current file.
-  UNZ_END_OF_LIST_OF_FILE if the file is not found
-*/
-extern int ZEXPORT unzLocateFile (file, szFileName, iCaseSensitivity)
-    unzFile file;
-    const char *szFileName;
-    int iCaseSensitivity;
-{
-    unz_s* s;
-    int err;
-
-    /* We remember the 'current' position in the file so that we can jump
-     * back there if we fail.
-     */
-    unz_file_info cur_file_infoSaved;
-    unz_file_info_internal cur_file_info_internalSaved;
-    uLong num_fileSaved;
-    uLong pos_in_central_dirSaved;
-
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-
-    if (strlen(szFileName)>=UNZ_MAXFILENAMEINZIP)
-        return UNZ_PARAMERROR;
-
-    s=(unz_s*)file;
-    if (!s->current_file_ok)
-        return UNZ_END_OF_LIST_OF_FILE;
-
-    /* Save the current state */
-    num_fileSaved = s->num_file;
-    pos_in_central_dirSaved = s->pos_in_central_dir;
-    cur_file_infoSaved = s->cur_file_info;
-    cur_file_info_internalSaved = s->cur_file_info_internal;
-
-    err = unzGoToFirstFile(file);
-
-    while (err == UNZ_OK)
-    {
-        char szCurrentFileName[UNZ_MAXFILENAMEINZIP+1];
-        err = unzGetCurrentFileInfo(file,NULL,
-                                    szCurrentFileName,sizeof(szCurrentFileName)-1,
-                                    NULL,0,NULL,0);
-        if (err == UNZ_OK)
-        {
-            if (unzStringFileNameCompare(szCurrentFileName,
-                                            szFileName,iCaseSensitivity)==0)
-                return UNZ_OK;
-            err = unzGoToNextFile(file);
-        }
-    }
-
-    /* We failed, so restore the state of the 'current file' to where we
-     * were.
-     */
-    s->num_file = num_fileSaved ;
-    s->pos_in_central_dir = pos_in_central_dirSaved ;
-    s->cur_file_info = cur_file_infoSaved;
-    s->cur_file_info_internal = cur_file_info_internalSaved;
-    return err;
-}
-
-
-/*
-///////////////////////////////////////////
-// Contributed by Ryan Haksi (mailto://cryogen@infoserve.net)
-// I need random access
-//
-// Further optimization could be realized by adding an ability
-// to cache the directory in memory. The goal being a single
-// comprehensive file read to put the file I need in a memory.
-*/
-
-/*
-typedef struct unz_file_pos_s
-{
-    uLong pos_in_zip_directory;   // offset in file
-    uLong num_of_file;            // # of file
-} unz_file_pos;
-*/
-
-extern int ZEXPORT unzGetFilePos(file, file_pos)
-    unzFile file;
-    unz_file_pos* file_pos;
-{
-    unz_s* s;
-
-    if (file==NULL || file_pos==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    if (!s->current_file_ok)
-        return UNZ_END_OF_LIST_OF_FILE;
-
-    file_pos->pos_in_zip_directory  = s->pos_in_central_dir;
-    file_pos->num_of_file           = s->num_file;
 
     return UNZ_OK;
 }
 
-extern int ZEXPORT unzGoToFilePos(file, file_pos)
-    unzFile file;
-    unz_file_pos* file_pos;
+extern int ZEXPORT unzGetGlobalInfo(unzFile file, unz_global_info* pglobal_info32)
 {
-    unz_s* s;
-    int err;
-
-    if (file==NULL || file_pos==NULL)
+    unz64_s *s = NULL;
+    if (file == NULL)
         return UNZ_PARAMERROR;
-    s=(unz_s*)file;
+    s = (unz64_s*)file;
 
-    /* jump to the right spot */
-    s->pos_in_central_dir = file_pos->pos_in_zip_directory;
-    s->num_file           = file_pos->num_of_file;
-
-    /* set the current file */
-    err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
-                                               &s->cur_file_info_internal,
-                                               NULL,0,NULL,0,NULL,0);
-    /* return results */
-    s->current_file_ok = (err == UNZ_OK);
-    return err;
+    pglobal_info32->number_entry = (uint32_t)s->gi.number_entry;
+    pglobal_info32->size_comment = s->gi.size_comment;
+    pglobal_info32->number_disk_with_CD = s->gi.number_disk_with_CD;
+    return UNZ_OK;
 }
 
-/*
-// Unzip Helper Functions - should be here?
-///////////////////////////////////////////
-*/
-
-/*
-  Read the local header of the current zipfile
-  Check the coherency of the local header and info in the end of central
-        directory about this file
-  store in *piSizeVar the size of extra info in local header
-        (filename and size of extra field data)
-*/
-local int unzlocal_CheckCurrentFileCoherencyHeader (s,piSizeVar,
-                                                    poffset_local_extrafield,
-                                                    psize_local_extrafield)
-    unz_s* s;
-    uInt* piSizeVar;
-    uLong *poffset_local_extrafield;
-    uInt  *psize_local_extrafield;
+extern int ZEXPORT unzGetGlobalInfo64(unzFile file, unz_global_info64 *pglobal_info)
 {
-    uLong uMagic,uData,uFlags;
-    uLong size_filename;
-    uLong size_extra_field;
-    int err=UNZ_OK;
+    unz64_s *s = NULL;
+    if (file == NULL)
+        return UNZ_PARAMERROR;
+    s = (unz64_s*)file;
+    *pglobal_info = s->gi;
+    return UNZ_OK;
+}
 
-    *piSizeVar = 0;
-    *poffset_local_extrafield = 0;
-    *psize_local_extrafield = 0;
+extern int ZEXPORT unzGetGlobalComment(unzFile file, char *comment, uint16_t comment_size)
+{
+    unz64_s *s = NULL;
+    uint16_t bytes_to_read = comment_size;
+    if (file == NULL)
+        return (int)UNZ_PARAMERROR;
+    s = (unz64_s*)file;
 
-    if (ZSEEK(s->z_filefunc, s->filestream,s->cur_file_info_internal.offset_curfile +
-                                s->byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET)!=0)
+    if (bytes_to_read > s->gi.size_comment)
+        bytes_to_read = s->gi.size_comment;
+
+    if (ZSEEK64(s->z_filefunc, s->filestream_with_CD, s->central_pos + 22, ZLIB_FILEFUNC_SEEK_SET) != 0)
         return UNZ_ERRNO;
 
-
-    if (err==UNZ_OK)
+    if (bytes_to_read > 0)
     {
-        if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
-            err=UNZ_ERRNO;
-        else if (uMagic!=0x04034b50)
-            err=UNZ_BADZIPFILE;
+        *comment = 0;
+        if (ZREAD64(s->z_filefunc, s->filestream_with_CD, comment, bytes_to_read) != bytes_to_read)
+            return UNZ_ERRNO;
     }
 
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
-        err=UNZ_ERRNO;
-/*
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.wVersion))
-        err=UNZ_BADZIPFILE;
-*/
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uFlags) != UNZ_OK)
-        err=UNZ_ERRNO;
+    if ((comment != NULL) && (comment_size > s->gi.size_comment))
+        *(comment + s->gi.size_comment) = 0;
 
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
-        err=UNZ_ERRNO;
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compression_method))
-        err=UNZ_BADZIPFILE;
+    return (int)bytes_to_read;
+}
 
-    if ((err==UNZ_OK) && (s->cur_file_info.compression_method!=0) &&
-                         (s->cur_file_info.compression_method!=Z_DEFLATED))
-        err=UNZ_BADZIPFILE;
+static int unzGetCurrentFileInfoField(unzFile file, uint32_t *seek, void *field, uint16_t field_size, uint16_t size_file_field, int null_terminated_field)
+{
+    unz64_s *s = NULL;
+    uint32_t bytes_to_read = 0;
+    int err = UNZ_OK;
 
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* date/time */
-        err=UNZ_ERRNO;
+    if (file == NULL)
+        return (int)UNZ_PARAMERROR;
+    s = (unz64_s*)file;
 
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* crc */
-        err=UNZ_ERRNO;
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.crc) &&
-                              ((uFlags & 8)==0))
-        err=UNZ_BADZIPFILE;
+    /* Read field */
+    if (field != NULL)
+    {
+        if (size_file_field < field_size)
+        {
+            if (null_terminated_field)
+                *((char *)field+size_file_field) = 0;
 
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size compr */
-        err=UNZ_ERRNO;
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compressed_size) &&
-                              ((uFlags & 8)==0))
-        err=UNZ_BADZIPFILE;
+            bytes_to_read = size_file_field;
+        }
+        else
+            bytes_to_read = field_size;
+        
+        if (*seek != 0)
+        {
+            if (ZSEEK64(s->z_filefunc, s->filestream_with_CD, *seek, ZLIB_FILEFUNC_SEEK_CUR) == 0)
+                *seek = 0;
+            else
+                err = UNZ_ERRNO;
+        }
+        
+        if ((size_file_field > 0) && (field_size > 0))
+        {
+            if (ZREAD64(s->z_filefunc, s->filestream_with_CD, field, bytes_to_read) != bytes_to_read)
+                err = UNZ_ERRNO;
+        }
+        *seek += size_file_field - bytes_to_read;
+    }
+    else
+    {
+        *seek += size_file_field;
+    }
 
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size uncompr */
-        err=UNZ_ERRNO;
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.uncompressed_size) &&
-                              ((uFlags & 8)==0))
-        err=UNZ_BADZIPFILE;
+    return err;
+}
 
+/* Get info about the current file in the zipfile, with internal only info */
+static int unzGetCurrentFileInfoInternal(unzFile file, unz_file_info64 *pfile_info,
+    unz_file_info64_internal *pfile_info_internal, char *filename, uint16_t filename_size, void *extrafield,
+    uint16_t extrafield_size, char *comment, uint16_t comment_size)
+{
+    unz64_s *s = NULL;
+    unz_file_info64 file_info;
+    unz_file_info64_internal file_info_internal;
+    uint32_t magic = 0;
+    uint64_t current_pos = 0;
+    uint32_t seek = 0;
+    uint32_t extra_pos = 0;
+    uint16_t extra_header_id = 0;
+    uint16_t extra_data_size = 0;
+    uint16_t value16 = 0;
+    uint32_t value32 = 0;
+    uint64_t value64 = 0;
+    int err = UNZ_OK;
 
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_filename) != UNZ_OK)
-        err=UNZ_ERRNO;
-    else if ((err==UNZ_OK) && (size_filename!=s->cur_file_info.size_filename))
-        err=UNZ_BADZIPFILE;
+    if (file == NULL)
+        return UNZ_PARAMERROR;
+    s = (unz64_s*)file;
 
-    *piSizeVar += (uInt)size_filename;
+    if (ZSEEK64(s->z_filefunc, s->filestream_with_CD,
+            s->pos_in_central_dir + s->byte_before_the_zipfile, ZLIB_FILEFUNC_SEEK_SET) != 0)
+        err = UNZ_ERRNO;
 
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_extra_field) != UNZ_OK)
-        err=UNZ_ERRNO;
-    *poffset_local_extrafield= s->cur_file_info_internal.offset_curfile +
-                                    SIZEZIPLOCALHEADER + size_filename;
-    *psize_local_extrafield = (uInt)size_extra_field;
+    /* Check the magic */
+    if (err == UNZ_OK)
+    {
+        if (unzReadUInt32(&s->z_filefunc, s->filestream_with_CD, &magic) != UNZ_OK)
+            err = UNZ_ERRNO;
+        else if (magic != CENTRALHEADERMAGIC)
+            err = UNZ_BADZIPFILE;
+    }
 
-    *piSizeVar += (uInt)size_extra_field;
+    /* Read central directory header */
+    if (unzReadUInt16(&s->z_filefunc, s->filestream_with_CD, &file_info.version) != UNZ_OK)
+        err = UNZ_ERRNO;
+    if (unzReadUInt16(&s->z_filefunc, s->filestream_with_CD, &file_info.version_needed) != UNZ_OK)
+        err = UNZ_ERRNO;
+    if (unzReadUInt16(&s->z_filefunc, s->filestream_with_CD, &file_info.flag) != UNZ_OK)
+        err = UNZ_ERRNO;
+    if (unzReadUInt16(&s->z_filefunc, s->filestream_with_CD, &file_info.compression_method) != UNZ_OK)
+        err = UNZ_ERRNO;
+    if (unzReadUInt32(&s->z_filefunc, s->filestream_with_CD, &file_info.dos_date) != UNZ_OK)
+        err = UNZ_ERRNO;
+    if (unzReadUInt32(&s->z_filefunc, s->filestream_with_CD, &file_info.crc) != UNZ_OK)
+        err = UNZ_ERRNO;
+    if (unzReadUInt32(&s->z_filefunc, s->filestream_with_CD, &value32) != UNZ_OK)
+        err = UNZ_ERRNO;
+    file_info.compressed_size = value32;
+    if (unzReadUInt32(&s->z_filefunc, s->filestream_with_CD, &value32) != UNZ_OK)
+        err = UNZ_ERRNO;
+    file_info.uncompressed_size = value32;
+    if (unzReadUInt16(&s->z_filefunc, s->filestream_with_CD, &file_info.size_filename) != UNZ_OK)
+        err = UNZ_ERRNO;
+    if (unzReadUInt16(&s->z_filefunc, s->filestream_with_CD, &file_info.size_file_extra) != UNZ_OK)
+        err = UNZ_ERRNO;
+    if (unzReadUInt16(&s->z_filefunc, s->filestream_with_CD, &file_info.size_file_comment) != UNZ_OK)
+        err = UNZ_ERRNO;
+    if (unzReadUInt16(&s->z_filefunc, s->filestream_with_CD, &value16) != UNZ_OK)
+        err = UNZ_ERRNO;
+    file_info.disk_num_start = value16;
+    if (unzReadUInt16(&s->z_filefunc, s->filestream_with_CD, &file_info.internal_fa) != UNZ_OK)
+        err = UNZ_ERRNO;
+    if (unzReadUInt32(&s->z_filefunc, s->filestream_with_CD, &file_info.external_fa) != UNZ_OK)
+        err = UNZ_ERRNO;
+    /* Relative offset of local header */
+    if (unzReadUInt32(&s->z_filefunc, s->filestream_with_CD, &value32) != UNZ_OK)
+        err = UNZ_ERRNO;
+
+    file_info.size_file_extra_internal = 0;
+    file_info.disk_offset = value32;
+    file_info_internal.offset_curfile = value32;
+#ifdef HAVE_AES
+    file_info_internal.aes_compression_method = 0;
+    file_info_internal.aes_encryption_mode = 0;
+    file_info_internal.aes_version = 0;
+#endif
+
+    if (err == UNZ_OK)
+        err = unzGetCurrentFileInfoField(file, &seek, filename, filename_size, file_info.size_filename, 1);
+
+    /* Read extrafield */
+    if (err == UNZ_OK)
+        err = unzGetCurrentFileInfoField(file, &seek, extrafield, extrafield_size, file_info.size_file_extra, 0);
+
+    if ((err == UNZ_OK) && (file_info.size_file_extra != 0))
+    {
+        if (seek != 0)
+        {
+            if (ZSEEK64(s->z_filefunc, s->filestream_with_CD, seek, ZLIB_FILEFUNC_SEEK_CUR) == 0)
+                seek = 0;
+            else
+                err = UNZ_ERRNO;
+        }
+
+        /* We are going to parse the extra field so we need to move back */
+        current_pos = ZTELL64(s->z_filefunc, s->filestream_with_CD);
+        if (current_pos < file_info.size_file_extra)
+            err = UNZ_ERRNO;
+        current_pos -= file_info.size_file_extra;
+        if (ZSEEK64(s->z_filefunc, s->filestream_with_CD, current_pos, ZLIB_FILEFUNC_SEEK_SET) != 0)
+            err = UNZ_ERRNO;
+
+        while ((err != UNZ_ERRNO) && (extra_pos < file_info.size_file_extra))
+        {
+            if (unzReadUInt16(&s->z_filefunc, s->filestream_with_CD, &extra_header_id) != UNZ_OK)
+                err = UNZ_ERRNO;
+            if (unzReadUInt16(&s->z_filefunc, s->filestream_with_CD, &extra_data_size) != UNZ_OK)
+                err = UNZ_ERRNO;
+
+            /* ZIP64 extra fields */
+            if (extra_header_id == 0x0001)
+            {
+                /* Subtract size of ZIP64 field, since ZIP64 is handled internally */
+                file_info.size_file_extra_internal += 2 + 2 + extra_data_size;
+
+                if (file_info.uncompressed_size == UINT32_MAX)
+                {
+                    if (unzReadUInt64(&s->z_filefunc, s->filestream_with_CD, &file_info.uncompressed_size) != UNZ_OK)
+                        err = UNZ_ERRNO;
+                }
+                if (file_info.compressed_size == UINT32_MAX)
+                {
+                    if (unzReadUInt64(&s->z_filefunc, s->filestream_with_CD, &file_info.compressed_size) != UNZ_OK)
+                        err = UNZ_ERRNO;
+                }
+                if (file_info_internal.offset_curfile == UINT32_MAX)
+                {
+                    /* Relative Header offset */
+                    if (unzReadUInt64(&s->z_filefunc, s->filestream_with_CD, &value64) != UNZ_OK)
+                        err = UNZ_ERRNO;
+                    file_info_internal.offset_curfile = value64;
+                    file_info.disk_offset = value64;
+                }
+                if (file_info.disk_num_start == UINT32_MAX)
+                {
+                    /* Disk Start Number */
+                    if (unzReadUInt32(&s->z_filefunc, s->filestream_with_CD, &file_info.disk_num_start) != UNZ_OK)
+                        err = UNZ_ERRNO;
+                }
+            }
+#ifdef HAVE_AES
+            /* AES header */
+            else if (extra_header_id == 0x9901)
+            {
+                uint8_t value8 = 0;
+
+                /* Subtract size of AES field, since AES is handled internally */
+                file_info.size_file_extra_internal += 2 + 2 + extra_data_size;
+
+                /* Verify version info */
+                if (unzReadUInt16(&s->z_filefunc, s->filestream_with_CD, &value16) != UNZ_OK)
+                    err = UNZ_ERRNO;
+                /* Support AE-1 and AE-2 */
+                if (value16 != 1 && value16 != 2)
+                    err = UNZ_ERRNO;
+                file_info_internal.aes_version = value16;
+                if (unzReadUInt8(&s->z_filefunc, s->filestream_with_CD, &value8) != UNZ_OK)
+                    err = UNZ_ERRNO;
+                if ((char)value8 != 'A')
+                    err = UNZ_ERRNO;
+                if (unzReadUInt8(&s->z_filefunc, s->filestream_with_CD, &value8) != UNZ_OK)
+                    err = UNZ_ERRNO;
+                if ((char)value8 != 'E')
+                    err = UNZ_ERRNO;
+                /* Get AES encryption strength and actual compression method */
+                if (unzReadUInt8(&s->z_filefunc, s->filestream_with_CD, &value8) != UNZ_OK)
+                    err = UNZ_ERRNO;
+                file_info_internal.aes_encryption_mode = value8;
+                if (unzReadUInt16(&s->z_filefunc, s->filestream_with_CD, &value16) != UNZ_OK)
+                    err = UNZ_ERRNO;
+                file_info_internal.aes_compression_method = value16;
+            }
+#endif
+            else
+            {
+                if (ZSEEK64(s->z_filefunc, s->filestream_with_CD,extra_data_size, ZLIB_FILEFUNC_SEEK_CUR) != 0)
+                    err = UNZ_ERRNO;
+            }
+
+            extra_pos += 2 + 2 + extra_data_size;
+        }
+    }
+
+    if (file_info.disk_num_start == s->gi.number_disk_with_CD)
+        file_info_internal.byte_before_the_zipfile = s->byte_before_the_zipfile;
+    else
+        file_info_internal.byte_before_the_zipfile = 0;
+
+    if (err == UNZ_OK)
+        err = unzGetCurrentFileInfoField(file, &seek, comment, comment_size, file_info.size_file_comment, 1);
+
+    if ((err == UNZ_OK) && (pfile_info != NULL))
+        *pfile_info = file_info;
+    if ((err == UNZ_OK) && (pfile_info_internal != NULL))
+        *pfile_info_internal = file_info_internal;
+
+    return err;
+}
+
+extern int ZEXPORT unzGetCurrentFileInfo(unzFile file, unz_file_info *pfile_info, char *filename,
+    uint16_t filename_size, void *extrafield, uint16_t extrafield_size, char *comment, uint16_t comment_size)
+{
+    unz_file_info64 file_info64;
+    int err = UNZ_OK;
+
+    err = unzGetCurrentFileInfoInternal(file, &file_info64, NULL, filename, filename_size,
+                extrafield, extrafield_size, comment, comment_size);
+
+    if ((err == UNZ_OK) && (pfile_info != NULL))
+    {
+        pfile_info->version = file_info64.version;
+        pfile_info->version_needed = file_info64.version_needed;
+        pfile_info->flag = file_info64.flag;
+        pfile_info->compression_method = file_info64.compression_method;
+        pfile_info->dos_date = file_info64.dos_date;
+        pfile_info->crc = file_info64.crc;
+
+        pfile_info->size_filename = file_info64.size_filename;
+        pfile_info->size_file_extra = file_info64.size_file_extra - file_info64.size_file_extra_internal;
+        pfile_info->size_file_comment = file_info64.size_file_comment;
+
+        pfile_info->disk_num_start = (uint16_t)file_info64.disk_num_start;
+        pfile_info->internal_fa = file_info64.internal_fa;
+        pfile_info->external_fa = file_info64.external_fa;
+
+        pfile_info->compressed_size = (uint32_t)file_info64.compressed_size;
+        pfile_info->uncompressed_size = (uint32_t)file_info64.uncompressed_size;
+    }
+    return err;
+}
+
+extern int ZEXPORT unzGetCurrentFileInfo64(unzFile file, unz_file_info64 * pfile_info, char *filename,
+    uint16_t filename_size, void *extrafield, uint16_t extrafield_size, char *comment, uint16_t comment_size)
+{
+    return unzGetCurrentFileInfoInternal(file, pfile_info, NULL, filename, filename_size,
+        extrafield, extrafield_size, comment,comment_size);
+}
+
+/* Read the local header of the current zipfile. Check the coherency of the local header and info in the
+   end of central directory about this file store in *piSizeVar the size of extra info in local header
+   (filename and size of extra field data) */
+static int unzCheckCurrentFileCoherencyHeader(unz64_s *s, uint32_t *psize_variable, uint64_t *poffset_local_extrafield,
+    uint16_t *psize_local_extrafield)
+{
+    uint32_t magic = 0;
+    uint16_t value16 = 0;
+    uint32_t value32 = 0;
+    uint32_t flags = 0;
+    uint16_t size_filename = 0;
+    uint16_t size_extra_field = 0;
+    uint16_t compression_method = 0;
+    int err = UNZ_OK;
+
+    if (psize_variable == NULL)
+        return UNZ_PARAMERROR;
+    *psize_variable = 0;
+    if (poffset_local_extrafield == NULL)
+        return UNZ_PARAMERROR;
+    *poffset_local_extrafield = 0;
+    if (psize_local_extrafield == NULL)
+        return UNZ_PARAMERROR;
+    *psize_local_extrafield = 0;
+
+    err = unzGoToNextDisk((unzFile)s);
+    if (err != UNZ_OK)
+        return err;
+
+    if (ZSEEK64(s->z_filefunc, s->filestream, s->cur_file_info_internal.offset_curfile +
+        s->cur_file_info_internal.byte_before_the_zipfile, ZLIB_FILEFUNC_SEEK_SET) != 0)
+        return UNZ_ERRNO;
+
+    if (err == UNZ_OK)
+    {
+        if (unzReadUInt32(&s->z_filefunc, s->filestream, &magic) != UNZ_OK)
+            err = UNZ_ERRNO;
+        else if (magic != LOCALHEADERMAGIC)
+            err = UNZ_BADZIPFILE;
+    }
+
+    if (unzReadUInt16(&s->z_filefunc, s->filestream, &value16) != UNZ_OK)
+        err = UNZ_ERRNO;
+    if (unzReadUInt16(&s->z_filefunc, s->filestream, &value16) != UNZ_OK)
+        err = UNZ_ERRNO;
+    flags = value16;
+    if (unzReadUInt16(&s->z_filefunc, s->filestream, &value16) != UNZ_OK)
+        err = UNZ_ERRNO;
+    else if ((err == UNZ_OK) && (value16 != s->cur_file_info.compression_method))
+        err = UNZ_BADZIPFILE;
+
+    compression_method = s->cur_file_info.compression_method;
+#ifdef HAVE_AES
+    if (compression_method == AES_METHOD)
+        compression_method = s->cur_file_info_internal.aes_compression_method;
+#endif
+
+    if ((err == UNZ_OK) && (compression_method != 0) && (compression_method != Z_DEFLATED))
+    {
+#ifdef HAVE_BZIP2
+        if (compression_method != Z_BZIP2ED)
+#endif
+            err = UNZ_BADZIPFILE;
+    }
+
+    if (unzReadUInt32(&s->z_filefunc, s->filestream, &value32) != UNZ_OK) /* date/time */
+        err = UNZ_ERRNO;
+    if (unzReadUInt32(&s->z_filefunc, s->filestream, &value32) != UNZ_OK) /* crc */
+        err = UNZ_ERRNO;
+    else if ((err == UNZ_OK) && (value32 != s->cur_file_info.crc) && ((flags & 8) == 0))
+        err = UNZ_BADZIPFILE;
+    if (unzReadUInt32(&s->z_filefunc, s->filestream, &value32) != UNZ_OK) /* size compr */
+        err = UNZ_ERRNO;
+    else if ((value32 != UINT32_MAX) && (err == UNZ_OK) && (value32 != s->cur_file_info.compressed_size) && ((flags & 8) == 0))
+        err = UNZ_BADZIPFILE;
+    if (unzReadUInt32(&s->z_filefunc, s->filestream, &value32) != UNZ_OK) /* size uncompr */
+        err = UNZ_ERRNO;
+    else if ((value32 != UINT32_MAX) && (err == UNZ_OK) && (value32 != s->cur_file_info.uncompressed_size) && ((flags & 8) == 0))
+        err = UNZ_BADZIPFILE;
+    if (unzReadUInt16(&s->z_filefunc, s->filestream, &size_filename) != UNZ_OK)
+        err = UNZ_ERRNO;
+    else if ((err == UNZ_OK) && (size_filename != s->cur_file_info.size_filename))
+        err = UNZ_BADZIPFILE;
+
+    *psize_variable += size_filename;
+
+    if (unzReadUInt16(&s->z_filefunc, s->filestream, &size_extra_field) != UNZ_OK)
+        err = UNZ_ERRNO;
+
+    *poffset_local_extrafield = s->cur_file_info_internal.offset_curfile + SIZEZIPLOCALHEADER + size_filename;
+    *psize_local_extrafield = size_extra_field;
+    *psize_variable += size_extra_field;
 
     return err;
 }
@@ -1064,62 +1043,68 @@ local int unzlocal_CheckCurrentFileCoherencyHeader (s,piSizeVar,
   Open for reading data the current file in the zipfile.
   If there is no error and the file is opened, the return value is UNZ_OK.
 */
-extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password)
-    unzFile file;
-    int* method;
-    int* level;
-    int raw;
-    const char* password;
+extern int ZEXPORT unzOpenCurrentFile3(unzFile file, int *method, int *level, int raw, const char *password)
 {
-    int err=UNZ_OK;
-    uInt iSizeVar;
-    unz_s* s;
-    file_in_zip_read_info_s* pfile_in_zip_read_info;
-    uLong offset_local_extrafield;  /* offset of the local extra field */
-    uInt  size_local_extrafield;    /* size of the local extra field */
-#    ifndef NOUNCRYPT
+    unz64_s *s = NULL;
+    file_in_zip64_read_info_s *pfile_in_zip_read_info = NULL;
+    uint16_t compression_method = 0;
+    uint64_t offset_local_extrafield = 0;
+    uint16_t size_local_extrafield = 0;
+    uint32_t size_variable = 0;
+    int err = UNZ_OK;
+#ifndef NOUNCRYPT
     char source[12];
-#    else
+#else
     if (password != NULL)
         return UNZ_PARAMERROR;
-#    endif
-
-    if (file==NULL)
+#endif
+    if (file == NULL)
         return UNZ_PARAMERROR;
-    s=(unz_s*)file;
+    s = (unz64_s*)file;
     if (!s->current_file_ok)
         return UNZ_PARAMERROR;
 
     if (s->pfile_in_zip_read != NULL)
         unzCloseCurrentFile(file);
 
-    if (unzlocal_CheckCurrentFileCoherencyHeader(s,&iSizeVar,
-                &offset_local_extrafield,&size_local_extrafield)!=UNZ_OK)
+    if (unzCheckCurrentFileCoherencyHeader(s, &size_variable, &offset_local_extrafield, &size_local_extrafield) != UNZ_OK)
         return UNZ_BADZIPFILE;
 
-    pfile_in_zip_read_info = (file_in_zip_read_info_s*)
-                                        ALLOC(sizeof(file_in_zip_read_info_s));
-    if (pfile_in_zip_read_info==NULL)
+    pfile_in_zip_read_info = (file_in_zip64_read_info_s*)ALLOC(sizeof(file_in_zip64_read_info_s));
+    if (pfile_in_zip_read_info == NULL)
         return UNZ_INTERNALERROR;
 
-    pfile_in_zip_read_info->read_buffer=(char*)ALLOC(UNZ_BUFSIZE);
+    pfile_in_zip_read_info->read_buffer = (uint8_t*)ALLOC(UNZ_BUFSIZE);
     pfile_in_zip_read_info->offset_local_extrafield = offset_local_extrafield;
     pfile_in_zip_read_info->size_local_extrafield = size_local_extrafield;
-    pfile_in_zip_read_info->pos_local_extrafield=0;
-    pfile_in_zip_read_info->raw=raw;
+    pfile_in_zip_read_info->pos_local_extrafield = 0;
+    pfile_in_zip_read_info->raw = raw;
 
-    if (pfile_in_zip_read_info->read_buffer==NULL)
+    if (pfile_in_zip_read_info->read_buffer == NULL)
     {
         TRYFREE(pfile_in_zip_read_info);
         return UNZ_INTERNALERROR;
     }
 
-    pfile_in_zip_read_info->stream_initialised=0;
+    pfile_in_zip_read_info->stream_initialised = 0;
 
-    if (method!=NULL)
-        *method = (int)s->cur_file_info.compression_method;
+    compression_method = s->cur_file_info.compression_method;
+#ifdef HAVE_AES
+    if (compression_method == AES_METHOD)
+    {
+        compression_method = s->cur_file_info_internal.aes_compression_method;
+        if (password == NULL)
+        {
+            TRYFREE(pfile_in_zip_read_info);
+            return UNZ_PARAMERROR;
+        }
+    }
+#endif
 
-    if (level!=NULL)
+    if (method != NULL)
+        *method = compression_method;
+
+    if (level != NULL)
     {
         *level = 6;
         switch (s->cur_file_info.flag & 0x06)
@@ -1130,238 +1115,430 @@ extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password)
         }
     }
 
-    if ((s->cur_file_info.compression_method!=0) &&
-        (s->cur_file_info.compression_method!=Z_DEFLATED))
-        return UNZ_BADZIPFILE;
-
-    pfile_in_zip_read_info->crc32_wait=s->cur_file_info.crc;
-    pfile_in_zip_read_info->crc32=0;
-    pfile_in_zip_read_info->compression_method =
-            s->cur_file_info.compression_method;
-    pfile_in_zip_read_info->filestream=s->filestream;
-    pfile_in_zip_read_info->z_filefunc=s->z_filefunc;
-    pfile_in_zip_read_info->byte_before_the_zipfile=s->byte_before_the_zipfile;
-
-    pfile_in_zip_read_info->stream.total_out = 0;
-
-    if ((s->cur_file_info.compression_method==Z_DEFLATED) &&
-        (!raw))
+    if ((compression_method != 0) && (compression_method != Z_DEFLATED))
     {
-      pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;
-      pfile_in_zip_read_info->stream.zfree = (free_func)0;
-      pfile_in_zip_read_info->stream.opaque = (voidpf)0;
-      pfile_in_zip_read_info->stream.next_in = (voidpf)0;
-      pfile_in_zip_read_info->stream.avail_in = 0;
-
-      err=inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS);
-      if (err == Z_OK)
-        pfile_in_zip_read_info->stream_initialised=1;
-      else
-      {
-        TRYFREE(pfile_in_zip_read_info);
-        return err;
-      }
-        /* windowBits is passed < 0 to tell that there is no zlib header.
-         * Note that in this case inflate *requires* an extra "dummy" byte
-         * after the compressed stream in order to complete decompression and
-         * return Z_STREAM_END.
-         * In unzip, i don't wait absolutely Z_STREAM_END because I known the
-         * size of both compressed and uncompressed data
-         */
+#ifdef HAVE_BZIP2
+        if (compression_method != Z_BZIP2ED)
+#endif
+        {
+            TRYFREE(pfile_in_zip_read_info);
+            return UNZ_BADZIPFILE;
+        }
     }
-    pfile_in_zip_read_info->rest_read_compressed =
-            s->cur_file_info.compressed_size ;
-    pfile_in_zip_read_info->rest_read_uncompressed =
-            s->cur_file_info.uncompressed_size ;
 
+    pfile_in_zip_read_info->crc32_wait = s->cur_file_info.crc;
+    pfile_in_zip_read_info->crc32 = 0;
+    pfile_in_zip_read_info->total_out_64 = 0;
+    pfile_in_zip_read_info->compression_method = compression_method;
+    pfile_in_zip_read_info->filestream = s->filestream;
+    pfile_in_zip_read_info->z_filefunc = s->z_filefunc;
+    if (s->number_disk == s->gi.number_disk_with_CD)
+        pfile_in_zip_read_info->byte_before_the_zipfile = s->byte_before_the_zipfile;
+    else
+        pfile_in_zip_read_info->byte_before_the_zipfile = 0;
+    pfile_in_zip_read_info->stream.total_out = 0;
+    pfile_in_zip_read_info->stream.total_in = 0;
+    pfile_in_zip_read_info->stream.next_in = NULL;
 
-    pfile_in_zip_read_info->pos_in_zipfile =
-            s->cur_file_info_internal.offset_curfile + SIZEZIPLOCALHEADER +
-              iSizeVar;
+    if (!raw)
+    {
+        if (compression_method == Z_BZIP2ED)
+        {
+#ifdef HAVE_BZIP2
+            pfile_in_zip_read_info->bstream.bzalloc = (void *(*) (void *, int, int))0;
+            pfile_in_zip_read_info->bstream.bzfree = (free_func)0;
+            pfile_in_zip_read_info->bstream.opaque = (voidpf)0;
+            pfile_in_zip_read_info->bstream.state = (voidpf)0;
 
-    pfile_in_zip_read_info->stream.avail_in = (uInt)0;
+            pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;
+            pfile_in_zip_read_info->stream.zfree = (free_func)0;
+            pfile_in_zip_read_info->stream.opaque = (voidpf)0;
+            pfile_in_zip_read_info->stream.next_in = (voidpf)0;
+            pfile_in_zip_read_info->stream.avail_in = 0;
+
+            err = BZ2_bzDecompressInit(&pfile_in_zip_read_info->bstream, 0, 0);
+            if (err == Z_OK)
+            {
+                pfile_in_zip_read_info->stream_initialised = Z_BZIP2ED;
+            }
+            else
+            {
+                TRYFREE(pfile_in_zip_read_info);
+                return err;
+            }
+#else
+            pfile_in_zip_read_info->raw = 1;
+#endif
+        }
+        else if (compression_method == Z_DEFLATED)
+        {
+            pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;
+            pfile_in_zip_read_info->stream.zfree = (free_func)0;
+            pfile_in_zip_read_info->stream.opaque = (voidpf)s;
+            pfile_in_zip_read_info->stream.next_in = 0;
+            pfile_in_zip_read_info->stream.avail_in = 0;
+
+#ifdef HAVE_APPLE_COMPRESSION
+            err = compression_stream_init(&pfile_in_zip_read_info->astream, COMPRESSION_STREAM_DECODE, COMPRESSION_ZLIB);
+            if (err == COMPRESSION_STATUS_ERROR)
+                err = UNZ_INTERNALERROR;
+            else
+                err = Z_OK;
+#else
+            err = inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS);
+#endif
+            if (err == Z_OK)
+            {
+                pfile_in_zip_read_info->stream_initialised = Z_DEFLATED;
+            }
+            else
+            {
+                TRYFREE(pfile_in_zip_read_info);
+                return err;
+            }
+            /* windowBits is passed < 0 to tell that there is no zlib header.
+             * Note that in this case inflate *requires* an extra "dummy" byte
+             * after the compressed stream in order to complete decompression and
+             * return Z_STREAM_END.
+             * In unzip, i don't wait absolutely Z_STREAM_END because I known the
+             * size of both compressed and uncompressed data
+             */
+        }
+    }
+
+    pfile_in_zip_read_info->rest_read_compressed = s->cur_file_info.compressed_size;
+    pfile_in_zip_read_info->rest_read_uncompressed = s->cur_file_info.uncompressed_size;
+    pfile_in_zip_read_info->pos_in_zipfile = s->cur_file_info_internal.offset_curfile + SIZEZIPLOCALHEADER + size_variable;
+    pfile_in_zip_read_info->stream.avail_in = 0;
 
     s->pfile_in_zip_read = pfile_in_zip_read_info;
 
-#    ifndef NOUNCRYPT
-    if (password != NULL)
+#ifndef NOUNCRYPT
+    s->pcrc_32_tab = NULL;
+
+    if ((password != NULL) && ((s->cur_file_info.flag & 1) != 0))
     {
-        int i;
-        s->pcrc_32_tab = get_crc_table();
-        init_keys(password,s->keys,s->pcrc_32_tab);
-        if (ZSEEK(s->z_filefunc, s->filestream,
-                  s->pfile_in_zip_read->pos_in_zipfile +
-                     s->pfile_in_zip_read->byte_before_the_zipfile,
-                  SEEK_SET)!=0)
-            return UNZ_INTERNALERROR;
-        if(ZREAD(s->z_filefunc, s->filestream,source, 12)<12)
+        if (ZSEEK64(s->z_filefunc, s->filestream,
+                  s->pfile_in_zip_read->pos_in_zipfile + s->pfile_in_zip_read->byte_before_the_zipfile,
+                  ZLIB_FILEFUNC_SEEK_SET) != 0)
             return UNZ_INTERNALERROR;
+#ifdef HAVE_AES
+        if (s->cur_file_info.compression_method == AES_METHOD)
+        {
+            unsigned char passverify_archive[AES_PWVERIFYSIZE];
+            unsigned char passverify_password[AES_PWVERIFYSIZE];
+            unsigned char salt_value[AES_MAXSALTLENGTH];
+            uint32_t salt_length = 0;
 
-        for (i = 0; i<12; i++)
-            zdecode(s->keys,s->pcrc_32_tab,source[i]);
+            if ((s->cur_file_info_internal.aes_encryption_mode < 1) ||
+                (s->cur_file_info_internal.aes_encryption_mode > 3))
+                return UNZ_INTERNALERROR;
 
-        s->pfile_in_zip_read->pos_in_zipfile+=12;
-        s->encrypted=1;
+            salt_length = SALT_LENGTH(s->cur_file_info_internal.aes_encryption_mode);
+
+            if (ZREAD64(s->z_filefunc, s->filestream, salt_value, salt_length) != salt_length)
+                return UNZ_INTERNALERROR;
+            if (ZREAD64(s->z_filefunc, s->filestream, passverify_archive, AES_PWVERIFYSIZE) != AES_PWVERIFYSIZE)
+                return UNZ_INTERNALERROR;
+
+            fcrypt_init(s->cur_file_info_internal.aes_encryption_mode, (uint8_t *)password,
+                (uint32_t)strlen(password), salt_value, passverify_password, &s->pfile_in_zip_read->aes_ctx);
+
+            if (memcmp(passverify_archive, passverify_password, AES_PWVERIFYSIZE) != 0)
+                return UNZ_BADPASSWORD;
+
+            s->pfile_in_zip_read->rest_read_compressed -= salt_length + AES_PWVERIFYSIZE;
+            s->pfile_in_zip_read->rest_read_compressed -= AES_AUTHCODESIZE;
+
+            s->pfile_in_zip_read->pos_in_zipfile += salt_length + AES_PWVERIFYSIZE;
+        }
+        else
+#endif
+        {
+            int i;
+            s->pcrc_32_tab = (const z_crc_t*)get_crc_table();
+            init_keys(password, s->keys, s->pcrc_32_tab);
+
+            if (ZREAD64(s->z_filefunc, s->filestream, source, 12) < 12)
+                return UNZ_INTERNALERROR;
+
+            for (i = 0; i < 12; i++)
+                zdecode(s->keys, s->pcrc_32_tab, source[i]);
+
+            s->pfile_in_zip_read->rest_read_compressed -= 12;
+            s->pfile_in_zip_read->pos_in_zipfile += 12;
+        }
     }
-#    endif
-
+#endif
 
     return UNZ_OK;
 }
 
-extern int ZEXPORT unzOpenCurrentFile (file)
-    unzFile file;
+extern int ZEXPORT unzOpenCurrentFile(unzFile file)
 {
     return unzOpenCurrentFile3(file, NULL, NULL, 0, NULL);
 }
 
-extern int ZEXPORT unzOpenCurrentFilePassword (file, password)
-    unzFile file;
-    const char* password;
+extern int ZEXPORT unzOpenCurrentFilePassword(unzFile file, const char *password)
 {
     return unzOpenCurrentFile3(file, NULL, NULL, 0, password);
 }
 
-extern int ZEXPORT unzOpenCurrentFile2 (file,method,level,raw)
-    unzFile file;
-    int* method;
-    int* level;
-    int raw;
+extern int ZEXPORT unzOpenCurrentFile2(unzFile file, int *method, int *level, int raw)
 {
     return unzOpenCurrentFile3(file, method, level, raw, NULL);
 }
 
-/*
-  Read bytes from the current file.
-  buf contain buffer where data must be copied
-  len the size of buf.
+/* Read bytes from the current file.
+   buf contain buffer where data must be copied
+   len the size of buf.
 
-  return the number of byte copied if somes bytes are copied
-  return 0 if the end of file was reached
-  return <0 with error code if there is an error
-    (UNZ_ERRNO for IO error, or zLib error for uncompress error)
-*/
-extern int ZEXPORT unzReadCurrentFile  (file, buf, len)
-    unzFile file;
-    voidp buf;
-    unsigned len;
+   return the number of byte copied if some bytes are copied
+   return 0 if the end of file was reached
+   return <0 with error code if there is an error (UNZ_ERRNO for IO error, or zLib error for uncompress error) */
+extern int ZEXPORT unzReadCurrentFile(unzFile file, voidp buf, uint32_t len)
 {
-    int err=UNZ_OK;
-    uInt iRead = 0;
-    unz_s* s;
-    file_in_zip_read_info_s* pfile_in_zip_read_info;
-    if (file==NULL)
+    unz64_s *s = NULL;
+    uint32_t read = 0;
+    int err = UNZ_OK;
+
+    if (file == NULL)
         return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
+    s = (unz64_s*)file;
 
-    if (pfile_in_zip_read_info==NULL)
+    if (s->pfile_in_zip_read == NULL)
         return UNZ_PARAMERROR;
-
-
-    if (pfile_in_zip_read_info->read_buffer == NULL)
+    if (s->pfile_in_zip_read->read_buffer == NULL)
         return UNZ_END_OF_LIST_OF_FILE;
-    if (len==0)
+    if (len == 0)
         return 0;
+    if (len > UINT16_MAX)
+        return UNZ_PARAMERROR;
 
-    pfile_in_zip_read_info->stream.next_out = (Bytef*)buf;
+    s->pfile_in_zip_read->stream.next_out = (uint8_t*)buf;
+    s->pfile_in_zip_read->stream.avail_out = (uint16_t)len;
 
-    pfile_in_zip_read_info->stream.avail_out = (uInt)len;
-
-    if ((len>pfile_in_zip_read_info->rest_read_uncompressed) &&
-        (!(pfile_in_zip_read_info->raw)))
-        pfile_in_zip_read_info->stream.avail_out =
-            (uInt)pfile_in_zip_read_info->rest_read_uncompressed;
-
-    if ((len>pfile_in_zip_read_info->rest_read_compressed+
-           pfile_in_zip_read_info->stream.avail_in) &&
-         (pfile_in_zip_read_info->raw))
-        pfile_in_zip_read_info->stream.avail_out =
-            (uInt)pfile_in_zip_read_info->rest_read_compressed+
-            pfile_in_zip_read_info->stream.avail_in;
-
-    while (pfile_in_zip_read_info->stream.avail_out>0)
+    if (s->pfile_in_zip_read->raw)
     {
-        if ((pfile_in_zip_read_info->stream.avail_in==0) &&
-            (pfile_in_zip_read_info->rest_read_compressed>0))
+        if (len > s->pfile_in_zip_read->rest_read_compressed + s->pfile_in_zip_read->stream.avail_in)
+            s->pfile_in_zip_read->stream.avail_out = (uint16_t)s->pfile_in_zip_read->rest_read_compressed +
+                s->pfile_in_zip_read->stream.avail_in;
+    }
+    else
+    {
+        if (len > s->pfile_in_zip_read->rest_read_uncompressed)
+            s->pfile_in_zip_read->stream.avail_out = (uint16_t)s->pfile_in_zip_read->rest_read_uncompressed;
+    }
+
+    do
+    {
+        if (s->pfile_in_zip_read->stream.avail_in == 0)
         {
-            uInt uReadThis = UNZ_BUFSIZE;
-            if (pfile_in_zip_read_info->rest_read_compressed<uReadThis)
-                uReadThis = (uInt)pfile_in_zip_read_info->rest_read_compressed;
-            if (uReadThis == 0)
-                return UNZ_EOF;
-            if (ZSEEK(pfile_in_zip_read_info->z_filefunc,
-                      pfile_in_zip_read_info->filestream,
-                      pfile_in_zip_read_info->pos_in_zipfile +
-                         pfile_in_zip_read_info->byte_before_the_zipfile,
-                         ZLIB_FILEFUNC_SEEK_SET)!=0)
-                return UNZ_ERRNO;
-            if (ZREAD(pfile_in_zip_read_info->z_filefunc,
-                      pfile_in_zip_read_info->filestream,
-                      pfile_in_zip_read_info->read_buffer,
-                      uReadThis)!=uReadThis)
-                return UNZ_ERRNO;
+            uint32_t bytes_to_read = UNZ_BUFSIZE;
+            uint32_t bytes_not_read = 0;
+            uint32_t bytes_read = 0;
+            uint32_t total_bytes_read = 0;
 
+            if (s->pfile_in_zip_read->stream.next_in != NULL)
+                bytes_not_read = (uint32_t)(s->pfile_in_zip_read->read_buffer + UNZ_BUFSIZE -
+                    s->pfile_in_zip_read->stream.next_in);
+            bytes_to_read -= bytes_not_read;
+            if (bytes_not_read > 0)
+                memcpy(s->pfile_in_zip_read->read_buffer, s->pfile_in_zip_read->stream.next_in, bytes_not_read);
+            if (s->pfile_in_zip_read->rest_read_compressed < bytes_to_read)
+                bytes_to_read = (uint16_t)s->pfile_in_zip_read->rest_read_compressed;
 
-#            ifndef NOUNCRYPT
-            if(s->encrypted)
+            while (total_bytes_read != bytes_to_read)
             {
-                uInt i;
-                for(i=0;i<uReadThis;i++)
-                  pfile_in_zip_read_info->read_buffer[i] =
-                      zdecode(s->keys,s->pcrc_32_tab,
-                              pfile_in_zip_read_info->read_buffer[i]);
+                if (ZSEEK64(s->pfile_in_zip_read->z_filefunc, s->pfile_in_zip_read->filestream,
+                        s->pfile_in_zip_read->pos_in_zipfile + s->pfile_in_zip_read->byte_before_the_zipfile,
+                        ZLIB_FILEFUNC_SEEK_SET) != 0)
+                    return UNZ_ERRNO;
+
+                bytes_read = ZREAD64(s->pfile_in_zip_read->z_filefunc, s->pfile_in_zip_read->filestream,
+                          s->pfile_in_zip_read->read_buffer + bytes_not_read + total_bytes_read,
+                          bytes_to_read - total_bytes_read);
+
+                total_bytes_read += bytes_read;
+                s->pfile_in_zip_read->pos_in_zipfile += bytes_read;
+
+                if (bytes_read == 0)
+                {
+                    if (ZERROR64(s->pfile_in_zip_read->z_filefunc, s->pfile_in_zip_read->filestream))
+                        return UNZ_ERRNO;
+
+                    err = unzGoToNextDisk(file);
+                    if (err != UNZ_OK)
+                        return err;
+
+                    s->pfile_in_zip_read->pos_in_zipfile = 0;
+                    s->pfile_in_zip_read->filestream = s->filestream;
+                }
             }
-#            endif
 
+#ifndef NOUNCRYPT
+            if ((s->cur_file_info.flag & 1) != 0)
+            {
+#ifdef HAVE_AES
+                if (s->cur_file_info.compression_method == AES_METHOD)
+                {
+                    fcrypt_decrypt(s->pfile_in_zip_read->read_buffer, bytes_to_read, &s->pfile_in_zip_read->aes_ctx);
+                }
+                else
+#endif
+                if (s->pcrc_32_tab != NULL)
+                {
+                    uint32_t i = 0;
 
-            pfile_in_zip_read_info->pos_in_zipfile += uReadThis;
+                    for (i = 0; i < total_bytes_read; i++)
+                      s->pfile_in_zip_read->read_buffer[i] =
+                          zdecode(s->keys, s->pcrc_32_tab, s->pfile_in_zip_read->read_buffer[i]);
+                }
+            }
+#endif
 
-            pfile_in_zip_read_info->rest_read_compressed-=uReadThis;
-
-            pfile_in_zip_read_info->stream.next_in =
-                (Bytef*)pfile_in_zip_read_info->read_buffer;
-            pfile_in_zip_read_info->stream.avail_in = (uInt)uReadThis;
+            s->pfile_in_zip_read->rest_read_compressed -= total_bytes_read;
+            s->pfile_in_zip_read->stream.next_in = (uint8_t*)s->pfile_in_zip_read->read_buffer;
+            s->pfile_in_zip_read->stream.avail_in = (uint16_t)(bytes_not_read + total_bytes_read);
         }
 
-        if ((pfile_in_zip_read_info->compression_method==0) || (pfile_in_zip_read_info->raw))
+        if ((s->pfile_in_zip_read->compression_method == 0) || (s->pfile_in_zip_read->raw))
         {
-            uInt uDoCopy,i ;
+            uint32_t i = 0;
+            uint32_t copy = 0;
 
-            if ((pfile_in_zip_read_info->stream.avail_in == 0) &&
-                (pfile_in_zip_read_info->rest_read_compressed == 0))
-                return (iRead==0) ? UNZ_EOF : iRead;
+            if ((s->pfile_in_zip_read->stream.avail_in == 0) &&
+                (s->pfile_in_zip_read->rest_read_compressed == 0))
+                return (read == 0) ? UNZ_EOF : read;
 
-            if (pfile_in_zip_read_info->stream.avail_out <
-                            pfile_in_zip_read_info->stream.avail_in)
-                uDoCopy = pfile_in_zip_read_info->stream.avail_out ;
+            if (s->pfile_in_zip_read->stream.avail_out < s->pfile_in_zip_read->stream.avail_in)
+                copy = s->pfile_in_zip_read->stream.avail_out;
             else
-                uDoCopy = pfile_in_zip_read_info->stream.avail_in ;
+                copy = s->pfile_in_zip_read->stream.avail_in;
 
-            for (i=0;i<uDoCopy;i++)
-                *(pfile_in_zip_read_info->stream.next_out+i) =
-                        *(pfile_in_zip_read_info->stream.next_in+i);
+            for (i = 0; i < copy; i++)
+                *(s->pfile_in_zip_read->stream.next_out + i) =
+                        *(s->pfile_in_zip_read->stream.next_in + i);
 
-            pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32,
-                                pfile_in_zip_read_info->stream.next_out,
-                                uDoCopy);
-            pfile_in_zip_read_info->rest_read_uncompressed-=uDoCopy;
-            pfile_in_zip_read_info->stream.avail_in -= uDoCopy;
-            pfile_in_zip_read_info->stream.avail_out -= uDoCopy;
-            pfile_in_zip_read_info->stream.next_out += uDoCopy;
-            pfile_in_zip_read_info->stream.next_in += uDoCopy;
-            pfile_in_zip_read_info->stream.total_out += uDoCopy;
-            iRead += uDoCopy;
+            s->pfile_in_zip_read->total_out_64 = s->pfile_in_zip_read->total_out_64 + copy;
+            s->pfile_in_zip_read->rest_read_uncompressed -= copy;
+            s->pfile_in_zip_read->crc32 = (uint32_t)crc32(s->pfile_in_zip_read->crc32,
+                                s->pfile_in_zip_read->stream.next_out, copy);
+
+            s->pfile_in_zip_read->stream.avail_in -= copy;
+            s->pfile_in_zip_read->stream.avail_out -= copy;
+            s->pfile_in_zip_read->stream.next_out += copy;
+            s->pfile_in_zip_read->stream.next_in += copy;
+            s->pfile_in_zip_read->stream.total_out += copy;
+
+            read += copy;
         }
+        else if (s->pfile_in_zip_read->compression_method == Z_BZIP2ED)
+        {
+#ifdef HAVE_BZIP2
+            uint64_t total_out_before = 0;
+            uint64_t total_out_after = 0;
+            uint64_t out_bytes = 0;
+            const uint8_t *buf_before = NULL;
+
+            s->pfile_in_zip_read->bstream.next_in        = (char*)s->pfile_in_zip_read->stream.next_in;
+            s->pfile_in_zip_read->bstream.avail_in       = s->pfile_in_zip_read->stream.avail_in;
+            s->pfile_in_zip_read->bstream.total_in_lo32  = (uint32_t)s->pfile_in_zip_read->stream.total_in;
+            s->pfile_in_zip_read->bstream.total_in_hi32  = s->pfile_in_zip_read->stream.total_in >> 32;
+            
+            s->pfile_in_zip_read->bstream.next_out       = (char*)s->pfile_in_zip_read->stream.next_out;
+            s->pfile_in_zip_read->bstream.avail_out      = s->pfile_in_zip_read->stream.avail_out;
+            s->pfile_in_zip_read->bstream.total_out_lo32 = (uint32_t)s->pfile_in_zip_read->stream.total_out;
+            s->pfile_in_zip_read->bstream.total_out_hi32 = s->pfile_in_zip_read->stream.total_out >> 32;
+
+            total_out_before = s->pfile_in_zip_read->bstream.total_out_lo32 + 
+                (((uint32_t)s->pfile_in_zip_read->bstream.total_out_hi32) << 32);
+            buf_before = (const uint8_t*)s->pfile_in_zip_read->bstream.next_out;
+
+            err = BZ2_bzDecompress(&s->pfile_in_zip_read->bstream);
+
+            total_out_after = s->pfile_in_zip_read->bstream.total_out_lo32 + 
+                (((uint32_t)s->pfile_in_zip_read->bstream.total_out_hi32) << 32);
+
+            out_bytes = total_out_after - total_out_before;
+
+            s->pfile_in_zip_read->total_out_64 = s->pfile_in_zip_read->total_out_64 + out_bytes;
+            s->pfile_in_zip_read->rest_read_uncompressed -= out_bytes;
+            s->pfile_in_zip_read->crc32 = crc32(s->pfile_in_zip_read->crc32, buf_before, (uint32_t)out_bytes);
+
+            read += (uint32_t)out_bytes;
+
+            s->pfile_in_zip_read->stream.next_in   = (uint8_t*)s->pfile_in_zip_read->bstream.next_in;
+            s->pfile_in_zip_read->stream.avail_in  = s->pfile_in_zip_read->bstream.avail_in;
+            s->pfile_in_zip_read->stream.total_in  = s->pfile_in_zip_read->bstream.total_in_lo32;
+            s->pfile_in_zip_read->stream.next_out  = (uint8_t*)s->pfile_in_zip_read->bstream.next_out;
+            s->pfile_in_zip_read->stream.avail_out = s->pfile_in_zip_read->bstream.avail_out;
+            s->pfile_in_zip_read->stream.total_out = s->pfile_in_zip_read->bstream.total_out_lo32;
+
+            if (err == BZ_STREAM_END)
+                return (read == 0) ? UNZ_EOF : read;
+            if (err != BZ_OK)
+                break;
+#endif
+        }
+#ifdef HAVE_APPLE_COMPRESSION
         else
         {
-            uLong uTotalOutBefore,uTotalOutAfter;
-            const Bytef *bufBefore;
-            uLong uOutThis;
-            int flush=Z_SYNC_FLUSH;
+            uint64_t total_out_before = 0;
+            uint64_t total_out_after = 0;
+            uint64_t out_bytes = 0;
+            const uint8_t *buf_before = NULL;
 
-            uTotalOutBefore = pfile_in_zip_read_info->stream.total_out;
-            bufBefore = pfile_in_zip_read_info->stream.next_out;
+            s->pfile_in_zip_read->astream.src_ptr = s->pfile_in_zip_read->stream.next_in;
+            s->pfile_in_zip_read->astream.src_size = s->pfile_in_zip_read->stream.avail_in;
+            s->pfile_in_zip_read->astream.dst_ptr = s->pfile_in_zip_read->stream.next_out;
+            s->pfile_in_zip_read->astream.dst_size = len;
+
+            total_out_before = s->pfile_in_zip_read->stream.total_out;
+            buf_before = s->pfile_in_zip_read->stream.next_out;
+
+            compression_status status;
+            compression_stream_flags flags;
+
+            if (s->pfile_in_zip_read->stream.avail_in == 0)
+            {
+                flags = COMPRESSION_STREAM_FINALIZE;
+            }
+
+            status = compression_stream_process(&s->pfile_in_zip_read->astream, flags);
+
+            total_out_after = len - s->pfile_in_zip_read->astream.dst_size;
+            out_bytes = total_out_after - total_out_before;
+
+            s->pfile_in_zip_read->total_out_64 += out_bytes;
+            s->pfile_in_zip_read->rest_read_uncompressed -= out_bytes;
+            s->pfile_in_zip_read->crc32 =
+                crc32(s->pfile_in_zip_read->crc32, buf_before, (uint32_t)out_bytes);
+
+            read += (uint32_t)out_bytes;
+
+            s->pfile_in_zip_read->stream.next_in = s->pfile_in_zip_read->astream.src_ptr;
+            s->pfile_in_zip_read->stream.avail_in = s->pfile_in_zip_read->astream.src_size;
+            s->pfile_in_zip_read->stream.next_out = s->pfile_in_zip_read->astream.dst_ptr;
+            s->pfile_in_zip_read->stream.avail_out = s->pfile_in_zip_read->astream.dst_size;
+
+            if (status == COMPRESSION_STATUS_END)
+                return (read == 0) ? UNZ_EOF : read;
+            if (status == COMPRESSION_STATUS_ERROR)
+                return Z_DATA_ERROR;
+            return read;
+        }
+#else
+        else
+        {
+            uint64_t total_out_before = 0;
+            uint64_t total_out_after = 0;
+            uint64_t out_bytes = 0;
+            const uint8_t *buf_before = NULL;
+            int flush = Z_SYNC_FLUSH;
+
+            total_out_before = s->pfile_in_zip_read->stream.total_out;
+            buf_before = s->pfile_in_zip_read->stream.next_out;
 
             /*
             if ((pfile_in_zip_read_info->rest_read_uncompressed ==
@@ -1369,254 +1546,455 @@ extern int ZEXPORT unzReadCurrentFile  (file, buf, len)
                 (pfile_in_zip_read_info->rest_read_compressed == 0))
                 flush = Z_FINISH;
             */
-            err=inflate(&pfile_in_zip_read_info->stream,flush);
+            err = inflate(&s->pfile_in_zip_read->stream, flush);
 
-            if ((err>=0) && (pfile_in_zip_read_info->stream.msg!=NULL))
-              err = Z_DATA_ERROR;
+            if ((err >= 0) && (s->pfile_in_zip_read->stream.msg != NULL))
+                err = Z_DATA_ERROR;
 
-            uTotalOutAfter = pfile_in_zip_read_info->stream.total_out;
-            uOutThis = uTotalOutAfter-uTotalOutBefore;
+            total_out_after = s->pfile_in_zip_read->stream.total_out;
+            out_bytes = total_out_after - total_out_before;
 
-            pfile_in_zip_read_info->crc32 =
-                crc32(pfile_in_zip_read_info->crc32,bufBefore,
-                        (uInt)(uOutThis));
+            s->pfile_in_zip_read->total_out_64 += out_bytes;
+            s->pfile_in_zip_read->rest_read_uncompressed -= out_bytes;
+            s->pfile_in_zip_read->crc32 =
+                (uint32_t)crc32(s->pfile_in_zip_read->crc32,buf_before, (uint32_t)out_bytes);
 
-            pfile_in_zip_read_info->rest_read_uncompressed -=
-                uOutThis;
+            read += (uint32_t)out_bytes;
 
-            iRead += (uInt)(uTotalOutAfter - uTotalOutBefore);
-
-            if (err==Z_STREAM_END)
-                return (iRead==0) ? UNZ_EOF : iRead;
-            if (err!=Z_OK)
+            if (err == Z_STREAM_END)
+                return (read == 0) ? UNZ_EOF : read;
+            if (err != Z_OK)
                 break;
         }
+#endif
     }
+    while (s->pfile_in_zip_read->stream.avail_out > 0);
 
-    if (err==Z_OK)
-        return iRead;
+    if (err == Z_OK)
+        return read;
     return err;
 }
 
-
-/*
-  Give the current position in uncompressed data
-*/
-extern z_off_t ZEXPORT unztell (file)
-    unzFile file;
+extern int ZEXPORT unzGetLocalExtrafield(unzFile file, voidp buf, uint32_t len)
 {
-    unz_s* s;
-    file_in_zip_read_info_s* pfile_in_zip_read_info;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
+    unz64_s *s = NULL;
+    uint64_t size_to_read = 0;
+    uint32_t read_now = 0;
 
-    if (pfile_in_zip_read_info==NULL)
+    if (file == NULL)
+        return UNZ_PARAMERROR;
+    s = (unz64_s*)file;
+    if (s->pfile_in_zip_read == NULL)
         return UNZ_PARAMERROR;
 
-    return (z_off_t)pfile_in_zip_read_info->stream.total_out;
-}
+    size_to_read = s->pfile_in_zip_read->size_local_extrafield - s->pfile_in_zip_read->pos_local_extrafield;
 
-
-/*
-  return 1 if the end of file was reached, 0 elsewhere
-*/
-extern int ZEXPORT unzeof (file)
-    unzFile file;
-{
-    unz_s* s;
-    file_in_zip_read_info_s* pfile_in_zip_read_info;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-    if (pfile_in_zip_read_info==NULL)
-        return UNZ_PARAMERROR;
-
-    if (pfile_in_zip_read_info->rest_read_uncompressed == 0)
-        return 1;
-    else
-        return 0;
-}
-
-
-
-/*
-  Read extra field from the current file (opened by unzOpenCurrentFile)
-  This is the local-header version of the extra field (sometimes, there is
-    more info in the local-header version than in the central-header)
-
-  if buf==NULL, it return the size of the local extra field that can be read
-
-  if buf!=NULL, len is the size of the buffer, the extra header is copied in
-    buf.
-  the return value is the number of bytes copied in buf, or (if <0)
-    the error code
-*/
-extern int ZEXPORT unzGetLocalExtrafield (file,buf,len)
-    unzFile file;
-    voidp buf;
-    unsigned len;
-{
-    unz_s* s;
-    file_in_zip_read_info_s* pfile_in_zip_read_info;
-    uInt read_now;
-    uLong size_to_read;
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-    if (pfile_in_zip_read_info==NULL)
-        return UNZ_PARAMERROR;
-
-    size_to_read = (pfile_in_zip_read_info->size_local_extrafield -
-                pfile_in_zip_read_info->pos_local_extrafield);
-
-    if (buf==NULL)
+    if (buf == NULL)
         return (int)size_to_read;
 
-    if (len>size_to_read)
-        read_now = (uInt)size_to_read;
+    if (len > size_to_read)
+        read_now = (uint32_t)size_to_read;
     else
-        read_now = (uInt)len ;
+        read_now = len;
 
-    if (read_now==0)
+    if (read_now == 0)
         return 0;
 
-    if (ZSEEK(pfile_in_zip_read_info->z_filefunc,
-              pfile_in_zip_read_info->filestream,
-              pfile_in_zip_read_info->offset_local_extrafield +
-              pfile_in_zip_read_info->pos_local_extrafield,
-              ZLIB_FILEFUNC_SEEK_SET)!=0)
+    if (ZSEEK64(s->pfile_in_zip_read->z_filefunc, s->pfile_in_zip_read->filestream,
+        s->pfile_in_zip_read->offset_local_extrafield + s->pfile_in_zip_read->pos_local_extrafield,
+        ZLIB_FILEFUNC_SEEK_SET) != 0)
         return UNZ_ERRNO;
 
-    if (ZREAD(pfile_in_zip_read_info->z_filefunc,
-              pfile_in_zip_read_info->filestream,
-              buf,read_now)!=read_now)
+    if (ZREAD64(s->pfile_in_zip_read->z_filefunc, s->pfile_in_zip_read->filestream, buf, read_now) != read_now)
         return UNZ_ERRNO;
 
     return (int)read_now;
 }
 
-/*
-  Close the file in zip opened with unzipOpenCurrentFile
-  Return UNZ_CRCERROR if all the file was read but the CRC is not good
-*/
-extern int ZEXPORT unzCloseCurrentFile (file)
-    unzFile file;
+extern int ZEXPORT unzCloseCurrentFile(unzFile file)
 {
-    int err=UNZ_OK;
+    unz64_s *s = NULL;
+    file_in_zip64_read_info_s *pfile_in_zip_read_info = NULL;
+    int err = UNZ_OK;
 
-    unz_s* s;
-    file_in_zip_read_info_s* pfile_in_zip_read_info;
-    if (file==NULL)
+    if (file == NULL)
         return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-    if (pfile_in_zip_read_info==NULL)
+    s = (unz64_s*)file;
+    pfile_in_zip_read_info = s->pfile_in_zip_read;
+    if (pfile_in_zip_read_info == NULL)
         return UNZ_PARAMERROR;
 
-
-    if ((pfile_in_zip_read_info->rest_read_uncompressed == 0) &&
-        (!pfile_in_zip_read_info->raw))
+#ifdef HAVE_AES
+    if (s->cur_file_info.compression_method == AES_METHOD)
     {
-        if (pfile_in_zip_read_info->crc32 != pfile_in_zip_read_info->crc32_wait)
-            err=UNZ_CRCERROR;
-    }
+        unsigned char authcode[AES_AUTHCODESIZE];
+        unsigned char rauthcode[AES_AUTHCODESIZE];
 
+        if (ZREAD64(s->z_filefunc, s->filestream, authcode, AES_AUTHCODESIZE) != AES_AUTHCODESIZE)
+            return UNZ_ERRNO;
+
+        if (fcrypt_end(rauthcode, &s->pfile_in_zip_read->aes_ctx) != AES_AUTHCODESIZE)
+            err = UNZ_CRCERROR;
+        if (memcmp(authcode, rauthcode, AES_AUTHCODESIZE) != 0)
+            err = UNZ_CRCERROR;
+    }
+    /* AES zip version AE-1 will expect a valid crc as well */
+    if ((s->cur_file_info.compression_method != AES_METHOD) ||
+        (s->cur_file_info_internal.aes_version == 0x0001))
+#endif
+    {
+        if ((pfile_in_zip_read_info->rest_read_uncompressed == 0) &&
+            (!pfile_in_zip_read_info->raw))
+        {
+            if (pfile_in_zip_read_info->crc32 != pfile_in_zip_read_info->crc32_wait)
+                err = UNZ_CRCERROR;
+        }
+    }
 
     TRYFREE(pfile_in_zip_read_info->read_buffer);
     pfile_in_zip_read_info->read_buffer = NULL;
-    if (pfile_in_zip_read_info->stream_initialised)
+    if (pfile_in_zip_read_info->stream_initialised == Z_DEFLATED)
+    {
+#ifdef HAVE_APPLE_COMPRESSION
+        if (compression_stream_destroy)
+            compression_stream_destroy(&pfile_in_zip_read_info->astream);
+#else
         inflateEnd(&pfile_in_zip_read_info->stream);
+#endif
+        
+    }
+#ifdef HAVE_BZIP2
+    else if (pfile_in_zip_read_info->stream_initialised == Z_BZIP2ED)
+        BZ2_bzDecompressEnd(&pfile_in_zip_read_info->bstream);
+#endif
 
     pfile_in_zip_read_info->stream_initialised = 0;
     TRYFREE(pfile_in_zip_read_info);
 
-    s->pfile_in_zip_read=NULL;
+    s->pfile_in_zip_read = NULL;
 
     return err;
 }
 
-
-/*
-  Get the global comment string of the ZipFile, in the szComment buffer.
-  uSizeBuf is the size of the szComment buffer.
-  return the number of byte copied or an error code <0
-*/
-extern int ZEXPORT unzGetGlobalComment (file, szComment, uSizeBuf)
-    unzFile file;
-    char *szComment;
-    uLong uSizeBuf;
+extern int ZEXPORT unzGoToFirstFile2(unzFile file, unz_file_info64 *pfile_info, char *filename,
+    uint16_t filename_size, void *extrafield, uint16_t extrafield_size, char *comment, uint16_t comment_size)
 {
-    int err=UNZ_OK;
-    unz_s* s;
-    uLong uReadThis ;
-    if (file==NULL)
+    unz64_s *s = NULL;
+    int err = UNZ_OK;
+
+    if (file == NULL)
         return UNZ_PARAMERROR;
-    s=(unz_s*)file;
+    s = (unz64_s*)file;
 
-    uReadThis = uSizeBuf;
-    if (uReadThis>s->gi.size_comment)
-        uReadThis = s->gi.size_comment;
+    s->pos_in_central_dir = s->offset_central_dir;
+    s->num_file = 0;
 
-    if (ZSEEK(s->z_filefunc,s->filestream,s->central_pos+22,ZLIB_FILEFUNC_SEEK_SET)!=0)
-        return UNZ_ERRNO;
+    err = unzGetCurrentFileInfoInternal(file, &s->cur_file_info, &s->cur_file_info_internal,
+            filename, filename_size, extrafield, extrafield_size, comment,comment_size);
 
-    if (uReadThis>0)
+    s->current_file_ok = (err == UNZ_OK);
+    if ((err == UNZ_OK) && (pfile_info != NULL))
+        memcpy(pfile_info, &s->cur_file_info, sizeof(unz_file_info64));
+
+    return err;
+}
+
+extern int ZEXPORT unzGoToFirstFile(unzFile file)
+{
+    return unzGoToFirstFile2(file, NULL, NULL, 0, NULL, 0, NULL, 0);
+}
+
+extern int ZEXPORT unzGoToNextFile2(unzFile file, unz_file_info64 *pfile_info, char *filename,
+    uint16_t filename_size, void *extrafield, uint16_t extrafield_size, char *comment, uint16_t comment_size)
+{
+    unz64_s *s = NULL;
+    int err = UNZ_OK;
+
+    if (file == NULL)
+        return UNZ_PARAMERROR;
+    s = (unz64_s*)file;
+
+    if (!s->current_file_ok)
+        return UNZ_END_OF_LIST_OF_FILE;
+    if (s->gi.number_entry != UINT16_MAX)    /* 2^16 files overflow hack */
     {
-      *szComment='\0';
-      if (ZREAD(s->z_filefunc,s->filestream,szComment,uReadThis)!=uReadThis)
-        return UNZ_ERRNO;
+        if (s->num_file+1 == s->gi.number_entry)
+            return UNZ_END_OF_LIST_OF_FILE;
     }
 
-    if ((szComment != NULL) && (uSizeBuf > s->gi.size_comment))
-        *(szComment+s->gi.size_comment)='\0';
-    return (int)uReadThis;
+    s->pos_in_central_dir += SIZECENTRALDIRITEM + s->cur_file_info.size_filename +
+            s->cur_file_info.size_file_extra + s->cur_file_info.size_file_comment;
+    s->num_file += 1;
+
+    err = unzGetCurrentFileInfoInternal(file, &s->cur_file_info, &s->cur_file_info_internal,
+            filename, filename_size, extrafield,extrafield_size, comment, comment_size);
+
+    s->current_file_ok = (err == UNZ_OK);
+    if ((err == UNZ_OK) && (pfile_info != NULL))
+        memcpy(pfile_info, &s->cur_file_info, sizeof(unz_file_info64));
+
+    return err;
 }
 
-/* Additions by RX '2004 */
-extern uLong ZEXPORT unzGetOffset (file)
-    unzFile file;
+extern int ZEXPORT unzGoToNextFile(unzFile file)
 {
-    unz_s* s;
-
-    if (file==NULL)
-          return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    if (!s->current_file_ok)
-      return 0;
-    if (s->gi.number_entry != 0 && s->gi.number_entry != 0xffff)
-      if (s->num_file==s->gi.number_entry)
-         return 0;
-    return s->pos_in_central_dir;
+    return unzGoToNextFile2(file, NULL, NULL, 0, NULL, 0, NULL, 0);
 }
 
-extern int ZEXPORT unzSetOffset (file, pos)
-        unzFile file;
-        uLong pos;
+extern int ZEXPORT unzLocateFile(unzFile file, const char *filename, unzFileNameComparer filename_compare_func)
 {
-    unz_s* s;
-    int err;
+    unz64_s *s = NULL;
+    unz_file_info64 cur_file_info_saved;
+    unz_file_info64_internal cur_file_info_internal_saved;
+    uint64_t num_file_saved = 0;
+    uint64_t pos_in_central_dir_saved = 0;
+    char current_filename[UNZ_MAXFILENAMEINZIP+1];
+    int err = UNZ_OK;
 
-    if (file==NULL)
+    if (file == NULL)
         return UNZ_PARAMERROR;
-    s=(unz_s*)file;
+    if (strlen(filename) >= UNZ_MAXFILENAMEINZIP)
+        return UNZ_PARAMERROR;
+    s = (unz64_s*)file;
+    if (!s->current_file_ok)
+        return UNZ_END_OF_LIST_OF_FILE;
 
-    s->pos_in_central_dir = pos;
-    s->num_file = s->gi.number_entry;      /* hack */
-    err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
-                                              &s->cur_file_info_internal,
-                                              NULL,0,NULL,0,NULL,0);
+    /* Save the current state */
+    num_file_saved = s->num_file;
+    pos_in_central_dir_saved = s->pos_in_central_dir;
+    cur_file_info_saved = s->cur_file_info;
+    cur_file_info_internal_saved = s->cur_file_info_internal;
+
+    err = unzGoToFirstFile2(file, NULL, current_filename, sizeof(current_filename)-1, NULL, 0, NULL, 0);
+
+    while (err == UNZ_OK)
+    {
+        if (filename_compare_func != NULL)
+            err = filename_compare_func(file, current_filename, filename);
+        else
+            err = strcmp(current_filename, filename);
+        if (err == 0)
+            return UNZ_OK;
+        err = unzGoToNextFile2(file, NULL, current_filename, sizeof(current_filename)-1, NULL, 0, NULL, 0);
+    }
+
+    /* We failed, so restore the state of the 'current file' to where we were. */
+    s->num_file = num_file_saved;
+    s->pos_in_central_dir = pos_in_central_dir_saved;
+    s->cur_file_info = cur_file_info_saved;
+    s->cur_file_info_internal = cur_file_info_internal_saved;
+    return err;
+}
+
+extern int ZEXPORT unzGetFilePos(unzFile file, unz_file_pos *file_pos)
+{
+    unz64_file_pos file_pos64;
+    int err = unzGetFilePos64(file, &file_pos64);
+    if (err == UNZ_OK)
+    {
+        file_pos->pos_in_zip_directory = (uint32_t)file_pos64.pos_in_zip_directory;
+        file_pos->num_of_file = (uint32_t)file_pos64.num_of_file;
+    }
+    return err;
+}
+
+extern int ZEXPORT unzGoToFilePos(unzFile file, unz_file_pos *file_pos)
+{
+    unz64_file_pos file_pos64;
+    if (file_pos == NULL)
+        return UNZ_PARAMERROR;
+    file_pos64.pos_in_zip_directory = file_pos->pos_in_zip_directory;
+    file_pos64.num_of_file = file_pos->num_of_file;
+    return unzGoToFilePos64(file, &file_pos64);
+}
+
+extern int ZEXPORT unzGetFilePos64(unzFile file, unz64_file_pos *file_pos)
+{
+    unz64_s *s = NULL;
+
+    if (file == NULL || file_pos == NULL)
+        return UNZ_PARAMERROR;
+    s = (unz64_s*)file;
+    if (!s->current_file_ok)
+        return UNZ_END_OF_LIST_OF_FILE;
+
+    file_pos->pos_in_zip_directory  = s->pos_in_central_dir;
+    file_pos->num_of_file = s->num_file;
+    return UNZ_OK;
+}
+
+extern int ZEXPORT unzGoToFilePos64(unzFile file, const unz64_file_pos *file_pos)
+{
+    unz64_s *s = NULL;
+    int err = UNZ_OK;
+
+    if (file == NULL || file_pos == NULL)
+        return UNZ_PARAMERROR;
+    s = (unz64_s*)file;
+
+    /* Jump to the right spot */
+    s->pos_in_central_dir = file_pos->pos_in_zip_directory;
+    s->num_file = file_pos->num_of_file;
+
+    /* Set the current file */
+    err = unzGetCurrentFileInfoInternal(file, &s->cur_file_info, &s->cur_file_info_internal, NULL, 0, NULL, 0, NULL, 0);
+    /* Return results */
     s->current_file_ok = (err == UNZ_OK);
     return err;
 }
 
+extern int32_t ZEXPORT unzGetOffset(unzFile file)
+{
+    uint64_t offset64 = 0;
+
+    if (file == NULL)
+        return UNZ_PARAMERROR;
+    offset64 = unzGetOffset64(file);
+    return (int32_t)offset64;
+}
+
+extern int64_t ZEXPORT unzGetOffset64(unzFile file)
+{
+    unz64_s *s = NULL;
+
+    if (file == NULL)
+        return UNZ_PARAMERROR;
+    s = (unz64_s*)file;
+    if (!s->current_file_ok)
+        return 0;
+    if (s->gi.number_entry != 0 && s->gi.number_entry != UINT16_MAX)
+    {
+        if (s->num_file == s->gi.number_entry)
+            return 0;
+    }
+    return s->pos_in_central_dir;
+}
+
+extern int ZEXPORT unzSetOffset(unzFile file, uint32_t pos)
+{
+    return unzSetOffset64(file, pos);
+}
+
+extern int ZEXPORT unzSetOffset64(unzFile file, uint64_t pos)
+{
+    unz64_s *s = NULL;
+    int err = UNZ_OK;
+
+    if (file == NULL)
+        return UNZ_PARAMERROR;
+    s = (unz64_s*)file;
+    s->pos_in_central_dir = pos;
+    s->num_file = s->gi.number_entry; /* hack */
+
+    err = unzGetCurrentFileInfoInternal(file, &s->cur_file_info, &s->cur_file_info_internal, NULL, 0, NULL, 0, NULL, 0);
+
+    s->current_file_ok = (err == UNZ_OK);
+    return err;
+}
+
+extern int32_t ZEXPORT unzTell(unzFile file)
+{
+    unz64_s *s = NULL;
+    if (file == NULL)
+        return UNZ_PARAMERROR;
+    s = (unz64_s*)file;
+    if (s->pfile_in_zip_read == NULL)
+        return UNZ_PARAMERROR;
+    return (int32_t)s->pfile_in_zip_read->stream.total_out;
+}
+
+extern int64_t ZEXPORT unzTell64(unzFile file)
+{
+    unz64_s *s = NULL;
+    if (file == NULL)
+        return UNZ_PARAMERROR;
+    s = (unz64_s*)file;
+    if (s->pfile_in_zip_read == NULL)
+        return UNZ_PARAMERROR;
+    return s->pfile_in_zip_read->total_out_64;
+}
+
+extern int ZEXPORT unzSeek(unzFile file, uint32_t offset, int origin)
+{
+    return unzSeek64(file, offset, origin);
+}
+
+extern int ZEXPORT unzSeek64(unzFile file, uint64_t offset, int origin)
+{
+    unz64_s *s = NULL;
+    uint64_t stream_pos_begin = 0;
+    uint64_t stream_pos_end = 0;
+    uint64_t position = 0;
+    int is_within_buffer = 0;
+
+    if (file == NULL)
+        return UNZ_PARAMERROR;
+    s = (unz64_s*)file;
+
+    if (s->pfile_in_zip_read == NULL)
+        return UNZ_ERRNO;
+    if (s->pfile_in_zip_read->compression_method != 0)
+        return UNZ_ERRNO;
+
+    if (origin == SEEK_SET)
+        position = offset;
+    else if (origin == SEEK_CUR)
+        position = s->pfile_in_zip_read->total_out_64 + offset;
+    else if (origin == SEEK_END)
+        position = s->cur_file_info.compressed_size + offset;
+    else
+        return UNZ_PARAMERROR;
+
+    if (position > s->cur_file_info.compressed_size)
+        return UNZ_PARAMERROR;
+
+    stream_pos_end = s->pfile_in_zip_read->pos_in_zipfile;
+    stream_pos_begin = stream_pos_end;
+
+    if (stream_pos_begin > UNZ_BUFSIZE)
+        stream_pos_begin -= UNZ_BUFSIZE;
+    else
+        stream_pos_begin = 0;
+
+    is_within_buffer = 
+        (s->pfile_in_zip_read->stream.avail_in != 0) &&
+        (s->pfile_in_zip_read->rest_read_compressed != 0 || s->cur_file_info.compressed_size < UNZ_BUFSIZE) &&
+        (position >= stream_pos_begin && position < stream_pos_end);
+
+    if (is_within_buffer)
+    {
+        s->pfile_in_zip_read->stream.next_in += position - s->pfile_in_zip_read->total_out_64;
+        s->pfile_in_zip_read->stream.avail_in = (uInt)(stream_pos_end - position);
+    }
+    else
+    {
+        s->pfile_in_zip_read->stream.avail_in = 0;
+        s->pfile_in_zip_read->stream.next_in = 0;
+
+        s->pfile_in_zip_read->pos_in_zipfile = s->pfile_in_zip_read->offset_local_extrafield + position;
+        s->pfile_in_zip_read->rest_read_compressed = s->cur_file_info.compressed_size - position;
+    }
+
+    s->pfile_in_zip_read->rest_read_uncompressed -= (position - s->pfile_in_zip_read->total_out_64);
+    s->pfile_in_zip_read->stream.total_out = (uint32_t)position;
+    s->pfile_in_zip_read->total_out_64 = position;
+
+    return UNZ_OK;
+}
+
+extern int ZEXPORT unzEndOfFile(unzFile file)
+{
+    unz64_s *s = NULL;
+    if (file == NULL)
+        return UNZ_PARAMERROR;
+    s = (unz64_s*)file;
+    if (s->pfile_in_zip_read == NULL)
+        return UNZ_PARAMERROR;
+    if (s->pfile_in_zip_read->rest_read_uncompressed == 0)
+        return 1;
+    return 0;
+}
+
 #ifdef _WIN32
-#    pragma warning(pop)
-#endif // _WIN32
+#   pragma warning(pop)
+#endif // _WIN32
\ No newline at end of file
diff --git a/contrib/unzip/unzip.h b/contrib/unzip/unzip.h
index b247937c8..ea4c90a4d 100644
--- a/contrib/unzip/unzip.h
+++ b/contrib/unzip/unzip.h
@@ -1,49 +1,21 @@
 /* unzip.h -- IO for uncompress .zip files using zlib
-   Version 1.01e, February 12th, 2005
-
-   Copyright (C) 1998-2005 Gilles Vollant
-
-   This unzip package allow extract file from .ZIP file, compatible with PKZip 2.04g
-     WinZip, InfoZip tools and compatible.
-
-   Multi volume ZipFile (span) are not supported.
-   Encryption compatible with pkzip 2.04g only supported
-   Old compressions used by old PKZip 1.x are not supported
-
-
-   I WAIT FEEDBACK at mail info@winimage.com
-   Visit also http://www.winimage.com/zLibDll/unzip.htm for evolution
-
-   Condition of use and distribution are the same than zlib :
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
+   Version 1.1, February 14h, 2010
+   part of the MiniZip project
 
+   Copyright (C) 1998-2010 Gilles Vollant
+     http://www.winimage.com/zLibDll/minizip.html
+   Modifications of Unzip for Zip64
+     Copyright (C) 2007-2008 Even Rouault
+   Modifications for Zip64 support on both zip and unzip
+     Copyright (C) 2009-2010 Mathias Svensson
+     http://result42.com
 
+   This program is distributed under the terms of the same license as zlib.
+   See the accompanying LICENSE file for the full text of the license.
 */
 
-/* for more info about .ZIP format, see
-      http://www.info-zip.org/pub/infozip/doc/appnote-981119-iz.zip
-      http://www.info-zip.org/pub/infozip/doc/
-   PkWare has also a specification at :
-      ftp://ftp.pkware.com/probdesc.zip
-*/
-
-#ifndef _unz_H
-#define _unz_H
+#ifndef _UNZ_H
+#define _UNZ_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -57,16 +29,21 @@ extern "C" {
 #include "ioapi.h"
 #endif
 
+#ifdef HAVE_BZIP2
+#include "bzlib.h"
+#endif
+
+#define Z_BZIP2ED 12
+
 #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
 /* like the STRICT of WIN32, we define a pointer that cannot be converted
     from (void*) without cast */
-typedef struct TagunzFile__ { int unused; } unzFile__;
-typedef unzFile__ *unzFile;
+typedef struct TagunzFile__ { int unused; } unz_file__;
+typedef unz_file__ *unzFile;
 #else
 typedef voidp unzFile;
 #endif
 
-
 #define UNZ_OK                          (0)
 #define UNZ_END_OF_LIST_OF_FILE         (-100)
 #define UNZ_ERRNO                       (Z_ERRNO)
@@ -75,280 +52,255 @@ typedef voidp unzFile;
 #define UNZ_BADZIPFILE                  (-103)
 #define UNZ_INTERNALERROR               (-104)
 #define UNZ_CRCERROR                    (-105)
-
-/* tm_unz contain date/time info */
-typedef struct tm_unz_s
-{
-    uInt tm_sec;            /* seconds after the minute - [0,59] */
-    uInt tm_min;            /* minutes after the hour - [0,59] */
-    uInt tm_hour;           /* hours since midnight - [0,23] */
-    uInt tm_mday;           /* day of the month - [1,31] */
-    uInt tm_mon;            /* months since January - [0,11] */
-    uInt tm_year;           /* years - [1980..2044] */
-} tm_unz;
+#define UNZ_BADPASSWORD                 (-106)
 
 /* unz_global_info structure contain global data about the ZIPfile
    These data comes from the end of central dir */
+typedef struct unz_global_info64_s
+{
+    uint64_t number_entry;          /* total number of entries in the central dir on this disk */
+    uint32_t number_disk_with_CD;   /* number the the disk with central dir, used for spanning ZIP*/
+    uint16_t size_comment;          /* size of the global comment of the zipfile */
+} unz_global_info64;
+
 typedef struct unz_global_info_s
 {
-    uLong number_entry;         /* total number of entries in
-                       the central dir on this disk */
-    uLong size_comment;         /* size of the global comment of the zipfile */
+    uint32_t number_entry;          /* total number of entries in the central dir on this disk */
+    uint32_t number_disk_with_CD;   /* number the the disk with central dir, used for spanning ZIP*/
+    uint16_t size_comment;          /* size of the global comment of the zipfile */
 } unz_global_info;
 
-
 /* unz_file_info contain information about a file in the zipfile */
+typedef struct unz_file_info64_s
+{
+    uint16_t version;               /* version made by                 2 bytes */
+    uint16_t version_needed;        /* version needed to extract       2 bytes */
+    uint16_t flag;                  /* general purpose bit flag        2 bytes */
+    uint16_t compression_method;    /* compression method              2 bytes */
+    uint32_t dos_date;              /* last mod file date in Dos fmt   4 bytes */
+    uint32_t crc;                   /* crc-32                          4 bytes */
+    uint64_t compressed_size;       /* compressed size                 8 bytes */
+    uint64_t uncompressed_size;     /* uncompressed size               8 bytes */
+    uint16_t size_filename;         /* filename length                 2 bytes */
+    uint16_t size_file_extra;       /* extra field length              2 bytes */
+    uint16_t size_file_comment;     /* file comment length             2 bytes */
+
+    uint32_t disk_num_start;        /* disk number start               4 bytes */
+    uint16_t internal_fa;           /* internal file attributes        2 bytes */
+    uint32_t external_fa;           /* external file attributes        4 bytes */
+
+    uint64_t disk_offset;
+
+    uint16_t size_file_extra_internal;
+} unz_file_info64;
+
 typedef struct unz_file_info_s
 {
-    uLong version;              /* version made by                 2 bytes */
-    uLong version_needed;       /* version needed to extract       2 bytes */
-    uLong flag;                 /* general purpose bit flag        2 bytes */
-    uLong compression_method;   /* compression method              2 bytes */
-    uLong dosDate;              /* last mod file date in Dos fmt   4 bytes */
-    uLong crc;                  /* crc-32                          4 bytes */
-    uLong compressed_size;      /* compressed size                 4 bytes */
-    uLong uncompressed_size;    /* uncompressed size               4 bytes */
-    uLong size_filename;        /* filename length                 2 bytes */
-    uLong size_file_extra;      /* extra field length              2 bytes */
-    uLong size_file_comment;    /* file comment length             2 bytes */
+    uint16_t version;               /* version made by                 2 bytes */
+    uint16_t version_needed;        /* version needed to extract       2 bytes */
+    uint16_t flag;                  /* general purpose bit flag        2 bytes */
+    uint16_t compression_method;    /* compression method              2 bytes */
+    uint32_t dos_date;              /* last mod file date in Dos fmt   4 bytes */
+    uint32_t crc;                   /* crc-32                          4 bytes */
+    uint32_t compressed_size;       /* compressed size                 4 bytes */
+    uint32_t uncompressed_size;     /* uncompressed size               4 bytes */
+    uint16_t size_filename;         /* filename length                 2 bytes */
+    uint16_t size_file_extra;       /* extra field length              2 bytes */
+    uint16_t size_file_comment;     /* file comment length             2 bytes */
 
-    uLong disk_num_start;       /* disk number start               2 bytes */
-    uLong internal_fa;          /* internal file attributes        2 bytes */
-    uLong external_fa;          /* external file attributes        4 bytes */
+    uint16_t disk_num_start;        /* disk number start               2 bytes */
+    uint16_t internal_fa;           /* internal file attributes        2 bytes */
+    uint32_t external_fa;           /* external file attributes        4 bytes */
 
-    tm_unz tmu_date;
+    uint64_t disk_offset;
 } unz_file_info;
 
-extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
-                                                 const char* fileName2,
-                                                 int iCaseSensitivity));
-/*
-   Compare two filename (fileName1,fileName2).
-   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
-   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
-                                or strcasecmp)
-   If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
-    (like 1 on Unix, 2 on Windows)
-*/
+/***************************************************************************/
+/* Opening and close a zip file */
 
+extern unzFile ZEXPORT unzOpen(const char *path);
+extern unzFile ZEXPORT unzOpen64(const void *path);
+/* Open a Zip file.
 
-extern unzFile ZEXPORT unzOpen OF((const char *path));
-/*
-  Open a Zip file. path contain the full pathname (by example,
-     on a Windows XP computer "c:\\zlib\\zlib113.zip" or on an Unix computer
-     "zlib/zlib113.zip".
-     If the zipfile cannot be opened (file don't exist or in not valid), the
-       return value is NULL.
-     Else, the return value is a unzFile Handle, usable with other function
-       of this unzip package.
-*/
+   path should contain the full path (by example, on a Windows XP computer 
+      "c:\\zlib\\zlib113.zip" or on an Unix computer "zlib/zlib113.zip". 
+   return NULL if zipfile cannot be opened or doesn't exist
+   return unzFile handle if no error
 
-extern unzFile ZEXPORT unzOpen2 OF((const char *path,
-                                    zlib_filefunc_def* pzlib_filefunc_def));
-/*
-   Open a Zip file, like unzOpen, but provide a set of file low level API
-      for read/write the zip file (see ioapi.h)
-*/
+   NOTE: The "64" function take a const void *pointer, because  the path is just the value passed to the
+   open64_file_func callback. Under Windows, if UNICODE is defined, using fill_fopen64_filefunc, the path 
+   is a pointer to a wide unicode string  (LPCTSTR is LPCWSTR), so const char *does not describe the reality */
 
-extern int ZEXPORT unzClose OF((unzFile file));
-/*
-  Close a ZipFile opened with unzipOpen.
-  If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
-    these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
-  return UNZ_OK if there is no problem. */
+extern unzFile ZEXPORT unzOpen2(const char *path, zlib_filefunc_def *pzlib_filefunc_def);
+/* Open a Zip file, like unzOpen, but provide a set of file low level API for read/write operations */
+extern unzFile ZEXPORT unzOpen2_64(const void *path, zlib_filefunc64_def *pzlib_filefunc_def);
+/* Open a Zip file, like unz64Open, but provide a set of file low level API for read/write 64-bit operations */
 
-extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,
-                                        unz_global_info *pglobal_info));
-/*
-  Write info about the ZipFile in the *pglobal_info structure.
-  No preparation of the structure is needed
-  return UNZ_OK if there is no problem. */
+extern int ZEXPORT unzClose(unzFile file);
+/* Close a ZipFile opened with unzOpen. If there is files inside the .Zip opened with unzOpenCurrentFile,
+   these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
 
+   return UNZ_OK if there is no error */
 
-extern int ZEXPORT unzGetGlobalComment OF((unzFile file,
-                                           char *szComment,
-                                           uLong uSizeBuf));
-/*
-  Get the global comment string of the ZipFile, in the szComment buffer.
-  uSizeBuf is the size of the szComment buffer.
-  return the number of byte copied or an error code <0
-*/
+extern int ZEXPORT unzGetGlobalInfo(unzFile file, unz_global_info *pglobal_info);
+extern int ZEXPORT unzGetGlobalInfo64(unzFile file, unz_global_info64 *pglobal_info);
+/* Write info about the ZipFile in the *pglobal_info structure.
 
+   return UNZ_OK if no error */
+
+extern int ZEXPORT unzGetGlobalComment(unzFile file, char *comment, uint16_t comment_size);
+/* Get the global comment string of the ZipFile, in the comment buffer.
+
+   uSizeBuf is the size of the szComment buffer.
+   return the number of byte copied or an error code <0 */
 
 /***************************************************************************/
-/* Unzip package allow you browse the directory of the zipfile */
+/* Reading the content of the current zipfile, you can open it, read data from it, and close it
+   (you can close it before reading all the file) */
 
-extern int ZEXPORT unzGoToFirstFile OF((unzFile file));
-/*
-  Set the current file of the zipfile to the first file.
-  return UNZ_OK if there is no problem
-*/
+extern int ZEXPORT unzOpenCurrentFile(unzFile file);
+/* Open for reading data the current file in the zipfile.
 
-extern int ZEXPORT unzGoToNextFile OF((unzFile file));
-/*
-  Set the current file of the zipfile to the next file.
-  return UNZ_OK if there is no problem
-  return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
-*/
+   return UNZ_OK if no error */
 
-extern int ZEXPORT unzLocateFile OF((unzFile file,
-                     const char *szFileName,
-                     int iCaseSensitivity));
-/*
-  Try locate the file szFileName in the zipfile.
-  For the iCaseSensitivity signification, see unzStringFileNameCompare
+extern int ZEXPORT unzOpenCurrentFilePassword(unzFile file, const char *password);
+/* Open for reading data the current file in the zipfile.
+   password is a crypting password
 
-  return value :
-  UNZ_OK if the file is found. It becomes the current file.
-  UNZ_END_OF_LIST_OF_FILE if the file is not found
-*/
+   return UNZ_OK if no error */
 
+extern int ZEXPORT unzOpenCurrentFile2(unzFile file, int *method, int *level, int raw);
+/* Same as unzOpenCurrentFile, but open for read raw the file (not uncompress)
+   if raw==1 *method will receive method of compression, *level will receive level of compression
+
+   NOTE: you can set level parameter as NULL (if you did not want known level,
+         but you CANNOT set method parameter as NULL */
+
+extern int ZEXPORT unzOpenCurrentFile3(unzFile file, int *method, int *level, int raw, const char *password);
+/* Same as unzOpenCurrentFile, but takes extra parameter password for encrypted files */
+
+extern int ZEXPORT unzReadCurrentFile(unzFile file, voidp buf, uint32_t len);
+/* Read bytes from the current file (opened by unzOpenCurrentFile)
+   buf contain buffer where data must be copied
+   len the size of buf.
+
+   return the number of byte copied if somes bytes are copied
+   return 0 if the end of file was reached
+   return <0 with error code if there is an error (UNZ_ERRNO for IO error, or zLib error for uncompress error) */
+
+extern int ZEXPORT unzGetCurrentFileInfo(unzFile file, unz_file_info *pfile_info, char *filename, 
+    uint16_t filename_size, void *extrafield, uint16_t extrafield_size, char *comment, uint16_t comment_size);
+extern int ZEXPORT unzGetCurrentFileInfo64(unzFile file, unz_file_info64 *pfile_info, char *filename,
+    uint16_t filename_size, void *extrafield, uint16_t extrafield_size, char *comment, uint16_t comment_size);
+/* Get Info about the current file
+
+   pfile_info if != NULL, the *pfile_info structure will contain somes info about the current file
+   filename if != NULL, the file name string will be copied in filename 
+   filename_size is the size of the filename buffer
+   extrafield if != NULL, the extra field information from the central header will be copied in to
+   extrafield_size is the size of the extraField buffer 
+   comment if != NULL, the comment string of the file will be copied in to
+   comment_size is the size of the comment buffer */
+
+extern int ZEXPORT unzGetLocalExtrafield(unzFile file, voidp buf, uint32_t len);
+/* Read extra field from the current file (opened by unzOpenCurrentFile)
+   This is the local-header version of the extra field (sometimes, there is
+   more info in the local-header version than in the central-header)
+
+   if buf == NULL, it return the size of the local extra field
+   if buf != NULL, len is the size of the buffer, the extra header is copied in buf.
+
+   return number of bytes copied in buf, or (if <0) the error code */
+
+extern int ZEXPORT unzCloseCurrentFile(unzFile file);
+/* Close the file in zip opened with unzOpenCurrentFile
+
+   return UNZ_CRCERROR if all the file was read but the CRC is not good */
+
+/***************************************************************************/
+/* Browse the directory of the zipfile */
+
+typedef int (*unzFileNameComparer)(unzFile file, const char *filename1, const char *filename2);
+typedef int (*unzIteratorFunction)(unzFile file);
+typedef int (*unzIteratorFunction2)(unzFile file, unz_file_info64 *pfile_info, char *filename,
+    uint16_t filename_size, void *extrafield, uint16_t extrafield_size, char *comment, uint16_t comment_size);
+
+extern int ZEXPORT unzGoToFirstFile(unzFile file);
+/* Set the current file of the zipfile to the first file.
+
+   return UNZ_OK if no error */
+
+extern int ZEXPORT unzGoToFirstFile2(unzFile file, unz_file_info64 *pfile_info, char *filename,
+    uint16_t filename_size, void *extrafield, uint16_t extrafield_size, char *comment, uint16_t comment_size);
+/* Set the current file of the zipfile to the first file and retrieves the current info on success. 
+   Not as seek intensive as unzGoToFirstFile + unzGetCurrentFileInfo.
+
+   return UNZ_OK if no error */
+
+extern int ZEXPORT unzGoToNextFile(unzFile file);
+/* Set the current file of the zipfile to the next file.
+
+   return UNZ_OK if no error
+   return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest */
+
+extern int ZEXPORT unzGoToNextFile2(unzFile file, unz_file_info64 *pfile_info, char *filename,
+    uint16_t filename_size, void *extrafield, uint16_t extrafield_size, char *comment, uint16_t comment_size);
+/* Set the current file of the zipfile to the next file and retrieves the current 
+   info on success. Does less seeking around than unzGotoNextFile + unzGetCurrentFileInfo.
+
+   return UNZ_OK if no error
+   return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest */
+
+extern int ZEXPORT unzLocateFile(unzFile file, const char *filename, unzFileNameComparer filename_compare_func);
+/* Try locate the file szFileName in the zipfile. For custom filename comparison pass in comparison function.
+
+   return UNZ_OK if the file is found (it becomes the current file)
+   return UNZ_END_OF_LIST_OF_FILE if the file is not found */
+
+/***************************************************************************/
+/* Raw access to zip file */
 
-/* ****************************************** */
-/* Ryan supplied functions */
-/* unz_file_info contain information about a file in the zipfile */
 typedef struct unz_file_pos_s
 {
-    uLong pos_in_zip_directory;   /* offset in zip file directory */
-    uLong num_of_file;            /* # of file */
+    uint32_t pos_in_zip_directory;  /* offset in zip file directory */
+    uint32_t num_of_file;           /* # of file */
 } unz_file_pos;
 
-extern int ZEXPORT unzGetFilePos(
-    unzFile file,
-    unz_file_pos* file_pos);
+extern int ZEXPORT unzGetFilePos(unzFile file, unz_file_pos *file_pos);
+extern int ZEXPORT unzGoToFilePos(unzFile file, unz_file_pos *file_pos);
 
-extern int ZEXPORT unzGoToFilePos(
-    unzFile file,
-    unz_file_pos* file_pos);
+typedef struct unz64_file_pos_s
+{
+    uint64_t pos_in_zip_directory;   /* offset in zip file directory */
+    uint64_t num_of_file;            /* # of file */
+} unz64_file_pos;
 
-/* ****************************************** */
-
-extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
-                         unz_file_info *pfile_info,
-                         char *szFileName,
-                         uLong fileNameBufferSize,
-                         void *extraField,
-                         uLong extraFieldBufferSize,
-                         char *szComment,
-                         uLong commentBufferSize));
-/*
-  Get Info about the current file
-  if pfile_info!=NULL, the *pfile_info structure will contain somes info about
-        the current file
-  if szFileName!=NULL, the filemane string will be copied in szFileName
-            (fileNameBufferSize is the size of the buffer)
-  if extraField!=NULL, the extra field information will be copied in extraField
-            (extraFieldBufferSize is the size of the buffer).
-            This is the Central-header version of the extra field
-  if szComment!=NULL, the comment string of the file will be copied in szComment
-            (commentBufferSize is the size of the buffer)
-*/
-
-/***************************************************************************/
-/* for reading the content of the current zipfile, you can open it, read data
-   from it, and close it (you can close it before reading all the file)
-   */
-
-extern int ZEXPORT unzOpenCurrentFile OF((unzFile file));
-/*
-  Open for reading data the current file in the zipfile.
-  If there is no error, the return value is UNZ_OK.
-*/
-
-extern int ZEXPORT unzOpenCurrentFilePassword OF((unzFile file,
-                                                  const char* password));
-/*
-  Open for reading data the current file in the zipfile.
-  password is a crypting password
-  If there is no error, the return value is UNZ_OK.
-*/
-
-extern int ZEXPORT unzOpenCurrentFile2 OF((unzFile file,
-                                           int* method,
-                                           int* level,
-                                           int raw));
-/*
-  Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
-    if raw==1
-  *method will receive method of compression, *level will receive level of
-     compression
-  note : you can set level parameter as NULL (if you did not want known level,
-         but you CANNOT set method parameter as NULL
-*/
-
-extern int ZEXPORT unzOpenCurrentFile3 OF((unzFile file,
-                                           int* method,
-                                           int* level,
-                                           int raw,
-                                           const char* password));
-/*
-  Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
-    if raw==1
-  *method will receive method of compression, *level will receive level of
-     compression
-  note : you can set level parameter as NULL (if you did not want known level,
-         but you CANNOT set method parameter as NULL
-*/
-
-
-extern int ZEXPORT unzCloseCurrentFile OF((unzFile file));
-/*
-  Close the file in zip opened with unzOpenCurrentFile
-  Return UNZ_CRCERROR if all the file was read but the CRC is not good
-*/
-
-extern int ZEXPORT unzReadCurrentFile OF((unzFile file,
-                      voidp buf,
-                      unsigned len));
-/*
-  Read bytes from the current file (opened by unzOpenCurrentFile)
-  buf contain buffer where data must be copied
-  len the size of buf.
-
-  return the number of byte copied if somes bytes are copied
-  return 0 if the end of file was reached
-  return <0 with error code if there is an error
-    (UNZ_ERRNO for IO error, or zLib error for uncompress error)
-*/
-
-extern z_off_t ZEXPORT unztell OF((unzFile file));
-/*
-  Give the current position in uncompressed data
-*/
-
-extern int ZEXPORT unzeof OF((unzFile file));
-/*
-  return 1 if the end of file was reached, 0 elsewhere
-*/
-
-extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,
-                                             voidp buf,
-                                             unsigned len));
-/*
-  Read extra field from the current file (opened by unzOpenCurrentFile)
-  This is the local-header version of the extra field (sometimes, there is
-    more info in the local-header version than in the central-header)
-
-  if buf==NULL, it return the size of the local extra field
-
-  if buf!=NULL, len is the size of the buffer, the extra header is copied in
-    buf.
-  the return value is the number of bytes copied in buf, or (if <0)
-    the error code
-*/
-
-/***************************************************************************/
+extern int ZEXPORT unzGetFilePos64(unzFile file, unz64_file_pos *file_pos);
+extern int ZEXPORT unzGoToFilePos64(unzFile file, const unz64_file_pos *file_pos);
 
+extern int32_t ZEXPORT unzGetOffset(unzFile file);
+extern int64_t ZEXPORT unzGetOffset64(unzFile file);
 /* Get the current file offset */
-extern uLong ZEXPORT unzGetOffset (unzFile file);
 
+extern int ZEXPORT unzSetOffset(unzFile file, uint32_t pos);
+extern int ZEXPORT unzSetOffset64(unzFile file, uint64_t pos);
 /* Set the current file offset */
-extern int ZEXPORT unzSetOffset (unzFile file, uLong pos);
 
+extern int32_t ZEXPORT unzTell(unzFile file);
+extern int64_t ZEXPORT unzTell64(unzFile file);
+/* return current position in uncompressed data */
 
+extern int ZEXPORT unzSeek(unzFile file, uint32_t offset, int origin);
+extern int ZEXPORT unzSeek64(unzFile file, uint64_t offset, int origin);
+/* Seek within the uncompressed data if compression method is storage */
+
+extern int ZEXPORT unzEndOfFile(unzFile file);
+/* return 1 if the end of file was reached, 0 elsewhere */
+
+/***************************************************************************/
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* _unz_H */
+#endif /* _UNZ_H */
diff --git a/contrib/utf8cpp/source/utf8/checked.h b/contrib/utf8cpp/source/utf8/checked.h
index 133115513..648636e46 100644
--- a/contrib/utf8cpp/source/utf8/checked.h
+++ b/contrib/utf8cpp/source/utf8/checked.h
@@ -1,4 +1,4 @@
-// Copyright 2006 Nemanja Trifunovic
+// Copyright 2006-2016 Nemanja Trifunovic
 
 /*
 Permission is hereby granted, free of charge, to any person or organization
@@ -41,8 +41,8 @@ namespace utf8
     class invalid_code_point : public exception {
         uint32_t cp;
     public:
-        invalid_code_point(uint32_t cp) : cp(cp) {}
-        virtual const char* what() const throw() { return "Invalid code point"; }
+        invalid_code_point(uint32_t codepoint) : cp(codepoint) {}
+        virtual const char* what() const NOEXCEPT OVERRIDE { return "Invalid code point"; }
         uint32_t code_point() const {return cp;}
     };
 
@@ -50,7 +50,7 @@ namespace utf8
         uint8_t u8;
     public:
         invalid_utf8 (uint8_t u) : u8(u) {}
-        virtual const char* what() const throw() { return "Invalid UTF-8"; }
+        virtual const char* what() const NOEXCEPT OVERRIDE { return "Invalid UTF-8"; }
         uint8_t utf8_octet() const {return u8;}
     };
 
@@ -58,13 +58,13 @@ namespace utf8
         uint16_t u16;
     public:
         invalid_utf16 (uint16_t u) : u16(u) {}
-        virtual const char* what() const throw() { return "Invalid UTF-16"; }
+        virtual const char* what() const NOEXCEPT OVERRIDE { return "Invalid UTF-16"; }
         uint16_t utf16_word() const {return u16;}
     };
 
     class not_enough_room : public exception {
     public:
-        virtual const char* what() const throw() { return "Not enough space"; }
+        virtual const char* what() const NOEXCEPT OVERRIDE { return "Not enough space"; }
     };
 
     /// The library API - functions intended to be called by the users
@@ -107,7 +107,9 @@ namespace utf8
                         *out++ = *it;
                     break;
                 case internal::NOT_ENOUGH_ROOM:
-                    throw not_enough_room();
+                    out = utf8::append (replacement, out);
+                    start = end;
+                    break;
                 case internal::INVALID_LEAD:
                     out = utf8::append (replacement, out);
                     ++start;
@@ -174,23 +176,19 @@ namespace utf8
         return utf8::peek_next(it, end);
     }
 
-    /// Deprecated in versions that include "prior"
-    template <typename octet_iterator>
-    uint32_t previous(octet_iterator& it, octet_iterator pass_start)
-    {
-        octet_iterator end = it;
-        while (utf8::internal::is_trail(*(--it)))
-            if (it == pass_start)
-                throw invalid_utf8(*it); // error - no lead byte in the sequence
-        octet_iterator temp = it;
-        return utf8::next(temp, end);
-    }
-
     template <typename octet_iterator, typename distance_type>
     void advance (octet_iterator& it, distance_type n, octet_iterator end)
     {
-        for (distance_type i = 0; i < n; ++i)
-            utf8::next(it, end);
+        const distance_type zero(0);
+        if (n < zero) {
+            // backward
+            for (distance_type i = n; i < zero; ++i)
+                utf8::prior(it, end);
+        } else {
+            // forward
+            for (distance_type i = zero; i < n; ++i)
+                utf8::next(it, end);
+        }
     }
 
     template <typename octet_iterator>
@@ -233,7 +231,7 @@ namespace utf8
     template <typename u16bit_iterator, typename octet_iterator>
     u16bit_iterator utf8to16 (octet_iterator start, octet_iterator end, u16bit_iterator result)
     {
-        while (start != end) {
+        while (start < end) {
             uint32_t cp = utf8::next(start, end);
             if (cp > 0xffff) { //make a surrogate pair
                 *result++ = static_cast<uint16_t>((cp >> 10)   + internal::LEAD_OFFSET);
@@ -257,7 +255,7 @@ namespace utf8
     template <typename octet_iterator, typename u32bit_iterator>
     u32bit_iterator utf8to32 (octet_iterator start, octet_iterator end, u32bit_iterator result)
     {
-        while (start != end)
+        while (start < end)
             (*result++) = utf8::next(start, end);
 
         return result;
@@ -265,16 +263,21 @@ namespace utf8
 
     // The iterator class
     template <typename octet_iterator>
-    class iterator : public std::iterator <std::bidirectional_iterator_tag, uint32_t> {
+    class iterator {
       octet_iterator it;
       octet_iterator range_start;
       octet_iterator range_end;
       public:
+      typedef uint32_t value_type;
+      typedef uint32_t* pointer;
+      typedef uint32_t& reference;
+      typedef std::ptrdiff_t difference_type;
+      typedef std::bidirectional_iterator_tag iterator_category;
       iterator () {}
       explicit iterator (const octet_iterator& octet_it,
-                         const octet_iterator& range_start,
-                         const octet_iterator& range_end) :
-               it(octet_it), range_start(range_start), range_end(range_end)
+                         const octet_iterator& rangestart,
+                         const octet_iterator& rangeend) :
+               it(octet_it), range_start(rangestart), range_end(rangeend)
       {
           if (it < range_start || it > range_end)
               throw std::out_of_range("Invalid utf-8 iterator position");
@@ -322,6 +325,9 @@ namespace utf8
 
 } // namespace utf8
 
+#if UTF_CPP_CPLUSPLUS >= 201103L // C++ 11 or later
+#include "cpp11.h"
+#endif // C++ 11 or later
+
 #endif //header guard
 
-
diff --git a/contrib/utf8cpp/source/utf8/core.h b/contrib/utf8cpp/source/utf8/core.h
index 693d388c0..244e89231 100644
--- a/contrib/utf8cpp/source/utf8/core.h
+++ b/contrib/utf8cpp/source/utf8/core.h
@@ -30,6 +30,23 @@ DEALINGS IN THE SOFTWARE.
 
 #include <iterator>
 
+// Determine the C++ standard version.
+// If the user defines UTF_CPP_CPLUSPLUS, use that.
+// Otherwise, trust the unreliable predefined macro __cplusplus
+
+#if !defined UTF_CPP_CPLUSPLUS
+    #define UTF_CPP_CPLUSPLUS __cplusplus
+#endif
+
+#if UTF_CPP_CPLUSPLUS >= 201103L // C++ 11 or later
+    #define OVERRIDE override
+    #define NOEXCEPT noexcept
+#else // C++ 98/03
+    #define OVERRIDE
+    #define NOEXCEPT throw()
+#endif // C++ 11 or later
+
+
 namespace utf8
 {
     // The typedefs for 8-bit, 16-bit and 32-bit unsigned integers
@@ -49,8 +66,8 @@ namespace internal
     const uint16_t LEAD_SURROGATE_MAX  = 0xdbffu;
     const uint16_t TRAIL_SURROGATE_MIN = 0xdc00u;
     const uint16_t TRAIL_SURROGATE_MAX = 0xdfffu;
-    const uint16_t LEAD_OFFSET         = LEAD_SURROGATE_MIN - (0x10000 >> 10);
-    const uint32_t SURROGATE_OFFSET    = 0x10000u - (LEAD_SURROGATE_MIN << 10) - TRAIL_SURROGATE_MIN;
+    const uint16_t LEAD_OFFSET         = 0xd7c0u;       // LEAD_SURROGATE_MIN - (0x10000 >> 10)
+    const uint32_t SURROGATE_OFFSET    = 0xfca02400u;   // 0x10000u - (LEAD_SURROGATE_MIN << 10) - TRAIL_SURROGATE_MIN
 
     // Maximum valid value for a Unicode code point
     const uint32_t CODE_POINT_MAX      = 0x0010ffffu;
@@ -142,7 +159,7 @@ namespace internal
 
         if (!utf8::internal::is_trail(*it))
             return INCOMPLETE_SEQUENCE;
-        
+
         return UTF8_OK;
     }
 
@@ -165,7 +182,7 @@ namespace internal
     {
         if (it == end) 
             return NOT_ENOUGH_ROOM;
-        
+
         code_point = utf8::internal::mask8(*it);
 
         UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
@@ -222,6 +239,9 @@ namespace internal
     template <typename octet_iterator>
     utf_error validate_next(octet_iterator& it, octet_iterator end, uint32_t& code_point)
     {
+        if (it == end)
+            return NOT_ENOUGH_ROOM;
+
         // Save the original value of it so we can go back in case of failure
         // Of course, it does not make much sense with i.e. stream iterators
         octet_iterator original_it = it;
@@ -234,7 +254,7 @@ namespace internal
         // Get trail octets and calculate the code point
         utf_error err = UTF8_OK;
         switch (length) {
-            case 0: 
+            case 0:
                 return INVALID_LEAD;
             case 1:
                 err = utf8::internal::get_sequence_1(it, end, cp);
@@ -310,18 +330,7 @@ namespace internal
             ((it != end) && (utf8::internal::mask8(*it++)) == bom[1]) &&
             ((it != end) && (utf8::internal::mask8(*it))   == bom[2])
            );
-    }
-	
-    //Deprecated in release 2.3 
-    template <typename octet_iterator>
-    inline bool is_bom (octet_iterator it)
-    {
-        return (
-            (utf8::internal::mask8(*it++)) == bom[0] &&
-            (utf8::internal::mask8(*it++)) == bom[1] &&
-            (utf8::internal::mask8(*it))   == bom[2]
-           );
-    }
+    }	
 } // namespace utf8
 
 #endif // header guard
diff --git a/contrib/utf8cpp/source/utf8/cpp11.h b/contrib/utf8cpp/source/utf8/cpp11.h
new file mode 100644
index 000000000..d93961b04
--- /dev/null
+++ b/contrib/utf8cpp/source/utf8/cpp11.h
@@ -0,0 +1,103 @@
+// Copyright 2018 Nemanja Trifunovic
+
+/*
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+*/
+
+
+#ifndef UTF8_FOR_CPP_a184c22c_d012_11e8_a8d5_f2801f1b9fd1
+#define UTF8_FOR_CPP_a184c22c_d012_11e8_a8d5_f2801f1b9fd1
+
+#include "checked.h"
+#include <string>
+
+namespace utf8
+{
+
+    inline void append(char32_t cp, std::string& s)
+    {
+        append(uint32_t(cp), std::back_inserter(s));
+    }
+
+    inline std::string utf16to8(const std::u16string& s)
+    {
+        std::string result;
+        utf16to8(s.begin(), s.end(), std::back_inserter(result));
+        return result;
+    }
+
+    inline std::u16string utf8to16(const std::string& s)
+    {
+        std::u16string result;
+        utf8to16(s.begin(), s.end(), std::back_inserter(result));
+        return result;
+    }
+
+    inline std::string utf32to8(const std::u32string& s)
+    {
+        std::string result;
+        utf32to8(s.begin(), s.end(), std::back_inserter(result));
+        return result;
+    }
+
+    inline std::u32string utf8to32(const std::string& s)
+    {
+        std::u32string result;
+        utf8to32(s.begin(), s.end(), std::back_inserter(result));
+        return result;
+    }
+
+    inline std::size_t find_invalid(const std::string& s)
+    {
+        std::string::const_iterator invalid = find_invalid(s.begin(), s.end());
+        return (invalid == s.end()) ? std::string::npos : (invalid - s.begin());
+    }
+
+    inline bool is_valid(const std::string& s)
+    {
+        return is_valid(s.begin(), s.end());
+    }
+
+    inline std::string replace_invalid(const std::string& s, char32_t replacement)
+    {
+        std::string result;
+        replace_invalid(s.begin(), s.end(), std::back_inserter(result), replacement);
+        return result;
+    }
+
+    inline std::string replace_invalid(const std::string& s)
+    {
+        std::string result;
+        replace_invalid(s.begin(), s.end(), std::back_inserter(result));
+        return result;
+    }
+
+    inline bool starts_with_bom(const std::string& s)
+    {
+        return starts_with_bom(s.begin(), s.end());
+    }
+ 
+} // namespace utf8
+
+#endif // header guard
+
diff --git a/contrib/utf8cpp/source/utf8/unchecked.h b/contrib/utf8cpp/source/utf8/unchecked.h
index cb2427166..0e1b51cc7 100644
--- a/contrib/utf8cpp/source/utf8/unchecked.h
+++ b/contrib/utf8cpp/source/utf8/unchecked.h
@@ -32,13 +32,13 @@ DEALINGS IN THE SOFTWARE.
 
 namespace utf8
 {
-    namespace unchecked 
+    namespace unchecked
     {
         template <typename octet_iterator>
         octet_iterator append(uint32_t cp, octet_iterator result)
         {
             if (cp < 0x80)                        // one octet
-                *(result++) = static_cast<uint8_t>(cp);  
+                *(result++) = static_cast<uint8_t>(cp);
             else if (cp < 0x800) {                // two octets
                 *(result++) = static_cast<uint8_t>((cp >> 6)          | 0xc0);
                 *(result++) = static_cast<uint8_t>((cp & 0x3f)        | 0x80);
@@ -57,6 +57,46 @@ namespace utf8
             return result;
         }
 
+        template <typename octet_iterator, typename output_iterator>
+        output_iterator replace_invalid(octet_iterator start, octet_iterator end, output_iterator out, uint32_t replacement)
+        {
+            while (start != end) {
+                octet_iterator sequence_start = start;
+                internal::utf_error err_code = utf8::internal::validate_next(start, end);
+                switch (err_code) {
+                    case internal::UTF8_OK :
+                        for (octet_iterator it = sequence_start; it != start; ++it)
+                            *out++ = *it;
+                        break;
+                    case internal::NOT_ENOUGH_ROOM:
+                        out = utf8::unchecked::append (replacement, out);
+                        start = end;
+                        break;
+                    case internal::INVALID_LEAD:
+                        out = utf8::unchecked::append (replacement, out);
+                        ++start;
+                        break;
+                    case internal::INCOMPLETE_SEQUENCE:
+                    case internal::OVERLONG_SEQUENCE:
+                    case internal::INVALID_CODE_POINT:
+                        out = utf8::unchecked::append (replacement, out);
+                        ++start;
+                        // just one replacement mark for the sequence
+                        while (start != end && utf8::internal::is_trail(*start))
+                            ++start;
+                        break;
+                }
+            }
+            return out;
+        }
+
+        template <typename octet_iterator, typename output_iterator>
+        inline output_iterator replace_invalid(octet_iterator start, octet_iterator end, output_iterator out)
+        {
+            static const uint32_t replacement_marker = utf8::internal::mask16(0xfffd);
+            return utf8::unchecked::replace_invalid(start, end, out, replacement_marker);
+        }
+
         template <typename octet_iterator>
         uint32_t next(octet_iterator& it)
         {
@@ -85,13 +125,13 @@ namespace utf8
                     break;
             }
             ++it;
-            return cp;        
+            return cp;
         }
 
         template <typename octet_iterator>
         uint32_t peek_next(octet_iterator it)
         {
-            return utf8::unchecked::next(it);    
+            return utf8::unchecked::next(it);
         }
 
         template <typename octet_iterator>
@@ -102,18 +142,19 @@ namespace utf8
             return utf8::unchecked::next(temp);
         }
 
-        // Deprecated in versions that include prior, but only for the sake of consistency (see utf8::previous)
-        template <typename octet_iterator>
-        inline uint32_t previous(octet_iterator& it)
-        {
-            return utf8::unchecked::prior(it);
-        }
-
         template <typename octet_iterator, typename distance_type>
         void advance (octet_iterator& it, distance_type n)
         {
-            for (distance_type i = 0; i < n; ++i)
-                utf8::unchecked::next(it);
+            const distance_type zero(0);
+            if (n < zero) {
+                // backward
+                for (distance_type i = n; i < zero; ++i)
+                    utf8::unchecked::prior(it);
+            } else {
+                // forward
+                for (distance_type i = zero; i < n; ++i)
+                    utf8::unchecked::next(it);
+            }
         }
 
         template <typename octet_iterator>
@@ -128,7 +169,7 @@ namespace utf8
 
         template <typename u16bit_iterator, typename octet_iterator>
         octet_iterator utf16to8 (u16bit_iterator start, u16bit_iterator end, octet_iterator result)
-        {       
+        {
             while (start != end) {
                 uint32_t cp = utf8::internal::mask16(*start++);
             // Take care of surrogate pairs first
@@ -138,7 +179,7 @@ namespace utf8
                 }
                 result = utf8::unchecked::append(cp, result);
             }
-            return result;         
+            return result;
         }
 
         template <typename u16bit_iterator, typename octet_iterator>
@@ -176,9 +217,14 @@ namespace utf8
 
         // The iterator class
         template <typename octet_iterator>
-          class iterator : public std::iterator <std::bidirectional_iterator_tag, uint32_t> { 
+          class iterator {
             octet_iterator it;
             public:
+            typedef uint32_t value_type;
+            typedef uint32_t* pointer;
+            typedef uint32_t& reference;
+            typedef std::ptrdiff_t difference_type;
+            typedef std::bidirectional_iterator_tag iterator_category;
             iterator () {}
             explicit iterator (const octet_iterator& octet_it): it(octet_it) {}
             // the default "big three" are OK
diff --git a/contrib/zip/src/miniz.h b/contrib/zip/src/miniz.h
index 07f7b2de2..7570ae929 100644
--- a/contrib/zip/src/miniz.h
+++ b/contrib/zip/src/miniz.h
@@ -5361,7 +5361,7 @@ mz_bool mz_zip_reader_extract_to_mem_no_alloc(mz_zip_archive *pZip,
   } else {
     // Temporarily allocate a read buffer.
     read_buf_size = MZ_MIN(file_stat.m_comp_size, MZ_ZIP_MAX_IO_BUF_SIZE);
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(__clang__)
     if (((0, sizeof(size_t) == sizeof(mz_uint32))) &&
         (read_buf_size > 0x7FFFFFFF))
 #else
@@ -5454,7 +5454,7 @@ void *mz_zip_reader_extract_to_heap(mz_zip_archive *pZip, mz_uint file_index,
   uncomp_size = MZ_READ_LE32(p + MZ_ZIP_CDH_DECOMPRESSED_SIZE_OFS);
 
   alloc_size = (flags & MZ_ZIP_FLAG_COMPRESSED_DATA) ? comp_size : uncomp_size;
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(__clang__)
   if (((0, sizeof(size_t) == sizeof(mz_uint32))) && (alloc_size > 0x7FFFFFFF))
 #else
   if (((sizeof(size_t) == sizeof(mz_uint32))) && (alloc_size > 0x7FFFFFFF))
@@ -5560,7 +5560,7 @@ mz_bool mz_zip_reader_extract_to_callback(mz_zip_archive *pZip,
   if ((flags & MZ_ZIP_FLAG_COMPRESSED_DATA) || (!file_stat.m_method)) {
     // The file is stored or the caller has requested the compressed data.
     if (pZip->m_pState->m_pMem) {
-#ifdef _MSC_VER
+#if defined (_MSC_VER) && !defined(__clang__)
       if (((0, sizeof(size_t) == sizeof(mz_uint32))) &&
           (file_stat.m_comp_size > 0xFFFFFFFF))
 #else
diff --git a/contrib/zip/src/zip.c b/contrib/zip/src/zip.c
index 0020df0ed..83e8e2a41 100644
--- a/contrib/zip/src/zip.c
+++ b/contrib/zip/src/zip.c
@@ -18,8 +18,10 @@
 /* Win32, DOS, MSVC, MSVS */
 #include <direct.h>
 
+#ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable : 4706)
+#endif // _MSC_VER
 
 #define MKDIR(DIRNAME) _mkdir(DIRNAME)
 #define STRCLONE(STR) ((STR) ? _strdup(STR) : NULL)
@@ -968,4 +970,6 @@ out:
   return status;
 }
 
+#ifdef _MSC_VER
 #pragma warning(pop)
+#endif // _MSC_VER
diff --git a/contrib/zip/src/zip.h b/contrib/zip/src/zip.h
index 807e328a8..87f3654f4 100644
--- a/contrib/zip/src/zip.h
+++ b/contrib/zip/src/zip.h
@@ -15,9 +15,10 @@
 #include <string.h>
 #include <sys/types.h>
 
-#ifdef _WIN32
+#ifdef _MSC_VER
+#pragma warning(push)
 #pragma warning(disable : 4127 )
-#endif //_WIN32
+#endif //_MSC_VER
 
 #ifdef __cplusplus
 extern "C" {
@@ -319,6 +320,10 @@ extern int zip_extract(const char *zipname, const char *dir,
 
 /** @} */
 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif //_MSC_VER
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/contrib/zlib/CMakeLists.txt b/contrib/zlib/CMakeLists.txt
index 664c83a71..469151ff6 100644
--- a/contrib/zlib/CMakeLists.txt
+++ b/contrib/zlib/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.4.4)
+cmake_minimum_required(VERSION 3.10.0)
 set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
 
 # CMake 3.0 changed the project command, setting policy CMP0048 reverts to the old behaviour.
@@ -199,7 +199,8 @@ endif(MINGW)
 add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
 
 INSTALL( TARGETS zlibstatic
-         LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
-         ARCHIVE DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
-         RUNTIME DESTINATION ${ASSIMP_BIN_INSTALL_DIR}
-         COMPONENT ${LIBASSIMP_COMPONENT})
+     EXPORT "${TARGETS_EXPORT_NAME}"
+     LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
+     ARCHIVE DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
+     RUNTIME DESTINATION ${ASSIMP_BIN_INSTALL_DIR}
+     COMPONENT ${LIBASSIMP_COMPONENT})
diff --git a/doc/dox.h b/doc/dox.h
index 910e77eae..a4516dc7a 100644
--- a/doc/dox.h
+++ b/doc/dox.h
@@ -1626,7 +1626,7 @@ void xxxxImporter::InternReadFile( const std::string& pFile,
 
 	// Check whether we can read from the file
 	if( file.get() == NULL) {
-		throw DeadlyImportError( "Failed to open xxxx file " + pFile + ".");
+		throw DeadlyImportError( "Failed to open xxxx file ", pFile, ".");
 	}
 
 	// Your task: fill pScene
diff --git a/fuzz/assimp_fuzzer.cc b/fuzz/assimp_fuzzer.cc
index 86ffe18ed..b65ee0236 100644
--- a/fuzz/assimp_fuzzer.cc
+++ b/fuzz/assimp_fuzzer.cc
@@ -39,9 +39,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ---------------------------------------------------------------------------
 */
 #include <assimp/cimport.h>
+#include <assimp/Importer.hpp>
 #include <assimp/scene.h>
 #include <assimp/postprocess.h>
 
+using namespace Assimp;
+
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t dataSize) {
 	aiLogStream stream = aiGetPredefinedLogStream(aiDefaultLogStream_STDOUT,NULL);
 	aiAttachLogStream(&stream);
diff --git a/include/assimp/BaseImporter.h b/include/assimp/BaseImporter.h
index ed146168d..a8239be8d 100644
--- a/include/assimp/BaseImporter.h
+++ b/include/assimp/BaseImporter.h
@@ -4,7 +4,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -40,7 +39,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ----------------------------------------------------------------------
 */
 
-/** @file Definition of the base class for all importer worker classes. */
+/// @file Definition of the base class for all importer worker classes.
+
 #pragma once
 #ifndef INCLUDED_AI_BASEIMPORTER_H
 #define INCLUDED_AI_BASEIMPORTER_H
@@ -57,6 +57,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <map>
 #include <set>
 #include <vector>
+#include <memory>
 
 struct aiScene;
 struct aiImporterDesc;
@@ -86,10 +87,6 @@ class IOStream;
 class ASSIMP_API BaseImporter {
     friend class Importer;
 
-private:
-    /* Pushes state into importer for the importer scale */
-    virtual void UpdateImporterScale(Importer *pImp);
-
 public:
     /** Constructor to be privately used by #Importer */
     BaseImporter() AI_NO_EXCEPT;
@@ -146,6 +143,8 @@ public:
 
     // -------------------------------------------------------------------
     /** Returns the error description of the last error that occurred.
+     * If the error is due to a std::exception, this will return the message.
+     * Exceptions can also be accessed with GetException().
      * @return A description of the last error that occurred. An empty
      * string if there was no error.
      */
@@ -153,6 +152,16 @@ public:
         return m_ErrorText;
     }
 
+    // -------------------------------------------------------------------
+    /** Returns the exception of the last exception that occurred.
+     * Note: Exceptions are not the only source of error details, so GetErrorText
+     * should be consulted too.
+     * @return The last exception that occurred. 
+     */
+    const std::exception_ptr& GetException() const {
+        return m_Exception;
+    }
+
     // -------------------------------------------------------------------
     /** Called prior to ReadFile().
      * The function is a request to the importer to update its configuration
@@ -391,9 +400,33 @@ public: // static utilities
         }
     }
 
+    // -------------------------------------------------------------------
+    /** Utility function to move a std::vector of unique_ptrs into a aiScene array
+    *  @param vec The vector of unique_ptrs to be moved
+    *  @param out The output pointer to the allocated array.
+    *  @param numOut The output count of elements copied. */
+    template <typename T>
+    AI_FORCE_INLINE static void CopyVector(
+            std::vector<std::unique_ptr<T> > &vec,
+            T **&out,
+            unsigned int &outLength) {
+        outLength = unsigned(vec.size());
+        if (outLength) {
+            out = new T*[outLength];
+            T** outPtr = out;
+            std::for_each(vec.begin(), vec.end(), [&outPtr](std::unique_ptr<T>& uPtr){*outPtr = uPtr.release(); ++outPtr; });
+        }
+    }
+
+private:
+    /* Pushes state into importer for the importer scale */
+    virtual void UpdateImporterScale(Importer *pImp);
+
 protected:
     /// Error description in case there was one.
     std::string m_ErrorText;
+    /// The exception, in case there was one.
+    std::exception_ptr m_Exception;
     /// Currently set progress handler.
     ProgressHandler *m_progress;
 };
diff --git a/include/assimp/Compiler/poppack1.h b/include/assimp/Compiler/poppack1.h
index e033bc147..a8e9a3c7e 100644
--- a/include/assimp/Compiler/poppack1.h
+++ b/include/assimp/Compiler/poppack1.h
@@ -14,7 +14,7 @@
 #endif
 
 // reset packing to the original value
-#if defined(_MSC_VER) ||  defined(__BORLANDC__) || defined (__BCPLUSPLUS__)
+#if (defined(_MSC_VER) && !defined(__clang__)) ||  defined(__BORLANDC__) || defined (__BCPLUSPLUS__)
 #	pragma pack( pop )
 #endif
 #undef PACK_STRUCT
diff --git a/include/assimp/Compiler/pushpack1.h b/include/assimp/Compiler/pushpack1.h
index 4c9fbb857..2a5e2dfe6 100644
--- a/include/assimp/Compiler/pushpack1.h
+++ b/include/assimp/Compiler/pushpack1.h
@@ -22,7 +22,7 @@
 #	error poppack1.h must be included after pushpack1.h
 #endif
 
-#if defined(_MSC_VER) ||  defined(__BORLANDC__) ||	defined (__BCPLUSPLUS__)
+#if (defined(_MSC_VER) && !defined(__clang__)) ||  defined(__BORLANDC__) ||	defined (__BCPLUSPLUS__)
 #	pragma pack(push,1)
 #	define PACK_STRUCT
 #elif defined( __GNUC__ ) || defined(__clang__)
diff --git a/include/assimp/CreateAnimMesh.h b/include/assimp/CreateAnimMesh.h
index 01a118ba3..c327fa442 100644
--- a/include/assimp/CreateAnimMesh.h
+++ b/include/assimp/CreateAnimMesh.h
@@ -57,10 +57,20 @@ namespace Assimp {
 
 /**
  *  Create aiAnimMesh from aiMesh.
- *  @param  mesh    The input mesh to create an animated mesh from.
+ *  @param  mesh            The input mesh to create an animated mesh from.
+ *  @param  needPositions   If true, positions will be copied from.
+ *  @param  needNormals     If true, normals will be copied from.
+ *  @param  needTangents    If true, tangents and bitangents will be copied from.
+ *  @param  needColors      If true, colors will be copied from.
+ *  @param  needTexCoords   If true, texCoords will be copied from.
  *  @return The new created animated mesh.
  */
-ASSIMP_API aiAnimMesh *aiCreateAnimMesh(const aiMesh *mesh);
+ASSIMP_API aiAnimMesh *aiCreateAnimMesh(const aiMesh *mesh,
+                                        bool needPositions = true,
+                                        bool needNormals = true,
+                                        bool needTangents = true,
+                                        bool needColors = true,
+                                        bool needTexCoords = true);
 
 } // end of namespace Assimp
 
diff --git a/include/assimp/Exceptional.h b/include/assimp/Exceptional.h
index c10b2f982..6c184383d 100644
--- a/include/assimp/Exceptional.h
+++ b/include/assimp/Exceptional.h
@@ -47,6 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #endif
 
 #include <assimp/DefaultIOStream.h>
+#include <assimp/TinyFormatter.h>
 #include <stdexcept>
 
 using std::runtime_error;
@@ -55,26 +56,33 @@ using std::runtime_error;
 #pragma warning(disable : 4275)
 #endif
 
+class ASSIMP_API DeadlyErrorBase : public runtime_error {
+protected:
+    DeadlyErrorBase(Assimp::Formatter::format f);
+    
+    template<typename... T, typename U>
+    DeadlyErrorBase(Assimp::Formatter::format f, U&& u, T&&... args) :
+            DeadlyErrorBase(std::move(f << std::forward<U>(u)), std::forward<T>(args)...) {}
+};
+
 // ---------------------------------------------------------------------------
 /** FOR IMPORTER PLUGINS ONLY: Simple exception class to be thrown if an
  *  unrecoverable error occurs while importing. Loading APIs return
  *  nullptr instead of a valid aiScene then.  */
-class DeadlyImportError : public runtime_error {
+class ASSIMP_API DeadlyImportError : public DeadlyErrorBase {
 public:
     /** Constructor with arguments */
-    explicit DeadlyImportError(const std::string &errorText) :
-            runtime_error(errorText) {
-        // empty
-    }
+    template<typename... T>
+    explicit DeadlyImportError(T&&... args) :
+            DeadlyErrorBase(Assimp::Formatter::format(), std::forward<T>(args)...) {}
 };
 
-class DeadlyExportError : public runtime_error {
+class ASSIMP_API DeadlyExportError : public DeadlyErrorBase {
 public:
     /** Constructor with arguments */
-    explicit DeadlyExportError(const std::string &errorText) :
-            runtime_error(errorText) {
-        // empty
-    }
+    template<typename... T>
+    explicit DeadlyExportError(T&&... args) :
+            DeadlyErrorBase(Assimp::Formatter::format(), std::forward<T>(args)...) {}
 };
 
 #ifdef _MSC_VER
@@ -123,17 +131,19 @@ struct ExceptionSwallower<void> {
     {                                   \
         try {
 
-#define ASSIMP_END_EXCEPTION_REGION_WITH_ERROR_STRING(type, ASSIMP_END_EXCEPTION_REGION_errorString) \
-    }                                                                                                \
-    catch (const DeadlyImportError &e) {                                                             \
-        ASSIMP_END_EXCEPTION_REGION_errorString = e.what();                                          \
-        return ExceptionSwallower<type>()();                                                         \
-    }                                                                                                \
-    catch (...) {                                                                                    \
-        ASSIMP_END_EXCEPTION_REGION_errorString = "Unknown exception";                               \
-        return ExceptionSwallower<type>()();                                                         \
-    }                                                                                                \
-    }
+#define ASSIMP_END_EXCEPTION_REGION_WITH_ERROR_STRING(type, ASSIMP_END_EXCEPTION_REGION_errorString, ASSIMP_END_EXCEPTION_REGION_exception)     \
+    }                                                                                                                                           \
+    catch (const DeadlyImportError &e) {                                                                                                        \
+        ASSIMP_END_EXCEPTION_REGION_errorString = e.what();                                                                                     \
+        ASSIMP_END_EXCEPTION_REGION_exception = std::current_exception();                                                                       \
+        return ExceptionSwallower<type>()();                                                                                                    \
+    }                                                                                                                                           \
+    catch (...) {                                                                                                                               \
+        ASSIMP_END_EXCEPTION_REGION_errorString = "Unknown exception";                                                                          \
+        ASSIMP_END_EXCEPTION_REGION_exception = std::current_exception();                                                                       \
+        return ExceptionSwallower<type>()();                                                                                                    \
+    }                                                                                                                                           \
+}
 
 #define ASSIMP_END_EXCEPTION_REGION(type)    \
     }                                        \
diff --git a/include/assimp/Exporter.hpp b/include/assimp/Exporter.hpp
index ed910d4d7..15918dd47 100644
--- a/include/assimp/Exporter.hpp
+++ b/include/assimp/Exporter.hpp
@@ -54,6 +54,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "cexport.h"
 #include <map>
+#include <functional>
 
 namespace Assimp {
 
@@ -107,7 +108,8 @@ public:
         }
 
         ExportFormatEntry() :
-                mExportFunction(), mEnforcePP() {
+                mExportFunction(),
+                mEnforcePP() {
             mDescription.id = nullptr;
             mDescription.description = nullptr;
             mDescription.fileExtension = nullptr;
@@ -147,7 +149,7 @@ public:
      * interface is the default IO handler provided by ASSIMP. The default
      * handler is active as long the application doesn't supply its own
      * custom IO handler via #SetIOHandler().
-     * @return A valid IOSystem interface, never nullptr. */
+     * @return A valid IOSystem interface, never NULL. */
     IOSystem *GetIOHandler() const;
 
     // -------------------------------------------------------------------
@@ -286,7 +288,7 @@ public:
      * @param pIndex Index of the export format to retrieve information
      *  for. Valid range is 0 to #Exporter::GetExportFormatCount
      * @return A description of that specific export format.
-     *  nullptr if pIndex is out of range. */
+     *  NULL if pIndex is out of range. */
     const aiExportFormatDesc *GetExportFormatDescription(size_t pIndex) const;
 
     // -------------------------------------------------------------------
@@ -329,6 +331,7 @@ public:
     typedef std::map<KeyType, ai_real> FloatPropertyMap;
     typedef std::map<KeyType, std::string> StringPropertyMap;
     typedef std::map<KeyType, aiMatrix4x4> MatrixPropertyMap;
+    typedef std::map<KeyType, std::function<void *(void *)>> CallbackPropertyMap;
 
 public:
     /** Standard constructor
@@ -387,6 +390,8 @@ public:
      * @see SetPropertyInteger()
      */
     bool SetPropertyMatrix(const char *szName, const aiMatrix4x4 &sValue);
+    
+    bool SetPropertyCallback(const char *szName, const std::function<void *(void *)> &f);
 
     // -------------------------------------------------------------------
     /** Get a configuration property.
@@ -440,6 +445,8 @@ public:
     const aiMatrix4x4 GetPropertyMatrix(const char *szName,
             const aiMatrix4x4 &sErrorReturn = aiMatrix4x4()) const;
 
+    std::function<void *(void *)> GetPropertyCallback(const char* szName) const;
+
     // -------------------------------------------------------------------
     /** Determine a integer configuration property has been set.
     * @see HasPropertyInteger()
@@ -466,7 +473,8 @@ public:
      */
     bool HasPropertyMatrix(const char *szName) const;
 
-protected:
+    bool HasPropertyCallback(const char *szName) const;
+
     /** List of integer properties */
     IntPropertyMap mIntProperties;
 
@@ -478,6 +486,8 @@ protected:
 
     /** List of Matrix properties */
     MatrixPropertyMap mMatrixProperties;
+
+    CallbackPropertyMap mCallbackProperties;
 };
 
 // ----------------------------------------------------------------------------------
diff --git a/include/assimp/IOStreamBuffer.h b/include/assimp/IOStreamBuffer.h
index 6ca9be84a..9a70ad115 100644
--- a/include/assimp/IOStreamBuffer.h
+++ b/include/assimp/IOStreamBuffer.h
@@ -254,25 +254,16 @@ bool IOStreamBuffer<T>::getNextDataLine( std::vector<T> &buffer, T continuationT
         }
     }
 
-    bool continuationFound( false );
     size_t i = 0;
     for( ;; ) {
-        if ( continuationToken == m_cache[ m_cachePos ] ) {
-            continuationFound = true;
+        if ( continuationToken == m_cache[ m_cachePos ] && IsLineEnd( m_cache[ m_cachePos + 1 ] ) ) {
             ++m_cachePos;
-        }
-        if ( IsLineEnd( m_cache[ m_cachePos ] ) ) {
-            if ( !continuationFound ) {
-                // the end of the data line
-                break;
-            } else {
-                // skip line end
-                while ( m_cache[m_cachePos] != '\n') {
-                    ++m_cachePos;
-                }
+            while ( m_cache[ m_cachePos ] != '\n' ) {
                 ++m_cachePos;
-                continuationFound = false;
             }
+            ++m_cachePos;
+        } else if ( IsLineEnd ( m_cache[ m_cachePos ] ) ) {
+            break;
         }
 
         buffer[ i ] = m_cache[ m_cachePos ];
diff --git a/include/assimp/Importer.hpp b/include/assimp/Importer.hpp
index 80eae78b3..9078fbfe6 100644
--- a/include/assimp/Importer.hpp
+++ b/include/assimp/Importer.hpp
@@ -495,6 +495,15 @@ public:
      * following methods is called: #ReadFile(), #FreeScene(). */
     const char *GetErrorString() const;
 
+    // -------------------------------------------------------------------
+    /** Returns an exception if one occurred during import.
+     *
+     * @return The last exception which occurred.
+     *
+     * @note The returned value remains valid until one of the
+     * following methods is called: #ReadFile(), #FreeScene(). */
+    const std::exception_ptr& GetException() const;
+
     // -------------------------------------------------------------------
     /** Returns the scene loaded by the last successful call to ReadFile()
      *
diff --git a/include/assimp/LogAux.h b/include/assimp/LogAux.h
index 330c5e93e..407820aac 100644
--- a/include/assimp/LogAux.h
+++ b/include/assimp/LogAux.h
@@ -61,9 +61,10 @@ template<class TDeriving>
 class LogFunctions {
 public:
     // ------------------------------------------------------------------------------------------------
-    static void ThrowException(const std::string& msg)
+    template<typename... T>
+    static void ThrowException(T&&... args)
     {
-        throw DeadlyImportError(Prefix()+msg);
+        throw DeadlyImportError(Prefix(), args...);
     }
 
     // ------------------------------------------------------------------------------------------------
diff --git a/include/assimp/Logger.hpp b/include/assimp/Logger.hpp
index 1e5a61eee..2ea4dacb7 100644
--- a/include/assimp/Logger.hpp
+++ b/include/assimp/Logger.hpp
@@ -73,9 +73,9 @@ public:
      *  @brief  Log severity to describe the granularity of logging.
      */
     enum LogSeverity {
-        NORMAL,     //!< Normal granularity of logging
-        DEBUG,      //!< Debug messages will be logged, but not verbose debug messages.
-        VERBOSE     //!< All messages will be logged
+        NORMAL,     ///< Normal granularity of logging
+        DEBUGGING,  ///< Debug messages will be logged, but not verbose debug messages.
+        VERBOSE     ///< All messages will be logged
     };
 
     // ----------------------------------------------------------------------
diff --git a/include/assimp/ParsingUtils.h b/include/assimp/ParsingUtils.h
index 69dc95da2..ba1e19728 100644
--- a/include/assimp/ParsingUtils.h
+++ b/include/assimp/ParsingUtils.h
@@ -39,7 +39,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ----------------------------------------------------------------------
 */
 
-
 /** @file ParsingUtils.h
  *  @brief Defines helper functions for text parsing
  */
@@ -48,12 +47,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_PARSING_UTILS_H_INC
 
 #ifdef __GNUC__
-#   pragma GCC system_header
+#pragma GCC system_header
 #endif
 
 #include <assimp/StringComparison.h>
 #include <assimp/StringUtils.h>
 #include <assimp/defs.h>
+#include <vector>
 
 namespace Assimp {
 
@@ -70,58 +70,50 @@ static const unsigned int BufferSize = 4096;
 
 // ---------------------------------------------------------------------------------
 template <class char_t>
-AI_FORCE_INLINE
-char_t ToLower( char_t in ) {
-    return (in >= (char_t)'A' && in <= (char_t)'Z') ? (char_t)(in+0x20) : in;
+AI_FORCE_INLINE char_t ToLower(char_t in) {
+    return (in >= (char_t)'A' && in <= (char_t)'Z') ? (char_t)(in + 0x20) : in;
 }
 
 // ---------------------------------------------------------------------------------
 template <class char_t>
-AI_FORCE_INLINE
-char_t ToUpper( char_t in) {
-    return (in >= (char_t)'a' && in <= (char_t)'z') ? (char_t)(in-0x20) : in;
+AI_FORCE_INLINE char_t ToUpper(char_t in) {
+    return (in >= (char_t)'a' && in <= (char_t)'z') ? (char_t)(in - 0x20) : in;
 }
 
 // ---------------------------------------------------------------------------------
 template <class char_t>
-AI_FORCE_INLINE
-bool IsUpper( char_t in) {
+AI_FORCE_INLINE bool IsUpper(char_t in) {
     return (in >= (char_t)'A' && in <= (char_t)'Z');
 }
 
 // ---------------------------------------------------------------------------------
 template <class char_t>
-AI_FORCE_INLINE
-bool IsLower( char_t in) {
+AI_FORCE_INLINE bool IsLower(char_t in) {
     return (in >= (char_t)'a' && in <= (char_t)'z');
 }
 
 // ---------------------------------------------------------------------------------
 template <class char_t>
-AI_FORCE_INLINE
-bool IsSpace( char_t in) {
+AI_FORCE_INLINE bool IsSpace(char_t in) {
     return (in == (char_t)' ' || in == (char_t)'\t');
 }
 
 // ---------------------------------------------------------------------------------
 template <class char_t>
-AI_FORCE_INLINE
-bool IsLineEnd( char_t in) {
-    return (in==(char_t)'\r'||in==(char_t)'\n'||in==(char_t)'\0'||in==(char_t)'\f');
+AI_FORCE_INLINE bool IsLineEnd(char_t in) {
+    return (in == (char_t)'\r' || in == (char_t)'\n' || in == (char_t)'\0' || in == (char_t)'\f');
 }
 
 // ---------------------------------------------------------------------------------
 template <class char_t>
-AI_FORCE_INLINE
-bool IsSpaceOrNewLine( char_t in) {
+AI_FORCE_INLINE bool IsSpaceOrNewLine(char_t in) {
     return IsSpace<char_t>(in) || IsLineEnd<char_t>(in);
 }
 
 // ---------------------------------------------------------------------------------
 template <class char_t>
-AI_FORCE_INLINE
-bool SkipSpaces( const char_t* in, const char_t** out) {
-    while( *in == ( char_t )' ' || *in == ( char_t )'\t' ) {
+AI_FORCE_INLINE bool SkipSpaces(const char_t *in, const char_t **out) {
+    while (*in == (char_t)' ' || *in == (char_t)'\t') {
         ++in;
     }
     *out = in;
@@ -130,21 +122,19 @@ bool SkipSpaces( const char_t* in, const char_t** out) {
 
 // ---------------------------------------------------------------------------------
 template <class char_t>
-AI_FORCE_INLINE
-bool SkipSpaces( const char_t** inout) {
-    return SkipSpaces<char_t>(*inout,inout);
+AI_FORCE_INLINE bool SkipSpaces(const char_t **inout) {
+    return SkipSpaces<char_t>(*inout, inout);
 }
 
 // ---------------------------------------------------------------------------------
 template <class char_t>
-AI_FORCE_INLINE
-bool SkipLine( const char_t* in, const char_t** out) {
-    while( *in != ( char_t )'\r' && *in != ( char_t )'\n' && *in != ( char_t )'\0' ) {
+AI_FORCE_INLINE bool SkipLine(const char_t *in, const char_t **out) {
+    while (*in != (char_t)'\r' && *in != (char_t)'\n' && *in != (char_t)'\0') {
         ++in;
     }
 
     // files are opened in binary mode. Ergo there are both NL and CR
-    while( *in == ( char_t )'\r' || *in == ( char_t )'\n' ) {
+    while (*in == (char_t)'\r' || *in == (char_t)'\n') {
         ++in;
     }
     *out = in;
@@ -153,16 +143,14 @@ bool SkipLine( const char_t* in, const char_t** out) {
 
 // ---------------------------------------------------------------------------------
 template <class char_t>
-AI_FORCE_INLINE
-bool SkipLine( const char_t** inout) {
-    return SkipLine<char_t>(*inout,inout);
+AI_FORCE_INLINE bool SkipLine(const char_t **inout) {
+    return SkipLine<char_t>(*inout, inout);
 }
 
 // ---------------------------------------------------------------------------------
 template <class char_t>
-AI_FORCE_INLINE
-bool SkipSpacesAndLineEnd( const char_t* in, const char_t** out) {
-    while( *in == ( char_t )' ' || *in == ( char_t )'\t' || *in == ( char_t )'\r' || *in == ( char_t )'\n' ) {
+AI_FORCE_INLINE bool SkipSpacesAndLineEnd(const char_t *in, const char_t **out) {
+    while (*in == (char_t)' ' || *in == (char_t)'\t' || *in == (char_t)'\r' || *in == (char_t)'\n') {
         ++in;
     }
     *out = in;
@@ -171,27 +159,25 @@ bool SkipSpacesAndLineEnd( const char_t* in, const char_t** out) {
 
 // ---------------------------------------------------------------------------------
 template <class char_t>
-AI_FORCE_INLINE
-bool SkipSpacesAndLineEnd( const char_t** inout) {
-    return SkipSpacesAndLineEnd<char_t>(*inout,inout);
+AI_FORCE_INLINE bool SkipSpacesAndLineEnd(const char_t **inout) {
+    return SkipSpacesAndLineEnd<char_t>(*inout, inout);
 }
 
 // ---------------------------------------------------------------------------------
 template <class char_t>
-AI_FORCE_INLINE
-bool GetNextLine( const char_t*& buffer, char_t out[ BufferSize ] ) {
-    if( ( char_t )'\0' == *buffer ) {
+AI_FORCE_INLINE bool GetNextLine(const char_t *&buffer, char_t out[BufferSize]) {
+    if ((char_t)'\0' == *buffer) {
         return false;
     }
 
-    char* _out = out;
-    char* const end = _out + BufferSize;
-    while( !IsLineEnd( *buffer ) && _out < end ) {
+    char *_out = out;
+    char *const end = _out + BufferSize;
+    while (!IsLineEnd(*buffer) && _out < end) {
         *_out++ = *buffer++;
     }
     *_out = (char_t)'\0';
 
-    while( IsLineEnd( *buffer ) && '\0' != *buffer ) {
+    while (IsLineEnd(*buffer) && '\0' != *buffer) {
         ++buffer;
     }
 
@@ -200,18 +186,16 @@ bool GetNextLine( const char_t*& buffer, char_t out[ BufferSize ] ) {
 
 // ---------------------------------------------------------------------------------
 template <class char_t>
-AI_FORCE_INLINE bool IsNumeric( char_t in) {
-    return ( in >= '0' && in <= '9' ) || '-' == in || '+' == in;
+AI_FORCE_INLINE bool IsNumeric(char_t in) {
+    return (in >= '0' && in <= '9') || '-' == in || '+' == in;
 }
 
 // ---------------------------------------------------------------------------------
 template <class char_t>
-AI_FORCE_INLINE
-bool TokenMatch(char_t*& in, const char* token, unsigned int len)
-{
-    if (!::strncmp(token,in,len) && IsSpaceOrNewLine(in[len])) {
+AI_FORCE_INLINE bool TokenMatch(char_t *&in, const char *token, unsigned int len) {
+    if (!::strncmp(token, in, len) && IsSpaceOrNewLine(in[len])) {
         if (in[len] != '\0') {
-            in += len+1;
+            in += len + 1;
         } else {
             // If EOF after the token make sure we don't go past end of buffer
             in += len;
@@ -227,37 +211,71 @@ bool TokenMatch(char_t*& in, const char* token, unsigned int len)
  *  @param token Token to check for
  *  @param len Number of characters to check
  */
-AI_FORCE_INLINE
-bool TokenMatchI(const char*& in, const char* token, unsigned int len) {
-    if (!ASSIMP_strincmp(token,in,len) && IsSpaceOrNewLine(in[len])) {
-        in += len+1;
+AI_FORCE_INLINE bool TokenMatchI(const char *&in, const char *token, unsigned int len) {
+    if (!ASSIMP_strincmp(token, in, len) && IsSpaceOrNewLine(in[len])) {
+        in += len + 1;
         return true;
     }
     return false;
 }
 
 // ---------------------------------------------------------------------------------
-AI_FORCE_INLINE
-void SkipToken(const char*& in) {
+AI_FORCE_INLINE void SkipToken(const char *&in) {
     SkipSpaces(&in);
-    while ( !IsSpaceOrNewLine( *in ) ) {
+    while (!IsSpaceOrNewLine(*in)) {
         ++in;
     }
 }
 
 // ---------------------------------------------------------------------------------
-AI_FORCE_INLINE
-std::string GetNextToken(const char*& in) {
+AI_FORCE_INLINE std::string GetNextToken(const char *&in) {
     SkipSpacesAndLineEnd(&in);
-    const char* cur = in;
-    while ( !IsSpaceOrNewLine( *in ) ) {
+    const char *cur = in;
+    while (!IsSpaceOrNewLine(*in)) {
         ++in;
     }
-    return std::string(cur,(size_t)(in-cur));
+    return std::string(cur, (size_t)(in - cur));
 }
 
 // ---------------------------------------------------------------------------------
+/** @brief  Will perform a simple tokenize.
+ *  @param  str         String to tokenize.
+ *  @param  tokens      Array with tokens, will be empty if no token was found.
+ *  @param  delimiters  Delimiter for tokenize.
+ *  @return Number of found token.
+ */
+template <class string_type>
+AI_FORCE_INLINE unsigned int tokenize(const string_type &str, std::vector<string_type> &tokens,
+        const string_type &delimiters) {
+    // Skip delimiters at beginning.
+    typename string_type::size_type lastPos = str.find_first_not_of(delimiters, 0);
 
-} // ! namespace Assimp
+    // Find first "non-delimiter".
+    typename string_type::size_type pos = str.find_first_of(delimiters, lastPos);
+    while (string_type::npos != pos || string_type::npos != lastPos) {
+        // Found a token, add it to the vector.
+        string_type tmp = str.substr(lastPos, pos - lastPos);
+        if (!tmp.empty() && ' ' != tmp[0])
+            tokens.push_back(tmp);
+
+        // Skip delimiters.  Note the "not_of"
+        lastPos = str.find_first_not_of(delimiters, pos);
+
+        // Find next "non-delimiter"
+        pos = str.find_first_of(delimiters, lastPos);
+    }
+
+    return static_cast<unsigned int>(tokens.size());
+}
+
+inline std::string ai_stdStrToLower(const std::string &str) {
+    std::string out(str);
+    for (size_t i = 0; i < str.size(); ++i) {
+        out[i] = (char) tolower(out[i]);
+    }
+    return out;
+}
+
+} // namespace Assimp
 
 #endif // ! AI_PARSING_UTILS_H_INC
diff --git a/include/assimp/StringComparison.h b/include/assimp/StringComparison.h
index 255123c0e..21007bf68 100644
--- a/include/assimp/StringComparison.h
+++ b/include/assimp/StringComparison.h
@@ -145,11 +145,7 @@ int ASSIMP_stricmp(const char *s1, const char *s2) {
 #if (defined _MSC_VER)
 
     return ::_stricmp(s1, s2);
-#elif defined(__GNUC__)
-
-    return ::strcasecmp(s1, s2);
 #else
-
     char c1, c2;
     do {
         c1 = tolower(*s1++);
diff --git a/include/assimp/StringUtils.h b/include/assimp/StringUtils.h
index 7e1cb4ce0..21942eed4 100644
--- a/include/assimp/StringUtils.h
+++ b/include/assimp/StringUtils.h
@@ -44,14 +44,23 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define INCLUDED_AI_STRINGUTILS_H
 
 #ifdef __GNUC__
-#   pragma GCC system_header
+#pragma GCC system_header
 #endif
 
 #include <assimp/defs.h>
 
-#include <sstream>
 #include <stdarg.h>
+#include <algorithm>
+#include <cctype>
 #include <cstdlib>
+#include <locale>
+#include <sstream>
+
+#ifdef _MSC_VER
+#define AI_SIZEFMT "%Iu"
+#else
+#define AI_SIZEFMT "%zu"
+#endif
 
 ///	@fn		ai_snprintf
 ///	@brief	The portable version of the function snprintf ( C99 standard ), which works on visual studio compilers 2013 and earlier.
@@ -62,33 +71,35 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ///	@return	The number of written characters if the buffer size was big enough. If an encoding error occurs, a negative number is returned.
 #if defined(_MSC_VER) && _MSC_VER < 1900
 
-    AI_FORCE_INLINE
-    int c99_ai_vsnprintf(char *outBuf, size_t size, const char *format, va_list ap) {
-		int count(-1);
-		if (0 != size) {
-			count = _vsnprintf_s(outBuf, size, _TRUNCATE, format, ap);
-		}
-		if (count == -1) {
-			count = _vscprintf(format, ap);
-		}
+AI_FORCE_INLINE
+int c99_ai_vsnprintf(char *outBuf, size_t size, const char *format, va_list ap) {
+    int count(-1);
+    if (0 != size) {
+        count = _vsnprintf_s(outBuf, size, _TRUNCATE, format, ap);
+    }
+    if (count == -1) {
+        count = _vscprintf(format, ap);
+    }
 
-		return count;
-	}
+    return count;
+}
 
-    AI_FORCE_INLINE
-    int ai_snprintf(char *outBuf, size_t size, const char *format, ...) {
-		int count;
-		va_list ap;
+AI_FORCE_INLINE
+int ai_snprintf(char *outBuf, size_t size, const char *format, ...) {
+    int count;
+    va_list ap;
 
-		va_start(ap, format);
-		count = c99_ai_vsnprintf(outBuf, size, format, ap);
-		va_end(ap);
+    va_start(ap, format);
+    count = c99_ai_vsnprintf(outBuf, size, format, ap);
+    va_end(ap);
 
-		return count;
-	}
+    return count;
+}
 
+#elif defined(__MINGW32__)
+#define ai_snprintf __mingw_snprintf
 #else
-#   define ai_snprintf snprintf
+#define ai_snprintf snprintf
 #endif
 
 ///	@fn		to_string
@@ -96,8 +107,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ///	@param	value   The value to write into the std::string.
 ///	@return	The value as a std::string
 template <typename T>
-AI_FORCE_INLINE
-std::string to_string( T value ) {
+AI_FORCE_INLINE std::string to_string(T value) {
     std::ostringstream os;
     os << value;
 
@@ -110,17 +120,17 @@ std::string to_string( T value ) {
 /// @param  end     The last character
 ///	@return	The float value, 0.0f in cas of an error.
 AI_FORCE_INLINE
-float ai_strtof( const char *begin, const char *end ) {
-    if ( nullptr == begin ) {
+float ai_strtof(const char *begin, const char *end) {
+    if (nullptr == begin) {
         return 0.0f;
     }
-    float val( 0.0f );
-    if ( nullptr == end ) {
-        val = static_cast< float >( ::atof( begin ) );
+    float val(0.0f);
+    if (nullptr == end) {
+        val = static_cast<float>(::atof(begin));
     } else {
-        std::string::size_type len( end - begin );
-        std::string token( begin, len );
-        val = static_cast< float >( ::atof( token.c_str() ) );
+        std::string::size_type len(end - begin);
+        std::string token(begin, len);
+        val = static_cast<float>(::atof(token.c_str()));
     }
 
     return val;
@@ -130,16 +140,15 @@ float ai_strtof( const char *begin, const char *end ) {
 ///	@brief	The portable to convert a decimal value into a hexadecimal string.
 ///	@param	toConvert   Value to convert
 ///	@return	The hexadecimal string, is empty in case of an error.
-template<class T>
-AI_FORCE_INLINE
-std::string DecimalToHexa( T toConvert ) {
+template <class T>
+AI_FORCE_INLINE std::string DecimalToHexa(T toConvert) {
     std::string result;
     std::stringstream ss;
     ss << std::hex << toConvert;
     ss >> result;
 
-    for ( size_t i = 0; i < result.size(); ++i ) {
-        result[ i ] = (char) toupper( result[ i ] );
+    for (size_t i = 0; i < result.size(); ++i) {
+        result[i] = (char)toupper(result[i]);
     }
 
     return result;
@@ -150,16 +159,37 @@ std::string DecimalToHexa( T toConvert ) {
 ///	@param	g   aiColor.g
 ///	@param	b   aiColor.b
 ///	@param	a   aiColor.a
-///	@param	with_head   # 
+///	@param	with_head   #
 ///	@return	The hexadecimal string, is empty in case of an error.
 AI_FORCE_INLINE std::string Rgba2Hex(int r, int g, int b, int a, bool with_head) {
-	std::stringstream ss;
-	if (with_head) {
-		ss << "#";
+    std::stringstream ss;
+    if (with_head) {
+        ss << "#";
     }
-	ss << std::hex << (r << 24 | g << 16 | b << 8 | a);
-	
+    ss << std::hex << (r << 24 | g << 16 | b << 8 | a);
+
     return ss.str();
 }
 
+// trim from start (in place)
+AI_FORCE_INLINE void ltrim(std::string &s) {
+    s.erase(s.begin(), std::find_if(s.begin(), s.end(), [](unsigned char ch) {
+        return !std::isspace(ch);
+    }));
+}
+
+// trim from end (in place)
+AI_FORCE_INLINE void rtrim(std::string &s) {
+    s.erase(std::find_if(s.rbegin(), s.rend(), [](unsigned char ch) {
+        return !std::isspace(ch);
+    }).base(),
+            s.end());
+}
+
+// trim from both ends (in place)
+AI_FORCE_INLINE void trim(std::string &s) {
+    ltrim(s);
+    rtrim(s);
+}
+
 #endif // INCLUDED_AI_STRINGUTILS_H
diff --git a/include/assimp/TinyFormatter.h b/include/assimp/TinyFormatter.h
index 3c6ca66c6..0f2cf6362 100644
--- a/include/assimp/TinyFormatter.h
+++ b/include/assimp/TinyFormatter.h
@@ -88,6 +88,9 @@ public:
         underlying << sin;
     }
 
+    basic_formatter(basic_formatter&& other)
+        : underlying(std::move(other.underlying)) {
+    }
 
     // The problem described here:
     // https://sourceforge.net/tracker/?func=detail&atid=1067632&aid=3358562&group_id=226462
diff --git a/include/assimp/XmlParser.h b/include/assimp/XmlParser.h
new file mode 100644
index 000000000..46bb57295
--- /dev/null
+++ b/include/assimp/XmlParser.h
@@ -0,0 +1,317 @@
+/*
+Open Asset Import Library (assimp)
+----------------------------------------------------------------------
+
+Copyright (c) 2006-2020, assimp team
+
+All rights reserved.
+
+Redistribution and use of this software in source and binary forms,
+with or without modification, are permitted provided that the
+following conditions are met:
+
+* Redistributions of source code must retain the above
+copyright notice, this list of conditions and the
+following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the
+following disclaimer in the documentation and/or other
+materials provided with the distribution.
+
+* Neither the name of the assimp team, nor the names of its
+contributors may be used to endorse or promote products
+derived from this software without specific prior
+written permission of the assimp team.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+----------------------------------------------------------------------
+*/
+
+#ifndef INCLUDED_AI_IRRXML_WRAPPER
+#define INCLUDED_AI_IRRXML_WRAPPER
+
+#include <assimp/DefaultLogger.hpp>
+#include "BaseImporter.h"
+#include "IOStream.hpp"
+#include <pugixml.hpp>
+#include <vector>
+
+namespace Assimp {
+
+struct find_node_by_name_predicate {
+    std::string mName;
+    find_node_by_name_predicate(const std::string &name) :
+            mName(name) {
+        // empty
+    }
+
+    bool operator()(pugi::xml_node node) const {
+        return node.name() == mName;
+    }
+};
+
+template <class TNodeType>
+struct NodeConverter {
+public:
+    static int to_int(TNodeType &node, const char *attribName) {
+        ai_assert(nullptr != attribName);
+        return node.attribute(attribName).to_int();
+    }
+};
+
+using XmlNode = pugi::xml_node;
+using XmlAttribute = pugi::xml_attribute;
+
+template <class TNodeType>
+class TXmlParser {
+public:
+    TXmlParser() :
+            mDoc(nullptr),
+            mData() {
+        // empty
+    }
+
+    ~TXmlParser() {
+        clear();
+    }
+
+    void clear() {
+        mData.resize(0);
+        delete mDoc;
+        mDoc = nullptr;
+    }
+
+    TNodeType *findNode(const std::string &name) {
+        if (name.empty()) {
+            return nullptr;
+        }
+
+        if (nullptr == mDoc) {
+            return nullptr;
+        }
+
+        find_node_by_name_predicate predicate(name);
+        mCurrent = mDoc->find_node(predicate);
+        if (mCurrent.empty()) {
+            return nullptr;
+        }
+
+        return &mCurrent;
+    }
+
+    bool hasNode(const std::string &name) {
+        return nullptr != findNode(name);
+    }
+
+    bool parse(IOStream *stream) {
+        if (nullptr == stream) {
+            ASSIMP_LOG_DEBUG("Stream is nullptr.");
+            return false;
+        }
+
+        const size_t len = stream->FileSize();
+        mData.resize(len + 1);
+        memset(&mData[0], '\0', len + 1);
+        stream->Read(&mData[0], 1, len);
+        
+        mDoc = new pugi::xml_document();
+        pugi::xml_parse_result parse_result = mDoc->load_string(&mData[0], pugi::parse_full);
+        if (parse_result.status == pugi::status_ok) {
+            return true;
+        } else {
+            ASSIMP_LOG_DEBUG("Error while parse xml.");
+            return false;
+        }
+    }
+
+    pugi::xml_document *getDocument() const {
+        return mDoc;
+    }
+
+    const TNodeType getRootNode() const {
+        return mDoc->root();
+    }
+
+    TNodeType getRootNode() {
+        return mDoc->root();
+    }
+
+    static inline bool hasNode(XmlNode &node, const char *name) {
+        pugi::xml_node child = node.find_child(find_node_by_name_predicate(name));
+        return !child.empty();
+    }
+
+    static inline bool hasAttribute(XmlNode &xmlNode, const char *name) {
+        pugi::xml_attribute attr = xmlNode.attribute(name);
+        return !attr.empty();
+    }
+
+    static inline bool getUIntAttribute(XmlNode &xmlNode, const char *name, unsigned int &val) {
+        pugi::xml_attribute attr = xmlNode.attribute(name);
+        if (attr.empty()) {
+            return false;
+        }
+
+        val = attr.as_uint();
+        return true;
+    }
+
+    static inline bool getIntAttribute(XmlNode &xmlNode, const char *name, int &val ) {
+        pugi::xml_attribute attr = xmlNode.attribute(name);
+        if (attr.empty()) {
+            return false;
+        }
+
+        val = attr.as_int();
+        return true;
+    }
+
+    static inline bool getFloatAttribute(XmlNode &xmlNode, const char *name, float &val ) {
+        pugi::xml_attribute attr = xmlNode.attribute(name);
+        if (attr.empty()) {
+            return false;
+        }
+
+        val = attr.as_float();
+        return true;
+
+    }
+
+    static inline bool getDoubleAttribute( XmlNode &xmlNode, const char *name, double &val ) {
+        pugi::xml_attribute attr = xmlNode.attribute(name);
+        if (attr.empty()) {
+            return false;
+        }
+
+        val = attr.as_double();
+        return true;
+    }
+
+    static inline bool getStdStrAttribute(XmlNode &xmlNode, const char *name, std::string &val) {
+        pugi::xml_attribute attr = xmlNode.attribute(name);
+        if (attr.empty()) {
+            return false;
+        }
+
+        val = attr.as_string();
+        return true;
+    }
+
+    static inline bool getBoolAttribute( XmlNode &xmlNode, const char *name, bool &val ) {
+        pugi::xml_attribute attr = xmlNode.attribute(name);
+        if (attr.empty()) {
+            return false;
+        }
+
+        val = attr.as_bool();
+        return true;
+
+    }
+
+    static inline bool getValueAsString( XmlNode &node, std::string &text ) {
+        text = "";
+        if (node.empty()) {
+            return false;
+        }
+
+        text = node.text().as_string();
+
+        return true;
+    }
+
+    static inline bool getValueAsFloat( XmlNode &node, ai_real &v ) {
+        if (node.empty()) {
+            return false;
+        }
+
+        v = node.text().as_float();
+
+        return true;
+
+    }
+
+ private:
+    pugi::xml_document *mDoc;
+    TNodeType mCurrent;
+    std::vector<char> mData;
+};
+
+using XmlParser = TXmlParser<pugi::xml_node>;
+
+class XmlNodeIterator {
+public:
+    XmlNodeIterator(XmlNode &parent) :
+            mParent(parent),
+            mNodes(),
+            mIndex(0) {
+        // empty
+    }
+
+    void collectChildrenPreOrder( XmlNode &node ) {
+        
+        if (node != mParent && node.type() == pugi::node_element) {
+            mNodes.push_back(node);
+        }
+        for (XmlNode currentNode : node.children()) {
+            collectChildrenPreOrder(currentNode);
+        }
+    }
+
+    void collectChildrenPostOrder(XmlNode &node) {
+        for (XmlNode currentNode = node.first_child(); currentNode; currentNode = currentNode.next_sibling()) {
+            collectChildrenPostOrder(currentNode);
+        }
+        if (node != mParent) {
+            mNodes.push_back(node);
+        }
+    }
+
+    bool getNext(XmlNode &next) {
+        if (mIndex == mNodes.size()) {
+            return false;
+        }
+
+        next = mNodes[mIndex];
+        ++mIndex;
+
+        return true;
+    }
+
+    size_t size() const {
+        return mNodes.size();
+    }
+
+    bool isEmpty() const {
+        return mNodes.empty();
+    }
+
+    void clear() {
+        if (mNodes.empty()) {
+            return;
+        }
+
+        mNodes.clear();
+        mIndex = 0;
+    }
+
+private:
+    XmlNode &mParent; 
+    std::vector<XmlNode> mNodes;
+    size_t mIndex;
+};
+
+} // namespace Assimp
+
+#endif // !! INCLUDED_AI_IRRXML_WRAPPER
diff --git a/include/assimp/ai_assert.h b/include/assimp/ai_assert.h
index 8b2b396f4..195ebbfd0 100644
--- a/include/assimp/ai_assert.h
+++ b/include/assimp/ai_assert.h
@@ -42,12 +42,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_ASSERT_H_INC
 #define AI_ASSERT_H_INC
 
+#include <assimp/defs.h>
+
 #if defined(ASSIMP_BUILD_DEBUG)
 
 namespace Assimp
 {
     // Assert violation behavior can be customized: see AssertHandler.h.
-    void aiAssertViolation(const char* failedExpression, const char* file, int line);
+    ASSIMP_API void aiAssertViolation(const char* failedExpression, const char* file, int line);
 }
 
 #    define ai_assert(expression) (void)((!!(expression)) || (Assimp::aiAssertViolation(#expression, __FILE__, __LINE__), 0))
diff --git a/include/assimp/cimport.h b/include/assimp/cimport.h
index a6ab93051..c68ca2d53 100644
--- a/include/assimp/cimport.h
+++ b/include/assimp/cimport.h
@@ -5,8 +5,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -49,19 +47,20 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_ASSIMP_H_INC
 
 #ifdef __GNUC__
-#   pragma GCC system_header
+#pragma GCC system_header
 #endif
 
-#include <assimp/types.h>
 #include <assimp/importerdesc.h>
+#include <assimp/types.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-struct aiScene;  // aiScene.h
-struct aiFileIO; // aiFileIO.h
-typedef void (*aiLogStreamCallback)(const char* /* message */, char* /* user */);
+struct aiScene;
+struct aiFileIO;
+
+typedef void (*aiLogStreamCallback)(const char * /* message */, char * /* user */);
 
 // --------------------------------------------------------------------------------
 /** C-API: Represents a log stream. A log stream receives all log messages and
@@ -70,16 +69,14 @@ typedef void (*aiLogStreamCallback)(const char* /* message */, char* /* user */)
  *  @see aiAttachLogStream
  *  @see aiDetachLogStream */
 // --------------------------------------------------------------------------------
-struct aiLogStream
-{
+struct aiLogStream {
     /** callback to be called */
     aiLogStreamCallback callback;
 
     /** user data to be passed to the callback */
-    char* user;
+    char *user;
 };
 
-
 // --------------------------------------------------------------------------------
 /** C-API: Represents an opaque set of settings to be used during importing.
  *  @see aiCreatePropertyStore
@@ -91,7 +88,9 @@ struct aiLogStream
  *  @see aiSetPropertyMatrix
  */
 // --------------------------------------------------------------------------------
-struct aiPropertyStore { char sentinel; };
+struct aiPropertyStore {
+    char sentinel;
+};
 
 /** Our own C boolean type */
 typedef int aiBool;
@@ -115,9 +114,9 @@ typedef int aiBool;
  *   #aiPostProcessSteps flags.
  * @return Pointer to the imported data or NULL if the import failed.
  */
-ASSIMP_API const C_STRUCT aiScene* aiImportFile(
-    const char* pFile,
-    unsigned int pFlags);
+ASSIMP_API const C_STRUCT aiScene *aiImportFile(
+        const char *pFile,
+        unsigned int pFlags);
 
 // --------------------------------------------------------------------------------
 /** Reads the given file using user-defined I/O functions and returns
@@ -140,10 +139,10 @@ ASSIMP_API const C_STRUCT aiScene* aiImportFile(
  * @return Pointer to the imported data or NULL if the import failed.
  * @note Include <aiFileIO.h> for the definition of #aiFileIO.
  */
-ASSIMP_API const C_STRUCT aiScene* aiImportFileEx(
-    const char* pFile,
-    unsigned int pFlags,
-    C_STRUCT aiFileIO* pFS);
+ASSIMP_API const C_STRUCT aiScene *aiImportFileEx(
+        const char *pFile,
+        unsigned int pFlags,
+        C_STRUCT aiFileIO *pFS);
 
 // --------------------------------------------------------------------------------
 /** Same as #aiImportFileEx, but adds an extra parameter containing importer settings.
@@ -161,11 +160,11 @@ ASSIMP_API const C_STRUCT aiScene* aiImportFileEx(
  * @note Include <aiFileIO.h> for the definition of #aiFileIO.
  * @see aiImportFileEx
  */
-ASSIMP_API const C_STRUCT aiScene* aiImportFileExWithProperties(
-    const char* pFile,
-    unsigned int pFlags,
-    C_STRUCT aiFileIO* pFS,
-    const C_STRUCT aiPropertyStore* pProps);
+ASSIMP_API const C_STRUCT aiScene *aiImportFileExWithProperties(
+        const char *pFile,
+        unsigned int pFlags,
+        C_STRUCT aiFileIO *pFS,
+        const C_STRUCT aiPropertyStore *pProps);
 
 // --------------------------------------------------------------------------------
 /** Reads the given file from a given memory buffer,
@@ -198,11 +197,11 @@ ASSIMP_API const C_STRUCT aiScene* aiImportFileExWithProperties(
  * a custom IOSystem to make Assimp find these files and use
  * the regular aiImportFileEx()/aiImportFileExWithProperties() API.
  */
-ASSIMP_API const C_STRUCT aiScene* aiImportFileFromMemory(
-    const char* pBuffer,
-    unsigned int pLength,
-    unsigned int pFlags,
-    const char* pHint);
+ASSIMP_API const C_STRUCT aiScene *aiImportFileFromMemory(
+        const char *pBuffer,
+        unsigned int pLength,
+        unsigned int pFlags,
+        const char *pHint);
 
 // --------------------------------------------------------------------------------
 /** Same as #aiImportFileFromMemory, but adds an extra parameter containing importer settings.
@@ -232,12 +231,12 @@ ASSIMP_API const C_STRUCT aiScene* aiImportFileFromMemory(
  * the regular aiImportFileEx()/aiImportFileExWithProperties() API.
  * @see aiImportFileFromMemory
  */
-ASSIMP_API const C_STRUCT aiScene* aiImportFileFromMemoryWithProperties(
-    const char* pBuffer,
-    unsigned int pLength,
-    unsigned int pFlags,
-    const char* pHint,
-    const C_STRUCT aiPropertyStore* pProps);
+ASSIMP_API const C_STRUCT aiScene *aiImportFileFromMemoryWithProperties(
+        const char *pBuffer,
+        unsigned int pLength,
+        unsigned int pFlags,
+        const char *pHint,
+        const C_STRUCT aiPropertyStore *pProps);
 
 // --------------------------------------------------------------------------------
 /** Apply post-processing to an already-imported scene.
@@ -254,9 +253,9 @@ ASSIMP_API const C_STRUCT aiScene* aiImportFileFromMemoryWithProperties(
  *   the #aiProcess_ValidateDataStructure flag is currently the only post processing step
  *   which can actually cause the scene to be reset to NULL.
  */
-ASSIMP_API const C_STRUCT aiScene* aiApplyPostProcessing(
-    const C_STRUCT aiScene* pScene,
-    unsigned int pFlags);
+ASSIMP_API const C_STRUCT aiScene *aiApplyPostProcessing(
+        const C_STRUCT aiScene *pScene,
+        unsigned int pFlags);
 
 // --------------------------------------------------------------------------------
 /** Get one of the predefine log streams. This is the quick'n'easy solution to
@@ -279,8 +278,8 @@ ASSIMP_API const C_STRUCT aiScene* aiApplyPostProcessing(
  *  @return The log stream. callback is set to NULL if something went wrong.
  */
 ASSIMP_API C_STRUCT aiLogStream aiGetPredefinedLogStream(
-    C_ENUM aiDefaultLogStream pStreams,
-    const char* file);
+        C_ENUM aiDefaultLogStream pStreams,
+        const char *file);
 
 // --------------------------------------------------------------------------------
 /** Attach a custom log stream to the libraries' logging system.
@@ -293,7 +292,7 @@ ASSIMP_API C_STRUCT aiLogStream aiGetPredefinedLogStream(
  *    Alternatively (for the lazy folks) #aiDetachAllLogStreams is provided.
  */
 ASSIMP_API void aiAttachLogStream(
-    const C_STRUCT aiLogStream* stream);
+        const C_STRUCT aiLogStream *stream);
 
 // --------------------------------------------------------------------------------
 /** Enable verbose logging. Verbose logging includes debug-related stuff and
@@ -314,7 +313,7 @@ ASSIMP_API void aiEnableVerboseLogging(aiBool d);
  *  @see aiDetachAllLogStreams
  */
 ASSIMP_API C_ENUM aiReturn aiDetachLogStream(
-    const C_STRUCT aiLogStream* stream);
+        const C_STRUCT aiLogStream *stream);
 
 // --------------------------------------------------------------------------------
 /** Detach all active log streams from the libraries' logging system.
@@ -333,7 +332,7 @@ ASSIMP_API void aiDetachAllLogStreams(void);
  * @param pScene The imported data to release. NULL is a valid value.
  */
 ASSIMP_API void aiReleaseImport(
-    const C_STRUCT aiScene* pScene);
+        const C_STRUCT aiScene *pScene);
 
 // --------------------------------------------------------------------------------
 /** Returns the error text of the last failed import process.
@@ -342,7 +341,7 @@ ASSIMP_API void aiReleaseImport(
  * import process. NULL if there was no error. There can't be an error if you
  * got a non-NULL #aiScene from #aiImportFile/#aiImportFileEx/#aiApplyPostProcessing.
  */
-ASSIMP_API const char* aiGetErrorString(void);
+ASSIMP_API const char *aiGetErrorString(void);
 
 // --------------------------------------------------------------------------------
 /** Returns whether a given file extension is supported by ASSIMP
@@ -352,7 +351,7 @@ ASSIMP_API const char* aiGetErrorString(void);
  * @return AI_TRUE if the file extension is supported.
  */
 ASSIMP_API aiBool aiIsExtensionSupported(
-    const char* szExtension);
+        const char *szExtension);
 
 // --------------------------------------------------------------------------------
 /** Get a list of all file extensions supported by ASSIMP.
@@ -363,7 +362,7 @@ ASSIMP_API aiBool aiIsExtensionSupported(
  * Format of the list: "*.3ds;*.obj;*.dae". NULL is not a valid parameter.
  */
 ASSIMP_API void aiGetExtensionList(
-    C_STRUCT aiString* szOut);
+        C_STRUCT aiString *szOut);
 
 // --------------------------------------------------------------------------------
 /** Get the approximated storage required by an imported asset
@@ -371,10 +370,8 @@ ASSIMP_API void aiGetExtensionList(
  * @param in Data structure to be filled.
  */
 ASSIMP_API void aiGetMemoryRequirements(
-    const C_STRUCT aiScene* pIn,
-    C_STRUCT aiMemoryInfo* in);
-
-
+        const C_STRUCT aiScene *pIn,
+        C_STRUCT aiMemoryInfo *in);
 
 // --------------------------------------------------------------------------------
 /** Create an empty property store. Property stores are used to collect import
@@ -382,13 +379,13 @@ ASSIMP_API void aiGetMemoryRequirements(
  * @return New property store. Property stores need to be manually destroyed using
  *   the #aiReleasePropertyStore API function.
  */
-ASSIMP_API C_STRUCT aiPropertyStore* aiCreatePropertyStore(void);
+ASSIMP_API C_STRUCT aiPropertyStore *aiCreatePropertyStore(void);
 
 // --------------------------------------------------------------------------------
 /** Delete a property store.
  * @param p Property store to be deleted.
  */
-ASSIMP_API void aiReleasePropertyStore(C_STRUCT aiPropertyStore* p);
+ASSIMP_API void aiReleasePropertyStore(C_STRUCT aiPropertyStore *p);
 
 // --------------------------------------------------------------------------------
 /** Set an integer property.
@@ -403,9 +400,9 @@ ASSIMP_API void aiReleasePropertyStore(C_STRUCT aiPropertyStore* p);
  * @param value New value for the property
  */
 ASSIMP_API void aiSetImportPropertyInteger(
-    C_STRUCT aiPropertyStore* store,
-    const char* szName,
-    int value);
+        C_STRUCT aiPropertyStore *store,
+        const char *szName,
+        int value);
 
 // --------------------------------------------------------------------------------
 /** Set a floating-point property.
@@ -420,9 +417,9 @@ ASSIMP_API void aiSetImportPropertyInteger(
  * @param value New value for the property
  */
 ASSIMP_API void aiSetImportPropertyFloat(
-    C_STRUCT aiPropertyStore* store,
-    const char* szName,
-    ai_real value);
+        C_STRUCT aiPropertyStore *store,
+        const char *szName,
+        ai_real value);
 
 // --------------------------------------------------------------------------------
 /** Set a string property.
@@ -437,9 +434,9 @@ ASSIMP_API void aiSetImportPropertyFloat(
  * @param st New value for the property
  */
 ASSIMP_API void aiSetImportPropertyString(
-    C_STRUCT aiPropertyStore* store,
-    const char* szName,
-    const C_STRUCT aiString* st);
+        C_STRUCT aiPropertyStore *store,
+        const char *szName,
+        const C_STRUCT aiString *st);
 
 // --------------------------------------------------------------------------------
 /** Set a matrix property.
@@ -454,9 +451,9 @@ ASSIMP_API void aiSetImportPropertyString(
  * @param mat New value for the property
  */
 ASSIMP_API void aiSetImportPropertyMatrix(
-    C_STRUCT aiPropertyStore* store,
-    const char* szName,
-    const C_STRUCT aiMatrix4x4* mat);
+        C_STRUCT aiPropertyStore *store,
+        const char *szName,
+        const C_STRUCT aiMatrix4x4 *mat);
 
 // --------------------------------------------------------------------------------
 /** Construct a quaternion from a 3x3 rotation matrix.
@@ -465,8 +462,8 @@ ASSIMP_API void aiSetImportPropertyMatrix(
  *  @see aiQuaternion(const aiMatrix3x3& pRotMatrix)
  */
 ASSIMP_API void aiCreateQuaternionFromMatrix(
-    C_STRUCT aiQuaternion* quat,
-    const C_STRUCT aiMatrix3x3* mat);
+        C_STRUCT aiQuaternion *quat,
+        const C_STRUCT aiMatrix3x3 *mat);
 
 // --------------------------------------------------------------------------------
 /** Decompose a transformation matrix into its rotational, translational and
@@ -479,24 +476,24 @@ ASSIMP_API void aiCreateQuaternionFromMatrix(
  * @see aiMatrix4x4::Decompose (aiVector3D&, aiQuaternion&, aiVector3D&) const;
  */
 ASSIMP_API void aiDecomposeMatrix(
-    const C_STRUCT aiMatrix4x4* mat,
-    C_STRUCT aiVector3D* scaling,
-    C_STRUCT aiQuaternion* rotation,
-    C_STRUCT aiVector3D* position);
+        const C_STRUCT aiMatrix4x4 *mat,
+        C_STRUCT aiVector3D *scaling,
+        C_STRUCT aiQuaternion *rotation,
+        C_STRUCT aiVector3D *position);
 
 // --------------------------------------------------------------------------------
 /** Transpose a 4x4 matrix.
  *  @param mat Pointer to the matrix to be transposed
  */
 ASSIMP_API void aiTransposeMatrix4(
-    C_STRUCT aiMatrix4x4* mat);
+        C_STRUCT aiMatrix4x4 *mat);
 
 // --------------------------------------------------------------------------------
 /** Transpose a 3x3 matrix.
  *  @param mat Pointer to the matrix to be transposed
  */
 ASSIMP_API void aiTransposeMatrix3(
-    C_STRUCT aiMatrix3x3* mat);
+        C_STRUCT aiMatrix3x3 *mat);
 
 // --------------------------------------------------------------------------------
 /** Transform a vector by a 3x3 matrix
@@ -504,8 +501,8 @@ ASSIMP_API void aiTransposeMatrix3(
  *  @param mat Matrix to transform the vector with.
  */
 ASSIMP_API void aiTransformVecByMatrix3(
-    C_STRUCT aiVector3D* vec,
-    const C_STRUCT aiMatrix3x3* mat);
+        C_STRUCT aiVector3D *vec,
+        const C_STRUCT aiMatrix3x3 *mat);
 
 // --------------------------------------------------------------------------------
 /** Transform a vector by a 4x4 matrix
@@ -513,8 +510,8 @@ ASSIMP_API void aiTransformVecByMatrix3(
  *  @param mat Matrix to transform the vector with.
  */
 ASSIMP_API void aiTransformVecByMatrix4(
-    C_STRUCT aiVector3D* vec,
-    const C_STRUCT aiMatrix4x4* mat);
+        C_STRUCT aiVector3D *vec,
+        const C_STRUCT aiMatrix4x4 *mat);
 
 // --------------------------------------------------------------------------------
 /** Multiply two 4x4 matrices.
@@ -522,8 +519,8 @@ ASSIMP_API void aiTransformVecByMatrix4(
  *  @param src Matrix to be multiplied with 'dst'.
  */
 ASSIMP_API void aiMultiplyMatrix4(
-    C_STRUCT aiMatrix4x4* dst,
-    const C_STRUCT aiMatrix4x4* src);
+        C_STRUCT aiMatrix4x4 *dst,
+        const C_STRUCT aiMatrix4x4 *src);
 
 // --------------------------------------------------------------------------------
 /** Multiply two 3x3 matrices.
@@ -531,22 +528,22 @@ ASSIMP_API void aiMultiplyMatrix4(
  *  @param src Matrix to be multiplied with 'dst'.
  */
 ASSIMP_API void aiMultiplyMatrix3(
-    C_STRUCT aiMatrix3x3* dst,
-    const C_STRUCT aiMatrix3x3* src);
+        C_STRUCT aiMatrix3x3 *dst,
+        const C_STRUCT aiMatrix3x3 *src);
 
 // --------------------------------------------------------------------------------
 /** Get a 3x3 identity matrix.
  *  @param mat Matrix to receive its personal identity
  */
 ASSIMP_API void aiIdentityMatrix3(
-    C_STRUCT aiMatrix3x3* mat);
+        C_STRUCT aiMatrix3x3 *mat);
 
 // --------------------------------------------------------------------------------
 /** Get a 4x4 identity matrix.
  *  @param mat Matrix to receive its personal identity
  */
 ASSIMP_API void aiIdentityMatrix4(
-    C_STRUCT aiMatrix4x4* mat);
+        C_STRUCT aiMatrix4x4 *mat);
 
 // --------------------------------------------------------------------------------
 /** Returns the number of import file formats available in the current Assimp build.
@@ -561,7 +558,7 @@ ASSIMP_API size_t aiGetImportFormatCount(void);
  *    0 to #aiGetImportFormatCount()
  * @return A description of that specific import format. NULL if pIndex is out of range.
  */
-ASSIMP_API const C_STRUCT aiImporterDesc* aiGetImportFormatDescription( size_t pIndex);
+ASSIMP_API const C_STRUCT aiImporterDesc *aiGetImportFormatDescription(size_t pIndex);
 
 // --------------------------------------------------------------------------------
 /** Check if 2D vectors are equal.
@@ -571,8 +568,8 @@ ASSIMP_API const C_STRUCT aiImporterDesc* aiGetImportFormatDescription( size_t p
  *  @return 0 if the vectors are not equal
  */
 ASSIMP_API int aiVector2AreEqual(
-    const C_STRUCT aiVector2D* a,
-    const C_STRUCT aiVector2D* b);
+        const C_STRUCT aiVector2D *a,
+        const C_STRUCT aiVector2D *b);
 
 // --------------------------------------------------------------------------------
 /** Check if 2D vectors are equal using epsilon.
@@ -583,9 +580,9 @@ ASSIMP_API int aiVector2AreEqual(
  *  @return 0 if the vectors are not equal
  */
 ASSIMP_API int aiVector2AreEqualEpsilon(
-    const C_STRUCT aiVector2D* a,
-    const C_STRUCT aiVector2D* b,
-    const float epsilon);
+        const C_STRUCT aiVector2D *a,
+        const C_STRUCT aiVector2D *b,
+        const float epsilon);
 
 // --------------------------------------------------------------------------------
 /** Add 2D vectors.
@@ -593,8 +590,8 @@ ASSIMP_API int aiVector2AreEqualEpsilon(
  *  @param src Vector to be added to 'dst'.
  */
 ASSIMP_API void aiVector2Add(
-    C_STRUCT aiVector2D* dst,
-    const C_STRUCT aiVector2D* src);
+        C_STRUCT aiVector2D *dst,
+        const C_STRUCT aiVector2D *src);
 
 // --------------------------------------------------------------------------------
 /** Subtract 2D vectors.
@@ -602,8 +599,8 @@ ASSIMP_API void aiVector2Add(
  *  @param src Vector to be subtracted from 'dst'.
  */
 ASSIMP_API void aiVector2Subtract(
-    C_STRUCT aiVector2D* dst,
-    const C_STRUCT aiVector2D* src);
+        C_STRUCT aiVector2D *dst,
+        const C_STRUCT aiVector2D *src);
 
 // --------------------------------------------------------------------------------
 /** Multiply a 2D vector by a scalar.
@@ -611,8 +608,8 @@ ASSIMP_API void aiVector2Subtract(
  *  @param s Scale factor
  */
 ASSIMP_API void aiVector2Scale(
-    C_STRUCT aiVector2D* dst,
-    const float s);
+        C_STRUCT aiVector2D *dst,
+        const float s);
 
 // --------------------------------------------------------------------------------
 /** Multiply each component of a 2D vector with
@@ -621,8 +618,8 @@ ASSIMP_API void aiVector2Scale(
  *  @param other Second vector
  */
 ASSIMP_API void aiVector2SymMul(
-    C_STRUCT aiVector2D* dst,
-    const C_STRUCT aiVector2D* other);
+        C_STRUCT aiVector2D *dst,
+        const C_STRUCT aiVector2D *other);
 
 // --------------------------------------------------------------------------------
 /** Divide a 2D vector by a scalar.
@@ -630,8 +627,8 @@ ASSIMP_API void aiVector2SymMul(
  *  @param s Scalar divisor
  */
 ASSIMP_API void aiVector2DivideByScalar(
-    C_STRUCT aiVector2D* dst,
-    const float s);
+        C_STRUCT aiVector2D *dst,
+        const float s);
 
 // --------------------------------------------------------------------------------
 /** Divide each component of a 2D vector by
@@ -640,29 +637,29 @@ ASSIMP_API void aiVector2DivideByScalar(
  *  @param v Vector as the divisor
  */
 ASSIMP_API void aiVector2DivideByVector(
-    C_STRUCT aiVector2D* dst,
-    C_STRUCT aiVector2D* v);
+        C_STRUCT aiVector2D *dst,
+        C_STRUCT aiVector2D *v);
 
 // --------------------------------------------------------------------------------
 /** Get the length of a 2D vector.
  *  @return v Vector to evaluate
  */
 ASSIMP_API float aiVector2Length(
-    const C_STRUCT aiVector2D* v);
+        const C_STRUCT aiVector2D *v);
 
 // --------------------------------------------------------------------------------
 /** Get the squared length of a 2D vector.
  *  @return v Vector to evaluate
  */
 ASSIMP_API float aiVector2SquareLength(
-    const C_STRUCT aiVector2D* v);
+        const C_STRUCT aiVector2D *v);
 
 // --------------------------------------------------------------------------------
 /** Negate a 2D vector.
  *  @param dst Vector to be negated
  */
 ASSIMP_API void aiVector2Negate(
-    C_STRUCT aiVector2D* dst);
+        C_STRUCT aiVector2D *dst);
 
 // --------------------------------------------------------------------------------
 /** Get the dot product of 2D vectors.
@@ -671,15 +668,15 @@ ASSIMP_API void aiVector2Negate(
  *  @return The dot product of vectors
  */
 ASSIMP_API float aiVector2DotProduct(
-    const C_STRUCT aiVector2D* a,
-    const C_STRUCT aiVector2D* b);
+        const C_STRUCT aiVector2D *a,
+        const C_STRUCT aiVector2D *b);
 
 // --------------------------------------------------------------------------------
 /** Normalize a 2D vector.
  *  @param v Vector to normalize
  */
 ASSIMP_API void aiVector2Normalize(
-    C_STRUCT aiVector2D* v);
+        C_STRUCT aiVector2D *v);
 
 // --------------------------------------------------------------------------------
 /** Check if 3D vectors are equal.
@@ -689,8 +686,8 @@ ASSIMP_API void aiVector2Normalize(
  *  @return 0 if the vectors are not equal
  */
 ASSIMP_API int aiVector3AreEqual(
-    const C_STRUCT aiVector3D* a,
-    const C_STRUCT aiVector3D* b);
+        const C_STRUCT aiVector3D *a,
+        const C_STRUCT aiVector3D *b);
 
 // --------------------------------------------------------------------------------
 /** Check if 3D vectors are equal using epsilon.
@@ -701,9 +698,9 @@ ASSIMP_API int aiVector3AreEqual(
  *  @return 0 if the vectors are not equal
  */
 ASSIMP_API int aiVector3AreEqualEpsilon(
-    const C_STRUCT aiVector3D* a,
-    const C_STRUCT aiVector3D* b,
-    const float epsilon);
+        const C_STRUCT aiVector3D *a,
+        const C_STRUCT aiVector3D *b,
+        const float epsilon);
 
 // --------------------------------------------------------------------------------
 /** Check if vector \p a is less than vector \p b.
@@ -714,8 +711,8 @@ ASSIMP_API int aiVector3AreEqualEpsilon(
  *  @return 0 if \p a is equal or greater than \p b
  */
 ASSIMP_API int aiVector3LessThan(
-    const C_STRUCT aiVector3D* a,
-    const C_STRUCT aiVector3D* b);
+        const C_STRUCT aiVector3D *a,
+        const C_STRUCT aiVector3D *b);
 
 // --------------------------------------------------------------------------------
 /** Add 3D vectors.
@@ -723,8 +720,8 @@ ASSIMP_API int aiVector3LessThan(
  *  @param src Vector to be added to 'dst'.
  */
 ASSIMP_API void aiVector3Add(
-    C_STRUCT aiVector3D* dst,
-    const C_STRUCT aiVector3D* src);
+        C_STRUCT aiVector3D *dst,
+        const C_STRUCT aiVector3D *src);
 
 // --------------------------------------------------------------------------------
 /** Subtract 3D vectors.
@@ -732,8 +729,8 @@ ASSIMP_API void aiVector3Add(
  *  @param src Vector to be subtracted from 'dst'.
  */
 ASSIMP_API void aiVector3Subtract(
-    C_STRUCT aiVector3D* dst,
-    const C_STRUCT aiVector3D* src);
+        C_STRUCT aiVector3D *dst,
+        const C_STRUCT aiVector3D *src);
 
 // --------------------------------------------------------------------------------
 /** Multiply a 3D vector by a scalar.
@@ -741,8 +738,8 @@ ASSIMP_API void aiVector3Subtract(
  *  @param s Scale factor
  */
 ASSIMP_API void aiVector3Scale(
-    C_STRUCT aiVector3D* dst,
-    const float s);
+        C_STRUCT aiVector3D *dst,
+        const float s);
 
 // --------------------------------------------------------------------------------
 /** Multiply each component of a 3D vector with
@@ -751,8 +748,8 @@ ASSIMP_API void aiVector3Scale(
  *  @param other Second vector
  */
 ASSIMP_API void aiVector3SymMul(
-    C_STRUCT aiVector3D* dst,
-    const C_STRUCT aiVector3D* other);
+        C_STRUCT aiVector3D *dst,
+        const C_STRUCT aiVector3D *other);
 
 // --------------------------------------------------------------------------------
 /** Divide a 3D vector by a scalar.
@@ -760,8 +757,8 @@ ASSIMP_API void aiVector3SymMul(
  *  @param s Scalar divisor
  */
 ASSIMP_API void aiVector3DivideByScalar(
-    C_STRUCT aiVector3D* dst,
-    const float s);
+        C_STRUCT aiVector3D *dst,
+        const float s);
 
 // --------------------------------------------------------------------------------
 /** Divide each component of a 3D vector by
@@ -770,29 +767,29 @@ ASSIMP_API void aiVector3DivideByScalar(
  *  @param v Vector as the divisor
  */
 ASSIMP_API void aiVector3DivideByVector(
-    C_STRUCT aiVector3D* dst,
-    C_STRUCT aiVector3D* v);
+        C_STRUCT aiVector3D *dst,
+        C_STRUCT aiVector3D *v);
 
 // --------------------------------------------------------------------------------
 /** Get the length of a 3D vector.
  *  @return v Vector to evaluate
  */
 ASSIMP_API float aiVector3Length(
-    const C_STRUCT aiVector3D* v);
+        const C_STRUCT aiVector3D *v);
 
 // --------------------------------------------------------------------------------
 /** Get the squared length of a 3D vector.
  *  @return v Vector to evaluate
  */
 ASSIMP_API float aiVector3SquareLength(
-    const C_STRUCT aiVector3D* v);
+        const C_STRUCT aiVector3D *v);
 
 // --------------------------------------------------------------------------------
 /** Negate a 3D vector.
  *  @param dst Vector to be negated
  */
 ASSIMP_API void aiVector3Negate(
-    C_STRUCT aiVector3D* dst);
+        C_STRUCT aiVector3D *dst);
 
 // --------------------------------------------------------------------------------
 /** Get the dot product of 3D vectors.
@@ -801,8 +798,8 @@ ASSIMP_API void aiVector3Negate(
  *  @return The dot product of vectors
  */
 ASSIMP_API float aiVector3DotProduct(
-    const C_STRUCT aiVector3D* a,
-    const C_STRUCT aiVector3D* b);
+        const C_STRUCT aiVector3D *a,
+        const C_STRUCT aiVector3D *b);
 
 // --------------------------------------------------------------------------------
 /** Get cross product of 3D vectors.
@@ -812,23 +809,23 @@ ASSIMP_API float aiVector3DotProduct(
  *  @return The dot product of vectors
  */
 ASSIMP_API void aiVector3CrossProduct(
-    C_STRUCT aiVector3D* dst,
-    const C_STRUCT aiVector3D* a,
-    const C_STRUCT aiVector3D* b);
+        C_STRUCT aiVector3D *dst,
+        const C_STRUCT aiVector3D *a,
+        const C_STRUCT aiVector3D *b);
 
 // --------------------------------------------------------------------------------
 /** Normalize a 3D vector.
  *  @param v Vector to normalize
  */
 ASSIMP_API void aiVector3Normalize(
-    C_STRUCT aiVector3D* v);
+        C_STRUCT aiVector3D *v);
 
 // --------------------------------------------------------------------------------
 /** Check for division by zero and normalize a 3D vector.
  *  @param v Vector to normalize
  */
 ASSIMP_API void aiVector3NormalizeSafe(
-    C_STRUCT aiVector3D* v);
+        C_STRUCT aiVector3D *v);
 
 // --------------------------------------------------------------------------------
 /** Rotate a 3D vector by a quaternion.
@@ -836,8 +833,8 @@ ASSIMP_API void aiVector3NormalizeSafe(
  *  @param q Quaternion to use to rotate \p v
  */
 ASSIMP_API void aiVector3RotateByQuaternion(
-    C_STRUCT aiVector3D* v,
-    const C_STRUCT aiQuaternion* q);
+        C_STRUCT aiVector3D *v,
+        const C_STRUCT aiQuaternion *q);
 
 // --------------------------------------------------------------------------------
 /** Construct a 3x3 matrix from a 4x4 matrix.
@@ -845,8 +842,8 @@ ASSIMP_API void aiVector3RotateByQuaternion(
  *  @param mat The 4x4 matrix to use
  */
 ASSIMP_API void aiMatrix3FromMatrix4(
-    C_STRUCT aiMatrix3x3* dst,
-    const C_STRUCT aiMatrix4x4* mat);
+        C_STRUCT aiMatrix3x3 *dst,
+        const C_STRUCT aiMatrix4x4 *mat);
 
 // --------------------------------------------------------------------------------
 /** Construct a 3x3 matrix from a quaternion.
@@ -854,8 +851,8 @@ ASSIMP_API void aiMatrix3FromMatrix4(
  *  @param q The quaternion matrix to use
  */
 ASSIMP_API void aiMatrix3FromQuaternion(
-    C_STRUCT aiMatrix3x3* mat,
-    const C_STRUCT aiQuaternion* q);
+        C_STRUCT aiMatrix3x3 *mat,
+        const C_STRUCT aiQuaternion *q);
 
 // --------------------------------------------------------------------------------
 /** Check if 3x3 matrices are equal.
@@ -865,8 +862,8 @@ ASSIMP_API void aiMatrix3FromQuaternion(
  *  @return 0 if the matrices are not equal
  */
 ASSIMP_API int aiMatrix3AreEqual(
-    const C_STRUCT aiMatrix3x3* a,
-    const C_STRUCT aiMatrix3x3* b);
+        const C_STRUCT aiMatrix3x3 *a,
+        const C_STRUCT aiMatrix3x3 *b);
 
 // --------------------------------------------------------------------------------
 /** Check if 3x3 matrices are equal.
@@ -877,23 +874,23 @@ ASSIMP_API int aiMatrix3AreEqual(
  *  @return 0 if the matrices are not equal
  */
 ASSIMP_API int aiMatrix3AreEqualEpsilon(
-    const C_STRUCT aiMatrix3x3* a,
-    const C_STRUCT aiMatrix3x3* b,
-    const float epsilon);
+        const C_STRUCT aiMatrix3x3 *a,
+        const C_STRUCT aiMatrix3x3 *b,
+        const float epsilon);
 
 // --------------------------------------------------------------------------------
 /** Invert a 3x3 matrix.
  *  @param mat Matrix to invert
  */
 ASSIMP_API void aiMatrix3Inverse(
-    C_STRUCT aiMatrix3x3* mat);
+        C_STRUCT aiMatrix3x3 *mat);
 
 // --------------------------------------------------------------------------------
 /** Get the determinant of a 3x3 matrix.
  *  @param mat Matrix to get the determinant from
  */
 ASSIMP_API float aiMatrix3Determinant(
-    const C_STRUCT aiMatrix3x3* mat);
+        const C_STRUCT aiMatrix3x3 *mat);
 
 // --------------------------------------------------------------------------------
 /** Get a 3x3 rotation matrix around the Z axis.
@@ -901,8 +898,8 @@ ASSIMP_API float aiMatrix3Determinant(
  *  @param angle Rotation angle, in radians
  */
 ASSIMP_API void aiMatrix3RotationZ(
-    C_STRUCT aiMatrix3x3* mat,
-    const float angle);
+        C_STRUCT aiMatrix3x3 *mat,
+        const float angle);
 
 // --------------------------------------------------------------------------------
 /** Returns a 3x3 rotation matrix for a rotation around an arbitrary axis.
@@ -911,9 +908,9 @@ ASSIMP_API void aiMatrix3RotationZ(
  *  @param angle Rotation angle, in radians
  */
 ASSIMP_API void aiMatrix3FromRotationAroundAxis(
-    C_STRUCT aiMatrix3x3* mat,
-    const C_STRUCT aiVector3D* axis,
-    const float angle);
+        C_STRUCT aiMatrix3x3 *mat,
+        const C_STRUCT aiVector3D *axis,
+        const float angle);
 
 // --------------------------------------------------------------------------------
 /** Get a 3x3 translation matrix.
@@ -921,8 +918,8 @@ ASSIMP_API void aiMatrix3FromRotationAroundAxis(
  *  @param translation The translation vector
  */
 ASSIMP_API void aiMatrix3Translation(
-    C_STRUCT aiMatrix3x3* mat,
-    const C_STRUCT aiVector2D* translation);
+        C_STRUCT aiMatrix3x3 *mat,
+        const C_STRUCT aiVector2D *translation);
 
 // --------------------------------------------------------------------------------
 /** Create a 3x3 matrix that rotates one vector to another vector.
@@ -931,9 +928,9 @@ ASSIMP_API void aiMatrix3Translation(
  *  @param to Vector to rotate to
  */
 ASSIMP_API void aiMatrix3FromTo(
-    C_STRUCT aiMatrix3x3* mat,
-    const C_STRUCT aiVector3D* from,
-    const C_STRUCT aiVector3D* to);
+        C_STRUCT aiMatrix3x3 *mat,
+        const C_STRUCT aiVector3D *from,
+        const C_STRUCT aiVector3D *to);
 
 // --------------------------------------------------------------------------------
 /** Construct a 4x4 matrix from a 3x3 matrix.
@@ -941,8 +938,8 @@ ASSIMP_API void aiMatrix3FromTo(
  *  @param mat The 3x3 matrix to use
  */
 ASSIMP_API void aiMatrix4FromMatrix3(
-    C_STRUCT aiMatrix4x4* dst,
-    const C_STRUCT aiMatrix3x3* mat);
+        C_STRUCT aiMatrix4x4 *dst,
+        const C_STRUCT aiMatrix3x3 *mat);
 
 // --------------------------------------------------------------------------------
 /** Construct a 4x4 matrix from scaling, rotation and position.
@@ -952,10 +949,10 @@ ASSIMP_API void aiMatrix4FromMatrix3(
  *  @param position The position for the x,y,z axes
  */
 ASSIMP_API void aiMatrix4FromScalingQuaternionPosition(
-    C_STRUCT aiMatrix4x4* mat,
-    const C_STRUCT aiVector3D* scaling,
-    const C_STRUCT aiQuaternion* rotation,
-    const C_STRUCT aiVector3D* position);
+        C_STRUCT aiMatrix4x4 *mat,
+        const C_STRUCT aiVector3D *scaling,
+        const C_STRUCT aiQuaternion *rotation,
+        const C_STRUCT aiVector3D *position);
 
 // --------------------------------------------------------------------------------
 /** Add 4x4 matrices.
@@ -963,8 +960,8 @@ ASSIMP_API void aiMatrix4FromScalingQuaternionPosition(
  *  @param src Matrix to be added to 'dst'.
  */
 ASSIMP_API void aiMatrix4Add(
-    C_STRUCT aiMatrix4x4* dst,
-    const C_STRUCT aiMatrix4x4* src);
+        C_STRUCT aiMatrix4x4 *dst,
+        const C_STRUCT aiMatrix4x4 *src);
 
 // --------------------------------------------------------------------------------
 /** Check if 4x4 matrices are equal.
@@ -974,8 +971,8 @@ ASSIMP_API void aiMatrix4Add(
  *  @return 0 if the matrices are not equal
  */
 ASSIMP_API int aiMatrix4AreEqual(
-    const C_STRUCT aiMatrix4x4* a,
-    const C_STRUCT aiMatrix4x4* b);
+        const C_STRUCT aiMatrix4x4 *a,
+        const C_STRUCT aiMatrix4x4 *b);
 
 // --------------------------------------------------------------------------------
 /** Check if 4x4 matrices are equal.
@@ -986,16 +983,16 @@ ASSIMP_API int aiMatrix4AreEqual(
  *  @return 0 if the matrices are not equal
  */
 ASSIMP_API int aiMatrix4AreEqualEpsilon(
-    const C_STRUCT aiMatrix4x4* a,
-    const C_STRUCT aiMatrix4x4* b,
-    const float epsilon);
+        const C_STRUCT aiMatrix4x4 *a,
+        const C_STRUCT aiMatrix4x4 *b,
+        const float epsilon);
 
 // --------------------------------------------------------------------------------
 /** Invert a 4x4 matrix.
  *  @param result Matrix to invert
  */
 ASSIMP_API void aiMatrix4Inverse(
-    C_STRUCT aiMatrix4x4* mat);
+        C_STRUCT aiMatrix4x4 *mat);
 
 // --------------------------------------------------------------------------------
 /** Get the determinant of a 4x4 matrix.
@@ -1003,7 +1000,7 @@ ASSIMP_API void aiMatrix4Inverse(
  *  @return The determinant of the matrix
  */
 ASSIMP_API float aiMatrix4Determinant(
-    const C_STRUCT aiMatrix4x4* mat);
+        const C_STRUCT aiMatrix4x4 *mat);
 
 // --------------------------------------------------------------------------------
 /** Returns true of the matrix is the identity matrix.
@@ -1012,7 +1009,7 @@ ASSIMP_API float aiMatrix4Determinant(
  *  @return 0 if \p mat is not an identity matrix.
  */
 ASSIMP_API int aiMatrix4IsIdentity(
-    const C_STRUCT aiMatrix4x4* mat);
+        const C_STRUCT aiMatrix4x4 *mat);
 
 // --------------------------------------------------------------------------------
 /** Decompose a transformation matrix into its scaling,
@@ -1024,10 +1021,10 @@ ASSIMP_API int aiMatrix4IsIdentity(
  * @param position Receives the output position for the x,y,z axes
  */
 ASSIMP_API void aiMatrix4DecomposeIntoScalingEulerAnglesPosition(
-    const C_STRUCT aiMatrix4x4* mat,
-    C_STRUCT aiVector3D* scaling,
-    C_STRUCT aiVector3D* rotation,
-    C_STRUCT aiVector3D* position);
+        const C_STRUCT aiMatrix4x4 *mat,
+        C_STRUCT aiVector3D *scaling,
+        C_STRUCT aiVector3D *rotation,
+        C_STRUCT aiVector3D *position);
 
 // --------------------------------------------------------------------------------
 /** Decompose a transformation matrix into its scaling,
@@ -1041,11 +1038,11 @@ ASSIMP_API void aiMatrix4DecomposeIntoScalingEulerAnglesPosition(
  * @param position Receives the output position for the x,y,z axes.
  */
 ASSIMP_API void aiMatrix4DecomposeIntoScalingAxisAnglePosition(
-    const C_STRUCT aiMatrix4x4* mat,
-    C_STRUCT aiVector3D* scaling,
-    C_STRUCT aiVector3D* axis,
-    float* angle,
-    C_STRUCT aiVector3D* position);
+        const C_STRUCT aiMatrix4x4 *mat,
+        C_STRUCT aiVector3D *scaling,
+        C_STRUCT aiVector3D *axis,
+        ai_real *angle,
+        C_STRUCT aiVector3D *position);
 
 // --------------------------------------------------------------------------------
 /** Decompose a transformation matrix into its rotational and
@@ -1056,9 +1053,9 @@ ASSIMP_API void aiMatrix4DecomposeIntoScalingAxisAnglePosition(
  * @param position Receives the translational component.
  */
 ASSIMP_API void aiMatrix4DecomposeNoScaling(
-    const C_STRUCT aiMatrix4x4* mat,
-    C_STRUCT aiQuaternion* rotation,
-    C_STRUCT aiVector3D* position);
+        const C_STRUCT aiMatrix4x4 *mat,
+        C_STRUCT aiQuaternion *rotation,
+        C_STRUCT aiVector3D *position);
 
 // --------------------------------------------------------------------------------
 /** Creates a 4x4 matrix from a set of euler angles.
@@ -1068,8 +1065,8 @@ ASSIMP_API void aiMatrix4DecomposeNoScaling(
  *  @param z Rotation angle for the z-axis, in radians
  */
 ASSIMP_API void aiMatrix4FromEulerAngles(
-    C_STRUCT aiMatrix4x4* mat,
-    float x, float y, float z);
+        C_STRUCT aiMatrix4x4 *mat,
+        float x, float y, float z);
 
 // --------------------------------------------------------------------------------
 /** Get a 4x4 rotation matrix around the X axis.
@@ -1077,8 +1074,8 @@ ASSIMP_API void aiMatrix4FromEulerAngles(
  *  @param angle Rotation angle, in radians
  */
 ASSIMP_API void aiMatrix4RotationX(
-    C_STRUCT aiMatrix4x4* mat,
-    const float angle);
+        C_STRUCT aiMatrix4x4 *mat,
+        const float angle);
 
 // --------------------------------------------------------------------------------
 /** Get a 4x4 rotation matrix around the Y axis.
@@ -1086,8 +1083,8 @@ ASSIMP_API void aiMatrix4RotationX(
  *  @param angle Rotation angle, in radians
  */
 ASSIMP_API void aiMatrix4RotationY(
-    C_STRUCT aiMatrix4x4* mat,
-    const float angle);
+        C_STRUCT aiMatrix4x4 *mat,
+        const float angle);
 
 // --------------------------------------------------------------------------------
 /** Get a 4x4 rotation matrix around the Z axis.
@@ -1095,8 +1092,8 @@ ASSIMP_API void aiMatrix4RotationY(
  *  @param angle Rotation angle, in radians
  */
 ASSIMP_API void aiMatrix4RotationZ(
-    C_STRUCT aiMatrix4x4* mat,
-    const float angle);
+        C_STRUCT aiMatrix4x4 *mat,
+        const float angle);
 
 // --------------------------------------------------------------------------------
 /** Returns a 4x4 rotation matrix for a rotation around an arbitrary axis.
@@ -1105,9 +1102,9 @@ ASSIMP_API void aiMatrix4RotationZ(
  *  @param angle Rotation angle, in radians
  */
 ASSIMP_API void aiMatrix4FromRotationAroundAxis(
-    C_STRUCT aiMatrix4x4* mat,
-    const C_STRUCT aiVector3D* axis,
-    const float angle);
+        C_STRUCT aiMatrix4x4 *mat,
+        const C_STRUCT aiVector3D *axis,
+        const float angle);
 
 // --------------------------------------------------------------------------------
 /** Get a 4x4 translation matrix.
@@ -1115,8 +1112,8 @@ ASSIMP_API void aiMatrix4FromRotationAroundAxis(
  *  @param translation The translation vector
  */
 ASSIMP_API void aiMatrix4Translation(
-    C_STRUCT aiMatrix4x4* mat,
-    const C_STRUCT aiVector3D* translation);
+        C_STRUCT aiMatrix4x4 *mat,
+        const C_STRUCT aiVector3D *translation);
 
 // --------------------------------------------------------------------------------
 /** Get a 4x4 scaling matrix.
@@ -1124,8 +1121,8 @@ ASSIMP_API void aiMatrix4Translation(
  *  @param scaling The scaling vector
  */
 ASSIMP_API void aiMatrix4Scaling(
-    C_STRUCT aiMatrix4x4* mat,
-    const C_STRUCT aiVector3D* scaling);
+        C_STRUCT aiMatrix4x4 *mat,
+        const C_STRUCT aiVector3D *scaling);
 
 // --------------------------------------------------------------------------------
 /** Create a 4x4 matrix that rotates one vector to another vector.
@@ -1134,9 +1131,9 @@ ASSIMP_API void aiMatrix4Scaling(
  *  @param to Vector to rotate to
  */
 ASSIMP_API void aiMatrix4FromTo(
-    C_STRUCT aiMatrix4x4* mat,
-    const C_STRUCT aiVector3D* from,
-    const C_STRUCT aiVector3D* to);
+        C_STRUCT aiMatrix4x4 *mat,
+        const C_STRUCT aiVector3D *from,
+        const C_STRUCT aiVector3D *to);
 
 // --------------------------------------------------------------------------------
 /** Create a Quaternion from euler angles.
@@ -1146,8 +1143,8 @@ ASSIMP_API void aiMatrix4FromTo(
  *  @param z Rotation angle for the z-axis, in radians
  */
 ASSIMP_API void aiQuaternionFromEulerAngles(
-    C_STRUCT aiQuaternion* q,
-    float x, float y, float z);
+        C_STRUCT aiQuaternion *q,
+        float x, float y, float z);
 
 // --------------------------------------------------------------------------------
 /** Create a Quaternion from an axis angle pair.
@@ -1156,9 +1153,9 @@ ASSIMP_API void aiQuaternionFromEulerAngles(
  *  @param angle The rotation angle, in radians
  */
 ASSIMP_API void aiQuaternionFromAxisAngle(
-    C_STRUCT aiQuaternion* q,
-    const C_STRUCT aiVector3D* axis,
-    const float angle);
+        C_STRUCT aiQuaternion *q,
+        const C_STRUCT aiVector3D *axis,
+        const float angle);
 
 // --------------------------------------------------------------------------------
 /** Create a Quaternion from a normalized quaternion stored
@@ -1167,8 +1164,8 @@ ASSIMP_API void aiQuaternionFromAxisAngle(
  *  @param normalized The vector that stores the quaternion
  */
 ASSIMP_API void aiQuaternionFromNormalizedQuaternion(
-    C_STRUCT aiQuaternion* q,
-    const C_STRUCT aiVector3D* normalized);
+        C_STRUCT aiQuaternion *q,
+        const C_STRUCT aiVector3D *normalized);
 
 // --------------------------------------------------------------------------------
 /** Check if quaternions are equal.
@@ -1178,8 +1175,8 @@ ASSIMP_API void aiQuaternionFromNormalizedQuaternion(
  *  @return 0 if the quaternions are not equal
  */
 ASSIMP_API int aiQuaternionAreEqual(
-    const C_STRUCT aiQuaternion* a,
-    const C_STRUCT aiQuaternion* b);
+        const C_STRUCT aiQuaternion *a,
+        const C_STRUCT aiQuaternion *b);
 
 // --------------------------------------------------------------------------------
 /** Check if quaternions are equal using epsilon.
@@ -1190,16 +1187,16 @@ ASSIMP_API int aiQuaternionAreEqual(
  *  @return 0 if the quaternions are not equal
  */
 ASSIMP_API int aiQuaternionAreEqualEpsilon(
-    const C_STRUCT aiQuaternion* a,
-    const C_STRUCT aiQuaternion* b,
-    const float epsilon);
+        const C_STRUCT aiQuaternion *a,
+        const C_STRUCT aiQuaternion *b,
+        const float epsilon);
 
 // --------------------------------------------------------------------------------
 /** Normalize a quaternion.
  *  @param q Quaternion to normalize
  */
 ASSIMP_API void aiQuaternionNormalize(
-    C_STRUCT aiQuaternion* q);
+        C_STRUCT aiQuaternion *q);
 
 // --------------------------------------------------------------------------------
 /** Compute quaternion conjugate.
@@ -1207,7 +1204,7 @@ ASSIMP_API void aiQuaternionNormalize(
  *           receives the output quaternion
  */
 ASSIMP_API void aiQuaternionConjugate(
-    C_STRUCT aiQuaternion* q);
+        C_STRUCT aiQuaternion *q);
 
 // --------------------------------------------------------------------------------
 /** Multiply quaternions.
@@ -1215,8 +1212,8 @@ ASSIMP_API void aiQuaternionConjugate(
  *  @param q Second quaternion
  */
 ASSIMP_API void aiQuaternionMultiply(
-    C_STRUCT aiQuaternion* dst,
-    const C_STRUCT aiQuaternion* q);
+        C_STRUCT aiQuaternion *dst,
+        const C_STRUCT aiQuaternion *q);
 
 // --------------------------------------------------------------------------------
 /** Performs a spherical interpolation between two quaternions.
@@ -1226,10 +1223,10 @@ ASSIMP_API void aiQuaternionMultiply(
  * @param factor Interpolation factor between 0 and 1
  */
 ASSIMP_API void aiQuaternionInterpolate(
-    C_STRUCT aiQuaternion* dst,
-    const C_STRUCT aiQuaternion* start,
-    const C_STRUCT aiQuaternion* end,
-    const float factor);
+        C_STRUCT aiQuaternion *dst,
+        const C_STRUCT aiQuaternion *start,
+        const C_STRUCT aiQuaternion *end,
+        const float factor);
 
 #ifdef __cplusplus
 }
diff --git a/include/assimp/config.h.in b/include/assimp/config.h.in
index c26dcc77f..d78568da7 100644
--- a/include/assimp/config.h.in
+++ b/include/assimp/config.h.in
@@ -615,6 +615,15 @@ enum aiComponent
 #define AI_CONFIG_IMPORT_FBX_READ_ANIMATIONS \
     "IMPORT_FBX_READ_ANIMATIONS"
 
+// ---------------------------------------------------------------------------
+/** @brief Set whether the fbx importer will read weights.
+ *
+ * The default value is true (1)
+ * Property type: bool
+ */
+#define AI_CONFIG_IMPORT_FBX_READ_WEIGHTS \
+    "IMPORT_FBX_READ_WEIGHTS"
+
 // ---------------------------------------------------------------------------
 /** @brief Set whether the fbx importer will act in strict mode in which only
  *    FBX 2013 is supported and any other sub formats are rejected. FBX 2013
diff --git a/include/assimp/fast_atof.h b/include/assimp/fast_atof.h
index 6e9a1bba7..9ea49c85c 100644
--- a/include/assimp/fast_atof.h
+++ b/include/assimp/fast_atof.h
@@ -24,11 +24,11 @@
 #include <cmath>
 #include <limits>
 #include <stdint.h>
-#include <stdexcept>
 #include <assimp/defs.h>
 
 #include "StringComparison.h"
 #include <assimp/DefaultLogger.hpp>
+#include <assimp/Exceptional.h>
 
 #ifdef _MSC_VER
 #  include <stdint.h>
@@ -185,13 +185,15 @@ unsigned int strtoul_cppstyle( const char* in, const char** out=0) {
 // Special version of the function, providing higher accuracy and safety
 // It is mainly used by fast_atof to prevent ugly and unwanted integer overflows.
 // ------------------------------------------------------------------------------------
+template<typename ExceptionType = DeadlyImportError>
 inline
 uint64_t strtoul10_64( const char* in, const char** out=0, unsigned int* max_inout=0) {
     unsigned int cur = 0;
     uint64_t value = 0;
 
     if ( *in < '0' || *in > '9' ) {
-        throw std::invalid_argument( std::string( "The string \"" ) + in + "\" cannot be converted into a value." );
+        // The string is known to be bad, so don't risk printing the whole thing.
+        throw ExceptionType("The string \"", std::string(in).substr(0, 100), "\" cannot be converted into a value." );
     }
 
     for ( ;; ) {
@@ -237,6 +239,7 @@ uint64_t strtoul10_64( const char* in, const char** out=0, unsigned int* max_ino
 // ------------------------------------------------------------------------------------
 // signed variant of strtoul10_64
 // ------------------------------------------------------------------------------------
+template<typename ExceptionType = DeadlyImportError>
 inline
 int64_t strtol10_64(const char* in, const char** out = 0, unsigned int* max_inout = 0) {
     bool inv = (*in == '-');
@@ -244,7 +247,7 @@ int64_t strtol10_64(const char* in, const char** out = 0, unsigned int* max_inou
         ++in;
     }
 
-    int64_t value = strtoul10_64(in, out, max_inout);
+    int64_t value = strtoul10_64<ExceptionType>(in, out, max_inout);
     if (inv) {
         value = -value;
     }
@@ -259,7 +262,7 @@ int64_t strtol10_64(const char* in, const char** out = 0, unsigned int* max_inou
 //! about 6 times faster than atof in win32.
 // If you find any bugs, please send them to me, niko (at) irrlicht3d.org.
 // ------------------------------------------------------------------------------------
-template<typename Real>
+template<typename Real, typename ExceptionType = DeadlyImportError>
 inline
 const char* fast_atoreal_move(const char* c, Real& out, bool check_comma = true) {
     Real f = 0;
@@ -289,13 +292,14 @@ const char* fast_atoreal_move(const char* c, Real& out, bool check_comma = true)
 
     if (!(c[0] >= '0' && c[0] <= '9') &&
             !((c[0] == '.' || (check_comma && c[0] == ',')) && c[1] >= '0' && c[1] <= '9')) {
-        throw std::invalid_argument("Cannot parse string "
-                                    "as real number: does not start with digit "
+        // The string is known to be bad, so don't risk printing the whole thing.
+        throw ExceptionType("Cannot parse string \"", std::string(c).substr(0, 100), 
+                                    "\" as a real number: does not start with digit "
                                     "or decimal point followed by digit.");
     }
 
     if (*c != '.' && (! check_comma || c[0] != ',')) {
-        f = static_cast<Real>( strtoul10_64 ( c, &c) );
+        f = static_cast<Real>( strtoul10_64<ExceptionType> ( c, &c) );
     }
 
     if ((*c == '.' || (check_comma && c[0] == ',')) && c[1] >= '0' && c[1] <= '9') {
@@ -310,7 +314,7 @@ const char* fast_atoreal_move(const char* c, Real& out, bool check_comma = true)
         // number of digits to be read. AI_FAST_ATOF_RELAVANT_DECIMALS can be a value between
         // 1 and 15.
         unsigned int diff = AI_FAST_ATOF_RELAVANT_DECIMALS;
-        double pl = static_cast<double>( strtoul10_64 ( c, &c, &diff ));
+        double pl = static_cast<double>( strtoul10_64<ExceptionType> ( c, &c, &diff ));
 
         pl *= fast_atof_table[diff];
         f += static_cast<Real>( pl );
@@ -332,7 +336,7 @@ const char* fast_atoreal_move(const char* c, Real& out, bool check_comma = true)
         // The reason float constants are used here is that we've seen cases where compilers
         // would perform such casts on compile-time constants at runtime, which would be
         // bad considering how frequently fast_atoreal_move<float> is called in Assimp.
-        Real exp = static_cast<Real>( strtoul10_64(c, &c) );
+        Real exp = static_cast<Real>( strtoul10_64<ExceptionType>(c, &c) );
         if (einv) {
             exp = -exp;
         }
@@ -348,26 +352,29 @@ const char* fast_atoreal_move(const char* c, Real& out, bool check_comma = true)
 
 // ------------------------------------------------------------------------------------
 // The same but more human.
+template<typename ExceptionType = DeadlyImportError>
 inline
 ai_real fast_atof(const char* c) {
     ai_real ret(0.0);
-    fast_atoreal_move<ai_real>(c, ret);
+    fast_atoreal_move<ai_real, ExceptionType>(c, ret);
 
     return ret;
 }
 
+template<typename ExceptionType = DeadlyImportError>
 inline
 ai_real fast_atof( const char* c, const char** cout) {
     ai_real ret(0.0);
-    *cout = fast_atoreal_move<ai_real>(c, ret);
+    *cout = fast_atoreal_move<ai_real, ExceptionType>(c, ret);
 
     return ret;
 }
 
+template<typename ExceptionType = DeadlyImportError>
 inline
 ai_real fast_atof( const char** inout) {
     ai_real ret(0.0);
-    *inout = fast_atoreal_move<ai_real>(*inout, ret);
+    *inout = fast_atoreal_move<ai_real, ExceptionType>(*inout, ret);
 
     return ret;
 }
diff --git a/include/assimp/importerdesc.h b/include/assimp/importerdesc.h
index f731ed1c4..a2817d929 100644
--- a/include/assimp/importerdesc.h
+++ b/include/assimp/importerdesc.h
@@ -5,8 +5,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -49,9 +47,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_IMPORTER_DESC_H_INC
 
 #ifdef __GNUC__
-#pragma GCC system_header
+#   pragma GCC system_header
 #endif
 
+#include <assimp/types.h>
+
 /** Mixed set of flags for #aiImporterDesc, indicating some features
   *  common to many importers*/
 enum aiImporterFlags {
diff --git a/include/assimp/irrXMLWrapper.h b/include/assimp/irrXMLWrapper.h
deleted file mode 100644
index 52c174791..000000000
--- a/include/assimp/irrXMLWrapper.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
-Open Asset Import Library (assimp)
-----------------------------------------------------------------------
-
-Copyright (c) 2006-2020, assimp team
-
-
-All rights reserved.
-
-Redistribution and use of this software in source and binary forms,
-with or without modification, are permitted provided that the
-following conditions are met:
-
-* Redistributions of source code must retain the above
-copyright notice, this list of conditions and the
-following disclaimer.
-
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the
-following disclaimer in the documentation and/or other
-materials provided with the distribution.
-
-* Neither the name of the assimp team, nor the names of its
-contributors may be used to endorse or promote products
-derived from this software without specific prior
-written permission of the assimp team.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-----------------------------------------------------------------------
-*/
-
-#ifndef INCLUDED_AI_IRRXML_WRAPPER
-#define INCLUDED_AI_IRRXML_WRAPPER
-
-// some long includes ....
-#ifdef ASSIMP_USE_HUNTER
-#  include <irrXML/irrXML.h>
-#else
-#  include <irrXML.h>
-#endif
-#include "IOStream.hpp"
-#include "BaseImporter.h"
-#include <vector>
-
-namespace Assimp    {
-
-// ---------------------------------------------------------------------------------
-/** @brief Utility class to make IrrXML work together with our custom IO system
- *  See the IrrXML docs for more details.
- *
- *  Construct IrrXML-Reader in BaseImporter::InternReadFile():
- *  @code
- * // open the file
- * std::unique_ptr<IOStream> file( pIOHandler->Open( pFile));
- * if( file.get() == nullptr ) {
- *    throw DeadlyImportError( "Failed to open file " + pFile + ".");
- * }
- *
- * // generate a XML reader for it
- * std::unique_ptr<CIrrXML_IOStreamReader> mIOWrapper( new CIrrXML_IOStreamReader( file.get()));
- * mReader = irr::io::createIrrXMLReader( mIOWrapper.get());
- * if( !mReader) {
- *    ThrowException( "xxxx: Unable to open file.");
- * }
- * @endcode
- **/
-class CIrrXML_IOStreamReader : public irr::io::IFileReadCallBack {
-public:
-
-    // ----------------------------------------------------------------------------------
-    //! Construction from an existing IOStream
-    explicit CIrrXML_IOStreamReader(IOStream* _stream)
-        : stream (_stream)
-        , t (0)
-    {
-
-        // Map the buffer into memory and convert it to UTF8. IrrXML provides its
-        // own conversion, which is merely a cast from uintNN_t to uint8_t. Thus,
-        // it is not suitable for our purposes and we have to do it BEFORE IrrXML
-        // gets the buffer. Sadly, this forces us to map the whole file into
-        // memory.
-
-        data.resize(stream->FileSize());
-        stream->Read(&data[0],data.size(),1);
-
-        // Remove null characters from the input sequence otherwise the parsing will utterly fail
-        // std::find is usually much faster than manually iterating
-        // It is very unlikely that there will be any null characters
-        auto null_char_iter = std::find(data.begin(), data.end(), '\0');
-
-        while (null_char_iter != data.end())
-        {
-            null_char_iter = data.erase(null_char_iter);
-            null_char_iter = std::find(null_char_iter, data.end(), '\0');
-        }
-
-        BaseImporter::ConvertToUTF8(data);
-    }
-
-    // ----------------------------------------------------------------------------------
-    //! Virtual destructor
-    virtual ~CIrrXML_IOStreamReader() {}
-
-    // ----------------------------------------------------------------------------------
-    //!   Reads an amount of bytes from the file.
-    /**  @param buffer:       Pointer to output buffer.
-     *   @param sizeToRead:   Amount of bytes to read
-     *   @return              Returns how much bytes were read.  */
-    virtual int read(void* buffer, int sizeToRead)  {
-        if(sizeToRead<0) {
-            return 0;
-        }
-        if(t+sizeToRead>data.size()) {
-            sizeToRead = static_cast<int>(data.size()-t);
-        }
-
-        memcpy(buffer,&data.front()+t,sizeToRead);
-
-        t += sizeToRead;
-        return sizeToRead;
-    }
-
-    // ----------------------------------------------------------------------------------
-    //! Returns size of file in bytes
-    virtual int getSize()   {
-        return (int)data.size();
-    }
-
-private:
-    IOStream* stream;
-    std::vector<char> data;
-    size_t t;
-
-}; // ! class CIrrXML_IOStreamReader
-
-} // ! Assimp
-
-#endif // !! INCLUDED_AI_IRRXML_WRAPPER
diff --git a/include/assimp/material.h b/include/assimp/material.h
index 75695e50b..13529f172 100644
--- a/include/assimp/material.h
+++ b/include/assimp/material.h
@@ -5,8 +5,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -49,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_MATERIAL_H_INC
 
 #ifdef __GNUC__
-#   pragma GCC system_header
+#pragma GCC system_header
 #endif
 
 #include <assimp/types.h>
@@ -59,7 +57,7 @@ extern "C" {
 #endif
 
 // Name for default materials (2nd is used if meshes have UV coords)
-#define AI_DEFAULT_MATERIAL_NAME          "DefaultMaterial"
+#define AI_DEFAULT_MATERIAL_NAME "DefaultMaterial"
 
 // ---------------------------------------------------------------------------
 /** @brief Defines how the Nth texture of a specific type is combined with
@@ -80,8 +78,7 @@ extern "C" {
  *  @endcode
  *  where 'diffContrib' is the intensity of the incoming light for that pixel.
  */
-enum aiTextureOp
-{
+enum aiTextureOp {
     /** T = T1 * T2 */
     aiTextureOp_Multiply = 0x0,
 
@@ -100,7 +97,6 @@ enum aiTextureOp
     /** T = T1 + (T2-0.5) */
     aiTextureOp_SignedAdd = 0x5,
 
-
 #ifndef SWIG
     _aiTextureOp_Force32Bit = INT_MAX
 #endif
@@ -111,8 +107,7 @@ enum aiTextureOp
  *
  *  Commonly referred to as 'wrapping mode'.
  */
-enum aiTextureMapMode
-{
+enum aiTextureMapMode {
     /** A texture coordinate u|v is translated to u%1|v%1
      */
     aiTextureMapMode_Wrap = 0x0,
@@ -146,8 +141,7 @@ enum aiTextureMapMode
  *  how the mapping should look like (e.g spherical) is given.
  *  See the #AI_MATKEY_MAPPING property for more details.
  */
-enum aiTextureMapping
-{
+enum aiTextureMapping {
     /** The mapping coordinates are taken from an UV channel.
      *
      *  The #AI_MATKEY_UVWSRC key specifies from which UV channel
@@ -156,22 +150,21 @@ enum aiTextureMapping
     */
     aiTextureMapping_UV = 0x0,
 
-     /** Spherical mapping */
+    /** Spherical mapping */
     aiTextureMapping_SPHERE = 0x1,
 
-     /** Cylindrical mapping */
+    /** Cylindrical mapping */
     aiTextureMapping_CYLINDER = 0x2,
 
-     /** Cubic mapping */
+    /** Cubic mapping */
     aiTextureMapping_BOX = 0x3,
 
-     /** Planar mapping */
+    /** Planar mapping */
     aiTextureMapping_PLANE = 0x4,
 
-     /** Undefined mapping. Have fun. */
+    /** Undefined mapping. Have fun. */
     aiTextureMapping_OTHER = 0x5,
 
-
 #ifndef SWIG
     _aiTextureMapping_Force32Bit = INT_MAX
 #endif
@@ -192,8 +185,7 @@ enum aiTextureMapping
  *  and the artists working on models have to conform to this specification,
  *  regardless which 3D tool they're using.
  */
-enum aiTextureType
-{
+enum aiTextureType {
     /** Dummy value.
      *
      *  No texture, but the value to be used as 'texture semantic'
@@ -304,17 +296,16 @@ enum aiTextureType
     */
     aiTextureType_UNKNOWN = 18,
 
-
 #ifndef SWIG
     _aiTextureType_Force32Bit = INT_MAX
 #endif
 };
 
-#define AI_TEXTURE_TYPE_MAX  aiTextureType_UNKNOWN
+#define AI_TEXTURE_TYPE_MAX aiTextureType_UNKNOWN
 
 // -------------------------------------------------------------------------------
 // Get a string for a given aiTextureType
-ASSIMP_API const char* TextureTypeToString(enum aiTextureType in);
+ASSIMP_API const char *TextureTypeToString(enum aiTextureType in);
 
 // ---------------------------------------------------------------------------
 /** @brief Defines all shading models supported by the library
@@ -326,10 +317,9 @@ ASSIMP_API const char* TextureTypeToString(enum aiTextureType in);
  *  undefined). <br>
  *  Again, this value is just a hint. Assimp tries to select the shader whose
  *  most common implementation matches the original rendering results of the
- *  3D modeller which wrote a particular model as closely as possible.
+ *  3D modeler which wrote a particular model as closely as possible.
  */
-enum aiShadingMode
-{
+enum aiShadingMode {
     /** Flat shading. Shading is done on per-face base,
      *  diffuse only. Also known as 'faceted shading'.
      */
@@ -377,17 +367,15 @@ enum aiShadingMode
     */
     aiShadingMode_NoShading = 0x9,
 
-     /** Fresnel shading
+    /** Fresnel shading
      */
     aiShadingMode_Fresnel = 0xa,
 
-
 #ifndef SWIG
     _aiShadingMode_Force32Bit = INT_MAX
 #endif
 };
 
-
 // ---------------------------------------------------------------------------
 /** @brief Defines some mixed flags for a particular texture.
  *
@@ -399,8 +387,7 @@ enum aiShadingMode
  *
  *  This corresponds to the #AI_MATKEY_TEXFLAGS property.
 */
-enum aiTextureFlags
-{
+enum aiTextureFlags {
     /** The texture's color values have to be inverted (component-wise 1-n)
      */
     aiTextureFlags_Invert = 0x1,
@@ -424,11 +411,10 @@ enum aiTextureFlags
     aiTextureFlags_IgnoreAlpha = 0x4,
 
 #ifndef SWIG
-      _aiTextureFlags_Force32Bit = INT_MAX
+    _aiTextureFlags_Force32Bit = INT_MAX
 #endif
 };
 
-
 // ---------------------------------------------------------------------------
 /** @brief Defines alpha-blend flags.
  *
@@ -440,13 +426,12 @@ enum aiTextureFlags
  *  @code
  *    SourceColor * SourceBlend + DestColor * DestBlend
  *  @endcode
- *  where DestColor is the previous color in the framebuffer at this
+ *  where DestColor is the previous color in the frame-buffer at this
  *  position and SourceColor is the material color before the transparency
  *  calculation.<br>
  *  This corresponds to the #AI_MATKEY_BLEND_FUNC property.
 */
-enum aiBlendMode
-{
+enum aiBlendMode {
     /**
      *  Formula:
      *  @code
@@ -464,15 +449,14 @@ enum aiBlendMode
      */
     aiBlendMode_Additive = 0x1,
 
-    // we don't need more for the moment, but we might need them
-    // in future versions ...
+// we don't need more for the moment, but we might need them
+// in future versions ...
 
 #ifndef SWIG
     _aiBlendMode_Force32Bit = INT_MAX
 #endif
 };
 
-
 #include "./Compiler/pushpack1.h"
 
 // ---------------------------------------------------------------------------
@@ -485,8 +469,7 @@ enum aiBlendMode
  *  we keep separate scaling/translation/rotation values to make it
  *  easier to process and optimize UV transformations internally.
  */
-struct aiUVTransform
-{
+struct aiUVTransform {
     /** Translation on the u and v axes.
      *
      *  The default value is (0|0).
@@ -507,17 +490,14 @@ struct aiUVTransform
      */
     ai_real mRotation;
 
-
 #ifdef __cplusplus
     aiUVTransform() AI_NO_EXCEPT
-        :   mTranslation (0.0,0.0)
-        ,   mScaling    (1.0,1.0)
-        ,   mRotation   (0.0)
-    {
+            : mTranslation(0.0, 0.0),
+              mScaling(1.0, 1.0),
+              mRotation(0.0) {
         // nothing to be done here ...
     }
 #endif
-
 };
 
 #include "./Compiler/poppack1.h"
@@ -527,15 +507,14 @@ struct aiUVTransform
 /** @brief A very primitive RTTI system for the contents of material
  *  properties.
  */
-enum aiPropertyTypeInfo
-{
+enum aiPropertyTypeInfo {
     /** Array of single-precision (32 Bit) floats
      *
      *  It is possible to use aiGetMaterialInteger[Array]() (or the C++-API
      *  aiMaterial::Get()) to query properties stored in floating-point format.
      *  The material system performs the type conversion automatically.
     */
-    aiPTI_Float   = 0x1,
+    aiPTI_Float = 0x1,
 
     /** Array of double-precision (64 Bit) floats
      *
@@ -543,14 +522,14 @@ enum aiPropertyTypeInfo
      *  aiMaterial::Get()) to query properties stored in floating-point format.
      *  The material system performs the type conversion automatically.
     */
-    aiPTI_Double   = 0x2,
+    aiPTI_Double = 0x2,
 
     /** The material property is an aiString.
      *
      *  Arrays of strings aren't possible, aiGetMaterialString() (or the
      *  C++-API aiMaterial::Get()) *must* be used to query a string property.
     */
-    aiPTI_String  = 0x3,
+    aiPTI_String = 0x3,
 
     /** Array of (32 Bit) integers
      *
@@ -560,17 +539,15 @@ enum aiPropertyTypeInfo
     */
     aiPTI_Integer = 0x4,
 
-
     /** Simple binary buffer, content undefined. Not convertible to anything.
     */
-    aiPTI_Buffer  = 0x5,
+    aiPTI_Buffer = 0x5,
 
-
-     /** This value is not used. It is just there to force the
+/** This value is not used. It is just there to force the
      *  compiler to map this enum to a 32 Bit integer.
      */
 #ifndef SWIG
-     _aiPTI_Force32Bit = INT_MAX
+    _aiPTI_Force32Bit = INT_MAX
 #endif
 };
 
@@ -594,8 +571,7 @@ enum aiPropertyTypeInfo
  *  @endcode
  *  @see aiMaterial
  */
-struct aiMaterialProperty
-{
+struct aiMaterialProperty {
     /** Specifies the name of the property (key)
      *  Keys are generally case insensitive.
      */
@@ -629,20 +605,20 @@ struct aiMaterialProperty
     /** Binary buffer to hold the property's value.
      * The size of the buffer is always mDataLength.
      */
-    char* mData;
+    char *mData;
 
 #ifdef __cplusplus
 
     aiMaterialProperty() AI_NO_EXCEPT
-    : mSemantic( 0 )
-    , mIndex( 0 )
-    , mDataLength( 0 )
-    , mType( aiPTI_Float )
-    , mData(nullptr) {
+            : mSemantic(0),
+              mIndex(0),
+              mDataLength(0),
+              mType(aiPTI_Float),
+              mData(nullptr) {
         // empty
     }
 
-    ~aiMaterialProperty()   {
+    ~aiMaterialProperty() {
         delete[] mData;
         mData = nullptr;
     }
@@ -674,7 +650,6 @@ struct aiMaterial
 #ifdef __cplusplus
 
 public:
-
     aiMaterial();
     ~aiMaterial();
 
@@ -684,7 +659,7 @@ public:
       * @return The name of the material.
       */
     // -------------------------------------------------------------------
-    aiString GetName();
+    aiString GetName() const;
 
     // -------------------------------------------------------------------
     /** @brief Retrieve an array of Type values with a specific key
@@ -699,14 +674,14 @@ public:
      * NULL is a valid value for this parameter.
      */
     template <typename Type>
-    aiReturn Get(const char* pKey,unsigned int type,
-        unsigned int idx, Type* pOut, unsigned int* pMax) const;
+    aiReturn Get(const char *pKey, unsigned int type,
+            unsigned int idx, Type *pOut, unsigned int *pMax) const;
 
-    aiReturn Get(const char* pKey,unsigned int type,
-        unsigned int idx, int* pOut, unsigned int* pMax) const;
+    aiReturn Get(const char *pKey, unsigned int type,
+            unsigned int idx, int *pOut, unsigned int *pMax) const;
 
-    aiReturn Get(const char* pKey,unsigned int type,
-        unsigned int idx, ai_real* pOut, unsigned int* pMax) const;
+    aiReturn Get(const char *pKey, unsigned int type,
+            unsigned int idx, ai_real *pOut, unsigned int *pMax) const;
 
     // -------------------------------------------------------------------
     /** @brief Retrieve a Type value with a specific key
@@ -719,27 +694,26 @@ public:
      * @param pOut Reference to receive the output value
      */
     template <typename Type>
-    aiReturn Get(const char* pKey,unsigned int type,
-        unsigned int idx,Type& pOut) const;
+    aiReturn Get(const char *pKey, unsigned int type,
+            unsigned int idx, Type &pOut) const;
 
+    aiReturn Get(const char *pKey, unsigned int type,
+            unsigned int idx, int &pOut) const;
 
-    aiReturn Get(const char* pKey,unsigned int type,
-        unsigned int idx, int& pOut) const;
+    aiReturn Get(const char *pKey, unsigned int type,
+            unsigned int idx, ai_real &pOut) const;
 
-    aiReturn Get(const char* pKey,unsigned int type,
-        unsigned int idx, ai_real& pOut) const;
+    aiReturn Get(const char *pKey, unsigned int type,
+            unsigned int idx, aiString &pOut) const;
 
-    aiReturn Get(const char* pKey,unsigned int type,
-        unsigned int idx, aiString& pOut) const;
+    aiReturn Get(const char *pKey, unsigned int type,
+            unsigned int idx, aiColor3D &pOut) const;
 
-    aiReturn Get(const char* pKey,unsigned int type,
-        unsigned int idx, aiColor3D& pOut) const;
+    aiReturn Get(const char *pKey, unsigned int type,
+            unsigned int idx, aiColor4D &pOut) const;
 
-    aiReturn Get(const char* pKey,unsigned int type,
-        unsigned int idx, aiColor4D& pOut) const;
-
-    aiReturn Get(const char* pKey,unsigned int type,
-        unsigned int idx, aiUVTransform& pOut) const;
+    aiReturn Get(const char *pKey, unsigned int type,
+            unsigned int idx, aiUVTransform &pOut) const;
 
     // -------------------------------------------------------------------
     /** Get the number of textures for a particular texture type.
@@ -761,9 +735,9 @@ public:
      *    #GetTextureCount() can be used to determine the number of textures
      *    per texture type.
      *  @param path Receives the path to the texture.
-     *    If the texture is embedded, receives a '*' followed by the id of
-     *    the texture (for the textures stored in the corresponding scene) which
-     *    can be converted to an int using a function like atoi.
+     *    Use aiScene::GetEmbeddedTexture() method to determine if returned path
+     *    is an image file to be opened or a string key of embedded texture stored in the corresponding scene
+     *    (could be a '*' followed by the id of the texture in case of no name)
      *    NULL is a valid value.
      *  @param mapping The texture mapping.
      *    NULL is allowed as value.
@@ -780,18 +754,16 @@ public:
      */
     // -------------------------------------------------------------------
     aiReturn GetTexture(aiTextureType type,
-        unsigned int  index,
-        C_STRUCT aiString* path,
-        aiTextureMapping* mapping   = NULL,
-        unsigned int* uvindex       = NULL,
-        ai_real* blend              = NULL,
-        aiTextureOp* op             = NULL,
-        aiTextureMapMode* mapmode   = NULL) const;
-
+            unsigned int index,
+            C_STRUCT aiString *path,
+            aiTextureMapping *mapping = NULL,
+            unsigned int *uvindex = NULL,
+            ai_real *blend = NULL,
+            aiTextureOp *op = NULL,
+            aiTextureMapMode *mapmode = NULL) const;
 
     // Setters
 
-
     // ------------------------------------------------------------------------------
     /** @brief Add a property with a given key and type info to the material
      *  structure
@@ -802,12 +774,12 @@ public:
      *  @param type Set by the AI_MATKEY_XXX macro
      *  @param index Set by the AI_MATKEY_XXX macro
      *  @param pType Type information hint */
-    aiReturn AddBinaryProperty (const void* pInput,
-        unsigned int pSizeInBytes,
-        const char* pKey,
-        unsigned int type ,
-        unsigned int index ,
-        aiPropertyTypeInfo pType);
+    aiReturn AddBinaryProperty(const void *pInput,
+            unsigned int pSizeInBytes,
+            const char *pKey,
+            unsigned int type,
+            unsigned int index,
+            aiPropertyTypeInfo pType);
 
     // ------------------------------------------------------------------------------
     /** @brief Add a string property with a given key and type info to the
@@ -817,10 +789,10 @@ public:
      *  @param pKey Key/Usage of the property (AI_MATKEY_XXX)
      *  @param type Set by the AI_MATKEY_XXX macro
      *  @param index Set by the AI_MATKEY_XXX macro */
-    aiReturn AddProperty (const aiString* pInput,
-        const char* pKey,
-        unsigned int type  = 0,
-        unsigned int index = 0);
+    aiReturn AddProperty(const aiString *pInput,
+            const char *pKey,
+            unsigned int type = 0,
+            unsigned int index = 0);
 
     // ------------------------------------------------------------------------------
     /** @brief Add a property with a given key to the material structure
@@ -829,54 +801,54 @@ public:
      *  @param pKey Key/Usage of the property (AI_MATKEY_XXX)
      *  @param type Set by the AI_MATKEY_XXX macro
      *  @param index Set by the AI_MATKEY_XXX macro  */
-    template<class TYPE>
-    aiReturn AddProperty (const TYPE* pInput,
-        unsigned int pNumValues,
-        const char* pKey,
-        unsigned int type  = 0,
-        unsigned int index = 0);
+    template <class TYPE>
+    aiReturn AddProperty(const TYPE *pInput,
+            unsigned int pNumValues,
+            const char *pKey,
+            unsigned int type = 0,
+            unsigned int index = 0);
 
-    aiReturn AddProperty (const aiVector3D* pInput,
-        unsigned int pNumValues,
-        const char* pKey,
-        unsigned int type  = 0,
-        unsigned int index = 0);
+    aiReturn AddProperty(const aiVector3D *pInput,
+            unsigned int pNumValues,
+            const char *pKey,
+            unsigned int type = 0,
+            unsigned int index = 0);
 
-    aiReturn AddProperty (const aiColor3D* pInput,
-        unsigned int pNumValues,
-        const char* pKey,
-        unsigned int type  = 0,
-        unsigned int index = 0);
+    aiReturn AddProperty(const aiColor3D *pInput,
+            unsigned int pNumValues,
+            const char *pKey,
+            unsigned int type = 0,
+            unsigned int index = 0);
 
-    aiReturn AddProperty (const aiColor4D* pInput,
-        unsigned int pNumValues,
-        const char* pKey,
-        unsigned int type  = 0,
-        unsigned int index = 0);
+    aiReturn AddProperty(const aiColor4D *pInput,
+            unsigned int pNumValues,
+            const char *pKey,
+            unsigned int type = 0,
+            unsigned int index = 0);
 
-    aiReturn AddProperty (const int* pInput,
-        unsigned int pNumValues,
-        const char* pKey,
-        unsigned int type  = 0,
-        unsigned int index = 0);
+    aiReturn AddProperty(const int *pInput,
+            unsigned int pNumValues,
+            const char *pKey,
+            unsigned int type = 0,
+            unsigned int index = 0);
 
-    aiReturn AddProperty (const float* pInput,
-        unsigned int pNumValues,
-        const char* pKey,
-        unsigned int type  = 0,
-        unsigned int index = 0);
+    aiReturn AddProperty(const float *pInput,
+            unsigned int pNumValues,
+            const char *pKey,
+            unsigned int type = 0,
+            unsigned int index = 0);
 
-    aiReturn AddProperty (const double* pInput,
-        unsigned int pNumValues,
-        const char* pKey,
-        unsigned int type  = 0,
-        unsigned int index = 0);
+    aiReturn AddProperty(const double *pInput,
+            unsigned int pNumValues,
+            const char *pKey,
+            unsigned int type = 0,
+            unsigned int index = 0);
 
-    aiReturn AddProperty (const aiUVTransform* pInput,
-        unsigned int pNumValues,
-        const char* pKey,
-        unsigned int type  = 0,
-        unsigned int index = 0);
+    aiReturn AddProperty(const aiUVTransform *pInput,
+            unsigned int pNumValues,
+            const char *pKey,
+            unsigned int type = 0,
+            unsigned int index = 0);
 
     // ------------------------------------------------------------------------------
     /** @brief Remove a given key from the list.
@@ -885,9 +857,9 @@ public:
      *  @param pKey Key to be deleted
      *  @param type Set by the AI_MATKEY_XXX macro
      *  @param index Set by the AI_MATKEY_XXX macro  */
-    aiReturn RemoveProperty (const char* pKey,
-        unsigned int type  = 0,
-        unsigned int index = 0);
+    aiReturn RemoveProperty(const char *pKey,
+            unsigned int type = 0,
+            unsigned int index = 0);
 
     // ------------------------------------------------------------------------------
     /** @brief Removes all properties from the material.
@@ -900,19 +872,18 @@ public:
      *  @param pcDest Destination material
      *  @param pcSrc Source material
      */
-    static void CopyPropertyList(aiMaterial* pcDest,
-        const aiMaterial* pcSrc);
-
+    static void CopyPropertyList(aiMaterial *pcDest,
+            const aiMaterial *pcSrc);
 
 #endif
 
     /** List of all material properties loaded. */
-    C_STRUCT aiMaterialProperty** mProperties;
+    C_STRUCT aiMaterialProperty **mProperties;
 
     /** Number of properties in the data base */
     unsigned int mNumProperties;
 
-     /** Storage allocated */
+    /** Storage allocated */
     unsigned int mNumAllocated;
 };
 
@@ -922,443 +893,443 @@ extern "C" {
 #endif
 
 // ---------------------------------------------------------------------------
-#define AI_MATKEY_NAME "?mat.name",0,0
-#define AI_MATKEY_TWOSIDED "$mat.twosided",0,0
-#define AI_MATKEY_SHADING_MODEL "$mat.shadingm",0,0
-#define AI_MATKEY_ENABLE_WIREFRAME "$mat.wireframe",0,0
-#define AI_MATKEY_BLEND_FUNC "$mat.blend",0,0
-#define AI_MATKEY_OPACITY "$mat.opacity",0,0
-#define AI_MATKEY_TRANSPARENCYFACTOR "$mat.transparencyfactor",0,0
-#define AI_MATKEY_BUMPSCALING "$mat.bumpscaling",0,0
-#define AI_MATKEY_SHININESS "$mat.shininess",0,0
-#define AI_MATKEY_REFLECTIVITY "$mat.reflectivity",0,0
-#define AI_MATKEY_SHININESS_STRENGTH "$mat.shinpercent",0,0
-#define AI_MATKEY_REFRACTI "$mat.refracti",0,0
-#define AI_MATKEY_COLOR_DIFFUSE "$clr.diffuse",0,0
-#define AI_MATKEY_COLOR_AMBIENT "$clr.ambient",0,0
-#define AI_MATKEY_COLOR_SPECULAR "$clr.specular",0,0
-#define AI_MATKEY_COLOR_EMISSIVE "$clr.emissive",0,0
-#define AI_MATKEY_COLOR_TRANSPARENT "$clr.transparent",0,0
-#define AI_MATKEY_COLOR_REFLECTIVE "$clr.reflective",0,0
-#define AI_MATKEY_GLOBAL_BACKGROUND_IMAGE "?bg.global",0,0
-#define AI_MATKEY_GLOBAL_SHADERLANG "?sh.lang",0,0
-#define AI_MATKEY_SHADER_VERTEX "?sh.vs",0,0
-#define AI_MATKEY_SHADER_FRAGMENT "?sh.fs",0,0
-#define AI_MATKEY_SHADER_GEO "?sh.gs",0,0
-#define AI_MATKEY_SHADER_TESSELATION "?sh.ts",0,0
-#define AI_MATKEY_SHADER_PRIMITIVE "?sh.ps",0,0
-#define AI_MATKEY_SHADER_COMPUTE "?sh.cs",0,0
+#define AI_MATKEY_NAME "?mat.name", 0, 0
+#define AI_MATKEY_TWOSIDED "$mat.twosided", 0, 0
+#define AI_MATKEY_SHADING_MODEL "$mat.shadingm", 0, 0
+#define AI_MATKEY_ENABLE_WIREFRAME "$mat.wireframe", 0, 0
+#define AI_MATKEY_BLEND_FUNC "$mat.blend", 0, 0
+#define AI_MATKEY_OPACITY "$mat.opacity", 0, 0
+#define AI_MATKEY_TRANSPARENCYFACTOR "$mat.transparencyfactor", 0, 0
+#define AI_MATKEY_BUMPSCALING "$mat.bumpscaling", 0, 0
+#define AI_MATKEY_SHININESS "$mat.shininess", 0, 0
+#define AI_MATKEY_REFLECTIVITY "$mat.reflectivity", 0, 0
+#define AI_MATKEY_SHININESS_STRENGTH "$mat.shinpercent", 0, 0
+#define AI_MATKEY_REFRACTI "$mat.refracti", 0, 0
+#define AI_MATKEY_COLOR_DIFFUSE "$clr.diffuse", 0, 0
+#define AI_MATKEY_COLOR_AMBIENT "$clr.ambient", 0, 0
+#define AI_MATKEY_COLOR_SPECULAR "$clr.specular", 0, 0
+#define AI_MATKEY_COLOR_EMISSIVE "$clr.emissive", 0, 0
+#define AI_MATKEY_COLOR_TRANSPARENT "$clr.transparent", 0, 0
+#define AI_MATKEY_COLOR_REFLECTIVE "$clr.reflective", 0, 0
+#define AI_MATKEY_GLOBAL_BACKGROUND_IMAGE "?bg.global", 0, 0
+#define AI_MATKEY_GLOBAL_SHADERLANG "?sh.lang", 0, 0
+#define AI_MATKEY_SHADER_VERTEX "?sh.vs", 0, 0
+#define AI_MATKEY_SHADER_FRAGMENT "?sh.fs", 0, 0
+#define AI_MATKEY_SHADER_GEO "?sh.gs", 0, 0
+#define AI_MATKEY_SHADER_TESSELATION "?sh.ts", 0, 0
+#define AI_MATKEY_SHADER_PRIMITIVE "?sh.ps", 0, 0
+#define AI_MATKEY_SHADER_COMPUTE "?sh.cs", 0, 0
 
 // ---------------------------------------------------------------------------
 // Pure key names for all texture-related properties
 //! @cond MATS_DOC_FULL
-#define _AI_MATKEY_TEXTURE_BASE         "$tex.file"
-#define _AI_MATKEY_UVWSRC_BASE          "$tex.uvwsrc"
-#define _AI_MATKEY_TEXOP_BASE           "$tex.op"
-#define _AI_MATKEY_MAPPING_BASE         "$tex.mapping"
-#define _AI_MATKEY_TEXBLEND_BASE        "$tex.blend"
-#define _AI_MATKEY_MAPPINGMODE_U_BASE   "$tex.mapmodeu"
-#define _AI_MATKEY_MAPPINGMODE_V_BASE   "$tex.mapmodev"
-#define _AI_MATKEY_TEXMAP_AXIS_BASE     "$tex.mapaxis"
-#define _AI_MATKEY_UVTRANSFORM_BASE     "$tex.uvtrafo"
-#define _AI_MATKEY_TEXFLAGS_BASE        "$tex.flags"
+#define _AI_MATKEY_TEXTURE_BASE "$tex.file"
+#define _AI_MATKEY_UVWSRC_BASE "$tex.uvwsrc"
+#define _AI_MATKEY_TEXOP_BASE "$tex.op"
+#define _AI_MATKEY_MAPPING_BASE "$tex.mapping"
+#define _AI_MATKEY_TEXBLEND_BASE "$tex.blend"
+#define _AI_MATKEY_MAPPINGMODE_U_BASE "$tex.mapmodeu"
+#define _AI_MATKEY_MAPPINGMODE_V_BASE "$tex.mapmodev"
+#define _AI_MATKEY_TEXMAP_AXIS_BASE "$tex.mapaxis"
+#define _AI_MATKEY_UVTRANSFORM_BASE "$tex.uvtrafo"
+#define _AI_MATKEY_TEXFLAGS_BASE "$tex.flags"
 //! @endcond
 
 // ---------------------------------------------------------------------------
-#define AI_MATKEY_TEXTURE(type, N) _AI_MATKEY_TEXTURE_BASE,type,N
+#define AI_MATKEY_TEXTURE(type, N) _AI_MATKEY_TEXTURE_BASE, type, N
 
 // For backward compatibility and simplicity
 //! @cond MATS_DOC_FULL
-#define AI_MATKEY_TEXTURE_DIFFUSE(N)    \
-    AI_MATKEY_TEXTURE(aiTextureType_DIFFUSE,N)
+#define AI_MATKEY_TEXTURE_DIFFUSE(N) \
+    AI_MATKEY_TEXTURE(aiTextureType_DIFFUSE, N)
 
-#define AI_MATKEY_TEXTURE_SPECULAR(N)   \
-    AI_MATKEY_TEXTURE(aiTextureType_SPECULAR,N)
+#define AI_MATKEY_TEXTURE_SPECULAR(N) \
+    AI_MATKEY_TEXTURE(aiTextureType_SPECULAR, N)
 
-#define AI_MATKEY_TEXTURE_AMBIENT(N)    \
-    AI_MATKEY_TEXTURE(aiTextureType_AMBIENT,N)
+#define AI_MATKEY_TEXTURE_AMBIENT(N) \
+    AI_MATKEY_TEXTURE(aiTextureType_AMBIENT, N)
 
-#define AI_MATKEY_TEXTURE_EMISSIVE(N)   \
-    AI_MATKEY_TEXTURE(aiTextureType_EMISSIVE,N)
+#define AI_MATKEY_TEXTURE_EMISSIVE(N) \
+    AI_MATKEY_TEXTURE(aiTextureType_EMISSIVE, N)
 
-#define AI_MATKEY_TEXTURE_NORMALS(N)    \
-    AI_MATKEY_TEXTURE(aiTextureType_NORMALS,N)
+#define AI_MATKEY_TEXTURE_NORMALS(N) \
+    AI_MATKEY_TEXTURE(aiTextureType_NORMALS, N)
 
 #define AI_MATKEY_TEXTURE_HEIGHT(N) \
-    AI_MATKEY_TEXTURE(aiTextureType_HEIGHT,N)
+    AI_MATKEY_TEXTURE(aiTextureType_HEIGHT, N)
 
-#define AI_MATKEY_TEXTURE_SHININESS(N)  \
-    AI_MATKEY_TEXTURE(aiTextureType_SHININESS,N)
+#define AI_MATKEY_TEXTURE_SHININESS(N) \
+    AI_MATKEY_TEXTURE(aiTextureType_SHININESS, N)
 
-#define AI_MATKEY_TEXTURE_OPACITY(N)    \
-    AI_MATKEY_TEXTURE(aiTextureType_OPACITY,N)
+#define AI_MATKEY_TEXTURE_OPACITY(N) \
+    AI_MATKEY_TEXTURE(aiTextureType_OPACITY, N)
 
-#define AI_MATKEY_TEXTURE_DISPLACEMENT(N)   \
-    AI_MATKEY_TEXTURE(aiTextureType_DISPLACEMENT,N)
+#define AI_MATKEY_TEXTURE_DISPLACEMENT(N) \
+    AI_MATKEY_TEXTURE(aiTextureType_DISPLACEMENT, N)
 
-#define AI_MATKEY_TEXTURE_LIGHTMAP(N)   \
-    AI_MATKEY_TEXTURE(aiTextureType_LIGHTMAP,N)
+#define AI_MATKEY_TEXTURE_LIGHTMAP(N) \
+    AI_MATKEY_TEXTURE(aiTextureType_LIGHTMAP, N)
 
 #define AI_MATKEY_TEXTURE_REFLECTION(N) \
-    AI_MATKEY_TEXTURE(aiTextureType_REFLECTION,N)
+    AI_MATKEY_TEXTURE(aiTextureType_REFLECTION, N)
 
 //! @endcond
 
 // ---------------------------------------------------------------------------
-#define AI_MATKEY_UVWSRC(type, N) _AI_MATKEY_UVWSRC_BASE,type,N
+#define AI_MATKEY_UVWSRC(type, N) _AI_MATKEY_UVWSRC_BASE, type, N
 
 // For backward compatibility and simplicity
 //! @cond MATS_DOC_FULL
 #define AI_MATKEY_UVWSRC_DIFFUSE(N) \
-    AI_MATKEY_UVWSRC(aiTextureType_DIFFUSE,N)
+    AI_MATKEY_UVWSRC(aiTextureType_DIFFUSE, N)
 
-#define AI_MATKEY_UVWSRC_SPECULAR(N)    \
-    AI_MATKEY_UVWSRC(aiTextureType_SPECULAR,N)
+#define AI_MATKEY_UVWSRC_SPECULAR(N) \
+    AI_MATKEY_UVWSRC(aiTextureType_SPECULAR, N)
 
 #define AI_MATKEY_UVWSRC_AMBIENT(N) \
-    AI_MATKEY_UVWSRC(aiTextureType_AMBIENT,N)
+    AI_MATKEY_UVWSRC(aiTextureType_AMBIENT, N)
 
-#define AI_MATKEY_UVWSRC_EMISSIVE(N)    \
-    AI_MATKEY_UVWSRC(aiTextureType_EMISSIVE,N)
+#define AI_MATKEY_UVWSRC_EMISSIVE(N) \
+    AI_MATKEY_UVWSRC(aiTextureType_EMISSIVE, N)
 
 #define AI_MATKEY_UVWSRC_NORMALS(N) \
-    AI_MATKEY_UVWSRC(aiTextureType_NORMALS,N)
+    AI_MATKEY_UVWSRC(aiTextureType_NORMALS, N)
 
-#define AI_MATKEY_UVWSRC_HEIGHT(N)  \
-    AI_MATKEY_UVWSRC(aiTextureType_HEIGHT,N)
+#define AI_MATKEY_UVWSRC_HEIGHT(N) \
+    AI_MATKEY_UVWSRC(aiTextureType_HEIGHT, N)
 
-#define AI_MATKEY_UVWSRC_SHININESS(N)   \
-    AI_MATKEY_UVWSRC(aiTextureType_SHININESS,N)
+#define AI_MATKEY_UVWSRC_SHININESS(N) \
+    AI_MATKEY_UVWSRC(aiTextureType_SHININESS, N)
 
 #define AI_MATKEY_UVWSRC_OPACITY(N) \
-    AI_MATKEY_UVWSRC(aiTextureType_OPACITY,N)
+    AI_MATKEY_UVWSRC(aiTextureType_OPACITY, N)
 
-#define AI_MATKEY_UVWSRC_DISPLACEMENT(N)    \
-    AI_MATKEY_UVWSRC(aiTextureType_DISPLACEMENT,N)
+#define AI_MATKEY_UVWSRC_DISPLACEMENT(N) \
+    AI_MATKEY_UVWSRC(aiTextureType_DISPLACEMENT, N)
 
-#define AI_MATKEY_UVWSRC_LIGHTMAP(N)    \
-    AI_MATKEY_UVWSRC(aiTextureType_LIGHTMAP,N)
+#define AI_MATKEY_UVWSRC_LIGHTMAP(N) \
+    AI_MATKEY_UVWSRC(aiTextureType_LIGHTMAP, N)
 
-#define AI_MATKEY_UVWSRC_REFLECTION(N)  \
-    AI_MATKEY_UVWSRC(aiTextureType_REFLECTION,N)
+#define AI_MATKEY_UVWSRC_REFLECTION(N) \
+    AI_MATKEY_UVWSRC(aiTextureType_REFLECTION, N)
 
 //! @endcond
 // ---------------------------------------------------------------------------
-#define AI_MATKEY_TEXOP(type, N) _AI_MATKEY_TEXOP_BASE,type,N
+#define AI_MATKEY_TEXOP(type, N) _AI_MATKEY_TEXOP_BASE, type, N
 
 // For backward compatibility and simplicity
 //! @cond MATS_DOC_FULL
-#define AI_MATKEY_TEXOP_DIFFUSE(N)  \
-    AI_MATKEY_TEXOP(aiTextureType_DIFFUSE,N)
+#define AI_MATKEY_TEXOP_DIFFUSE(N) \
+    AI_MATKEY_TEXOP(aiTextureType_DIFFUSE, N)
 
 #define AI_MATKEY_TEXOP_SPECULAR(N) \
-    AI_MATKEY_TEXOP(aiTextureType_SPECULAR,N)
+    AI_MATKEY_TEXOP(aiTextureType_SPECULAR, N)
 
-#define AI_MATKEY_TEXOP_AMBIENT(N)  \
-    AI_MATKEY_TEXOP(aiTextureType_AMBIENT,N)
+#define AI_MATKEY_TEXOP_AMBIENT(N) \
+    AI_MATKEY_TEXOP(aiTextureType_AMBIENT, N)
 
 #define AI_MATKEY_TEXOP_EMISSIVE(N) \
-    AI_MATKEY_TEXOP(aiTextureType_EMISSIVE,N)
+    AI_MATKEY_TEXOP(aiTextureType_EMISSIVE, N)
 
-#define AI_MATKEY_TEXOP_NORMALS(N)  \
-    AI_MATKEY_TEXOP(aiTextureType_NORMALS,N)
+#define AI_MATKEY_TEXOP_NORMALS(N) \
+    AI_MATKEY_TEXOP(aiTextureType_NORMALS, N)
 
-#define AI_MATKEY_TEXOP_HEIGHT(N)   \
-    AI_MATKEY_TEXOP(aiTextureType_HEIGHT,N)
+#define AI_MATKEY_TEXOP_HEIGHT(N) \
+    AI_MATKEY_TEXOP(aiTextureType_HEIGHT, N)
 
-#define AI_MATKEY_TEXOP_SHININESS(N)    \
-    AI_MATKEY_TEXOP(aiTextureType_SHININESS,N)
+#define AI_MATKEY_TEXOP_SHININESS(N) \
+    AI_MATKEY_TEXOP(aiTextureType_SHININESS, N)
 
-#define AI_MATKEY_TEXOP_OPACITY(N)  \
-    AI_MATKEY_TEXOP(aiTextureType_OPACITY,N)
+#define AI_MATKEY_TEXOP_OPACITY(N) \
+    AI_MATKEY_TEXOP(aiTextureType_OPACITY, N)
 
 #define AI_MATKEY_TEXOP_DISPLACEMENT(N) \
-    AI_MATKEY_TEXOP(aiTextureType_DISPLACEMENT,N)
+    AI_MATKEY_TEXOP(aiTextureType_DISPLACEMENT, N)
 
 #define AI_MATKEY_TEXOP_LIGHTMAP(N) \
-    AI_MATKEY_TEXOP(aiTextureType_LIGHTMAP,N)
+    AI_MATKEY_TEXOP(aiTextureType_LIGHTMAP, N)
 
-#define AI_MATKEY_TEXOP_REFLECTION(N)   \
-    AI_MATKEY_TEXOP(aiTextureType_REFLECTION,N)
+#define AI_MATKEY_TEXOP_REFLECTION(N) \
+    AI_MATKEY_TEXOP(aiTextureType_REFLECTION, N)
 
 //! @endcond
 // ---------------------------------------------------------------------------
-#define AI_MATKEY_MAPPING(type, N) _AI_MATKEY_MAPPING_BASE,type,N
+#define AI_MATKEY_MAPPING(type, N) _AI_MATKEY_MAPPING_BASE, type, N
 
 // For backward compatibility and simplicity
 //! @cond MATS_DOC_FULL
-#define AI_MATKEY_MAPPING_DIFFUSE(N)    \
-    AI_MATKEY_MAPPING(aiTextureType_DIFFUSE,N)
+#define AI_MATKEY_MAPPING_DIFFUSE(N) \
+    AI_MATKEY_MAPPING(aiTextureType_DIFFUSE, N)
 
-#define AI_MATKEY_MAPPING_SPECULAR(N)   \
-    AI_MATKEY_MAPPING(aiTextureType_SPECULAR,N)
+#define AI_MATKEY_MAPPING_SPECULAR(N) \
+    AI_MATKEY_MAPPING(aiTextureType_SPECULAR, N)
 
-#define AI_MATKEY_MAPPING_AMBIENT(N)    \
-    AI_MATKEY_MAPPING(aiTextureType_AMBIENT,N)
+#define AI_MATKEY_MAPPING_AMBIENT(N) \
+    AI_MATKEY_MAPPING(aiTextureType_AMBIENT, N)
 
-#define AI_MATKEY_MAPPING_EMISSIVE(N)   \
-    AI_MATKEY_MAPPING(aiTextureType_EMISSIVE,N)
+#define AI_MATKEY_MAPPING_EMISSIVE(N) \
+    AI_MATKEY_MAPPING(aiTextureType_EMISSIVE, N)
 
-#define AI_MATKEY_MAPPING_NORMALS(N)    \
-    AI_MATKEY_MAPPING(aiTextureType_NORMALS,N)
+#define AI_MATKEY_MAPPING_NORMALS(N) \
+    AI_MATKEY_MAPPING(aiTextureType_NORMALS, N)
 
 #define AI_MATKEY_MAPPING_HEIGHT(N) \
-    AI_MATKEY_MAPPING(aiTextureType_HEIGHT,N)
+    AI_MATKEY_MAPPING(aiTextureType_HEIGHT, N)
 
-#define AI_MATKEY_MAPPING_SHININESS(N)  \
-    AI_MATKEY_MAPPING(aiTextureType_SHININESS,N)
+#define AI_MATKEY_MAPPING_SHININESS(N) \
+    AI_MATKEY_MAPPING(aiTextureType_SHININESS, N)
 
-#define AI_MATKEY_MAPPING_OPACITY(N)    \
-    AI_MATKEY_MAPPING(aiTextureType_OPACITY,N)
+#define AI_MATKEY_MAPPING_OPACITY(N) \
+    AI_MATKEY_MAPPING(aiTextureType_OPACITY, N)
 
-#define AI_MATKEY_MAPPING_DISPLACEMENT(N)   \
-    AI_MATKEY_MAPPING(aiTextureType_DISPLACEMENT,N)
+#define AI_MATKEY_MAPPING_DISPLACEMENT(N) \
+    AI_MATKEY_MAPPING(aiTextureType_DISPLACEMENT, N)
 
-#define AI_MATKEY_MAPPING_LIGHTMAP(N)   \
-    AI_MATKEY_MAPPING(aiTextureType_LIGHTMAP,N)
+#define AI_MATKEY_MAPPING_LIGHTMAP(N) \
+    AI_MATKEY_MAPPING(aiTextureType_LIGHTMAP, N)
 
 #define AI_MATKEY_MAPPING_REFLECTION(N) \
-    AI_MATKEY_MAPPING(aiTextureType_REFLECTION,N)
+    AI_MATKEY_MAPPING(aiTextureType_REFLECTION, N)
 
 //! @endcond
 // ---------------------------------------------------------------------------
-#define AI_MATKEY_TEXBLEND(type, N) _AI_MATKEY_TEXBLEND_BASE,type,N
+#define AI_MATKEY_TEXBLEND(type, N) _AI_MATKEY_TEXBLEND_BASE, type, N
 
 // For backward compatibility and simplicity
 //! @cond MATS_DOC_FULL
-#define AI_MATKEY_TEXBLEND_DIFFUSE(N)   \
-    AI_MATKEY_TEXBLEND(aiTextureType_DIFFUSE,N)
+#define AI_MATKEY_TEXBLEND_DIFFUSE(N) \
+    AI_MATKEY_TEXBLEND(aiTextureType_DIFFUSE, N)
 
-#define AI_MATKEY_TEXBLEND_SPECULAR(N)  \
-    AI_MATKEY_TEXBLEND(aiTextureType_SPECULAR,N)
+#define AI_MATKEY_TEXBLEND_SPECULAR(N) \
+    AI_MATKEY_TEXBLEND(aiTextureType_SPECULAR, N)
 
-#define AI_MATKEY_TEXBLEND_AMBIENT(N)   \
-    AI_MATKEY_TEXBLEND(aiTextureType_AMBIENT,N)
+#define AI_MATKEY_TEXBLEND_AMBIENT(N) \
+    AI_MATKEY_TEXBLEND(aiTextureType_AMBIENT, N)
 
-#define AI_MATKEY_TEXBLEND_EMISSIVE(N)  \
-    AI_MATKEY_TEXBLEND(aiTextureType_EMISSIVE,N)
+#define AI_MATKEY_TEXBLEND_EMISSIVE(N) \
+    AI_MATKEY_TEXBLEND(aiTextureType_EMISSIVE, N)
 
-#define AI_MATKEY_TEXBLEND_NORMALS(N)   \
-    AI_MATKEY_TEXBLEND(aiTextureType_NORMALS,N)
+#define AI_MATKEY_TEXBLEND_NORMALS(N) \
+    AI_MATKEY_TEXBLEND(aiTextureType_NORMALS, N)
 
-#define AI_MATKEY_TEXBLEND_HEIGHT(N)    \
-    AI_MATKEY_TEXBLEND(aiTextureType_HEIGHT,N)
+#define AI_MATKEY_TEXBLEND_HEIGHT(N) \
+    AI_MATKEY_TEXBLEND(aiTextureType_HEIGHT, N)
 
 #define AI_MATKEY_TEXBLEND_SHININESS(N) \
-    AI_MATKEY_TEXBLEND(aiTextureType_SHININESS,N)
+    AI_MATKEY_TEXBLEND(aiTextureType_SHININESS, N)
 
-#define AI_MATKEY_TEXBLEND_OPACITY(N)   \
-    AI_MATKEY_TEXBLEND(aiTextureType_OPACITY,N)
+#define AI_MATKEY_TEXBLEND_OPACITY(N) \
+    AI_MATKEY_TEXBLEND(aiTextureType_OPACITY, N)
 
-#define AI_MATKEY_TEXBLEND_DISPLACEMENT(N)  \
-    AI_MATKEY_TEXBLEND(aiTextureType_DISPLACEMENT,N)
+#define AI_MATKEY_TEXBLEND_DISPLACEMENT(N) \
+    AI_MATKEY_TEXBLEND(aiTextureType_DISPLACEMENT, N)
 
-#define AI_MATKEY_TEXBLEND_LIGHTMAP(N)  \
-    AI_MATKEY_TEXBLEND(aiTextureType_LIGHTMAP,N)
+#define AI_MATKEY_TEXBLEND_LIGHTMAP(N) \
+    AI_MATKEY_TEXBLEND(aiTextureType_LIGHTMAP, N)
 
-#define AI_MATKEY_TEXBLEND_REFLECTION(N)    \
-    AI_MATKEY_TEXBLEND(aiTextureType_REFLECTION,N)
+#define AI_MATKEY_TEXBLEND_REFLECTION(N) \
+    AI_MATKEY_TEXBLEND(aiTextureType_REFLECTION, N)
 
 //! @endcond
 // ---------------------------------------------------------------------------
-#define AI_MATKEY_MAPPINGMODE_U(type, N) _AI_MATKEY_MAPPINGMODE_U_BASE,type,N
+#define AI_MATKEY_MAPPINGMODE_U(type, N) _AI_MATKEY_MAPPINGMODE_U_BASE, type, N
 
 // For backward compatibility and simplicity
 //! @cond MATS_DOC_FULL
-#define AI_MATKEY_MAPPINGMODE_U_DIFFUSE(N)  \
-    AI_MATKEY_MAPPINGMODE_U(aiTextureType_DIFFUSE,N)
+#define AI_MATKEY_MAPPINGMODE_U_DIFFUSE(N) \
+    AI_MATKEY_MAPPINGMODE_U(aiTextureType_DIFFUSE, N)
 
 #define AI_MATKEY_MAPPINGMODE_U_SPECULAR(N) \
-    AI_MATKEY_MAPPINGMODE_U(aiTextureType_SPECULAR,N)
+    AI_MATKEY_MAPPINGMODE_U(aiTextureType_SPECULAR, N)
 
-#define AI_MATKEY_MAPPINGMODE_U_AMBIENT(N)  \
-    AI_MATKEY_MAPPINGMODE_U(aiTextureType_AMBIENT,N)
+#define AI_MATKEY_MAPPINGMODE_U_AMBIENT(N) \
+    AI_MATKEY_MAPPINGMODE_U(aiTextureType_AMBIENT, N)
 
 #define AI_MATKEY_MAPPINGMODE_U_EMISSIVE(N) \
-    AI_MATKEY_MAPPINGMODE_U(aiTextureType_EMISSIVE,N)
+    AI_MATKEY_MAPPINGMODE_U(aiTextureType_EMISSIVE, N)
 
-#define AI_MATKEY_MAPPINGMODE_U_NORMALS(N)  \
-    AI_MATKEY_MAPPINGMODE_U(aiTextureType_NORMALS,N)
+#define AI_MATKEY_MAPPINGMODE_U_NORMALS(N) \
+    AI_MATKEY_MAPPINGMODE_U(aiTextureType_NORMALS, N)
 
-#define AI_MATKEY_MAPPINGMODE_U_HEIGHT(N)   \
-    AI_MATKEY_MAPPINGMODE_U(aiTextureType_HEIGHT,N)
+#define AI_MATKEY_MAPPINGMODE_U_HEIGHT(N) \
+    AI_MATKEY_MAPPINGMODE_U(aiTextureType_HEIGHT, N)
 
-#define AI_MATKEY_MAPPINGMODE_U_SHININESS(N)    \
-    AI_MATKEY_MAPPINGMODE_U(aiTextureType_SHININESS,N)
+#define AI_MATKEY_MAPPINGMODE_U_SHININESS(N) \
+    AI_MATKEY_MAPPINGMODE_U(aiTextureType_SHININESS, N)
 
-#define AI_MATKEY_MAPPINGMODE_U_OPACITY(N)  \
-    AI_MATKEY_MAPPINGMODE_U(aiTextureType_OPACITY,N)
+#define AI_MATKEY_MAPPINGMODE_U_OPACITY(N) \
+    AI_MATKEY_MAPPINGMODE_U(aiTextureType_OPACITY, N)
 
 #define AI_MATKEY_MAPPINGMODE_U_DISPLACEMENT(N) \
-    AI_MATKEY_MAPPINGMODE_U(aiTextureType_DISPLACEMENT,N)
+    AI_MATKEY_MAPPINGMODE_U(aiTextureType_DISPLACEMENT, N)
 
 #define AI_MATKEY_MAPPINGMODE_U_LIGHTMAP(N) \
-    AI_MATKEY_MAPPINGMODE_U(aiTextureType_LIGHTMAP,N)
+    AI_MATKEY_MAPPINGMODE_U(aiTextureType_LIGHTMAP, N)
 
-#define AI_MATKEY_MAPPINGMODE_U_REFLECTION(N)   \
-    AI_MATKEY_MAPPINGMODE_U(aiTextureType_REFLECTION,N)
+#define AI_MATKEY_MAPPINGMODE_U_REFLECTION(N) \
+    AI_MATKEY_MAPPINGMODE_U(aiTextureType_REFLECTION, N)
 
 //! @endcond
 // ---------------------------------------------------------------------------
-#define AI_MATKEY_MAPPINGMODE_V(type, N) _AI_MATKEY_MAPPINGMODE_V_BASE,type,N
+#define AI_MATKEY_MAPPINGMODE_V(type, N) _AI_MATKEY_MAPPINGMODE_V_BASE, type, N
 
 // For backward compatibility and simplicity
 //! @cond MATS_DOC_FULL
-#define AI_MATKEY_MAPPINGMODE_V_DIFFUSE(N)  \
-    AI_MATKEY_MAPPINGMODE_V(aiTextureType_DIFFUSE,N)
+#define AI_MATKEY_MAPPINGMODE_V_DIFFUSE(N) \
+    AI_MATKEY_MAPPINGMODE_V(aiTextureType_DIFFUSE, N)
 
 #define AI_MATKEY_MAPPINGMODE_V_SPECULAR(N) \
-    AI_MATKEY_MAPPINGMODE_V(aiTextureType_SPECULAR,N)
+    AI_MATKEY_MAPPINGMODE_V(aiTextureType_SPECULAR, N)
 
-#define AI_MATKEY_MAPPINGMODE_V_AMBIENT(N)  \
-    AI_MATKEY_MAPPINGMODE_V(aiTextureType_AMBIENT,N)
+#define AI_MATKEY_MAPPINGMODE_V_AMBIENT(N) \
+    AI_MATKEY_MAPPINGMODE_V(aiTextureType_AMBIENT, N)
 
 #define AI_MATKEY_MAPPINGMODE_V_EMISSIVE(N) \
-    AI_MATKEY_MAPPINGMODE_V(aiTextureType_EMISSIVE,N)
+    AI_MATKEY_MAPPINGMODE_V(aiTextureType_EMISSIVE, N)
 
-#define AI_MATKEY_MAPPINGMODE_V_NORMALS(N)  \
-    AI_MATKEY_MAPPINGMODE_V(aiTextureType_NORMALS,N)
+#define AI_MATKEY_MAPPINGMODE_V_NORMALS(N) \
+    AI_MATKEY_MAPPINGMODE_V(aiTextureType_NORMALS, N)
 
-#define AI_MATKEY_MAPPINGMODE_V_HEIGHT(N)   \
-    AI_MATKEY_MAPPINGMODE_V(aiTextureType_HEIGHT,N)
+#define AI_MATKEY_MAPPINGMODE_V_HEIGHT(N) \
+    AI_MATKEY_MAPPINGMODE_V(aiTextureType_HEIGHT, N)
 
-#define AI_MATKEY_MAPPINGMODE_V_SHININESS(N)    \
-    AI_MATKEY_MAPPINGMODE_V(aiTextureType_SHININESS,N)
+#define AI_MATKEY_MAPPINGMODE_V_SHININESS(N) \
+    AI_MATKEY_MAPPINGMODE_V(aiTextureType_SHININESS, N)
 
-#define AI_MATKEY_MAPPINGMODE_V_OPACITY(N)  \
-    AI_MATKEY_MAPPINGMODE_V(aiTextureType_OPACITY,N)
+#define AI_MATKEY_MAPPINGMODE_V_OPACITY(N) \
+    AI_MATKEY_MAPPINGMODE_V(aiTextureType_OPACITY, N)
 
 #define AI_MATKEY_MAPPINGMODE_V_DISPLACEMENT(N) \
-    AI_MATKEY_MAPPINGMODE_V(aiTextureType_DISPLACEMENT,N)
+    AI_MATKEY_MAPPINGMODE_V(aiTextureType_DISPLACEMENT, N)
 
 #define AI_MATKEY_MAPPINGMODE_V_LIGHTMAP(N) \
-    AI_MATKEY_MAPPINGMODE_V(aiTextureType_LIGHTMAP,N)
+    AI_MATKEY_MAPPINGMODE_V(aiTextureType_LIGHTMAP, N)
 
-#define AI_MATKEY_MAPPINGMODE_V_REFLECTION(N)   \
-    AI_MATKEY_MAPPINGMODE_V(aiTextureType_REFLECTION,N)
+#define AI_MATKEY_MAPPINGMODE_V_REFLECTION(N) \
+    AI_MATKEY_MAPPINGMODE_V(aiTextureType_REFLECTION, N)
 
 //! @endcond
 // ---------------------------------------------------------------------------
-#define AI_MATKEY_TEXMAP_AXIS(type, N) _AI_MATKEY_TEXMAP_AXIS_BASE,type,N
+#define AI_MATKEY_TEXMAP_AXIS(type, N) _AI_MATKEY_TEXMAP_AXIS_BASE, type, N
 
 // For backward compatibility and simplicity
 //! @cond MATS_DOC_FULL
-#define AI_MATKEY_TEXMAP_AXIS_DIFFUSE(N)    \
-    AI_MATKEY_TEXMAP_AXIS(aiTextureType_DIFFUSE,N)
+#define AI_MATKEY_TEXMAP_AXIS_DIFFUSE(N) \
+    AI_MATKEY_TEXMAP_AXIS(aiTextureType_DIFFUSE, N)
 
-#define AI_MATKEY_TEXMAP_AXIS_SPECULAR(N)   \
-    AI_MATKEY_TEXMAP_AXIS(aiTextureType_SPECULAR,N)
+#define AI_MATKEY_TEXMAP_AXIS_SPECULAR(N) \
+    AI_MATKEY_TEXMAP_AXIS(aiTextureType_SPECULAR, N)
 
-#define AI_MATKEY_TEXMAP_AXIS_AMBIENT(N)    \
-    AI_MATKEY_TEXMAP_AXIS(aiTextureType_AMBIENT,N)
+#define AI_MATKEY_TEXMAP_AXIS_AMBIENT(N) \
+    AI_MATKEY_TEXMAP_AXIS(aiTextureType_AMBIENT, N)
 
-#define AI_MATKEY_TEXMAP_AXIS_EMISSIVE(N)   \
-    AI_MATKEY_TEXMAP_AXIS(aiTextureType_EMISSIVE,N)
+#define AI_MATKEY_TEXMAP_AXIS_EMISSIVE(N) \
+    AI_MATKEY_TEXMAP_AXIS(aiTextureType_EMISSIVE, N)
 
-#define AI_MATKEY_TEXMAP_AXIS_NORMALS(N)    \
-    AI_MATKEY_TEXMAP_AXIS(aiTextureType_NORMALS,N)
+#define AI_MATKEY_TEXMAP_AXIS_NORMALS(N) \
+    AI_MATKEY_TEXMAP_AXIS(aiTextureType_NORMALS, N)
 
 #define AI_MATKEY_TEXMAP_AXIS_HEIGHT(N) \
-    AI_MATKEY_TEXMAP_AXIS(aiTextureType_HEIGHT,N)
+    AI_MATKEY_TEXMAP_AXIS(aiTextureType_HEIGHT, N)
 
-#define AI_MATKEY_TEXMAP_AXIS_SHININESS(N)  \
-    AI_MATKEY_TEXMAP_AXIS(aiTextureType_SHININESS,N)
+#define AI_MATKEY_TEXMAP_AXIS_SHININESS(N) \
+    AI_MATKEY_TEXMAP_AXIS(aiTextureType_SHININESS, N)
 
-#define AI_MATKEY_TEXMAP_AXIS_OPACITY(N)    \
-    AI_MATKEY_TEXMAP_AXIS(aiTextureType_OPACITY,N)
+#define AI_MATKEY_TEXMAP_AXIS_OPACITY(N) \
+    AI_MATKEY_TEXMAP_AXIS(aiTextureType_OPACITY, N)
 
-#define AI_MATKEY_TEXMAP_AXIS_DISPLACEMENT(N)   \
-    AI_MATKEY_TEXMAP_AXIS(aiTextureType_DISPLACEMENT,N)
+#define AI_MATKEY_TEXMAP_AXIS_DISPLACEMENT(N) \
+    AI_MATKEY_TEXMAP_AXIS(aiTextureType_DISPLACEMENT, N)
 
-#define AI_MATKEY_TEXMAP_AXIS_LIGHTMAP(N)   \
-    AI_MATKEY_TEXMAP_AXIS(aiTextureType_LIGHTMAP,N)
+#define AI_MATKEY_TEXMAP_AXIS_LIGHTMAP(N) \
+    AI_MATKEY_TEXMAP_AXIS(aiTextureType_LIGHTMAP, N)
 
 #define AI_MATKEY_TEXMAP_AXIS_REFLECTION(N) \
-    AI_MATKEY_TEXMAP_AXIS(aiTextureType_REFLECTION,N)
+    AI_MATKEY_TEXMAP_AXIS(aiTextureType_REFLECTION, N)
 
 //! @endcond
 // ---------------------------------------------------------------------------
-#define AI_MATKEY_UVTRANSFORM(type, N) _AI_MATKEY_UVTRANSFORM_BASE,type,N
+#define AI_MATKEY_UVTRANSFORM(type, N) _AI_MATKEY_UVTRANSFORM_BASE, type, N
 
 // For backward compatibility and simplicity
 //! @cond MATS_DOC_FULL
-#define AI_MATKEY_UVTRANSFORM_DIFFUSE(N)    \
-    AI_MATKEY_UVTRANSFORM(aiTextureType_DIFFUSE,N)
+#define AI_MATKEY_UVTRANSFORM_DIFFUSE(N) \
+    AI_MATKEY_UVTRANSFORM(aiTextureType_DIFFUSE, N)
 
-#define AI_MATKEY_UVTRANSFORM_SPECULAR(N)   \
-    AI_MATKEY_UVTRANSFORM(aiTextureType_SPECULAR,N)
+#define AI_MATKEY_UVTRANSFORM_SPECULAR(N) \
+    AI_MATKEY_UVTRANSFORM(aiTextureType_SPECULAR, N)
 
-#define AI_MATKEY_UVTRANSFORM_AMBIENT(N)    \
-    AI_MATKEY_UVTRANSFORM(aiTextureType_AMBIENT,N)
+#define AI_MATKEY_UVTRANSFORM_AMBIENT(N) \
+    AI_MATKEY_UVTRANSFORM(aiTextureType_AMBIENT, N)
 
-#define AI_MATKEY_UVTRANSFORM_EMISSIVE(N)   \
-    AI_MATKEY_UVTRANSFORM(aiTextureType_EMISSIVE,N)
+#define AI_MATKEY_UVTRANSFORM_EMISSIVE(N) \
+    AI_MATKEY_UVTRANSFORM(aiTextureType_EMISSIVE, N)
 
-#define AI_MATKEY_UVTRANSFORM_NORMALS(N)    \
-    AI_MATKEY_UVTRANSFORM(aiTextureType_NORMALS,N)
+#define AI_MATKEY_UVTRANSFORM_NORMALS(N) \
+    AI_MATKEY_UVTRANSFORM(aiTextureType_NORMALS, N)
 
 #define AI_MATKEY_UVTRANSFORM_HEIGHT(N) \
-    AI_MATKEY_UVTRANSFORM(aiTextureType_HEIGHT,N)
+    AI_MATKEY_UVTRANSFORM(aiTextureType_HEIGHT, N)
 
-#define AI_MATKEY_UVTRANSFORM_SHININESS(N)  \
-    AI_MATKEY_UVTRANSFORM(aiTextureType_SHININESS,N)
+#define AI_MATKEY_UVTRANSFORM_SHININESS(N) \
+    AI_MATKEY_UVTRANSFORM(aiTextureType_SHININESS, N)
 
-#define AI_MATKEY_UVTRANSFORM_OPACITY(N)    \
-    AI_MATKEY_UVTRANSFORM(aiTextureType_OPACITY,N)
+#define AI_MATKEY_UVTRANSFORM_OPACITY(N) \
+    AI_MATKEY_UVTRANSFORM(aiTextureType_OPACITY, N)
 
-#define AI_MATKEY_UVTRANSFORM_DISPLACEMENT(N)   \
-    AI_MATKEY_UVTRANSFORM(aiTextureType_DISPLACEMENT,N)
+#define AI_MATKEY_UVTRANSFORM_DISPLACEMENT(N) \
+    AI_MATKEY_UVTRANSFORM(aiTextureType_DISPLACEMENT, N)
 
-#define AI_MATKEY_UVTRANSFORM_LIGHTMAP(N)   \
-    AI_MATKEY_UVTRANSFORM(aiTextureType_LIGHTMAP,N)
+#define AI_MATKEY_UVTRANSFORM_LIGHTMAP(N) \
+    AI_MATKEY_UVTRANSFORM(aiTextureType_LIGHTMAP, N)
 
 #define AI_MATKEY_UVTRANSFORM_REFLECTION(N) \
-    AI_MATKEY_UVTRANSFORM(aiTextureType_REFLECTION,N)
+    AI_MATKEY_UVTRANSFORM(aiTextureType_REFLECTION, N)
 
-#define AI_MATKEY_UVTRANSFORM_UNKNOWN(N)    \
-    AI_MATKEY_UVTRANSFORM(aiTextureType_UNKNOWN,N)
+#define AI_MATKEY_UVTRANSFORM_UNKNOWN(N) \
+    AI_MATKEY_UVTRANSFORM(aiTextureType_UNKNOWN, N)
 
 //! @endcond
 // ---------------------------------------------------------------------------
-#define AI_MATKEY_TEXFLAGS(type, N) _AI_MATKEY_TEXFLAGS_BASE,type,N
+#define AI_MATKEY_TEXFLAGS(type, N) _AI_MATKEY_TEXFLAGS_BASE, type, N
 
 // For backward compatibility and simplicity
 //! @cond MATS_DOC_FULL
-#define AI_MATKEY_TEXFLAGS_DIFFUSE(N)   \
-    AI_MATKEY_TEXFLAGS(aiTextureType_DIFFUSE,N)
+#define AI_MATKEY_TEXFLAGS_DIFFUSE(N) \
+    AI_MATKEY_TEXFLAGS(aiTextureType_DIFFUSE, N)
 
-#define AI_MATKEY_TEXFLAGS_SPECULAR(N)  \
-    AI_MATKEY_TEXFLAGS(aiTextureType_SPECULAR,N)
+#define AI_MATKEY_TEXFLAGS_SPECULAR(N) \
+    AI_MATKEY_TEXFLAGS(aiTextureType_SPECULAR, N)
 
-#define AI_MATKEY_TEXFLAGS_AMBIENT(N)   \
-    AI_MATKEY_TEXFLAGS(aiTextureType_AMBIENT,N)
+#define AI_MATKEY_TEXFLAGS_AMBIENT(N) \
+    AI_MATKEY_TEXFLAGS(aiTextureType_AMBIENT, N)
 
-#define AI_MATKEY_TEXFLAGS_EMISSIVE(N)  \
-    AI_MATKEY_TEXFLAGS(aiTextureType_EMISSIVE,N)
+#define AI_MATKEY_TEXFLAGS_EMISSIVE(N) \
+    AI_MATKEY_TEXFLAGS(aiTextureType_EMISSIVE, N)
 
-#define AI_MATKEY_TEXFLAGS_NORMALS(N)   \
-    AI_MATKEY_TEXFLAGS(aiTextureType_NORMALS,N)
+#define AI_MATKEY_TEXFLAGS_NORMALS(N) \
+    AI_MATKEY_TEXFLAGS(aiTextureType_NORMALS, N)
 
-#define AI_MATKEY_TEXFLAGS_HEIGHT(N)    \
-    AI_MATKEY_TEXFLAGS(aiTextureType_HEIGHT,N)
+#define AI_MATKEY_TEXFLAGS_HEIGHT(N) \
+    AI_MATKEY_TEXFLAGS(aiTextureType_HEIGHT, N)
 
 #define AI_MATKEY_TEXFLAGS_SHININESS(N) \
-    AI_MATKEY_TEXFLAGS(aiTextureType_SHININESS,N)
+    AI_MATKEY_TEXFLAGS(aiTextureType_SHININESS, N)
 
-#define AI_MATKEY_TEXFLAGS_OPACITY(N)   \
-    AI_MATKEY_TEXFLAGS(aiTextureType_OPACITY,N)
+#define AI_MATKEY_TEXFLAGS_OPACITY(N) \
+    AI_MATKEY_TEXFLAGS(aiTextureType_OPACITY, N)
 
-#define AI_MATKEY_TEXFLAGS_DISPLACEMENT(N)  \
-    AI_MATKEY_TEXFLAGS(aiTextureType_DISPLACEMENT,N)
+#define AI_MATKEY_TEXFLAGS_DISPLACEMENT(N) \
+    AI_MATKEY_TEXFLAGS(aiTextureType_DISPLACEMENT, N)
 
-#define AI_MATKEY_TEXFLAGS_LIGHTMAP(N)  \
-    AI_MATKEY_TEXFLAGS(aiTextureType_LIGHTMAP,N)
+#define AI_MATKEY_TEXFLAGS_LIGHTMAP(N) \
+    AI_MATKEY_TEXFLAGS(aiTextureType_LIGHTMAP, N)
 
-#define AI_MATKEY_TEXFLAGS_REFLECTION(N)    \
-    AI_MATKEY_TEXFLAGS(aiTextureType_REFLECTION,N)
+#define AI_MATKEY_TEXFLAGS_REFLECTION(N) \
+    AI_MATKEY_TEXFLAGS(aiTextureType_REFLECTION, N)
 
-#define AI_MATKEY_TEXFLAGS_UNKNOWN(N)   \
-    AI_MATKEY_TEXFLAGS(aiTextureType_UNKNOWN,N)
+#define AI_MATKEY_TEXFLAGS_UNKNOWN(N) \
+    AI_MATKEY_TEXFLAGS(aiTextureType_UNKNOWN, N)
 
 //! @endcond
 //!
@@ -1374,11 +1345,11 @@ extern "C" {
  *        structure or NULL if the key has not been found. */
 // ---------------------------------------------------------------------------
 ASSIMP_API C_ENUM aiReturn aiGetMaterialProperty(
-    const C_STRUCT aiMaterial* pMat,
-    const char* pKey,
-    unsigned int type,
-    unsigned int  index,
-    const C_STRUCT aiMaterialProperty** pPropOut);
+        const C_STRUCT aiMaterial *pMat,
+        const char *pKey,
+        unsigned int type,
+        unsigned int index,
+        const C_STRUCT aiMaterialProperty **pPropOut);
 
 // ---------------------------------------------------------------------------
 /** @brief Retrieve an array of float values with a specific key
@@ -1407,13 +1378,12 @@ ASSIMP_API C_ENUM aiReturn aiGetMaterialProperty(
  *   arrays remains unmodified and pMax is set to 0.*/
 // ---------------------------------------------------------------------------
 ASSIMP_API C_ENUM aiReturn aiGetMaterialFloatArray(
-    const C_STRUCT aiMaterial* pMat,
-    const char* pKey,
-    unsigned int type,
-    unsigned int index,
-    ai_real* pOut,
-    unsigned int* pMax);
-
+        const C_STRUCT aiMaterial *pMat,
+        const char *pKey,
+        unsigned int type,
+        unsigned int index,
+        ai_real *pOut,
+        unsigned int *pMax);
 
 #ifdef __cplusplus
 
@@ -1436,36 +1406,33 @@ ASSIMP_API C_ENUM aiReturn aiGetMaterialFloatArray(
 * @return Specifies whether the key has been found. If not, the output
 *   float remains unmodified.*/
 // ---------------------------------------------------------------------------
-inline aiReturn aiGetMaterialFloat(const aiMaterial* pMat,
-    const char* pKey,
-    unsigned int type,
-    unsigned int index,
-    ai_real* pOut)
-{
-    return aiGetMaterialFloatArray(pMat,pKey,type,index,pOut,(unsigned int*)0x0);
+inline aiReturn aiGetMaterialFloat(const aiMaterial *pMat,
+        const char *pKey,
+        unsigned int type,
+        unsigned int index,
+        ai_real *pOut) {
+    return aiGetMaterialFloatArray(pMat, pKey, type, index, pOut, (unsigned int *)0x0);
 }
 
 #else
 
 // Use our friend, the C preprocessor
 #define aiGetMaterialFloat (pMat, type, index, pKey, pOut) \
-    aiGetMaterialFloatArray(pMat, type, index, pKey, pOut, NULL)
+        aiGetMaterialFloatArray(pMat, type, index, pKey, pOut, NULL)
 
 #endif //!__cplusplus
 
-
 // ---------------------------------------------------------------------------
 /** @brief Retrieve an array of integer values with a specific key
  *  from a material
  *
  * See the sample for aiGetMaterialFloatArray for more information.*/
-ASSIMP_API C_ENUM aiReturn aiGetMaterialIntegerArray(const C_STRUCT aiMaterial* pMat,
-     const char* pKey,
-     unsigned int  type,
-     unsigned int  index,
-     int* pOut,
-     unsigned int* pMax);
-
+ASSIMP_API C_ENUM aiReturn aiGetMaterialIntegerArray(const C_STRUCT aiMaterial *pMat,
+        const char *pKey,
+        unsigned int type,
+        unsigned int index,
+        int *pOut,
+        unsigned int *pMax);
 
 #ifdef __cplusplus
 
@@ -1474,20 +1441,19 @@ ASSIMP_API C_ENUM aiReturn aiGetMaterialIntegerArray(const C_STRUCT aiMaterial*
  *
  * See the sample for aiGetMaterialFloat for more information.*/
 // ---------------------------------------------------------------------------
-inline aiReturn aiGetMaterialInteger(const C_STRUCT aiMaterial* pMat,
-    const char* pKey,
-    unsigned int type,
-    unsigned int index,
-    int* pOut)
-{
-    return aiGetMaterialIntegerArray(pMat,pKey,type,index,pOut,(unsigned int*)0x0);
+inline aiReturn aiGetMaterialInteger(const C_STRUCT aiMaterial *pMat,
+        const char *pKey,
+        unsigned int type,
+        unsigned int index,
+        int *pOut) {
+    return aiGetMaterialIntegerArray(pMat, pKey, type, index, pOut, (unsigned int *)0x0);
 }
 
 #else
 
 // use our friend, the C preprocessor
 #define aiGetMaterialInteger (pMat, type, index, pKey, pOut) \
-    aiGetMaterialIntegerArray(pMat, type, index, pKey, pOut, NULL)
+        aiGetMaterialIntegerArray(pMat, type, index, pKey, pOut, NULL)
 
 #endif //!__cplusplus
 
@@ -1496,35 +1462,33 @@ inline aiReturn aiGetMaterialInteger(const C_STRUCT aiMaterial* pMat,
 *
 * See the sample for aiGetMaterialFloat for more information*/
 // ---------------------------------------------------------------------------
-ASSIMP_API C_ENUM aiReturn aiGetMaterialColor(const C_STRUCT aiMaterial* pMat,
-    const char* pKey,
-    unsigned int type,
-    unsigned int index,
-    C_STRUCT aiColor4D* pOut);
-
+ASSIMP_API C_ENUM aiReturn aiGetMaterialColor(const C_STRUCT aiMaterial *pMat,
+        const char *pKey,
+        unsigned int type,
+        unsigned int index,
+        C_STRUCT aiColor4D *pOut);
 
 // ---------------------------------------------------------------------------
 /** @brief Retrieve a aiUVTransform value from the material property table
 *
 * See the sample for aiGetMaterialFloat for more information*/
 // ---------------------------------------------------------------------------
-ASSIMP_API C_ENUM aiReturn aiGetMaterialUVTransform(const C_STRUCT aiMaterial* pMat,
-    const char* pKey,
-    unsigned int type,
-    unsigned int index,
-    C_STRUCT aiUVTransform* pOut);
-
+ASSIMP_API C_ENUM aiReturn aiGetMaterialUVTransform(const C_STRUCT aiMaterial *pMat,
+        const char *pKey,
+        unsigned int type,
+        unsigned int index,
+        C_STRUCT aiUVTransform *pOut);
 
 // ---------------------------------------------------------------------------
 /** @brief Retrieve a string from the material property table
 *
 * See the sample for aiGetMaterialFloat for more information.*/
 // ---------------------------------------------------------------------------
-ASSIMP_API C_ENUM aiReturn aiGetMaterialString(const C_STRUCT aiMaterial* pMat,
-    const char* pKey,
-    unsigned int type,
-    unsigned int index,
-    C_STRUCT aiString* pOut);
+ASSIMP_API C_ENUM aiReturn aiGetMaterialString(const C_STRUCT aiMaterial *pMat,
+        const char *pKey,
+        unsigned int type,
+        unsigned int index,
+        C_STRUCT aiString *pOut);
 
 // ---------------------------------------------------------------------------
 /** Get the number of textures for a particular texture type.
@@ -1533,8 +1497,8 @@ ASSIMP_API C_ENUM aiReturn aiGetMaterialString(const C_STRUCT aiMaterial* pMat,
  *  @return Number of textures for this type.
  *  @note A texture can be easily queried using #aiGetMaterialTexture() */
 // ---------------------------------------------------------------------------
-ASSIMP_API unsigned int aiGetMaterialTextureCount(const C_STRUCT aiMaterial* pMat,
-    C_ENUM aiTextureType type);
+ASSIMP_API unsigned int aiGetMaterialTextureCount(const C_STRUCT aiMaterial *pMat,
+        C_ENUM aiTextureType type);
 
 // ---------------------------------------------------------------------------
 /** @brief Helper function to get all values pertaining to a particular
@@ -1574,30 +1538,29 @@ ASSIMP_API unsigned int aiGetMaterialTextureCount(const C_STRUCT aiMaterial* pMa
  *  @return AI_SUCCESS on success, otherwise something else. Have fun.*/
 // ---------------------------------------------------------------------------
 #ifdef __cplusplus
-ASSIMP_API aiReturn aiGetMaterialTexture(const C_STRUCT aiMaterial* mat,
-    aiTextureType type,
-    unsigned int  index,
-    aiString* path,
-    aiTextureMapping* mapping   = NULL,
-    unsigned int* uvindex       = NULL,
-    ai_real* blend              = NULL,
-    aiTextureOp* op             = NULL,
-    aiTextureMapMode* mapmode   = NULL,
-    unsigned int* flags         = NULL);
+ASSIMP_API aiReturn aiGetMaterialTexture(const C_STRUCT aiMaterial *mat,
+        aiTextureType type,
+        unsigned int index,
+        aiString *path,
+        aiTextureMapping *mapping = NULL,
+        unsigned int *uvindex = NULL,
+        ai_real *blend = NULL,
+        aiTextureOp *op = NULL,
+        aiTextureMapMode *mapmode = NULL,
+        unsigned int *flags = NULL);
 #else
-C_ENUM aiReturn aiGetMaterialTexture(const C_STRUCT aiMaterial* mat,
-    C_ENUM aiTextureType type,
-    unsigned int  index,
-    C_STRUCT aiString* path,
-    C_ENUM aiTextureMapping* mapping    /*= NULL*/,
-    unsigned int* uvindex               /*= NULL*/,
-    ai_real* blend                      /*= NULL*/,
-    C_ENUM aiTextureOp* op              /*= NULL*/,
-    C_ENUM aiTextureMapMode* mapmode    /*= NULL*/,
-    unsigned int* flags                 /*= NULL*/);
+C_ENUM aiReturn aiGetMaterialTexture(const C_STRUCT aiMaterial *mat,
+        C_ENUM aiTextureType type,
+        unsigned int index,
+        C_STRUCT aiString *path,
+        C_ENUM aiTextureMapping *mapping /*= NULL*/,
+        unsigned int *uvindex /*= NULL*/,
+        ai_real *blend /*= NULL*/,
+        C_ENUM aiTextureOp *op /*= NULL*/,
+        C_ENUM aiTextureMapMode *mapmode /*= NULL*/,
+        unsigned int *flags /*= NULL*/);
 #endif // !#ifdef __cplusplus
 
-
 #ifdef __cplusplus
 }
 
diff --git a/include/assimp/material.inl b/include/assimp/material.inl
index 759134441..48a38d45e 100644
--- a/include/assimp/material.inl
+++ b/include/assimp/material.inl
@@ -5,8 +5,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
diff --git a/include/assimp/mesh.h b/include/assimp/mesh.h
index 4b5af97ce..ec1062837 100644
--- a/include/assimp/mesh.h
+++ b/include/assimp/mesh.h
@@ -52,9 +52,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #pragma GCC system_header
 #endif
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 #pragma warning(disable : 4351)
-#endif // _WIN32
+#endif // _MSC_VER
 
 #include <assimp/aabb.h>
 #include <assimp/types.h>
@@ -458,8 +458,8 @@ struct aiAnimMesh {
      */
     unsigned int mNumVertices;
 
-    /** 
-     * Weight of the AnimMesh. 
+    /**
+     * Weight of the AnimMesh.
      */
     float mWeight;
 
@@ -713,8 +713,8 @@ struct aiMesh {
      *  Note! Currently only works with Collada loader.*/
     C_STRUCT aiAnimMesh **mAnimMeshes;
 
-    /** 
-     *  Method of morphing when animeshes are specified. 
+    /**
+     *  Method of morphing when animeshes are specified.
      */
     unsigned int mMethod;
 
diff --git a/include/assimp/pbrmaterial.h b/include/assimp/pbrmaterial.h
index cac4ab56b..645986d95 100644
--- a/include/assimp/pbrmaterial.h
+++ b/include/assimp/pbrmaterial.h
@@ -60,6 +60,20 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_MATKEY_GLTF_PBRSPECULARGLOSSINESS "$mat.gltf.pbrSpecularGlossiness", 0, 0
 #define AI_MATKEY_GLTF_PBRSPECULARGLOSSINESS_GLOSSINESS_FACTOR "$mat.gltf.pbrMetallicRoughness.glossinessFactor", 0, 0
 #define AI_MATKEY_GLTF_UNLIT "$mat.gltf.unlit", 0, 0
+#define AI_MATKEY_GLTF_MATERIAL_SHEEN "$mat.gltf.materialSheen", 0, 0
+#define AI_MATKEY_GLTF_MATERIAL_SHEEN_COLOR_FACTOR "$mat.gltf.materialSheen.sheenColorFactor", 0, 0
+#define AI_MATKEY_GLTF_MATERIAL_SHEEN_ROUGHNESS_FACTOR "$mat.gltf.materialSheen.sheenRoughnessFactor", 0, 0
+#define AI_MATKEY_GLTF_MATERIAL_SHEEN_COLOR_TEXTURE aiTextureType_UNKNOWN, 1
+#define AI_MATKEY_GLTF_MATERIAL_SHEEN_ROUGHNESS_TEXTURE aiTextureType_UNKNOWN, 2
+#define AI_MATKEY_GLTF_MATERIAL_CLEARCOAT "$mat.gltf.materialClearcoat", 0, 0
+#define AI_MATKEY_GLTF_MATERIAL_CLEARCOAT_FACTOR "$mat.gltf.materialClearcoat.clearcoatFactor", 0, 0
+#define AI_MATKEY_GLTF_MATERIAL_CLEARCOAT_ROUGHNESS_FACTOR "$mat.gltf.materialClearcoat.clearcoatRoughnessFactor", 0, 0
+#define AI_MATKEY_GLTF_MATERIAL_CLEARCOAT_TEXTURE aiTextureType_UNKNOWN, 3
+#define AI_MATKEY_GLTF_MATERIAL_CLEARCOAT_ROUGHNESS_TEXTURE aiTextureType_UNKNOWN, 4
+#define AI_MATKEY_GLTF_MATERIAL_CLEARCOAT_NORMAL_TEXTURE aiTextureType_NORMALS, 1
+#define AI_MATKEY_GLTF_MATERIAL_TRANSMISSION "$mat.gltf.materialTransmission", 0, 0
+#define AI_MATKEY_GLTF_MATERIAL_TRANSMISSION_FACTOR "$mat.gltf.materialTransmission.transmissionFactor", 0, 0
+#define AI_MATKEY_GLTF_MATERIAL_TRANSMISSION_TEXTURE aiTextureType_UNKNOWN, 5
 
 #define _AI_MATKEY_GLTF_TEXTURE_TEXCOORD_BASE "$tex.file.texCoord"
 #define _AI_MATKEY_GLTF_MAPPINGNAME_BASE "$tex.mappingname"
diff --git a/include/assimp/quaternion.h b/include/assimp/quaternion.h
index 9a14bd413..ee733ba2d 100644
--- a/include/assimp/quaternion.h
+++ b/include/assimp/quaternion.h
@@ -57,6 +57,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 template <typename TReal> class aiVector3t;
 template <typename TReal> class aiMatrix3x3t;
+template <typename TReal> class aiMatrix4x4t;
 
 // ---------------------------------------------------------------------------
 /** Represents a quaternion in a 4D vector. */
@@ -88,6 +89,9 @@ public:
     bool operator== (const aiQuaterniont& o) const;
     bool operator!= (const aiQuaterniont& o) const;
 
+    // transform vector by matrix
+    aiQuaterniont& operator *= (const aiMatrix4x4t<TReal>& mat);
+
     bool Equal(const aiQuaterniont& o, TReal epsilon = 1e-6) const;
 
 public:
diff --git a/include/assimp/quaternion.inl b/include/assimp/quaternion.inl
index 32549db3b..95e5d8cf7 100644
--- a/include/assimp/quaternion.inl
+++ b/include/assimp/quaternion.inl
@@ -57,6 +57,18 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <cmath>
 
+// ------------------------------------------------------------------------------------------------
+/** Transformation of a quaternion by a 4x4 matrix */
+template <typename TReal>
+AI_FORCE_INLINE
+aiQuaterniont<TReal> operator * (const aiMatrix4x4t<TReal>& pMatrix, const aiQuaterniont<TReal>& pQuaternion) {
+    aiQuaterniont<TReal> res;
+    res.x = pMatrix.a1 * pQuaternion.x + pMatrix.a2 * pQuaternion.y + pMatrix.a3 * pQuaternion.z + pMatrix.a4 * pQuaternion.w;
+    res.y = pMatrix.b1 * pQuaternion.x + pMatrix.b2 * pQuaternion.y + pMatrix.b3 * pQuaternion.z + pMatrix.b4 * pQuaternion.w;
+    res.z = pMatrix.c1 * pQuaternion.x + pMatrix.c2 * pQuaternion.y + pMatrix.c3 * pQuaternion.z + pMatrix.c4 * pQuaternion.w;
+    res.w = pMatrix.d1 * pQuaternion.x + pMatrix.d2 * pQuaternion.y + pMatrix.d3 * pQuaternion.z + pMatrix.d4 * pQuaternion.w;
+    return res;
+}
 // ---------------------------------------------------------------------------
 template<typename TReal>
 bool aiQuaterniont<TReal>::operator== (const aiQuaterniont& o) const
@@ -71,6 +83,14 @@ bool aiQuaterniont<TReal>::operator!= (const aiQuaterniont& o) const
     return !(*this == o);
 }
 
+// ------------------------------------------------------------------------------------------------
+template <typename TReal>
+AI_FORCE_INLINE
+aiQuaterniont<TReal>& aiQuaterniont<TReal>::operator *= (const aiMatrix4x4t<TReal>& mat){
+    return (*this = mat * (*this));
+}
+// ------------------------------------------------------------------------------------------------
+
 // ---------------------------------------------------------------------------
 template<typename TReal>
 inline bool aiQuaterniont<TReal>::Equal(const aiQuaterniont& o, TReal epsilon) const {
diff --git a/include/assimp/scene.h b/include/assimp/scene.h
index a189f5700..2a9a77b02 100644
--- a/include/assimp/scene.h
+++ b/include/assimp/scene.h
@@ -335,12 +335,15 @@ struct aiScene
     /**
      *  @brief  The global metadata assigned to the scene itself.
      *
-     *  This data contains global metadata which belongs to the scene like 
-     *  unit-conversions, versions, vendors or other model-specific data. This 
+     *  This data contains global metadata which belongs to the scene like
+     *  unit-conversions, versions, vendors or other model-specific data. This
      *  can be used to store format-specific metadata as well.
      */
     C_STRUCT aiMetadata* mMetaData;
 
+    /** The name of the scene itself.
+     */
+    C_STRUCT aiString mName;
 
 #ifdef __cplusplus
 
diff --git a/include/assimp/types.h b/include/assimp/types.h
index 74763d496..99527dcc2 100644
--- a/include/assimp/types.h
+++ b/include/assimp/types.h
@@ -305,9 +305,9 @@ struct aiString {
 
     /** Copy a const char* to the aiString */
     void Set(const char *sz) {
-        const ai_int32 len = (ai_uint32)::strlen(sz);
+        ai_int32 len = (ai_uint32)::strlen(sz);
         if (len > (ai_int32)MAXLEN - 1) {
-            return;
+            len = (ai_int32) MAXLEN - 1;
         }
         length = len;
         memcpy(data, sz, len);
@@ -321,7 +321,10 @@ struct aiString {
         }
 
         length = rOther.length;
-        ;
+        if (length >(MAXLEN - 1)) {
+            length = (ai_int32) MAXLEN - 1;
+        }
+
         memcpy(data, rOther.data, length);
         data[length] = '\0';
         return *this;
diff --git a/include/assimp/vector3.inl b/include/assimp/vector3.inl
index 2765115a2..1d024e03f 100644
--- a/include/assimp/vector3.inl
+++ b/include/assimp/vector3.inl
@@ -5,8 +5,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -154,6 +152,9 @@ const aiVector3t<TReal>& aiVector3t<TReal>::operator *= (TReal f) {
 template <typename TReal>
 AI_FORCE_INLINE
 const aiVector3t<TReal>& aiVector3t<TReal>::operator /= (TReal f) {
+    if ( f == static_cast<TReal>(0.0)) {
+        return *this;
+    }
     const TReal invF = (TReal) 1.0 / f;
     x *= invF;
     y *= invF;
diff --git a/include/assimp/version.h b/include/assimp/version.h
index 6709eaf39..16a7b1402 100644
--- a/include/assimp/version.h
+++ b/include/assimp/version.h
@@ -5,8 +5,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -91,7 +89,7 @@ ASSIMP_API unsigned int aiGetVersionMajor (void);
 ASSIMP_API unsigned int aiGetVersionRevision (void);
 
 // ---------------------------------------------------------------------------
-/** @brief Returns the branchname of the Assimp runtime.
+/** @brief Returns the branch-name of the Assimp runtime.
  *  @return The current branch name.
  */
 ASSIMP_API const char *aiGetBranchName();
@@ -107,12 +105,14 @@ ASSIMP_API const char *aiGetBranchName();
 #define ASSIMP_CFLAGS_NOBOOST           0x8
 //! Assimp was compiled with ASSIMP_BUILD_SINGLETHREADED defined
 #define ASSIMP_CFLAGS_SINGLETHREADED    0x10
+//! Assimp was compiled with ASSIMP_BUILD_SINGLETHREADED defined
+#define ASSIMP_CFLAGS_DOUBLE_SUPPORT 0x20
 
 // ---------------------------------------------------------------------------
 /** @brief Returns assimp's compile flags
  *  @return Any bitwise combination of the ASSIMP_CFLAGS_xxx constants.
  */
-ASSIMP_API unsigned int aiGetCompileFlags (void);
+ASSIMP_API unsigned int aiGetCompileFlags(void);
 
 #ifdef __cplusplus
 } // end extern "C"
diff --git a/port/AndroidJNI/README.md b/port/AndroidJNI/README.md
index 0b95efd04..003b1da1a 100644
--- a/port/AndroidJNI/README.md
+++ b/port/AndroidJNI/README.md
@@ -14,6 +14,11 @@ To use this module please provide following cmake defines:
 
 "SOME_PATH" is a path to your cmake android toolchain script.
 
+
+The build script for this port is based on [android-cmake](https://github.com/taka-no-me/android-cmake).  
+See its documentation for more Android-specific cmake options (e.g. -DANDROID_ABI for the target ABI).
+Check [Asset-Importer-Docs](https://assimp-docs.readthedocs.io/en/latest/) for more information.
+
 ### Code ###
 A small example how to wrap assimp for Android:
 ```cpp
diff --git a/port/jassimp/jassimp/src/jassimp/AiTextureType.java b/port/jassimp/jassimp/src/jassimp/AiTextureType.java
index 6b3e642e0..9b236ee94 100644
--- a/port/jassimp/jassimp/src/jassimp/AiTextureType.java
+++ b/port/jassimp/jassimp/src/jassimp/AiTextureType.java
@@ -56,109 +56,115 @@ package jassimp;
  * regardless which 3D tool they're using.
  */
 public enum AiTextureType {
-   /** 
-    * The texture is combined with the result of the diffuse
-    * lighting equation.
+    /** Dummy value.
+     *
+     *  No texture, but the value to be used as 'texture semantic'
+     *  (#aiMaterialProperty::mSemantic) for all material properties
+     *  *not* related to textures.
+     */
+    NONE(0),
+
+    /** LEGACY API MATERIALS 
+     * Legacy refers to materials which 
+     * Were originally implemented in the specifications around 2000.
+     * These must never be removed, as most engines support them.
+     */
+
+    /** The texture is combined with the result of the diffuse
+     *  lighting equation.
+     */
+    DIFFUSE(1),
+
+    /** The texture is combined with the result of the specular
+     *  lighting equation.
+     */
+    SPECULAR(2),
+
+    /** The texture is combined with the result of the ambient
+     *  lighting equation.
+     */
+    AMBIENT(3),
+
+    /** The texture is added to the result of the lighting
+     *  calculation. It isn't influenced by incoming light.
+     */
+    EMISSIVE(4),
+
+    /** The texture is a height map.
+     *
+     *  By convention, higher gray-scale values stand for
+     *  higher elevations from the base height.
+     */
+    HEIGHT(5),
+
+    /** The texture is a (tangent space) normal-map.
+     *
+     *  Again, there are several conventions for tangent-space
+     *  normal maps. Assimp does (intentionally) not
+     *  distinguish here.
+     */
+    NORMALS(6),
+
+    /** The texture defines the glossiness of the material.
+     *
+     *  The glossiness is in fact the exponent of the specular
+     *  (phong) lighting equation. Usually there is a conversion
+     *  function defined to map the linear color values in the
+     *  texture to a suitable exponent. Have fun.
     */
-   DIFFUSE(0x1),
+    SHININESS(7),
 
-           
-   /** 
-    * The texture is combined with the result of the specular
-    * lighting equation.
+    /** The texture defines per-pixel opacity.
+     *
+     *  Usually 'white' means opaque and 'black' means
+     *  'transparency'. Or quite the opposite. Have fun.
     */
-   SPECULAR(0x2),
+    OPACITY(8),
 
-   
-   /** 
-    * The texture is combined with the result of the ambient
-    * lighting equation.
+    /** Displacement texture
+     *
+     *  The exact purpose and format is application-dependent.
+     *  Higher color values stand for higher vertex displacements.
     */
-   AMBIENT(0x3),
+    DISPLACEMENT(9),
 
-   
-   /** 
-    * The texture is added to the result of the lighting
-    * calculation. It isn't influenced by incoming light.
+    /** Lightmap texture (aka Ambient Occlusion)
+     *
+     *  Both 'Lightmaps' and dedicated 'ambient occlusion maps' are
+     *  covered by this material property. The texture contains a
+     *  scaling value for the final color value of a pixel. Its
+     *  intensity is not affected by incoming light.
     */
-   EMISSIVE(0x4),
+    LIGHTMAP(10),
 
-   
-   /** 
-    * The texture is a height map.<p>
-    *
-    * By convention, higher gray-scale values stand for
-    * higher elevations from the base height.
+    /** Reflection texture
+     *
+     * Contains the color of a perfect mirror reflection.
+     * Rarely used, almost never for real-time applications.
     */
-   HEIGHT(0x5),
+    REFLECTION(11),
 
-   
-   /**
-    * The texture is a (tangent space) normal-map.<p>
-    *
-    * Again, there are several conventions for tangent-space
-    * normal maps. Assimp does (intentionally) not distinguish here.
+    /** PBR Materials
+     * PBR definitions from maya and other modelling packages now use this standard.
+     * This was originally introduced around 2012.
+     * Support for this is in game engines like Godot, Unreal or Unity3D.
+     * Modelling packages which use this are very common now.
+     */
+
+    BASE_COLOR(12),
+    NORMAL_CAMERA(13),
+    EMISSION_COLOR(14),
+    METALNESS(15),
+    DIFFUSE_ROUGHNESS(16),
+    AMBIENT_OCCLUSION(17),
+
+    /** Unknown texture
+     *
+     *  A texture reference that does not match any of the definitions
+     *  above is considered to be 'unknown'. It is still imported,
+     *  but is excluded from any further post-processing.
     */
-   NORMALS(0x6),
-
-   
-   /** 
-    * The texture defines the glossiness of the material.<p>
-    *
-    * The glossiness is in fact the exponent of the specular
-    * (phong) lighting equation. Usually there is a conversion
-    * function defined to map the linear color values in the
-    * texture to a suitable exponent. Have fun.
-   */
-   SHININESS(0x7),
-
-   
-   /** 
-    * The texture defines per-pixel opacity.<p>
-    *
-    * Usually 'white' means opaque and 'black' means 
-    * 'transparency'. Or quite the opposite. Have fun.
-   */
-   OPACITY(0x8),
-
-   
-   /** 
-    * Displacement texture.<p>
-    *
-    * The exact purpose and format is application-dependent.
-    * Higher color values stand for higher vertex displacements.
-   */
-   DISPLACEMENT(0x9),
-
-   
-   /** 
-    * Lightmap texture (aka Ambient Occlusion).<p>
-    *
-    * Both 'Lightmaps' and dedicated 'ambient occlusion maps' are
-    * covered by this material property. The texture contains a
-    * scaling value for the final color value of a pixel. Its
-    * intensity is not affected by incoming light.
-   */
-   LIGHTMAP(0xA),
-
-   
-   /**
-    * Reflection texture.<p>
-    *
-    * Contains the color of a perfect mirror reflection.
-    * Rarely used, almost never for real-time applications.
-   */
-   REFLECTION(0xB),
-
-   
-   /** 
-    * Unknown texture.<p>
-    *
-    * A texture reference that does not match any of the definitions 
-    * above is considered to be 'unknown'. It is still imported,
-    * but is excluded from any further postprocessing.
-   */
-   UNKNOWN(0xC);
+    UNKNOWN(18);
    
    
    /**
diff --git a/samples/SimpleOpenGL/CMakeLists.txt b/samples/SimpleOpenGL/CMakeLists.txt
index 6bc8e37e6..ba5deb4cf 100644
--- a/samples/SimpleOpenGL/CMakeLists.txt
+++ b/samples/SimpleOpenGL/CMakeLists.txt
@@ -44,6 +44,8 @@ ADD_EXECUTABLE( ${SAMPLE_PROJECT_NAME}
   Sample_SimpleOpenGL.c
 )
 
+TARGET_USE_COMMON_OUTPUT_DIRECTORY(${SAMPLE_PROJECT_NAME})
+
 SET_PROPERTY(TARGET ${SAMPLE_PROJECT_NAME} PROPERTY DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
 
 TARGET_LINK_LIBRARIES( ${SAMPLE_PROJECT_NAME} assimp ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES} ${M_LIB} )
diff --git a/samples/SimpleOpenGL/Sample_SimpleOpenGL.c b/samples/SimpleOpenGL/Sample_SimpleOpenGL.c
index bcc964efe..bcb109564 100644
--- a/samples/SimpleOpenGL/Sample_SimpleOpenGL.c
+++ b/samples/SimpleOpenGL/Sample_SimpleOpenGL.c
@@ -278,7 +278,7 @@ void do_motion (void)
 	static int frames = 0;
 
 	int time = glutGet(GLUT_ELAPSED_TIME);
-	angle += static_cast<float>((time-prev_time)*0.01);
+	angle += (float)((time-prev_time)*0.01);
 	prev_time = time;
 
 	frames += 1;
@@ -376,7 +376,7 @@ int main(int argc, char **argv)
 
 	// Check and validate the specified model file extension.
 	model_file = argv[1];
-	const char* extension = strchr(model_file, '.');
+	const char* extension = strrchr(model_file, '.');
 	if (!extension) {
 		print_error("Please provide a file with a valid extension.");
 		return EXIT_FAILURE;
diff --git a/samples/SimpleTexturedDirectx11/CMakeLists.txt b/samples/SimpleTexturedDirectx11/CMakeLists.txt
index 9eec738f5..82144caa9 100644
--- a/samples/SimpleTexturedDirectx11/CMakeLists.txt
+++ b/samples/SimpleTexturedDirectx11/CMakeLists.txt
@@ -37,6 +37,8 @@ ADD_EXECUTABLE( assimp_simpletextureddirectx11 WIN32
   ${SAMPLES_SHARED_CODE_DIR}/UTFConverter.h
 )
 
+TARGET_USE_COMMON_OUTPUT_DIRECTORY(assimp_simpletextureddirectx11)
+
 SET_PROPERTY(TARGET assimp_simpletextureddirectx11 PROPERTY DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
 
 TARGET_LINK_LIBRARIES( assimp_simpletextureddirectx11 assimp comctl32.lib winmm.lib )
diff --git a/samples/SimpleTexturedDirectx11/SimpleTexturedDirectx11/TextureLoader.cpp b/samples/SimpleTexturedDirectx11/SimpleTexturedDirectx11/TextureLoader.cpp
index c3269d290..01ba343e8 100644
--- a/samples/SimpleTexturedDirectx11/SimpleTexturedDirectx11/TextureLoader.cpp
+++ b/samples/SimpleTexturedDirectx11/SimpleTexturedDirectx11/TextureLoader.cpp
@@ -31,10 +31,16 @@
 #include <dxgiformat.h>
 #include <assert.h>
 
+#ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable : 4005)
+#endif // _MSC_VER
+
 #include <wincodec.h>
+
+#ifdef _MSC_VER
 #pragma warning(pop)
+#endif // _MSC_VER
 
 #include <memory>
 
diff --git a/samples/SimpleTexturedDirectx11/SimpleTexturedDirectx11/TextureLoader.h b/samples/SimpleTexturedDirectx11/SimpleTexturedDirectx11/TextureLoader.h
index c2e0b5214..5448daf2a 100644
--- a/samples/SimpleTexturedDirectx11/SimpleTexturedDirectx11/TextureLoader.h
+++ b/samples/SimpleTexturedDirectx11/SimpleTexturedDirectx11/TextureLoader.h
@@ -31,10 +31,16 @@
 
 #include <d3d11.h>
 
+#ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable : 4005)
+#endif // _MSC_VER
+
 #include <stdint.h>
+
+#ifdef _MSC_VER
 #pragma warning(pop)
+#endif // _MSC_VER
 
 HRESULT CreateWICTextureFromMemory(_In_ ID3D11Device* d3dDevice,
 	_In_opt_ ID3D11DeviceContext* d3dContext,
diff --git a/samples/SimpleTexturedDirectx11/SimpleTexturedDirectx11/main.cpp b/samples/SimpleTexturedDirectx11/SimpleTexturedDirectx11/main.cpp
index 5cce7c376..02e2b6088 100644
--- a/samples/SimpleTexturedDirectx11/SimpleTexturedDirectx11/main.cpp
+++ b/samples/SimpleTexturedDirectx11/SimpleTexturedDirectx11/main.cpp
@@ -25,10 +25,12 @@
 #include "UTFConverter.h"
 #include "SafeRelease.hpp"
 
+#ifdef _MSC_VER
 #pragma comment (lib, "d3d11.lib")
 #pragma comment (lib, "Dxgi.lib")
 #pragma comment(lib,"d3dcompiler.lib")
 #pragma comment (lib, "dxguid.lib")
+#endif // _MSC_VER
 
 using namespace DirectX;
 using namespace AssimpSamples::SharedCode;
diff --git a/samples/SimpleTexturedOpenGL/CMakeLists.txt b/samples/SimpleTexturedOpenGL/CMakeLists.txt
index 83cd2746e..1837af033 100644
--- a/samples/SimpleTexturedOpenGL/CMakeLists.txt
+++ b/samples/SimpleTexturedOpenGL/CMakeLists.txt
@@ -34,6 +34,8 @@ ADD_EXECUTABLE( assimp_simpletexturedogl WIN32
   ${SAMPLES_SHARED_CODE_DIR}/UTFConverter.h
 )
 
+TARGET_USE_COMMON_OUTPUT_DIRECTORY(assimp_simpletexturedogl)
+
 SET_PROPERTY(TARGET assimp_simpletexturedogl PROPERTY DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
 
 TARGET_LINK_LIBRARIES( assimp_simpletexturedogl assimp ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES} )
diff --git a/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp b/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp
index 806da8f8a..aa2344118 100644
--- a/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp
+++ b/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp
@@ -18,10 +18,16 @@
 #include <GL/gl.h>
 #include <GL/glu.h>
 
+#ifdef _MSC_VER
 #pragma warning(disable: 4100) // Disable warning 'unreferenced formal parameter'
+#endif // _MSC_VER
+
 #define STB_IMAGE_IMPLEMENTATION
 #include "contrib/stb_image/stb_image.h"
+
+#ifdef _MSC_VER
 #pragma warning(default: 4100) // Enable warning 'unreferenced formal parameter'
+#endif // _MSC_VER
 
 #include <fstream>
 
@@ -757,7 +763,7 @@ void cleanup()
 
 	if (g_hWnd)
 		KillGLWindow();
-};
+}
 
 LRESULT CALLBACK WndProc(HWND hWnd,				// Handles for this Window
 						 UINT uMsg,				// Message for this Window
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 8e1746ce2..9005a5ec4 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -2,8 +2,7 @@
 # ----------------------------------------------------------------------
 #
 # Copyright (c) 2006-2020, assimp team
-
-
+#
 # All rights reserved.
 #
 # Redistribution and use of this software in source and binary forms,
@@ -40,12 +39,19 @@
 cmake_minimum_required( VERSION 3.0 )
 
 INCLUDE_DIRECTORIES(
-	${Assimp_SOURCE_DIR}/contrib/gtest/include
-	${Assimp_SOURCE_DIR}/contrib/gtest/
     ${Assimp_SOURCE_DIR}/test/unit
     ${Assimp_SOURCE_DIR}/include
     ${Assimp_SOURCE_DIR}/code
 )
+
+if(NOT ASSIMP_HUNTER_ENABLED)
+  INCLUDE_DIRECTORIES(
+    ${Assimp_SOURCE_DIR}/contrib/gtest/include
+    ${Assimp_SOURCE_DIR}/contrib/gtest/
+    ${Assimp_SOURCE_DIR}/contrib/pugixml/src
+  )
+endif()
+
 if (MSVC)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING")
 endif()
@@ -84,10 +90,12 @@ SET( COMMON
   unit/utProfiler.cpp
   unit/utSharedPPData.cpp
   unit/utStringUtils.cpp
+  unit/Common/utStandardShapes.cpp
   unit/Common/uiScene.cpp
   unit/Common/utLineSplitter.cpp
   unit/Common/utSpatialSort.cpp
   unit/Common/utAssertHandler.cpp
+  unit/Common/utXmlParser.cpp
 )
 
 SET( IMPORTERS
@@ -197,7 +205,6 @@ SOURCE_GROUP( UnitTests\\Math         FILES  ${MATH} )
 SOURCE_GROUP( UnitTests\\PostProcess  FILES  ${POST_PROCESSES})
 
 add_executable( unit
-    ../contrib/gtest/src/gtest-all.cc
     unit/CCompilerTest.c
     unit/Main.cpp
     ../code/Common/Version.cpp
@@ -205,9 +212,19 @@ add_executable( unit
 	${IMPORTERS}
 	${MATERIAL}
 	${MATH}
-    ${POST_PROCESSES}
+  ${POST_PROCESSES}
 )
 
+if(ASSIMP_HUNTER_ENABLED)
+    hunter_add_package(GTest)
+    find_package(GTest CONFIG REQUIRED)
+    target_link_libraries(unit GTest::gtest_main GTest::gmock)
+else()
+    target_sources(unit PUBLIC ${Assimp_SOURCE_DIR}/contrib/gtest/src/gtest-all.cc)
+endif()
+
+TARGET_USE_COMMON_OUTPUT_DIRECTORY(unit)
+
 add_definitions(-DASSIMP_TEST_MODELS_DIR="${CMAKE_CURRENT_LIST_DIR}/models")
 add_definitions(-DASSIMP_TEST_MODELS_NONBSD_DIR="${CMAKE_CURRENT_LIST_DIR}/models-nonbsd")
 
@@ -215,12 +232,14 @@ SET_PROPERTY( TARGET assimp PROPERTY DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX} )
 
 IF( WIN32 )
     SET( platform_libs )
+ELSEIF(ANDROID)
+    SET( platform_libs )
 ELSE()
     SET( platform_libs pthread )
 ENDIF()
 
 IF(MSVC)
-		add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+    add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 ENDIF()
 
 target_link_libraries( unit assimp ${platform_libs} )
@@ -228,4 +247,3 @@ target_link_libraries( unit assimp ${platform_libs} )
 add_subdirectory(headercheck)
 
 add_test( unittests unit )
-
diff --git a/test/models/AC/Wuson.acc b/test/models/AC/Wuson.acc
new file mode 100644
index 000000000..6e6aee582
--- /dev/null
+++ b/test/models/AC/Wuson.acc
@@ -0,0 +1,9528 @@
+AC3Db
+MATERIAL "DefaultWhite" rgb 1 1 1  amb 1 1 1  emis 0 0 0   spec 0.5 0.5 0.5  shi 0  trans 0
+OBJECT world
+kids 1
+OBJECT poly
+name "MESH"
+numvert 3161
+-0.343303 -1.163795 -1.072610 -0.368130 -0.808416 -0.459286
+-0.361312 -1.160513 -1.063353 -0.921609 -0.357869 0.150225
+-0.355943 -1.129597 -1.088021 -0.345433 -0.217054 -0.912997
+-0.372936 -1.126281 -1.083700 -0.914896 0.346902 0.206458
+-0.357764 -1.155275 -1.061677 -0.283888 0.500285 0.817999
+-0.363313 -1.128177 -1.076717 -0.196322 0.115199 0.973749
+-0.348236 -1.105636 -1.066348 -0.439092 -0.108607 0.891854
+-0.351197 -1.098160 -1.069294 -0.778692 0.625695 -0.046313
+-0.332530 -1.106033 -1.077487 -0.129960 0.518644 -0.845055
+-0.329556 -1.172598 -1.035929 -0.354215 0.719343 0.597559
+-0.331995 -1.180665 -1.031806 -0.725050 -0.488759 0.485198
+-0.304381 -1.184538 -1.045494 -0.192502 -0.977040 -0.091296
+-0.305743 -1.176263 -1.011915 -0.526763 0.554871 0.643925
+-0.305398 -1.183834 -1.009541 -0.459568 -0.736064 0.496999
+-0.279853 -1.188245 -1.025279 -0.035887 -0.991930 0.121604
+-0.336214 -1.117070 -1.070677 -0.067295 -0.344926 0.936214
+-0.348472 -1.131245 -1.076251 -0.013622 0.085427 0.996251
+-0.275683 -1.171798 -0.990842 -0.565770 0.588340 0.577719
+-0.292839 -1.167308 -1.027903 -0.343933 0.883692 0.317487
+-0.269625 -1.163410 -0.996001 -0.627770 0.683018 0.373351
+-0.312037 -1.163003 -1.057184 -0.022911 0.847034 0.531045
+-0.338613 -1.146774 -1.069065 0.068005 0.526146 0.847671
+-0.265898 -1.184636 -1.016200 0.175160 -0.966731 0.186413
+-0.285302 -1.182847 -0.993891 -0.391605 -0.472438 0.789587
+-0.264614 -1.166326 -0.984473 -0.466393 0.081932 0.880775
+-0.245808 -1.173403 -0.979229 0.033385 -0.844246 0.534915
+-0.239201 -1.174720 -0.997346 0.243556 -0.956868 0.158380
+-0.159733 -1.351043 -0.960337 -0.239022 -0.260069 -0.935539
+-0.149381 -1.370119 -0.954521 -0.220660 -0.628737 -0.745654
+-0.173488 -1.358508 -0.942559 -0.566451 -0.505769 -0.650639
+-0.167375 -1.369772 -0.939125 -0.476905 -0.692115 -0.541791
+-0.141802 -1.384084 -0.938632 -0.071415 -0.903737 -0.422089
+-0.162901 -1.378017 -0.929744 -0.372041 -0.885358 -0.278795
+-0.139028 -1.389196 -0.916928 -0.019344 -0.999706 0.014590
+-0.161263 -1.381035 -0.916928 -0.343948 -0.937138 0.058924
+-0.141802 -1.384084 -0.895224 -0.078381 -0.890914 0.447357
+-0.162901 -1.378017 -0.904112 -0.400130 -0.833585 0.380831
+-0.149381 -1.370119 -0.879335 -0.232714 -0.606512 0.760255
+-0.167375 -1.369772 -0.894731 -0.525584 -0.602416 0.600713
+-0.159733 -1.351043 -0.873520 -0.369964 -0.223894 0.901664
+-0.173488 -1.358508 -0.891297 -0.566429 -0.505766 0.650660
+-0.135179 -1.337718 -0.965356 -0.196599 -0.007046 -0.980459
+-0.123630 -1.359001 -0.958868 0.042811 -0.448241 -0.892887
+-0.115175 -1.374581 -0.941142 0.229247 -0.791845 -0.566063
+-0.112080 -1.380283 -0.916928 0.312801 -0.945773 -0.087579
+-0.115175 -1.374581 -0.892714 0.271020 -0.868807 0.414394
+-0.123630 -1.359001 -0.874988 0.115139 -0.581556 0.805317
+-0.135179 -1.337718 -0.868500 -0.113082 -0.160991 0.980456
+-0.146729 -1.316436 -0.874988 -0.271926 0.142550 0.951701
+-0.170085 -1.331967 -0.879335 -0.271920 0.142548 0.951704
+-0.146729 -1.316436 -0.958868 -0.271926 0.142557 -0.951701
+-0.170085 -1.331967 -0.954521 -0.271922 0.142577 -0.951699
+-0.167375 -1.369772 -0.939125 -0.787254 -0.574453 -0.224132
+-0.179524 -1.361783 -0.916928 -0.878924 -0.476962 0.000000
+-0.173488 -1.358508 -0.942559 -0.832254 -0.383619 -0.400237
+-0.162901 -1.378017 -0.929744 -0.742078 -0.657706 -0.129398
+-0.161263 -1.381035 -0.916928 -0.725534 -0.688187 0.000000
+-0.162901 -1.378017 -0.904112 -0.742078 -0.657706 0.129398
+-0.167375 -1.369772 -0.894731 -0.787254 -0.574453 0.224132
+-0.173488 -1.358508 -0.891297 -0.815145 -0.340009 0.468970
+-0.179601 -1.347243 -0.894731 -0.891526 -0.157300 0.424780
+-0.184075 -1.338998 -0.904112 -0.974488 -0.004417 0.224398
+-0.185713 -1.335980 -0.916928 -0.998550 0.039917 -0.036121
+-0.184075 -1.338998 -0.929744 -0.957262 -0.036154 -0.286953
+-0.179601 -1.347243 -0.939125 -0.861690 -0.212288 -0.460896
+-0.159733 -1.351043 -0.873520 -0.732750 -0.199300 0.650658
+-0.170085 -1.331967 -0.879335 -0.712883 0.157143 0.683450
+-0.177663 -1.318002 -0.895224 -0.796647 0.432669 0.422081
+-0.180437 -1.312890 -0.916928 -0.848727 0.528630 -0.014588
+-0.177663 -1.318002 -0.938632 -0.789690 0.419839 -0.447353
+-0.170085 -1.331967 -0.954521 -0.784588 0.122559 -0.607783
+-0.159733 -1.351043 -0.960337 -0.732770 -0.199292 -0.650639
+-0.146729 -1.316436 -0.874988 -0.482612 0.530771 0.696684
+-0.155183 -1.300856 -0.892714 -0.538967 0.623774 0.566056
+-0.158278 -1.295154 -0.916928 -0.622490 0.777712 0.087578
+-0.155183 -1.300856 -0.941142 -0.580728 0.700739 -0.414391
+-0.146729 -1.316436 -0.958868 -0.482615 0.530772 -0.696681
+-0.007777 1.583781 -1.285707 -0.694618 -0.192257 0.693213
+-0.000345 1.583852 -1.280908 -0.513488 -0.157742 0.843474
+-0.013389 1.611106 -1.283752 -0.678659 -0.191051 0.709169
+-0.000428 1.612066 -1.276136 -0.493065 -0.146496 0.857570
+-0.020758 1.612066 -1.293944 -0.799698 -0.223856 0.557110
+-0.015212 1.583690 -1.297385 -0.812305 -0.215486 0.541965
+-0.012060 1.519814 -1.281023 -0.699437 -0.147215 0.699368
+-0.000351 1.519087 -1.274030 -0.481137 -0.142013 0.865066
+-0.018614 1.595557 -1.271634 -0.711099 -0.134462 0.690115
+-0.000373 1.597562 -1.262090 -0.447717 -0.134624 0.883983
+-0.027355 1.597562 -1.291280 -0.913149 -0.093619 0.396729
+-0.022072 1.519996 -1.297424 -0.881899 -0.115633 0.457036
+-0.015475 1.475798 -1.277939 -0.777520 -0.141381 0.612759
+-0.000349 1.475675 -1.269924 -0.441888 -0.140128 0.886058
+-0.023519 1.567919 -1.266891 -0.753911 -0.146545 0.640424
+-0.000372 1.570149 -1.255745 -0.419314 -0.134843 0.897771
+-0.034452 1.570149 -1.296174 -0.930455 -0.145408 0.336318
+-0.021517 1.476233 -1.300993 -0.947124 -0.129821 0.293433
+-0.036751 1.537030 -1.295993 -0.940385 -0.168274 0.295568
+-0.021517 1.443114 -1.300993 -0.949139 -0.158746 0.271908
+-0.025818 1.534800 -1.262478 -0.949139 -0.158746 0.271908
+-0.015475 1.442679 -1.277939 -0.957204 -0.149103 0.248051
+-0.015475 1.442679 -1.277939 -0.460301 -0.196964 0.865638
+-0.000349 1.442555 -1.269924 -0.439601 -0.192197 0.877389
+-0.025818 1.534800 -1.262478 -0.439601 -0.192197 0.877389
+-0.000372 1.537030 -1.250020 -0.418642 -0.187317 0.888623
+-0.039525 1.500012 -1.289692 -0.926847 -0.120357 0.355623
+-0.028506 1.392485 -1.297365 -0.912115 -0.132629 0.387885
+-0.027067 1.497572 -1.258049 -0.912115 -0.132629 0.387885
+-0.018579 1.392218 -1.276257 -0.896099 -0.144714 0.419601
+-0.018579 1.392218 -1.276257 -0.426589 -0.187293 0.884841
+-0.000351 1.392143 -1.267485 -0.412715 -0.184418 0.891996
+-0.027067 1.497572 -1.258049 -0.412715 -0.184418 0.891996
+-0.000403 1.500012 -1.245729 -0.398737 -0.181496 0.898926
+-0.043651 1.457243 -1.289771 -0.922057 -0.154920 0.354699
+-0.028506 1.349716 -1.297365 -0.907360 -0.166177 0.386114
+-0.031193 1.454802 -1.258452 -0.907360 -0.166177 0.386114
+-0.018579 1.349450 -1.276257 -0.891456 -0.177213 0.417015
+-0.018579 1.349450 -1.276257 -0.425544 -0.200104 0.882536
+-0.000351 1.349374 -1.267485 -0.399148 -0.193555 0.896224
+-0.031193 1.454802 -1.258452 -0.399148 -0.193555 0.896224
+-0.000403 1.457243 -1.245338 -0.372382 -0.186826 0.909081
+-0.046819 1.414506 -1.287978 -0.891662 -0.144440 0.429041
+-0.029357 1.278820 -1.297367 -0.898695 -0.140587 0.415431
+-0.032103 1.411768 -1.258316 -0.898695 -0.140587 0.415431
+-0.019341 1.278735 -1.274819 -0.905504 -0.136700 0.401717
+-0.019341 1.278735 -1.274819 -0.447698 -0.152254 0.881127
+-0.000345 1.279529 -1.265030 -0.402402 -0.142552 0.904296
+-0.032103 1.411768 -1.258316 -0.402402 -0.142552 0.904296
+-0.000345 1.414506 -1.245701 -0.356026 -0.132468 0.925039
+-0.043068 1.325265 -1.289129 -0.870751 -0.100438 0.481357
+-0.032032 1.188607 -1.297680 -0.892376 -0.089747 0.442279
+-0.028351 1.322527 -1.263078 -0.892376 -0.089747 0.442279
+-0.021388 1.189144 -1.273440 -0.912119 -0.078866 0.402267
+-0.021388 1.189144 -1.273440 -0.409418 -0.091889 0.907708
+-0.000345 1.188933 -1.263970 -0.359933 -0.081660 0.929398
+-0.028351 1.322527 -1.263078 -0.359933 -0.081660 0.929398
+-0.000345 1.325265 -1.253736 -0.309359 -0.071184 0.948277
+-0.014435 1.611458 -1.309839 -0.869412 -0.422036 -0.256921
+-0.002626 1.584369 -1.305302 -0.751840 -0.267439 -0.602671
+-0.017630 1.611106 -1.298449 -0.965614 -0.240434 -0.098898
+-0.015267 1.583688 -1.297604 -0.971576 -0.090476 -0.218757
+-0.007538 1.583853 -1.285870 -0.903892 -0.149778 0.400682
+-0.014435 1.612066 -1.284791 -0.941571 -0.239245 0.237077
+-0.000428 1.612066 -1.318737 -0.493111 -0.146522 -0.857539
+-0.000345 1.583852 -1.313964 -0.513472 -0.157733 -0.843485
+-0.013389 1.611106 -1.311120 -0.678646 -0.191041 -0.709185
+-0.007777 1.583781 -1.309166 -0.694588 -0.192228 -0.693250
+-0.015212 1.583690 -1.297488 -0.812295 -0.215477 -0.541984
+-0.020758 1.612066 -1.300929 -0.799672 -0.223856 -0.557147
+-0.000373 1.597562 -1.332783 -0.447776 -0.134619 -0.883954
+-0.000351 1.519087 -1.320843 -0.481166 -0.142001 -0.865052
+-0.018613 1.595557 -1.323238 -0.711100 -0.134451 -0.690115
+-0.012060 1.519814 -1.313850 -0.699438 -0.147197 -0.699370
+-0.022072 1.519996 -1.297449 -0.881886 -0.115625 -0.457064
+-0.027355 1.597562 -1.303593 -0.913125 -0.093622 -0.396784
+-0.022081 1.597562 -1.324929 -0.962630 -0.159597 -0.218798
+-0.011751 1.520020 -1.313816 -0.905427 -0.107635 -0.410629
+-0.027835 1.595557 -1.298151 -0.993500 -0.112701 -0.016025
+-0.023238 1.519814 -1.297900 -0.997698 -0.060653 -0.030337
+-0.012708 1.519996 -1.281267 -0.919986 -0.099463 0.379121
+-0.022081 1.597562 -1.270444 -0.966419 -0.146262 0.211284
+-0.000372 1.570149 -1.339127 -0.419283 -0.134836 -0.897787
+-0.000349 1.475675 -1.324949 -0.441896 -0.140130 -0.886054
+-0.023519 1.567919 -1.327982 -0.753918 -0.146544 -0.640416
+-0.015475 1.475798 -1.316933 -0.777534 -0.141386 -0.612740
+-0.021517 1.476234 -1.293880 -0.947128 -0.129819 -0.293422
+-0.034451 1.570149 -1.298699 -0.930466 -0.145400 -0.336291
+-0.027068 1.570149 -1.329074 -0.967620 -0.146678 -0.205421
+-0.015223 1.476312 -1.317866 -0.927524 -0.105642 -0.358523
+-0.033316 1.567919 -1.298051 -0.994028 -0.109005 -0.005130
+-0.026855 1.475798 -1.297816 -0.997387 -0.069998 -0.017869
+-0.015913 1.476233 -1.277305 -0.932470 -0.098339 0.347606
+-0.027068 1.570149 -1.268926 -0.966746 -0.134247 0.217669
+-0.015475 1.442679 -1.316933 -0.957201 -0.149107 -0.248061
+-0.021517 1.443114 -1.293880 -0.949138 -0.158748 -0.271913
+-0.025818 1.534800 -1.332395 -0.949138 -0.158748 -0.271913
+-0.036751 1.537030 -1.298880 -0.940385 -0.168274 -0.295568
+-0.000372 1.537030 -1.344853 -0.418642 -0.187317 -0.888623
+-0.000349 1.442555 -1.324949 -0.439623 -0.192202 -0.877377
+-0.025818 1.534800 -1.332395 -0.439623 -0.192202 -0.877377
+-0.015475 1.442679 -1.316933 -0.460344 -0.196974 -0.865612
+-0.029367 1.537029 -1.333645 -0.967483 -0.176324 -0.181345
+-0.015223 1.443193 -1.317866 -0.928580 -0.132019 -0.346858
+-0.035616 1.534799 -1.298138 -0.990634 -0.136435 -0.005446
+-0.026855 1.442678 -1.297816 -0.995344 -0.094723 -0.017856
+-0.015913 1.443114 -1.277305 -0.933855 -0.124500 0.335282
+-0.029367 1.537029 -1.264803 -0.967490 -0.164206 0.192351
+-0.032987 1.500012 -1.334286 -0.971131 -0.154903 -0.181408
+-0.018732 1.392114 -1.318464 -0.947302 -0.128622 -0.293385
+-0.039357 1.497572 -1.298102 -0.991493 -0.129558 -0.012494
+-0.027913 1.392711 -1.297786 -0.993594 -0.108531 -0.031485
+-0.020142 1.392485 -1.276685 -0.955806 -0.120075 0.268359
+-0.032987 1.500012 -1.264132 -0.971548 -0.138489 0.192131
+-0.018579 1.392219 -1.318616 -0.896096 -0.144712 -0.419607
+-0.028506 1.392485 -1.297508 -0.912112 -0.132628 -0.387893
+-0.027067 1.497572 -1.336823 -0.912112 -0.132628 -0.387893
+-0.039525 1.500012 -1.305181 -0.926844 -0.120357 -0.355633
+-0.000403 1.500012 -1.349143 -0.398738 -0.181488 -0.898927
+-0.000351 1.392143 -1.327388 -0.412720 -0.184410 -0.891995
+-0.027067 1.497572 -1.336823 -0.412720 -0.184410 -0.891995
+-0.018579 1.392219 -1.318616 -0.426598 -0.187287 -0.884838
+-0.037113 1.457243 -1.333909 -0.964164 -0.190659 -0.184490
+-0.018732 1.349345 -1.318464 -0.941715 -0.164327 -0.293545
+-0.043483 1.454802 -1.298096 -0.985875 -0.167038 -0.012229
+-0.027913 1.349942 -1.297786 -0.988664 -0.146892 -0.031070
+-0.020142 1.349716 -1.276685 -0.950360 -0.156266 0.269068
+-0.037113 1.457243 -1.264473 -0.965051 -0.174518 0.195502
+-0.018579 1.349450 -1.318616 -0.891457 -0.177208 -0.417015
+-0.028506 1.349716 -1.297508 -0.907357 -0.166175 -0.386121
+-0.031193 1.454803 -1.336420 -0.907357 -0.166175 -0.386121
+-0.043651 1.457243 -1.305102 -0.922051 -0.154921 -0.354713
+-0.000403 1.457243 -1.349535 -0.372411 -0.186832 -0.909067
+-0.000351 1.349374 -1.327387 -0.399143 -0.193552 -0.896227
+-0.031193 1.454803 -1.336420 -0.399143 -0.193552 -0.896227
+-0.018579 1.349450 -1.318616 -0.425506 -0.200093 -0.882557
+-0.031963 1.414506 -1.332496 -0.954880 -0.131496 -0.266294
+-0.016837 1.279816 -1.320225 -0.916973 -0.104483 -0.385025
+-0.041210 1.411768 -1.297986 -0.994133 -0.106553 -0.018579
+-0.029808 1.280044 -1.297729 -0.995162 -0.086233 -0.047081
+-0.019007 1.279646 -1.274121 -0.932637 -0.093796 0.348412
+-0.031963 1.414506 -1.265585 -0.953357 -0.109396 0.281325
+-0.019341 1.278736 -1.320054 -0.905502 -0.136694 -0.401722
+-0.029357 1.278820 -1.297506 -0.898688 -0.140585 -0.415446
+-0.032102 1.411768 -1.336557 -0.898688 -0.140585 -0.415446
+-0.046819 1.414506 -1.306895 -0.891650 -0.144440 -0.429065
+-0.000345 1.414506 -1.349172 -0.356035 -0.132474 -0.925035
+-0.000345 1.279529 -1.329842 -0.402391 -0.142553 -0.904301
+-0.032102 1.411768 -1.336557 -0.402391 -0.142553 -0.904301
+-0.019341 1.278736 -1.320054 -0.447668 -0.152251 -0.881143
+-0.028212 1.325265 -1.328228 -0.952886 -0.064003 -0.296499
+-0.021185 1.189232 -1.321447 -0.933902 -0.051572 -0.353791
+-0.037459 1.322527 -1.297919 -0.998128 -0.056463 0.023495
+-0.032060 1.188684 -1.297206 -0.998460 -0.040072 0.038376
+-0.019151 1.190492 -1.273409 -0.915769 -0.053065 0.398185
+-0.028212 1.325265 -1.269463 -0.946438 -0.072841 0.314561
+-0.021388 1.189144 -1.321433 -0.912125 -0.078865 -0.402253
+-0.032032 1.188607 -1.297192 -0.892380 -0.089748 -0.442272
+-0.028351 1.322527 -1.331795 -0.892380 -0.089748 -0.442272
+-0.043068 1.325265 -1.305744 -0.870751 -0.100442 -0.481357
+-0.000345 1.325265 -1.341137 -0.309359 -0.071184 -0.948277
+-0.000345 1.188933 -1.330903 -0.359933 -0.081660 -0.929398
+-0.028351 1.322527 -1.331795 -0.359933 -0.081660 -0.929398
+-0.021388 1.189144 -1.321433 -0.409418 -0.091889 -0.907708
+0.000000 -1.276195 -0.555204 -1.000000 0.000044 0.000106
+0.000014 -1.250245 -0.434445 -1.000000 0.000025 0.000099
+0.000000 -1.188162 -0.591492 -1.000000 0.000021 0.000096
+0.000014 -1.159240 -0.439762 -1.000000 0.000007 0.000088
+0.000000 -1.063840 -0.611120 -1.000000 -0.000003 0.000086
+0.000014 -1.050621 -0.441716 -1.000000 -0.000011 0.000086
+0.000000 -0.987748 -0.589001 -1.000000 -0.000030 0.000089
+0.000014 -0.986598 -0.434334 -1.000000 -0.000033 0.000095
+0.000000 -0.931298 -0.554330 -1.000000 -0.000055 0.000098
+0.000014 -0.932663 -0.417662 -1.000000 -0.000050 0.000108
+0.000000 -0.882034 -0.516288 -1.000000 -0.000065 0.000115
+0.000014 -0.880610 -0.399948 -1.000000 -0.000059 0.000125
+0.000000 -0.820980 -0.477658 -1.000000 -0.000074 0.000130
+0.000014 -0.822789 -0.374273 -1.000000 -0.000072 0.000142
+0.000000 -0.743088 -0.427930 -1.000000 -0.000070 0.000150
+0.000014 -0.744348 -0.339557 -1.000000 -0.000057 0.000160
+0.000000 -0.682874 -0.406746 -1.000000 -0.000033 0.000152
+0.000014 -0.681405 -0.321842 -1.000000 -0.000039 0.000166
+0.000000 -0.520932 -0.408895 -1.000000 0.000011 0.000119
+0.000014 -0.518173 -0.291564 -1.000000 0.000006 0.000133
+0.000000 -0.433288 -0.424155 -1.000000 0.000034 0.000124
+0.000014 -0.422456 -0.316589 -1.000000 0.000040 0.000125
+0.000014 -0.340680 -0.343339 -1.000000 0.000049 0.000115
+0.000000 -0.365253 -0.450508 -1.000000 0.000051 0.000121
+0.000000 -0.278299 -0.498183 -1.000000 0.000038 0.000111
+0.000014 -0.278986 -0.368215 -1.000000 0.000022 0.000109
+0.000014 -0.182662 -0.379905 -1.000000 0.000017 0.000125
+0.000000 -0.181285 -0.504868 -1.000000 0.000008 0.000111
+0.000000 -0.002516 -0.511473 -1.000000 0.000018 0.000131
+0.000014 -0.003255 -0.418132 -1.000000 0.000032 0.000150
+-0.090468 -0.527023 -0.448803 -0.915722 -0.132316 0.379403
+-0.038948 -0.523525 -0.323235 -0.906733 -0.041819 0.419626
+-0.122302 -0.438939 -0.494918 -0.897874 -0.062103 0.435850
+-0.043792 -0.422016 -0.343618 -0.870977 0.054486 0.488293
+-0.044009 -0.342730 -0.376249 -0.808265 0.106176 0.579166
+-0.144772 -0.369612 -0.521974 -0.848424 0.023093 0.528814
+-0.163313 -0.268690 -0.540612 -0.792544 -0.007641 0.609766
+-0.049406 -0.273320 -0.399098 -0.751218 0.043022 0.658650
+-0.044787 -0.177356 -0.408909 -0.675643 0.215521 0.705023
+-0.173070 -0.171995 -0.533485 -0.778539 0.281322 0.561012
+0.000000 -0.002516 -0.511473 -0.700250 0.713833 0.009658
+-0.007276 -0.010464 -0.451574 -0.735097 0.562851 0.377931
+0.000000 -1.276185 -0.555181 -0.953738 -0.293920 0.063200
+-0.000071 -1.253767 -0.451994 -0.968818 -0.228921 0.094801
+-0.028426 -1.191990 -0.592592 -0.977115 -0.187074 0.101237
+-0.017762 -1.166412 -0.476638 -0.985726 -0.114760 0.123181
+-0.044876 -1.066191 -0.622134 -0.989850 -0.071612 0.122757
+-0.028477 -1.049551 -0.487267 -0.989857 -0.105042 0.095653
+-0.045709 -0.984544 -0.606913 -0.989511 -0.129959 0.063078
+-0.040666 -0.987166 -0.466243 -0.989128 -0.138085 0.050589
+-0.054009 -0.924554 -0.576160 -0.981705 -0.177060 0.070039
+-0.043304 -0.921943 -0.452843 -0.978345 -0.163908 0.126390
+-0.066690 -0.876854 -0.541092 -0.954227 -0.251133 0.162427
+-0.044857 -0.874260 -0.433364 -0.948194 -0.167567 0.269908
+-0.080293 -0.814336 -0.503604 -0.923417 -0.182051 0.337874
+-0.040422 -0.812548 -0.413537 -0.909730 -0.134698 0.392743
+-0.075641 -0.735415 -0.462425 -0.911591 -0.150866 0.382415
+-0.039930 -0.738402 -0.375737 -0.919840 -0.144710 0.364627
+-0.072233 -0.668912 -0.433957 -0.926843 -0.111684 0.358454
+-0.040244 -0.668088 -0.348705 -0.928134 -0.093480 0.360318
+-0.090468 -0.527023 -0.448803 -0.928048 -0.070966 0.365637
+-0.038948 -0.523525 -0.323235 -0.922983 -0.058735 0.380332
+-0.081137 0.746770 -1.310106 0.445926 0.283467 -0.848997
+-0.083203 0.776489 -1.299486 0.411560 0.292010 -0.863336
+-0.049248 0.745544 -1.293766 0.123347 0.417871 -0.900094
+-0.031367 0.777065 -1.277087 0.381269 0.254053 -0.888871
+-0.078983 0.672760 -1.329372 -0.479434 0.535854 -0.694985
+-0.060854 0.725216 -1.324017 -0.938781 0.308866 0.152618
+-0.229770 -0.368127 -0.574212 -0.518484 0.117324 0.847000
+-0.186971 -0.445619 -0.537279 -0.535712 0.129421 0.834424
+-0.144773 -0.369613 -0.521976 -0.535712 0.129421 0.834424
+-0.122304 -0.438939 -0.494920 -0.552618 0.141441 0.821345
+-0.348796 -0.704774 -0.000013 -0.000597 0.002011 0.999998
+-0.332202 -0.734652 0.000057 0.000868 0.001874 0.999998
+-0.349110 -0.655147 -0.000113 0.000217 0.000179 1.000000
+-0.335244 -0.615850 -0.000015 0.001307 -0.002955 0.999995
+-0.278199 -0.590617 -0.000015 0.000255 -0.001293 0.999999
+-0.222624 -0.608680 -0.000015 0.000000 0.000000 1.000000
+-0.200394 -0.636211 -0.000015 -0.000316 -0.000123 1.000000
+-0.189201 -0.700580 -0.000015 0.000000 0.000000 1.000000
+-0.208629 -0.741017 -0.000015 -0.000205 0.000287 1.000000
+-0.248955 -0.755402 -0.000014 -0.000273 0.000835 1.000000
+-0.272467 -0.735551 -0.000037 0.000378 0.000951 0.999999
+-0.295178 -0.752239 0.000018 0.001591 0.001131 0.999998
+-0.281603 -0.495410 -0.271164 0.295101 0.640769 0.708753
+-0.246942 -0.515169 -0.267732 0.357069 0.656451 0.664510
+-0.284307 -0.461224 -0.300945 0.357069 0.656451 0.664510
+-0.237075 -0.487034 -0.304912 0.416879 0.668166 0.616251
+-0.320785 -0.569750 -0.245758 -0.985638 -0.164017 -0.040210
+-0.316683 -0.593278 -0.250336 -0.960675 -0.272203 -0.054854
+-0.318454 -0.607310 -0.149689 -0.960675 -0.272203 -0.054854
+-0.309583 -0.628690 -0.151638 -0.923664 -0.376974 -0.068810
+-0.337312 -0.487621 -0.305082 -0.575286 0.620671 0.532741
+-0.284307 -0.461224 -0.300945 -0.453752 0.690854 0.562876
+-0.336212 -0.447832 -0.375617 -0.593563 0.683031 0.425619
+-0.287657 -0.420008 -0.357903 -0.560305 0.655029 0.506947
+-0.355280 -0.513678 -0.307759 -0.805873 0.273567 0.525100
+-0.383499 -0.505994 -0.385173 -0.776811 0.539922 0.324113
+-0.348767 -0.549903 -0.311345 -0.881100 -0.218222 0.419574
+-0.333531 -0.536521 -0.271928 -0.908451 0.090079 0.408169
+-0.321012 -0.513381 -0.269870 -0.591340 0.625468 0.509025
+-0.281603 -0.495410 -0.271164 -0.355068 0.741130 0.569784
+-0.343097 -0.581915 -0.315867 -0.798783 -0.482113 0.359879
+-0.328640 -0.560920 -0.275564 -0.926180 -0.213048 0.311129
+-0.320785 -0.569750 -0.245758 -0.958602 -0.199829 0.202854
+-0.325592 -0.544287 -0.241358 -0.968760 -0.007153 0.247898
+-0.314774 -0.524596 -0.238126 -0.739007 0.574149 0.352451
+-0.281356 -0.506819 -0.237638 -0.414281 0.845209 0.337629
+-0.316683 -0.593278 -0.250336 -0.852119 -0.505094 0.137014
+-0.324506 -0.588902 -0.280399 -0.863885 -0.438113 0.248517
+-0.319099 -0.611475 -0.323902 -0.598339 -0.744404 0.296400
+-0.332847 -0.626788 -0.381643 -0.641025 -0.693271 0.329335
+-0.367801 -0.587543 -0.383197 -0.715004 -0.624371 0.314532
+-0.276524 -0.635578 -0.326774 -0.439099 -0.852981 0.282161
+-0.307727 -0.608932 -0.283631 -0.611847 -0.777269 0.146615
+-0.276764 -0.624107 -0.286603 -0.362134 -0.932125 0.001411
+-0.302528 -0.611687 -0.254364 -0.597898 -0.801508 -0.010131
+-0.276524 -0.661972 -0.379310 -0.470268 -0.801589 0.369192
+-0.256416 -0.624547 -0.286227 0.018971 -0.994581 -0.102220
+-0.276371 -0.627443 -0.261753 -0.172149 -0.979258 -0.106862
+-0.258925 -0.626401 -0.262389 0.056872 -0.995820 -0.071464
+-0.376532 -0.549829 -0.385658 -0.947026 -0.210055 0.242939
+-0.383499 -0.505994 -0.385173 -0.969946 -0.096563 0.223341
+-0.402735 -0.560380 -0.492227 -0.970770 -0.117150 0.209479
+-0.405876 -0.495740 -0.495396 -0.967191 0.187757 0.171140
+-0.427755 -0.497838 -0.650739 -0.978649 0.136076 0.154044
+-0.436833 -0.575138 -0.660827 -0.959727 -0.194453 0.202761
+-0.391453 -0.418047 -0.607499 -0.684687 0.721762 0.101306
+-0.357320 -0.417054 -0.465251 -0.657338 0.736667 0.158836
+-0.398648 -0.657788 -0.643241 -0.887419 -0.414011 0.202686
+-0.387067 -0.602420 -0.479440 -0.906068 -0.352375 0.234248
+-0.367801 -0.587543 -0.383197 -0.952881 -0.206072 0.222603
+-0.325815 -0.384064 -0.553484 -0.502136 0.860629 0.084718
+-0.323346 -0.382968 -0.595645 -0.459747 0.887942 0.013822
+-0.405733 -0.421712 -0.714452 -0.461967 0.886344 0.031308
+-0.306654 -0.389007 -0.449769 -0.511117 0.848861 0.134884
+-0.347038 -0.652398 -0.457320 -0.805044 -0.512765 0.298289
+-0.352869 -0.722752 -0.593997 -0.837809 -0.482078 0.256274
+-0.229238 -0.751868 -0.513438 -0.419650 -0.735264 0.532242
+-0.294151 -0.787640 -0.616429 -0.503019 -0.714902 0.485681
+-0.188531 -0.803520 -0.548481 -0.442631 -0.719849 0.534691
+-0.271029 -0.828348 -0.649493 -0.433916 -0.715775 0.547159
+-0.294651 -0.747369 -0.556845 -0.463743 -0.725788 0.508109
+-0.352869 -0.722752 -0.593997 -0.600462 -0.685632 0.411526
+-0.368785 -0.778217 -0.725018 -0.622602 -0.690616 0.367989
+-0.233252 -0.732483 -0.490942 -0.414997 -0.724538 0.550292
+-0.130932 -0.873717 -0.601270 -0.422412 -0.722173 0.547755
+-0.218263 -0.890110 -0.686509 -0.424088 -0.703853 0.569860
+-0.318454 -0.607310 -0.149689 -0.964270 -0.136838 -0.226844
+-0.321219 -0.579032 -0.146115 -0.964789 0.263024 0.000291
+-0.320785 -0.569750 -0.245758 -0.990154 -0.138918 -0.017253
+-0.325592 -0.544287 -0.241358 -0.985428 0.140157 0.096375
+-0.303818 -0.553183 -0.141994 -0.656425 0.753346 0.039695
+-0.314774 -0.524596 -0.238126 -0.678045 0.683061 0.271446
+-0.309583 -0.628690 -0.151638 -0.812067 -0.463212 -0.354939
+-0.327569 -0.625240 -0.112006 -0.933819 -0.178188 -0.310212
+-0.314822 -0.657923 -0.112631 -0.722698 -0.491822 -0.485611
+-0.308093 -0.551433 -0.092604 -0.709991 0.685607 0.160797
+-0.330532 -0.589047 -0.108363 -0.966499 0.233573 -0.106407
+-0.294872 -0.646012 -0.153510 -0.589705 -0.722708 -0.360473
+-0.291509 -0.674280 -0.113187 -0.338451 -0.751045 -0.566906
+-0.279028 -0.540377 -0.138857 0.059338 0.990442 0.124513
+-0.279132 -0.529526 -0.087386 -0.031389 0.965129 0.259885
+-0.281356 -0.506819 -0.237638 0.235864 0.920775 0.310711
+-0.302528 -0.611687 -0.254364 -0.573314 -0.792544 -0.207809
+-0.273842 -0.653064 -0.155062 -0.146201 -0.918243 -0.368042
+-0.316683 -0.593278 -0.250336 -0.780230 -0.606145 -0.154368
+-0.249190 -0.549680 -0.142483 0.732826 0.679290 0.039130
+-0.251681 -0.526464 -0.238647 0.622102 0.732776 0.275731
+-0.336374 -0.647740 -0.079227 -0.935600 -0.135775 -0.325911
+-0.321164 -0.686016 -0.079581 -0.649956 -0.532114 -0.542598
+-0.314000 -0.565151 -0.068947 -0.625749 0.690597 0.362647
+-0.335166 -0.602167 -0.075203 -0.965446 0.260574 0.003913
+-0.247016 -0.552736 -0.092951 0.727882 0.684580 0.039206
+-0.242148 -0.565654 -0.068614 0.661515 0.654606 0.365908
+-0.278717 -0.556303 -0.063563 -0.047022 0.776609 0.628226
+-0.273588 -0.679387 -0.111205 0.016764 -0.818112 -0.574814
+-0.291303 -0.704382 -0.077706 -0.246287 -0.752975 -0.610223
+-0.274078 -0.706588 -0.077441 -0.006409 -0.821230 -0.570562
+-0.219397 -0.607375 -0.110780 0.961197 0.230352 -0.151786
+-0.214653 -0.617621 -0.076848 0.949442 0.311316 -0.040516
+-0.257647 -0.677363 -0.108988 0.168451 -0.780358 -0.602217
+-0.255760 -0.710602 -0.077899 -0.044986 -0.774366 -0.631137
+-0.222420 -0.652138 -0.114268 0.854221 -0.287278 -0.433333
+-0.229231 -0.598010 -0.149052 0.983470 0.174776 -0.047327
+-0.256660 -0.650004 -0.154840 0.245569 -0.888502 -0.387635
+-0.241496 -0.644234 -0.153820 0.521793 -0.776407 -0.353448
+-0.233185 -0.667982 -0.111233 0.455689 -0.655526 -0.602190
+-0.232306 -0.634170 -0.151996 0.866820 -0.420581 -0.267833
+-0.227821 -0.552386 -0.242999 0.892245 0.356757 0.276808
+-0.246942 -0.515169 -0.267732 0.650622 0.639985 0.408791
+-0.218390 -0.549998 -0.270212 0.853557 0.224824 0.469994
+-0.281603 -0.495410 -0.271164 0.484415 0.810796 0.328560
+-0.229813 -0.597061 -0.252879 0.961024 -0.250394 0.117200
+-0.220666 -0.594124 -0.278731 0.844691 -0.369260 0.387484
+-0.258925 -0.626401 -0.262389 0.384944 -0.914144 -0.127115
+-0.276371 -0.627443 -0.261753 -0.260287 -0.940223 -0.219617
+-0.239402 -0.611725 -0.258518 0.745425 -0.666586 0.002202
+-0.237075 -0.487034 -0.304912 0.633209 0.529518 0.564498
+-0.196859 -0.533913 -0.303928 0.871448 0.187364 0.453292
+-0.232977 -0.612466 -0.284542 0.609948 -0.719608 0.331854
+-0.198140 -0.597121 -0.314314 0.822572 -0.361696 0.438807
+-0.215880 -0.635772 -0.327812 0.621168 -0.631279 0.464367
+-0.256416 -0.624547 -0.286227 0.352859 -0.873855 0.334467
+-0.249547 -0.643542 -0.327400 0.207234 -0.874705 0.438115
+-0.346166 -0.674416 -0.040982 -0.948766 -0.158373 -0.273425
+-0.326741 -0.712820 -0.044831 -0.633953 -0.611138 -0.473934
+-0.318030 -0.594901 -0.032404 -0.625223 0.719749 0.301757
+-0.342440 -0.630348 -0.037392 -0.956823 0.287874 -0.040238
+-0.236572 -0.595298 -0.032914 0.584769 0.761518 0.279527
+-0.278297 -0.578394 -0.034141 0.004610 0.887172 0.461416
+-0.209417 -0.666078 -0.081436 0.915704 -0.174794 -0.361848
+-0.197789 -0.683783 -0.037944 0.963394 -0.097384 -0.249775
+-0.210457 -0.628753 -0.037344 0.921174 0.388789 -0.016785
+-0.292682 -0.727566 -0.046478 -0.093443 -0.857946 -0.505171
+-0.273287 -0.721296 -0.043570 0.002470 -0.912941 -0.408084
+-0.227787 -0.702231 -0.078069 0.470799 -0.629120 -0.618512
+-0.253455 -0.733264 -0.046138 -0.186049 -0.855983 -0.482367
+-0.218227 -0.725212 -0.045825 0.574979 -0.666158 -0.475008
+-0.224163 -0.441915 -0.371038 0.754452 0.517976 0.403117
+-0.178825 -0.521027 -0.378250 0.934769 0.233918 0.267376
+-0.179266 -0.601335 -0.377465 0.924076 -0.232110 0.303659
+-0.200532 -0.651395 -0.376826 0.852737 -0.357389 0.380938
+-0.132622 0.539817 -0.555258 0.631186 -0.710502 0.311111
+-0.200296 0.489186 -0.533589 0.646521 -0.689651 0.326177
+-0.116679 0.512235 -0.650594 0.646521 -0.689651 0.326177
+-0.196093 0.452835 -0.612980 0.661276 -0.668182 0.340951
+-0.220027 0.731594 -0.542794 0.160079 0.930343 0.329905
+-0.172011 0.723263 -0.542599 0.168303 0.913627 0.370081
+-0.228561 0.777364 -0.667726 0.076430 0.927313 0.366400
+-0.174726 0.772485 -0.655484 0.222638 0.893524 0.389933
+-0.112848 0.705254 -0.556160 0.333427 0.864054 0.377144
+-0.098672 0.741881 -0.649914 0.319832 0.865129 0.386341
+-0.323680 0.530277 0.000566 0.017633 -0.002622 0.999841
+-0.320365 0.485449 0.000390 0.004583 -0.000007 0.999990
+-0.307234 0.573768 0.000390 0.002514 -0.001265 0.999996
+-0.254878 0.617560 0.000566 -0.000530 -0.003385 0.999994
+-0.222234 0.612449 0.000566 -0.000616 -0.001679 0.999998
+-0.187262 0.606974 0.000566 0.000000 0.000000 1.000000
+-0.153742 0.557811 0.000566 -0.000472 -0.000128 1.000000
+-0.146152 0.501367 0.000566 0.000000 0.000000 1.000000
+-0.167233 0.459170 0.000566 0.000000 0.000000 1.000000
+-0.220789 0.442452 0.000566 0.000000 0.000000 1.000000
+-0.242179 0.466927 0.000566 -0.000985 0.000723 0.999999
+-0.269638 0.446302 0.000566 -0.001711 0.002278 0.999996
+-0.290254 0.638585 -0.489197 -0.939061 0.255295 0.230195
+-0.265205 0.675793 -0.482234 -0.861442 0.435406 0.261418
+-0.311358 0.632463 -0.562152 -0.941826 0.213494 0.259586
+-0.290660 0.682530 -0.558843 -0.881893 0.343219 0.323211
+-0.298894 0.585936 -0.492080 -0.966864 0.147248 0.208549
+-0.318289 0.563922 -0.566455 -0.967701 0.104323 0.229503
+-0.343117 0.533016 -0.669788 -0.969464 0.049683 0.240146
+-0.346101 0.613384 -0.684474 -0.962424 0.013824 0.271200
+-0.204691 0.525197 -0.474041 -0.349932 -0.812810 0.465711
+-0.257957 0.539113 -0.489777 -0.489493 -0.758511 0.430183
+-0.200296 0.489186 -0.533589 -0.368387 -0.828300 0.422149
+-0.266554 0.508384 -0.555996 -0.545675 -0.731967 0.408000
+-0.298894 0.585936 -0.492080 -0.711511 -0.599201 0.367028
+-0.318289 0.563922 -0.566455 -0.732297 -0.566630 0.377719
+-0.196093 0.452835 -0.612980 -0.344621 -0.848693 0.401195
+-0.291123 0.470982 -0.647226 -0.617888 -0.669140 0.412876
+-0.343117 0.533016 -0.669788 -0.777430 -0.526405 0.344238
+-0.265205 0.675793 -0.482234 -0.851818 0.415093 0.319538
+-0.249918 0.703367 -0.477302 -0.714576 0.651282 0.255369
+-0.290660 0.682530 -0.558843 -0.842402 0.494610 0.213823
+-0.263180 0.713418 -0.550893 -0.634938 0.739909 0.222234
+-0.207105 0.724098 -0.466516 -0.438311 0.880652 0.179823
+-0.220027 0.731594 -0.542794 -0.426874 0.862032 0.273274
+-0.310846 0.688865 -0.685292 -0.847324 0.498279 0.183740
+-0.275723 0.755235 -0.676234 -0.605431 0.733184 0.309669
+-0.311358 0.632463 -0.562152 -0.909765 0.362764 0.201818
+-0.346101 0.613384 -0.684474 -0.902014 0.391092 0.182806
+-0.228561 0.777364 -0.667726 -0.449092 0.828611 0.334246
+-0.343043 0.675234 -1.105304 -0.938880 0.319155 -0.129015
+-0.362855 0.685884 -0.934781 -0.913680 0.398231 -0.081250
+-0.315812 0.762780 -1.086902 -0.869631 0.488062 -0.074413
+-0.310224 0.786234 -0.897805 -0.764913 0.643963 -0.014852
+-0.257483 0.826472 -0.861991 -0.626019 0.778367 0.047383
+-0.251929 0.841469 -1.034970 -0.694724 0.719255 -0.005620
+-0.261987 0.648849 -0.326739 -0.946754 0.321871 0.007470
+-0.270736 0.619210 -0.325093 -0.993302 -0.076628 -0.086480
+-0.277107 0.594368 -0.159115 -0.981739 0.189928 -0.010783
+-0.277643 0.564086 -0.163536 -0.877110 -0.451148 -0.164754
+-0.250399 0.586577 -0.324189 -0.730983 -0.647758 -0.214647
+-0.249859 0.543077 -0.169297 -0.617018 -0.758195 -0.210781
+-0.268234 0.627424 -0.156155 -0.940031 0.340985 0.008402
+-0.246793 0.681763 -0.328611 -0.907333 0.419960 0.019518
+-0.200959 0.732715 -0.338152 0.344317 0.888662 0.302861
+-0.178600 0.713752 -0.333697 0.707089 0.669979 0.226170
+-0.201002 0.752380 -0.409530 0.622245 0.756445 0.201501
+-0.175497 0.729689 -0.405860 0.636694 0.746755 0.192296
+-0.209338 0.666894 -0.151392 0.152521 0.983757 0.094657
+-0.191454 0.652899 -0.149048 0.724706 0.670027 0.160826
+-0.162211 0.681140 -0.329839 0.851311 0.489729 0.188245
+-0.166089 0.620852 -0.155459 0.955757 0.270962 0.114493
+-0.232782 0.708077 -0.332184 -0.606781 0.762968 0.222927
+-0.231067 0.660079 -0.153241 -0.563940 0.824753 0.041896
+-0.169900 0.585220 -0.162331 0.969582 -0.244134 -0.017570
+-0.142688 0.649372 -0.328296 0.984903 0.090463 0.147591
+-0.208967 0.676069 -0.095824 0.055528 0.969037 0.240589
+-0.232840 0.663758 -0.096986 -0.551264 0.802744 0.227398
+-0.163027 0.600441 -0.111351 0.967581 0.251607 -0.021942
+-0.190077 0.655760 -0.095630 0.759240 0.633512 0.149056
+-0.168712 0.566050 -0.116333 0.963247 -0.206105 -0.172268
+-0.268234 0.627424 -0.156155 -0.779247 0.626716 -0.000897
+-0.277154 0.615199 -0.111693 -0.881456 0.469913 -0.047097
+-0.182677 0.552369 -0.164101 0.733596 -0.659658 -0.163365
+-0.182943 0.532746 -0.120103 0.813599 -0.485663 -0.319670
+-0.277107 0.594368 -0.159115 -0.979744 0.164337 -0.114435
+-0.284402 0.576404 -0.112761 -0.981846 0.080977 -0.171527
+-0.148225 0.609419 -0.328049 0.907863 -0.418357 0.027601
+-0.176281 0.581040 -0.325084 0.388035 -0.920868 -0.037831
+-0.210195 0.534058 -0.169644 0.168253 -0.938514 -0.301466
+-0.246793 0.681763 -0.328611 -0.773461 0.616886 0.145635
+-0.282348 0.545361 -0.119478 -0.858267 -0.381324 -0.343467
+-0.291826 0.566355 -0.081698 -0.943022 0.066719 -0.325972
+-0.289658 0.521276 -0.087188 -0.794586 -0.339978 -0.503038
+-0.209317 0.654582 -0.075414 0.131693 0.798140 0.587903
+-0.188509 0.645758 -0.076114 0.646319 0.645050 0.407654
+-0.159072 0.588271 -0.082848 0.987454 0.156213 -0.023077
+-0.179070 0.506104 -0.086362 0.688299 -0.537697 -0.486957
+-0.214153 0.515186 -0.127241 0.298675 -0.823383 -0.482529
+-0.218592 0.488978 -0.091478 -0.066934 -0.815191 -0.575311
+-0.251436 0.524118 -0.128080 -0.330094 -0.794556 -0.509626
+-0.254084 0.492429 -0.091707 -0.134532 -0.781063 -0.609788
+-0.235307 0.654334 -0.079683 -0.412949 0.833299 0.367539
+-0.286406 0.610778 -0.079691 -0.862538 0.500875 -0.071781
+-0.217708 0.623680 -0.032393 0.131698 0.877330 0.461463
+-0.251605 0.623111 -0.036680 -0.312984 0.903742 0.292046
+-0.164135 0.553976 -0.084703 0.943223 -0.187405 -0.274243
+-0.171417 0.482939 -0.048275 0.655773 -0.618415 -0.433040
+-0.154307 0.520564 -0.045954 0.955808 -0.137070 -0.260084
+-0.214007 0.575025 -0.326258 -0.024474 -0.988320 -0.150418
+-0.210193 0.564010 -0.387937 0.212955 -0.965966 0.146829
+-0.167913 0.575845 -0.391086 0.275515 -0.954971 0.110096
+-0.229663 0.536460 -0.171279 -0.230602 -0.917616 -0.323735
+-0.236035 0.495774 -0.085419 -0.103317 -0.826566 -0.553275
+-0.232231 0.518961 -0.128260 -0.220660 -0.862413 -0.455580
+-0.239054 0.473485 -0.052529 -0.228490 -0.878628 -0.419292
+-0.223805 0.460757 -0.052471 -0.029678 -0.885961 -0.462808
+-0.155436 0.559053 -0.044730 0.973517 0.228114 0.015088
+-0.312485 0.544627 -0.044161 -0.954017 0.079391 -0.289048
+-0.306784 0.584437 -0.041477 -0.853713 0.518057 -0.052843
+-0.277643 0.564086 -0.163536 -0.939428 -0.256067 -0.227825
+-0.249859 0.543077 -0.169297 -0.468908 -0.810792 -0.350345
+-0.250399 0.586577 -0.324189 -0.314588 -0.913818 -0.256847
+-0.305828 0.503800 -0.050020 -0.806807 -0.390269 -0.443569
+-0.186751 0.612696 -0.034908 0.686088 0.684905 0.245333
+-0.260517 0.465220 -0.052600 -0.094624 -0.905016 -0.414720
+-0.196093 0.452835 -0.612980 -0.325392 -0.822011 0.467352
+-0.291123 0.470982 -0.647226 -0.335781 -0.828745 0.447697
+-0.193418 0.414036 -0.679360 -0.335781 -0.828745 0.447697
+-0.311188 0.429845 -0.743750 -0.345989 -0.835032 0.427800
+-0.172004 0.879637 -0.926179 0.368152 0.855541 0.364025
+-0.191441 0.840666 -0.814931 0.418558 0.867201 0.269763
+-0.087118 0.775469 -0.767209 0.418558 0.867201 0.269763
+-0.088868 0.769612 -0.732977 0.464125 0.868834 0.172382
+-0.298894 0.585936 -0.492080 -0.867895 -0.379133 0.320963
+-0.270736 0.608116 -0.391070 -0.972824 -0.110129 0.203679
+-0.290254 0.638585 -0.489197 -0.911075 0.324458 0.254301
+-0.260287 0.642322 -0.394408 -0.935795 0.340539 0.091223
+-0.257957 0.539113 -0.489777 -0.542537 -0.760777 0.356191
+-0.244685 0.577869 -0.386784 -0.577162 -0.783782 0.229282
+-0.270736 0.619210 -0.325093 -0.985754 -0.168190 0.001202
+-0.261987 0.648849 -0.326739 -0.941232 0.336102 -0.033426
+-0.210193 0.564010 -0.387937 -0.150059 -0.934180 0.323712
+-0.214007 0.575025 -0.326258 -0.330505 -0.935682 0.123553
+-0.250399 0.586577 -0.324189 -0.611077 -0.789721 0.054081
+-0.204691 0.525197 -0.474041 0.237215 -0.885861 0.398722
+-0.167913 0.575845 -0.391086 0.661453 -0.694204 0.283832
+-0.147059 0.559099 -0.487339 0.780024 -0.558246 0.282708
+-0.247846 0.680231 -0.398317 -0.944621 0.321992 0.063341
+-0.246793 0.681763 -0.328611 -0.919608 0.390427 0.043449
+-0.265205 0.675793 -0.482234 -0.900648 0.401839 0.165406
+-0.121016 0.612952 -0.489468 0.936852 -0.239404 0.254940
+-0.104151 0.602309 -0.560450 0.918303 -0.244381 0.311443
+-0.132622 0.539817 -0.555258 0.760375 -0.544014 0.354794
+-0.116559 0.653839 -0.489535 0.940656 0.180409 0.287436
+-0.095284 0.658244 -0.561410 0.953362 0.100333 0.284665
+-0.200296 0.489186 -0.533589 0.624292 -0.647209 0.437469
+-0.133645 0.691215 -0.483091 0.727684 0.652658 0.210983
+-0.112848 0.705254 -0.556160 0.811658 0.499399 0.303004
+-0.070740 0.591315 -0.644639 0.887658 -0.295146 0.353486
+-0.116679 0.512235 -0.650594 0.820442 -0.497786 0.281218
+-0.068726 0.667268 -0.647439 0.942332 0.070495 0.327170
+-0.098672 0.741881 -0.649914 0.896983 0.337925 0.285005
+-0.172382 0.715347 -0.474482 0.393029 0.915956 -0.080951
+-0.175497 0.729689 -0.405860 0.821381 0.568537 0.045802
+-0.161990 0.688799 -0.401702 0.896024 0.410572 0.169034
+-0.142612 0.617588 -0.398601 0.926191 -0.332450 0.177897
+-0.162211 0.681140 -0.329839 0.896746 0.435535 0.078462
+-0.178600 0.713752 -0.333697 0.878172 0.457748 0.138854
+-0.148225 0.609419 -0.328049 0.951952 -0.305447 0.022131
+-0.176281 0.581040 -0.325084 0.793080 -0.605957 0.061968
+-0.238095 0.715785 -0.403665 -0.795187 0.604607 0.046127
+-0.232782 0.708077 -0.332184 -0.747677 0.652022 0.125882
+-0.249918 0.703367 -0.477302 -0.683822 0.729529 -0.013233
+-0.201002 0.752380 -0.409530 -0.186917 0.961127 -0.203217
+-0.207105 0.724098 -0.466516 -0.207100 0.956100 -0.207322
+-0.200959 0.732715 -0.338152 -0.633555 0.756177 0.163718
+-0.141864 0.649581 -0.398320 0.979702 0.152465 0.130150
+-0.142688 0.649372 -0.328296 0.954874 0.295635 0.028557
+-0.220027 0.731594 -0.542794 0.212582 0.973587 0.083285
+-0.172011 0.723263 -0.542599 0.355089 0.920346 0.163935
+-0.315181 -0.764996 -1.175598 -0.815775 -0.424816 -0.392483
+-0.250557 -0.893329 -1.103714 -0.803406 -0.527391 -0.276402
+-0.378254 -0.754824 -1.055511 -0.821280 -0.444724 -0.357379
+-0.298690 -0.872468 -0.981866 -0.851079 -0.491762 -0.183944
+-0.352477 -0.606807 -1.199774 -0.878490 -0.167214 -0.447543
+-0.417389 -0.603646 -1.074460 -0.895260 -0.038631 -0.443866
+-0.335016 -0.477144 -1.219440 -0.893182 0.127510 -0.431238
+-0.412246 -0.462044 -1.047188 -0.879460 0.144002 -0.453667
+-0.241454 -0.975757 -1.025889 -0.890920 -0.417457 -0.178860
+-0.261458 -0.950653 -0.936834 -0.884755 -0.460950 -0.068800
+-0.317998 -0.316945 -1.171010 -0.869610 0.082195 -0.486849
+-0.397077 -0.294104 -1.040035 -0.871306 0.011498 -0.490605
+-0.333440 -0.148889 -1.169196 -0.889200 -0.028833 -0.456610
+-0.390117 -0.124181 -1.050900 -0.898057 -0.023551 -0.439248
+-0.334864 -0.008152 -1.173440 -0.891275 0.008762 -0.453379
+-0.392133 0.008478 -1.063792 -0.882833 0.053350 -0.466648
+-0.316565 0.155535 -1.170591 -0.872609 0.174304 -0.456259
+-0.372005 0.173291 -1.062321 -0.861339 0.188147 -0.471907
+-0.284178 0.314571 -1.157604 -0.888441 0.214082 -0.406006
+-0.328173 0.316278 -1.060432 -0.938331 0.145317 -0.313718
+-0.360061 0.306779 -0.937631 -0.966075 0.083456 -0.244407
+-0.332474 0.404321 -1.013368 -0.974994 -0.078659 -0.207845
+-0.341636 0.537693 -1.091500 -0.950636 -0.202863 -0.234814
+-0.346506 0.444275 -0.970240 -0.972649 -0.163481 -0.165008
+-0.314782 0.525202 -1.163291 -0.970901 -0.117034 -0.208936
+-0.110497 0.357001 -0.628471 -0.447278 0.593106 0.669453
+-0.042466 0.462186 -0.676207 -0.497101 0.610396 0.616691
+-0.219224 0.341114 -0.687039 -0.502465 0.686552 0.525524
+-0.193934 0.374098 -0.718043 -0.366712 0.334615 0.868076
+-0.073671 0.464847 -0.696580 -0.166169 0.018769 0.985919
+-0.194984 0.389910 -0.710710 0.207110 -0.398499 0.893479
+-0.091850 0.479491 -0.699313 0.268173 -0.319429 0.908872
+-0.193418 0.414036 -0.679360 0.528243 -0.542678 0.653039
+-0.103255 0.494590 -0.692424 0.572878 -0.511102 0.640770
+-0.196093 0.452835 -0.612980 0.651498 -0.621930 0.434458
+-0.116679 0.512235 -0.650594 0.661077 -0.591483 0.461655
+-0.390662 -0.263803 -0.714595 -0.797753 -0.165857 0.579726
+-0.348259 -0.357136 -0.682947 -0.719696 0.083717 0.689224
+-0.305341 -0.258291 -0.595609 -0.527067 -0.157949 0.835016
+-0.229770 -0.368127 -0.574212 -0.554491 0.095730 0.826665
+-0.163313 -0.268688 -0.540615 -0.419909 -0.038148 0.906764
+-0.144773 -0.369613 -0.521976 -0.521828 0.061276 0.850847
+-0.334028 -0.151073 -0.594810 -0.403515 -0.038496 0.914163
+-0.173069 -0.171989 -0.533491 -0.365032 -0.094207 0.926216
+-0.338005 -0.375625 -0.651199 -0.270600 0.744981 0.609737
+-0.186971 -0.445619 -0.537279 0.098541 0.893629 0.437855
+-0.181052 0.003963 -0.522829 -0.456972 0.118555 0.881545
+-0.337591 0.012575 -0.608417 -0.466021 0.166046 0.869053
+-0.157486 0.215574 -0.562074 -0.482482 0.411264 0.773352
+-0.317899 0.220593 -0.663393 -0.476817 0.333328 0.813350
+-0.210664 -0.440016 -0.501884 0.385861 0.915372 0.114913
+-0.323346 -0.382968 -0.595645 0.403543 0.913281 0.055409
+-0.210983 -0.443751 -0.483240 0.359252 0.913856 0.189222
+-0.325815 -0.384064 -0.553484 0.390282 0.912971 0.119016
+-0.110497 0.357001 -0.628471 -0.466506 0.498142 0.730908
+-0.219224 0.341114 -0.687039 -0.457127 0.504388 0.732549
+-0.115223 0.870956 -1.200244 0.179302 0.786878 -0.590486
+0.000000 0.842631 -1.203002 0.225651 0.750493 -0.621162
+-0.085151 0.801816 -1.283248 0.279787 0.639435 -0.716130
+0.000000 0.798667 -1.251145 0.354642 0.524684 -0.773909
+-0.083203 0.776489 -1.299486 0.332154 0.527060 -0.782228
+-0.031367 0.777065 -1.277087 0.399787 0.391974 -0.828569
+-0.049248 0.745544 -1.293766 -0.818083 0.109453 0.564589
+0.000000 0.777615 -1.259705 0.398388 0.409297 -0.820831
+0.000000 0.812923 -1.255352 -0.522462 -0.100835 0.846679
+-0.029112 0.812922 -1.273484 -0.877684 0.066770 0.474566
+-0.060854 0.725216 -1.324017 -0.831265 0.226921 -0.507450
+-0.039245 0.812922 -1.297518 -0.991059 0.117941 -0.062386
+-0.035195 0.911391 -1.297518 -0.999039 0.031398 0.030593
+-0.025062 0.911391 -1.323454 -0.931567 0.031723 -0.362183
+-0.027126 0.812922 -1.328997 -0.809499 0.173340 -0.560950
+-0.022481 0.911391 -1.271582 -0.908468 0.017601 0.417583
+-0.078983 0.672760 -1.329372 -0.157720 0.033444 -0.986917
+-0.038019 0.674176 -1.342370 -0.230371 0.013315 -0.973012
+-0.028482 0.725216 -1.340985 -0.251015 0.080787 -0.964606
+-0.093267 0.537123 -1.340819 0.004371 -0.013449 -0.999900
+0.000000 0.531584 -1.328178 -0.012186 -0.037851 -0.999209
+0.000000 0.675576 -1.343699 -0.028875 -0.009963 -0.999533
+0.000000 0.376398 -1.337871 -0.064365 -0.055625 -0.996375
+-0.108528 0.360089 -1.304915 -0.262863 -0.169957 -0.949746
+-0.033976 0.991295 -1.297518 -0.987457 0.005385 0.157797
+-0.023843 0.991295 -1.322813 -0.929756 0.015644 -0.367844
+-0.023843 0.991295 -1.272223 -0.928210 -0.012839 0.371835
+0.000000 0.725216 -1.341540 -0.019464 0.043444 -0.998866
+-0.335016 -0.477144 -1.219440 -0.819375 0.142017 -0.555388
+-0.219620 -0.509012 -1.385795 -0.808235 0.043899 -0.587221
+-0.352477 -0.606807 -1.199774 -0.808999 -0.100696 -0.579121
+-0.215624 -0.638821 -1.379687 -0.790148 -0.211487 -0.575274
+-0.317998 -0.316945 -1.171010 -0.865330 0.034616 -0.500006
+-0.236095 -0.336440 -1.315803 -0.841276 0.113538 -0.528549
+-0.333440 -0.148889 -1.169196 -0.858436 -0.032665 -0.511880
+-0.268996 -0.166749 -1.278754 -0.866841 -0.045564 -0.496498
+-0.315181 -0.764996 -1.175598 -0.777929 -0.288819 -0.558041
+-0.198746 -0.792401 -1.318974 -0.766625 -0.307155 -0.563863
+-0.334864 -0.008152 -1.173440 -0.846801 0.052789 -0.529283
+-0.276410 -0.024242 -1.265942 -0.849437 0.018228 -0.527375
+-0.316565 0.155535 -1.170591 -0.852650 0.104231 -0.511980
+-0.263580 0.140392 -1.261915 -0.844786 0.091364 -0.527246
+-0.121794 0.126862 -1.337687 -0.246268 0.158980 -0.956074
+-0.108528 0.360089 -1.304915 -0.276043 0.133725 -0.951797
+0.000000 0.123007 -1.369700 -0.255195 0.147876 -0.955515
+0.000000 0.376398 -1.337871 -0.304797 0.118702 -0.944991
+-0.126253 -0.069033 -1.371295 -0.220563 0.216683 -0.951000
+0.000000 -0.085812 -1.403213 -0.221652 0.287575 -0.931757
+0.000000 -0.212704 -1.457249 -0.247469 0.379611 -0.891434
+-0.121475 -0.199653 -1.417969 -0.219521 0.352173 -0.909827
+-0.337829 0.315369 -0.803507 -0.850165 0.515339 0.107916
+-0.360061 0.306779 -0.937631 -0.890382 0.448883 0.075663
+-0.372288 0.218413 -0.760127 -0.945523 0.285782 0.155933
+-0.409406 0.188720 -0.931537 -0.956010 0.276242 -0.098669
+-0.372005 0.173291 -1.062321 -0.941402 0.173709 -0.289116
+-0.437223 0.021572 -0.907435 -0.988816 0.111657 -0.098869
+-0.401509 0.019700 -0.719666 -0.966041 0.179835 0.185536
+-0.328173 0.316278 -1.060432 -0.911216 0.326521 -0.251138
+-0.392133 0.008478 -1.063792 -0.962224 0.006191 -0.272187
+-0.432499 -0.117936 -0.893081 -0.963614 -0.052087 -0.262174
+-0.303637 0.359237 -0.823789 -0.952544 0.269371 0.141769
+-0.332474 0.404321 -1.013368 -0.985989 -0.106311 0.128546
+-0.316694 0.395121 -0.826608 -0.949017 -0.302780 0.087693
+-0.346506 0.444275 -0.970240 -0.913033 -0.407720 0.011622
+-0.390117 -0.124181 -1.050900 -0.972651 -0.022315 -0.231197
+-0.423456 -0.279155 -0.891875 -0.979023 -0.028774 -0.201708
+-0.380000 0.479387 -0.850625 -0.897808 -0.421940 -0.126123
+-0.341636 0.537693 -1.091500 -0.964211 -0.153065 -0.216492
+-0.388560 0.573610 -0.906970 -0.992477 0.052210 -0.110745
+-0.311188 0.429845 -0.743750 -0.855672 -0.507549 0.101094
+-0.346101 0.613384 -0.684474 -0.927871 0.336971 0.159708
+-0.362855 0.685884 -0.934781 -0.931578 0.344951 0.114764
+-0.310846 0.688865 -0.685292 -0.885057 0.429536 0.179369
+-0.343043 0.675234 -1.105304 -0.979688 0.079572 -0.184064
+-0.397077 -0.294104 -1.040035 -0.989007 0.021149 -0.146348
+-0.414880 -0.360277 -0.913431 -0.988851 0.135698 -0.061317
+-0.275723 0.755235 -0.676234 -0.888209 0.419780 0.186733
+-0.310224 0.786234 -0.897805 -0.896302 0.398138 0.195266
+-0.412246 -0.462044 -1.047188 -0.969065 0.152795 -0.193820
+-0.445104 -0.474404 -0.928435 -0.986395 0.127519 -0.103751
+-0.396773 -0.408556 -0.803304 -0.943552 0.216978 0.250260
+-0.441108 -0.605236 -0.978452 -0.981078 -0.088849 -0.172025
+-0.449057 -0.493539 -0.787950 -0.995577 0.056793 -0.074842
+-0.421764 -0.731125 -0.935026 -0.884742 -0.461487 -0.065276
+-0.459976 -0.598947 -0.814650 -0.990811 -0.109190 -0.079816
+-0.430026 -0.707082 -0.805969 -0.894149 -0.447012 0.026035
+-0.378254 -0.754824 -1.055511 -0.893875 -0.384436 -0.230645
+-0.298690 -0.872468 -0.981866 -0.821463 -0.567337 -0.057680
+-0.327169 -0.847824 -0.782242 -0.806724 -0.590927 0.001551
+-0.417389 -0.603646 -1.074460 -0.968093 -0.042231 -0.247008
+-0.261458 -0.950653 -0.936834 -0.903943 -0.427626 0.004923
+-0.275470 -0.919913 -0.839500 -0.869645 -0.493164 -0.022512
+-0.368785 -0.778217 -0.725018 -0.807768 -0.585014 0.072594
+-0.075642 -0.735416 -0.462425 -0.416250 -0.370773 0.830219
+-0.080293 -0.814335 -0.503604 -0.337955 -0.491686 0.802516
+0.000000 -0.743096 -0.427930 -0.381979 -0.391794 0.837012
+0.000000 -0.820987 -0.477658 -0.302317 -0.511311 0.804466
+-0.066691 -0.876854 -0.541093 -0.330389 -0.537225 0.776036
+0.000000 -0.882034 -0.516286 -0.316538 -0.523597 0.790980
+-0.072233 -0.668912 -0.433957 -0.396984 -0.149820 0.905515
+0.000000 -0.682871 -0.406746 -0.373654 -0.148785 0.915558
+-0.090468 -0.527020 -0.448806 -0.405691 0.043407 0.912979
+0.000000 -0.520935 -0.408895 -0.378260 0.027933 0.925278
+0.000000 0.792848 -0.871132 0.565732 0.760235 0.319360
+0.000000 0.877127 -1.071758 0.490527 0.859384 0.144367
+-0.020074 0.802988 -0.859710 0.428814 0.834497 0.346025
+-0.055367 0.903845 -1.060557 0.364531 0.930132 0.044410
+0.000000 0.842631 -1.203002 0.302930 0.912640 -0.274450
+-0.115223 0.870956 -1.200244 0.219773 0.924376 -0.311815
+-0.059104 0.807325 -0.828836 0.239710 0.877346 0.415695
+-0.112552 0.899531 -1.004645 0.301415 0.876695 0.374906
+-0.172004 0.879637 -0.926179 0.174024 0.876340 0.449160
+-0.087118 0.775469 -0.767209 0.120160 0.858564 0.498427
+-0.401509 0.019700 -0.719666 -0.908055 0.121556 0.400824
+-0.437223 0.021572 -0.907435 -0.987194 0.018799 0.158414
+-0.408121 -0.129847 -0.708110 -0.938711 -0.021708 0.344021
+-0.432499 -0.117936 -0.893081 -0.986887 -0.069425 0.145720
+-0.337591 0.012575 -0.608417 -0.850899 0.134410 0.507843
+-0.372288 0.218413 -0.760127 -0.829738 0.301489 0.469722
+-0.317899 0.220593 -0.663393 -0.764895 0.434460 0.475583
+-0.390662 -0.263803 -0.714595 -0.926258 -0.182049 0.330007
+-0.334028 -0.151073 -0.594810 -0.825877 -0.108166 0.553378
+-0.337829 0.315369 -0.803507 -0.629975 0.631413 0.452160
+-0.219224 0.341114 -0.687039 -0.579738 0.686694 0.438583
+-0.423456 -0.279155 -0.891875 -0.955594 -0.193394 0.222347
+-0.193934 0.374098 -0.718043 -0.672829 0.416328 0.611532
+-0.303637 0.359237 -0.823789 -0.701341 0.041246 0.711631
+-0.194984 0.389910 -0.710710 -0.554804 -0.555641 0.619238
+-0.316694 0.395121 -0.826608 -0.584191 -0.559076 0.588350
+-0.348259 -0.357136 -0.682947 -0.958911 -0.049178 0.279411
+-0.414880 -0.360277 -0.913431 -0.959959 0.042531 0.276895
+-0.305341 -0.258291 -0.595609 -0.788843 -0.215351 0.575630
+-0.193418 0.414036 -0.679360 -0.407298 -0.713835 0.569691
+-0.311188 0.429845 -0.743750 -0.622061 -0.658307 0.423877
+-0.291123 0.470982 -0.647226 -0.772611 -0.510087 0.377998
+-0.343117 0.533016 -0.669788 -0.927233 -0.250812 0.278087
+-0.380000 0.479387 -0.850625 -0.936742 -0.233878 0.260414
+-0.338005 -0.375625 -0.651199 -0.800471 0.548383 0.241912
+-0.396773 -0.408556 -0.803304 -0.875754 0.459175 0.149045
+-0.346101 0.613384 -0.684474 -0.982202 -0.002148 0.187818
+-0.388560 0.573610 -0.906970 -0.981688 0.011891 0.190122
+-0.405733 -0.421712 -0.714452 -0.818859 0.561223 0.120410
+-0.323346 -0.382968 -0.595645 -0.702031 0.658062 0.272226
+-0.449057 -0.493539 -0.787950 -0.938921 0.329333 0.099838
+-0.445104 -0.474404 -0.928435 -0.846803 0.529708 0.048322
+-0.391453 -0.418047 -0.607499 -0.925918 0.360968 0.111256
+-0.427755 -0.497838 -0.650739 -0.948036 0.285030 0.141371
+-0.436833 -0.575138 -0.660827 -0.983238 -0.073300 0.166941
+-0.459976 -0.598947 -0.814650 -0.962050 -0.186536 0.199158
+-0.398648 -0.657788 -0.643241 -0.897694 -0.359380 0.254933
+-0.430026 -0.707082 -0.805969 -0.904548 -0.327091 0.273503
+-0.352869 -0.722752 -0.593997 -0.871680 -0.404266 0.277026
+-0.368785 -0.778217 -0.725018 -0.764334 -0.551206 0.334613
+-0.327169 -0.847824 -0.782242 -0.633309 -0.680950 0.367733
+-0.271029 -0.828348 -0.649493 -0.635327 -0.675748 0.373798
+-0.294151 -0.787640 -0.616429 -0.637302 -0.670499 0.379838
+0.000000 -0.365256 -0.450505 -0.446947 0.319956 0.835384
+0.000000 -0.278300 -0.498178 -0.305059 0.217029 0.927274
+-0.144773 -0.369613 -0.521976 -0.368333 0.261049 0.892292
+-0.163313 -0.268688 -0.540615 -0.219901 0.037023 0.974819
+0.000000 -0.181284 -0.504867 -0.192464 0.004644 0.981293
+-0.173069 -0.171989 -0.533491 -0.131365 -0.038782 0.990575
+0.000000 -0.002516 -0.511473 -0.106887 0.071547 0.991694
+-0.181052 0.003963 -0.522829 -0.060235 0.062843 0.996204
+0.000000 -0.433288 -0.424155 -0.463794 0.243990 0.851683
+-0.122304 -0.438939 -0.494920 -0.554788 0.176260 0.813107
+-0.186971 -0.445619 -0.537279 0.101080 0.481331 0.870691
+-0.131915 -0.528796 -0.497689 0.204651 0.359604 0.910386
+-0.090468 -0.527020 -0.448806 -0.617492 0.118765 0.777559
+-0.157486 0.215574 -0.562074 -0.112487 0.259472 0.959177
+0.000000 0.217662 -0.539160 -0.161664 0.334761 0.928332
+0.000000 -0.520935 -0.408895 -0.407447 0.156644 0.899694
+-0.210664 -0.440016 -0.501884 0.727881 0.627548 0.276355
+-0.148618 -0.528786 -0.462029 0.902718 0.316587 0.291330
+-0.153661 -0.526172 -0.447830 0.934071 0.297970 0.196789
+-0.210983 -0.443751 -0.483240 0.685123 0.726985 0.045823
+-0.130595 -0.640556 -0.478463 0.006278 0.005909 0.999963
+-0.152043 -0.627013 -0.461232 0.842566 -0.035257 0.537439
+-0.155519 -0.617108 -0.446525 0.934561 -0.123926 0.333524
+-0.325815 -0.384064 -0.553484 0.483472 0.874061 -0.047663
+-0.306654 -0.389007 -0.449769 0.229139 0.963390 0.139192
+-0.219295 -0.435004 -0.413224 0.640116 0.758326 0.123257
+-0.165710 -0.520333 -0.397867 0.887121 0.307598 0.344093
+-0.166063 -0.601729 -0.399052 0.898662 -0.166275 0.405906
+-0.166408 -0.689953 -0.448651 0.496847 -0.541910 0.677847
+-0.185062 -0.653566 -0.409151 0.657777 -0.579303 0.481391
+-0.233252 -0.732483 -0.490942 -0.086198 -0.834667 0.543968
+-0.236832 -0.696120 -0.429808 0.003363 -0.861538 0.507683
+-0.072233 -0.668912 -0.433957 -0.537361 -0.121704 0.834525
+-0.139670 -0.729077 -0.486843 -0.173515 -0.439191 0.881478
+-0.075642 -0.735416 -0.462425 -0.362020 -0.383035 0.849839
+-0.080293 -0.814335 -0.503604 -0.426080 -0.527517 0.734970
+-0.188531 -0.803520 -0.548481 -0.268564 -0.597053 0.755911
+0.000000 0.362368 -0.606042 -0.200478 0.411030 0.889305
+-0.110497 0.357001 -0.628471 -0.167369 0.434512 0.884978
+-0.066691 -0.876854 -0.541093 -0.584302 -0.554331 0.592712
+-0.130932 -0.873717 -0.601270 -0.506028 -0.610256 0.609527
+-0.054281 -0.924635 -0.576374 -0.576327 -0.577005 0.578716
+-0.106031 -0.926096 -0.629367 -0.573605 -0.579521 0.578906
+-0.357320 -0.417054 -0.465251 -0.691627 0.636928 0.340551
+-0.287657 -0.420008 -0.357903 0.086053 0.901619 0.423885
+-0.178825 -0.521027 -0.378250 0.829992 0.127880 0.542918
+-0.224163 -0.441915 -0.371038 0.612860 0.686851 0.390691
+-0.245371 -0.672412 -0.378741 0.067894 -0.899852 0.430878
+-0.276524 -0.661972 -0.379310 -0.351352 -0.855161 0.381119
+-0.286957 -0.682616 -0.438026 -0.407820 -0.813382 0.414840
+-0.332847 -0.626788 -0.381643 -0.578235 -0.732991 0.358284
+-0.347038 -0.652398 -0.457320 -0.627715 -0.689744 0.360869
+-0.367801 -0.587543 -0.383197 -0.856477 -0.398490 0.328106
+-0.387067 -0.602420 -0.479440 -0.806748 -0.537875 0.244639
+-0.294651 -0.747369 -0.556845 -0.462801 -0.770504 0.438337
+-0.352869 -0.722752 -0.593997 -0.560842 -0.726144 0.397707
+-0.336212 -0.447832 -0.375617 -0.661431 0.647690 0.378161
+-0.383499 -0.505994 -0.385173 -0.898800 0.299309 0.320271
+-0.405876 -0.495740 -0.495396 -0.865675 0.450800 0.217683
+-0.156180 -0.709903 -0.464735 0.464990 -0.387697 0.795911
+-0.200532 -0.651395 -0.376826 0.557172 -0.710295 0.430163
+-0.179266 -0.601335 -0.377465 0.839398 -0.169291 0.516481
+-0.376532 -0.549829 -0.385658 -0.923955 -0.180530 0.337220
+-0.355280 -0.513678 -0.307759 -0.926048 -0.175534 0.334100
+-0.249547 -0.643542 -0.327400 0.006909 -0.912306 0.409451
+-0.276524 -0.635578 -0.326774 -0.268915 -0.882415 0.386041
+-0.284307 -0.461224 -0.300945 0.445628 0.737497 0.507459
+-0.237075 -0.487034 -0.304912 0.408707 0.735574 0.540268
+-0.348767 -0.549903 -0.311345 -0.916553 -0.200258 0.346161
+-0.343097 -0.581915 -0.315867 -0.911775 -0.211246 0.352196
+-0.229238 -0.751868 -0.513438 -0.035081 -0.696553 0.716647
+-0.215880 -0.635772 -0.327812 0.214213 -0.909251 0.356897
+-0.256416 -0.624547 -0.286227 -0.027333 -0.909413 0.414994
+-0.276764 -0.624107 -0.286603 -0.148954 -0.927623 0.342532
+0.000428 1.612066 -1.276136 0.493065 -0.146496 0.857570
+0.000345 1.583852 -1.280908 0.513488 -0.157742 0.843474
+0.013389 1.611106 -1.283752 0.678651 -0.191055 0.709176
+0.007777 1.583781 -1.285707 0.694618 -0.192257 0.693213
+0.015212 1.583690 -1.297385 0.812292 -0.215496 0.541982
+0.020758 1.612066 -1.293943 0.799670 -0.223874 0.557143
+0.000373 1.597562 -1.262090 0.447737 -0.134622 0.883973
+0.000351 1.519087 -1.274030 0.481147 -0.142008 0.865061
+0.018613 1.595557 -1.271634 0.711096 -0.134457 0.690119
+0.012060 1.519814 -1.281023 0.699438 -0.147206 0.699369
+0.022072 1.519996 -1.297424 0.881890 -0.115628 0.457056
+0.027355 1.597562 -1.291280 0.913132 -0.093621 0.396767
+0.000372 1.570149 -1.255745 0.419314 -0.134843 0.897771
+0.000349 1.475675 -1.269924 0.441888 -0.140128 0.886058
+0.023519 1.567919 -1.266891 0.753916 -0.146542 0.640418
+0.015475 1.475798 -1.277939 0.777520 -0.141381 0.612759
+0.021517 1.476233 -1.300993 0.947129 -0.129816 0.293419
+0.034451 1.570149 -1.296174 0.930466 -0.145398 0.336291
+0.000372 1.537030 -1.250020 0.418642 -0.187317 0.888623
+0.000349 1.442555 -1.269924 0.439601 -0.192197 0.877389
+0.025818 1.534800 -1.262478 0.756189 -0.191097 0.625828
+0.015475 1.442679 -1.277939 0.772235 -0.188532 0.606720
+0.021517 1.443114 -1.300993 0.949139 -0.158746 0.271908
+0.036751 1.537030 -1.295993 0.940385 -0.168274 0.295568
+0.000403 1.500012 -1.245729 0.398737 -0.181496 0.898926
+0.000351 1.392143 -1.267485 0.412715 -0.184418 0.891996
+0.027067 1.497572 -1.258049 0.708700 -0.169626 0.684814
+0.018579 1.392218 -1.276257 0.700889 -0.175932 0.691233
+0.028506 1.392485 -1.297364 0.912112 -0.132628 0.387894
+0.039525 1.500012 -1.289692 0.926848 -0.120354 0.355624
+0.000403 1.457243 -1.245338 0.372382 -0.186826 0.909081
+0.000351 1.349374 -1.267485 0.399128 -0.193550 0.896234
+0.031193 1.454802 -1.258452 0.700251 -0.192814 0.687366
+0.018579 1.349450 -1.276256 0.697437 -0.199813 0.688227
+0.028506 1.349716 -1.297364 0.907360 -0.166174 0.386114
+0.043651 1.457243 -1.289771 0.922057 -0.154917 0.354699
+0.000345 1.414506 -1.245701 0.356010 -0.132468 0.925045
+0.000345 1.279529 -1.265030 0.402397 -0.142555 0.904298
+0.032102 1.411768 -1.258315 0.694165 -0.151028 0.703793
+0.019341 1.278736 -1.274819 0.717162 -0.153139 0.679873
+0.029357 1.278820 -1.297367 0.898691 -0.140586 0.415440
+0.046819 1.414506 -1.287978 0.891656 -0.144440 0.429054
+0.000345 1.325265 -1.253736 0.309360 -0.071177 0.948278
+0.000345 1.188933 -1.263969 0.359951 -0.081657 0.929391
+0.028351 1.322527 -1.263078 0.671463 -0.091894 0.735319
+0.021388 1.189144 -1.273440 0.707249 -0.091381 0.701034
+0.032032 1.188607 -1.297680 0.892376 -0.089747 0.442279
+0.043068 1.325265 -1.289129 0.870751 -0.100438 0.481357
+0.015267 1.583688 -1.297604 0.971576 -0.090469 -0.218758
+0.002626 1.584369 -1.305302 0.751851 -0.267424 -0.602665
+0.017630 1.611106 -1.298448 0.965615 -0.240432 -0.098892
+0.014435 1.611458 -1.309839 0.869418 -0.422035 -0.256900
+0.014435 1.612066 -1.284790 0.941569 -0.239253 0.237077
+0.007538 1.583853 -1.285870 0.903890 -0.149792 0.400681
+0.007777 1.583781 -1.309166 0.694602 -0.192230 -0.693236
+0.000345 1.583852 -1.313964 0.513472 -0.157733 -0.843485
+0.013389 1.611106 -1.311120 0.678652 -0.191047 -0.709177
+0.000428 1.612066 -1.318737 0.493111 -0.146522 -0.857539
+0.020758 1.612066 -1.300929 0.799670 -0.223874 -0.557143
+0.015212 1.583690 -1.297487 0.812304 -0.215487 -0.541967
+0.012060 1.519814 -1.313850 0.699438 -0.147197 -0.699370
+0.000351 1.519087 -1.320843 0.481166 -0.142001 -0.865052
+0.018613 1.595557 -1.323238 0.711100 -0.134451 -0.690115
+0.000373 1.597562 -1.332783 0.447776 -0.134619 -0.883954
+0.027355 1.597562 -1.303593 0.913125 -0.093622 -0.396784
+0.022072 1.519996 -1.297449 0.881886 -0.115625 -0.457064
+0.023238 1.519814 -1.297899 0.997699 -0.060653 -0.030308
+0.011751 1.520020 -1.313816 0.905433 -0.107639 -0.410615
+0.027835 1.595557 -1.298151 0.993500 -0.112701 -0.016012
+0.022081 1.597562 -1.324929 0.962630 -0.159597 -0.218798
+0.022081 1.597562 -1.270444 0.966419 -0.146262 0.211284
+0.012708 1.519996 -1.281267 0.919981 -0.099460 0.379134
+0.015475 1.475798 -1.316933 0.777534 -0.141386 -0.612740
+0.000349 1.475675 -1.324949 0.441896 -0.140130 -0.886054
+0.023519 1.567919 -1.327982 0.753918 -0.146544 -0.640416
+0.000372 1.570149 -1.339127 0.419283 -0.134836 -0.897787
+0.034451 1.570149 -1.298699 0.930466 -0.145400 -0.336291
+0.021517 1.476234 -1.293880 0.947128 -0.129819 -0.293422
+0.027068 1.570149 -1.268926 0.966746 -0.134247 0.217669
+0.015913 1.476233 -1.277305 0.932466 -0.098336 0.347616
+0.033316 1.567919 -1.298051 0.932466 -0.098336 0.347616
+0.026855 1.475798 -1.297815 0.880142 -0.060523 0.470836
+0.026855 1.475798 -1.297815 0.862645 -0.061789 -0.502022
+0.015223 1.476312 -1.317866 0.927527 -0.105644 -0.358516
+0.033316 1.567919 -1.298051 0.927527 -0.105644 -0.358516
+0.027068 1.570149 -1.329073 0.967619 -0.146676 -0.205427
+0.015475 1.442679 -1.316933 0.772246 -0.188537 -0.606704
+0.000349 1.442555 -1.324949 0.439623 -0.192202 -0.877377
+0.025818 1.534800 -1.332395 0.756195 -0.191099 -0.625820
+0.000372 1.537030 -1.344853 0.418642 -0.187317 -0.888623
+0.036751 1.537030 -1.298880 0.940385 -0.168274 -0.295568
+0.021517 1.443114 -1.293880 0.949138 -0.158748 -0.271913
+0.029367 1.537029 -1.264803 0.967490 -0.164206 0.192351
+0.015913 1.443114 -1.277305 0.933852 -0.124498 0.335291
+0.035616 1.534799 -1.298138 0.933852 -0.124498 0.335291
+0.026855 1.442678 -1.297815 0.878605 -0.081908 0.470473
+0.026855 1.442678 -1.297815 0.861021 -0.083645 -0.501644
+0.015223 1.443193 -1.317866 0.928583 -0.132021 -0.346850
+0.035616 1.534799 -1.298138 0.928583 -0.132021 -0.346850
+0.029367 1.537029 -1.333644 0.967483 -0.176323 -0.181350
+0.032987 1.500012 -1.264132 0.971548 -0.138489 0.192131
+0.020142 1.392485 -1.276685 0.955806 -0.120075 0.268359
+0.039357 1.497572 -1.298102 0.955806 -0.120075 0.268359
+0.027913 1.392711 -1.297786 0.933949 -0.100893 0.342871
+0.027913 1.392711 -1.297786 0.910403 -0.100566 -0.401314
+0.018732 1.392114 -1.318464 0.947302 -0.128622 -0.293385
+0.039357 1.497572 -1.298102 0.947302 -0.128622 -0.293385
+0.032987 1.500012 -1.334286 0.971131 -0.154903 -0.181408
+0.018579 1.392219 -1.318616 0.700881 -0.175928 -0.691241
+0.000351 1.392143 -1.327387 0.412700 -0.184414 -0.892004
+0.027067 1.497572 -1.336823 0.708700 -0.169623 -0.684816
+0.000403 1.500012 -1.349143 0.398737 -0.181496 -0.898926
+0.039524 1.500012 -1.305181 0.926854 -0.120348 -0.355609
+0.028506 1.392485 -1.297508 0.912118 -0.132623 -0.387881
+0.037113 1.457243 -1.264473 0.965049 -0.174518 0.195508
+0.020142 1.349716 -1.276685 0.950359 -0.156267 0.269071
+0.043483 1.454802 -1.298095 0.950359 -0.156267 0.269071
+0.027913 1.349942 -1.297786 0.930003 -0.137085 0.341030
+0.027913 1.349942 -1.297786 0.906940 -0.135841 -0.398758
+0.018732 1.349345 -1.318464 0.941716 -0.164325 -0.293543
+0.043483 1.454802 -1.298095 0.941716 -0.164325 -0.293543
+0.037113 1.457243 -1.333909 0.964165 -0.190659 -0.184485
+0.018579 1.349450 -1.318616 0.697437 -0.199811 -0.688228
+0.000351 1.349374 -1.327387 0.399143 -0.193552 -0.896227
+0.031193 1.454803 -1.336420 0.700258 -0.192812 -0.687358
+0.000403 1.457243 -1.349535 0.372411 -0.186832 -0.909067
+0.043650 1.457243 -1.305102 0.922062 -0.154912 -0.354689
+0.028506 1.349716 -1.297508 0.907363 -0.166170 -0.386109
+0.031963 1.414506 -1.265585 0.953354 -0.109396 0.281333
+0.019007 1.279646 -1.274121 0.932635 -0.093797 0.348416
+0.041210 1.411768 -1.297985 0.932635 -0.093797 0.348416
+0.029808 1.280044 -1.297729 0.907092 -0.077714 0.413697
+0.029808 1.280044 -1.297729 0.864135 -0.075766 -0.497523
+0.016836 1.279816 -1.320225 0.916967 -0.104484 -0.385037
+0.041210 1.411768 -1.297985 0.916967 -0.104484 -0.385037
+0.031963 1.414506 -1.332496 0.954881 -0.131503 -0.266287
+0.019341 1.278736 -1.320054 0.717148 -0.153134 -0.679888
+0.000345 1.279529 -1.329842 0.402391 -0.142553 -0.904301
+0.032102 1.411768 -1.336557 0.694161 -0.151026 -0.703798
+0.000345 1.414506 -1.349172 0.356035 -0.132474 -0.925035
+0.046819 1.414506 -1.306895 0.891650 -0.144440 -0.429065
+0.029357 1.278820 -1.297506 0.898688 -0.140585 -0.415446
+0.028212 1.325265 -1.269463 0.946438 -0.072841 0.314561
+0.019151 1.190492 -1.273409 0.915769 -0.053065 0.398185
+0.037459 1.322527 -1.297919 0.915769 -0.053065 0.398185
+0.032060 1.188684 -1.297206 0.877476 -0.032847 0.478494
+0.032060 1.188684 -1.297206 0.911371 -0.038946 -0.409740
+0.021185 1.189232 -1.321447 0.933902 -0.051572 -0.353791
+0.037459 1.322527 -1.297919 0.933902 -0.051572 -0.353791
+0.028212 1.325265 -1.328228 0.952886 -0.064003 -0.296499
+0.021388 1.189144 -1.321433 0.707241 -0.091381 -0.701042
+0.000345 1.188933 -1.330903 0.359933 -0.081660 -0.929398
+0.028351 1.322527 -1.331795 0.671458 -0.091897 -0.735323
+0.000345 1.325265 -1.341137 0.309359 -0.071184 -0.948277
+0.043068 1.325265 -1.305744 0.870751 -0.100442 -0.481357
+0.032032 1.188607 -1.297192 0.892380 -0.089748 -0.442272
+-0.000014 -1.159240 -0.439762 1.000000 0.000007 0.000088
+-0.000014 -1.250245 -0.434445 1.000000 0.000025 0.000099
+0.000000 -1.276195 -0.555204 1.000000 0.000044 0.000106
+-0.000014 -1.050621 -0.441716 1.000000 -0.000011 0.000086
+0.000000 -1.063839 -0.611120 1.000000 -0.000003 0.000086
+-0.000014 -0.986598 -0.434334 1.000000 -0.000033 0.000095
+0.000000 -0.987748 -0.589001 1.000000 -0.000030 0.000089
+-0.000014 -0.932663 -0.417662 1.000000 -0.000050 0.000108
+0.000000 -0.931298 -0.554330 1.000000 -0.000055 0.000098
+-0.000014 -0.880610 -0.399948 1.000000 -0.000059 0.000125
+-0.000014 -0.822789 -0.374273 1.000000 -0.000072 0.000142
+-0.000014 -0.744347 -0.339557 1.000000 -0.000057 0.000160
+0.000000 -0.743088 -0.427930 1.000000 -0.000070 0.000150
+-0.000014 -0.681405 -0.321841 1.000000 -0.000039 0.000166
+-0.000014 -0.518173 -0.291564 1.000000 0.000006 0.000133
+0.000000 -0.520932 -0.408895 1.000000 0.000011 0.000119
+-0.000014 -0.422456 -0.316589 1.000000 0.000040 0.000125
+-0.000014 -0.340680 -0.343338 1.000000 0.000049 0.000115
+-0.000014 -0.278986 -0.368215 1.000000 0.000022 0.000109
+0.000000 -0.278299 -0.498183 1.000000 0.000038 0.000111
+0.000000 -0.181284 -0.504868 1.000000 0.000008 0.000111
+-0.000014 -0.182662 -0.379905 1.000000 0.000019 0.000128
+-0.000015 -0.003255 -0.418132 1.000000 0.000040 0.000161
+0.044857 -0.874260 -0.433364 0.948194 -0.167564 0.269906
+0.043304 -0.921943 -0.452842 0.965449 -0.216312 0.145320
+0.066690 -0.876853 -0.541092 0.954229 -0.251129 0.162426
+0.054009 -0.924554 -0.576160 0.944508 -0.316291 0.088688
+0.040422 -0.812548 -0.413537 0.909731 -0.134698 0.392743
+0.080293 -0.814335 -0.503604 0.923417 -0.182051 0.337873
+0.039930 -0.738402 -0.375737 0.919840 -0.144710 0.364627
+0.075641 -0.735415 -0.462425 0.911591 -0.150867 0.382414
+0.040244 -0.668088 -0.348705 0.928134 -0.093480 0.360318
+0.072233 -0.668912 -0.433957 0.926843 -0.111684 0.358454
+0.038948 -0.523525 -0.323235 0.912381 -0.047487 0.406579
+0.090468 -0.527023 -0.448803 0.924361 -0.091460 0.370395
+0.043792 -0.422016 -0.343618 0.870977 0.054486 0.488293
+0.122302 -0.438939 -0.494918 0.897874 -0.062103 0.435850
+0.144772 -0.369612 -0.521974 0.848424 0.023093 0.528814
+0.044009 -0.342730 -0.376249 0.808265 0.106176 0.579166
+0.049406 -0.273320 -0.399098 0.751218 0.043022 0.658650
+0.163313 -0.268690 -0.540612 0.792544 -0.007641 0.609766
+0.173070 -0.171995 -0.533485 0.778539 0.281322 0.561012
+0.044787 -0.177356 -0.408909 0.675643 0.215521 0.705023
+0.007276 -0.010464 -0.451574 0.735097 0.562851 0.377931
+0.000000 -0.002516 -0.511473 0.700250 0.713833 0.009658
+0.017762 -1.166412 -0.476638 0.985727 -0.114764 0.123176
+0.000071 -1.253767 -0.451994 0.968819 -0.228917 0.094796
+0.028425 -1.191990 -0.592592 0.977116 -0.187075 0.101231
+0.000000 -1.276185 -0.555181 0.953741 -0.293911 0.063198
+0.028477 -1.049551 -0.487267 0.989857 -0.105042 0.095653
+0.044876 -1.066191 -0.622134 0.989850 -0.071615 0.122754
+0.040666 -0.987166 -0.466243 0.989127 -0.138086 0.050589
+0.045709 -0.984544 -0.606913 0.989511 -0.129959 0.063078
+0.043304 -0.921943 -0.452842 0.994457 -0.058212 0.087559
+0.054009 -0.924554 -0.576160 0.992553 -0.105932 0.060145
+-0.178546 -1.354269 -0.860294 -0.867690 -0.459636 0.189335
+-0.154545 -1.402559 -0.867532 -0.882287 -0.428250 0.195375
+-0.131543 -1.409096 -0.777987 -0.882287 -0.428250 0.195375
+-0.111758 -1.457935 -0.786106 -0.895794 -0.396335 0.201175
+-0.085409 -1.291375 -1.217723 0.056625 -0.109374 -0.992386
+-0.082624 -1.177560 -1.230108 0.046793 -0.063930 -0.996857
+-0.000017 -1.287914 -1.213232 0.052002 -0.112815 -0.992254
+-0.000017 -1.171195 -1.226909 -0.002241 -0.047014 -0.998892
+-0.063693 -1.084658 -1.226234 -0.049267 -0.129632 -0.990337
+0.000000 -1.086145 -1.231919 -0.135462 -0.291080 -0.947060
+-0.063837 -1.006457 -1.256372 -0.177770 -0.475488 -0.861574
+0.000000 -1.014367 -1.268361 -0.192482 -0.537709 -0.820866
+0.000000 -0.946150 -1.314178 -0.132503 -0.611708 -0.779908
+-0.077967 -0.944955 -1.301869 -0.170017 -0.616850 -0.768499
+0.000000 -0.850805 -1.401005 -0.166715 -0.586793 -0.792389
+-0.113353 -0.829547 -1.389298 -0.215967 -0.489613 -0.844771
+-0.117833 -0.677125 -1.452666 -0.283429 -0.242821 -0.927742
+0.000000 -0.694820 -1.481308 -0.237083 -0.344148 -0.908490
+-0.114572 -0.524305 -1.478219 -0.306719 0.040080 -0.950956
+0.000000 -0.533029 -1.515251 -0.293088 -0.072777 -0.953312
+0.000000 -0.361320 -1.491224 -0.297235 0.160851 -0.941158
+-0.108530 -0.355331 -1.455653 -0.292423 0.184591 -0.938304
+0.000000 -0.212704 -1.457249 -0.287521 0.208324 -0.934843
+-0.121475 -0.199653 -1.417969 -0.281357 0.203601 -0.937755
+-0.107905 -1.323799 -0.578042 -0.769640 0.004185 0.638464
+-0.096499 -1.343108 -0.564166 -0.738631 0.072852 0.670162
+-0.084009 -1.293200 -0.566737 -0.637960 0.197992 0.744182
+-0.079885 -1.324992 -0.553916 -0.665125 0.203467 0.718477
+-0.101609 -1.353245 -0.577932 -0.869459 -0.184191 0.458382
+-0.044418 -1.529981 -0.878195 -0.330139 -0.836287 -0.437758
+-0.032348 -1.573539 -0.787490 -0.491571 -0.802664 -0.337771
+-0.082070 -1.492716 -0.881297 -0.660635 -0.708678 -0.247662
+-0.062210 -1.548939 -0.790061 -0.710617 -0.665123 -0.229423
+-0.095632 -1.475422 -0.916070 -0.645849 -0.750170 -0.141858
+-0.043559 -1.502736 -0.920470 -0.298206 -0.855224 -0.423870
+-0.000017 -1.583737 -0.779092 -0.121621 -0.894308 -0.430606
+-0.000017 -1.537104 -0.870659 -0.056208 -0.858897 -0.509055
+-0.045074 -1.490148 -0.950779 -0.254260 -0.941268 -0.222187
+-0.000017 -1.507587 -0.917663 -0.067777 -0.897285 -0.436218
+-0.000017 -1.493131 -0.951213 -0.067606 -0.989312 -0.129191
+-0.048005 -1.490109 -0.980232 -0.263580 -0.960743 -0.086598
+-0.000017 -1.493460 -0.986184 -0.087438 -0.975216 -0.203245
+-0.091205 -1.508123 -0.790433 -0.874673 -0.484092 -0.024557
+-0.119248 -1.452959 -0.879041 -0.811978 -0.576072 -0.093985
+-0.130164 -1.431816 -0.909236 -0.798578 -0.590799 -0.115021
+-0.138662 -1.415715 -0.925182 -0.859668 -0.497242 -0.117140
+-0.108982 -1.462815 -0.939119 -0.648173 -0.761275 0.018214
+-0.147928 -1.405185 -0.938309 -0.797560 -0.577029 0.175886
+-0.115110 -1.457540 -0.963420 -0.645634 -0.763330 -0.021998
+-0.154545 -1.402559 -0.867532 -0.824668 -0.563234 -0.051862
+-0.111758 -1.457935 -0.786106 -0.874177 -0.483559 0.044562
+-0.112016 -1.455975 -0.988007 -0.607255 -0.779260 -0.154902
+-0.052771 -1.482106 -1.004878 -0.250142 -0.919604 -0.302915
+-0.145103 -1.397383 -0.918884 -0.770096 0.111358 -0.628134
+-0.161762 -1.386568 -0.896266 -0.881296 -0.274275 -0.384825
+-0.000017 -1.486275 -1.007160 -0.089176 -0.921451 -0.378122
+-0.068456 -1.451326 -1.066913 -0.180804 -0.889212 -0.420252
+-0.000017 -1.458554 -1.064723 -0.079705 -0.873026 -0.481116
+-0.122840 -1.432474 -1.061670 -0.546898 -0.817520 -0.180456
+-0.162523 -1.393819 -0.950832 -0.786727 -0.614684 0.056786
+-0.163461 -1.392704 -1.039889 -0.752078 -0.656759 -0.055186
+-0.144263 -1.389823 -0.917095 -0.903571 0.365726 -0.223167
+-0.156965 -1.380106 -0.899919 -0.641695 0.182320 -0.744974
+-0.125457 -1.349364 -0.914963 -0.870710 0.257242 -0.419156
+-0.174107 -1.349980 -0.894637 -0.384262 -0.057090 -0.921457
+-0.169497 -1.373555 -0.931681 -0.421288 0.148677 0.894657
+-0.082855 -1.405828 -1.147955 0.048645 -0.675449 -0.735800
+-0.000017 -1.402693 -1.142934 0.022659 -0.769241 -0.638556
+-0.085424 -1.351693 -1.181174 0.027622 -0.499785 -0.865709
+-0.000017 -1.351366 -1.180527 0.029415 -0.524705 -0.850776
+-0.085409 -1.291375 -1.217723 0.065841 -0.517113 -0.853381
+-0.000017 -1.287914 -1.213232 0.037201 -0.488114 -0.871987
+-0.082624 -1.177560 -1.230108 -0.180493 -0.011863 -0.983505
+-0.085409 -1.291375 -1.217723 -0.200059 -0.246003 -0.948398
+-0.149071 -1.182005 -1.217860 -0.229970 0.023361 -0.972917
+-0.147357 -1.283632 -1.206186 -0.203759 -0.374892 -0.904399
+-0.085424 -1.351693 -1.181174 -0.202893 -0.514604 -0.833077
+-0.148332 -1.343492 -1.172147 -0.187265 -0.517288 -0.835072
+-0.140970 -1.081044 -1.195292 -0.372095 -0.009922 -0.928141
+-0.063693 -1.084658 -1.226234 -0.343579 -0.069006 -0.936585
+-0.144250 -1.389224 -1.142150 -0.235064 -0.670845 -0.703358
+-0.082855 -1.405828 -1.147955 -0.285195 -0.773233 -0.566369
+-0.063837 -1.006457 -1.256372 -0.387685 -0.473576 -0.790839
+-0.155712 -1.010450 -1.208942 -0.456264 -0.366003 -0.811089
+-0.163891 -0.925097 -1.230911 -0.650326 -0.247203 -0.718308
+-0.077967 -0.944955 -1.301869 -0.511268 -0.440302 -0.738064
+-0.122840 -1.432474 -1.061670 -0.304072 -0.861373 -0.406912
+-0.068456 -1.451326 -1.066913 -0.333398 -0.846142 -0.415799
+-0.261846 -0.969024 -0.862849 -0.977584 -0.210522 0.003317
+-0.261458 -0.950653 -0.936834 -0.992233 -0.118960 -0.036354
+-0.241371 -1.101547 -0.904321 -0.990728 -0.135562 -0.008942
+-0.247114 -1.089240 -0.947537 -0.984172 -0.113856 0.135801
+-0.244854 -1.124264 -0.861905 -0.990560 -0.127662 -0.049939
+-0.255188 -0.984125 -0.812184 -0.979388 -0.165099 0.116371
+-0.240435 -1.032634 -0.777716 -0.949671 -0.015489 0.312866
+-0.250630 -1.151253 -0.812148 -0.974700 -0.221714 -0.028319
+-0.220599 -1.216669 -0.913999 -0.960564 -0.266809 0.078289
+-0.224201 -1.213435 -0.939482 -0.952355 -0.278603 0.124096
+-0.216420 -1.224037 -0.880489 -0.949111 -0.314905 0.004820
+-0.203675 -1.233119 -0.795930 -0.915994 -0.400457 -0.024277
+-0.231512 -1.201274 -0.999141 -0.967195 -0.248457 0.052952
+-0.216845 -1.256261 -1.004349 -0.920937 -0.258032 0.292051
+-0.204236 -1.276883 -0.942053 -0.953780 -0.214325 0.210638
+-0.217272 -1.235284 -0.685585 -0.907936 -0.215499 0.359461
+-0.244292 -1.167176 -0.753451 -0.976471 -0.188002 0.105638
+-0.201506 -1.208949 -0.656278 -0.569535 0.077234 0.818331
+-0.232620 -1.119921 -0.714247 -0.871979 0.123251 0.473774
+-0.171399 -1.036528 -0.683604 -0.584696 0.043687 0.810075
+-0.134118 -1.124052 -0.661652 -0.232562 0.244191 0.941427
+-0.161583 -1.276360 -0.634034 -0.487381 -0.000512 0.873189
+-0.164444 -1.289065 -0.635710 -0.661596 -0.068800 0.746698
+-0.198140 -1.282808 -0.684246 -0.924553 -0.301088 0.233554
+-0.163789 -1.303910 -0.634987 -0.798069 -0.119928 0.590511
+-0.181060 -1.327258 -0.684930 -0.939052 -0.336954 0.068144
+-0.160709 -1.327495 -0.631884 -0.896761 -0.116955 0.426780
+-0.154531 -1.380270 -0.678829 -0.914094 -0.403836 -0.036733
+-0.158370 -1.364142 -0.622466 -0.951998 -0.212476 0.220349
+-0.198039 -0.974045 -0.698088 -0.716782 -0.193601 0.669883
+-0.106031 -0.926096 -0.629367 -0.495336 -0.287782 0.819648
+-0.093126 -0.998740 -0.644095 -0.340258 -0.244532 0.907980
+-0.200161 -1.310606 -1.001052 -0.957672 -0.275651 0.082955
+-0.215271 -1.295989 -1.027565 -0.606594 -0.412564 0.679584
+-0.229336 -1.271132 -1.029667 -0.734767 -0.018310 0.678072
+-0.245808 -1.173403 -0.979229 -0.908634 -0.270341 0.318276
+-0.239201 -1.174720 -0.997346 -0.288648 -0.845641 -0.448970
+-0.249225 -1.146517 -0.975926 -0.660128 0.067145 0.748146
+-0.239283 -1.257875 -1.047984 -0.835930 0.338784 0.431795
+-0.239547 -1.236328 -1.048406 -0.959853 -0.051510 0.275735
+-0.244916 -1.193270 -1.045580 -0.968097 -0.117801 0.221159
+-0.236921 -1.166535 -1.012875 -0.665131 -0.731753 -0.148787
+-0.253992 -1.187852 -1.077022 -0.966157 -0.148761 0.210741
+-0.241466 -1.230007 -1.081590 -0.989961 -0.051495 0.131628
+-0.245983 -1.253788 -1.075521 -0.898110 0.436689 0.051965
+-0.246879 -1.260431 -1.101758 -0.882723 0.302516 -0.359560
+-0.248839 -1.231756 -1.114913 -0.978359 -0.205942 -0.020048
+-0.228445 -1.270773 -1.165832 -0.792560 -0.336179 -0.508756
+-0.236955 -1.282762 -1.116675 -0.676454 -0.124614 -0.725866
+-0.250852 -1.070818 -0.986752 -0.998474 -0.040943 -0.037068
+-0.241454 -0.975757 -1.025889 -0.966859 -0.000582 -0.255311
+-0.249772 -1.082750 -1.018378 -0.993759 -0.082886 -0.074647
+-0.233541 -1.041313 -1.070262 -0.932411 0.212150 -0.292577
+-0.246537 -1.119261 -0.985145 -0.827349 0.256709 0.499594
+-0.252712 -1.118911 -1.071416 -0.993537 0.092377 0.065965
+-0.243274 -1.109294 -1.101869 -0.894963 0.301347 -0.328985
+-0.238407 -1.125403 -1.004741 0.348237 0.935240 -0.063696
+-0.262511 -1.180367 -1.120451 -0.975502 0.051451 -0.213888
+-0.248637 -1.153758 -1.051702 -0.950077 0.052440 0.307576
+-0.234143 -1.139745 -1.016009 -0.915805 0.316765 0.246903
+-0.234969 -1.155538 -1.017211 0.975664 0.027166 -0.217580
+-0.275470 -0.919913 -0.839500 -0.922553 -0.363928 0.128270
+-0.194389 -1.019275 -1.135778 -0.866415 0.041205 -0.497621
+-0.212075 -1.089059 -1.151285 -0.698728 0.303937 -0.647612
+-0.250557 -0.893329 -1.103714 -0.843327 -0.350433 -0.407425
+-0.255500 -0.909942 -0.759849 -0.814856 -0.426005 0.393101
+-0.155712 -1.010450 -1.208942 -0.837623 -0.244515 -0.488466
+-0.140970 -1.081044 -1.195292 -0.669532 0.094537 -0.736742
+-0.163891 -0.925097 -1.230911 -0.734426 -0.467055 -0.492421
+-0.218263 -0.890110 -0.686509 -0.615625 -0.471258 0.631602
+-0.327169 -0.847824 -0.782242 -0.675776 -0.665229 0.317488
+-0.271029 -0.828348 -0.649493 -0.598535 -0.682106 0.420105
+-0.130932 -0.873717 -0.601270 -0.509345 -0.582123 0.633798
+-0.242521 -1.305722 -1.114672 0.077351 -0.116276 -0.990200
+-0.258017 -1.289274 -1.110665 -0.224347 0.416686 -0.880932
+-0.230654 -1.322045 -1.104962 0.240337 -0.640326 -0.729534
+-0.222890 -1.307619 -1.114574 -0.481846 -0.581925 -0.655124
+-0.226949 -1.332009 -1.085243 0.284837 -0.930449 -0.230506
+-0.210056 -1.325508 -1.096257 -0.415292 -0.858716 -0.300231
+-0.232821 -1.331807 -1.063047 0.189155 -0.920451 0.342039
+-0.203355 -1.329595 -1.068720 -0.520253 -0.847267 0.107126
+-0.242675 -1.323309 -1.050723 -0.101892 -0.611520 0.784641
+-0.205347 -1.318320 -1.042482 -0.520962 -0.723995 0.452139
+-0.254444 -1.304698 -1.046883 -0.440110 -0.146878 0.885850
+-0.266311 -1.288375 -1.056594 -0.681797 0.347352 0.643816
+-0.270016 -1.278411 -1.076313 -0.711866 0.683517 0.161403
+-0.267872 -1.280775 -1.098341 -0.565719 0.720670 -0.400745
+-0.256785 -1.119221 -0.988089 -0.575288 0.193387 0.794761
+-0.267289 -1.108005 -0.996575 -0.651366 -0.072583 0.755284
+-0.269348 -1.094962 -1.000723 0.117353 0.805793 0.580453
+-0.250012 -1.105224 -1.022424 0.751447 0.624333 -0.213392
+-0.258528 -1.145483 -0.981235 -0.854151 0.184101 0.486348
+-0.264614 -1.166326 -0.984473 -0.636881 0.204205 0.743427
+-0.265898 -1.184636 -1.016200 0.427101 -0.853580 -0.298305
+-0.248887 -1.170372 -1.033533 0.614129 -0.658716 -0.434670
+-0.241348 -1.130242 -1.036225 0.885540 0.201576 -0.418552
+-0.241888 -1.154453 -1.038826 0.822104 -0.195850 -0.534591
+-0.288607 -1.098594 -1.015810 -0.685822 -0.196972 0.700607
+-0.285797 -1.111916 -1.028553 -0.764529 -0.362401 0.533068
+-0.262797 -1.123355 -0.998651 -0.887227 -0.151528 0.435737
+-0.258653 -1.146065 -0.997343 -0.890717 0.173522 0.420135
+-0.269625 -1.163410 -0.996001 -0.795294 0.498973 0.344287
+-0.275683 -1.171798 -0.990842 -0.586428 0.687228 0.428743
+-0.232968 -1.184636 -1.172981 -0.651188 0.061298 -0.756437
+-0.155502 -1.236804 -0.630819 -0.403984 0.156546 0.901271
+-0.156683 -1.356212 -0.761539 -0.922868 -0.384271 -0.025511
+-0.190161 -1.294682 -0.840066 -0.941135 -0.308571 0.138017
+-0.131543 -1.409096 -0.777987 -0.911732 -0.367224 0.184094
+-0.178546 -1.354269 -0.860294 -0.937708 -0.340063 0.071141
+-0.190512 -1.297658 -0.930004 -0.885442 -0.293470 0.360371
+-0.208784 -1.327152 -0.949713 -0.948052 -0.216224 0.233333
+-0.198518 -1.333706 -0.937192 -0.549280 -0.175477 0.817006
+-0.135328 -1.430873 -0.717779 -0.948600 -0.309649 -0.065387
+-0.191302 -1.311910 -0.896540 -0.859385 -0.473499 -0.193020
+-0.179296 -1.351104 -0.883960 -0.870071 -0.332443 -0.363949
+-0.161762 -1.386568 -0.896266 -0.860235 -0.348552 -0.372167
+-0.154545 -1.402559 -0.867532 -0.896548 -0.442446 -0.021047
+-0.149071 -1.182005 -1.217860 -0.493224 0.138026 -0.858883
+-0.147357 -1.283632 -1.206186 -0.465484 -0.216427 -0.858187
+-0.207014 -1.323399 -1.147182 -0.743962 -0.554045 -0.373571
+-0.148332 -1.343492 -1.172147 -0.500834 -0.497080 -0.708574
+-0.156965 -1.380106 -0.899919 -0.487846 -0.126145 -0.863767
+-0.174107 -1.349980 -0.894637 -0.684042 -0.211820 -0.698011
+-0.175729 -1.319335 -0.902466 -0.616269 -0.555600 -0.558141
+-0.175126 -1.314950 -0.923527 -0.609416 -0.658318 0.441848
+-0.182817 -1.335078 -0.932330 -0.315557 -0.182188 0.931253
+-0.125457 -1.349364 -0.914963 -0.692898 -0.634970 0.341623
+-0.185049 -1.368596 -1.120970 -0.745293 -0.627753 -0.224642
+-0.144250 -1.389224 -1.142150 -0.581523 -0.655628 -0.481646
+-0.184522 -1.353751 -1.012516 -0.913976 -0.404285 -0.034674
+-0.187929 -1.370655 -0.952735 -0.829033 -0.557353 -0.045423
+-0.183277 -1.375734 -0.941167 -0.728546 -0.485107 0.483624
+-0.169497 -1.373555 -0.931681 -0.424879 -0.141100 0.894186
+-0.163461 -1.392704 -1.039889 -0.815191 -0.579138 -0.007937
+-0.198746 -0.792401 -1.318974 -0.666829 -0.457870 -0.587957
+-0.315181 -0.764996 -1.175598 -0.727208 -0.541407 -0.421956
+-0.113353 -0.829547 -1.389298 -0.676960 -0.441889 -0.588608
+-0.077967 -0.944955 -1.301869 -0.630963 -0.559770 -0.537162
+-0.117833 -0.677125 -1.452666 -0.653326 -0.253417 -0.713404
+-0.215624 -0.638821 -1.379687 -0.649244 -0.172433 -0.740776
+-0.114572 -0.524305 -1.478219 -0.647567 -0.016038 -0.761840
+-0.219620 -0.509012 -1.385795 -0.677497 0.092011 -0.729748
+-0.254991 -1.321908 -1.115359 0.500202 -0.179081 -0.847189
+-0.268611 -1.308589 -1.120257 0.180868 0.343192 -0.921687
+-0.249913 -1.335757 -1.102068 0.606897 -0.629945 -0.484609
+-0.254575 -1.344734 -1.085416 0.503019 -0.864083 0.018240
+-0.268398 -1.346147 -1.071792 0.171787 -0.838312 0.517419
+-0.286584 -1.340647 -1.068407 -0.292466 -0.522459 0.800937
+-0.303199 -1.329213 -1.075418 -0.692350 -0.058220 0.719209
+-0.308545 -1.316096 -1.089215 -0.854070 0.413327 0.315795
+-0.301231 -1.305795 -1.104480 -0.688543 0.693637 -0.211603
+-0.285179 -1.302507 -1.116210 -0.282780 0.672992 -0.683460
+-0.269323 -1.342471 -1.125993 0.805580 -0.152774 -0.572452
+-0.279711 -1.332219 -1.133962 0.465688 0.298278 -0.833166
+-0.267450 -1.352851 -1.113072 0.795677 -0.576539 -0.185743
+-0.274699 -1.359736 -1.099968 0.524113 -0.820676 0.227589
+-0.288424 -1.360377 -1.091233 0.052878 -0.820119 0.569744
+-0.303655 -1.354242 -1.090079 -0.500848 -0.564802 0.655859
+-0.314641 -1.343556 -1.097327 -0.902755 -0.145720 0.404721
+-0.316908 -1.332587 -1.110568 -0.959478 0.277776 -0.047358
+-0.309341 -1.325785 -1.124591 -0.662531 0.549546 -0.508972
+-0.294992 -1.325751 -1.133573 -0.113776 0.563562 -0.818201
+-0.279442 -1.091644 -1.009008 -0.084789 0.934854 0.344760
+-0.261838 -1.101313 -1.030667 0.495924 0.794786 -0.349820
+-0.251003 -1.153046 -1.047842 0.682825 -0.212684 -0.698939
+-0.259299 -1.170908 -1.043556 0.534564 -0.671114 -0.513662
+-0.279853 -1.188245 -1.025279 0.350512 -0.858430 -0.374485
+-0.248231 -1.128193 -1.043317 0.708641 0.312637 -0.632524
+-0.285725 -1.140543 -1.030960 -0.799910 0.113121 0.589363
+-0.292839 -1.167308 -1.027903 -0.754320 0.348148 0.556592
+-0.307133 -1.138480 -1.061830 -0.506829 0.093034 0.857012
+-0.305048 -1.109485 -1.057337 -0.569048 -0.419977 0.706968
+-0.336214 -1.117070 -1.070677 -0.316364 -0.249330 0.915286
+-0.348472 -1.131245 -1.076251 -0.314014 0.089737 0.945168
+-0.312037 -1.163003 -1.057184 -0.644673 0.268029 0.715931
+-0.338613 -1.146774 -1.069065 -0.277388 0.241700 0.929859
+-0.269799 -1.171450 -1.053666 0.360509 -0.692729 -0.624628
+-0.304381 -1.184538 -1.045494 0.134016 -0.802193 -0.581830
+-0.263265 -1.151909 -1.060025 0.524796 -0.206634 -0.825767
+-0.260030 -1.124678 -1.055475 0.600320 0.334951 -0.726240
+-0.287615 -1.097294 -1.050728 0.349335 0.781344 -0.517172
+-0.310452 -1.086322 -1.035124 -0.468085 0.798203 0.379168
+-0.311671 -1.094821 -1.038957 -0.596044 -0.455791 0.661049
+-0.348236 -1.105636 -1.066348 -0.375412 -0.467302 0.800434
+-0.147928 -1.405185 -0.938309 -0.727859 -0.640782 0.244171
+-0.162523 -1.393819 -0.950832 -0.662721 -0.748865 -0.001284
+-0.138662 -1.415715 -0.925182 -0.868009 -0.404107 0.288544
+-0.145103 -1.397383 -0.918884 -0.725954 -0.440852 0.527865
+-0.122840 -1.432474 -1.061670 -0.633108 -0.758758 -0.153170
+-0.144263 -1.389823 -0.917095 -0.552942 -0.123192 0.824062
+-0.108530 -0.355331 -1.455653 -0.695608 0.144731 -0.703692
+-0.236095 -0.336440 -1.315803 -0.708825 0.112503 -0.696355
+-0.121475 -0.199653 -1.417969 -0.686186 0.123558 -0.716856
+-0.268996 -0.166749 -1.278754 -0.632808 0.104040 -0.767287
+-0.126253 -0.069033 -1.371295 -0.582573 0.146614 -0.799445
+-0.276410 -0.024242 -1.265942 -0.523653 0.085940 -0.847586
+-0.277886 -1.362630 -1.135619 0.948442 -0.153751 -0.277160
+-0.283686 -1.359002 -1.147220 0.709430 0.216599 -0.670667
+-0.280020 -1.368770 -1.123823 0.865928 -0.482114 0.133172
+-0.289273 -1.375075 -1.116339 0.527157 -0.686181 0.501259
+-0.302110 -1.379138 -1.116024 -0.038247 -0.729403 0.683014
+-0.313628 -1.379406 -1.122999 -0.628958 -0.574123 0.524208
+-0.319427 -1.375778 -1.134601 -0.960593 -0.264440 0.085630
+-0.317293 -1.369638 -1.146396 -0.903671 0.087393 -0.419215
+-0.308040 -1.363333 -1.153881 -0.490767 0.361613 -0.792707
+-0.295204 -1.359270 -1.154196 0.141296 0.429705 -0.891846
+-0.351197 -1.098160 -1.069294 -0.630088 0.406194 0.661812
+-0.310089 -1.161948 -1.072658 0.128746 -0.566795 -0.813737
+-0.343303 -1.163795 -1.072610 0.032180 -0.599473 -0.799748
+-0.311104 -1.142927 -1.084190 0.251806 -0.114717 -0.960955
+-0.302553 -1.120087 -1.073390 0.342573 0.330694 -0.879366
+-0.332530 -1.106033 -1.077487 0.224317 0.663148 -0.714084
+-0.121794 0.126862 -1.337687 -0.465797 0.117416 -0.877067
+-0.263580 0.140392 -1.261915 -0.609194 0.112356 -0.785022
+-0.229655 0.334608 -1.256244 -0.687405 0.026545 -0.725789
+-0.108528 0.360089 -1.304915 -0.319163 -0.087919 -0.943613
+-0.208275 0.514568 -1.309593 -0.528967 -0.076611 -0.845177
+-0.276877 0.518283 -1.223775 -0.824384 -0.099048 -0.557298
+-0.284178 0.314571 -1.157604 -0.880721 -0.049919 -0.470998
+-0.201975 0.676339 -1.300758 -0.381373 0.175413 -0.907626
+-0.093267 0.537123 -1.340819 -0.242363 -0.002218 -0.970183
+-0.078983 0.672760 -1.329372 -0.218391 0.173171 -0.960373
+-0.314782 0.525202 -1.163291 -0.882557 -0.089556 -0.461599
+-0.284059 0.669572 -1.231316 -0.770204 0.143261 -0.621499
+-0.328173 0.316278 -1.060432 -0.902669 -0.142122 -0.406190
+-0.316567 0.674269 -1.177092 -0.899695 0.158234 -0.406830
+-0.279601 0.779780 -1.158522 -0.750713 0.560713 -0.349330
+-0.234621 0.787648 -1.231194 -0.615072 0.617987 -0.489672
+-0.115223 0.870956 -1.200244 -0.349666 0.840396 -0.414088
+-0.203523 0.850704 -1.130556 -0.439897 0.872048 -0.214529
+-0.112552 0.899531 -1.004645 -0.332031 0.936783 -0.110418
+-0.055367 0.903845 -1.060557 -0.274261 0.951171 -0.141614
+-0.251929 0.841469 -1.034970 -0.519001 0.848369 -0.104442
+-0.172004 0.879637 -0.926179 -0.417151 0.904650 0.087135
+-0.341636 0.537693 -1.091500 -0.937843 -0.043632 -0.344306
+-0.343043 0.675234 -1.105304 -0.926620 0.152259 -0.343792
+-0.315812 0.762780 -1.086902 -0.829182 0.474899 -0.294835
+-0.081137 0.746770 -1.310106 -0.220055 0.277155 -0.935287
+-0.187521 0.788019 -1.271414 -0.371622 0.474332 -0.798064
+-0.083203 0.776489 -1.299486 -0.191787 0.422061 -0.886049
+-0.280601 -1.383995 -1.147629 0.986606 0.163103 -0.002431
+-0.284070 -1.382217 -1.157102 0.781413 0.363876 -0.506940
+-0.282084 -1.390649 -1.140100 0.864782 -0.136750 0.483168
+-0.287731 -1.399218 -1.137627 0.452203 -0.447922 0.771284
+-0.294990 -1.406136 -1.140857 -0.117278 -0.670052 0.732992
+-0.301114 -1.408959 -1.148293 -0.614005 -0.701550 0.361699
+-0.304027 -1.406916 -1.157166 -0.838267 -0.513041 -0.184654
+-0.302810 -1.400832 -1.164291 -0.708467 -0.165392 -0.686090
+-0.297857 -1.392846 -1.167120 -0.266187 0.193741 -0.944250
+-0.290769 -1.385752 -1.164499 0.312846 0.392806 -0.864772
+-0.258485 -1.431602 -1.170118 0.908561 0.304684 0.285806
+-0.258912 -1.430779 -1.174341 0.829774 0.486206 -0.274006
+-0.259865 -1.434206 -1.166871 0.705983 -0.041278 0.707025
+-0.262486 -1.437617 -1.165891 0.296132 -0.441259 0.847111
+-0.265684 -1.440051 -1.167361 -0.187472 -0.755468 0.627791
+-0.268306 -1.440624 -1.170797 -0.535974 -0.834506 0.127795
+-0.269087 -1.439328 -1.175026 -0.614819 -0.652616 -0.442820
+-0.267857 -1.436418 -1.178335 -0.402921 -0.283501 -0.870219
+-0.264932 -1.433226 -1.179409 0.023461 0.129749 -0.991269
+-0.261355 -1.431329 -1.177856 0.495003 0.422800 -0.759087
+-0.355943 -1.129597 -1.088021 0.095520 -0.098053 -0.990586
+-0.316565 0.155535 -1.170591 -0.858188 0.188038 -0.477656
+-0.085151 0.801816 -1.283248 -0.172412 0.629211 -0.757870
+-0.257483 0.826472 -0.861991 -0.481527 0.849066 0.217299
+-0.191441 0.840666 -0.814931 -0.019656 0.941005 0.337820
+-0.174726 0.772485 -0.655484 0.163875 0.913129 0.373283
+-0.228561 0.777364 -0.667726 -0.287121 0.901021 0.325150
+-0.098672 0.741881 -0.649914 0.335570 0.879375 0.337775
+-0.088868 0.769612 -0.732977 0.341962 0.878487 0.333649
+-0.275723 0.755235 -0.676234 -0.568824 0.785055 0.245211
+-0.310224 0.786234 -0.897805 -0.677690 0.706383 0.204351
+-0.249671 -1.449145 -1.176748 0.686375 -0.678472 -0.261849
+0.173635 -1.358508 -0.942559 0.737418 -0.441260 -0.511374
+0.179672 -1.361783 -0.916928 0.878918 -0.476973 0.000000
+0.167523 -1.369772 -0.939125 0.617776 -0.661748 -0.424785
+0.163048 -1.378017 -0.929743 0.534807 -0.814638 -0.224379
+0.161410 -1.381035 -0.916928 0.510749 -0.858971 0.036119
+0.163048 -1.378017 -0.904112 0.552022 -0.782900 0.286948
+0.167523 -1.369772 -0.894731 0.647615 -0.606761 0.460908
+0.173635 -1.358508 -0.891297 0.771878 -0.377782 0.511357
+0.179748 -1.347244 -0.894731 0.891512 -0.157325 0.424799
+0.184223 -1.338998 -0.904112 0.974483 -0.004425 0.224418
+0.185861 -1.335980 -0.916928 0.998550 0.039918 -0.036122
+0.184223 -1.338998 -0.929743 0.957259 -0.036174 -0.286960
+0.179748 -1.347244 -0.939125 0.861673 -0.212316 -0.460914
+0.149528 -1.370119 -0.954521 0.220660 -0.628718 -0.745669
+0.159880 -1.351043 -0.960336 0.427069 -0.248369 -0.869439
+0.141950 -1.384084 -0.938632 0.071421 -0.903742 -0.422078
+0.139176 -1.389196 -0.916928 0.019353 -0.999706 0.014589
+0.141950 -1.384084 -0.895224 0.078388 -0.890914 0.447356
+0.149528 -1.370119 -0.879335 0.232699 -0.606528 0.760246
+0.159880 -1.351043 -0.873519 0.440998 -0.222714 0.869436
+0.170233 -1.331967 -0.879335 0.647415 0.157644 0.745656
+0.177811 -1.318002 -0.895224 0.796651 0.432662 0.422078
+0.180585 -1.312891 -0.916928 0.848725 0.528633 -0.014584
+0.177811 -1.318002 -0.938632 0.789692 0.419839 -0.447351
+0.170233 -1.331967 -0.954521 0.635357 0.135426 -0.760251
+0.123777 -1.359001 -0.958868 -0.042796 -0.448237 -0.892890
+0.135327 -1.337718 -0.965356 0.196612 -0.007070 -0.980456
+0.115323 -1.374581 -0.941142 -0.229249 -0.791848 -0.566058
+0.112228 -1.380283 -0.916928 -0.312801 -0.945773 -0.087579
+0.115323 -1.374581 -0.892714 -0.271021 -0.868808 0.414392
+0.123777 -1.359001 -0.874988 -0.115146 -0.581569 0.805307
+0.135327 -1.337718 -0.868499 0.113081 -0.161004 0.980454
+0.146876 -1.316436 -0.874988 0.352498 0.280196 0.892880
+0.155331 -1.300856 -0.892714 0.538963 0.623778 0.566056
+0.158425 -1.295154 -0.916928 0.622493 0.777711 0.087567
+0.155331 -1.300856 -0.941142 0.580732 0.700743 -0.414379
+0.146876 -1.316436 -0.958868 0.424839 0.413499 -0.805314
+0.007202 1.584741 -1.309190 0.724131 0.195871 -0.661263
+0.000000 1.622242 -1.297518 0.893076 0.449905 0.000013
+0.015217 1.584564 -1.297518 0.967707 0.219246 0.124396
+0.000000 1.584920 -1.313976 0.525223 0.180011 -0.831707
+0.007202 1.584740 -1.285847 0.663513 0.198677 0.721303
+0.000000 1.584920 -1.281061 0.543125 0.225448 0.808819
+0.012210 1.519316 -1.313955 0.707247 0.074854 -0.702993
+0.022343 1.519310 -1.297518 0.996623 0.079873 -0.019066
+0.000000 1.519330 -1.320764 0.478038 0.062782 -0.876092
+0.012210 1.519316 -1.281081 0.704261 0.074666 0.706004
+0.000000 1.519330 -1.272790 0.557861 0.079860 0.826083
+0.015294 1.442862 -1.316786 0.712363 0.043590 -0.700456
+0.025428 1.442862 -1.297518 0.998992 0.041707 -0.016593
+0.000000 1.442863 -1.324767 0.449794 0.033100 -0.892519
+0.015294 1.442862 -1.278250 0.705576 0.041854 0.707398
+0.000000 1.442863 -1.269792 0.510001 0.038442 0.859314
+0.018443 1.349348 -1.318398 0.710581 0.023158 -0.703234
+0.028576 1.349348 -1.297518 0.999671 0.023577 -0.010091
+0.000000 1.349349 -1.327047 0.406618 0.015636 -0.913464
+0.018443 1.349348 -1.276638 0.722135 0.026809 0.691233
+0.000000 1.349350 -1.266484 0.482665 0.027711 0.875367
+0.019217 1.253847 -1.320011 0.700674 0.017142 -0.713276
+0.029351 1.253847 -1.297518 0.999854 0.015151 -0.007878
+0.000000 1.253848 -1.327673 0.381797 0.017721 -0.924076
+0.019217 1.253847 -1.275025 0.739203 0.020009 0.673186
+0.000000 1.253848 -1.264209 0.487623 0.023695 0.872733
+0.020764 1.166052 -1.321185 0.709045 0.026112 -0.704680
+0.030897 1.166052 -1.297518 0.999700 0.023652 -0.006371
+0.000000 1.166052 -1.330374 0.410524 0.027014 -0.911449
+0.020764 1.166052 -1.273851 0.754056 0.023757 0.656380
+0.000000 1.166052 -1.261031 0.513665 0.024852 0.857631
+0.023085 1.075631 -1.322514 0.723051 0.019230 -0.690527
+0.033219 1.075631 -1.297518 0.999820 0.018543 -0.003890
+0.000000 1.075632 -1.333278 0.430236 0.017001 -0.902556
+0.023085 1.075631 -1.272521 0.758384 0.018586 0.651543
+0.000000 1.075632 -1.258652 0.518354 0.019262 0.854949
+0.023843 0.991295 -1.322813 0.782440 0.013451 -0.622581
+0.033976 0.991295 -1.297518 0.999904 0.007463 0.011634
+0.000000 0.991296 -1.334681 0.445557 0.014891 -0.895130
+0.023843 0.991295 -1.272223 0.756034 -0.001749 0.654530
+0.000000 0.991296 -1.257709 0.518310 -0.001552 0.855191
+0.025062 0.911391 -1.323454 0.931299 0.017127 -0.363852
+0.035195 0.911391 -1.297518 0.992876 0.029245 0.115510
+0.022481 0.911391 -1.271582 0.733825 0.019430 0.679061
+0.000000 0.911391 -1.259761 0.483798 0.005617 0.875162
+0.029112 0.812922 -1.273484 0.751529 0.003117 0.659693
+0.000000 0.812923 -1.255352 0.510971 -0.035810 0.858852
+0.039245 0.812922 -1.297518 0.920790 0.037872 0.388215
+0.049248 0.745544 -1.293766 0.565651 -0.014801 0.824512
+0.000000 0.777615 -1.259705 -0.398388 0.409297 -0.820831
+0.000000 0.798667 -1.251145 -0.452011 0.335990 -0.826315
+0.031367 0.777065 -1.277087 -0.464232 0.262140 -0.846033
+0.295178 -0.752238 0.000018 -0.001573 0.001095 0.999998
+0.332202 -0.734652 0.000057 -0.000857 0.001861 0.999998
+0.272467 -0.735551 -0.000036 -0.000377 0.000938 0.999999
+0.248955 -0.755401 -0.000014 0.000260 0.000800 1.000000
+0.208629 -0.741017 -0.000015 0.000196 0.000275 1.000000
+0.189201 -0.700580 -0.000015 0.000000 0.000000 1.000000
+0.200394 -0.636211 -0.000015 0.000313 -0.000121 1.000000
+0.222624 -0.608680 -0.000015 0.000000 0.000000 1.000000
+0.278199 -0.590617 -0.000015 -0.000255 -0.001293 0.999999
+0.335244 -0.615850 -0.000015 -0.001307 -0.002955 0.999995
+0.349110 -0.655147 -0.000113 -0.000213 0.000181 1.000000
+0.348796 -0.704774 -0.000013 0.000597 0.002011 0.999998
+0.326741 -0.712820 -0.044831 0.825396 -0.375178 -0.421856
+0.321164 -0.686016 -0.079581 0.653239 -0.529408 -0.541301
+0.346165 -0.674416 -0.040981 0.909116 -0.208547 -0.360578
+0.336374 -0.647740 -0.079227 0.960867 -0.065165 -0.269235
+0.342440 -0.630348 -0.037392 0.982827 0.068937 -0.171167
+0.335166 -0.602167 -0.075203 0.961086 0.272371 -0.046122
+0.330532 -0.589047 -0.108363 0.870018 0.488175 0.068950
+0.314000 -0.565151 -0.068947 0.870018 0.488175 0.068950
+0.308093 -0.551433 -0.092603 0.749115 0.662410 -0.006349
+0.291303 -0.704382 -0.077706 0.211492 -0.751068 -0.625434
+0.291509 -0.674280 -0.113187 0.300594 -0.753200 -0.585093
+0.314822 -0.657923 -0.112631 0.458263 -0.631898 -0.625060
+0.273587 -0.679387 -0.111205 0.017027 -0.825329 -0.564395
+0.273842 -0.653064 -0.155061 0.112784 -0.843691 -0.524848
+0.294872 -0.646012 -0.153510 0.304537 -0.791690 -0.529607
+0.303818 -0.553183 -0.141994 0.514962 0.846675 -0.133999
+0.279132 -0.529526 -0.087386 0.181074 0.968761 -0.169452
+0.279028 -0.540377 -0.138857 -0.158540 0.980583 -0.115421
+0.257647 -0.677363 -0.108988 -0.177272 -0.846821 -0.501466
+0.256660 -0.650004 -0.154840 -0.167282 -0.846628 -0.505211
+0.274078 -0.706588 -0.077441 0.089624 -0.774958 -0.625626
+0.247016 -0.552736 -0.092951 -0.437248 0.897105 -0.063387
+0.249190 -0.549680 -0.142482 -0.302375 0.952104 0.045472
+0.210457 -0.628753 -0.037344 -0.926518 0.346041 -0.147713
+0.197789 -0.683783 -0.037943 -0.940195 -0.193249 -0.280513
+0.236572 -0.595297 -0.032913 -0.777848 0.623313 -0.080210
+0.218227 -0.725211 -0.045824 -0.501421 -0.765373 -0.403461
+0.253455 -0.733264 -0.046138 -0.203873 -0.874700 -0.439699
+0.200532 -0.651394 -0.376826 -0.852736 -0.357396 0.380933
+0.215880 -0.635772 -0.327812 -0.844791 -0.419827 0.331774
+0.179266 -0.601335 -0.377465 -0.924076 -0.232112 0.303658
+0.198140 -0.597121 -0.314314 -0.914560 -0.279842 0.292009
+0.178825 -0.521027 -0.378250 -0.971917 -0.003037 0.235306
+0.196859 -0.533913 -0.303928 -0.964214 -0.035035 0.262801
+0.391453 -0.418047 -0.607499 0.533801 0.836727 0.122247
+0.325815 -0.384064 -0.553484 0.213570 0.973673 0.079680
+0.357320 -0.417054 -0.465251 0.686982 0.693526 0.216974
+0.306654 -0.389007 -0.449769 -0.172370 0.984942 0.013354
+0.405876 -0.495740 -0.495396 0.865675 0.450800 0.217683
+0.383499 -0.505994 -0.385173 0.812760 0.503354 0.293352
+0.336212 -0.447832 -0.375617 0.750671 0.550226 0.365710
+0.219295 -0.435004 -0.413224 -0.482210 0.874511 -0.052005
+0.210983 -0.443751 -0.483240 -0.482843 0.874288 -0.049834
+0.347038 -0.652398 -0.457320 0.660694 -0.663023 0.351971
+0.332847 -0.626788 -0.381643 0.578235 -0.732991 0.358284
+0.286957 -0.682616 -0.438026 0.429080 -0.797441 0.424239
+0.276524 -0.661972 -0.379310 0.504116 -0.782807 0.364802
+0.387067 -0.602420 -0.479440 0.827830 -0.500935 0.252509
+0.367801 -0.587543 -0.383197 0.760023 -0.579513 0.294159
+0.294651 -0.747369 -0.556844 0.462801 -0.770503 0.438339
+0.233252 -0.732483 -0.490942 0.302703 -0.827602 0.472700
+0.236832 -0.696120 -0.429808 0.300677 -0.827318 0.474488
+0.352869 -0.722752 -0.593997 0.758671 -0.573589 0.308892
+0.398648 -0.657788 -0.643241 0.867407 -0.449569 0.213290
+0.286957 -0.682616 -0.438026 0.297427 -0.882930 0.363279
+0.276524 -0.661972 -0.379310 0.299928 -0.882899 0.361292
+0.236832 -0.696120 -0.429808 -0.068169 -0.858321 0.508564
+0.245371 -0.672412 -0.378741 -0.200268 -0.905636 0.373787
+0.200532 -0.651394 -0.376826 -0.715413 -0.564188 0.412160
+0.185062 -0.653566 -0.409151 -0.657777 -0.579300 0.481395
+0.166063 -0.601729 -0.399052 -0.833938 -0.367101 0.412048
+0.155519 -0.617108 -0.446525 -0.865152 -0.263850 0.426492
+0.166408 -0.689952 -0.448651 -0.272905 -0.667343 0.692947
+0.233252 -0.732483 -0.490942 -0.136242 -0.797944 0.587131
+0.179266 -0.601335 -0.377465 -0.801345 -0.334092 0.496215
+0.156180 -0.709903 -0.464735 -0.346460 -0.461496 0.816693
+0.229238 -0.751868 -0.513438 0.035083 -0.696549 0.716651
+0.152043 -0.627012 -0.461232 -0.600298 -0.063652 0.797239
+0.130595 -0.640555 -0.478463 -0.669680 -0.101433 0.735691
+0.139670 -0.729077 -0.486843 -0.242721 -0.560623 0.791700
+0.188531 -0.803520 -0.548481 0.082147 -0.603057 0.793457
+0.405876 -0.495740 -0.495396 0.967191 0.187757 0.171140
+0.383499 -0.505994 -0.385173 0.969946 -0.096563 0.223341
+0.402735 -0.560380 -0.492227 0.970770 -0.117150 0.209479
+0.376532 -0.549829 -0.385658 0.947026 -0.210055 0.242939
+0.436833 -0.575138 -0.660827 0.973473 -0.134263 0.185265
+0.427755 -0.497838 -0.650739 0.966122 0.211346 0.148122
+0.357320 -0.417054 -0.465251 0.866101 0.456060 0.204641
+0.391453 -0.418047 -0.607499 0.908437 0.391109 0.147569
+0.387067 -0.602420 -0.479440 0.932754 -0.284597 0.221302
+0.398648 -0.657788 -0.643241 0.899648 -0.363186 0.242340
+0.367801 -0.587543 -0.383197 0.952881 -0.206072 0.222603
+0.449056 -0.493539 -0.787950 0.970811 0.186562 0.150734
+0.405733 -0.421712 -0.714452 0.917133 0.375999 0.132253
+0.459976 -0.598947 -0.814650 0.962051 -0.186533 0.199158
+0.430026 -0.707082 -0.805969 0.904548 -0.327091 0.273503
+0.368785 -0.778217 -0.725018 0.867592 -0.408093 0.284155
+0.352869 -0.722752 -0.593997 0.871680 -0.404266 0.277026
+0.148618 -0.528786 -0.462029 -0.755813 0.620372 0.209490
+0.210664 -0.440016 -0.501884 -0.727881 0.627548 0.276355
+0.131915 -0.528796 -0.497689 -0.694152 0.632003 0.344566
+0.186971 -0.445619 -0.537279 0.170012 0.394526 0.903020
+0.210983 -0.443751 -0.483240 -0.792969 0.599631 0.107901
+0.153661 -0.526172 -0.447830 -0.808346 0.578673 0.108236
+0.165710 -0.520333 -0.397867 -0.816383 0.501904 0.285676
+0.219295 -0.435004 -0.413224 -0.822177 0.557476 0.115086
+0.122304 -0.438939 -0.494920 0.552618 0.141441 0.821345
+0.144773 -0.369613 -0.521976 0.535712 0.129421 0.834424
+0.229770 -0.368127 -0.574212 0.518484 0.117324 0.847000
+0.224163 -0.441915 -0.371037 -0.802960 0.475628 0.359210
+0.178825 -0.521027 -0.378250 -0.759840 0.387887 0.521716
+0.227821 -0.552386 -0.242999 -0.892245 0.356757 0.276808
+0.229231 -0.598010 -0.149052 -0.983470 0.174776 -0.047327
+0.251681 -0.526464 -0.238647 -0.690594 0.664226 0.286152
+0.249190 -0.549680 -0.142482 -0.912229 0.408758 -0.027482
+0.229813 -0.597061 -0.252879 -0.961022 -0.250403 0.117198
+0.232306 -0.634170 -0.151996 -0.866818 -0.420584 -0.267836
+0.219397 -0.607375 -0.110780 -0.961196 0.230353 -0.151785
+0.222420 -0.652138 -0.114268 -0.854221 -0.287278 -0.433333
+0.247016 -0.552736 -0.092951 -0.835980 0.541525 0.088818
+0.233185 -0.667982 -0.111233 -0.455689 -0.655526 -0.602190
+0.241496 -0.644234 -0.153820 -0.521797 -0.776403 -0.353449
+0.218390 -0.549998 -0.270212 -0.853557 0.224824 0.469994
+0.246942 -0.515169 -0.267732 -0.561310 0.656767 0.503575
+0.281603 -0.495410 -0.271164 -0.431338 0.772183 0.466563
+0.281356 -0.506818 -0.237638 -0.538157 0.799117 0.267953
+0.220666 -0.594124 -0.278731 -0.844689 -0.369256 0.387492
+0.239402 -0.611724 -0.258518 -0.745427 -0.666583 0.002216
+0.232976 -0.612466 -0.284542 -0.609951 -0.719599 0.331870
+0.258925 -0.626401 -0.262389 -0.339126 -0.933082 -0.119796
+0.276371 -0.627443 -0.261753 0.115841 -0.983273 -0.140550
+0.273842 -0.653064 -0.155061 -0.111909 -0.967933 -0.224905
+0.256660 -0.650004 -0.154840 -0.295440 -0.905891 -0.303442
+0.196859 -0.533913 -0.303928 -0.806942 0.276959 0.521668
+0.237075 -0.487034 -0.304912 -0.528071 0.628260 0.571341
+0.284307 -0.461223 -0.300945 -0.388347 0.686507 0.614731
+0.215880 -0.635772 -0.327812 -0.376298 -0.788135 0.487076
+0.198140 -0.597121 -0.314314 -0.744275 -0.409019 0.527975
+0.249547 -0.643542 -0.327400 -0.041428 -0.908593 0.415623
+0.256416 -0.624547 -0.286227 -0.182454 -0.960841 0.208554
+0.242148 -0.565654 -0.068614 -0.661519 0.654608 0.365898
+0.279132 -0.529526 -0.087386 -0.125342 0.760870 0.636684
+0.214653 -0.617621 -0.076847 -0.949442 0.311317 -0.040514
+0.209417 -0.666078 -0.081436 -0.915706 -0.174796 -0.361841
+0.278717 -0.556303 -0.063563 0.047024 0.776610 0.628224
+0.308093 -0.551433 -0.092603 0.418683 0.726184 0.545308
+0.227787 -0.702231 -0.078069 -0.470808 -0.629122 -0.618503
+0.255760 -0.710602 -0.077899 0.044986 -0.774366 -0.631137
+0.257647 -0.677363 -0.108988 -0.166346 -0.765348 -0.621748
+0.274078 -0.706588 -0.077441 -0.010844 -0.829579 -0.558285
+0.273587 -0.679387 -0.111205 -0.182935 -0.766886 -0.615159
+0.276764 -0.624107 -0.286603 0.295377 -0.947934 0.119051
+0.307727 -0.608932 -0.283631 0.443418 -0.884600 0.144444
+0.302528 -0.611687 -0.254364 0.488921 -0.870571 -0.055339
+0.178825 -0.521027 -0.378250 -0.842886 0.457172 0.283789
+0.224163 -0.441915 -0.371037 -0.582539 0.701935 0.409800
+0.245371 -0.672412 -0.378741 0.062836 -0.876098 0.478022
+0.276524 -0.635578 -0.326774 0.355798 -0.872141 0.335823
+0.276524 -0.661972 -0.379310 0.413191 -0.822524 0.390803
+0.319099 -0.611475 -0.323902 0.473491 -0.824421 0.310058
+0.287657 -0.420008 -0.357903 -0.086054 0.901619 0.423883
+0.200532 -0.651394 -0.376826 -0.286514 -0.860688 0.420863
+0.278297 -0.578394 -0.034141 -0.004600 0.887169 0.461423
+0.236572 -0.595297 -0.032913 -0.441510 0.778132 0.446743
+0.210457 -0.628753 -0.037344 -0.898310 0.424168 0.114550
+0.197789 -0.683783 -0.037943 -0.976256 -0.001163 -0.216619
+0.273287 -0.721296 -0.043570 -0.002460 -0.912943 -0.408081
+0.292682 -0.727566 -0.046477 0.093442 -0.857950 -0.505163
+0.291303 -0.704382 -0.077706 0.280725 -0.753801 -0.594120
+0.326741 -0.712820 -0.044831 0.586150 -0.653319 -0.479169
+0.321164 -0.686016 -0.079581 0.391162 -0.697303 -0.600634
+0.318030 -0.594901 -0.032404 0.625223 0.719749 0.301757
+0.314000 -0.565151 -0.068947 0.450200 0.746021 0.490685
+0.218227 -0.725211 -0.045824 -0.636342 -0.554428 -0.536356
+0.253455 -0.733264 -0.046138 0.267319 -0.834484 -0.481848
+0.306654 -0.389007 -0.449769 0.087698 0.938219 0.334745
+0.357320 -0.417054 -0.465251 0.547318 0.747830 0.375758
+0.336212 -0.447832 -0.375617 0.560539 0.733743 0.383950
+0.219295 -0.435004 -0.413224 -0.367072 0.906678 0.207828
+0.332847 -0.626788 -0.381643 0.509630 -0.793816 0.331863
+0.332202 -0.734652 0.000057 0.549319 -0.721702 -0.421182
+0.348796 -0.704774 -0.000013 0.920403 -0.296492 -0.254854
+0.346165 -0.674416 -0.040981 0.977328 -0.106354 -0.183082
+0.335244 -0.615850 -0.000015 0.766257 0.630850 0.121975
+0.342440 -0.630348 -0.037392 0.918952 0.393354 0.028279
+0.278199 -0.590617 -0.000015 0.153638 0.925027 0.347449
+0.222624 -0.608680 -0.000015 -0.327561 0.905627 0.269340
+0.272467 -0.735551 -0.000036 0.225850 -0.919491 -0.321759
+0.295178 -0.752238 0.000018 -0.191296 -0.887975 -0.418218
+0.349110 -0.655147 -0.000113 0.988956 0.141399 -0.044404
+0.248955 -0.755401 -0.000014 0.617067 -0.731228 -0.290747
+0.335166 -0.602167 -0.075203 0.836380 0.486658 0.252253
+0.325592 -0.544287 -0.241357 0.980676 0.051672 0.188691
+0.321219 -0.579031 -0.146115 0.964788 0.263029 0.000295
+0.320785 -0.569750 -0.245758 0.980517 -0.174798 0.089618
+0.318454 -0.607310 -0.149689 0.968249 -0.183239 -0.170052
+0.314774 -0.524596 -0.238125 0.706083 0.638125 0.306989
+0.303818 -0.553183 -0.141994 0.731572 0.663152 0.158213
+0.309583 -0.628689 -0.151638 0.841672 -0.449423 -0.299346
+0.316683 -0.593278 -0.250336 0.879243 -0.476366 -0.002558
+0.314822 -0.657923 -0.112631 0.767139 -0.456582 -0.450589
+0.327569 -0.625240 -0.112006 0.933818 -0.178190 -0.310215
+0.330532 -0.589047 -0.108363 0.976877 0.091608 -0.193181
+0.308093 -0.551433 -0.092603 0.832015 0.549085 -0.079097
+0.291509 -0.674280 -0.113187 0.516696 -0.720718 -0.462158
+0.294872 -0.646012 -0.153510 0.640399 -0.698083 -0.320263
+0.333531 -0.536520 -0.271928 0.908451 0.090084 0.408169
+0.328640 -0.560919 -0.275564 0.926178 -0.213059 0.311127
+0.321012 -0.513381 -0.269870 0.591341 0.625473 0.509017
+0.281356 -0.506818 -0.237638 0.204055 0.918315 0.339204
+0.324505 -0.588902 -0.280399 0.863889 -0.438109 0.248509
+0.307727 -0.608932 -0.283631 0.755434 -0.639440 0.142955
+0.302528 -0.611687 -0.254364 0.636149 -0.759471 -0.136078
+0.279028 -0.540377 -0.138857 0.018450 0.953555 0.300654
+0.273842 -0.653064 -0.155061 0.437815 -0.867780 -0.235109
+0.276371 -0.627443 -0.261753 0.544748 -0.818258 -0.183584
+0.251681 -0.526464 -0.238647 -0.430483 0.870296 0.239311
+0.249190 -0.549680 -0.142482 -0.314405 0.924604 0.215072
+0.355280 -0.513678 -0.307759 0.872571 0.122265 0.472939
+0.348767 -0.549903 -0.311345 0.899610 -0.209424 0.383202
+0.337312 -0.487621 -0.305082 0.575289 0.620668 0.532742
+0.281603 -0.495410 -0.271164 0.355072 0.741131 0.569780
+0.343097 -0.581914 -0.315867 0.823114 -0.438544 0.360780
+0.319099 -0.611475 -0.323902 0.709509 -0.648285 0.276268
+0.321164 -0.686016 -0.079581 0.836167 -0.328209 -0.439436
+0.336374 -0.647740 -0.079227 0.902314 -0.204747 -0.379352
+0.335166 -0.602167 -0.075203 0.980426 -0.009097 -0.196679
+0.383499 -0.505994 -0.385173 0.879673 0.328093 0.344284
+0.376532 -0.549829 -0.385658 0.923955 -0.180530 0.337220
+0.336212 -0.447832 -0.375617 0.593567 0.683030 0.425615
+0.284307 -0.461223 -0.300945 0.453759 0.690851 0.562875
+0.367801 -0.587543 -0.383197 0.870472 -0.350768 0.345311
+0.332847 -0.626788 -0.381643 0.700170 -0.635872 0.324699
+0.287657 -0.420008 -0.357903 0.560305 0.655035 0.506940
+0.172004 0.879637 -0.926179 0.374912 0.925746 -0.049352
+0.251929 0.841469 -1.034970 0.370078 0.926176 -0.072390
+0.112552 0.899531 -1.004645 0.370078 0.926176 -0.072390
+0.203523 0.850704 -1.130556 0.365040 0.926092 -0.095387
+0.115223 0.870956 -1.200244 0.294909 0.950545 -0.097435
+0.055367 0.903845 -1.060557 0.274261 0.951171 -0.141614
+0.203523 0.850704 -1.130556 0.274261 0.951171 -0.141614
+0.112552 0.899531 -1.004645 0.252960 0.949535 -0.185456
+0.279601 0.779780 -1.158522 0.636892 0.733151 -0.238450
+0.234621 0.787648 -1.231194 0.533583 0.781026 -0.324480
+0.203523 0.850704 -1.130556 0.561353 0.772771 -0.296153
+0.115223 0.870956 -1.200244 0.469204 0.806289 -0.360202
+0.315812 0.762780 -1.086902 0.697746 0.691030 -0.188754
+0.251929 0.841469 -1.034970 0.656948 0.722974 -0.213841
+0.282348 0.545361 -0.119478 0.991695 -0.039105 -0.122524
+0.277643 0.564086 -0.163536 0.991272 -0.000510 -0.131831
+0.284402 0.576404 -0.112761 0.991272 -0.000510 -0.131831
+0.277107 0.594368 -0.159115 0.989287 0.038086 -0.140930
+0.269638 0.446302 0.000566 0.001711 0.002278 0.999996
+0.320365 0.485449 0.000390 -0.004583 -0.000007 0.999990
+0.242179 0.466927 0.000566 0.000985 0.000723 0.999999
+0.220789 0.442452 0.000566 0.000000 0.000000 1.000000
+0.167233 0.459170 0.000566 0.000000 0.000000 1.000000
+0.146152 0.501367 0.000566 0.000000 0.000000 1.000000
+0.153742 0.557811 0.000566 0.000472 -0.000128 1.000000
+0.187262 0.606974 0.000566 0.000000 0.000000 1.000000
+0.222234 0.612449 0.000566 0.000616 -0.001679 0.999998
+0.254878 0.617560 0.000566 0.000530 -0.003385 0.999994
+0.307234 0.573768 0.000390 -0.002514 -0.001265 0.999996
+0.323680 0.530277 0.000566 -0.017633 -0.002622 0.999841
+0.310224 0.786234 -0.897804 0.677688 0.706385 0.204351
+0.257483 0.826472 -0.861991 0.568823 0.785056 0.245211
+0.275723 0.755235 -0.676234 0.568823 0.785056 0.245211
+0.228561 0.777364 -0.667726 0.448746 0.848253 0.281238
+0.289658 0.521276 -0.087188 0.753525 -0.436024 -0.492020
+0.282348 0.545361 -0.119478 0.808482 -0.446612 -0.383268
+0.291826 0.566355 -0.081698 0.971848 -0.015706 -0.235083
+0.284402 0.576404 -0.112761 0.983191 0.086734 -0.160661
+0.254084 0.492429 -0.091707 0.561240 -0.603370 -0.566529
+0.251436 0.524118 -0.128080 0.578239 -0.643993 -0.500911
+0.249859 0.543077 -0.169297 0.601604 -0.713259 -0.359631
+0.277643 0.564086 -0.163536 0.608546 -0.704826 -0.364544
+0.277107 0.594368 -0.159115 0.968817 0.226499 -0.100454
+0.277154 0.615199 -0.111693 0.921051 0.385228 -0.057133
+0.268234 0.627424 -0.156155 0.811748 0.581601 -0.052969
+0.232840 0.663758 -0.096986 0.701629 0.712322 -0.017713
+0.231067 0.660080 -0.153241 0.655341 0.752099 -0.069827
+0.186751 0.612696 -0.034908 -0.755114 0.639320 0.145168
+0.217708 0.623680 -0.032393 -0.245774 0.937080 0.247945
+0.155436 0.559053 -0.044730 -0.973518 0.228114 0.015088
+0.188509 0.645758 -0.076114 -0.860442 0.428189 0.276214
+0.159072 0.588271 -0.082848 -0.987841 0.153674 0.023565
+0.164135 0.553976 -0.084703 -0.950462 -0.118846 -0.287222
+0.154307 0.520563 -0.045954 -0.955807 -0.137073 -0.260085
+0.179070 0.506104 -0.086362 -0.856303 -0.308085 -0.414523
+0.171417 0.482939 -0.048275 -0.771964 -0.518095 -0.368307
+0.223805 0.460757 -0.052471 -0.332387 -0.863041 -0.380366
+0.310224 0.786234 -0.897804 0.896303 0.398136 0.195266
+0.275723 0.755235 -0.676234 0.888210 0.419779 0.186733
+0.362855 0.685884 -0.934781 0.888210 0.419779 0.186733
+0.310846 0.688865 -0.685292 0.879577 0.441167 0.178087
+0.175497 0.729689 -0.405860 -0.843965 0.521374 0.126062
+0.178600 0.713752 -0.333697 -0.720376 0.668763 0.183888
+0.201002 0.752380 -0.409529 -0.622247 0.756443 0.201502
+0.200959 0.732715 -0.338152 -0.607554 0.765842 0.210630
+0.162211 0.681141 -0.329839 -0.896742 0.435541 0.078468
+0.161989 0.688799 -0.401702 -0.899699 0.435035 0.035857
+0.142688 0.649372 -0.328296 -0.954878 0.295623 0.028558
+0.141864 0.649581 -0.398320 -0.994152 0.102355 0.034423
+0.148225 0.609419 -0.328049 -0.951952 -0.305447 0.022131
+0.142612 0.617588 -0.398601 -0.900598 -0.428996 0.069892
+0.167913 0.575845 -0.391086 -0.610215 -0.779990 0.138758
+0.176281 0.581040 -0.325084 -0.534249 -0.837955 0.111398
+0.210193 0.564010 -0.387937 -0.212955 -0.965966 0.146829
+0.214007 0.575025 -0.326258 -0.149249 -0.971761 0.182772
+0.261987 0.648849 -0.326739 0.944217 0.329067 -0.012986
+0.270736 0.619210 -0.325093 0.991042 -0.128205 -0.037407
+0.260287 0.642322 -0.394408 0.955256 0.291357 -0.050961
+0.270736 0.608116 -0.391070 0.979016 -0.200961 0.033791
+0.250399 0.586577 -0.324189 0.568013 -0.809663 -0.147673
+0.244685 0.577869 -0.386784 0.595910 -0.797758 0.092051
+0.277643 0.564086 -0.163536 0.877110 -0.451148 -0.164754
+0.277107 0.594368 -0.159115 0.981739 0.189928 -0.010783
+0.249859 0.543077 -0.169297 0.426813 -0.854864 -0.295023
+0.229663 0.536460 -0.171279 0.230602 -0.917616 -0.323735
+0.214007 0.575025 -0.326258 0.187646 -0.976400 -0.106923
+0.176281 0.581040 -0.325084 -0.493609 -0.854166 -0.163557
+0.210195 0.534058 -0.169644 -0.168253 -0.938514 -0.301466
+0.246793 0.681763 -0.328611 0.877041 0.474690 0.073949
+0.268234 0.627424 -0.156155 0.871328 0.487326 0.057448
+0.247846 0.680231 -0.398317 0.943393 0.331405 -0.013441
+0.214153 0.515186 -0.127241 -0.298675 -0.823383 -0.482529
+0.232231 0.518961 -0.128260 0.220660 -0.862413 -0.455580
+0.182943 0.532746 -0.120103 -0.813599 -0.485663 -0.319670
+0.182677 0.552369 -0.164101 -0.733596 -0.659658 -0.163365
+0.251436 0.524118 -0.128080 0.117990 -0.865499 -0.486817
+0.168712 0.566050 -0.116333 -0.963247 -0.206105 -0.172268
+0.169900 0.585220 -0.162331 -0.969582 -0.244134 -0.017570
+0.210193 0.564010 -0.387937 0.364984 -0.920158 0.141758
+0.148225 0.609419 -0.328049 -0.907863 -0.418357 0.027601
+0.232782 0.708077 -0.332184 0.667286 0.721591 0.184486
+0.231067 0.660080 -0.153241 0.542769 0.837337 0.065331
+0.238095 0.715785 -0.403665 0.803124 0.584191 0.117100
+0.218592 0.488978 -0.091478 0.066934 -0.815191 -0.575311
+0.179070 0.506104 -0.086362 -0.576627 -0.639670 -0.508255
+0.254084 0.492429 -0.091707 0.035198 -0.797983 -0.601651
+0.236035 0.495774 -0.085419 0.103317 -0.826566 -0.553275
+0.200959 0.732715 -0.338152 0.167168 0.943057 0.287572
+0.201002 0.752380 -0.409529 0.672606 0.713316 0.196930
+0.209338 0.666894 -0.151392 -0.152536 0.983755 0.094656
+0.142688 0.649372 -0.328296 -0.984903 0.090459 0.147590
+0.164135 0.553976 -0.084703 -0.931463 -0.254468 -0.260043
+0.223805 0.460757 -0.052471 0.300321 -0.822569 -0.482895
+0.239054 0.473485 -0.052529 0.228486 -0.878628 -0.419293
+0.220789 0.442452 0.000566 0.688562 -0.703863 -0.174525
+0.242179 0.466927 0.000566 -0.083766 -0.982788 -0.164654
+0.162211 0.681141 -0.329839 -0.851310 0.489728 0.188248
+0.166089 0.620852 -0.155459 -0.955757 0.270962 0.114494
+0.163027 0.600441 -0.111351 -0.967581 0.251607 -0.021942
+0.159072 0.588271 -0.082848 -0.986468 0.157341 -0.046097
+0.232840 0.663758 -0.096986 0.449259 0.821419 0.351335
+0.208967 0.676069 -0.095824 -0.055538 0.969036 0.240591
+0.190077 0.655760 -0.095630 -0.759240 0.633512 0.149056
+0.191454 0.652899 -0.149048 -0.724706 0.670027 0.160826
+0.178600 0.713752 -0.333697 -0.758421 0.605604 0.240920
+0.269638 0.446302 0.000566 -0.013509 -0.942777 -0.333150
+0.260516 0.465220 -0.052600 0.094616 -0.905017 -0.414719
+0.320365 0.485449 0.000390 0.755898 -0.529569 -0.384934
+0.305828 0.503800 -0.050020 0.806806 -0.390272 -0.443568
+0.289658 0.521276 -0.087188 0.826338 -0.242158 -0.508454
+0.312485 0.544627 -0.044161 0.954017 0.079391 -0.289048
+0.291826 0.566355 -0.081698 0.922825 0.107861 -0.369810
+0.171417 0.482939 -0.048275 -0.381488 -0.762129 -0.523093
+0.188509 0.645758 -0.076114 -0.504124 0.731401 0.459251
+0.209317 0.654582 -0.075414 -0.131693 0.798140 0.587903
+0.235307 0.654334 -0.079683 0.412952 0.833297 0.367541
+0.277154 0.615199 -0.111693 0.832503 0.552830 -0.036302
+0.251605 0.623111 -0.036680 0.312986 0.903743 0.292043
+0.217708 0.623680 -0.032393 -0.082813 0.837345 0.540366
+0.254878 0.617560 0.000566 0.378865 0.913388 0.148945
+0.222234 0.612449 0.000566 -0.048900 0.969776 0.239046
+0.306784 0.584437 -0.041477 0.853710 0.518060 -0.052846
+0.307234 0.573768 0.000390 0.898226 0.438380 0.031828
+0.323680 0.530277 0.000566 0.969627 0.056639 -0.237940
+0.286405 0.610778 -0.079691 0.862536 0.500878 -0.071776
+0.284402 0.576404 -0.112761 0.962806 0.156083 -0.220553
+0.186751 0.612696 -0.034908 -0.312783 0.747304 0.586262
+0.380000 0.479387 -0.850625 0.823111 -0.476358 0.309148
+0.343117 0.533016 -0.669788 0.798703 -0.493743 0.343936
+0.311188 0.429845 -0.743750 0.798703 -0.493743 0.343936
+0.291123 0.470982 -0.647226 0.772611 -0.510087 0.377998
+0.257483 0.826472 -0.861991 0.388084 0.878137 0.279761
+0.191441 0.840666 -0.814931 0.201232 0.917264 0.343704
+0.228561 0.777364 -0.667726 0.201232 0.917264 0.343704
+0.174726 0.772485 -0.655484 0.006223 0.919211 0.393716
+0.257957 0.539113 -0.489777 0.356363 -0.833619 0.422001
+0.244685 0.577869 -0.386784 0.335682 -0.866587 0.369249
+0.204691 0.525197 -0.474041 -0.149790 -0.895576 0.418935
+0.210193 0.564010 -0.387937 0.032443 -0.911954 0.409007
+0.147059 0.559099 -0.487339 -0.534122 -0.792202 0.295179
+0.167913 0.575845 -0.391086 -0.408578 -0.848313 0.336793
+0.266554 0.508384 -0.555996 0.382278 -0.818249 0.429339
+0.200296 0.489186 -0.533589 -0.273814 -0.845326 0.458748
+0.132622 0.539817 -0.555258 -0.598820 -0.714263 0.362276
+0.196093 0.452835 -0.612980 -0.661276 -0.668182 0.340951
+0.116679 0.512235 -0.650594 -0.646521 -0.689651 0.326177
+0.175497 0.729689 -0.405860 -0.732136 0.681003 0.014575
+0.201002 0.752380 -0.409529 -0.036848 0.939147 -0.341533
+0.172382 0.715347 -0.474482 -0.393029 0.915956 -0.080950
+0.207105 0.724098 -0.466516 0.297162 0.952233 -0.070332
+0.161989 0.688799 -0.401702 -0.889609 0.326371 0.319497
+0.133645 0.691215 -0.483091 -0.607069 0.781718 0.142772
+0.249918 0.703367 -0.477302 0.616795 0.784687 0.061884
+0.238095 0.715785 -0.403665 0.782446 0.622127 -0.027137
+0.172011 0.723263 -0.542599 -0.264026 0.925984 0.269895
+0.220027 0.731594 -0.542794 -0.045993 0.984282 0.170512
+0.112848 0.705254 -0.556160 -0.334904 0.878136 0.341637
+0.263180 0.713418 -0.550893 0.438311 0.880652 0.179823
+0.174726 0.772485 -0.655484 -0.222638 0.893524 0.389933
+0.228561 0.777364 -0.667726 -0.076430 0.927313 0.366400
+0.098672 0.741881 -0.649914 -0.319832 0.865129 0.386341
+0.265205 0.675793 -0.482234 0.900649 0.401836 0.165405
+0.247846 0.680231 -0.398317 0.935890 0.304307 0.177504
+0.260287 0.642322 -0.394408 0.883245 0.419577 0.209362
+0.290254 0.638584 -0.489197 0.825408 0.510599 0.240813
+0.260287 0.642322 -0.394408 0.911347 0.305333 0.276076
+0.270736 0.608116 -0.391070 0.949998 -0.049979 0.308230
+0.290254 0.638584 -0.489197 0.939471 0.243450 0.241096
+0.298894 0.585936 -0.492080 0.864486 -0.378927 0.330271
+0.244685 0.577869 -0.386784 0.728663 -0.600608 0.329120
+0.257957 0.539113 -0.489777 0.714362 -0.607476 0.347361
+0.318289 0.563922 -0.566455 0.944303 -0.132381 0.301275
+0.266554 0.508384 -0.555996 0.711511 -0.599201 0.367028
+0.311358 0.632463 -0.562152 0.908058 0.321332 0.268657
+0.265205 0.675793 -0.482234 0.858593 0.428787 0.280999
+0.290660 0.682530 -0.558843 0.837753 0.462414 0.290418
+0.249918 0.703367 -0.477302 0.810056 0.519444 0.272006
+0.263180 0.713418 -0.550893 0.756230 0.616060 0.220423
+0.222856 -1.307619 -1.114574 -0.215118 -0.619053 -0.755313
+0.230621 -1.322045 -1.104962 -0.132676 -0.772335 -0.621205
+0.210022 -1.325508 -1.096257 -0.132676 -0.772335 -0.621205
+0.226916 -1.332009 -1.085243 -0.043829 -0.888331 -0.457108
+0.295170 -1.359270 -1.154195 -0.470966 0.387270 -0.792599
+0.290735 -1.385752 -1.164499 -0.537034 0.404276 -0.740375
+0.283652 -1.359002 -1.147220 -0.555573 0.342339 -0.757722
+0.284036 -1.382217 -1.157102 -0.676948 0.479403 -0.558493
+0.258878 -1.430779 -1.174340 -0.824018 0.503086 -0.260573
+0.280568 -1.383995 -1.147628 -0.912896 0.404233 0.056711
+0.258451 -1.431602 -1.170118 -0.914976 0.275932 0.294416
+0.282051 -1.390649 -1.140099 -0.818206 0.071551 0.570456
+0.259831 -1.434206 -1.166870 -0.701196 -0.081901 0.708248
+0.287698 -1.399218 -1.137627 -0.451423 -0.315511 0.834668
+0.262452 -1.437617 -1.165891 -0.266627 -0.457263 0.848422
+0.294956 -1.406136 -1.140856 0.051491 -0.639953 0.766687
+0.265650 -1.440051 -1.167361 0.247797 -0.728118 0.639094
+0.301081 -1.408959 -1.148293 0.391259 -0.762168 0.515767
+0.268273 -1.440624 -1.170797 0.432938 -0.775339 0.459798
+0.261322 -1.431329 -1.177856 -0.577685 0.529642 -0.621095
+0.308007 -1.363333 -1.153881 0.138136 0.365292 -0.920587
+0.297823 -1.392846 -1.167120 0.184178 0.204161 -0.961456
+0.295170 -1.359270 -1.154195 0.077060 0.363478 -0.928410
+0.290735 -1.385752 -1.164499 -0.068942 0.355658 -0.932070
+0.302777 -1.400832 -1.164291 0.624254 -0.328461 -0.708817
+0.267823 -1.436418 -1.178335 0.498845 -0.163351 -0.851158
+0.264899 -1.433226 -1.179409 0.043575 0.244648 -0.968632
+0.261322 -1.431329 -1.177856 -0.187589 0.385789 -0.903314
+0.303994 -1.406916 -1.157166 0.721852 -0.664243 -0.194195
+0.269053 -1.439328 -1.175026 0.718240 -0.551662 -0.424030
+0.301081 -1.408959 -1.148293 0.674810 -0.736154 0.052041
+0.268273 -1.440624 -1.170797 0.689791 -0.723789 -0.017793
+0.317259 -1.369638 -1.146396 0.669543 0.110523 -0.734505
+0.302777 -1.400832 -1.164291 0.652209 0.116954 -0.748963
+0.308007 -1.363333 -1.153881 0.652209 0.116954 -0.748963
+0.297823 -1.392846 -1.167120 0.634516 0.123321 -0.763009
+0.283652 -1.359002 -1.147220 -0.776198 0.147292 -0.613043
+0.284036 -1.382217 -1.157102 -0.923219 0.111806 -0.367649
+0.277853 -1.362630 -1.135619 -0.948446 -0.153790 -0.277125
+0.280568 -1.383995 -1.147628 -0.994497 -0.085504 -0.060541
+0.279987 -1.368770 -1.123823 -0.954536 -0.298051 0.005133
+0.282051 -1.390649 -1.140099 -0.987337 -0.143483 0.067670
+0.279678 -1.332219 -1.133962 -0.521755 0.265453 -0.810745
+0.269289 -1.342471 -1.125993 -0.805577 -0.152788 -0.572452
+0.267416 -1.352851 -1.113071 -0.846495 -0.425452 -0.320056
+0.294958 -1.325751 -1.133573 -0.195856 0.512956 -0.835773
+0.295170 -1.359270 -1.154195 -0.344707 0.427621 -0.835654
+0.268578 -1.308589 -1.120256 -0.310961 0.163334 -0.936283
+0.254957 -1.321908 -1.115359 -0.559739 -0.042249 -0.827591
+0.249879 -1.335757 -1.102068 -0.771434 -0.359638 -0.524929
+0.257984 -1.289274 -1.110665 0.166751 0.262420 -0.950437
+0.242488 -1.305722 -1.114672 -0.037667 0.077559 -0.996276
+0.246845 -1.260431 -1.101758 0.363742 0.400226 -0.841136
+0.236921 -1.282762 -1.116675 0.324543 0.195655 -0.925414
+0.259831 -1.434206 -1.166870 -0.710934 0.020308 0.702965
+0.258451 -1.431602 -1.170118 -0.824134 0.216217 0.523502
+0.249637 -1.449145 -1.176748 -0.427277 -0.861461 -0.274443
+0.262452 -1.437617 -1.165891 -0.340083 -0.416163 0.843298
+0.265650 -1.440051 -1.167361 0.094129 -0.790470 0.605225
+0.268273 -1.440624 -1.170797 0.388331 -0.916486 0.096193
+0.269053 -1.439328 -1.175026 0.433870 -0.778573 -0.453410
+0.267823 -1.436418 -1.178335 0.240674 -0.451072 -0.859424
+0.264899 -1.433226 -1.179409 -0.123365 -0.047419 -0.991228
+0.261322 -1.431329 -1.177856 -0.541230 0.306275 -0.783113
+0.258878 -1.430779 -1.174340 -0.708479 0.429862 -0.559712
+0.258451 -1.431602 -1.170118 -0.893153 0.449746 -0.002661
+0.258878 -1.430779 -1.174340 -0.893153 0.449746 -0.002661
+0.249637 -1.449145 -1.176748 -0.893153 0.449746 -0.002661
+-0.000017 -1.403685 -0.532843 -0.000002 -0.966061 0.258313
+0.013712 -1.402167 -0.533006 0.097451 -0.673701 0.732551
+-0.000017 -1.370935 -0.522635 -0.032841 -0.105281 0.993900
+0.018619 -1.370303 -0.523921 0.075592 -0.284155 0.955794
+-0.000017 -1.401655 -0.547689 -0.061154 -0.887961 -0.455835
+0.013895 -1.398495 -0.548833 0.157213 -0.971303 -0.178481
+-0.018653 -1.370303 -0.523921 -0.159617 -0.057901 0.985479
+-0.013745 -1.402167 -0.533006 -0.190507 -0.744010 0.640435
+-0.013929 -1.398495 -0.548833 -0.162019 -0.913315 -0.373639
+-0.019046 -1.364328 -0.580399 -0.142713 -0.647691 -0.748418
+-0.000017 -1.366282 -0.582045 -0.123537 -0.644757 -0.754338
+-0.025466 -1.305227 -0.627061 -0.201774 -0.599173 -0.774777
+-0.000017 -1.308295 -0.628125 -0.090353 -0.579347 -0.810058
+-0.023282 -1.315241 -0.541154 -0.131109 0.327981 0.935542
+-0.000017 -1.312755 -0.538588 -0.138689 0.336526 0.931405
+-0.050546 -1.365189 -0.530957 -0.319704 -0.009109 0.947474
+-0.055160 -1.320242 -0.544940 -0.270335 0.321038 0.907664
+-0.078031 -1.352136 -0.542918 -0.559650 0.052269 0.827079
+-0.079885 -1.324992 -0.553916 -0.485806 0.292212 0.823775
+-0.062022 -1.284424 -0.560729 -0.267470 0.367239 0.890840
+-0.084009 -1.293200 -0.566737 -0.461943 0.300769 0.834354
+-0.106325 -1.214490 -0.609168 -0.469728 0.263478 0.842576
+-0.072717 -1.196973 -0.602534 -0.280764 0.350688 0.893415
+-0.084098 -1.085169 -0.641995 -0.404074 0.165496 0.899631
+-0.134118 -1.124052 -0.661652 -0.470607 0.157508 0.868171
+-0.171399 -1.036528 -0.683604 -0.460562 0.026352 0.887236
+-0.093126 -0.998740 -0.644095 -0.475011 -0.083425 0.876017
+-0.042277 -1.393100 -0.536856 -0.399716 -0.816626 0.416351
+-0.072746 -1.377240 -0.548504 -0.672758 -0.532609 0.513540
+-0.043746 -0.981986 -0.606547 -0.509136 -0.305320 0.804711
+-0.106031 -0.926096 -0.629367 -0.586436 -0.356586 0.727282
+0.000000 -0.987806 -0.588966 -0.346456 -0.356176 0.867817
+-0.054281 -0.924635 -0.576374 -0.443428 -0.512629 0.735243
+0.000000 -0.931320 -0.554331 -0.355603 -0.559518 0.748656
+-0.066691 -0.876854 -0.541093 -0.342435 -0.595854 0.726427
+-0.096499 -1.343108 -0.564166 -0.780040 -0.126364 0.612838
+-0.044949 -1.066321 -0.622270 -0.401935 -0.048329 0.914392
+-0.054498 -1.294657 -0.623404 -0.155322 -0.625340 -0.764738
+-0.036736 -1.235823 -0.673595 0.031175 -0.873304 -0.486177
+-0.070108 -1.244802 -0.663809 0.255978 -0.932714 -0.254008
+-0.039668 -1.391853 -0.554379 -0.132593 -0.774687 -0.618287
+-0.088928 -1.370848 -0.574027 -0.441640 -0.806382 -0.393322
+-0.071663 -1.379708 -0.565028 -0.249851 -0.888289 -0.385380
+-0.101609 -1.353245 -0.577932 -0.867413 -0.471572 0.158789
+-0.026294 -1.280054 -0.556299 -0.146347 0.383536 0.911857
+-0.044926 -1.348548 -0.584637 -0.157698 -0.589008 -0.792591
+-0.111650 -1.327029 -0.608226 -0.321265 -0.688702 -0.649983
+-0.074089 -1.339260 -0.590221 0.111138 -0.538403 -0.835326
+-0.127044 -1.303758 -0.615782 -0.848693 -0.526879 0.046027
+-0.139436 -1.274319 -0.619443 -0.682362 -0.100214 0.724113
+-0.107905 -1.323799 -0.578042 -0.865736 -0.113026 0.487572
+-0.028693 -1.192433 -0.593276 -0.237018 0.259857 0.936107
+-0.129518 -1.292252 -0.638544 0.246747 -0.928808 -0.276461
+-0.081699 -1.289704 -0.623371 0.089856 -0.589103 -0.803046
+-0.141188 -1.289671 -0.632284 -0.284500 -0.687507 0.668128
+-0.155502 -1.236804 -0.630819 -0.499570 0.140885 0.854740
+0.000000 -1.276184 -0.555177 -0.111435 0.391591 0.913367
+-0.000017 -1.231392 -0.679250 0.076679 -0.967442 -0.241196
+0.000000 -1.188148 -0.591409 -0.100355 0.307913 0.946107
+0.000000 -1.063857 -0.611077 -0.188931 0.023938 0.981699
+-0.036826 -1.238117 -0.697304 0.252580 -0.793215 0.554089
+-0.000017 -1.233837 -0.701840 0.177759 -0.515775 0.838080
+-0.071025 -1.247380 -0.686623 0.429352 -0.649909 0.627117
+-0.103259 -1.263748 -0.674458 0.635154 -0.752880 0.172486
+-0.100422 -1.255747 -0.653954 0.329040 -0.825654 -0.458289
+-0.069705 -1.278198 -0.690989 0.250671 0.192115 0.948818
+-0.118153 -1.278789 -0.677453 0.729450 -0.125032 0.672510
+-0.161583 -1.276360 -0.634034 -0.344855 -0.269254 0.899209
+-0.143928 -1.296556 -0.636116 0.178977 -0.012768 0.983770
+-0.164444 -1.289065 -0.635710 -0.069988 0.164136 0.983952
+-0.163789 -1.303910 -0.634987 -0.447533 0.149294 0.881717
+-0.146164 -1.308268 -0.627509 0.351579 0.353231 0.866960
+-0.145479 -1.326647 -0.619138 -0.191647 0.257680 0.947033
+-0.160709 -1.327495 -0.631884 -0.642251 0.085113 0.761754
+-0.139410 -1.362009 -0.611108 -0.173098 0.140187 0.974877
+-0.139116 -1.326727 -0.623711 0.626279 0.349113 0.697061
+-0.132678 -1.361377 -0.611443 0.498879 0.310687 0.809070
+-0.122719 -1.405695 -0.604309 0.214590 0.354505 0.910097
+-0.129609 -1.405361 -0.603754 -0.377846 0.080828 0.922334
+0.000000 -0.882034 -0.516286 -0.323522 -0.578187 0.749022
+-0.138671 -1.308886 -0.637077 0.805129 0.170672 0.568013
+-0.119228 -1.324339 -0.660955 0.522903 0.398759 0.753368
+-0.068073 -1.327512 -0.667823 0.125703 0.438650 0.889823
+-0.037389 -1.272798 -0.701558 0.209312 0.128835 0.969324
+-0.134693 -1.297916 -0.641700 0.740369 -0.405580 0.536059
+-0.158370 -1.364142 -0.622466 -0.812731 -0.112071 0.571758
+-0.144608 -1.406805 -0.621260 -0.862875 -0.272558 0.425628
+-0.118995 -1.437387 -0.596255 -0.699944 -0.139714 0.700399
+-0.128478 -1.442977 -0.627141 -0.914997 -0.287826 0.282732
+-0.103442 -1.413538 -0.607254 0.387582 0.586059 0.711558
+-0.091602 -1.447681 -0.580916 -0.045693 0.346880 0.936796
+-0.000017 -1.270105 -0.707808 0.112788 0.293520 0.949276
+-0.035521 -1.329960 -0.670332 0.073285 0.474690 0.877097
+-0.000017 -1.339257 -0.666214 0.034043 0.466884 0.883663
+-0.132973 -1.443241 -0.645172 -0.969701 -0.220545 0.105073
+-0.143399 -1.414398 -0.669677 -0.950202 -0.311574 -0.006072
+-0.133724 -1.465766 -0.673240 -0.986415 -0.156154 -0.051006
+-0.125978 -1.491134 -0.642916 -0.948998 -0.244911 0.198549
+-0.114850 -1.528464 -0.668639 -0.879759 -0.462876 0.108491
+-0.120598 -1.513026 -0.684932 -0.958525 -0.284342 0.019494
+-0.101414 -1.557837 -0.680852 -0.762311 -0.494106 0.418022
+-0.107676 -1.558038 -0.689610 -0.827833 -0.485508 0.281026
+-0.077735 -1.575456 -0.670632 -0.609785 -0.530027 0.589266
+-0.082763 -1.589562 -0.687034 -0.679620 -0.720564 0.137494
+-0.048244 -1.589749 -0.652445 -0.470857 -0.568856 0.674311
+-0.042597 -1.569583 -0.636975 -0.369132 -0.622112 0.690447
+-0.070579 -1.562914 -0.651884 -0.440875 -0.751341 0.491035
+-0.085528 -1.544567 -0.622349 -0.485636 -0.671105 0.560157
+-0.057607 -1.545277 -0.610821 -0.214965 -0.717837 0.662193
+-0.068996 -1.417705 -0.624797 0.226569 0.598008 0.768800
+-0.062730 -1.462112 -0.576113 -0.056728 0.311910 0.948417
+-0.089700 -1.497634 -0.594454 -0.501505 -0.323118 0.802551
+-0.060933 -1.501117 -0.582180 -0.207365 -0.386829 0.898534
+-0.049631 -1.607373 -0.680832 -0.408683 -0.871533 0.270941
+-0.049236 -1.606319 -0.712284 -0.471617 -0.868228 -0.154134
+-0.078194 -1.582310 -0.717670 -0.677902 -0.687495 -0.260384
+-0.053302 -1.597447 -0.738356 -0.527744 -0.754999 -0.389182
+-0.022231 -1.613117 -0.731314 -0.231045 -0.896421 -0.378217
+-0.020617 -1.618934 -0.702387 -0.243201 -0.969435 -0.032392
+-0.086410 -1.560745 -0.743683 -0.722071 -0.553186 -0.415450
+-0.107128 -1.521984 -0.746441 -0.894076 -0.308559 -0.324684
+-0.108797 -1.541432 -0.725267 -0.869414 -0.423587 -0.254350
+-0.120703 -1.476615 -0.732980 -0.951795 -0.255760 -0.169332
+-0.119379 -1.495462 -0.712270 -0.963477 -0.200926 -0.177036
+-0.135328 -1.430873 -0.717779 -0.947176 -0.302854 -0.105533
+-0.132311 -1.445773 -0.698382 -0.974043 -0.211142 -0.081604
+-0.154531 -1.380270 -0.678829 -0.949577 -0.313260 -0.013137
+-0.000017 -1.419349 -0.627442 0.106198 0.594731 0.796880
+-0.034491 -1.418122 -0.626023 0.067138 0.564120 0.822959
+-0.018495 -1.572862 -0.630150 -0.267418 -0.510440 0.817275
+-0.019229 -1.594895 -0.641123 -0.278157 -0.641106 0.715270
+-0.091737 -1.556855 -0.667292 -0.629615 -0.686797 0.363173
+-0.115473 -1.495687 -0.619527 -0.778841 -0.363015 0.511494
+-0.032758 -1.470149 -0.575474 0.073613 0.302042 0.950448
+-0.024074 -1.503406 -0.579481 0.014771 -0.309214 0.950878
+-0.107077 -1.541398 -0.649263 -0.793207 -0.559108 0.241292
+-0.017253 -1.546269 -0.609926 -0.094801 -0.597710 0.796088
+-0.062210 -1.548939 -0.790061 -0.612687 -0.604155 -0.509520
+-0.032348 -1.573539 -0.787490 -0.308010 -0.778247 -0.547231
+-0.111758 -1.457935 -0.786106 -0.908480 -0.285658 -0.305062
+-0.091205 -1.508123 -0.790433 -0.786773 -0.426099 -0.446574
+-0.131543 -1.409096 -0.777987 -0.926024 -0.317585 -0.204006
+-0.156683 -1.356212 -0.761539 -0.908179 -0.372112 -0.191685
+-0.021106 -1.614909 -0.670898 -0.260959 -0.877575 0.402198
+-0.000017 -1.596067 -0.638937 -0.172956 -0.707462 0.685262
+-0.000017 -1.574039 -0.625376 -0.097000 -0.508685 0.855471
+-0.000017 -1.547150 -0.608158 -0.023033 -0.564196 0.825320
+-0.000017 -1.507004 -0.582671 0.008703 -0.415148 0.909712
+-0.000017 -1.476035 -0.579618 0.155065 0.158287 0.975141
+-0.000017 -1.583737 -0.779092 -0.090095 -0.829132 -0.551745
+-0.000017 -1.616928 -0.728156 -0.112830 -0.944493 -0.308550
+-0.000017 -1.618749 -0.666344 -0.223222 -0.930500 0.290415
+-0.000017 -1.622242 -0.698873 -0.152394 -0.987650 -0.036376
+0.018462 -1.572862 -0.630150 0.178652 -0.562234 0.807451
+0.017220 -1.546269 -0.609926 0.111962 -0.598212 0.793478
+-0.000017 -1.312755 -0.538588 0.143088 0.408791 0.901341
+0.023249 -1.315241 -0.541154 0.119668 0.397824 0.909624
+0.000000 -1.276184 -0.555177 0.111512 0.391548 0.913376
+0.026260 -1.280054 -0.556299 0.093739 0.381057 0.919787
+0.000000 -1.188148 -0.591409 0.083042 0.306054 0.948385
+0.028430 -1.191998 -0.592604 0.133403 0.243692 0.960634
+0.000000 -1.063857 -0.611077 0.179299 0.025575 0.983462
+0.044879 -1.066202 -0.622145 0.283750 -0.087011 0.954942
+0.000000 -0.987806 -0.588966 0.334088 -0.353327 0.873811
+0.045699 -0.984531 -0.606911 0.365856 -0.323411 0.872671
+0.054010 -0.924554 -0.576161 0.365890 -0.474506 0.800605
+0.000000 -0.931320 -0.554331 0.379394 -0.483640 0.788766
+-0.000017 -1.458554 -1.064723 0.079705 -0.873026 -0.481116
+-0.000017 -1.402693 -1.142934 -0.022658 -0.769241 -0.638557
+0.068422 -1.451326 -1.066913 0.028741 -0.863516 -0.503502
+0.082822 -1.405828 -1.147955 -0.048644 -0.675449 -0.735800
+-0.000017 -1.486275 -1.007160 0.089176 -0.921451 -0.378122
+0.052737 -1.482106 -1.004878 0.090678 -0.925200 -0.368487
+-0.000017 -1.351366 -1.180527 -0.029415 -0.524705 -0.850776
+0.085390 -1.351693 -1.181174 -0.027622 -0.499785 -0.865709
+-0.000017 -1.287914 -1.213232 -0.045499 -0.306387 -0.950819
+0.085375 -1.291375 -1.217723 -0.062705 -0.320776 -0.945077
+-0.000017 -1.493460 -0.986184 0.087438 -0.975216 -0.203245
+0.047971 -1.490109 -0.980232 0.079763 -0.992514 -0.092487
+-0.000017 -1.493131 -0.951213 0.067606 -0.989312 -0.129191
+0.045040 -1.490148 -0.950779 0.070867 -0.962756 -0.260919
+-0.000017 -1.171195 -1.226909 0.002248 -0.047023 -0.998891
+0.082590 -1.177560 -1.230108 -0.046793 -0.063928 -0.996857
+-0.000017 -1.507587 -0.917663 0.071388 -0.919318 -0.386987
+0.043526 -1.502736 -0.920470 0.078289 -0.922062 -0.379042
+0.000000 -1.086145 -1.231919 0.135480 -0.291094 -0.947053
+0.063677 -1.084658 -1.226234 0.049283 -0.129646 -0.990335
+0.000000 -1.014367 -1.268361 0.218178 -0.441795 -0.870181
+0.063836 -1.006456 -1.256372 0.155265 -0.401364 -0.902663
+0.261829 -0.969024 -0.862849 0.971189 -0.230942 0.058792
+0.255171 -0.984125 -0.812184 0.980803 -0.168422 0.098283
+0.241338 -1.101547 -0.904321 0.994154 -0.107229 -0.012602
+0.244821 -1.124264 -0.861905 0.995812 -0.078310 -0.047186
+0.255500 -0.909942 -0.759849 0.847182 -0.457756 0.269708
+0.275470 -0.919913 -0.839500 0.894568 -0.402967 0.193303
+0.250596 -1.151253 -0.812148 0.974733 -0.210827 -0.073812
+0.240419 -1.032634 -0.777716 0.996870 -0.021906 0.075965
+0.203642 -1.233119 -0.795930 0.916260 -0.388827 0.096340
+0.216387 -1.224037 -0.880489 0.944553 -0.327916 0.017064
+0.327169 -0.847824 -0.782242 0.677570 -0.689399 0.256181
+0.191269 -1.311910 -0.896540 0.950463 -0.291432 0.108107
+0.190128 -1.294682 -0.840066 0.950575 -0.290292 0.110171
+0.250557 -0.893329 -1.103714 0.905844 -0.339468 -0.253394
+0.241437 -0.975757 -1.025889 0.926929 -0.072401 -0.368184
+0.194389 -1.019275 -1.135778 0.926929 -0.072401 -0.368184
+0.233524 -1.041313 -1.070262 0.869276 0.200816 -0.451699
+0.178512 -1.354269 -0.860294 0.901656 -0.285913 0.324454
+0.190128 -1.294682 -0.840066 0.911730 -0.367236 0.184084
+0.131509 -1.409096 -0.777987 0.911730 -0.367236 0.184084
+0.156650 -1.356212 -0.761539 0.897717 -0.438857 0.038851
+0.181027 -1.327258 -0.684930 0.928179 -0.354912 -0.111894
+0.203642 -1.233119 -0.795930 0.899593 -0.425457 -0.098586
+0.198106 -1.282808 -0.684246 0.923990 -0.364309 -0.116283
+0.217239 -1.235284 -0.685585 0.960557 -0.233754 0.150627
+0.250596 -1.151253 -0.812148 0.970584 -0.237350 0.040398
+0.244259 -1.167176 -0.753451 0.976461 -0.188046 0.105655
+0.232586 -1.119921 -0.714247 0.871959 0.123217 0.473819
+0.201473 -1.208949 -0.656278 0.611909 0.147642 0.777025
+0.134085 -1.124052 -0.661652 0.149462 0.180178 0.972212
+0.171366 -1.036528 -0.683604 0.634792 0.147134 0.758545
+0.198022 -0.974045 -0.698088 0.810359 -0.218358 0.543725
+0.240419 -1.032634 -0.777716 0.920786 -0.013236 0.389843
+0.255171 -0.984125 -0.812184 0.967450 -0.148732 0.204740
+0.255500 -0.909942 -0.759849 0.797797 -0.411239 0.440911
+0.218263 -0.890110 -0.686509 0.614622 -0.586434 0.527576
+0.271029 -0.828348 -0.649493 0.542405 -0.699851 0.464763
+0.327169 -0.847824 -0.782242 0.652450 -0.659835 0.372730
+0.294151 -0.787640 -0.616429 0.526664 -0.709009 0.468968
+0.368785 -0.778217 -0.725018 0.631114 -0.680735 0.371879
+0.130931 -0.873717 -0.601270 0.422409 -0.722174 0.547755
+0.188531 -0.803520 -0.548481 0.442630 -0.719850 0.534691
+0.229238 -0.751868 -0.513438 0.419644 -0.735267 0.532241
+0.352869 -0.722752 -0.593997 0.600464 -0.685633 0.411523
+0.294651 -0.747369 -0.556844 0.463739 -0.725792 0.508107
+0.233252 -0.732483 -0.490942 0.414991 -0.724540 0.550295
+0.070074 -1.244802 -0.663809 0.053225 -0.638746 -0.767574
+0.054464 -1.294657 -0.623404 0.223195 -0.602575 -0.766216
+0.036703 -1.235823 -0.673595 0.130588 -0.583820 -0.801312
+0.025433 -1.305227 -0.627061 0.201777 -0.599173 -0.774776
+0.019013 -1.364328 -0.580399 0.142714 -0.647691 -0.748418
+0.044892 -1.348548 -0.584637 0.262046 -0.595092 -0.759735
+-0.000017 -1.231392 -0.679250 0.061328 -0.552581 -0.831200
+-0.000017 -1.308295 -0.628125 0.090350 -0.579347 -0.810058
+-0.000017 -1.366282 -0.582045 0.123532 -0.644758 -0.754339
+-0.000017 -1.401655 -0.547689 0.114050 -0.687016 -0.717636
+0.013895 -1.398495 -0.548833 0.056612 -0.682070 -0.729093
+0.039635 -1.391853 -0.554379 0.120943 -0.632566 -0.765006
+0.190128 -1.294682 -0.840066 0.936754 -0.314995 0.152546
+0.203642 -1.233119 -0.795930 0.934664 -0.355502 0.004707
+0.156650 -1.356212 -0.761539 0.934664 -0.355502 0.004707
+0.181027 -1.327258 -0.684930 0.910607 -0.387654 -0.143243
+0.091171 -1.508123 -0.790433 0.874673 -0.484092 -0.024548
+0.119215 -1.452959 -0.879041 0.828218 -0.556458 -0.066399
+0.111725 -1.457935 -0.786106 0.884629 -0.456020 0.097345
+0.154512 -1.402559 -0.867532 0.864915 -0.481222 0.142643
+0.131509 -1.409096 -0.777987 0.882291 -0.428236 0.195387
+0.178512 -1.354269 -0.860294 0.867695 -0.459623 0.189347
+0.082036 -1.492716 -0.881297 0.714616 -0.654227 -0.247611
+0.062177 -1.548939 -0.790061 0.766043 -0.618266 -0.175855
+0.062177 -1.548939 -0.790061 0.582972 -0.742236 -0.330500
+0.032314 -1.573539 -0.787490 0.491570 -0.802664 -0.337771
+0.082036 -1.492716 -0.881297 0.651097 -0.717495 -0.247533
+0.044385 -1.529981 -0.878195 0.330144 -0.836286 -0.437756
+0.043526 -1.502736 -0.920470 0.309241 -0.833947 -0.457059
+0.095598 -1.475422 -0.916070 0.642586 -0.755896 -0.125319
+-0.000017 -1.537104 -0.870659 0.056206 -0.858897 -0.509055
+-0.000017 -1.583737 -0.779092 0.121620 -0.894309 -0.430605
+-0.000017 -1.507587 -0.917663 0.059956 -0.845343 -0.530848
+0.130130 -1.431816 -0.909236 0.756876 -0.645283 -0.103675
+0.119215 -1.452959 -0.879041 0.720858 -0.662575 -0.203367
+0.232935 -1.184636 -1.172981 0.863226 0.104196 -0.493948
+0.262478 -1.180367 -1.120451 0.912544 0.070354 -0.402881
+0.228412 -1.270773 -1.165832 0.925217 -0.181320 -0.333312
+0.248806 -1.231756 -1.114913 0.947205 -0.270546 -0.172066
+0.212058 -1.089059 -1.151285 0.839213 0.313317 -0.444469
+0.243257 -1.109294 -1.101869 0.852521 0.335375 -0.400913
+0.019196 -1.594895 -0.641123 0.393888 -0.399213 0.827938
+0.048210 -1.589749 -0.652445 0.346680 -0.464872 0.814682
+0.018462 -1.572862 -0.630150 0.329917 -0.500776 0.800236
+0.042564 -1.569583 -0.636975 0.211180 -0.621257 0.754614
+0.017220 -1.546269 -0.609926 0.091910 -0.597608 0.796503
+0.057574 -1.545277 -0.610821 0.032811 -0.648945 0.760128
+0.060899 -1.501117 -0.582180 0.069607 -0.366628 0.927760
+0.024041 -1.503406 -0.579481 -0.014768 -0.309214 0.950878
+-0.000017 -1.507004 -0.582671 -0.008703 -0.415148 0.909712
+-0.000017 -1.547150 -0.608158 0.113254 -0.532522 0.838805
+-0.000017 -1.476035 -0.579618 -0.155060 0.158287 0.975142
+0.032725 -1.470149 -0.575474 -0.073611 0.302041 0.950449
+0.062696 -1.462112 -0.576113 -0.052045 0.474222 0.878866
+0.034457 -1.418122 -0.626023 -0.067139 0.564120 0.822959
+0.068962 -1.417705 -0.624797 -0.035698 0.596507 0.801814
+-0.000017 -1.419349 -0.627442 -0.106195 0.594731 0.796880
+0.035488 -1.329960 -0.670332 -0.058123 0.448845 0.891718
+-0.000017 -1.339257 -0.666214 -0.033247 0.442230 0.896285
+0.068040 -1.327512 -0.667823 -0.069733 0.439068 0.895744
+0.247080 -1.089240 -0.947536 0.982932 -0.155588 0.098164
+0.261441 -0.950653 -0.936834 0.986501 -0.163747 -0.001462
+0.241338 -1.101547 -0.904321 0.988692 -0.149787 -0.007156
+0.261829 -0.969024 -0.862849 0.980441 -0.189750 -0.052258
+0.275470 -0.919913 -0.839500 0.968994 -0.238567 -0.064319
+0.224168 -1.213435 -0.939482 0.965402 -0.238144 0.106236
+0.220566 -1.216669 -0.913999 0.960564 -0.266812 0.078283
+0.216387 -1.224037 -0.880489 0.954627 -0.297589 -0.011327
+0.244821 -1.124264 -0.861905 0.972957 -0.224317 -0.055113
+0.190478 -1.297658 -0.930004 0.885447 -0.293468 0.360361
+0.204202 -1.276883 -0.942053 0.880893 -0.257214 0.397327
+0.198484 -1.333706 -0.937192 0.549279 -0.175471 0.817008
+0.208750 -1.327152 -0.949713 0.916620 -0.270542 0.294304
+0.191269 -1.311910 -0.896540 0.830252 -0.500275 -0.245778
+0.190128 -1.294682 -0.840066 0.971939 -0.218796 0.086383
+0.178512 -1.354269 -0.860294 0.936711 -0.350039 0.006659
+0.179262 -1.351104 -0.883960 0.870083 -0.332445 -0.363918
+0.154512 -1.402559 -0.867532 0.852436 -0.518052 -0.070526
+0.161729 -1.386568 -0.896266 0.871447 -0.311587 -0.378805
+0.145069 -1.397383 -0.918884 0.975045 -0.204700 -0.085936
+0.156931 -1.380106 -0.899919 0.616919 0.120555 -0.777739
+0.144229 -1.389823 -0.917095 0.912502 0.150549 0.380361
+0.174074 -1.349980 -0.894637 0.630083 -0.182015 -0.754894
+0.175696 -1.319335 -0.902466 0.616281 -0.555601 -0.558127
+0.175093 -1.314950 -0.923527 0.609423 -0.658316 0.441840
+0.182783 -1.335078 -0.932330 0.315560 -0.182195 0.931250
+0.183244 -1.375734 -0.941167 0.728543 -0.485095 0.483640
+0.169463 -1.373555 -0.931681 0.427045 -0.083163 0.900398
+0.125424 -1.349364 -0.914963 0.949422 -0.313338 0.020439
+0.187896 -1.370655 -0.952735 0.829040 -0.557342 -0.045425
+0.184488 -1.353751 -1.012516 0.913977 -0.404281 -0.034678
+0.200128 -1.310606 -1.001052 0.916991 -0.396056 0.047620
+0.205313 -1.318320 -1.042482 0.883094 -0.438534 0.166834
+0.203321 -1.329595 -1.068720 0.620192 -0.783307 0.042324
+0.163428 -1.392704 -1.039889 0.797970 -0.602309 -0.021611
+0.215237 -1.295989 -1.027565 0.839186 -0.506033 0.199245
+0.210022 -1.325508 -1.096257 0.366051 -0.929312 -0.048850
+0.185016 -1.368596 -1.120970 0.754149 -0.656150 -0.026947
+0.162490 -1.393819 -0.950832 0.727543 -0.685505 0.027635
+0.147895 -1.405185 -0.938309 0.764402 -0.609578 0.210010
+0.130130 -1.431816 -0.909236 0.817884 -0.562628 -0.120479
+0.138628 -1.415715 -0.925182 0.872071 -0.487121 -0.046966
+0.119215 -1.452959 -0.879041 0.825370 -0.557091 -0.091726
+0.144216 -1.389224 -1.142150 0.323626 -0.721749 -0.611837
+0.122807 -1.432474 -1.061670 0.502365 -0.827056 -0.252203
+0.111983 -1.455975 -0.988007 0.607251 -0.779265 -0.154894
+0.115076 -1.457540 -0.963420 0.645628 -0.763335 -0.021992
+0.108948 -1.462815 -0.939119 0.648169 -0.761278 0.018221
+0.095598 -1.475422 -0.916070 0.647435 -0.747161 -0.150261
+0.082822 -1.405828 -1.147955 0.285196 -0.773232 -0.566370
+0.085390 -1.351693 -1.181174 0.203423 -0.534268 -0.820474
+0.148298 -1.343492 -1.172147 0.188463 -0.550347 -0.813387
+0.226916 -1.332009 -1.085243 -0.160133 -0.983429 -0.084994
+0.232787 -1.331807 -1.063047 -0.080643 -0.996279 0.030397
+0.068422 -1.451326 -1.066913 0.377519 -0.868762 -0.320520
+0.047971 -1.490109 -0.980232 0.437361 -0.895919 -0.077744
+0.052737 -1.482106 -1.004878 0.451365 -0.869342 -0.201281
+0.043526 -1.502736 -0.920470 0.461100 -0.827405 -0.320607
+0.045040 -1.490148 -0.950779 0.427742 -0.886638 -0.175810
+0.000000 0.690640 -0.766550 0.083511 0.531548 0.842901
+0.000000 0.583122 -0.715693 -0.130451 0.390084 0.911492
+0.008274 0.689589 -0.762612 0.125130 0.391939 0.911442
+0.009831 0.582357 -0.722762 0.573132 0.292757 0.765384
+0.000000 0.792848 -0.871132 0.429239 0.637745 0.639558
+-0.008275 0.689589 -0.762612 0.350114 0.531118 0.771578
+-0.020074 0.802988 -0.859710 0.575518 0.565618 0.590640
+-0.009831 0.582357 -0.722762 -0.078415 0.345235 0.935235
+0.000000 0.473072 -0.669559 -0.360995 0.408163 0.838502
+-0.042466 0.462186 -0.676207 -0.203483 0.426921 0.881098
+0.000000 0.362368 -0.606042 -0.224976 0.494455 0.839583
+-0.025789 0.687817 -0.748559 0.579702 0.419644 0.698458
+-0.059104 0.807325 -0.828836 0.546257 0.570138 0.613633
+-0.022530 0.582900 -0.720376 0.372846 0.219888 0.901463
+-0.073671 0.464847 -0.696580 0.054131 0.154441 0.986518
+-0.087118 0.775469 -0.767209 0.721483 0.558864 0.408820
+-0.037486 0.686148 -0.731377 0.793309 0.319706 0.518121
+-0.030152 0.581907 -0.713972 0.574630 -0.041534 0.817359
+-0.091850 0.479491 -0.699313 0.195414 0.022613 0.980460
+-0.110497 0.357001 -0.628471 -0.195038 0.507138 0.839507
+-0.047675 0.582939 -0.689279 0.845393 -0.123815 0.519596
+-0.103255 0.494590 -0.692424 0.681233 -0.400258 0.612957
+-0.116679 0.512235 -0.650594 0.759798 -0.474825 0.444127
+-0.070740 0.591315 -0.644639 0.873777 -0.227008 0.430095
+-0.051595 0.678974 -0.703427 0.887107 0.247807 0.389400
+-0.068726 0.667268 -0.647439 0.930431 0.175935 0.321474
+-0.088868 0.769612 -0.732977 0.826241 0.480255 0.294415
+-0.098672 0.741881 -0.649914 0.868274 0.398897 0.294926
+0.298690 -0.872468 -0.981866 0.861232 -0.493985 -0.119409
+0.250557 -0.893329 -1.103714 0.803384 -0.527433 -0.276386
+0.378254 -0.754824 -1.055511 0.821280 -0.444724 -0.357379
+0.315181 -0.764996 -1.175598 0.815775 -0.424816 -0.392483
+0.417389 -0.603646 -1.074460 0.895260 -0.038631 -0.443866
+0.352477 -0.606807 -1.199774 0.878490 -0.167214 -0.447543
+0.412246 -0.462044 -1.047188 0.879460 0.144002 -0.453667
+0.335016 -0.477144 -1.219440 0.893182 0.127510 -0.431238
+0.261441 -0.950653 -0.936834 0.965166 -0.254281 -0.061605
+0.241437 -0.975757 -1.025889 0.972289 -0.143433 -0.184610
+0.250818 -1.070818 -0.986752 0.998471 -0.041018 -0.037047
+0.247080 -1.089240 -0.947536 0.983391 -0.088145 0.158657
+0.233524 -1.041313 -1.070262 0.964188 0.178859 -0.195833
+0.249739 -1.082750 -1.018378 0.993758 -0.082950 -0.074588
+0.246504 -1.119261 -0.985145 0.827348 0.256706 0.499597
+0.249192 -1.146517 -0.975926 0.660126 0.067135 0.748149
+0.243257 -1.109294 -1.101869 0.940610 0.270076 -0.205699
+0.252678 -1.118911 -1.071416 0.993537 0.092280 0.066093
+0.238374 -1.125403 -1.004741 -0.348228 0.935244 -0.063683
+0.262478 -1.180367 -1.120451 0.998435 0.022897 0.051017
+0.253958 -1.187852 -1.077022 0.966160 -0.148754 0.210732
+0.244883 -1.193270 -1.045580 0.968097 -0.117796 0.221161
+0.248604 -1.153758 -1.051702 0.950081 0.052432 0.307567
+0.234110 -1.139745 -1.016009 0.915809 0.316766 0.246888
+0.234936 -1.155538 -1.017211 -0.975665 0.027170 -0.217578
+0.236887 -1.166535 -1.012875 0.665138 -0.731748 -0.148784
+0.327169 -0.847824 -0.782242 0.829935 -0.555632 -0.049807
+0.275470 -0.919913 -0.839500 0.869590 -0.493259 -0.022553
+0.397077 -0.294104 -1.040035 0.871306 0.011498 -0.490605
+0.317998 -0.316945 -1.171010 0.869610 0.082195 -0.486849
+0.390117 -0.124181 -1.050900 0.898058 -0.023549 -0.439246
+0.333440 -0.148889 -1.169196 0.889200 -0.028833 -0.456610
+0.392132 0.008478 -1.063792 0.882835 0.053351 -0.466643
+0.334864 -0.008152 -1.173440 0.891277 0.008764 -0.453375
+0.372005 0.173291 -1.062321 0.861340 0.188144 -0.471905
+0.316565 0.155536 -1.170591 0.872610 0.174303 -0.456256
+0.328173 0.316278 -1.060432 0.938331 0.145317 -0.313717
+0.284178 0.314571 -1.157604 0.888441 0.214083 -0.406006
+0.231478 -1.201274 -0.999141 0.967196 -0.248450 0.052955
+0.239514 -1.236328 -1.048406 0.959851 -0.051524 0.275738
+0.224168 -1.213435 -0.939482 0.944972 -0.298879 0.133038
+0.216812 -1.256261 -1.004349 0.920939 -0.258035 0.292044
+0.229302 -1.271132 -1.029667 0.734770 -0.018327 0.678069
+0.215237 -1.295989 -1.027565 0.533326 -0.376692 0.757408
+0.200128 -1.310606 -1.001052 0.981875 -0.148916 0.117238
+0.269315 -1.094963 -1.000722 -0.117342 0.805782 0.580471
+0.267256 -1.108005 -0.996575 0.651377 -0.072590 0.755274
+0.256752 -1.119221 -0.988089 0.575285 0.193383 0.794764
+0.249978 -1.105225 -1.022424 -0.751452 0.624332 -0.213376
+0.245774 -1.173403 -0.979229 0.676432 -0.566488 0.470670
+0.264580 -1.166326 -0.984473 0.581478 0.162648 0.797138
+0.258494 -1.145483 -0.981235 0.854153 0.184090 0.486347
+0.239167 -1.174720 -0.997346 0.142423 -0.945968 -0.291307
+0.265864 -1.184636 -1.016200 -0.313535 -0.947793 -0.058180
+0.285269 -1.182847 -0.993891 0.391598 -0.472427 0.789598
+0.248854 -1.170372 -1.033533 -0.614132 -0.658712 -0.434673
+0.241315 -1.130242 -1.036225 -0.885553 0.201567 -0.418529
+0.241855 -1.154453 -1.038826 -0.822110 -0.195842 -0.534585
+0.262764 -1.123355 -0.998650 0.887225 -0.151539 0.435738
+0.285763 -1.111916 -1.028553 0.764528 -0.362403 0.533068
+0.288573 -1.098594 -1.015810 0.685830 -0.196995 0.700593
+0.258619 -1.146066 -0.997343 0.890722 0.173522 0.420125
+0.269591 -1.163410 -0.996000 0.764519 0.539919 0.352133
+0.275650 -1.171798 -0.990842 0.571684 0.610951 0.547646
+0.292806 -1.167308 -1.027903 0.557452 0.697656 0.450025
+0.305709 -1.176263 -1.011915 0.526764 0.554880 0.643916
+0.312003 -1.163003 -1.057184 0.369826 0.619867 0.692094
+0.329523 -1.172598 -1.035929 0.354239 0.719317 0.597577
+0.338580 -1.146774 -1.069065 0.072299 0.422737 0.903364
+0.357730 -1.155275 -1.061677 0.283889 0.500282 0.818001
+0.348439 -1.131245 -1.076251 0.170741 0.088665 0.981318
+0.363280 -1.128177 -1.076717 0.196331 0.115188 0.973748
+0.248806 -1.231756 -1.114913 0.965488 -0.171123 0.196340
+0.241433 -1.230007 -1.081590 0.989962 -0.051495 0.131619
+0.239249 -1.257875 -1.047984 0.835927 0.338767 0.431813
+0.245950 -1.253788 -1.075520 0.898114 0.436682 0.051963
+0.246845 -1.260431 -1.101758 0.904770 0.380324 -0.191690
+0.332474 0.404321 -1.013368 0.993343 -0.091324 -0.070207
+0.360061 0.306779 -0.937631 0.914547 0.403588 0.026854
+0.303637 0.359237 -0.823789 0.952544 0.269371 0.141769
+0.337829 0.315369 -0.803507 0.766073 0.636948 0.086189
+0.346506 0.444275 -0.970240 0.932693 -0.359786 -0.025269
+0.316694 0.395121 -0.826608 0.949017 -0.302780 0.087693
+0.341636 0.537693 -1.091500 0.956131 -0.136411 -0.259242
+0.343043 0.675234 -1.105304 0.970776 0.109985 -0.213303
+0.316567 0.674269 -1.177092 0.937843 -0.043632 -0.344306
+0.314782 0.525202 -1.163291 0.962549 -0.092400 -0.254876
+0.204202 -1.276883 -0.942053 0.986262 -0.163929 0.020375
+0.208750 -1.327152 -0.949713 0.985454 0.109022 -0.130363
+0.205313 -1.318320 -1.042482 -0.010924 -0.795052 0.606443
+0.242641 -1.323309 -1.050722 0.101886 -0.611524 0.784639
+0.254410 -1.304698 -1.046883 0.440101 -0.146872 0.885856
+0.266277 -1.288375 -1.056593 0.681786 0.347347 0.643830
+0.269983 -1.278411 -1.076312 0.711865 0.683517 0.161411
+0.267838 -1.280775 -1.098341 0.565714 0.720670 -0.400752
+0.257984 -1.289274 -1.110665 0.274181 0.555918 -0.784717
+0.305364 -1.183834 -1.009540 0.459578 -0.736047 0.497014
+0.279820 -1.188245 -1.025279 -0.166661 -0.976836 -0.134223
+0.307100 -1.138480 -1.061830 0.506826 0.093010 0.857016
+0.285691 -1.140543 -1.030960 0.799903 0.113121 0.589372
+0.261805 -1.101313 -1.030666 -0.495932 0.794792 -0.349795
+0.279409 -1.091644 -1.009008 0.084789 0.934848 0.344776
+0.259265 -1.170908 -1.043556 -0.534575 -0.671104 -0.513662
+0.250970 -1.153046 -1.047842 -0.682829 -0.212688 -0.698934
+0.248197 -1.128193 -1.043317 -0.708654 0.312636 -0.632510
+0.372903 -1.126281 -1.083700 0.914892 0.346913 0.206458
+0.361278 -1.160513 -1.063353 0.921601 -0.357889 0.150226
+0.305015 -1.109486 -1.057336 0.569036 -0.419974 0.706979
+0.351163 -1.098161 -1.069294 0.736071 0.523862 0.428682
+0.348203 -1.105637 -1.066348 0.415283 -0.289559 0.862378
+0.332497 -1.106033 -1.077487 -0.102710 0.624481 -0.774257
+0.355910 -1.129597 -1.088021 0.088969 -0.151206 -0.984490
+0.302519 -1.120087 -1.073390 -0.342571 0.330690 -0.879369
+0.311070 -1.142928 -1.084190 -0.251800 -0.114754 -0.960952
+0.311638 -1.094821 -1.038957 0.596041 -0.455771 0.661066
+0.310419 -1.086322 -1.035124 0.468103 0.798186 0.379181
+0.336180 -1.117070 -1.070676 0.217165 -0.290676 0.931851
+0.331961 -1.180666 -1.031806 0.725049 -0.488773 0.485185
+0.343269 -1.163795 -1.072610 0.214611 -0.753495 -0.621440
+0.304348 -1.184538 -1.045493 0.030342 -0.934656 -0.354257
+0.310055 -1.161948 -1.072657 -0.128742 -0.566808 -0.813728
+0.269765 -1.171450 -1.053666 -0.360501 -0.692727 -0.624634
+0.263232 -1.151909 -1.060025 -0.524795 -0.206638 -0.825767
+0.259996 -1.124678 -1.055475 -0.600324 0.334949 -0.726237
+0.287581 -1.097294 -1.050728 -0.349338 0.781348 -0.517164
+0.388560 0.573610 -0.906970 0.999205 0.038918 -0.008631
+0.380000 0.479387 -0.850625 0.948167 -0.314655 -0.044401
+0.311188 0.429845 -0.743750 0.855672 -0.507549 0.101094
+0.343117 0.533016 -0.669788 0.981688 0.011891 0.190122
+0.346101 0.613384 -0.684474 0.958784 0.226629 0.171383
+0.315812 0.762780 -1.086902 0.869631 0.488062 -0.074413
+0.362855 0.685884 -0.934781 0.941817 0.336066 0.006341
+0.251929 0.841469 -1.034970 0.632483 0.774405 0.016214
+0.310224 0.786234 -0.897804 0.764913 0.643963 -0.014852
+0.257483 0.826472 -0.861991 0.502394 0.856290 0.119866
+0.310846 0.688865 -0.685292 0.890389 0.417832 0.180620
+0.232787 -1.331807 -1.063047 -0.208906 -0.891673 0.401594
+0.268365 -1.346147 -1.071792 -0.171803 -0.838318 0.517404
+0.286550 -1.340647 -1.068406 0.292461 -0.522466 0.800934
+0.303166 -1.329213 -1.075417 0.692345 -0.058235 0.719212
+0.308512 -1.316096 -1.089215 0.854075 0.413328 0.315779
+0.301198 -1.305795 -1.104480 0.688544 0.693634 -0.211611
+0.285145 -1.302507 -1.116210 0.282760 0.672985 -0.683475
+0.268578 -1.308589 -1.120256 -0.046225 0.501322 -0.864025
+0.203321 -1.329595 -1.068720 -0.144933 -0.905023 0.399910
+0.254542 -1.344734 -1.085416 -0.503013 -0.864086 0.018250
+0.274666 -1.359736 -1.099968 -0.524116 -0.820674 0.227590
+0.288390 -1.360377 -1.091232 -0.052882 -0.820122 0.569740
+0.303621 -1.354242 -1.090079 0.500846 -0.564815 0.655849
+0.314608 -1.343556 -1.097327 0.902759 -0.145731 0.404708
+0.316874 -1.332587 -1.110568 0.959480 0.277766 -0.047366
+0.309308 -1.325785 -1.124591 0.662541 0.549540 -0.508966
+0.294958 -1.325751 -1.133573 0.176502 0.567114 -0.804505
+0.279678 -1.332219 -1.133962 -0.162407 0.436880 -0.884737
+0.191441 0.840666 -0.814931 0.369792 0.895137 0.248964
+0.172004 0.879637 -0.926179 0.435123 0.886904 0.155143
+0.267416 -1.352851 -1.113071 -0.711624 -0.701098 -0.045296
+0.279987 -1.368770 -1.123823 -0.726580 -0.638507 0.253754
+0.289240 -1.375075 -1.116338 -0.527158 -0.686185 0.501253
+0.302076 -1.379138 -1.116024 0.038248 -0.729401 0.683017
+0.313594 -1.379406 -1.122999 0.628951 -0.574125 0.524214
+0.319393 -1.375778 -1.134600 0.960594 -0.264435 0.085635
+0.317259 -1.369638 -1.146396 0.935311 0.080790 -0.344480
+0.308007 -1.363333 -1.153881 0.467976 0.504713 -0.725440
+0.295170 -1.359270 -1.154195 0.183759 0.515924 -0.836693
+0.226916 -1.332009 -1.085243 -0.439995 -0.865074 -0.240937
+0.249879 -1.335757 -1.102068 -0.544320 -0.771618 -0.329121
+0.282051 -1.390649 -1.140099 -0.757970 -0.416288 0.502181
+0.287698 -1.399218 -1.137627 -0.443013 -0.572202 0.690162
+0.294956 -1.406136 -1.140856 0.183325 -0.696257 0.693988
+0.301081 -1.408959 -1.148293 0.714398 -0.609838 0.343123
+0.303994 -1.406916 -1.157166 0.923949 -0.343429 -0.168447
+0.302777 -1.400832 -1.164291 0.910826 -0.223920 -0.346780
+0.230621 -1.322045 -1.104962 -0.465113 -0.751862 -0.467305
+0.144773 -0.369613 -0.521976 0.521828 0.061276 0.850847
+0.229770 -0.368127 -0.574212 0.445918 -0.004395 0.895063
+0.163313 -0.268688 -0.540615 0.445918 -0.004395 0.895063
+0.305341 -0.258291 -0.595608 0.364643 -0.070014 0.928511
+0.263580 0.140392 -1.261915 0.463632 0.082094 -0.882216
+0.276410 -0.024242 -1.265942 0.523653 0.085940 -0.847586
+0.121794 0.126862 -1.337687 0.465797 0.117416 -0.877067
+0.126253 -0.069033 -1.371295 0.582573 0.146614 -0.799445
+0.108528 0.360089 -1.304915 0.395611 0.149826 -0.906115
+0.229655 0.334608 -1.256244 0.428548 0.128128 -0.894388
+0.268996 -0.166749 -1.278754 0.632808 0.104040 -0.767287
+0.121475 -0.199653 -1.417969 0.686186 0.123558 -0.716856
+0.236095 -0.336440 -1.315803 0.706301 0.065363 -0.704887
+0.108530 -0.355331 -1.455653 0.727833 0.103571 -0.677888
+0.236095 -0.336440 -1.315803 0.708978 0.205884 -0.674509
+0.219620 -0.509012 -1.385795 0.678572 0.165171 -0.715723
+0.108530 -0.355331 -1.455653 0.678572 0.165171 -0.715723
+0.114572 -0.524305 -1.478219 0.645261 0.123750 -0.753873
+0.093267 0.537123 -1.340819 -0.138003 0.068851 -0.988036
+0.000000 0.531584 -1.328178 0.063134 -0.071490 -0.995441
+0.078983 0.672760 -1.329372 0.157706 0.033446 -0.986920
+0.038019 0.674176 -1.342369 0.230372 0.013309 -0.973012
+0.000000 0.675576 -1.343699 0.028893 -0.009968 -0.999533
+0.000000 0.725216 -1.341540 0.004020 0.071121 -0.997460
+0.028482 0.725216 -1.340985 0.136871 0.082440 -0.987153
+0.060854 0.725216 -1.324017 0.383738 0.155604 -0.910238
+-0.028482 0.725216 -1.340985 -0.019302 0.135692 -0.990563
+-0.027126 0.812922 -1.328997 -0.314978 0.062121 -0.947064
+0.000000 0.812923 -1.340139 0.000000 0.026585 -0.999647
+-0.025062 0.911391 -1.323454 -0.455667 0.031140 -0.889605
+0.000000 0.911391 -1.336474 0.000000 0.042160 -0.999111
+0.027126 0.812922 -1.328997 0.314978 0.062121 -0.947064
+0.000000 0.991296 -1.334681 -0.099392 0.018440 -0.994877
+0.025062 0.911391 -1.323454 0.455667 0.031140 -0.889605
+0.023843 0.991295 -1.322813 0.445563 0.013978 -0.895142
+-0.023843 0.991295 -1.322813 -0.589910 0.011979 -0.807380
+0.000000 1.075632 -1.333278 -0.430226 0.017000 -0.902561
+-0.023086 1.075631 -1.322514 -0.723055 0.019230 -0.690523
+0.000000 1.166052 -1.330374 -0.410519 0.027016 -0.911452
+-0.020764 1.166052 -1.321185 -0.709049 0.026115 -0.704676
+0.000000 1.253848 -1.327673 -0.381797 0.017721 -0.924076
+-0.033219 1.075631 -1.297518 -0.999821 0.018543 -0.003890
+-0.033976 0.991295 -1.297518 -0.990970 0.009364 -0.133759
+-0.023086 1.075631 -1.272521 -0.758387 0.018586 0.651539
+-0.023843 0.991295 -1.272223 -0.709153 0.000612 0.705055
+-0.019217 1.253847 -1.320011 -0.700674 0.017142 -0.713276
+0.000000 1.349349 -1.327047 -0.406618 0.015636 -0.913464
+-0.030897 1.166052 -1.297518 -0.999700 0.023654 -0.006377
+0.000000 1.075632 -1.258652 -0.518343 0.019264 0.854956
+-0.020764 1.166052 -1.273851 -0.754054 0.023760 0.656382
+0.000000 0.991296 -1.257709 -0.518305 -0.001554 0.855195
+0.000000 0.911391 -1.259761 -0.483798 0.005617 0.875162
+-0.022481 0.911391 -1.271582 -0.486695 0.019337 0.873358
+0.000000 0.812923 -1.255352 -0.497166 0.029422 0.867156
+-0.029112 0.812922 -1.273484 -0.528580 0.019203 0.848666
+-0.029351 1.253847 -1.297518 -0.999854 0.015151 -0.007878
+0.000000 1.166052 -1.261031 -0.513665 0.024852 0.857631
+-0.019217 1.253847 -1.275025 -0.739203 0.020009 0.673186
+-0.018443 1.349348 -1.318398 -0.710578 0.023155 -0.703238
+0.000000 1.442863 -1.324767 -0.449778 0.033099 -0.892527
+-0.028576 1.349348 -1.297518 -0.999671 0.023575 -0.010084
+0.000000 1.253848 -1.264209 -0.487623 0.023695 0.872733
+-0.018443 1.349348 -1.276638 -0.722139 0.026806 0.691228
+-0.015295 1.442862 -1.316786 -0.712366 0.043591 -0.700453
+0.000000 1.519330 -1.320764 -0.478030 0.062784 -0.876097
+-0.025428 1.442862 -1.297518 -0.998992 0.041707 -0.016593
+0.000000 1.349350 -1.266484 -0.482657 0.027709 0.875371
+-0.015295 1.442862 -1.278250 -0.705578 0.041854 0.707395
+-0.012210 1.519316 -1.313955 -0.707251 0.074857 -0.702988
+0.000000 1.584920 -1.313976 -0.525223 0.180011 -0.831707
+-0.007202 1.584741 -1.309190 -0.724131 0.195871 -0.661263
+0.000000 1.622242 -1.297518 -0.893076 0.449905 0.000013
+0.000000 1.584920 -1.281061 -0.543125 0.225448 0.808819
+-0.007202 1.584740 -1.285847 -0.663513 0.198677 0.721303
+-0.015217 1.584564 -1.297518 -0.967707 0.219246 0.124396
+-0.022343 1.519310 -1.297518 -0.996622 0.079875 -0.019073
+0.000000 1.442863 -1.269792 -0.509986 0.038444 0.859323
+-0.012210 1.519316 -1.281081 -0.704258 0.074669 0.706007
+0.000000 1.519330 -1.272790 -0.557861 0.079860 0.826083
+0.229770 -0.368127 -0.574212 0.625354 0.168151 0.762009
+0.348259 -0.357136 -0.682947 0.719697 0.083714 0.689223
+0.305341 -0.258291 -0.595608 0.616566 -0.188544 0.764393
+0.390662 -0.263803 -0.714595 0.809996 -0.172247 0.560569
+0.408121 -0.129847 -0.708110 0.849486 -0.010222 0.527513
+0.334028 -0.151073 -0.594810 0.640147 -0.076359 0.764448
+0.163313 -0.268688 -0.540615 0.365756 -0.105031 0.924765
+0.173069 -0.171989 -0.533491 0.365030 -0.094204 0.926217
+0.401509 0.019700 -0.719666 0.852924 0.151007 0.499718
+0.337591 0.012575 -0.608417 0.746279 0.149665 0.648589
+0.186971 -0.445619 -0.537279 -0.098541 0.893629 0.437855
+0.338005 -0.375625 -0.651199 0.471654 0.774706 0.421157
+0.317899 0.220593 -0.663392 0.636941 0.394015 0.662615
+0.372288 0.218413 -0.760127 0.829740 0.301488 0.469720
+0.181052 0.003963 -0.522829 0.456971 0.118554 0.881546
+0.219224 0.341114 -0.687039 0.527205 0.605559 0.596116
+0.337829 0.315369 -0.803507 0.629976 0.631413 0.452159
+0.157486 0.215574 -0.562074 0.482479 0.411265 0.773353
+0.303637 0.359237 -0.823789 0.701341 0.041246 0.711631
+0.193934 0.374098 -0.718043 0.672829 0.416328 0.611532
+0.316694 0.395121 -0.826608 0.584191 -0.559076 0.588350
+0.194984 0.389910 -0.710710 0.554804 -0.555641 0.619238
+0.323346 -0.382968 -0.595644 0.079091 0.992845 0.089462
+0.405733 -0.421712 -0.714452 0.596425 0.793285 0.122380
+0.396773 -0.408556 -0.803304 0.598110 0.799310 0.058036
+0.210664 -0.440016 -0.501884 -0.385861 0.915372 0.114913
+0.325815 -0.384064 -0.553484 -0.117163 0.989441 0.085318
+0.210983 -0.443751 -0.483240 -0.359252 0.913856 0.189222
+0.391453 -0.418047 -0.607499 0.459747 0.887942 0.013822
+0.110497 0.357001 -0.628471 0.466506 0.498142 0.730908
+0.311188 0.429845 -0.743750 0.384860 -0.799763 0.460719
+0.193418 0.414036 -0.679360 0.360958 -0.793368 0.490181
+0.291123 0.470982 -0.647226 0.509474 -0.743804 0.432657
+0.196093 0.452835 -0.612980 0.338413 -0.840304 0.423517
+0.266554 0.508384 -0.555996 0.474387 -0.774569 0.418329
+0.200296 0.489186 -0.533589 0.371833 -0.851326 0.370114
+0.343117 0.533016 -0.669788 0.946207 -0.148915 0.287257
+0.318289 0.563922 -0.566455 0.867262 -0.358627 0.345316
+0.346101 0.613384 -0.684474 0.938336 0.269938 0.216007
+0.311358 0.632463 -0.562152 0.960617 0.155920 0.230010
+0.310846 0.688865 -0.685292 0.847324 0.498279 0.183740
+0.290660 0.682530 -0.558843 0.861641 0.476629 0.174355
+0.275723 0.755235 -0.676234 0.605431 0.733184 0.309669
+0.263180 0.713418 -0.550893 0.708539 0.661757 0.245052
+0.228561 0.777364 -0.667726 0.449092 0.828611 0.334246
+0.220027 0.731594 -0.542794 0.433750 0.838582 0.329609
+0.000000 -0.820987 -0.477658 0.302497 -0.509654 0.805449
+0.000000 -0.882034 -0.516286 0.319041 -0.542087 0.777402
+0.080293 -0.814335 -0.503604 0.389750 -0.527089 0.755163
+0.066691 -0.876853 -0.541093 0.466128 -0.571736 0.675161
+0.188531 -0.803520 -0.548481 0.359673 -0.585726 0.726334
+0.130931 -0.873717 -0.601270 0.506900 -0.603293 0.615703
+0.106014 -0.926096 -0.629367 0.548687 -0.380569 0.744386
+0.054010 -0.924554 -0.576161 0.533009 -0.542973 0.648908
+0.000000 -0.931320 -0.554331 0.342424 -0.595835 0.726448
+0.093092 -0.998740 -0.644095 0.459926 -0.113140 0.880720
+0.171366 -1.036528 -0.683604 0.465137 -0.093144 0.880325
+0.198022 -0.974045 -0.698088 0.541430 -0.147373 0.827728
+0.084065 -1.085169 -0.641995 0.407211 0.165371 0.898238
+0.134085 -1.124052 -0.661652 0.440368 0.188158 0.877880
+0.139670 -0.729077 -0.486843 0.437952 -0.307618 0.844730
+0.075642 -0.735415 -0.462425 0.362015 -0.383036 0.849840
+0.218263 -0.890110 -0.686509 0.514962 -0.417311 0.748776
+0.045699 -0.984531 -0.606911 0.596053 -0.279819 0.752610
+0.155468 -1.236804 -0.630819 0.462097 0.147331 0.874506
+0.201473 -1.208949 -0.656278 0.535988 0.026057 0.843823
+0.044879 -1.066202 -0.622145 0.512264 -0.014685 0.858702
+0.139402 -1.274319 -0.619443 0.682363 -0.100216 0.724111
+0.106292 -1.214490 -0.609168 0.469728 0.263475 0.842577
+0.028430 -1.191998 -0.592604 0.331738 0.270534 0.903748
+0.072683 -1.196973 -0.602534 0.285708 0.348718 0.892618
+0.107871 -1.323799 -0.578042 0.831398 -0.065902 0.551756
+0.127010 -1.303758 -0.615782 0.848695 -0.526875 0.046037
+0.101575 -1.353245 -0.577932 0.878926 -0.425859 0.214786
+0.141154 -1.289671 -0.632284 0.284496 -0.687509 0.668127
+0.217239 -1.235284 -0.685585 0.778468 -0.177402 0.602093
+0.164410 -1.289065 -0.635710 0.398839 0.046729 0.915830
+0.161549 -1.276360 -0.634034 0.398166 -0.178562 0.899766
+0.163755 -1.303910 -0.634987 0.646679 0.014569 0.762623
+0.198106 -1.282808 -0.684246 0.859140 -0.236890 0.453609
+0.160675 -1.327495 -0.631884 0.815560 -0.036226 0.577537
+0.181027 -1.327258 -0.684930 0.934363 -0.313721 0.168949
+0.158337 -1.364142 -0.622466 0.869381 -0.145043 0.472377
+0.154497 -1.380270 -0.678829 0.929443 -0.367955 -0.027304
+0.061988 -1.284424 -0.560729 0.267470 0.367239 0.890840
+0.083975 -1.293200 -0.566737 0.508683 0.276170 0.815458
+0.143365 -1.414398 -0.669677 0.950203 -0.311571 -0.006078
+0.135294 -1.430873 -0.717779 0.947524 -0.304022 -0.098835
+0.144574 -1.406805 -0.621260 0.862880 -0.272552 0.425621
+0.129576 -1.405361 -0.603754 0.377867 0.080825 0.922325
+0.139376 -1.362009 -0.611108 0.173088 0.140189 0.974878
+0.072233 -0.668912 -0.433957 0.537359 -0.121704 0.834526
+0.130595 -0.640555 -0.478463 0.402414 0.070315 0.912754
+0.143894 -1.296556 -0.636116 -0.178994 -0.012784 0.983767
+0.146131 -1.308268 -0.627509 -0.351591 0.353222 0.866959
+0.145445 -1.326647 -0.619138 0.191628 0.257689 0.947035
+0.132645 -1.361377 -0.611443 -0.498868 0.310691 0.809075
+0.139083 -1.326727 -0.623711 -0.626290 0.349117 0.697050
+0.122685 -1.405695 -0.604309 -0.214586 0.354508 0.910097
+0.118962 -1.437387 -0.596255 0.699948 -0.139712 0.700395
+0.128445 -1.442977 -0.627141 0.914997 -0.287825 0.282732
+0.125944 -1.491134 -0.642916 0.948998 -0.244915 0.198541
+0.115440 -1.495687 -0.619527 0.778850 -0.363011 0.511484
+0.119194 -1.324339 -0.660955 -0.522894 0.398764 0.753372
+0.118120 -1.278789 -0.677453 -0.729447 -0.125026 0.672515
+0.138638 -1.308886 -0.637077 -0.805129 0.170672 0.568013
+0.134660 -1.297916 -0.641700 -0.740374 -0.405585 0.536047
+0.129485 -1.292252 -0.638544 -0.246744 -0.928812 -0.276453
+0.089667 -1.497634 -0.594454 0.501498 -0.323117 0.802555
+0.091568 -1.447681 -0.580916 0.045685 0.346884 0.936795
+0.096465 -1.343108 -0.564166 0.763581 -0.026697 0.645160
+0.072713 -1.377240 -0.548504 0.672760 -0.532612 0.513535
+0.088895 -1.370848 -0.574027 0.441650 -0.806378 -0.393318
+0.079852 -1.324992 -0.553916 0.533730 0.271093 0.801025
+0.026260 -1.280054 -0.556299 0.182762 0.381391 0.906167
+0.055126 -1.320242 -0.544940 0.270332 0.321042 0.907663
+0.071629 -1.379708 -0.565028 0.249842 -0.888289 -0.385386
+0.074056 -1.339260 -0.590221 -0.111140 -0.538403 -0.835327
+0.111616 -1.327029 -0.608226 0.321276 -0.688704 -0.649976
+0.107044 -1.541398 -0.649263 0.793218 -0.559099 0.241275
+0.114816 -1.528464 -0.668639 0.879766 -0.462867 0.108473
+0.085495 -1.544567 -0.622349 0.485634 -0.671105 0.560159
+0.156650 -1.356212 -0.761539 0.916740 -0.380221 -0.122554
+0.131509 -1.409096 -0.777987 0.926027 -0.317579 -0.204004
+0.120670 -1.476615 -0.732980 0.951799 -0.255756 -0.169316
+0.103226 -1.263748 -0.674458 -0.635152 -0.752882 0.172483
+0.132940 -1.443241 -0.645172 0.969703 -0.220537 0.105069
+0.132277 -1.445773 -0.698382 0.974045 -0.211133 -0.081608
+0.103408 -1.413538 -0.607254 -0.387582 0.586059 0.711558
+0.081666 -1.289704 -0.623371 -0.089859 -0.589101 -0.803047
+0.107095 -1.521984 -0.746441 0.894077 -0.308566 -0.324673
+0.111725 -1.457935 -0.786106 0.908479 -0.285657 -0.305067
+0.091704 -1.556855 -0.667292 0.629621 -0.686802 0.363153
+0.101380 -1.557837 -0.680852 0.762316 -0.494111 0.418006
+0.070546 -1.562914 -0.651884 0.440872 -0.751348 0.491028
+0.023249 -1.315241 -0.541154 0.135504 0.299456 0.944439
+0.050513 -1.365189 -0.530957 0.319701 -0.009112 0.947475
+0.018619 -1.370303 -0.523921 0.180053 0.001879 0.983655
+0.133691 -1.465766 -0.673240 0.986414 -0.156159 -0.051013
+0.120564 -1.513026 -0.684932 0.958523 -0.284348 0.019494
+0.107642 -1.558038 -0.689610 0.827835 -0.485500 0.281032
+0.082730 -1.589562 -0.687034 0.679627 -0.720555 0.137504
+0.077701 -1.575456 -0.670632 0.609785 -0.530034 0.589259
+0.042564 -1.569583 -0.636975 0.517554 -0.604675 0.605397
+0.048210 -1.589749 -0.652445 0.526037 -0.611964 0.590581
+0.077998 -1.352136 -0.542918 0.559656 0.052270 0.827075
+0.100389 -1.255747 -0.653954 -0.329039 -0.825654 -0.458288
+0.070074 -1.244802 -0.663809 -0.323171 -0.942167 -0.088776
+0.070992 -1.247380 -0.686623 -0.429352 -0.649910 0.627116
+0.042243 -1.393100 -0.536856 0.399713 -0.816629 0.416349
+0.039635 -1.391853 -0.554379 0.136670 -0.839556 -0.525802
+0.057574 -1.545277 -0.610821 0.332911 -0.745233 0.577752
+0.062696 -1.462112 -0.576113 0.170326 0.123501 0.977618
+0.068962 -1.417705 -0.624797 -0.318850 0.590360 0.741491
+0.044892 -1.348548 -0.584637 0.051457 -0.575851 -0.815934
+0.054464 -1.294657 -0.623404 0.086984 -0.644814 -0.759374
+0.060899 -1.501117 -0.582180 0.382779 -0.401480 0.832042
+0.068040 -1.327512 -0.667823 -0.153558 0.437919 0.885803
+0.069671 -1.278198 -0.690989 -0.250673 0.192119 0.948817
+0.078161 -1.582310 -0.717670 0.677907 -0.687491 -0.260381
+0.049203 -1.606319 -0.712284 0.471614 -0.868230 -0.154133
+0.049598 -1.607373 -0.680832 0.408683 -0.871532 0.270943
+0.020583 -1.618934 -0.702387 0.243196 -0.969436 -0.032392
+0.022198 -1.613117 -0.731314 0.231042 -0.896422 -0.378216
+0.053269 -1.597447 -0.738356 0.527741 -0.755000 -0.389184
+0.086377 -1.560745 -0.743683 0.722076 -0.553183 -0.415446
+0.108763 -1.541432 -0.725267 0.869420 -0.423583 -0.254337
+0.119345 -1.495462 -0.712270 0.963477 -0.200933 -0.177025
+0.152043 -0.627012 -0.461232 -0.879135 -0.028876 0.475698
+0.131915 -0.528796 -0.497689 0.149555 0.090672 0.984587
+0.155519 -0.617108 -0.446525 -0.957518 -0.053155 0.283434
+0.148618 -0.528786 -0.462029 -0.940818 -0.024817 0.338002
+0.166063 -0.601729 -0.399052 -0.921102 -0.009043 0.389216
+0.153661 -0.526172 -0.447830 -0.964127 -0.012943 0.265126
+0.090467 -0.527020 -0.448806 0.713601 0.056573 0.698265
+0.122304 -0.438939 -0.494920 0.663049 0.047898 0.747042
+0.186971 -0.445619 -0.537279 0.550035 0.033116 0.834484
+0.036703 -1.235823 -0.673595 -0.235733 -0.967222 0.094405
+0.036792 -1.238117 -0.697304 -0.252575 -0.793214 0.554091
+0.013712 -1.402167 -0.533006 0.324194 -0.819410 0.472721
+0.037356 -1.272798 -0.701558 -0.209313 0.128834 0.969325
+0.035488 -1.329960 -0.670332 -0.083344 0.491624 0.866810
+0.013895 -1.398495 -0.548833 0.249013 -0.955351 -0.159047
+0.032314 -1.573539 -0.787490 0.308004 -0.778247 -0.547234
+0.062177 -1.548939 -0.790061 0.612686 -0.604154 -0.509524
+0.091171 -1.508123 -0.790433 0.786768 -0.426097 -0.446585
+0.021073 -1.614909 -0.670898 0.260953 -0.877577 0.402196
+-0.000017 -1.270105 -0.707808 -0.112785 0.293520 0.949276
+-0.000017 -1.233837 -0.701840 -0.177757 -0.515776 0.838080
+-0.000017 -1.616928 -0.728156 0.112827 -0.944493 -0.308549
+-0.000017 -1.583737 -0.779092 0.090094 -0.829132 -0.551746
+-0.000017 -1.339257 -0.666214 -0.035554 0.515106 0.856389
+-0.000017 -1.231392 -0.679250 -0.130735 -0.986276 0.100836
+-0.000017 -1.622242 -0.698873 0.152394 -0.987650 -0.036376
+-0.000017 -1.618749 -0.666344 0.223215 -0.930502 0.290414
+-0.000017 -1.312755 -0.538588 0.133416 0.262076 0.955781
+-0.000017 -1.370935 -0.522635 0.094730 0.278252 0.955825
+0.019196 -1.594895 -0.641123 0.251325 -0.684342 0.684479
+-0.000017 -1.596067 -0.638937 0.172948 -0.707463 0.685263
+0.166408 -0.689952 -0.448651 -0.880088 -0.108466 0.462256
+0.156180 -0.709903 -0.464735 -0.803508 -0.065109 0.591722
+0.165710 -0.520333 -0.397867 -0.915783 -0.009818 0.401552
+0.178825 -0.521027 -0.378250 -0.842461 -0.005640 0.538728
+0.179266 -0.601335 -0.377465 -0.853093 0.000415 0.521759
+0.018462 -1.572862 -0.630150 0.251718 -0.424713 0.869630
+-0.000017 -1.574039 -0.625376 0.190362 -0.473816 0.859803
+0.201975 0.676339 -1.300758 0.644574 0.170370 -0.745318
+0.187521 0.788019 -1.271414 0.631059 0.267877 -0.728016
+0.284059 0.669572 -1.231316 0.681880 0.135437 -0.718816
+0.234621 0.787648 -1.231194 0.627624 0.263541 -0.732554
+0.276877 0.518284 -1.223774 0.780730 -0.068029 -0.621154
+0.208275 0.514568 -1.309593 0.719129 -0.000681 -0.694876
+0.000000 0.376398 -1.337871 0.147506 0.003599 -0.989055
+0.108528 0.360089 -1.304915 0.275882 -0.063229 -0.959109
+0.000000 0.123007 -1.369700 0.276043 0.133725 -0.951797
+0.121794 0.126862 -1.337687 0.246986 0.148600 -0.957557
+0.229655 0.334608 -1.256244 0.319654 -0.234204 -0.918134
+0.208275 0.514568 -1.309593 0.275389 -0.116415 -0.954258
+0.093267 0.537123 -1.340819 0.172735 -0.023427 -0.984690
+0.000000 0.531584 -1.328178 -0.137651 0.061746 -0.988554
+0.078983 0.672760 -1.329372 0.316351 0.305148 -0.898224
+0.201975 0.676339 -1.300758 0.236351 0.171688 -0.956379
+0.060854 0.725216 -1.324017 0.961962 0.251319 -0.107089
+0.049248 0.745544 -1.293766 0.231847 0.505786 -0.830920
+0.081137 0.746770 -1.310106 -0.048970 0.296172 -0.953879
+0.083203 0.776490 -1.299485 -0.162608 0.409927 -0.897507
+0.187521 0.788019 -1.271414 0.250929 0.544439 -0.800388
+0.085151 0.801816 -1.283248 -0.131644 0.651141 -0.747453
+0.234621 0.787648 -1.231194 0.415295 0.773236 -0.479203
+0.115223 0.870956 -1.200244 0.141682 0.788102 -0.599017
+0.031367 0.777065 -1.277087 -0.348189 0.430559 -0.832697
+0.039245 0.812922 -1.297518 0.974353 0.135026 -0.180012
+0.027126 0.812922 -1.328997 0.809499 0.173340 -0.560950
+0.028482 0.725216 -1.340985 0.460477 0.127198 -0.878511
+0.029112 0.812922 -1.273484 0.938439 0.164670 0.303670
+0.025062 0.911391 -1.323454 0.931626 0.039018 -0.361319
+0.035195 0.911391 -1.297518 0.930753 0.038282 -0.363638
+0.000000 0.798667 -1.251145 -0.299097 0.610391 -0.733460
+0.000000 0.842631 -1.203002 -0.225651 0.750493 -0.621162
+0.250557 -0.893329 -1.103714 0.737084 -0.572401 -0.359254
+0.163891 -0.925097 -1.230911 0.727208 -0.541407 -0.421956
+0.315181 -0.764996 -1.175598 0.760713 -0.419445 -0.495360
+0.198746 -0.792401 -1.318974 0.744800 -0.409984 -0.526484
+0.215624 -0.638821 -1.379687 0.790148 -0.211487 -0.575274
+0.352477 -0.606807 -1.199774 0.808999 -0.100696 -0.579121
+0.219620 -0.509012 -1.385795 0.808235 0.043899 -0.587221
+0.335016 -0.477144 -1.219440 0.819375 0.142017 -0.555388
+0.236095 -0.336440 -1.315803 0.841276 0.113538 -0.528549
+0.317998 -0.316945 -1.171010 0.865330 0.034616 -0.500006
+0.268996 -0.166749 -1.278754 0.866841 -0.045564 -0.496498
+0.333440 -0.148889 -1.169196 0.858436 -0.032665 -0.511880
+0.276410 -0.024242 -1.265942 0.849437 0.018228 -0.527375
+0.334864 -0.008152 -1.173440 0.846801 0.052788 -0.529284
+0.263580 0.140392 -1.261915 0.844216 0.114997 -0.523522
+0.316565 0.155536 -1.170591 0.857125 0.160227 -0.489555
+0.229655 0.334608 -1.256244 0.849671 0.038792 -0.525885
+0.284178 0.314571 -1.157604 0.880720 -0.049918 -0.471000
+0.276877 0.518284 -1.223774 0.834422 -0.106711 -0.540697
+0.208275 0.514568 -1.309593 0.779783 -0.090980 -0.619404
+0.284059 0.669572 -1.231316 0.845794 0.148636 -0.512387
+0.314782 0.525202 -1.163291 0.865963 -0.100943 -0.489815
+0.316567 0.674269 -1.177092 0.864274 0.258473 -0.431534
+0.328173 0.316278 -1.060432 0.902669 -0.142122 -0.406190
+0.234621 0.787648 -1.231194 0.815203 0.341806 -0.467560
+0.279601 0.779780 -1.158522 0.823280 0.357340 -0.441041
+0.343043 0.675234 -1.105304 0.879853 0.342854 -0.329106
+0.315812 0.762780 -1.086902 0.871621 0.353479 -0.339602
+0.113353 -0.829547 -1.389298 0.532833 -0.522432 -0.665698
+0.077967 -0.944955 -1.301869 0.380628 -0.575787 -0.723596
+0.000000 -0.850805 -1.401005 0.161013 -0.649310 -0.743284
+0.000000 -0.946150 -1.314178 0.132503 -0.611708 -0.779908
+0.163891 -0.925097 -1.230911 0.709708 -0.341212 -0.616352
+0.198746 -0.792401 -1.318974 0.653318 -0.444131 -0.613125
+0.215624 -0.638821 -1.379687 0.644376 -0.341333 -0.684303
+0.117833 -0.677125 -1.452666 0.662838 -0.319893 -0.676990
+0.063836 -1.006456 -1.256372 0.332632 -0.523102 -0.784679
+0.155712 -1.010450 -1.208942 0.642905 -0.324041 -0.694025
+0.000000 -1.014367 -1.268361 0.178733 -0.583271 -0.792369
+0.194389 -1.019275 -1.135778 0.833571 0.086931 -0.545529
+0.140954 -1.081044 -1.195292 0.557744 0.052802 -0.828332
+0.250557 -0.893329 -1.103714 0.837069 -0.233218 -0.494898
+0.063677 -1.084658 -1.226234 0.343575 -0.069069 -0.936582
+0.212058 -1.089059 -1.151285 0.610014 0.291725 -0.736736
+0.243257 -1.109294 -1.101869 0.857182 0.310578 -0.410829
+0.233524 -1.041313 -1.070262 0.858121 0.312333 -0.407524
+0.082590 -1.177560 -1.230108 0.180492 -0.011882 -0.983505
+0.149037 -1.182005 -1.217860 0.346676 0.073243 -0.935121
+0.232935 -1.184636 -1.172981 0.468361 0.028736 -0.883070
+0.147323 -1.283632 -1.206186 0.339010 -0.299074 -0.891979
+0.228412 -1.270773 -1.165832 0.731633 -0.385408 -0.562293
+0.148298 -1.343492 -1.172147 0.441873 -0.499209 -0.745345
+0.206980 -1.323399 -1.147182 0.743963 -0.554044 -0.373570
+0.144216 -1.389224 -1.142150 0.583097 -0.481328 -0.654462
+0.185016 -1.368596 -1.120970 0.684383 -0.547695 -0.481300
+0.222856 -1.307619 -1.114574 0.616177 -0.530083 -0.582528
+0.210022 -1.325508 -1.096257 0.830781 -0.551860 -0.072481
+0.236921 -1.282762 -1.116675 0.798409 -0.293597 -0.525684
+0.246845 -1.260431 -1.101758 0.928308 -0.205605 -0.309792
+0.248806 -1.231756 -1.114913 0.941395 -0.210244 -0.263767
+0.085375 -1.291375 -1.217723 0.200059 -0.246003 -0.948398
+0.085390 -1.351693 -1.181174 0.202253 -0.494658 -0.845226
+0.242488 -1.305722 -1.114672 -0.113639 -0.303684 -0.945972
+0.230621 -1.322045 -1.104962 -0.221549 -0.476650 -0.850718
+0.254957 -1.321908 -1.115359 -0.352154 -0.432576 -0.829979
+0.249879 -1.335757 -1.102068 -0.312788 -0.595476 -0.739981
+0.000000 -0.820987 -0.477658 0.302135 -0.512966 0.803480
+0.000000 -0.743096 -0.427930 0.381981 -0.391794 0.837011
+0.075642 -0.735415 -0.462425 0.416254 -0.370772 0.830218
+0.000000 -0.682871 -0.406746 0.373654 -0.148785 0.915558
+0.000000 -0.520935 -0.408895 0.388776 0.070997 0.918593
+0.090467 -0.527020 -0.448806 0.437648 0.153182 0.886002
+0.122304 -0.438939 -0.494920 0.473333 0.257953 0.842268
+0.000000 -0.433288 -0.424155 0.463796 0.243988 0.851683
+0.144773 -0.369613 -0.521976 0.438573 0.199812 0.876201
+0.000000 -0.365256 -0.450505 0.463460 0.258350 0.847620
+0.020074 0.802989 -0.859710 -0.468616 0.735648 0.489102
+0.000000 0.792848 -0.871132 -0.429261 0.637739 0.639550
+0.008274 0.689589 -0.762612 -0.470719 0.608497 0.638870
+0.000000 0.690640 -0.766550 -0.235042 0.695142 0.679362
+0.055367 0.903845 -1.060557 -0.308741 0.870649 0.382947
+0.112552 0.899531 -1.004645 -0.301408 0.876697 0.374907
+0.059104 0.807325 -0.828836 -0.357493 0.777283 0.517716
+0.025789 0.687817 -0.748559 -0.474214 0.578186 0.663944
+0.087118 0.775469 -0.767209 -0.323846 0.878246 0.351863
+0.172004 0.879637 -0.926179 -0.240069 0.873814 0.422867
+0.088868 0.769612 -0.732977 -0.464125 0.868834 0.172382
+0.191441 0.840666 -0.814931 -0.418558 0.867201 0.269763
+0.055367 0.903845 -1.060557 -0.373691 0.924481 -0.075434
+0.000000 0.877127 -1.071758 -0.490537 0.859379 0.144364
+0.020074 0.802989 -0.859710 -0.515598 0.792443 0.325871
+0.000000 0.792848 -0.871132 -0.565758 0.760218 0.319353
+0.115223 0.870956 -1.200244 -0.219773 0.924376 -0.311815
+0.000000 0.842631 -1.203002 -0.302930 0.912640 -0.274450
+0.432499 -0.117936 -0.893081 0.996289 -0.062059 -0.059641
+0.437223 0.021572 -0.907435 0.996072 0.085228 -0.023996
+0.408121 -0.129847 -0.708110 0.988708 -0.032280 0.146335
+0.401509 0.019700 -0.719666 0.975183 0.119050 0.186668
+0.409405 0.188720 -0.931537 0.956010 0.276241 -0.098669
+0.372005 0.173291 -1.062321 0.941402 0.173709 -0.289114
+0.392132 0.008478 -1.063792 0.962223 0.006191 -0.272191
+0.423456 -0.279155 -0.891875 0.993456 -0.113791 0.009849
+0.390117 -0.124181 -1.050900 0.972651 -0.022312 -0.231197
+0.397077 -0.294104 -1.040035 0.989007 0.021149 -0.146348
+0.372288 0.218413 -0.760127 0.945523 0.285782 0.155930
+0.360061 0.306779 -0.937631 0.923030 0.384346 0.017108
+0.328173 0.316278 -1.060432 0.911217 0.326518 -0.251135
+0.390662 -0.263803 -0.714595 0.968738 -0.180295 0.170413
+0.337829 0.315369 -0.803507 0.915270 0.382221 0.127233
+0.414880 -0.360277 -0.913431 0.992981 0.106055 0.052362
+0.412246 -0.462044 -1.047188 0.969065 0.152795 -0.193820
+0.348259 -0.357136 -0.682947 0.958911 -0.049178 0.279411
+0.445104 -0.474404 -0.928435 0.976834 0.198878 -0.079009
+0.417389 -0.603646 -1.074460 0.968093 -0.042231 -0.247008
+0.441108 -0.605236 -0.978452 0.981078 -0.088848 -0.172024
+0.396773 -0.408556 -0.803304 0.926122 0.328728 0.185031
+0.338005 -0.375625 -0.651199 0.935522 0.074226 0.345383
+0.449056 -0.493539 -0.787950 0.952996 0.301660 -0.028288
+0.459976 -0.598947 -0.814650 0.990812 -0.109187 -0.079816
+0.405733 -0.421712 -0.714452 0.852379 0.522855 -0.008538
+0.430026 -0.707082 -0.805969 0.894149 -0.447012 0.026035
+0.421764 -0.731125 -0.935026 0.884742 -0.461487 -0.065276
+0.327169 -0.847824 -0.782242 0.793739 -0.607645 0.027308
+0.298690 -0.872468 -0.981866 0.765891 -0.636311 -0.092295
+0.378254 -0.754824 -1.055511 0.893875 -0.384436 -0.230645
+0.368785 -0.778217 -0.725018 0.807768 -0.585014 0.072594
+0.108530 -0.355331 -1.455653 0.292423 0.184591 -0.938304
+0.114572 -0.524305 -1.478219 0.451389 -0.010769 -0.892263
+0.000000 -0.361320 -1.491224 0.297235 0.160851 -0.941158
+0.000000 -0.533029 -1.515251 0.293088 -0.072777 -0.953312
+0.000000 -0.694820 -1.481308 0.237083 -0.344148 -0.908490
+0.117833 -0.677125 -1.452666 0.374118 -0.214150 -0.902317
+0.121475 -0.199653 -1.417969 0.240861 0.303519 -0.921880
+0.000000 -0.212704 -1.457249 0.275176 0.266395 -0.923749
+0.126253 -0.069033 -1.371295 0.220563 0.216683 -0.951000
+0.000000 -0.085812 -1.403213 0.221652 0.287575 -0.931757
+0.000000 -0.850805 -1.401005 0.174925 -0.450661 -0.875389
+0.113353 -0.829547 -1.389298 0.223785 -0.414227 -0.882234
+0.219620 -0.509012 -1.385795 0.664080 -0.055526 -0.745597
+0.215624 -0.638821 -1.379687 0.643959 -0.085867 -0.760226
+0.000000 0.123007 -1.369700 0.234190 0.161925 -0.958611
+0.121794 0.126862 -1.337687 0.245522 0.169341 -0.954485
+0.163313 -0.268688 -0.540615 0.219901 0.037023 0.974819
+0.000000 -0.278300 -0.498178 0.305059 0.217029 0.927274
+0.144773 -0.369613 -0.521976 0.331283 0.291349 0.897423
+0.000000 -0.365256 -0.450505 0.408356 0.438826 0.800423
+0.173069 -0.171989 -0.533491 0.131365 -0.038782 0.990575
+0.000000 -0.181284 -0.504867 0.192464 0.004644 0.981293
+0.181052 0.003963 -0.522829 0.060235 0.062843 0.996204
+0.000000 -0.002516 -0.511473 0.106887 0.071547 0.991694
+0.000000 0.217662 -0.539160 0.161664 0.334761 0.928332
+0.157486 0.215574 -0.562074 0.112487 0.259472 0.959177
+0.110497 0.357001 -0.628471 0.247536 0.498871 0.830574
+0.000000 0.362368 -0.606042 0.217049 0.467158 0.857119
+0.219224 0.341114 -0.687039 0.502465 0.686552 0.525524
+0.042466 0.462186 -0.676207 0.321037 0.507282 0.799750
+0.000000 0.473072 -0.669559 0.360995 0.408163 0.838502
+0.009831 0.582357 -0.722762 -0.032884 0.344141 0.938342
+0.022530 0.582900 -0.720376 -0.372847 0.219888 0.901462
+0.073671 0.464847 -0.696580 0.059356 0.085577 0.994562
+0.193934 0.374098 -0.718043 0.366712 0.334615 0.868076
+0.030152 0.581907 -0.713972 -0.574628 -0.041532 0.817360
+0.037486 0.686149 -0.731377 -0.793310 0.319707 0.518119
+0.025789 0.687817 -0.748559 -0.599119 0.384319 0.702393
+0.091849 0.479491 -0.699313 -0.241330 -0.178301 0.953923
+0.194984 0.389910 -0.710710 -0.207107 -0.398498 0.893480
+0.000000 0.583122 -0.715693 0.569719 0.317734 0.757935
+0.103255 0.494590 -0.692424 -0.637342 -0.448487 0.626621
+0.047675 0.582939 -0.689279 -0.845393 -0.123815 0.519597
+0.070740 0.591315 -0.644639 -0.880952 -0.256879 0.397413
+0.116679 0.512235 -0.650594 -0.752185 -0.524909 0.398357
+0.051595 0.678974 -0.703427 -0.887106 0.247808 0.389402
+0.068726 0.667268 -0.647439 -0.938830 0.112970 0.325325
+0.193418 0.414036 -0.679360 -0.528239 -0.542676 0.653043
+0.196093 0.452835 -0.612980 -0.651498 -0.621930 0.434458
+0.087118 0.775469 -0.767209 -0.721486 0.558866 0.408812
+0.088868 0.769612 -0.732977 -0.731718 0.603754 0.316338
+0.098672 0.741881 -0.649914 -0.748836 0.576357 0.327197
+0.132622 0.539817 -0.555258 -0.853161 -0.411324 0.320824
+0.104151 0.602309 -0.560450 -0.918303 -0.244381 0.311443
+0.095284 0.658244 -0.561410 -0.953362 0.100333 0.284665
+0.112848 0.705254 -0.556160 -0.901424 0.322681 0.288638
+0.008274 0.689589 -0.762612 -0.584561 0.275160 0.763266
+0.059104 0.807325 -0.828836 -0.615244 0.550537 0.564255
+0.191441 0.840666 -0.814931 -0.335570 0.879375 0.337775
+0.174726 0.772485 -0.655484 -0.329157 0.880212 0.341881
+0.147059 0.559099 -0.487339 -0.869477 -0.417298 0.264332
+0.121016 0.612952 -0.489468 -0.936852 -0.239404 0.254940
+0.116559 0.653839 -0.489535 -0.940657 0.180407 0.287434
+0.133645 0.691215 -0.483091 -0.881879 0.348367 0.317693
+0.167913 0.575845 -0.391086 -0.845178 -0.464751 0.263972
+0.142612 0.617588 -0.398601 -0.932227 -0.257840 0.253913
+0.141864 0.649581 -0.398320 -0.936399 0.223905 0.270229
+0.161989 0.688799 -0.401702 -0.868051 0.404387 0.288026
+numsurf 345
+SURF 0x24
+mat 0
+refs 4
+2092 0.18417 0.47203
+2090 0.17447 0.47611
+2092 0.18417 0.47203
+2091 0.17409 0.47332
+SURF 0x24
+mat 0
+refs 44
+3153 0.82063 0.33963
+3157 0.88744 0.34868
+3153 0.82063 0.33963
+3158 0.87040 0.37083
+3154 0.80637 0.36412
+3158 0.87040 0.37083
+3155 0.80410 0.36840
+3159 0.87019 0.37164
+3155 0.80410 0.36840
+3160 0.87826 0.35118
+3155 0.80410 0.36840
+3156 0.81642 0.35386
+3155 0.80410 0.36840
+3148 0.76321 0.35178
+3147 0.75136 0.36714
+3144 0.70120 0.33703
+3139 0.68769 0.36669
+3138 0.64633 0.36625
+3136 0.69033 0.36560
+3135 0.65266 0.37432
+3134 0.67859 0.31971
+3128 0.62943 0.38375
+3131 0.66885 0.32864
+3126 0.66137 0.34701
+3132 0.71371 0.22562
+3126 0.66137 0.34701
+3127 0.70889 0.22441
+3122 0.65771 0.38331
+3121 0.73969 0.20940
+3122 0.65771 0.38331
+3119 0.60332 0.30002
+3120 0.56124 0.41349
+3119 0.60332 0.30002
+3117 0.60042 0.43377
+3118 0.66570 0.27480
+3116 0.61664 0.44217
+3115 0.70047 0.26395
+3116 0.61664 0.44217
+3113 0.69023 0.26842
+3114 0.62052 0.44417
+3109 0.68118 0.27568
+3110 0.62443 0.44620
+3111 0.68284 0.29923
+3112 0.65237 0.46066
+SURF 0x24
+mat 0
+refs 5
+3120 0.56124 0.41349
+3122 0.65771 0.38331
+3123 0.64039 0.42633
+3124 0.61413 0.40070
+3133 0.61336 0.41234
+SURF 0x24
+mat 0
+refs 16
+3131 0.66885 0.32864
+3132 0.71371 0.22562
+3131 0.66885 0.32864
+3140 0.73129 0.23664
+3134 0.67859 0.31971
+3141 0.77152 0.25419
+3134 0.67859 0.31971
+3137 0.70980 0.31944
+3136 0.69033 0.36560
+3145 0.77362 0.33296
+3146 0.75635 0.35888
+3153 0.82063 0.33963
+3146 0.75635 0.35888
+3154 0.80637 0.36412
+3147 0.75136 0.36714
+3155 0.80410 0.36840
+SURF 0x24
+mat 0
+refs 4
+3147 0.75136 0.36714
+3139 0.68769 0.36669
+3146 0.75635 0.35888
+3136 0.69033 0.36560
+SURF 0x24
+mat 0
+refs 17
+3152 0.73594 0.26192
+3151 0.65088 0.19743
+3144 0.70120 0.33703
+3143 0.64764 0.32131
+3138 0.64633 0.36625
+3129 0.62290 0.37139
+3135 0.65266 0.37432
+3129 0.62290 0.37139
+3128 0.62943 0.38375
+3125 0.62187 0.38917
+3126 0.66137 0.34701
+3125 0.62187 0.38917
+3122 0.65771 0.38331
+3125 0.62187 0.38917
+3124 0.61413 0.40070
+3130 0.60699 0.37747
+3149 0.59000 0.39012
+SURF 0x24
+mat 0
+refs 5
+3125 0.62187 0.38917
+3129 0.62290 0.37139
+3130 0.60699 0.37747
+3142 0.62671 0.31261
+3150 0.57660 0.32097
+SURF 0x24
+mat 0
+refs 4
+3143 0.64764 0.32131
+3142 0.62671 0.31261
+3143 0.64764 0.32131
+3129 0.62290 0.37139
+SURF 0x24
+mat 0
+refs 15
+3107 0.40370 0.17426
+3108 0.53610 0.19538
+3107 0.40370 0.17426
+3101 0.54094 0.17321
+3102 0.40370 0.15215
+3099 0.53575 0.14242
+3100 0.40370 0.11650
+3093 0.52168 0.11756
+3095 0.40370 0.09409
+3094 0.52824 0.10267
+3096 0.40370 0.07824
+3098 0.53179 0.11953
+3097 0.40370 0.10063
+3104 0.52692 0.16133
+3103 0.40370 0.15361
+SURF 0x24
+mat 0
+refs 4
+3098 0.53179 0.11953
+3094 0.52824 0.10267
+3106 0.63809 0.16767
+3105 0.64243 0.16364
+SURF 0x24
+mat 0
+refs 36
+3082 0.48979 0.45981
+3086 0.43162 0.44767
+3082 0.48979 0.45981
+3084 0.48201 0.40261
+3079 0.57443 0.41072
+3084 0.48201 0.40261
+3081 0.60722 0.41642
+3085 0.50010 0.39147
+3088 0.57773 0.43625
+3087 0.49303 0.42377
+3088 0.57773 0.43625
+3092 0.43694 0.48808
+3088 0.57773 0.43625
+3089 0.47279 0.53483
+3088 0.57773 0.43625
+3090 0.60310 0.57119
+3088 0.57773 0.43625
+3091 0.65520 0.48677
+3081 0.60722 0.41642
+3080 0.66944 0.44478
+3079 0.57443 0.41072
+3077 0.65124 0.44963
+3076 0.56319 0.44313
+3070 0.64584 0.46591
+3068 0.54936 0.43324
+3069 0.65270 0.47376
+3061 0.55056 0.42345
+3067 0.66128 0.47192
+3062 0.56024 0.41871
+3066 0.65941 0.49374
+3065 0.57488 0.44957
+3073 0.65621 0.54130
+3065 0.57488 0.44957
+3072 0.57669 0.50333
+3071 0.46023 0.48523
+3075 0.48729 0.52384
+SURF 0x24
+mat 0
+refs 13
+3065 0.57488 0.44957
+3071 0.46023 0.48523
+3062 0.56024 0.41871
+3064 0.43487 0.45240
+3062 0.56024 0.41871
+3063 0.42755 0.44490
+3061 0.55056 0.42345
+3074 0.43104 0.46404
+3068 0.54936 0.43324
+3078 0.40828 0.50923
+3076 0.56319 0.44313
+3082 0.48979 0.45981
+3079 0.57443 0.41072
+SURF 0x24
+mat 0
+refs 4
+3078 0.40828 0.50923
+3083 0.38690 0.51951
+3078 0.40828 0.50923
+3082 0.48979 0.45981
+SURF 0x24
+mat 0
+refs 6
+3059 0.32880 0.46158
+3060 0.39435 0.35484
+3055 0.44147 0.45599
+3056 0.46746 0.40121
+3057 0.57391 0.49456
+3058 0.57923 0.47210
+SURF 0x24
+mat 0
+refs 8
+3053 0.61164 0.32195
+3054 0.62110 0.44551
+3051 0.59117 0.33169
+3052 0.54706 0.46422
+3049 0.65707 0.35796
+3048 0.58614 0.46657
+3043 0.61810 0.33157
+3047 0.52297 0.43145
+SURF 0x24
+mat 0
+refs 7
+3050 0.68458 0.30000
+3049 0.65707 0.35796
+3045 0.66698 0.28822
+3043 0.61810 0.33157
+3045 0.66698 0.28822
+3044 0.60060 0.31651
+3046 0.66021 0.28176
+SURF 0x24
+mat 0
+refs 14
+3041 0.58855 0.22901
+3042 0.55808 0.39044
+3039 0.59317 0.25891
+3040 0.57351 0.39843
+3038 0.60428 0.30363
+3037 0.58245 0.40306
+1119 0.60387 0.32573
+3036 0.58371 0.40372
+1119 0.60387 0.32573
+3034 0.57130 0.39729
+3035 0.58889 0.31381
+3034 0.57130 0.39729
+1115 0.56709 0.29683
+3033 0.54217 0.38221
+SURF 0x24
+mat 0
+refs 11
+3031 0.17719 0.51234
+3032 0.18245 0.52127
+3031 0.17719 0.51234
+3030 0.20343 0.51998
+3029 0.19072 0.51319
+3022 0.21205 0.51389
+3024 0.19681 0.51205
+3017 0.20702 0.47991
+3024 0.19681 0.51205
+3026 0.18386 0.51283
+3025 0.18574 0.52157
+SURF 0x24
+mat 0
+refs 33
+3020 0.29804 0.49825
+3018 0.29419 0.47833
+3021 0.25329 0.51089
+3019 0.22994 0.49290
+3023 0.22564 0.52638
+3019 0.22994 0.49290
+3022 0.21205 0.51389
+3019 0.22994 0.49290
+3017 0.20702 0.47991
+3018 0.29419 0.47833
+3016 0.29592 0.45592
+3028 0.36272 0.47441
+3016 0.29592 0.45592
+3027 0.36345 0.45031
+3014 0.29428 0.44816
+3013 0.36672 0.44223
+3014 0.29428 0.44816
+3009 0.38719 0.44540
+3007 0.30262 0.46331
+3009 0.38719 0.44540
+3004 0.28686 0.45383
+3003 0.38761 0.42552
+2996 0.37315 0.39506
+3005 0.45721 0.41967
+2996 0.37315 0.39506
+2998 0.45810 0.38946
+2996 0.37315 0.39506
+2997 0.45981 0.33221
+2996 0.37315 0.39506
+2995 0.33641 0.33627
+3000 0.24225 0.37988
+3002 0.33279 0.29434
+3001 0.22510 0.33930
+SURF 0x24
+mat 0
+refs 14
+2996 0.37315 0.39506
+3000 0.24225 0.37988
+2996 0.37315 0.39506
+2999 0.27840 0.43908
+3004 0.28686 0.45383
+3008 0.18174 0.52016
+3004 0.28686 0.45383
+3006 0.24340 0.50083
+3007 0.30262 0.46331
+3010 0.22451 0.49003
+3014 0.29428 0.44816
+3015 0.20225 0.47505
+3016 0.29592 0.45592
+3017 0.20702 0.47991
+SURF 0x24
+mat 0
+refs 4
+3010 0.22451 0.49003
+3006 0.24340 0.50083
+3011 0.18964 0.52161
+3012 0.19959 0.54277
+SURF 0x24
+mat 0
+refs 7
+2994 0.41758 0.52791
+2993 0.41170 0.55935
+2994 0.41758 0.52791
+2989 0.35949 0.54078
+2992 0.36333 0.49894
+2987 0.31729 0.51343
+2991 0.30647 0.46079
+SURF 0x24
+mat 0
+refs 8
+2987 0.31729 0.51343
+2989 0.35949 0.54078
+2987 0.31729 0.51343
+2988 0.36801 0.53703
+2985 0.32058 0.50477
+2988 0.36801 0.53703
+2984 0.36493 0.50369
+2990 0.43741 0.53752
+SURF 0x24
+mat 0
+refs 22
+2986 0.25002 0.44323
+2985 0.32058 0.50477
+2983 0.28919 0.45885
+2984 0.36493 0.50369
+2983 0.28919 0.45885
+2982 0.36368 0.53990
+2981 0.29301 0.49572
+2980 0.36588 0.55976
+2979 0.29324 0.50992
+2978 0.36830 0.55768
+2977 0.28332 0.50374
+2976 0.36373 0.54149
+2975 0.25214 0.47368
+2974 0.33619 0.56608
+2973 0.20329 0.46550
+2972 0.35275 0.58203
+2971 0.20636 0.46043
+2969 0.36014 0.53910
+2970 0.24186 0.43435
+2969 0.36014 0.53910
+2968 0.29106 0.38546
+2967 0.39234 0.46070
+SURF 0x24
+mat 0
+refs 7
+2963 0.43106 0.38254
+2964 0.41954 0.39931
+2963 0.43106 0.38254
+2959 0.41514 0.39918
+2960 0.42892 0.37881
+2950 0.39218 0.38101
+2961 0.42768 0.37086
+SURF 0x24
+mat 0
+refs 22
+2959 0.41514 0.39918
+2962 0.42568 0.41536
+2950 0.39218 0.38101
+2951 0.40419 0.40133
+2948 0.37258 0.37689
+2952 0.36987 0.38953
+2949 0.23839 0.39179
+2952 0.36987 0.38953
+2954 0.25352 0.41161
+2952 0.36987 0.38953
+2953 0.36741 0.39646
+2951 0.40419 0.40133
+2953 0.36741 0.39646
+2958 0.42330 0.41291
+2955 0.36498 0.40711
+2965 0.45687 0.43103
+2955 0.36498 0.40711
+2966 0.45593 0.46277
+2955 0.36498 0.40711
+2957 0.33068 0.46087
+2954 0.25352 0.41161
+2956 0.20156 0.43661
+SURF 0x24
+mat 0
+refs 4
+2953 0.36741 0.39646
+2955 0.36498 0.40711
+2953 0.36741 0.39646
+2954 0.25352 0.41161
+SURF 0x24
+mat 0
+refs 6
+2948 0.37258 0.37689
+2949 0.23839 0.39179
+2946 0.35729 0.36888
+2945 0.23172 0.38576
+2941 0.34000 0.39207
+2944 0.20744 0.42025
+SURF 0x24
+mat 0
+refs 6
+2947 0.45838 0.38023
+2946 0.35729 0.36888
+2940 0.45857 0.37384
+2941 0.34000 0.39207
+2942 0.45919 0.35285
+2943 0.32623 0.37003
+SURF 0x24
+mat 0
+refs 7
+2938 0.28008 0.46937
+2939 0.28822 0.37610
+2936 0.27115 0.47181
+2934 0.29713 0.37494
+2936 0.27115 0.47181
+2935 0.32203 0.37630
+2937 0.30730 0.43205
+SURF 0x24
+mat 0
+refs 54
+2932 0.67270 0.42046
+2933 0.66626 0.43974
+2925 0.66664 0.41642
+2926 0.65832 0.43563
+2914 0.65013 0.40558
+2922 0.64226 0.42732
+2890 0.63144 0.39650
+2921 0.62320 0.41745
+2890 0.63144 0.39650
+2917 0.60605 0.40857
+2891 0.61530 0.38617
+2918 0.57621 0.39312
+2891 0.61530 0.38617
+2911 0.58744 0.35937
+2892 0.62670 0.35404
+2912 0.60086 0.32976
+2893 0.64012 0.32046
+2913 0.61513 0.30166
+2858 0.64886 0.29963
+2859 0.62793 0.28313
+2852 0.66353 0.29060
+2851 0.64258 0.26649
+2815 0.67974 0.28110
+2850 0.66478 0.24721
+2811 0.71216 0.27437
+2809 0.72184 0.24691
+2810 0.74710 0.28776
+2809 0.72184 0.24691
+2808 0.74275 0.28264
+2807 0.73077 0.23063
+2806 0.74247 0.27873
+2803 0.73955 0.21176
+2804 0.74237 0.27788
+2793 0.74884 0.23586
+2805 0.74193 0.28115
+2793 0.74884 0.23586
+2792 0.74077 0.28799
+2787 0.71202 0.29929
+2796 0.61252 0.30993
+2786 0.69854 0.35353
+2798 0.59961 0.34439
+2797 0.58332 0.39012
+2798 0.59961 0.34439
+2842 0.60351 0.40323
+2812 0.61876 0.36739
+2842 0.60351 0.40323
+2843 0.62458 0.37881
+2863 0.61087 0.41073
+2864 0.63047 0.38750
+2863 0.61087 0.41073
+2865 0.61866 0.42042
+2863 0.61087 0.41073
+2924 0.61010 0.43880
+2923 0.60075 0.43396
+SURF 0x24
+mat 0
+refs 13
+2797 0.58332 0.39012
+2786 0.69854 0.35353
+2794 0.69059 0.39738
+2783 0.70182 0.34418
+2791 0.69993 0.40121
+2780 0.60055 0.30408
+2781 0.60574 0.37041
+2777 0.63262 0.36881
+2782 0.59154 0.42917
+2777 0.63262 0.36881
+2775 0.61383 0.44071
+2776 0.66138 0.36705
+2774 0.63646 0.45243
+SURF 0x24
+mat 0
+refs 24
+2786 0.69854 0.35353
+2787 0.71202 0.29929
+2783 0.70182 0.34418
+2784 0.71779 0.25664
+2780 0.60055 0.30408
+2785 0.72262 0.22651
+2780 0.60055 0.30408
+2790 0.73952 0.21049
+2780 0.60055 0.30408
+2779 0.62946 0.28854
+2777 0.63262 0.36881
+2779 0.62946 0.28854
+2776 0.66138 0.36705
+2778 0.68917 0.24895
+2776 0.66138 0.36705
+2788 0.70087 0.31481
+2789 0.68318 0.38403
+2788 0.70087 0.31481
+2819 0.69815 0.39595
+2820 0.70124 0.32611
+2902 0.69857 0.37384
+2897 0.69064 0.31901
+2903 0.68746 0.32912
+2904 0.69496 0.25385
+SURF 0x24
+mat 0
+refs 12
+2897 0.69064 0.31901
+2820 0.70124 0.32611
+2897 0.69064 0.31901
+2896 0.83841 0.34273
+2899 0.83624 0.34580
+2898 0.84877 0.34384
+2901 0.84707 0.34523
+2900 0.88185 0.34806
+2929 0.88237 0.34876
+2900 0.88185 0.34806
+2930 0.90042 0.34204
+2931 0.90109 0.34186
+SURF 0x24
+mat 0
+refs 4
+2898 0.84877 0.34384
+2896 0.83841 0.34273
+2927 0.85296 0.33268
+2928 0.83843 0.33768
+SURF 0x24
+mat 0
+refs 48
+2919 0.64234 0.42736
+2909 0.65767 0.39183
+2915 0.61797 0.41474
+2908 0.64030 0.38056
+2916 0.62147 0.41655
+2906 0.64252 0.38239
+2920 0.63470 0.42340
+2906 0.64252 0.38239
+2905 0.65636 0.38967
+2876 0.66586 0.35262
+2875 0.67877 0.36042
+2853 0.68910 0.32519
+2875 0.67877 0.36042
+2874 0.69969 0.33415
+2883 0.69464 0.38775
+2857 0.70825 0.36150
+2882 0.59621 0.37664
+2845 0.60751 0.34680
+2878 0.61131 0.39090
+2844 0.62106 0.35678
+2878 0.61131 0.39090
+2877 0.62288 0.39369
+2910 0.60170 0.41743
+2877 0.62288 0.39369
+2907 0.61088 0.42240
+2877 0.62288 0.39369
+2865 0.61866 0.42042
+2877 0.62288 0.39369
+2864 0.63047 0.38750
+2877 0.62288 0.39369
+2839 0.63129 0.36075
+2844 0.62106 0.35678
+2840 0.62442 0.33738
+2845 0.60751 0.34680
+2846 0.61574 0.30508
+2857 0.70825 0.36150
+2835 0.72326 0.31073
+2874 0.69969 0.33415
+2835 0.72326 0.31073
+2853 0.68910 0.32519
+2834 0.72400 0.30478
+2853 0.68910 0.32519
+2832 0.69478 0.30991
+2876 0.66586 0.35262
+2886 0.66265 0.35257
+2876 0.66586 0.35262
+2908 0.64030 0.38056
+2906 0.64252 0.38239
+SURF 0x24
+mat 0
+refs 58
+2908 0.64030 0.38056
+2909 0.65767 0.39183
+2908 0.64030 0.38056
+2885 0.67540 0.36117
+2886 0.66265 0.35257
+2831 0.70499 0.31387
+2832 0.69478 0.30991
+2825 0.73675 0.30597
+2832 0.69478 0.30991
+2833 0.72869 0.30234
+2834 0.72400 0.30478
+2833 0.72869 0.30234
+2822 0.73804 0.29801
+2825 0.73675 0.30597
+2823 0.74261 0.30121
+2818 0.74428 0.30951
+2823 0.74261 0.30121
+2810 0.74710 0.28776
+2823 0.74261 0.30121
+2808 0.74275 0.28264
+2823 0.74261 0.30121
+2806 0.74247 0.27873
+2822 0.73804 0.29801
+2804 0.74237 0.27788
+2821 0.73188 0.29756
+2805 0.74193 0.28115
+2802 0.73276 0.30137
+2805 0.74193 0.28115
+2795 0.73941 0.30695
+2792 0.74077 0.28799
+2795 0.73941 0.30695
+2796 0.61252 0.30993
+2813 0.62623 0.34435
+2798 0.59961 0.34439
+2813 0.62623 0.34435
+2812 0.61876 0.36739
+2813 0.62623 0.34435
+2843 0.62458 0.37881
+2841 0.63168 0.35221
+2843 0.62458 0.37881
+2873 0.63720 0.35734
+2864 0.63047 0.38750
+2873 0.63720 0.35734
+2839 0.63129 0.36075
+2873 0.63720 0.35734
+2838 0.63398 0.33307
+2841 0.63168 0.35221
+2838 0.63398 0.33307
+2813 0.62623 0.34435
+2799 0.63155 0.31785
+2795 0.73941 0.30695
+2800 0.73536 0.32003
+2802 0.73276 0.30137
+2835 0.72326 0.31073
+2802 0.73276 0.30137
+2834 0.72400 0.30478
+2821 0.73188 0.29756
+2822 0.73804 0.29801
+SURF 0x24
+mat 0
+refs 12
+2835 0.72326 0.31073
+2800 0.73536 0.32003
+2846 0.61574 0.30508
+2801 0.62847 0.32396
+2840 0.62442 0.33738
+2801 0.62847 0.32396
+2839 0.63129 0.36075
+2801 0.62847 0.32396
+2838 0.63398 0.33307
+2801 0.62847 0.32396
+2799 0.63155 0.31785
+2800 0.73536 0.32003
+SURF 0x24
+mat 0
+refs 92
+2831 0.70499 0.31387
+2885 0.67540 0.36117
+2831 0.70499 0.31387
+2881 0.58471 0.34123
+2856 0.61220 0.31330
+2881 0.58471 0.34123
+2837 0.62172 0.33272
+2880 0.61010 0.36204
+2836 0.61284 0.33044
+2884 0.60565 0.36194
+2849 0.71077 0.35811
+2879 0.70357 0.38856
+2862 0.68599 0.36358
+2871 0.68075 0.39512
+2870 0.67858 0.35099
+2872 0.67450 0.38498
+2869 0.67149 0.34116
+2872 0.67450 0.38498
+2889 0.65856 0.37503
+2925 0.66664 0.41642
+2889 0.65856 0.37503
+2914 0.65013 0.40558
+2889 0.65856 0.37503
+2890 0.63144 0.39650
+2888 0.63994 0.36587
+2891 0.61530 0.38617
+2888 0.63994 0.36587
+2892 0.62670 0.35404
+2887 0.65126 0.33628
+2893 0.64012 0.32046
+2894 0.66210 0.30444
+2858 0.64886 0.29963
+2895 0.67500 0.29816
+2852 0.66353 0.29060
+2855 0.68960 0.28989
+2815 0.67974 0.28110
+2814 0.71196 0.28789
+2811 0.71216 0.27437
+2814 0.71196 0.28789
+2810 0.74710 0.28776
+2816 0.74093 0.30141
+2818 0.74428 0.30951
+2817 0.74369 0.32120
+2826 0.73992 0.32768
+2817 0.74369 0.32120
+2827 0.74278 0.33372
+2816 0.74093 0.30141
+2828 0.72942 0.31520
+2816 0.74093 0.30141
+2854 0.72110 0.30539
+2814 0.71196 0.28789
+2854 0.72110 0.30539
+2855 0.68960 0.28989
+2866 0.70503 0.29615
+2895 0.67500 0.29816
+2867 0.69162 0.30528
+2894 0.66210 0.30444
+2868 0.68243 0.31633
+2869 0.67149 0.34116
+2868 0.68243 0.31633
+2870 0.67858 0.35099
+2868 0.68243 0.31633
+2861 0.68443 0.32503
+2867 0.69162 0.30528
+2848 0.69830 0.31577
+2867 0.69162 0.30528
+2829 0.71893 0.31283
+2866 0.70503 0.29615
+2829 0.71893 0.31283
+2854 0.72110 0.30539
+2829 0.71893 0.31283
+2828 0.72942 0.31520
+2829 0.71893 0.31283
+2827 0.74278 0.33372
+2830 0.72738 0.33006
+2836 0.61284 0.33044
+2830 0.72738 0.33006
+2849 0.71077 0.35811
+2830 0.72738 0.33006
+2847 0.70577 0.32915
+2829 0.71893 0.31283
+2847 0.70577 0.32915
+2848 0.69830 0.31577
+2860 0.68754 0.33849
+2861 0.68443 0.32503
+2860 0.68754 0.33849
+2870 0.67858 0.35099
+2860 0.68754 0.33849
+2862 0.68599 0.36358
+2860 0.68754 0.33849
+2849 0.71077 0.35811
+2847 0.70577 0.32915
+SURF 0x24
+mat 0
+refs 12
+2836 0.61284 0.33044
+2827 0.74278 0.33372
+2837 0.62172 0.33272
+2826 0.73992 0.32768
+2856 0.61220 0.31330
+2826 0.73992 0.32768
+2831 0.70499 0.31387
+2824 0.74072 0.31590
+2825 0.73675 0.30597
+2824 0.74072 0.31590
+2818 0.74428 0.30951
+2826 0.73992 0.32768
+SURF 0x24
+mat 0
+refs 6
+2887 0.65126 0.33628
+2894 0.66210 0.30444
+2887 0.65126 0.33628
+2869 0.67149 0.34116
+2888 0.63994 0.36587
+2889 0.65856 0.37503
+SURF 0x24
+mat 0
+refs 14
+2772 0.65938 0.28448
+2773 0.72831 0.33061
+2770 0.67796 0.23638
+2771 0.74512 0.28650
+2768 0.69020 0.19972
+2769 0.75420 0.25756
+2766 0.70830 0.16594
+2767 0.76260 0.23657
+2764 0.71541 0.17327
+2765 0.76354 0.22858
+2760 0.70265 0.23031
+2762 0.74382 0.28169
+2761 0.67523 0.33243
+2763 0.72384 0.35245
+SURF 0x24
+mat 0
+refs 30
+2760 0.70265 0.23031
+2761 0.67523 0.33243
+2760 0.70265 0.23031
+2759 0.63500 0.31488
+2758 0.65613 0.18166
+2749 0.61741 0.30386
+2748 0.61033 0.15122
+2749 0.61741 0.30386
+2746 0.60546 0.16468
+2747 0.61259 0.30265
+2744 0.63443 0.13782
+2743 0.64340 0.28764
+2744 0.63443 0.13782
+2740 0.70656 0.19955
+2741 0.67706 0.11771
+2737 0.74861 0.19722
+2736 0.71537 0.10178
+2737 0.74861 0.19722
+2732 0.72544 0.09890
+2733 0.75480 0.20478
+2731 0.71292 0.11378
+2730 0.74000 0.23223
+2729 0.71027 0.16432
+2728 0.71477 0.31168
+2739 0.72375 0.18384
+2738 0.71502 0.36419
+2750 0.74897 0.21484
+2753 0.74760 0.35206
+2754 0.77491 0.22524
+2755 0.75868 0.35740
+SURF 0x24
+mat 0
+refs 6
+2754 0.77491 0.22524
+2756 0.77606 0.14550
+2750 0.74897 0.21484
+2751 0.72053 0.09928
+2739 0.72375 0.18384
+2752 0.66400 0.08098
+SURF 0x24
+mat 0
+refs 12
+2743 0.64340 0.28764
+2757 0.62338 0.41036
+2743 0.64340 0.28764
+2745 0.68576 0.38514
+2740 0.70656 0.19955
+2742 0.72053 0.37429
+2737 0.74861 0.19722
+2742 0.72053 0.37429
+2733 0.75480 0.20478
+2735 0.71029 0.37876
+2730 0.74000 0.23223
+2734 0.70124 0.38602
+SURF 0x24
+mat 0
+refs 51
+2703 0.37206 0.23774
+2702 0.40370 0.24970
+2701 0.37927 0.23899
+2700 0.40370 0.24679
+2693 0.37779 0.23857
+2699 0.40370 0.24814
+2692 0.37861 0.23837
+2697 0.40370 0.24752
+2698 0.38113 0.23750
+2705 0.40370 0.24595
+2706 0.38281 0.23672
+2710 0.40370 0.24386
+2711 0.38366 0.23566
+2715 0.40370 0.24236
+2716 0.38708 0.23459
+2725 0.40370 0.24017
+2726 0.39043 0.23273
+2727 0.40370 0.23820
+2722 0.39588 0.22958
+2721 0.40370 0.23274
+2722 0.39588 0.22958
+2720 0.40370 0.22188
+2722 0.39588 0.22958
+2723 0.38716 0.22188
+2726 0.39043 0.23273
+2724 0.37942 0.22188
+2716 0.38708 0.23459
+2714 0.37606 0.22188
+2711 0.38366 0.23566
+2709 0.37264 0.22188
+2706 0.38281 0.23672
+2704 0.37180 0.22188
+2698 0.38113 0.23750
+2696 0.37012 0.22188
+2692 0.37861 0.23837
+2690 0.36759 0.22188
+2693 0.37779 0.23857
+2690 0.36759 0.22188
+2691 0.36677 0.22188
+2686 0.37861 0.20539
+2684 0.37779 0.20519
+2685 0.40370 0.19829
+2684 0.37779 0.20519
+2681 0.40370 0.19737
+2678 0.37646 0.20477
+2679 0.40370 0.19618
+2676 0.37422 0.20111
+2677 0.40370 0.19376
+2676 0.37422 0.20111
+2672 0.40370 0.19284
+2675 0.37274 0.19321
+SURF 0x24
+mat 0
+refs 30
+2685 0.40370 0.19829
+2686 0.37861 0.20539
+2687 0.40370 0.20021
+2688 0.38113 0.20627
+2689 0.40370 0.20199
+2694 0.38281 0.20704
+2695 0.40370 0.20240
+2707 0.38366 0.20811
+2708 0.40370 0.20391
+2712 0.38708 0.20917
+2713 0.40370 0.20655
+2717 0.39043 0.21104
+2718 0.40370 0.21102
+2719 0.39588 0.21418
+2720 0.40370 0.22188
+2719 0.39588 0.21418
+2723 0.38716 0.22188
+2719 0.39588 0.21418
+2724 0.37942 0.22188
+2717 0.39043 0.21104
+2714 0.37606 0.22188
+2712 0.38708 0.20917
+2709 0.37264 0.22188
+2707 0.38366 0.20811
+2704 0.37180 0.22188
+2694 0.38281 0.20704
+2696 0.37012 0.22188
+2688 0.38113 0.20627
+2690 0.36759 0.22188
+2686 0.37861 0.20539
+SURF 0x24
+mat 0
+refs 15
+2681 0.40370 0.19737
+2683 0.42962 0.20519
+2681 0.40370 0.19737
+2682 0.43095 0.20477
+2679 0.40370 0.19618
+2680 0.43319 0.20111
+2677 0.40370 0.19376
+2680 0.43319 0.20111
+2672 0.40370 0.19284
+2673 0.43466 0.19321
+2671 0.40370 0.19142
+2670 0.44503 0.19229
+2668 0.40370 0.20166
+2669 0.48956 0.20087
+2667 0.50509 0.19331
+SURF 0x24
+mat 0
+refs 4
+2669 0.48956 0.20087
+2670 0.44503 0.19229
+2674 0.46985 0.20440
+2673 0.43466 0.19321
+SURF 0x24
+mat 0
+refs 5
+2664 0.27532 0.25355
+2666 0.39131 0.31104
+2664 0.27532 0.25355
+2665 0.38301 0.32503
+2663 0.22734 0.26581
+SURF 0x24
+mat 0
+refs 12
+2661 0.26487 0.39575
+2662 0.28965 0.23105
+2661 0.26487 0.39575
+2660 0.29861 0.25817
+2659 0.25896 0.43867
+2656 0.31794 0.28270
+2654 0.25981 0.45031
+2655 0.33762 0.29400
+2653 0.27114 0.44176
+2655 0.33762 0.29400
+2658 0.29868 0.41695
+2657 0.36332 0.29784
+SURF 0x24
+mat 0
+refs 5
+2650 0.62048 0.24146
+2652 0.64570 0.16202
+2650 0.62048 0.24146
+2651 0.60695 0.31580
+2649 0.60861 0.33935
+SURF 0x24
+mat 0
+refs 20
+2640 0.42474 0.65049
+2648 0.43008 0.66302
+2640 0.42474 0.65049
+2641 0.45071 0.65899
+2620 0.45463 0.64754
+2631 0.47041 0.66427
+2621 0.47737 0.65487
+2632 0.48473 0.66993
+2633 0.49423 0.66400
+2642 0.48805 0.68039
+2633 0.49423 0.66400
+2643 0.49399 0.67814
+2634 0.50809 0.66237
+2644 0.50206 0.67946
+2635 0.52101 0.66567
+2645 0.50918 0.68366
+2636 0.52806 0.67264
+2646 0.51293 0.68916
+2637 0.52655 0.68062
+2647 0.51209 0.69397
+SURF 0x24
+mat 0
+refs 20
+2611 0.42960 0.63527
+2640 0.42474 0.65049
+2611 0.42960 0.63527
+2620 0.45463 0.64754
+2612 0.46866 0.63707
+2621 0.47737 0.65487
+2622 0.49162 0.64762
+2633 0.49423 0.66400
+2622 0.49162 0.64762
+2634 0.50809 0.66237
+2623 0.50802 0.64517
+2635 0.52101 0.66567
+2624 0.52038 0.64871
+2636 0.52806 0.67264
+2625 0.52372 0.65715
+2637 0.52655 0.68062
+2626 0.51648 0.66719
+2638 0.51705 0.68656
+2627 0.50157 0.67468
+2639 0.50318 0.68819
+SURF 0x24
+mat 0
+refs 21
+2630 0.35468 0.55218
+2629 0.36822 0.47702
+2630 0.35468 0.55218
+2609 0.44280 0.50059
+2607 0.44842 0.61473
+2608 0.50224 0.51826
+2605 0.52099 0.64174
+2606 0.56164 0.53670
+2559 0.55167 0.65080
+2600 0.58756 0.51560
+2559 0.55167 0.65080
+2558 0.54922 0.64190
+2560 0.52786 0.70084
+2558 0.54922 0.64190
+2561 0.52500 0.69199
+2552 0.53406 0.59163
+2511 0.53257 0.62300
+2552 0.53406 0.59163
+2553 0.55881 0.53888
+2554 0.49014 0.47041
+2555 0.52575 0.45331
+SURF 0x24
+mat 0
+refs 10
+2554 0.49014 0.47041
+2552 0.53406 0.59163
+2557 0.50445 0.47082
+2556 0.54634 0.56178
+2602 0.49293 0.41705
+2556 0.54634 0.56178
+2601 0.57452 0.47957
+2556 0.54634 0.56178
+2558 0.54922 0.64190
+2552 0.53406 0.59163
+SURF 0x24
+mat 0
+refs 9
+2601 0.57452 0.47957
+2558 0.54922 0.64190
+2601 0.57452 0.47957
+2600 0.58756 0.51560
+2603 0.52249 0.36497
+2600 0.58756 0.51560
+2604 0.52670 0.37428
+2606 0.56164 0.53670
+2610 0.48864 0.37872
+SURF 0x24
+mat 0
+refs 19
+2628 0.48507 0.67662
+2618 0.47215 0.66886
+2627 0.50157 0.67468
+2617 0.48979 0.66437
+2626 0.51648 0.66719
+2616 0.50636 0.65489
+2625 0.52372 0.65715
+2615 0.51325 0.64407
+2624 0.52038 0.64871
+2614 0.50654 0.63560
+2623 0.50802 0.64517
+2613 0.48810 0.63284
+2622 0.49162 0.64762
+2613 0.48810 0.63284
+2612 0.46866 0.63707
+2565 0.43943 0.62609
+2611 0.42960 0.63527
+2564 0.39851 0.62482
+2619 0.39812 0.64226
+SURF 0x24
+mat 0
+refs 16
+2518 0.40824 0.61393
+2564 0.39851 0.62482
+2518 0.40824 0.61393
+2565 0.43943 0.62609
+2566 0.45190 0.62227
+2613 0.48810 0.63284
+2566 0.45190 0.62227
+2614 0.50654 0.63560
+2567 0.46538 0.62733
+2615 0.51325 0.64407
+2568 0.47072 0.63986
+2616 0.50636 0.65489
+2569 0.46988 0.65456
+2617 0.48979 0.66437
+2570 0.46005 0.66373
+2618 0.47215 0.66886
+SURF 0x24
+mat 0
+refs 15
+2570 0.46005 0.66373
+2551 0.44741 0.65912
+2569 0.46988 0.65456
+2550 0.44467 0.64200
+2568 0.47072 0.63986
+2549 0.43558 0.62467
+2567 0.46538 0.62733
+2517 0.42359 0.61375
+2566 0.45190 0.62227
+2517 0.42359 0.61375
+2518 0.40824 0.61393
+2516 0.40839 0.59852
+2519 0.39012 0.59820
+2562 0.39056 0.55903
+2563 0.39600 0.56356
+SURF 0x24
+mat 0
+refs 126
+2515 0.41198 0.55513
+2562 0.39056 0.55903
+2515 0.41198 0.55513
+2516 0.40839 0.59852
+2513 0.42389 0.59348
+2516 0.40839 0.59852
+2514 0.43589 0.62492
+2517 0.42359 0.61375
+2514 0.43589 0.62492
+2549 0.43558 0.62467
+2514 0.43589 0.62492
+2550 0.44467 0.64200
+2548 0.44020 0.64649
+2551 0.44741 0.65912
+2548 0.44020 0.64649
+2547 0.45041 0.66754
+2495 0.45344 0.64210
+2494 0.46557 0.66966
+2492 0.45167 0.63856
+2491 0.44353 0.65959
+2492 0.45167 0.63856
+2487 0.43088 0.63993
+2488 0.44493 0.60408
+2484 0.43646 0.60993
+2485 0.44398 0.58321
+2483 0.45211 0.54927
+2485 0.44398 0.58321
+2486 0.43730 0.55788
+2485 0.44398 0.58321
+2489 0.43920 0.58263
+2488 0.44493 0.60408
+2493 0.43173 0.59639
+2488 0.44493 0.60408
+2498 0.42787 0.60426
+2492 0.45167 0.63856
+2497 0.44594 0.62608
+2495 0.45344 0.64210
+2496 0.44151 0.62247
+2548 0.44020 0.64649
+2496 0.44151 0.62247
+2514 0.43589 0.62492
+2496 0.44151 0.62247
+2513 0.42389 0.59348
+2496 0.44151 0.62247
+2500 0.43067 0.60189
+2497 0.44594 0.62608
+2499 0.42885 0.60495
+2498 0.42787 0.60426
+2531 0.43702 0.61673
+2498 0.42787 0.60426
+2523 0.44546 0.60671
+2493 0.43173 0.59639
+2520 0.46492 0.59033
+2489 0.43920 0.58263
+2521 0.46241 0.58783
+2522 0.45048 0.58343
+2533 0.45769 0.58969
+2526 0.45191 0.57874
+2536 0.45312 0.58929
+2537 0.46490 0.58720
+2539 0.49214 0.60557
+2538 0.47110 0.58314
+2540 0.50502 0.59364
+2529 0.48171 0.58408
+2571 0.50449 0.59212
+2572 0.47793 0.60528
+2594 0.50581 0.61583
+2596 0.46896 0.62502
+2595 0.51380 0.63303
+2597 0.46232 0.62992
+2588 0.51568 0.64048
+2587 0.50570 0.63434
+2588 0.51568 0.64048
+2586 0.56442 0.63803
+2595 0.51380 0.63303
+2593 0.54972 0.62932
+2594 0.50581 0.61583
+2592 0.53475 0.60379
+2571 0.50449 0.59212
+2592 0.53475 0.60379
+2540 0.50502 0.59364
+2542 0.53239 0.60677
+2539 0.49214 0.60557
+2541 0.51487 0.62266
+2539 0.49214 0.60557
+2574 0.48466 0.60836
+2536 0.45312 0.58929
+2534 0.48457 0.60677
+2533 0.45769 0.58969
+2534 0.48457 0.60677
+2521 0.46241 0.58783
+2535 0.48676 0.59810
+2520 0.46492 0.59033
+2576 0.47639 0.59465
+2520 0.46492 0.59033
+2575 0.45881 0.61081
+2523 0.44546 0.60671
+2579 0.44494 0.62062
+2531 0.43702 0.61673
+2532 0.43778 0.61837
+2499 0.42885 0.60495
+2532 0.43778 0.61837
+2500 0.43067 0.60189
+2530 0.44499 0.61413
+2500 0.43067 0.60189
+2527 0.43209 0.59145
+2513 0.42389 0.59348
+2524 0.43802 0.57883
+2515 0.41198 0.55513
+2524 0.43802 0.57883
+2486 0.43730 0.55788
+2490 0.44149 0.57628
+2489 0.43920 0.58263
+2490 0.44149 0.57628
+2522 0.45048 0.58343
+2490 0.44149 0.57628
+2526 0.45191 0.57874
+2525 0.45871 0.58019
+2537 0.46490 0.58720
+2525 0.45871 0.58019
+2538 0.47110 0.58314
+2525 0.45871 0.58019
+2529 0.48171 0.58408
+2525 0.45871 0.58019
+2524 0.43802 0.57883
+2490 0.44149 0.57628
+SURF 0x24
+mat 0
+refs 26
+2512 0.49153 0.69164
+2511 0.53257 0.62300
+2510 0.52742 0.69658
+2509 0.58010 0.61939
+2510 0.52742 0.69658
+2507 0.60196 0.61812
+2508 0.54740 0.69642
+2505 0.59892 0.60989
+2506 0.54558 0.69380
+2503 0.60571 0.60198
+2504 0.52900 0.69670
+2481 0.62260 0.60500
+2482 0.55066 0.72659
+2479 0.62999 0.62233
+2480 0.56822 0.71175
+2477 0.58640 0.61422
+2478 0.52626 0.70002
+2477 0.58640 0.61422
+2476 0.45155 0.66000
+2475 0.49541 0.57470
+2484 0.43646 0.60993
+2475 0.49541 0.57470
+2483 0.45211 0.54927
+2475 0.49541 0.57470
+2502 0.46074 0.48384
+2501 0.51280 0.44054
+SURF 0x24
+mat 0
+refs 24
+2469 0.45958 0.61816
+2468 0.43695 0.59666
+2470 0.47685 0.57113
+2467 0.45526 0.53904
+2470 0.47685 0.57113
+2471 0.44512 0.54063
+2472 0.47566 0.56853
+2471 0.44512 0.54063
+2474 0.46530 0.59943
+2471 0.44512 0.54063
+2473 0.41541 0.57437
+2463 0.43151 0.52088
+2462 0.39418 0.56645
+2458 0.42403 0.50558
+2459 0.36326 0.52615
+2452 0.42024 0.48474
+2453 0.35510 0.47980
+2452 0.42024 0.48474
+2451 0.35373 0.45676
+2452 0.42024 0.48474
+2447 0.42017 0.47538
+2448 0.45247 0.48444
+2449 0.42510 0.46742
+2450 0.45087 0.47289
+SURF 0x24
+mat 0
+refs 23
+2463 0.43151 0.52088
+2471 0.44512 0.54063
+2463 0.43151 0.52088
+2467 0.45526 0.53904
+2464 0.44472 0.51631
+2468 0.43695 0.59666
+2464 0.44472 0.51631
+2465 0.43592 0.58349
+2464 0.44472 0.51631
+2461 0.44299 0.56495
+2460 0.44289 0.50719
+2456 0.46509 0.53592
+2454 0.44510 0.49347
+2455 0.48178 0.49266
+2454 0.44510 0.49347
+2448 0.45247 0.48444
+2454 0.44510 0.49347
+2452 0.42024 0.48474
+2454 0.44510 0.49347
+2458 0.42403 0.50558
+2460 0.44289 0.50719
+2463 0.43151 0.52088
+2464 0.44472 0.51631
+SURF 0x24
+mat 0
+refs 4
+2455 0.48178 0.49266
+2456 0.46509 0.53592
+2457 0.52212 0.50397
+2466 0.47545 0.61563
+SURF 0x24
+mat 0
+refs 15
+2436 0.46797 0.49030
+2445 0.42797 0.45014
+2436 0.46797 0.49030
+2446 0.41420 0.46474
+2435 0.46636 0.51126
+2443 0.40188 0.48009
+2434 0.45889 0.52693
+2444 0.39325 0.49482
+2433 0.44458 0.53527
+2442 0.37421 0.53486
+2432 0.41630 0.57651
+2437 0.34491 0.58224
+2431 0.39237 0.62931
+2438 0.33048 0.59896
+2439 0.38062 0.64584
+SURF 0x24
+mat 0
+refs 17
+2431 0.39237 0.62931
+2425 0.43241 0.65295
+2432 0.41630 0.57651
+2422 0.45651 0.59974
+2433 0.44458 0.53527
+2426 0.49952 0.55971
+2434 0.45889 0.52693
+2427 0.49506 0.54238
+2435 0.46636 0.51126
+2429 0.49476 0.52911
+2436 0.46797 0.49030
+2429 0.49476 0.52911
+2428 0.49641 0.51520
+2406 0.52574 0.53503
+2428 0.49641 0.51520
+2405 0.53459 0.51652
+2430 0.50330 0.49306
+SURF 0x24
+mat 0
+refs 34
+2403 0.55558 0.53273
+2405 0.53459 0.51652
+2403 0.55558 0.53273
+2406 0.52574 0.53503
+2404 0.54452 0.54377
+2410 0.53551 0.54429
+2411 0.53285 0.54905
+2416 0.49018 0.51392
+2412 0.52207 0.55785
+2413 0.52334 0.56795
+2399 0.53237 0.58279
+2413 0.52334 0.56795
+2415 0.51398 0.55690
+2416 0.49018 0.51392
+2409 0.50280 0.53007
+2416 0.49018 0.51392
+2408 0.52046 0.53276
+2410 0.53551 0.54429
+2408 0.52046 0.53276
+2406 0.52574 0.53503
+2407 0.50253 0.53153
+2429 0.49476 0.52911
+2407 0.50253 0.53153
+2427 0.49506 0.54238
+2414 0.51934 0.57222
+2426 0.49952 0.55971
+2417 0.51705 0.58108
+2422 0.45651 0.59974
+2418 0.48524 0.60470
+2421 0.47135 0.64471
+2418 0.48524 0.60470
+2420 0.48567 0.63475
+2419 0.50223 0.61228
+2423 0.50020 0.63619
+SURF 0x24
+mat 0
+refs 14
+2418 0.48524 0.60470
+2419 0.50223 0.61228
+2418 0.48524 0.60470
+2400 0.53369 0.59661
+2417 0.51705 0.58108
+2400 0.53369 0.59661
+2414 0.51934 0.57222
+2399 0.53237 0.58279
+2414 0.51934 0.57222
+2415 0.51398 0.55690
+2414 0.51934 0.57222
+2409 0.50280 0.53007
+2407 0.50253 0.53153
+2408 0.52046 0.53276
+SURF 0x24
+mat 0
+refs 7
+2422 0.45651 0.59974
+2425 0.43241 0.65295
+2421 0.47135 0.64471
+2424 0.46271 0.66227
+2421 0.47135 0.64471
+2440 0.48039 0.67107
+2441 0.49555 0.66602
+SURF 0x24
+mat 0
+refs 22
+2402 0.57395 0.53320
+2403 0.55558 0.53273
+2401 0.54707 0.55903
+2404 0.54452 0.54377
+2401 0.54707 0.55903
+2411 0.53285 0.54905
+2401 0.54707 0.55903
+2412 0.52207 0.55785
+2397 0.53008 0.57315
+2399 0.53237 0.58279
+2397 0.53008 0.57315
+2400 0.53369 0.59661
+2397 0.53008 0.57315
+2398 0.53414 0.58956
+2394 0.55979 0.59041
+2393 0.54991 0.60456
+2394 0.55979 0.59041
+2388 0.56261 0.62664
+2390 0.57964 0.60294
+2389 0.57829 0.63353
+2391 0.61488 0.60121
+2392 0.63624 0.60194
+SURF 0x24
+mat 0
+refs 6
+2390 0.57964 0.60294
+2396 0.60298 0.58705
+2394 0.55979 0.59041
+2395 0.57320 0.57225
+2397 0.53008 0.57315
+2401 0.54707 0.55903
+SURF 0x24
+mat 0
+refs 28
+2378 0.58206 0.37475
+2373 0.58964 0.35757
+2377 0.59699 0.38248
+2376 0.61088 0.36022
+2379 0.59878 0.38340
+2380 0.61757 0.35305
+2384 0.57076 0.36890
+2382 0.58882 0.33605
+2386 0.54805 0.35714
+2382 0.58882 0.33605
+2385 0.56338 0.32162
+2382 0.58882 0.33605
+2387 0.58111 0.29096
+2382 0.58882 0.33605
+2383 0.49042 0.27101
+2382 0.58882 0.33605
+2381 0.51581 0.29183
+2380 0.61757 0.35305
+2375 0.51136 0.29172
+2376 0.61088 0.36022
+2375 0.51136 0.29172
+2373 0.58964 0.35757
+2374 0.60928 0.31835
+2373 0.58964 0.35757
+2372 0.58645 0.32490
+2371 0.57841 0.35024
+2370 0.58021 0.31476
+2369 0.57235 0.34620
+SURF 0x24
+mat 0
+refs 8
+2367 0.23585 0.46758
+2368 0.24081 0.51436
+2367 0.23585 0.46758
+2364 0.21832 0.52335
+2363 0.21063 0.47673
+2364 0.21832 0.52335
+2365 0.21737 0.47574
+2366 0.23032 0.51385
+SURF 0x24
+mat 0
+refs 11
+2361 0.65014 0.45137
+2362 0.66137 0.43109
+2361 0.65014 0.45137
+2354 0.63973 0.39693
+2357 0.62734 0.42122
+2354 0.63973 0.39693
+2356 0.59632 0.37378
+2355 0.62088 0.36054
+2356 0.59632 0.37378
+2358 0.60086 0.31634
+2360 0.57408 0.33196
+SURF 0x24
+mat 0
+refs 7
+2359 0.65305 0.28591
+2358 0.60086 0.31634
+2359 0.65305 0.28591
+2355 0.62088 0.36054
+2353 0.66597 0.31906
+2354 0.63973 0.39693
+2352 0.68085 0.34796
+SURF 0x24
+mat 0
+refs 10
+2351 0.58656 0.27774
+2350 0.54544 0.32671
+2351 0.58656 0.27774
+2345 0.56708 0.36087
+2344 0.60223 0.30509
+2345 0.56708 0.36087
+2346 0.61595 0.32296
+2347 0.59297 0.39019
+2348 0.51505 0.30674
+2349 0.49388 0.37822
+SURF 0x24
+mat 0
+refs 5
+2341 0.54432 0.38043
+2343 0.59519 0.32231
+2341 0.54432 0.38043
+2342 0.53819 0.32488
+2340 0.51177 0.38241
+SURF 0x24
+mat 0
+refs 17
+2334 0.54041 0.35319
+2330 0.56207 0.31945
+2335 0.57036 0.36869
+2331 0.58370 0.34445
+2336 0.59736 0.38267
+2332 0.60783 0.36480
+2337 0.61749 0.39309
+2332 0.60783 0.36480
+2338 0.50741 0.34721
+2332 0.60783 0.36480
+2339 0.51702 0.32068
+2332 0.60783 0.36480
+2333 0.50192 0.30643
+2331 0.58370 0.34445
+2329 0.60035 0.31753
+2330 0.56207 0.31945
+2328 0.58448 0.29021
+SURF 0x24
+mat 0
+refs 17
+2327 0.76529 0.33357
+2324 0.75011 0.33062
+2326 0.75736 0.25431
+2320 0.72220 0.23672
+2325 0.76469 0.18684
+2320 0.72220 0.23672
+2321 0.69588 0.13174
+2318 0.69128 0.24902
+2319 0.64156 0.15456
+2318 0.69128 0.24902
+2316 0.61887 0.23054
+2317 0.64323 0.28873
+2316 0.61887 0.23054
+2313 0.62633 0.30476
+2316 0.61887 0.23054
+2314 0.60086 0.23968
+2315 0.58804 0.21498
+SURF 0x24
+mat 0
+refs 13
+2313 0.62633 0.30476
+2312 0.62149 0.33488
+2314 0.60086 0.23968
+2309 0.63413 0.26649
+2314 0.60086 0.23968
+2308 0.61700 0.24333
+2307 0.58577 0.21941
+2308 0.61700 0.24333
+2304 0.57181 0.26966
+2306 0.64325 0.29000
+2304 0.57181 0.26966
+2305 0.63448 0.30887
+2303 0.62554 0.32515
+SURF 0x24
+mat 0
+refs 7
+2306 0.64325 0.29000
+2308 0.61700 0.24333
+2306 0.64325 0.29000
+2309 0.63413 0.26649
+2310 0.65255 0.31410
+2312 0.62149 0.33488
+2311 0.61572 0.37753
+SURF 0x24
+mat 0
+refs 7
+2322 0.64952 0.39888
+2317 0.64323 0.28873
+2322 0.64952 0.39888
+2318 0.69128 0.24902
+2323 0.70924 0.35929
+2320 0.72220 0.23672
+2324 0.75011 0.33062
+SURF 0x24
+mat 0
+refs 5
+2300 0.60606 0.45263
+2302 0.63248 0.39509
+2300 0.60606 0.45263
+2301 0.60934 0.37695
+2299 0.58817 0.44844
+SURF 0x24
+mat 0
+refs 5
+2296 0.28163 0.54352
+2298 0.26377 0.51878
+2296 0.28163 0.54352
+2297 0.25570 0.45867
+2295 0.23499 0.51988
+SURF 0x24
+mat 0
+refs 18
+2294 0.57323 0.48753
+2293 0.59496 0.51782
+2294 0.57323 0.48753
+2291 0.61178 0.49385
+2290 0.56927 0.45516
+2291 0.61178 0.49385
+2288 0.61765 0.43570
+2285 0.63067 0.46649
+2289 0.59583 0.42296
+2285 0.63067 0.46649
+2283 0.62180 0.43296
+2284 0.64306 0.49185
+2283 0.62180 0.43296
+2282 0.64639 0.45673
+2283 0.62180 0.43296
+2287 0.65016 0.43569
+2286 0.60291 0.40405
+2292 0.67590 0.37306
+SURF 0x24
+mat 0
+refs 24
+2280 0.35794 0.33174
+2281 0.32745 0.39458
+2278 0.37824 0.34462
+2279 0.34433 0.40508
+2274 0.38104 0.34637
+2275 0.33116 0.42107
+2268 0.38866 0.35121
+2269 0.33644 0.42801
+2268 0.38866 0.35121
+2267 0.35679 0.44093
+2266 0.40688 0.36276
+2263 0.37679 0.45031
+2261 0.42782 0.37605
+2262 0.43033 0.46573
+2260 0.47139 0.40368
+2265 0.47402 0.47325
+2264 0.50346 0.42402
+2265 0.47402 0.47325
+2270 0.51515 0.43143
+2271 0.49052 0.47759
+2272 0.53463 0.44379
+2273 0.50864 0.48530
+2276 0.55332 0.45564
+2277 0.52641 0.49462
+SURF 0x24
+mat 0
+refs 14
+2258 0.51145 0.30020
+2259 0.49725 0.35896
+2258 0.51145 0.30020
+2256 0.59331 0.38055
+2257 0.60563 0.33099
+2256 0.59331 0.38055
+2255 0.59630 0.32717
+2254 0.58036 0.37385
+2253 0.48903 0.31991
+2252 0.59188 0.37981
+2251 0.50922 0.33301
+2250 0.61311 0.39080
+2249 0.51658 0.34051
+2248 0.50646 0.36375
+SURF 0x24
+mat 0
+refs 29
+2246 0.51223 0.48035
+2247 0.52471 0.48525
+2246 0.51223 0.48035
+2239 0.52078 0.50361
+2238 0.50984 0.50054
+2222 0.50138 0.51903
+2238 0.50984 0.50054
+2223 0.49420 0.51785
+2237 0.50122 0.49813
+2236 0.47473 0.51451
+2244 0.48382 0.49325
+2211 0.45487 0.50839
+2245 0.46315 0.48745
+2211 0.45487 0.50839
+2243 0.44455 0.48224
+2210 0.43603 0.50493
+2242 0.41219 0.47317
+2210 0.43603 0.50493
+2231 0.39737 0.50551
+2209 0.42243 0.53619
+2230 0.38698 0.53631
+2212 0.40933 0.56990
+2233 0.37823 0.56659
+2213 0.40150 0.59109
+2232 0.37495 0.58887
+2215 0.40607 0.60769
+2234 0.37430 0.61102
+2217 0.41143 0.62571
+2235 0.37737 0.64027
+SURF 0x24
+mat 0
+refs 65
+2172 0.57914 0.51995
+2127 0.54381 0.58534
+2126 0.55497 0.51318
+2125 0.52504 0.56607
+2124 0.53297 0.50701
+2125 0.52504 0.56607
+2122 0.50897 0.54967
+2123 0.47619 0.61079
+2122 0.50897 0.54967
+2119 0.47062 0.59466
+2122 0.50897 0.54967
+2129 0.49863 0.54813
+2124 0.53297 0.50701
+2129 0.49863 0.54813
+2152 0.51893 0.50307
+2144 0.52181 0.53627
+2151 0.53142 0.50657
+2137 0.54601 0.54035
+2149 0.55444 0.51303
+2106 0.55651 0.53989
+2107 0.56497 0.51600
+2106 0.55651 0.53989
+2095 0.57510 0.51884
+2099 0.56881 0.53812
+2100 0.56448 0.53136
+2120 0.55366 0.56054
+2101 0.55438 0.52874
+2133 0.54330 0.55469
+2102 0.53282 0.52847
+2138 0.52254 0.55480
+2104 0.50130 0.52688
+2130 0.49510 0.55792
+2131 0.46843 0.53039
+2132 0.46485 0.56706
+2155 0.45009 0.56396
+2156 0.44836 0.59986
+2159 0.44209 0.61492
+2177 0.45995 0.63859
+2173 0.46172 0.64358
+2164 0.46559 0.65313
+2173 0.46172 0.64358
+2168 0.47008 0.64643
+2159 0.44209 0.61492
+2174 0.45225 0.61898
+2159 0.44209 0.61492
+2158 0.44771 0.56180
+2155 0.45009 0.56396
+2176 0.45048 0.52609
+2155 0.45009 0.56396
+2153 0.45335 0.52626
+2131 0.46843 0.53039
+2150 0.47562 0.49095
+2131 0.46843 0.53039
+2105 0.50809 0.50005
+2104 0.50130 0.52688
+2103 0.53736 0.50826
+2102 0.53282 0.52847
+2097 0.55919 0.51438
+2101 0.55438 0.52874
+2093 0.56862 0.51702
+2100 0.56448 0.53136
+2093 0.56862 0.51702
+2095 0.57510 0.51884
+2094 0.57254 0.50262
+2096 0.57975 0.49911
+SURF 0x24
+mat 0
+refs 4
+2094 0.57254 0.50262
+2093 0.56862 0.51702
+2098 0.56254 0.49961
+2097 0.55919 0.51438
+SURF 0x24
+mat 0
+refs 107
+2150 0.47562 0.49095
+2153 0.45335 0.52626
+2154 0.46127 0.48692
+2176 0.45048 0.52609
+2184 0.45748 0.48586
+2185 0.47086 0.52970
+2186 0.48390 0.49327
+2221 0.49931 0.53651
+2220 0.50853 0.50017
+2226 0.53193 0.54370
+2241 0.53890 0.50869
+2227 0.53193 0.53390
+2240 0.53697 0.50815
+2229 0.51459 0.52134
+2239 0.52078 0.50361
+2229 0.51459 0.52134
+2222 0.50138 0.51903
+2198 0.48998 0.54304
+2222 0.50138 0.51903
+2197 0.47849 0.54620
+2223 0.49420 0.51785
+2206 0.46005 0.54260
+2236 0.47473 0.51451
+2206 0.46005 0.54260
+2211 0.45487 0.50839
+2207 0.44019 0.53658
+2210 0.43603 0.50493
+2207 0.44019 0.53658
+2209 0.42243 0.53619
+2208 0.42827 0.56593
+2212 0.40933 0.56990
+2214 0.41446 0.59661
+2213 0.40150 0.59109
+2216 0.41961 0.61000
+2215 0.40607 0.60769
+2218 0.42464 0.62601
+2217 0.41143 0.62571
+2188 0.43962 0.64272
+2219 0.43054 0.65275
+2188 0.43962 0.64272
+2178 0.46522 0.66680
+2179 0.47002 0.65261
+2167 0.47799 0.64898
+2171 0.48554 0.64003
+2170 0.48721 0.63272
+2171 0.48554 0.64003
+2180 0.49342 0.63026
+2179 0.47002 0.65261
+2181 0.47102 0.63468
+2179 0.47002 0.65261
+2187 0.45825 0.63618
+2188 0.43962 0.64272
+2187 0.45825 0.63618
+2218 0.42464 0.62601
+2189 0.44020 0.63196
+2216 0.41961 0.61000
+2192 0.43662 0.61614
+2214 0.41446 0.59661
+2194 0.43744 0.60178
+2214 0.41446 0.59661
+2196 0.44639 0.57617
+2208 0.42827 0.56593
+2196 0.44639 0.57617
+2207 0.44019 0.53658
+2196 0.44639 0.57617
+2206 0.46005 0.54260
+2196 0.44639 0.57617
+2197 0.47849 0.54620
+2195 0.45828 0.57383
+2198 0.48998 0.54304
+2199 0.47229 0.56968
+2198 0.48998 0.54304
+2201 0.50218 0.56341
+2229 0.51459 0.52134
+2205 0.51940 0.57199
+2227 0.53193 0.53390
+2205 0.51940 0.57199
+2226 0.53193 0.54370
+2203 0.52273 0.57495
+2221 0.49931 0.53651
+2202 0.48996 0.57284
+2221 0.49931 0.53651
+2175 0.46290 0.56421
+2185 0.47086 0.52970
+2175 0.46290 0.56421
+2176 0.45048 0.52609
+2175 0.46290 0.56421
+2158 0.44771 0.56180
+2175 0.46290 0.56421
+2174 0.45225 0.61898
+2202 0.48996 0.57284
+2182 0.49100 0.61202
+2202 0.48996 0.57284
+2183 0.51120 0.60432
+2203 0.52273 0.57495
+2204 0.50316 0.59992
+2205 0.51940 0.57199
+2200 0.48667 0.59058
+2201 0.50218 0.56341
+2200 0.48667 0.59058
+2199 0.47229 0.56968
+2224 0.45630 0.58908
+2195 0.45828 0.57383
+2193 0.44484 0.59679
+2195 0.45828 0.57383
+2194 0.43744 0.60178
+2196 0.44639 0.57617
+SURF 0x24
+mat 0
+refs 21
+2192 0.43662 0.61614
+2194 0.43744 0.60178
+2192 0.43662 0.61614
+2193 0.44484 0.59679
+2191 0.44866 0.61303
+2224 0.45630 0.58908
+2228 0.46325 0.60834
+2200 0.48667 0.59058
+2225 0.47967 0.62243
+2204 0.50316 0.59992
+2180 0.49342 0.63026
+2183 0.51120 0.60432
+2170 0.48721 0.63272
+2182 0.49100 0.61202
+2170 0.48721 0.63272
+2174 0.45225 0.61898
+2169 0.47976 0.64187
+2168 0.47008 0.64643
+2169 0.47976 0.64187
+2167 0.47799 0.64898
+2170 0.48721 0.63272
+SURF 0x24
+mat 0
+refs 47
+2118 0.42256 0.66955
+2117 0.44744 0.63444
+2119 0.47062 0.59466
+2116 0.47461 0.58559
+2129 0.49863 0.54813
+2116 0.47461 0.58559
+2144 0.52181 0.53627
+2115 0.50301 0.58070
+2137 0.54601 0.54035
+2112 0.53271 0.57695
+2137 0.54601 0.54035
+2109 0.54475 0.57258
+2106 0.55651 0.53989
+2108 0.55499 0.57025
+2099 0.56881 0.53812
+2108 0.55499 0.57025
+2120 0.55366 0.56054
+2121 0.53733 0.59036
+2120 0.55366 0.56054
+2135 0.52715 0.58628
+2133 0.54330 0.55469
+2140 0.51043 0.58433
+2138 0.52254 0.55480
+2146 0.48714 0.58639
+2130 0.49510 0.55792
+2157 0.46222 0.60054
+2132 0.46485 0.56706
+2157 0.46222 0.60054
+2156 0.44836 0.59986
+2145 0.46347 0.63374
+2177 0.45995 0.63859
+2147 0.46402 0.64707
+2177 0.45995 0.63859
+2161 0.46078 0.64925
+2164 0.46559 0.65313
+2162 0.45502 0.67080
+2164 0.46559 0.65313
+2163 0.45567 0.67024
+2165 0.47111 0.65390
+2166 0.45855 0.66757
+2165 0.47111 0.65390
+2178 0.46522 0.66680
+2165 0.47111 0.65390
+2167 0.47799 0.64898
+2165 0.47111 0.65390
+2168 0.47008 0.64643
+2164 0.46559 0.65313
+SURF 0x24
+mat 0
+refs 31
+2162 0.45502 0.67080
+2161 0.46078 0.64925
+2160 0.45693 0.66810
+2147 0.46402 0.64707
+2160 0.45693 0.66810
+2142 0.47269 0.64752
+2148 0.46075 0.66231
+2114 0.48894 0.61470
+2117 0.44744 0.63444
+2114 0.48894 0.61470
+2116 0.47461 0.58559
+2114 0.48894 0.61470
+2115 0.50301 0.58070
+2113 0.52244 0.59890
+2112 0.53271 0.57695
+2113 0.52244 0.59890
+2109 0.54475 0.57258
+2111 0.53179 0.59686
+2110 0.53932 0.59688
+2128 0.52041 0.61243
+2121 0.53733 0.59036
+2136 0.51016 0.61532
+2121 0.53733 0.59036
+2134 0.51636 0.60275
+2135 0.52715 0.58628
+2134 0.51636 0.60275
+2140 0.51043 0.58433
+2139 0.48797 0.62044
+2146 0.48714 0.58639
+2145 0.46347 0.63374
+2157 0.46222 0.60054
+SURF 0x24
+mat 0
+refs 12
+2134 0.51636 0.60275
+2136 0.51016 0.61532
+2139 0.48797 0.62044
+2141 0.47865 0.63520
+2145 0.46347 0.63374
+2141 0.47865 0.63520
+2147 0.46402 0.64707
+2141 0.47865 0.63520
+2142 0.47269 0.64752
+2141 0.47865 0.63520
+2143 0.50824 0.62189
+2136 0.51016 0.61532
+SURF 0x24
+mat 0
+refs 4
+2143 0.50824 0.62189
+2113 0.52244 0.59890
+2142 0.47269 0.64752
+2114 0.48894 0.61470
+SURF 0x24
+mat 0
+refs 4
+2121 0.53733 0.59036
+2108 0.55499 0.57025
+2110 0.53932 0.59688
+2109 0.54475 0.57258
+SURF 0x24
+mat 0
+refs 17
+2089 0.31738 0.47678
+2088 0.31388 0.47719
+2081 0.32295 0.46827
+2087 0.31051 0.47938
+2081 0.32295 0.46827
+2086 0.30890 0.48221
+2081 0.32295 0.46827
+2085 0.30962 0.48467
+2081 0.32295 0.46827
+2084 0.31225 0.48592
+2081 0.32295 0.46827
+2083 0.31585 0.48533
+2081 0.32295 0.46827
+2082 0.31890 0.48340
+2081 0.32295 0.46827
+2079 0.32034 0.48086
+2080 0.31976 0.47831
+SURF 0x24
+mat 0
+refs 17
+2078 0.31732 0.56333
+2077 0.33044 0.56976
+2078 0.31732 0.56333
+2075 0.32941 0.58318
+2076 0.32077 0.56847
+2072 0.32774 0.59621
+2073 0.32532 0.58125
+2067 0.32375 0.61075
+2073 0.32532 0.58125
+2068 0.32451 0.59832
+2074 0.33145 0.57290
+2068 0.32451 0.59832
+2069 0.33169 0.59330
+2063 0.32201 0.60931
+2065 0.33010 0.60861
+2064 0.31572 0.61496
+2066 0.32093 0.61463
+SURF 0x24
+mat 0
+refs 10
+2062 0.31129 0.62076
+2064 0.31572 0.61496
+2062 0.31129 0.62076
+2063 0.32201 0.60931
+2061 0.31720 0.61798
+2068 0.32451 0.59832
+2061 0.31720 0.61798
+2067 0.32375 0.61075
+2071 0.31751 0.63131
+2070 0.33008 0.62611
+SURF 0x24
+mat 0
+refs 5
+2058 0.31914 0.50286
+2060 0.31355 0.50397
+2058 0.31914 0.50286
+2059 0.32571 0.49684
+2057 0.33635 0.49334
+SURF 0x24
+mat 0
+refs 10
+2055 0.37468 0.52044
+2056 0.35291 0.48853
+2053 0.36959 0.52473
+2054 0.35035 0.48992
+2049 0.36471 0.52438
+2050 0.34794 0.48906
+2046 0.36180 0.51949
+2051 0.34660 0.48609
+2048 0.36193 0.51160
+2052 0.34681 0.48207
+SURF 0x24
+mat 0
+refs 5
+2046 0.36180 0.51949
+2048 0.36193 0.51160
+2046 0.36180 0.51949
+2047 0.36956 0.51494
+2045 0.37259 0.52856
+SURF 0x24
+mat 0
+refs 17
+2043 0.18822 0.50796
+2042 0.17809 0.54524
+2041 0.19176 0.50710
+2040 0.18604 0.54299
+2039 0.19465 0.50495
+2038 0.19256 0.53806
+2037 0.19589 0.50230
+2036 0.19504 0.53221
+2035 0.19512 0.49980
+2034 0.19210 0.52789
+2033 0.19263 0.49846
+2032 0.18485 0.52704
+2044 0.18917 0.49914
+2032 0.18485 0.52704
+2030 0.17653 0.52980
+2031 0.19026 0.53071
+2029 0.17895 0.53778
+SURF 0x24
+mat 0
+refs 5
+2026 0.31470 0.60118
+2028 0.32784 0.60474
+2026 0.31470 0.60118
+2027 0.33154 0.58534
+2025 0.31386 0.59065
+SURF 0x24
+mat 0
+refs 17
+2024 0.51445 0.23334
+2023 0.47992 0.27039
+2022 0.54353 0.24195
+2021 0.49625 0.27487
+2020 0.56465 0.25001
+2014 0.52267 0.28289
+2018 0.57266 0.25082
+2015 0.53193 0.28537
+2019 0.51924 0.23196
+2015 0.53193 0.28537
+2017 0.49141 0.26691
+2015 0.53193 0.28537
+2016 0.44824 0.32132
+2015 0.53193 0.28537
+2013 0.47485 0.33140
+2014 0.52267 0.28289
+2012 0.46566 0.32437
+SURF 0x24
+mat 0
+refs 20
+2010 0.54544 0.41939
+2011 0.60246 0.37791
+2010 0.54544 0.41939
+2008 0.57603 0.36990
+2009 0.53448 0.41106
+2008 0.57603 0.36990
+2000 0.52656 0.40318
+1999 0.55970 0.36541
+1996 0.51487 0.35106
+2004 0.59423 0.32836
+1996 0.51487 0.35106
+2002 0.54985 0.31226
+1995 0.48341 0.32954
+2002 0.54985 0.31226
+2001 0.50306 0.28913
+2006 0.59486 0.24259
+2001 0.50306 0.28913
+2005 0.53887 0.22376
+2003 0.44947 0.25248
+2007 0.46321 0.19024
+SURF 0x24
+mat 0
+refs 8
+2001 0.50306 0.28913
+2003 0.44947 0.25248
+2001 0.50306 0.28913
+1998 0.44824 0.30571
+1995 0.48341 0.32954
+1998 0.44824 0.30571
+1993 0.46628 0.37158
+1997 0.45191 0.36750
+SURF 0x24
+mat 0
+refs 6
+1995 0.48341 0.32954
+1993 0.46628 0.37158
+1995 0.48341 0.32954
+1994 0.49218 0.38176
+1996 0.51487 0.35106
+2000 0.52656 0.40318
+SURF 0x24
+mat 0
+refs 17
+1992 0.48094 0.19855
+1991 0.54718 0.25921
+1992 0.48094 0.19855
+1989 0.52795 0.30814
+1990 0.46845 0.26258
+1984 0.51473 0.34544
+1986 0.46254 0.30969
+1984 0.51473 0.34544
+1987 0.45456 0.37664
+1984 0.51473 0.34544
+1985 0.49479 0.39897
+1984 0.51473 0.34544
+1983 0.52802 0.41635
+1984 0.51473 0.34544
+1982 0.57119 0.36193
+1989 0.52795 0.30814
+1988 0.59902 0.32698
+SURF 0x24
+mat 0
+refs 5
+1979 0.37907 0.40751
+1981 0.42981 0.31360
+1979 0.37907 0.40751
+1980 0.47082 0.35612
+1978 0.41631 0.47629
+SURF 0x24
+mat 0
+refs 5
+1975 0.69258 0.46949
+1977 0.67697 0.41316
+1975 0.69258 0.46949
+1976 0.63295 0.46408
+1974 0.60971 0.56421
+SURF 0x24
+mat 0
+refs 96
+1960 0.39785 0.26170
+1973 0.37261 0.25144
+1960 0.39785 0.26170
+1965 0.38595 0.22050
+1961 0.40740 0.24119
+1962 0.42238 0.21707
+1947 0.43145 0.22451
+1962 0.42238 0.21707
+1963 0.46138 0.18554
+1971 0.44686 0.16721
+1972 0.46549 0.17878
+1971 0.44686 0.16721
+1958 0.45064 0.16251
+1968 0.43399 0.13622
+1958 0.45064 0.16251
+1957 0.43831 0.13144
+1956 0.45286 0.16622
+1955 0.43859 0.13963
+1932 0.43850 0.20224
+1953 0.41842 0.18460
+1940 0.40810 0.20552
+1942 0.37815 0.18704
+1940 0.40810 0.20552
+1941 0.36790 0.20791
+1940 0.40810 0.20552
+1939 0.40076 0.22039
+1930 0.42136 0.23681
+1959 0.37318 0.27029
+1930 0.42136 0.23681
+1931 0.39940 0.27389
+1918 0.44041 0.25154
+1931 0.39940 0.27389
+1920 0.42124 0.27992
+1938 0.39127 0.28798
+1923 0.41219 0.29271
+1946 0.38774 0.29238
+1945 0.40652 0.29681
+1946 0.38774 0.29238
+1949 0.41016 0.26584
+1960 0.39785 0.26170
+1949 0.41016 0.26584
+1961 0.40740 0.24119
+1948 0.41932 0.24746
+1947 0.43145 0.22451
+1948 0.41932 0.24746
+1928 0.46391 0.24259
+1948 0.41932 0.24746
+1936 0.45241 0.26326
+1949 0.41016 0.26584
+1950 0.44246 0.28003
+1945 0.40652 0.29681
+1944 0.43410 0.30664
+1923 0.41219 0.29271
+1924 0.44000 0.30492
+1920 0.42124 0.27992
+1921 0.44717 0.29297
+1918 0.44041 0.25154
+1914 0.46363 0.26773
+1918 0.44041 0.25154
+1919 0.44968 0.23419
+1930 0.42136 0.23681
+1933 0.42613 0.21803
+1940 0.40810 0.20552
+1933 0.42613 0.21803
+1932 0.43850 0.20224
+1933 0.42613 0.21803
+1922 0.45877 0.21540
+1919 0.44968 0.23419
+1911 0.47392 0.24920
+1914 0.46363 0.26773
+1912 0.55821 0.30953
+1914 0.46363 0.26773
+1913 0.53944 0.34600
+1921 0.44717 0.29297
+1926 0.52776 0.37424
+1924 0.44000 0.30492
+1937 0.52525 0.37972
+1944 0.43410 0.30664
+1943 0.53552 0.36112
+1944 0.43410 0.30664
+1951 0.54565 0.34624
+1950 0.44246 0.28003
+1934 0.55900 0.32572
+1936 0.45241 0.26326
+1927 0.57071 0.29293
+1928 0.46391 0.24259
+1915 0.57530 0.27822
+1916 0.48344 0.20717
+1902 0.58147 0.26285
+1909 0.48944 0.19937
+1903 0.58469 0.25384
+1908 0.49232 0.20013
+1906 0.57441 0.27342
+1910 0.48242 0.22892
+1911 0.47392 0.24920
+1922 0.45877 0.21540
+SURF 0x24
+mat 0
+refs 6
+1906 0.57441 0.27342
+1911 0.47392 0.24920
+1906 0.57441 0.27342
+1912 0.55821 0.30953
+1907 0.60874 0.29719
+1925 0.59291 0.33118
+SURF 0x24
+mat 0
+refs 14
+1906 0.57441 0.27342
+1907 0.60874 0.29719
+1903 0.58469 0.25384
+1905 0.62376 0.27301
+1903 0.58469 0.25384
+1904 0.62073 0.28418
+1902 0.58147 0.26285
+1917 0.61709 0.29746
+1915 0.57530 0.27822
+1929 0.61558 0.30853
+1927 0.57071 0.29293
+1929 0.61558 0.30853
+1934 0.55900 0.32572
+1935 0.60129 0.34643
+SURF 0x24
+mat 0
+refs 20
+1952 0.39130 0.16024
+1942 0.37815 0.18704
+1952 0.39130 0.16024
+1953 0.41842 0.18460
+1954 0.41570 0.11080
+1955 0.43859 0.13963
+1970 0.41719 0.10751
+1957 0.43831 0.13144
+1969 0.40941 0.12361
+1968 0.43399 0.13622
+1966 0.38423 0.17465
+1964 0.40472 0.18867
+1967 0.36860 0.20650
+1964 0.40472 0.18867
+1965 0.38595 0.22050
+1964 0.40472 0.18867
+1962 0.42238 0.21707
+1964 0.40472 0.18867
+1971 0.44686 0.16721
+1968 0.43399 0.13622
+SURF 0x24
+mat 0
+refs 16
+1900 0.48568 0.25721
+1901 0.44874 0.23966
+1900 0.48568 0.25721
+1899 0.43425 0.27804
+1898 0.47223 0.30121
+1899 0.43425 0.27804
+1897 0.46767 0.32878
+1896 0.42587 0.30742
+1895 0.46723 0.32948
+1894 0.42401 0.31315
+1893 0.47666 0.30962
+1892 0.43208 0.29349
+1888 0.48417 0.29671
+1889 0.44045 0.27757
+1890 0.49575 0.27140
+1891 0.45137 0.25565
+SURF 0x24
+mat 0
+refs 5
+1885 0.43794 0.25067
+1887 0.47558 0.24188
+1885 0.43794 0.25067
+1886 0.58975 0.37322
+1884 0.52757 0.37208
+SURF 0x24
+mat 0
+refs 6
+1873 0.37551 0.36171
+1872 0.37026 0.32492
+1871 0.41552 0.35583
+1870 0.41940 0.32518
+1869 0.42536 0.35589
+1864 0.42726 0.32435
+SURF 0x24
+mat 0
+refs 7
+1867 0.39759 0.36818
+1868 0.42650 0.35864
+1867 0.39759 0.36818
+1862 0.42592 0.32913
+1866 0.39404 0.34116
+1861 0.42962 0.30670
+1865 0.39225 0.31706
+SURF 0x24
+mat 0
+refs 4
+1861 0.42962 0.30670
+1862 0.42592 0.32913
+1863 0.43124 0.30269
+1864 0.42726 0.32435
+SURF 0x24
+mat 0
+refs 5
+1858 0.48353 0.35768
+1860 0.42083 0.24156
+1858 0.48353 0.35768
+1859 0.47186 0.23409
+1857 0.54497 0.36610
+SURF 0x24
+mat 0
+refs 5
+1856 0.57534 0.27210
+1855 0.55782 0.27565
+1846 0.57183 0.27291
+1847 0.48840 0.28914
+1845 0.51769 0.28340
+SURF 0x24
+mat 0
+refs 30
+1854 0.50195 0.28648
+1853 0.46713 0.29331
+1855 0.55782 0.27565
+1851 0.39406 0.30763
+1847 0.48840 0.28914
+1849 0.40846 0.30481
+1848 0.46558 0.29361
+1849 0.40846 0.30481
+1883 0.47553 0.32732
+1849 0.40846 0.30481
+1882 0.41912 0.33556
+1849 0.40846 0.30481
+1850 0.38597 0.30922
+1851 0.39406 0.30763
+1850 0.38597 0.30922
+1880 0.40057 0.33763
+1882 0.41912 0.33556
+1880 0.40057 0.33763
+1881 0.43211 0.35861
+1880 0.40057 0.33763
+1879 0.41597 0.36066
+1876 0.40162 0.33660
+1878 0.41034 0.36052
+1876 0.40162 0.33660
+1877 0.44088 0.35001
+1876 0.40162 0.33660
+1874 0.43378 0.32370
+1876 0.40162 0.33660
+1851 0.39406 0.30763
+1880 0.40057 0.33763
+SURF 0x24
+mat 0
+refs 5
+1842 0.39602 0.27837
+1844 0.39315 0.27761
+1842 0.39602 0.27837
+1843 0.36919 0.25702
+1841 0.37218 0.26098
+SURF 0x24
+mat 0
+refs 7
+1840 0.26990 0.54886
+1839 0.20027 0.58272
+1840 0.26990 0.54886
+1835 0.18707 0.52266
+1837 0.25234 0.46863
+1836 0.17916 0.45464
+1838 0.27486 0.36461
+SURF 0x24
+mat 0
+refs 5
+1832 0.24092 0.39735
+1834 0.29359 0.34785
+1832 0.24092 0.39735
+1833 0.40815 0.40747
+1831 0.32444 0.47318
+SURF 0x24
+mat 0
+refs 5
+1828 0.42783 0.45325
+1830 0.38343 0.52234
+1828 0.42783 0.45325
+1829 0.27501 0.45217
+1827 0.33273 0.39279
+SURF 0x24
+mat 0
+refs 24
+1822 0.54967 0.28287
+1826 0.51592 0.32510
+1822 0.54967 0.28287
+1823 0.48059 0.31181
+1813 0.50843 0.26129
+1814 0.46166 0.30580
+1801 0.47977 0.26697
+1802 0.44168 0.29629
+1789 0.45798 0.26382
+1806 0.38207 0.26985
+1789 0.45798 0.26382
+1790 0.39580 0.24657
+1786 0.40658 0.23079
+1796 0.36860 0.22804
+1786 0.40658 0.23079
+1795 0.38868 0.21073
+1788 0.40737 0.23453
+1795 0.38868 0.21073
+1794 0.38942 0.21468
+1819 0.37126 0.19657
+1794 0.38942 0.21468
+1818 0.37422 0.19656
+1793 0.38368 0.22730
+1817 0.36715 0.21150
+SURF 0x24
+mat 0
+refs 5
+1806 0.38207 0.26985
+1802 0.44168 0.29629
+1806 0.38207 0.26985
+1809 0.42807 0.32554
+1810 0.36993 0.30002
+SURF 0x24
+mat 0
+refs 19
+1822 0.54967 0.28287
+1813 0.50843 0.26129
+1820 0.57798 0.23951
+1811 0.51862 0.24454
+1821 0.57493 0.24645
+1812 0.51762 0.25194
+1824 0.56929 0.25425
+1815 0.51758 0.25879
+1825 0.55163 0.28791
+1815 0.51758 0.25879
+1816 0.51085 0.28454
+1803 0.48768 0.26662
+1804 0.48155 0.28393
+1792 0.46613 0.26551
+1805 0.46173 0.28049
+1798 0.39834 0.25865
+1805 0.46173 0.28049
+1807 0.38918 0.27962
+1808 0.45358 0.30817
+SURF 0x24
+mat 0
+refs 19
+1813 0.50843 0.26129
+1801 0.47977 0.26697
+1811 0.51862 0.24454
+1799 0.48698 0.25535
+1812 0.51762 0.25194
+1800 0.48679 0.26118
+1815 0.51758 0.25879
+1800 0.48679 0.26118
+1803 0.48768 0.26662
+1787 0.46538 0.26018
+1792 0.46613 0.26551
+1787 0.46538 0.26018
+1788 0.40737 0.23453
+1787 0.46538 0.26018
+1786 0.40658 0.23079
+1785 0.46507 0.25421
+1789 0.45798 0.26382
+1799 0.48698 0.25535
+1801 0.47977 0.26697
+SURF 0x24
+mat 0
+refs 4
+1799 0.48698 0.25535
+1785 0.46507 0.25421
+1800 0.48679 0.26118
+1787 0.46538 0.26018
+SURF 0x24
+mat 0
+refs 11
+1793 0.38368 0.22730
+1797 0.37285 0.25021
+1793 0.38368 0.22730
+1798 0.39834 0.25865
+1791 0.40427 0.24375
+1792 0.46613 0.26551
+1791 0.40427 0.24375
+1788 0.40737 0.23453
+1791 0.40427 0.24375
+1794 0.38942 0.21468
+1793 0.38368 0.22730
+SURF 0x24
+mat 0
+refs 36
+1783 0.38174 0.18059
+1767 0.41121 0.18961
+1780 0.39301 0.15766
+1759 0.41919 0.16951
+1781 0.40386 0.13548
+1760 0.43020 0.15143
+1773 0.42157 0.09934
+1762 0.44554 0.11772
+1774 0.42956 0.08317
+1775 0.45256 0.09764
+1782 0.42977 0.08289
+1777 0.44865 0.10024
+1776 0.42307 0.09639
+1764 0.43400 0.12261
+1778 0.39575 0.15206
+1755 0.41600 0.16188
+1779 0.36913 0.20629
+1755 0.41600 0.16188
+1756 0.39529 0.20224
+1737 0.43363 0.17003
+1756 0.39529 0.20224
+1733 0.41910 0.20718
+1757 0.38541 0.22901
+1735 0.41081 0.23640
+1758 0.37969 0.24155
+1736 0.41102 0.24284
+1766 0.39415 0.22390
+1739 0.41782 0.22394
+1767 0.41121 0.18961
+1740 0.43112 0.19659
+1759 0.41919 0.16951
+1742 0.43962 0.17859
+1760 0.43020 0.15143
+1761 0.44803 0.16185
+1762 0.44554 0.11772
+1763 0.46344 0.13326
+SURF 0x24
+mat 0
+refs 22
+1777 0.44865 0.10024
+1784 0.46756 0.11833
+1764 0.43400 0.12261
+1765 0.45371 0.13716
+1755 0.41600 0.16188
+1765 0.45371 0.13716
+1737 0.43363 0.17003
+1738 0.46490 0.14980
+1737 0.43363 0.17003
+1734 0.44793 0.17655
+1733 0.41910 0.20718
+1712 0.43585 0.20950
+1735 0.41081 0.23640
+1710 0.43318 0.24163
+1736 0.41102 0.24284
+1711 0.43669 0.23970
+1739 0.41782 0.22394
+1713 0.44005 0.22831
+1740 0.43112 0.19659
+1741 0.45044 0.20379
+1742 0.43962 0.17859
+1743 0.45939 0.18888
+SURF 0x24
+mat 0
+refs 25
+1712 0.43585 0.20950
+1707 0.46622 0.22178
+1710 0.43318 0.24163
+1705 0.46055 0.24316
+1711 0.43669 0.23970
+1709 0.46377 0.24102
+1713 0.44005 0.22831
+1714 0.46925 0.23258
+1741 0.45044 0.20379
+1714 0.46925 0.23258
+1725 0.47712 0.21808
+1722 0.54189 0.24713
+1724 0.48548 0.20138
+1722 0.54189 0.24713
+1723 0.54988 0.22993
+1732 0.55481 0.25651
+1723 0.54988 0.22993
+1744 0.56478 0.23677
+1746 0.55803 0.20225
+1744 0.56478 0.23677
+1745 0.57785 0.20569
+1750 0.58845 0.24868
+1752 0.60715 0.20630
+1751 0.61957 0.26395
+1772 0.64793 0.20967
+SURF 0x24
+mat 0
+refs 13
+1749 0.60431 0.29418
+1751 0.61957 0.26395
+1749 0.60431 0.29418
+1750 0.58845 0.24868
+1731 0.57590 0.27518
+1744 0.56478 0.23677
+1731 0.57590 0.27518
+1732 0.55481 0.25651
+1731 0.57590 0.27518
+1729 0.56002 0.30816
+1731 0.57590 0.27518
+1754 0.58170 0.33738
+1749 0.60431 0.29418
+SURF 0x24
+mat 0
+refs 11
+1705 0.46055 0.24316
+1707 0.46622 0.22178
+1705 0.46055 0.24316
+1706 0.52437 0.24730
+1704 0.51551 0.27185
+1716 0.53932 0.26038
+1715 0.52711 0.28896
+1727 0.55661 0.28082
+1726 0.53677 0.31977
+1748 0.58959 0.31264
+1747 0.57214 0.35897
+SURF 0x24
+mat 0
+refs 15
+1770 0.64597 0.20463
+1769 0.70916 0.21009
+1753 0.61222 0.24686
+1768 0.67572 0.25503
+1753 0.61222 0.24686
+1771 0.61224 0.32965
+1753 0.61222 0.24686
+1748 0.58959 0.31264
+1753 0.61222 0.24686
+1727 0.55661 0.28082
+1728 0.57688 0.23358
+1716 0.53932 0.26038
+1717 0.55795 0.22756
+1706 0.52437 0.24730
+1718 0.53798 0.21805
+SURF 0x24
+mat 0
+refs 10
+1703 0.46141 0.38950
+1702 0.50342 0.41571
+1697 0.45441 0.37157
+1698 0.51107 0.38844
+1696 0.45736 0.33622
+1695 0.52355 0.34306
+1691 0.45663 0.32539
+1692 0.52872 0.33189
+1693 0.48107 0.17939
+1694 0.54628 0.18265
+SURF 0x24
+mat 0
+refs 5
+1694 0.54628 0.18265
+1701 0.56857 0.29842
+1694 0.54628 0.18265
+1700 0.50072 0.17126
+1699 0.47090 0.17637
+SURF 0x24
+mat 0
+refs 14
+1690 0.67292 0.50545
+1689 0.69023 0.41901
+1683 0.72269 0.47296
+1688 0.75680 0.36561
+1683 0.72269 0.47296
+1687 0.78935 0.35988
+1678 0.76419 0.46136
+1685 0.77748 0.37749
+1679 0.75433 0.46801
+1686 0.73039 0.42598
+1679 0.75433 0.46801
+1681 0.71487 0.49654
+1674 0.73054 0.57049
+1680 0.67776 0.59038
+SURF 0x24
+mat 0
+refs 14
+1682 0.71010 0.58102
+1683 0.72269 0.47296
+1682 0.71010 0.58102
+1678 0.76419 0.46136
+1676 0.72713 0.57258
+1679 0.75433 0.46801
+1676 0.72713 0.57258
+1674 0.73054 0.57049
+1676 0.72713 0.57258
+1675 0.70622 0.64321
+1676 0.72713 0.57258
+1677 0.69865 0.64289
+1682 0.71010 0.58102
+1684 0.68916 0.64451
+SURF 0x24
+mat 0
+refs 6
+1673 0.55109 0.17679
+1669 0.55019 0.33406
+1672 0.48543 0.18955
+1668 0.46478 0.32746
+1671 0.47413 0.19010
+1670 0.45972 0.32752
+SURF 0x24
+mat 0
+refs 13
+1668 0.46478 0.32746
+1669 0.55019 0.33406
+1665 0.47001 0.34191
+1666 0.54749 0.34929
+1665 0.47001 0.34191
+1659 0.53301 0.38713
+1665 0.47001 0.34191
+1662 0.47656 0.37427
+1664 0.45879 0.33789
+1662 0.47656 0.37427
+1663 0.45510 0.37104
+1661 0.48212 0.40085
+1667 0.46161 0.39018
+SURF 0x24
+mat 0
+refs 6
+1661 0.48212 0.40085
+1662 0.47656 0.37427
+1660 0.52632 0.42143
+1659 0.53301 0.38713
+1658 0.55681 0.43617
+1657 0.58421 0.40654
+SURF 0x24
+mat 0
+refs 8
+1656 0.67343 0.24437
+1650 0.61403 0.33552
+1655 0.61441 0.25130
+1646 0.56858 0.32921
+1652 0.54683 0.24506
+1648 0.50443 0.31152
+1653 0.46771 0.25426
+1654 0.45323 0.29211
+SURF 0x24
+mat 0
+refs 6
+1650 0.61403 0.33552
+1651 0.56701 0.38304
+1646 0.56858 0.32921
+1647 0.53253 0.36704
+1648 0.50443 0.31152
+1649 0.47703 0.34115
+SURF 0x24
+mat 0
+refs 7
+1645 0.44377 0.24803
+1644 0.43129 0.29341
+1645 0.44377 0.24803
+1640 0.52705 0.31412
+1638 0.57617 0.26213
+1639 0.58091 0.32950
+1637 0.65593 0.26200
+SURF 0x24
+mat 0
+refs 5
+1639 0.58091 0.32950
+1643 0.53404 0.37222
+1639 0.58091 0.32950
+1642 0.58287 0.38947
+1641 0.63703 0.33520
+SURF 0x24
+mat 0
+refs 8
+1636 0.42861 0.25228
+1635 0.46823 0.28719
+1636 0.42861 0.25228
+1633 0.46790 0.28657
+1634 0.43553 0.25327
+1633 0.46790 0.28657
+1632 0.45038 0.23809
+1631 0.47525 0.26465
+SURF 0x24
+mat 0
+refs 15
+1630 0.50636 0.31702
+1594 0.49570 0.28810
+1629 0.46874 0.32418
+1595 0.45269 0.29653
+1627 0.44594 0.32335
+1596 0.43196 0.30059
+1626 0.45937 0.32032
+1597 0.44390 0.29825
+1628 0.48667 0.31199
+1597 0.44390 0.29825
+1598 0.46762 0.29361
+1597 0.44390 0.29825
+1599 0.52690 0.28199
+1601 0.60255 0.26722
+1600 0.58775 0.27006
+SURF 0x24
+mat 0
+refs 6
+1597 0.44390 0.29825
+1596 0.43196 0.30059
+1597 0.44390 0.29825
+1595 0.45269 0.29653
+1593 0.52079 0.28320
+1594 0.49570 0.28810
+SURF 0x24
+mat 0
+refs 5
+1597 0.44390 0.29825
+1593 0.52079 0.28320
+1601 0.60255 0.26722
+1592 0.58449 0.27065
+1602 0.60220 0.26722
+SURF 0x24
+mat 0
+refs 4
+1593 0.52079 0.28320
+1591 0.54501 0.27841
+1593 0.52079 0.28320
+1592 0.58449 0.27065
+SURF 0x24
+mat 0
+refs 6
+1625 0.39347 0.35096
+1624 0.38487 0.31934
+1620 0.42484 0.34237
+1619 0.41842 0.30903
+1618 0.45169 0.33922
+1611 0.44998 0.30635
+SURF 0x24
+mat 0
+refs 6
+1623 0.41177 0.30365
+1615 0.41553 0.32561
+1612 0.43018 0.30022
+1613 0.43490 0.32314
+1604 0.46227 0.29518
+1614 0.45970 0.31791
+SURF 0x24
+mat 0
+refs 6
+1621 0.39824 0.32750
+1622 0.40301 0.35739
+1615 0.41553 0.32561
+1616 0.42137 0.35395
+1613 0.43490 0.32314
+1617 0.44360 0.34854
+SURF 0x24
+mat 0
+refs 5
+1609 0.47591 0.31186
+1611 0.44998 0.30635
+1609 0.47591 0.31186
+1610 0.45327 0.28980
+1608 0.47665 0.28942
+SURF 0x24
+mat 0
+refs 6
+1608 0.47665 0.28942
+1607 0.47961 0.26342
+1606 0.47845 0.29178
+1605 0.48404 0.26497
+1604 0.46227 0.29518
+1603 0.46381 0.27152
+SURF 0x24
+mat 0
+refs 47
+1589 0.36753 0.33783
+1590 0.33481 0.35745
+1588 0.36276 0.33480
+1587 0.31511 0.36797
+1585 0.36518 0.33634
+1584 0.33813 0.35666
+1585 0.36518 0.33634
+1582 0.34305 0.35124
+1583 0.36273 0.33478
+1578 0.34190 0.35227
+1579 0.36387 0.33551
+1573 0.34218 0.35146
+1574 0.36334 0.33517
+1568 0.34279 0.34886
+1569 0.36202 0.33433
+1563 0.34304 0.34703
+1564 0.36025 0.33321
+1558 0.34259 0.34575
+1559 0.35898 0.33241
+1553 0.34352 0.34229
+1554 0.35714 0.33124
+1548 0.34374 0.33846
+1549 0.35547 0.33018
+1543 0.34400 0.33217
+1544 0.35086 0.32726
+1543 0.34400 0.33217
+1540 0.34169 0.32144
+1543 0.34400 0.33217
+1541 0.33283 0.33541
+1548 0.34374 0.33846
+1546 0.32868 0.34195
+1553 0.34352 0.34229
+1551 0.32689 0.34478
+1558 0.34259 0.34575
+1556 0.32506 0.34767
+1563 0.34304 0.34703
+1561 0.32460 0.34838
+1568 0.34279 0.34886
+1566 0.32370 0.34980
+1573 0.34218 0.35146
+1571 0.32235 0.35193
+1578 0.34190 0.35227
+1576 0.32191 0.35263
+1582 0.34305 0.35124
+1581 0.32120 0.35375
+1584 0.33813 0.35666
+1586 0.31884 0.35746
+SURF 0x24
+mat 0
+refs 37
+1581 0.32120 0.35375
+1580 0.31265 0.33528
+1581 0.32120 0.35375
+1575 0.31372 0.33439
+1576 0.32191 0.35263
+1570 0.31433 0.33380
+1571 0.32235 0.35193
+1565 0.31642 0.33214
+1566 0.32370 0.34980
+1560 0.31797 0.33113
+1561 0.32460 0.34838
+1555 0.31932 0.33099
+1556 0.32506 0.34767
+1550 0.32205 0.32867
+1551 0.32689 0.34478
+1545 0.32543 0.32684
+1546 0.32868 0.34195
+1539 0.33100 0.32393
+1541 0.33283 0.33541
+1539 0.33100 0.32393
+1540 0.34169 0.32144
+1539 0.33100 0.32393
+1542 0.33252 0.31563
+1545 0.32543 0.32684
+1547 0.32874 0.31323
+1550 0.32205 0.32867
+1552 0.32651 0.31181
+1555 0.31932 0.33099
+1557 0.32524 0.31101
+1560 0.31797 0.33113
+1562 0.32489 0.31078
+1565 0.31642 0.33214
+1567 0.32339 0.30983
+1570 0.31433 0.33380
+1572 0.32177 0.30880
+1575 0.31372 0.33439
+1577 0.32099 0.30831
+SURF 0x24
+mat 0
+refs 9
+1500 0.29261 0.29042
+1499 0.18604 0.39726
+1493 0.30155 0.35178
+1496 0.20737 0.44421
+1494 0.31148 0.42936
+1495 0.23029 0.49866
+1494 0.31148 0.42936
+1497 0.26932 0.57163
+1498 0.32188 0.55284
+SURF 0x24
+mat 0
+refs 152
+1493 0.30155 0.35178
+1494 0.31148 0.42936
+1493 0.30155 0.35178
+1463 0.38538 0.41008
+1462 0.40277 0.29874
+1460 0.46288 0.43924
+1459 0.48385 0.31181
+1461 0.52632 0.47387
+1459 0.48385 0.31181
+1458 0.57237 0.37089
+1457 0.52370 0.24886
+1458 0.57237 0.37089
+1468 0.57264 0.27935
+1492 0.63614 0.37106
+1468 0.57264 0.27935
+1469 0.64643 0.36742
+1468 0.57264 0.27935
+1467 0.65360 0.36577
+1449 0.58127 0.25596
+1451 0.66573 0.36130
+1449 0.58127 0.25596
+1450 0.66430 0.34409
+1446 0.58279 0.24710
+1445 0.63547 0.34192
+1444 0.54066 0.24507
+1442 0.64670 0.31848
+1443 0.52506 0.21145
+1442 0.64670 0.31848
+1425 0.52023 0.19809
+1424 0.66329 0.30300
+1423 0.53161 0.20071
+1422 0.69243 0.29175
+1421 0.57088 0.21900
+1420 0.72099 0.29117
+1371 0.61973 0.21084
+1370 0.73044 0.27792
+1369 0.61848 0.21663
+1368 0.71413 0.28348
+1364 0.59340 0.25284
+1366 0.68066 0.30900
+1364 0.59340 0.25284
+1367 0.65069 0.37151
+1364 0.59340 0.25284
+1298 0.56277 0.31507
+1365 0.44747 0.19226
+1298 0.56277 0.31507
+1294 0.44253 0.27688
+1296 0.55484 0.33011
+1292 0.49188 0.31859
+1297 0.55528 0.34849
+1293 0.49087 0.29684
+1347 0.56359 0.33332
+1333 0.49159 0.27000
+1348 0.55791 0.33885
+1277 0.49004 0.27664
+1350 0.53806 0.34940
+1349 0.49135 0.30295
+1350 0.53806 0.34940
+1357 0.48866 0.33231
+1358 0.52331 0.36332
+1357 0.48866 0.33231
+1418 0.48952 0.41042
+1357 0.48866 0.33231
+1363 0.45463 0.37978
+1310 0.44886 0.33278
+1359 0.42742 0.36931
+1312 0.43287 0.33975
+1262 0.41224 0.35855
+1263 0.41890 0.33550
+1243 0.40486 0.34184
+1264 0.41229 0.32164
+1269 0.41726 0.30579
+1268 0.41717 0.30618
+1274 0.42907 0.29064
+1315 0.41619 0.26791
+1316 0.42988 0.26250
+1380 0.41486 0.22925
+1381 0.43042 0.24030
+1390 0.42177 0.21489
+1391 0.43482 0.22529
+1434 0.43911 0.20625
+1435 0.44641 0.21814
+1478 0.45227 0.21131
+1479 0.45471 0.21882
+1488 0.47750 0.23796
+1489 0.47861 0.24182
+1501 0.48446 0.25312
+1481 0.47797 0.24529
+1480 0.47581 0.24711
+1470 0.45078 0.23401
+1472 0.44569 0.23516
+1428 0.43760 0.24256
+1429 0.42822 0.23643
+1385 0.42701 0.25557
+1386 0.41445 0.24568
+1376 0.41452 0.27095
+1377 0.40251 0.25508
+1311 0.41684 0.30208
+1313 0.40813 0.29237
+1263 0.41890 0.33550
+1313 0.40813 0.29237
+1264 0.41229 0.32164
+1314 0.40706 0.27801
+1268 0.41717 0.30618
+1314 0.40706 0.27801
+1315 0.41619 0.26791
+1379 0.40214 0.22755
+1380 0.41486 0.22925
+1389 0.40962 0.21254
+1390 0.42177 0.21489
+1433 0.42973 0.20012
+1434 0.43911 0.20625
+1477 0.44791 0.20764
+1478 0.45227 0.21131
+1487 0.47527 0.23558
+1488 0.47750 0.23796
+1487 0.47527 0.23558
+1501 0.48446 0.25312
+1487 0.47527 0.23558
+1486 0.47271 0.23555
+1477 0.44791 0.20764
+1476 0.44320 0.20890
+1433 0.42973 0.20012
+1432 0.42185 0.20210
+1389 0.40962 0.21254
+1388 0.40336 0.21912
+1379 0.40214 0.22755
+1378 0.39728 0.23719
+1314 0.40706 0.27801
+1378 0.39728 0.23719
+1313 0.40813 0.29237
+1378 0.39728 0.23719
+1377 0.40251 0.25508
+1387 0.40534 0.23183
+1386 0.41445 0.24568
+1430 0.42092 0.22454
+1429 0.42822 0.23643
+1473 0.44115 0.23071
+1472 0.44569 0.23516
+1482 0.47320 0.24691
+1480 0.47581 0.24711
+1482 0.47320 0.24691
+1501 0.48446 0.25312
+1482 0.47320 0.24691
+1483 0.47119 0.24479
+1473 0.44115 0.23071
+1474 0.43896 0.22284
+1430 0.42092 0.22454
+1431 0.41849 0.21142
+1387 0.40534 0.23183
+1388 0.40336 0.21912
+1378 0.39728 0.23719
+SURF 0x24
+mat 0
+refs 16
+1431 0.41849 0.21142
+1388 0.40336 0.21912
+1431 0.41849 0.21142
+1432 0.42185 0.20210
+1475 0.43978 0.21461
+1476 0.44320 0.20890
+1485 0.47074 0.23770
+1486 0.47271 0.23555
+1485 0.47074 0.23770
+1501 0.48446 0.25312
+1484 0.47025 0.24131
+1483 0.47119 0.24479
+1484 0.47025 0.24131
+1474 0.43896 0.22284
+1475 0.43978 0.21461
+1431 0.41849 0.21142
+SURF 0x24
+mat 0
+refs 4
+1475 0.43978 0.21461
+1485 0.47074 0.23770
+1475 0.43978 0.21461
+1484 0.47025 0.24131
+SURF 0x24
+mat 0
+refs 38
+1263 0.41890 0.33550
+1311 0.41684 0.30208
+1312 0.43287 0.33975
+1309 0.42930 0.30715
+1310 0.44886 0.33278
+1307 0.44515 0.30516
+1310 0.44886 0.33278
+1308 0.46077 0.31725
+1357 0.48866 0.33231
+1308 0.46077 0.31725
+1349 0.49135 0.30295
+1306 0.46404 0.29908
+1277 0.49004 0.27664
+1278 0.45743 0.28523
+1276 0.44984 0.27471
+1275 0.44346 0.28097
+1273 0.43502 0.29282
+1274 0.42907 0.29064
+1273 0.43502 0.29282
+1269 0.41726 0.30579
+1270 0.41268 0.30172
+1269 0.41726 0.30579
+1242 0.39377 0.32989
+1243 0.40486 0.34184
+1239 0.36397 0.35680
+1243 0.40486 0.34184
+1244 0.37651 0.37460
+1262 0.41224 0.35855
+1340 0.37833 0.36777
+1359 0.42742 0.36931
+1360 0.39161 0.38625
+1363 0.45463 0.37978
+1360 0.39161 0.38625
+1415 0.40462 0.41064
+1361 0.38763 0.39449
+1414 0.40562 0.42850
+1417 0.39616 0.43768
+1416 0.40331 0.44158
+SURF 0x24
+mat 0
+refs 43
+1417 0.39616 0.43768
+1419 0.39561 0.43907
+1361 0.38763 0.39449
+1362 0.38989 0.41057
+1341 0.37692 0.38158
+1362 0.38989 0.41057
+1355 0.38287 0.39790
+1356 0.40483 0.45737
+1355 0.38287 0.39790
+1354 0.38214 0.40805
+1341 0.37692 0.38158
+1339 0.37728 0.39149
+1340 0.37833 0.36777
+1339 0.37728 0.39149
+1244 0.37651 0.37460
+1238 0.35151 0.36875
+1239 0.36397 0.35680
+1233 0.35583 0.33267
+1239 0.36397 0.35680
+1265 0.37454 0.32322
+1242 0.39377 0.32989
+1266 0.38848 0.32330
+1242 0.39377 0.32989
+1271 0.39856 0.32020
+1270 0.41268 0.30172
+1288 0.41409 0.29618
+1270 0.41268 0.30172
+1272 0.42548 0.28265
+1273 0.43502 0.29282
+1272 0.42548 0.28265
+1276 0.44984 0.27471
+1287 0.44539 0.26007
+1277 0.49004 0.27664
+1287 0.44539 0.26007
+1333 0.49159 0.27000
+1287 0.44539 0.26007
+1293 0.49087 0.29684
+1285 0.44552 0.28431
+1292 0.49188 0.31859
+1282 0.43299 0.30404
+1292 0.49188 0.31859
+1280 0.40343 0.31159
+1294 0.44253 0.27688
+SURF 0x24
+mat 0
+refs 4
+1341 0.37692 0.38158
+1340 0.37833 0.36777
+1361 0.38763 0.39449
+1360 0.39161 0.38625
+SURF 0x24
+mat 0
+refs 25
+1274 0.42907 0.29064
+1275 0.44346 0.28097
+1316 0.42988 0.26250
+1304 0.44234 0.26756
+1381 0.43042 0.24030
+1373 0.44190 0.25443
+1391 0.43482 0.22529
+1383 0.44352 0.23944
+1435 0.44641 0.21814
+1427 0.44884 0.23126
+1479 0.45471 0.21882
+1471 0.45423 0.22758
+1489 0.47861 0.24182
+1471 0.45423 0.22758
+1481 0.47797 0.24529
+1471 0.45423 0.22758
+1470 0.45078 0.23401
+1426 0.44547 0.24059
+1428 0.43760 0.24256
+1384 0.43847 0.25793
+1385 0.42701 0.25557
+1375 0.42992 0.27928
+1376 0.41452 0.27095
+1309 0.42930 0.30715
+1311 0.41684 0.30208
+SURF 0x24
+mat 0
+refs 10
+1307 0.44515 0.30516
+1309 0.42930 0.30715
+1307 0.44515 0.30516
+1375 0.42992 0.27928
+1374 0.44195 0.27803
+1384 0.43847 0.25793
+1382 0.44476 0.25183
+1426 0.44547 0.24059
+1427 0.44884 0.23126
+1471 0.45423 0.22758
+SURF 0x24
+mat 0
+refs 10
+1382 0.44476 0.25183
+1427 0.44884 0.23126
+1382 0.44476 0.25183
+1383 0.44352 0.23944
+1372 0.44668 0.26881
+1373 0.44190 0.25443
+1303 0.45320 0.28070
+1304 0.44234 0.26756
+1278 0.45743 0.28523
+1275 0.44346 0.28097
+SURF 0x24
+mat 0
+refs 12
+1303 0.45320 0.28070
+1278 0.45743 0.28523
+1303 0.45320 0.28070
+1306 0.46404 0.29908
+1305 0.45428 0.29506
+1308 0.46077 0.31725
+1305 0.45428 0.29506
+1307 0.44515 0.30516
+1305 0.45428 0.29506
+1374 0.44195 0.27803
+1372 0.44668 0.26881
+1382 0.44476 0.25183
+SURF 0x24
+mat 0
+refs 4
+1372 0.44668 0.26881
+1303 0.45320 0.28070
+1372 0.44668 0.26881
+1305 0.45428 0.29506
+SURF 0x24
+mat 0
+refs 28
+1443 0.52506 0.21145
+1491 0.44386 0.19266
+1444 0.54066 0.24507
+1448 0.45446 0.22730
+1444 0.54066 0.24507
+1447 0.49605 0.21185
+1446 0.58279 0.24710
+1453 0.49634 0.20260
+1449 0.58127 0.25596
+1453 0.49634 0.20260
+1468 0.57264 0.27935
+1453 0.49634 0.20260
+1457 0.52370 0.24886
+1456 0.45752 0.23128
+1459 0.48385 0.31181
+1456 0.45752 0.23128
+1462 0.40277 0.29874
+1456 0.45752 0.23128
+1466 0.39680 0.22153
+1455 0.44755 0.19047
+1465 0.39213 0.18988
+1455 0.44755 0.19047
+1464 0.38508 0.19584
+1455 0.44755 0.19047
+1452 0.44071 0.19678
+1455 0.44755 0.19047
+1453 0.49634 0.20260
+1456 0.45752 0.23128
+SURF 0x24
+mat 0
+refs 5
+1453 0.49634 0.20260
+1447 0.49605 0.21185
+1452 0.44071 0.19678
+1448 0.45446 0.22730
+1454 0.37492 0.21889
+SURF 0x24
+mat 0
+refs 47
+1351 0.37882 0.43298
+1345 0.37409 0.42972
+1352 0.36632 0.41873
+1344 0.35738 0.41747
+1352 0.36632 0.41873
+1353 0.36986 0.41458
+1356 0.40483 0.45737
+1353 0.36986 0.41458
+1354 0.38214 0.40805
+1343 0.35786 0.40201
+1339 0.37728 0.39149
+1240 0.33482 0.38394
+1238 0.35151 0.36875
+1234 0.30850 0.36361
+1238 0.35151 0.36875
+1232 0.33450 0.35259
+1233 0.35583 0.33267
+1231 0.34181 0.32287
+1279 0.37601 0.31598
+1280 0.40343 0.31159
+1281 0.39455 0.30634
+1282 0.43299 0.30404
+1284 0.42301 0.28574
+1285 0.44552 0.28431
+1284 0.42301 0.28574
+1287 0.44539 0.26007
+1284 0.42301 0.28574
+1272 0.42548 0.28265
+1284 0.42301 0.28574
+1288 0.41409 0.29618
+1284 0.42301 0.28574
+1289 0.40188 0.32175
+1281 0.39455 0.30634
+1286 0.39312 0.32155
+1281 0.39455 0.30634
+1283 0.37749 0.32055
+1279 0.37601 0.31598
+1283 0.37749 0.32055
+1233 0.35583 0.33267
+1267 0.37077 0.32114
+1265 0.37454 0.32322
+1267 0.37077 0.32114
+1322 0.36708 0.30388
+1321 0.36862 0.31066
+1322 0.36708 0.30388
+1331 0.37084 0.29531
+1332 0.36456 0.29139
+SURF 0x24
+mat 0
+refs 7
+1343 0.35786 0.40201
+1353 0.36986 0.41458
+1343 0.35786 0.40201
+1344 0.35738 0.41747
+1338 0.34437 0.42614
+1345 0.37409 0.42972
+1346 0.36179 0.44614
+SURF 0x24
+mat 0
+refs 50
+1335 0.30047 0.47982
+1342 0.28749 0.51452
+1335 0.30047 0.47982
+1257 0.25474 0.50968
+1255 0.24348 0.48283
+1258 0.22063 0.52507
+1255 0.24348 0.48283
+1256 0.22468 0.51971
+1253 0.23362 0.46709
+1254 0.22473 0.51579
+1245 0.22377 0.44875
+1252 0.22478 0.51493
+1247 0.21589 0.47336
+1251 0.22541 0.51817
+1247 0.21589 0.47336
+1334 0.22696 0.52494
+1247 0.21589 0.47336
+1250 0.25631 0.53455
+1247 0.21589 0.47336
+1249 0.24809 0.49231
+1247 0.21589 0.47336
+1248 0.23152 0.42476
+1245 0.22377 0.44875
+1246 0.24728 0.40065
+1245 0.22377 0.44875
+1241 0.29392 0.42432
+1253 0.23362 0.46709
+1241 0.29392 0.42432
+1255 0.24348 0.48283
+1241 0.29392 0.42432
+1335 0.30047 0.47982
+1336 0.32645 0.42209
+1337 0.32375 0.49779
+1336 0.32645 0.42209
+1338 0.34437 0.42614
+1336 0.32645 0.42209
+1343 0.35786 0.40201
+1336 0.32645 0.42209
+1240 0.33482 0.38394
+1241 0.29392 0.42432
+1237 0.27707 0.37496
+1246 0.24728 0.40065
+1236 0.26319 0.39608
+1248 0.23152 0.42476
+1236 0.26319 0.39608
+1249 0.24809 0.49231
+1259 0.24153 0.46253
+1249 0.24809 0.49231
+1260 0.25358 0.57167
+1261 0.26909 0.57878
+SURF 0x24
+mat 0
+refs 19
+1240 0.33482 0.38394
+1237 0.27707 0.37496
+1234 0.30850 0.36361
+1236 0.26319 0.39608
+1234 0.30850 0.36361
+1235 0.27456 0.37069
+1232 0.33450 0.35259
+1230 0.29961 0.34741
+1231 0.34181 0.32287
+1230 0.29961 0.34741
+1291 0.27881 0.34253
+1235 0.27456 0.37069
+1295 0.24470 0.38802
+1236 0.26319 0.39608
+1295 0.24470 0.38802
+1259 0.24153 0.46253
+1299 0.22374 0.44752
+1260 0.25358 0.57167
+1302 0.22382 0.55785
+SURF 0x24
+mat 0
+refs 5
+1299 0.22374 0.44752
+1301 0.17347 0.41065
+1295 0.24470 0.38802
+1300 0.21765 0.31348
+1291 0.27881 0.34253
+SURF 0x24
+mat 0
+refs 20
+1229 0.43053 0.39270
+1228 0.39201 0.34773
+1223 0.46363 0.34789
+1222 0.42020 0.29708
+1218 0.47939 0.33241
+1219 0.43327 0.28157
+1218 0.47939 0.33241
+1217 0.45179 0.26882
+1215 0.49860 0.31783
+1216 0.45680 0.26268
+1214 0.50693 0.31530
+1216 0.45680 0.26268
+1221 0.51735 0.33323
+1220 0.45027 0.27870
+1221 0.51735 0.33323
+1225 0.44774 0.26049
+1224 0.53308 0.32107
+1225 0.44774 0.26049
+1227 0.54769 0.29068
+1226 0.45390 0.24465
+SURF 0x24
+mat 0
+refs 39
+1212 0.40716 0.19628
+1213 0.49998 0.19925
+1210 0.40714 0.22039
+1211 0.49998 0.22082
+1208 0.40993 0.24231
+1209 0.49998 0.24562
+1198 0.42559 0.29577
+1199 0.49998 0.29722
+1194 0.44264 0.33670
+1197 0.49998 0.33519
+1194 0.44264 0.33670
+1183 0.49998 0.34903
+1182 0.44782 0.35296
+1181 0.49998 0.37210
+1179 0.45100 0.37239
+1180 0.49998 0.39423
+1176 0.45265 0.39238
+1178 0.49998 0.42524
+1171 0.45172 0.42027
+1177 0.49998 0.48565
+1171 0.45172 0.42027
+1172 0.46484 0.48011
+1173 0.41079 0.41823
+1174 0.43238 0.47842
+1185 0.37038 0.41971
+1184 0.40086 0.47817
+1185 0.37038 0.41971
+1192 0.37852 0.48102
+1185 0.37038 0.41971
+1191 0.33201 0.42731
+1186 0.35851 0.39979
+1196 0.32416 0.40835
+1187 0.34927 0.38927
+1196 0.32416 0.40835
+1195 0.34227 0.39343
+1204 0.32938 0.40594
+1203 0.34319 0.39461
+1205 0.36363 0.39602
+1207 0.31576 0.38499
+SURF 0x24
+mat 0
+refs 4
+1206 0.31074 0.40942
+1205 0.36363 0.39602
+1206 0.31074 0.40942
+1204 0.32938 0.40594
+SURF 0x24
+mat 0
+refs 26
+1173 0.41079 0.41823
+1185 0.37038 0.41971
+1173 0.41079 0.41823
+1186 0.35851 0.39979
+1175 0.39605 0.39529
+1187 0.34927 0.38927
+1188 0.38154 0.38008
+1189 0.33920 0.38061
+1190 0.37487 0.36405
+1201 0.32333 0.37235
+1193 0.37824 0.34783
+1202 0.32232 0.31360
+1193 0.37824 0.34783
+1200 0.36647 0.29923
+1193 0.37824 0.34783
+1198 0.42559 0.29577
+1193 0.37824 0.34783
+1194 0.44264 0.33670
+1190 0.37487 0.36405
+1182 0.44782 0.35296
+1188 0.38154 0.38008
+1179 0.45100 0.37239
+1175 0.39605 0.39529
+1176 0.45265 0.39238
+1173 0.41079 0.41823
+1171 0.45172 0.42027
+SURF 0x24
+mat 0
+refs 6
+1166 0.40143 0.59901
+1170 0.39725 0.59359
+1166 0.40143 0.59901
+1167 0.40095 0.58360
+1168 0.39122 0.57399
+1169 0.39509 0.56523
+SURF 0x24
+mat 0
+refs 21
+1165 0.45949 0.17736
+1164 0.56002 0.26681
+1163 0.48780 0.17352
+1162 0.57787 0.25325
+1160 0.49568 0.15928
+1161 0.59048 0.24366
+1158 0.48011 0.16666
+1159 0.57266 0.25721
+1157 0.44977 0.19583
+1156 0.53048 0.28926
+1155 0.42713 0.26136
+1154 0.48487 0.32392
+1155 0.42713 0.26136
+1153 0.46081 0.34221
+1152 0.41252 0.29175
+1151 0.44167 0.35676
+1150 0.39679 0.30390
+1149 0.43903 0.35874
+1147 0.38637 0.28597
+1148 0.43184 0.36420
+1146 0.37804 0.28851
+SURF 0x24
+mat 0
+refs 5
+1143 0.33684 0.59556
+1145 0.39569 0.63539
+1143 0.33684 0.59556
+1144 0.37630 0.64613
+1142 0.31288 0.60693
+SURF 0x24
+mat 0
+refs 11
+1141 0.60574 0.37042
+1140 0.67264 0.41815
+1141 0.60574 0.37042
+1138 0.66347 0.41663
+1139 0.58357 0.36910
+1136 0.64506 0.42202
+1137 0.57424 0.36529
+1132 0.64593 0.43559
+1134 0.58333 0.39013
+1133 0.65153 0.46014
+1135 0.59104 0.42891
+SURF 0x24
+mat 0
+refs 23
+1131 0.52236 0.37195
+1130 0.56108 0.38310
+1128 0.59594 0.19821
+1129 0.60483 0.35982
+1128 0.59594 0.19821
+1126 0.61288 0.35834
+1127 0.58689 0.20546
+1125 0.62357 0.37048
+1124 0.58855 0.22901
+1122 0.64258 0.38059
+1123 0.59317 0.25891
+1120 0.65210 0.39144
+1121 0.60428 0.30363
+1118 0.63783 0.38247
+1119 0.60387 0.32573
+1116 0.62183 0.37457
+1117 0.58889 0.31381
+1114 0.59993 0.36263
+1115 0.56709 0.29683
+1110 0.59053 0.35234
+1112 0.53833 0.29859
+1111 0.57834 0.34793
+1113 0.51145 0.30020
+SURF 0x24
+mat 0
+refs 33
+269 0.56215 0.47760
+1109 0.58707 0.42130
+269 0.56215 0.47760
+1108 0.59728 0.39824
+1107 0.56391 0.47362
+1105 0.60040 0.39118
+1106 0.56569 0.46959
+1104 0.60704 0.37617
+264 0.57842 0.44082
+1103 0.61418 0.36004
+261 0.58545 0.42492
+1101 0.62086 0.34494
+1102 0.58953 0.41572
+1101 0.62086 0.34494
+257 0.59010 0.41442
+1100 0.61278 0.36321
+257 0.59010 0.41442
+1098 0.60805 0.37389
+1099 0.58444 0.42720
+1097 0.59878 0.39484
+253 0.57117 0.45720
+1096 0.59193 0.41033
+251 0.56086 0.48051
+1094 0.58720 0.42101
+1095 0.55071 0.50346
+1092 0.58275 0.43107
+1093 0.54145 0.52438
+1090 0.58078 0.43553
+1091 0.53555 0.53772
+1087 0.58130 0.43435
+243 0.54079 0.52588
+1088 0.58272 0.43114
+1089 0.55047 0.50399
+SURF 0x24
+mat 0
+refs 7
+1085 0.41115 0.39363
+1086 0.42297 0.39963
+1083 0.42764 0.37693
+1081 0.43501 0.38399
+1083 0.42764 0.37693
+1082 0.45806 0.37842
+1084 0.45826 0.37167
+SURF 0x24
+mat 0
+refs 5
+1078 0.43523 0.38398
+1080 0.42773 0.37929
+1078 0.43523 0.38398
+1079 0.41709 0.39897
+1077 0.42294 0.39962
+SURF 0x24
+mat 0
+refs 5
+1074 0.34397 0.34754
+1076 0.32320 0.35098
+1074 0.34397 0.34754
+1075 0.31966 0.35568
+1073 0.34090 0.35725
+SURF 0x24
+mat 0
+refs 7
+1071 0.40709 0.39275
+1072 0.42588 0.39951
+1069 0.42366 0.37367
+1067 0.43720 0.38496
+1069 0.42366 0.37367
+1068 0.45804 0.37912
+1070 0.45842 0.36637
+SURF 0x24
+mat 0
+refs 5
+1064 0.43993 0.38493
+1066 0.42373 0.37635
+1064 0.43993 0.38493
+1065 0.41301 0.39881
+1063 0.42540 0.39935
+SURF 0x24
+mat 0
+refs 5
+1060 0.34366 0.34716
+1062 0.32422 0.34873
+1060 0.34366 0.34716
+1061 0.31744 0.35910
+1059 0.34087 0.36206
+SURF 0x24
+mat 0
+refs 7
+1057 0.41050 0.39404
+1058 0.42680 0.39953
+1055 0.42465 0.37379
+1053 0.43801 0.38594
+1055 0.42465 0.37379
+1054 0.45798 0.38074
+1056 0.45836 0.36613
+SURF 0x24
+mat 0
+refs 5
+1050 0.43784 0.38603
+1052 0.41817 0.37525
+1050 0.43784 0.38603
+1051 0.41054 0.39866
+1049 0.42746 0.39937
+SURF 0x24
+mat 0
+refs 5
+1046 0.34157 0.34729
+1048 0.32529 0.34697
+1046 0.34157 0.34729
+1047 0.31605 0.36115
+1045 0.33849 0.36718
+SURF 0x24
+mat 0
+refs 7
+1043 0.41498 0.39412
+1044 0.42680 0.39953
+1041 0.42914 0.37365
+1039 0.43801 0.38594
+1041 0.42914 0.37365
+1040 0.45798 0.38074
+1042 0.45835 0.36639
+SURF 0x24
+mat 0
+refs 5
+1036 0.43784 0.38603
+1038 0.42266 0.37514
+1036 0.43784 0.38603
+1037 0.41503 0.39879
+1035 0.42746 0.39937
+SURF 0x24
+mat 0
+refs 5
+1032 0.34157 0.34729
+1034 0.32529 0.34697
+1032 0.34157 0.34729
+1033 0.31845 0.35736
+1031 0.34109 0.36352
+SURF 0x24
+mat 0
+refs 5
+1028 0.44164 0.38654
+1030 0.42658 0.37568
+1028 0.44164 0.38654
+1029 0.41909 0.39889
+1027 0.42860 0.39938
+SURF 0x24
+mat 0
+refs 5
+1024 0.34369 0.34319
+1026 0.32589 0.34599
+1024 0.34369 0.34319
+1025 0.32061 0.35391
+1023 0.34282 0.35996
+SURF 0x24
+mat 0
+refs 7
+1021 0.41787 0.39836
+1022 0.43433 0.40215
+1019 0.43041 0.37661
+1017 0.44134 0.38715
+1019 0.43041 0.37661
+1018 0.45794 0.38235
+1020 0.45830 0.36922
+SURF 0x24
+mat 0
+refs 5
+1014 0.44164 0.38654
+1016 0.42899 0.37876
+1014 0.44164 0.38654
+1015 0.42159 0.39902
+1013 0.42860 0.39938
+SURF 0x24
+mat 0
+refs 5
+1010 0.34369 0.34319
+1012 0.32589 0.34599
+1010 0.34369 0.34319
+1011 0.32200 0.35183
+1009 0.34186 0.35639
+SURF 0x24
+mat 0
+refs 7
+1007 0.32098 0.35265
+1008 0.33119 0.34248
+1005 0.31103 0.33226
+1003 0.32187 0.32879
+1005 0.31103 0.33226
+1004 0.32621 0.31207
+1006 0.31830 0.30708
+SURF 0x24
+mat 0
+refs 7
+1001 0.34392 0.35128
+1002 0.34335 0.33885
+999 0.32513 0.34677
+997 0.32795 0.34264
+999 0.32513 0.34677
+998 0.32577 0.32647
+1000 0.31357 0.33202
+SURF 0x24
+mat 0
+refs 7
+995 0.32238 0.34440
+996 0.32888 0.34173
+993 0.31653 0.32944
+991 0.32557 0.32674
+993 0.31653 0.32944
+992 0.32849 0.31352
+994 0.32183 0.30932
+SURF 0x24
+mat 0
+refs 7
+989 0.32771 0.33929
+990 0.33285 0.33541
+987 0.32632 0.32892
+985 0.33068 0.32446
+987 0.32632 0.32892
+986 0.33233 0.31595
+988 0.32962 0.31434
+SURF 0x24
+mat 0
+refs 7
+983 0.34038 0.33919
+984 0.34379 0.33248
+981 0.33091 0.33729
+979 0.33276 0.33542
+981 0.33091 0.33729
+980 0.33583 0.32110
+982 0.32642 0.33034
+SURF 0x24
+mat 0
+refs 8
+977 0.32295 0.35079
+978 0.32129 0.36394
+977 0.32295 0.35079
+975 0.34437 0.35963
+976 0.34266 0.34958
+975 0.34437 0.35963
+974 0.36018 0.33361
+973 0.36588 0.33723
+SURF 0x24
+mat 0
+refs 8
+971 0.32469 0.34844
+972 0.31975 0.36779
+971 0.32469 0.34844
+969 0.34484 0.36476
+970 0.34308 0.34721
+969 0.34484 0.36476
+968 0.35959 0.33324
+967 0.37036 0.34007
+SURF 0x24
+mat 0
+refs 8
+965 0.32518 0.34766
+966 0.32059 0.36425
+965 0.32518 0.34766
+963 0.34530 0.36388
+964 0.34272 0.34601
+963 0.34530 0.36388
+962 0.35822 0.33237
+961 0.37053 0.34025
+SURF 0x24
+mat 0
+refs 8
+959 0.32518 0.34766
+960 0.32304 0.36049
+959 0.32518 0.34766
+957 0.34792 0.36023
+958 0.34272 0.34601
+957 0.34792 0.36023
+956 0.35822 0.33237
+955 0.37031 0.34011
+SURF 0x24
+mat 0
+refs 8
+953 0.32723 0.33996
+954 0.32114 0.35571
+953 0.32723 0.33996
+951 0.34618 0.35752
+952 0.34359 0.34256
+951 0.34618 0.35752
+950 0.35686 0.33151
+949 0.36794 0.33856
+SURF 0x24
+mat 0
+refs 8
+947 0.32723 0.33996
+948 0.32238 0.35354
+947 0.32723 0.33996
+945 0.34506 0.35385
+946 0.34359 0.34256
+945 0.34506 0.35385
+944 0.35686 0.33151
+943 0.36475 0.33654
+SURF 0x24
+mat 0
+refs 8
+941 0.32889 0.34173
+942 0.32924 0.34876
+941 0.32889 0.34173
+939 0.34528 0.34767
+940 0.34386 0.33834
+939 0.34528 0.34767
+938 0.35457 0.33006
+937 0.36121 0.33430
+SURF 0x24
+mat 0
+refs 8
+935 0.33291 0.33545
+936 0.33160 0.34176
+935 0.33291 0.33545
+933 0.34157 0.33859
+934 0.34374 0.33275
+933 0.34157 0.33859
+932 0.35074 0.32763
+931 0.35336 0.32939
+SURF 0x24
+mat 0
+refs 13
+929 0.65255 0.60669
+930 0.66605 0.62422
+921 0.62660 0.61763
+922 0.64507 0.64041
+904 0.59718 0.63503
+905 0.61784 0.66186
+888 0.56497 0.64858
+905 0.61784 0.66186
+906 0.59443 0.69474
+907 0.65452 0.71091
+908 0.62485 0.75392
+909 0.67723 0.74139
+910 0.64031 0.79713
+SURF 0x24
+mat 0
+refs 19
+928 0.60374 0.58905
+921 0.62660 0.61763
+917 0.56801 0.59596
+904 0.59718 0.63503
+886 0.54086 0.59595
+888 0.56497 0.64858
+885 0.50784 0.59614
+887 0.53088 0.67048
+885 0.50784 0.59614
+927 0.51653 0.67624
+916 0.49262 0.59397
+927 0.51653 0.67624
+890 0.47006 0.58890
+893 0.47098 0.65579
+892 0.42143 0.54504
+897 0.40488 0.62815
+896 0.39286 0.54873
+899 0.37357 0.61836
+898 0.36623 0.55254
+SURF 0x24
+mat 0
+refs 32
+892 0.42143 0.54504
+891 0.43964 0.52426
+890 0.47006 0.58890
+889 0.45210 0.50973
+877 0.46830 0.57773
+869 0.45667 0.53136
+868 0.45922 0.58671
+866 0.45419 0.57737
+868 0.45922 0.58671
+867 0.47574 0.64988
+868 0.45922 0.58671
+873 0.51002 0.65566
+874 0.48894 0.58641
+876 0.51990 0.64832
+875 0.49969 0.58492
+882 0.56177 0.62684
+883 0.53369 0.57481
+903 0.58691 0.61377
+883 0.53369 0.57481
+902 0.55267 0.57800
+884 0.53331 0.57560
+918 0.55338 0.57806
+884 0.53331 0.57560
+917 0.56801 0.59596
+884 0.53331 0.57560
+886 0.54086 0.59595
+879 0.50161 0.58597
+885 0.50784 0.59614
+878 0.49165 0.58901
+916 0.49262 0.59397
+877 0.46830 0.57773
+890 0.47006 0.58890
+SURF 0x24
+mat 0
+refs 8
+877 0.46830 0.57773
+868 0.45922 0.58671
+878 0.49165 0.58901
+874 0.48894 0.58641
+879 0.50161 0.58597
+875 0.49969 0.58492
+884 0.53331 0.57560
+883 0.53369 0.57481
+SURF 0x24
+mat 0
+refs 7
+887 0.53088 0.67048
+888 0.56497 0.64858
+887 0.53088 0.67048
+906 0.59443 0.69474
+911 0.53803 0.74982
+908 0.62485 0.75392
+912 0.55794 0.81469
+SURF 0x24
+mat 0
+refs 7
+909 0.67723 0.74139
+926 0.69550 0.69281
+909 0.67723 0.74139
+925 0.70166 0.69580
+919 0.68182 0.74985
+920 0.70790 0.69990
+914 0.68676 0.75560
+SURF 0x24
+mat 0
+refs 9
+923 0.66369 0.63651
+924 0.62986 0.59780
+901 0.63643 0.66263
+903 0.58691 0.61377
+901 0.63643 0.66263
+882 0.56177 0.62684
+881 0.60160 0.71635
+876 0.51990 0.64832
+880 0.56074 0.77505
+SURF 0x24
+mat 0
+refs 8
+901 0.63643 0.66263
+881 0.60160 0.71635
+901 0.63643 0.66263
+900 0.62766 0.76594
+913 0.65991 0.71132
+900 0.62766 0.76594
+914 0.68676 0.75560
+915 0.64469 0.81970
+SURF 0x24
+mat 0
+refs 17
+894 0.31434 0.51830
+895 0.37704 0.62181
+871 0.34900 0.49100
+870 0.44306 0.63483
+863 0.36335 0.47969
+864 0.47925 0.63893
+863 0.36335 0.47969
+862 0.46835 0.63647
+861 0.36677 0.47700
+860 0.45810 0.63104
+858 0.37023 0.47427
+859 0.45529 0.60760
+857 0.39494 0.45480
+866 0.45419 0.57737
+865 0.40860 0.44405
+869 0.45667 0.53136
+872 0.41650 0.43782
+SURF 0x24
+mat 0
+refs 4
+856 0.38600 0.46011
+853 0.29126 0.40777
+855 0.40580 0.43337
+854 0.32724 0.36110
+SURF 0x24
+mat 0
+refs 12
+853 0.29126 0.40777
+852 0.32689 0.48840
+853 0.29126 0.40777
+850 0.27127 0.46747
+851 0.21470 0.37007
+850 0.27127 0.46747
+849 0.18168 0.37154
+848 0.22824 0.46514
+844 0.19708 0.38616
+847 0.23931 0.46950
+842 0.25357 0.42328
+846 0.28402 0.48879
+SURF 0x24
+mat 0
+refs 6
+845 0.18118 0.29475
+844 0.19708 0.38616
+839 0.25037 0.36395
+842 0.25357 0.42328
+838 0.33448 0.44805
+843 0.35799 0.48037
+SURF 0x24
+mat 0
+refs 26
+839 0.25037 0.36395
+838 0.33448 0.44805
+839 0.25037 0.36395
+830 0.31906 0.43002
+831 0.21540 0.29729
+830 0.31906 0.43002
+825 0.20938 0.31319
+821 0.26954 0.41963
+817 0.19961 0.31455
+816 0.25194 0.42793
+815 0.19255 0.30642
+816 0.25194 0.42793
+814 0.25730 0.41893
+818 0.34104 0.47551
+819 0.28253 0.38598
+820 0.35408 0.43546
+823 0.31289 0.34992
+824 0.45540 0.39698
+823 0.31289 0.34992
+826 0.47781 0.37105
+827 0.34627 0.32880
+828 0.47774 0.37602
+829 0.33201 0.33006
+828 0.47774 0.37602
+834 0.34970 0.38213
+833 0.48389 0.39584
+SURF 0x24
+mat 0
+refs 5
+818 0.34104 0.47551
+816 0.25194 0.42793
+822 0.34677 0.48343
+821 0.26954 0.41963
+832 0.37710 0.47616
+SURF 0x24
+mat 0
+refs 7
+840 0.32113 0.42853
+841 0.24425 0.29525
+836 0.32640 0.43729
+837 0.26140 0.32952
+836 0.32640 0.43729
+834 0.34970 0.38213
+835 0.38480 0.43956
+SURF 0x24
+mat 0
+refs 10
+812 0.31303 0.38862
+813 0.40530 0.49349
+812 0.31303 0.38862
+810 0.43575 0.45283
+811 0.37765 0.33685
+806 0.47818 0.43247
+807 0.43982 0.29997
+806 0.47818 0.43247
+805 0.50000 0.29258
+804 0.50000 0.42493
+SURF 0x24
+mat 0
+refs 5
+807 0.43982 0.29997
+805 0.50000 0.29258
+807 0.43982 0.29997
+808 0.50000 0.20599
+809 0.37475 0.20781
+SURF 0x24
+mat 0
+refs 14
+803 0.58953 0.41572
+802 0.66880 0.47959
+803 0.58953 0.41572
+800 0.65464 0.46261
+801 0.59010 0.41442
+800 0.65464 0.46261
+796 0.58445 0.42720
+794 0.65043 0.48128
+796 0.58445 0.42720
+795 0.64406 0.50817
+797 0.57117 0.45720
+795 0.64406 0.50817
+799 0.56086 0.48051
+798 0.62054 0.52481
+SURF 0x24
+mat 0
+refs 20
+791 0.43942 0.32223
+792 0.38631 0.36140
+788 0.42772 0.27341
+789 0.31901 0.35393
+784 0.30564 0.21057
+793 0.26009 0.35353
+784 0.30564 0.21057
+786 0.24378 0.26976
+784 0.30564 0.21057
+785 0.22263 0.24435
+782 0.30810 0.17512
+783 0.22031 0.26546
+782 0.30810 0.17512
+780 0.28346 0.19750
+790 0.36869 0.14343
+780 0.28346 0.19750
+779 0.36134 0.16077
+780 0.28346 0.19750
+776 0.30215 0.22628
+781 0.27024 0.29445
+SURF 0x24
+mat 0
+refs 35
+779 0.36134 0.16077
+776 0.30215 0.22628
+775 0.37088 0.17503
+766 0.28584 0.23111
+765 0.38128 0.17444
+760 0.27885 0.22415
+759 0.38510 0.16653
+756 0.28105 0.21361
+755 0.40118 0.18141
+754 0.31441 0.22100
+758 0.43674 0.21314
+754 0.31441 0.22100
+752 0.35795 0.25259
+753 0.27215 0.33338
+752 0.35795 0.25259
+751 0.31923 0.33574
+752 0.35795 0.25259
+761 0.35624 0.34954
+762 0.41311 0.23382
+763 0.34661 0.33895
+764 0.38309 0.24568
+770 0.31587 0.38454
+764 0.38309 0.24568
+767 0.30432 0.28240
+768 0.43881 0.18804
+769 0.32123 0.24801
+774 0.44353 0.18010
+769 0.32123 0.24801
+772 0.35441 0.25206
+771 0.26164 0.38987
+772 0.35441 0.25206
+773 0.29124 0.41422
+772 0.35441 0.25206
+777 0.31652 0.44344
+778 0.38232 0.30764
+SURF 0x24
+mat 0
+refs 5
+753 0.27215 0.33338
+754 0.31441 0.22100
+753 0.27215 0.33338
+756 0.28105 0.21361
+757 0.23066 0.33324
+SURF 0x24
+mat 0
+refs 6
+782 0.30810 0.17512
+790 0.36869 0.14343
+782 0.30810 0.17512
+787 0.39309 0.18045
+784 0.30564 0.21057
+788 0.42772 0.27341
+SURF 0x24
+mat 0
+refs 9
+749 0.43049 0.10697
+750 0.31416 0.17461
+748 0.44214 0.14066
+747 0.31931 0.20541
+745 0.44936 0.16156
+743 0.33114 0.22478
+745 0.44936 0.16156
+744 0.35183 0.24050
+746 0.45622 0.18140
+SURF 0x24
+mat 0
+refs 14
+741 0.40313 0.31553
+742 0.43731 0.39155
+739 0.41235 0.29781
+740 0.44501 0.37963
+735 0.40917 0.29819
+736 0.44981 0.39027
+733 0.40397 0.31419
+734 0.45902 0.43260
+729 0.44053 0.30906
+730 0.49507 0.46655
+731 0.43564 0.28659
+732 0.48970 0.46906
+737 0.40562 0.31817
+738 0.44569 0.47101
+SURF 0x24
+mat 0
+refs 11
+719 0.48022 0.28857
+728 0.49924 0.31300
+719 0.48022 0.28857
+722 0.50038 0.31214
+718 0.47467 0.27976
+721 0.49223 0.31833
+717 0.44091 0.24950
+721 0.49223 0.31833
+720 0.43752 0.23257
+723 0.49732 0.31446
+724 0.40863 0.23369
+SURF 0x24
+mat 0
+refs 15
+718 0.47467 0.27976
+717 0.44091 0.24950
+718 0.47467 0.27976
+711 0.45002 0.26733
+719 0.48022 0.28857
+711 0.45002 0.26733
+715 0.47482 0.29453
+712 0.45031 0.29661
+714 0.47326 0.29853
+713 0.45297 0.30011
+726 0.47373 0.29984
+713 0.45297 0.30011
+725 0.45378 0.30117
+716 0.44771 0.32147
+727 0.44715 0.32003
+SURF 0x24
+mat 0
+refs 16
+716 0.44771 0.32147
+713 0.45297 0.30011
+710 0.44435 0.31497
+712 0.45031 0.29661
+710 0.44435 0.31497
+711 0.45002 0.26733
+710 0.44435 0.31497
+707 0.44176 0.28945
+709 0.45398 0.34740
+707 0.44176 0.28945
+708 0.45626 0.34566
+706 0.44476 0.31158
+704 0.45177 0.34908
+706 0.44476 0.31158
+703 0.41262 0.26257
+705 0.42243 0.25778
+SURF 0x24
+mat 0
+refs 5
+702 0.42648 0.36830
+704 0.45177 0.34908
+702 0.42648 0.36830
+703 0.41262 0.26257
+701 0.34925 0.26968
+SURF 0x24
+mat 0
+refs 13
+699 0.42272 0.38268
+700 0.31095 0.43715
+693 0.41651 0.44968
+694 0.24475 0.52298
+691 0.41612 0.48610
+692 0.25461 0.56393
+691 0.41612 0.48610
+687 0.26364 0.56768
+688 0.41746 0.47501
+683 0.28567 0.54561
+685 0.42181 0.46426
+684 0.35450 0.49859
+686 0.44484 0.45907
+SURF 0x24
+mat 0
+refs 11
+698 0.28902 0.58105
+697 0.41092 0.52750
+698 0.28902 0.58105
+695 0.40261 0.51842
+696 0.27159 0.55920
+690 0.40486 0.48373
+689 0.23465 0.54396
+684 0.35450 0.49859
+682 0.21207 0.53667
+683 0.28567 0.54561
+681 0.16444 0.55374
+SURF 0x24
+mat 0
+refs 11
+680 0.25971 0.55457
+679 0.19432 0.49299
+678 0.29089 0.55304
+677 0.23347 0.47315
+676 0.30113 0.56138
+675 0.25039 0.46113
+674 0.30966 0.57929
+673 0.25513 0.45965
+671 0.31541 0.61532
+672 0.22351 0.44644
+670 0.25059 0.56780
+SURF 0x24
+mat 0
+refs 7
+668 0.41345 0.26501
+667 0.48558 0.29999
+666 0.43408 0.28984
+669 0.51850 0.34484
+666 0.43408 0.28984
+664 0.46109 0.30584
+665 0.39905 0.24327
+SURF 0x24
+mat 0
+refs 23
+664 0.46109 0.30584
+663 0.50251 0.37426
+664 0.46109 0.30584
+661 0.52369 0.34486
+662 0.48016 0.26216
+661 0.52369 0.34486
+660 0.48928 0.24225
+659 0.53291 0.32713
+658 0.48058 0.24109
+657 0.52973 0.32751
+656 0.47678 0.23138
+655 0.52453 0.34352
+652 0.48735 0.21788
+651 0.56109 0.33839
+650 0.50612 0.21946
+649 0.55620 0.31592
+647 0.47855 0.25418
+645 0.52618 0.34749
+647 0.47855 0.25418
+646 0.45583 0.39476
+648 0.40101 0.31606
+653 0.40454 0.38463
+654 0.35827 0.34239
+SURF 0x24
+mat 0
+refs 49
+628 0.53613 0.58643
+632 0.57561 0.55962
+628 0.53613 0.58643
+631 0.56659 0.54405
+629 0.52920 0.57320
+642 0.55425 0.52675
+641 0.51741 0.55464
+633 0.55811 0.53138
+630 0.51777 0.55539
+634 0.57851 0.55413
+630 0.51777 0.55539
+610 0.53868 0.57393
+611 0.47477 0.59541
+610 0.53868 0.57393
+609 0.52043 0.63920
+606 0.56875 0.60874
+603 0.59255 0.63772
+607 0.60328 0.58682
+603 0.59255 0.63772
+608 0.62884 0.61705
+603 0.59255 0.63772
+604 0.64205 0.63478
+599 0.60786 0.66172
+604 0.64205 0.63478
+601 0.59910 0.65416
+605 0.63531 0.62799
+612 0.58870 0.64513
+613 0.62412 0.61578
+635 0.57937 0.63899
+636 0.61284 0.60527
+635 0.57937 0.63899
+640 0.58834 0.58053
+635 0.57937 0.63899
+638 0.55138 0.60971
+635 0.57937 0.63899
+639 0.52596 0.63819
+635 0.57937 0.63899
+637 0.54917 0.67915
+635 0.57937 0.63899
+614 0.55689 0.69421
+612 0.58870 0.64513
+614 0.55689 0.69421
+601 0.59910 0.65416
+600 0.57013 0.71844
+599 0.60786 0.66172
+598 0.57445 0.72700
+603 0.59255 0.63772
+602 0.54811 0.69110
+609 0.52043 0.63920
+SURF 0x24
+mat 0
+refs 35
+617 0.42987 0.61081
+624 0.36974 0.63612
+617 0.42987 0.61081
+623 0.34192 0.59446
+616 0.40802 0.58862
+625 0.33911 0.59389
+619 0.40156 0.58144
+626 0.35798 0.62047
+619 0.40156 0.58144
+622 0.41610 0.59430
+618 0.45312 0.57027
+622 0.41610 0.59430
+621 0.46795 0.58223
+644 0.46292 0.63928
+627 0.49847 0.61179
+643 0.49512 0.68036
+627 0.49847 0.61179
+639 0.52596 0.63819
+627 0.49847 0.61179
+638 0.55138 0.60971
+627 0.49847 0.61179
+628 0.53613 0.58643
+621 0.46795 0.58223
+629 0.52920 0.57320
+618 0.45312 0.57027
+641 0.51741 0.55464
+618 0.45312 0.57027
+630 0.51777 0.55539
+615 0.45615 0.57405
+611 0.47477 0.59541
+616 0.40802 0.58862
+611 0.47477 0.59541
+617 0.42987 0.61081
+609 0.52043 0.63920
+620 0.48662 0.65975
+SURF 0x24
+mat 0
+refs 5
+615 0.45615 0.57405
+616 0.40802 0.58862
+615 0.45615 0.57405
+619 0.40156 0.58144
+618 0.45312 0.57027
+SURF 0x24
+mat 0
+refs 5
+595 0.31386 0.50820
+597 0.39394 0.41364
+595 0.31386 0.50820
+596 0.37254 0.40619
+594 0.24802 0.46949
+SURF 0x24
+mat 0
+refs 5
+591 0.24755 0.43431
+593 0.23690 0.36784
+591 0.24755 0.43431
+592 0.35581 0.43151
+590 0.34549 0.47417
+SURF 0x24
+mat 0
+refs 32
+574 0.64726 0.50345
+575 0.60851 0.52825
+574 0.64726 0.50345
+552 0.59460 0.48600
+573 0.63049 0.46615
+553 0.57520 0.37877
+573 0.63049 0.46615
+576 0.59406 0.36911
+586 0.66405 0.44517
+576 0.59406 0.36911
+585 0.61242 0.35700
+564 0.53797 0.43597
+585 0.61242 0.35700
+555 0.56423 0.41424
+584 0.63666 0.33860
+550 0.56394 0.40929
+549 0.63470 0.33636
+546 0.55677 0.41262
+545 0.62537 0.33950
+541 0.51021 0.42832
+545 0.62537 0.33950
+537 0.58943 0.35805
+554 0.66212 0.44966
+537 0.58943 0.35805
+536 0.65011 0.45932
+532 0.56837 0.36881
+528 0.62213 0.48004
+533 0.55076 0.37720
+528 0.62213 0.48004
+529 0.59962 0.48966
+530 0.64574 0.52079
+531 0.62052 0.53256
+SURF 0x24
+mat 0
+refs 9
+526 0.53108 0.26928
+527 0.56783 0.37945
+526 0.53108 0.26928
+520 0.58151 0.37011
+522 0.54041 0.26614
+521 0.58920 0.36441
+523 0.54237 0.26838
+524 0.56976 0.37496
+525 0.51812 0.28678
+SURF 0x24
+mat 0
+refs 6
+518 0.31089 0.32783
+519 0.41437 0.37633
+517 0.35434 0.28359
+516 0.47222 0.32486
+515 0.39845 0.23975
+514 0.49460 0.30200
+SURF 0x24
+mat 0
+refs 9
+508 0.37652 0.50611
+513 0.31252 0.45337
+508 0.37652 0.50611
+510 0.27179 0.48500
+506 0.33911 0.53491
+509 0.24021 0.50727
+505 0.31401 0.55193
+512 0.21305 0.53432
+511 0.29633 0.56601
+SURF 0x24
+mat 0
+refs 7
+507 0.42162 0.53249
+508 0.37652 0.50611
+507 0.42162 0.53249
+506 0.33911 0.53491
+504 0.38324 0.55975
+505 0.31401 0.55193
+503 0.36904 0.56898
+SURF 0x24
+mat 0
+refs 10
+499 0.28894 0.56921
+502 0.22213 0.53902
+499 0.28894 0.56921
+501 0.27308 0.51039
+497 0.33413 0.53504
+500 0.36300 0.45475
+497 0.33413 0.53504
+496 0.39615 0.49555
+495 0.37124 0.55992
+494 0.42005 0.52710
+SURF 0x24
+mat 0
+refs 5
+497 0.33413 0.53504
+495 0.37124 0.55992
+497 0.33413 0.53504
+498 0.33822 0.58979
+499 0.28894 0.56921
+SURF 0x24
+mat 0
+refs 6
+493 0.27761 0.64906
+492 0.28508 0.64210
+488 0.33540 0.58125
+491 0.33594 0.58929
+486 0.36970 0.54043
+490 0.37186 0.54977
+SURF 0x24
+mat 0
+refs 4
+486 0.36970 0.54043
+487 0.36260 0.51375
+488 0.33540 0.58125
+489 0.32807 0.55987
+SURF 0x24
+mat 0
+refs 7
+472 0.30700 0.53958
+473 0.32818 0.47946
+472 0.30700 0.53958
+471 0.24623 0.46799
+469 0.24213 0.54241
+470 0.18874 0.45442
+468 0.19018 0.53734
+SURF 0x24
+mat 0
+refs 5
+465 0.21096 0.54541
+467 0.22046 0.49371
+465 0.21096 0.54541
+466 0.30874 0.47716
+464 0.28554 0.53814
+SURF 0x24
+mat 0
+refs 99
+443 0.63276 0.46602
+463 0.63450 0.50236
+443 0.63276 0.46602
+462 0.61470 0.51430
+442 0.61161 0.46796
+462 0.61470 0.51430
+440 0.60698 0.46272
+461 0.61454 0.51498
+440 0.60698 0.46272
+460 0.65483 0.48620
+440 0.60698 0.46272
+439 0.64515 0.44141
+432 0.61611 0.43176
+431 0.64217 0.41481
+430 0.61600 0.41108
+431 0.64217 0.41481
+409 0.63702 0.39562
+433 0.67592 0.39792
+409 0.63702 0.39562
+404 0.66462 0.37890
+402 0.56750 0.42712
+394 0.63391 0.46437
+393 0.59186 0.41543
+394 0.63391 0.46437
+390 0.60960 0.40831
+392 0.64516 0.46033
+390 0.60960 0.40831
+391 0.64209 0.46546
+390 0.60960 0.40831
+389 0.60818 0.41186
+399 0.60590 0.38168
+389 0.60818 0.41186
+396 0.60432 0.38538
+395 0.60047 0.41780
+397 0.59253 0.39267
+395 0.60047 0.41780
+400 0.58725 0.42687
+407 0.70206 0.36694
+400 0.58725 0.42687
+405 0.69007 0.37694
+406 0.63029 0.33582
+437 0.66789 0.39539
+406 0.63029 0.33582
+436 0.65168 0.40524
+426 0.61404 0.34504
+427 0.59943 0.35271
+422 0.59983 0.31831
+428 0.57755 0.33290
+423 0.52548 0.40496
+457 0.56153 0.31690
+458 0.51282 0.38807
+459 0.47956 0.40705
+322 0.49336 0.36417
+321 0.45541 0.38611
+322 0.49336 0.36417
+323 0.51550 0.35140
+458 0.51282 0.38807
+456 0.53064 0.37581
+423 0.52548 0.40496
+419 0.54256 0.39473
+422 0.59983 0.31831
+417 0.55325 0.41428
+426 0.61404 0.34504
+417 0.55325 0.41428
+406 0.63029 0.33582
+401 0.57077 0.40567
+400 0.58725 0.42687
+401 0.57077 0.40567
+397 0.59253 0.39267
+411 0.58758 0.37034
+397 0.59253 0.39267
+410 0.60178 0.36187
+396 0.60432 0.38538
+413 0.59932 0.36022
+399 0.60590 0.38168
+412 0.57733 0.36816
+399 0.60590 0.38168
+398 0.57958 0.38489
+390 0.60960 0.40831
+398 0.57958 0.38489
+393 0.59186 0.41543
+403 0.55060 0.39766
+402 0.56750 0.42712
+414 0.52222 0.41831
+402 0.56750 0.42712
+408 0.60293 0.34205
+409 0.63702 0.39562
+425 0.58632 0.35665
+430 0.61600 0.41108
+434 0.62114 0.41564
+432 0.61611 0.43176
+435 0.62107 0.43538
+440 0.60698 0.46272
+435 0.62107 0.43538
+442 0.61161 0.46796
+441 0.63457 0.43201
+443 0.63276 0.46602
+444 0.65719 0.42022
+445 0.66431 0.44747
+SURF 0x24
+mat 0
+refs 49
+436 0.65168 0.40524
+444 0.65719 0.42022
+436 0.65168 0.40524
+441 0.63457 0.43201
+438 0.63203 0.41365
+435 0.62107 0.43538
+438 0.63203 0.41365
+434 0.62114 0.41564
+429 0.59018 0.35666
+425 0.58632 0.35665
+424 0.56842 0.34049
+425 0.58632 0.35665
+420 0.56443 0.34014
+408 0.60293 0.34205
+420 0.56443 0.34014
+414 0.52222 0.41831
+421 0.54876 0.32334
+414 0.52222 0.41831
+415 0.50960 0.40706
+403 0.55060 0.39766
+416 0.54235 0.38428
+398 0.57958 0.38489
+416 0.54235 0.38428
+412 0.57733 0.36816
+451 0.53224 0.36770
+412 0.57733 0.36816
+448 0.56906 0.34510
+413 0.59932 0.36022
+449 0.59368 0.33467
+410 0.60178 0.36187
+446 0.59837 0.33470
+411 0.58758 0.37034
+447 0.58136 0.34746
+411 0.58758 0.37034
+418 0.55886 0.38551
+401 0.57077 0.40567
+418 0.55886 0.38551
+417 0.55325 0.41428
+418 0.55886 0.38551
+419 0.54256 0.39473
+455 0.54985 0.36693
+456 0.53064 0.37581
+324 0.53685 0.33901
+323 0.51550 0.35140
+324 0.53685 0.33901
+314 0.57168 0.31885
+455 0.54985 0.36693
+447 0.58136 0.34746
+418 0.55886 0.38551
+SURF 0x24
+mat 0
+refs 40
+436 0.65168 0.40524
+438 0.63203 0.41365
+427 0.59943 0.35271
+429 0.59018 0.35666
+428 0.57755 0.33290
+424 0.56842 0.34049
+457 0.56153 0.31690
+452 0.54535 0.32881
+459 0.47956 0.40705
+453 0.52005 0.31029
+321 0.45541 0.38611
+320 0.43712 0.39667
+321 0.45541 0.38611
+319 0.44766 0.39059
+323 0.51550 0.35140
+315 0.58765 0.30975
+314 0.57168 0.31885
+313 0.58732 0.30986
+447 0.58136 0.34746
+313 0.58732 0.30986
+446 0.59837 0.33470
+315 0.58765 0.30975
+449 0.59368 0.33467
+316 0.57457 0.31724
+448 0.56906 0.34510
+317 0.52088 0.34826
+451 0.53224 0.36770
+318 0.46858 0.37849
+451 0.53224 0.36770
+450 0.49257 0.38970
+416 0.54235 0.38428
+450 0.49257 0.38970
+415 0.50960 0.40706
+454 0.53177 0.30306
+421 0.54876 0.32334
+453 0.52005 0.31029
+421 0.54876 0.32334
+452 0.54535 0.32881
+420 0.56443 0.34014
+424 0.56842 0.34049
+SURF 0x24
+mat 0
+refs 12
+320 0.43712 0.39667
+453 0.52005 0.31029
+320 0.43712 0.39667
+454 0.53177 0.30306
+319 0.44766 0.39059
+450 0.49257 0.38970
+319 0.44766 0.39059
+318 0.46858 0.37849
+319 0.44766 0.39059
+317 0.52088 0.34826
+315 0.58765 0.30975
+316 0.57457 0.31724
+SURF 0x24
+mat 0
+refs 8
+388 0.31194 0.43668
+387 0.41925 0.41102
+382 0.28773 0.49412
+381 0.39851 0.47960
+380 0.28485 0.52728
+379 0.38280 0.52699
+383 0.31181 0.55589
+386 0.39000 0.54069
+SURF 0x24
+mat 0
+refs 5
+380 0.28485 0.52728
+383 0.31181 0.55589
+380 0.28485 0.52728
+384 0.24930 0.58231
+385 0.17673 0.53226
+SURF 0x24
+mat 0
+refs 14
+378 0.33498 0.63103
+377 0.41441 0.58790
+378 0.33498 0.63103
+371 0.41916 0.63354
+370 0.32603 0.68978
+371 0.41916 0.63354
+367 0.33267 0.73236
+364 0.41854 0.65254
+366 0.33464 0.72062
+365 0.41805 0.65651
+368 0.34425 0.67289
+369 0.41428 0.60024
+373 0.34712 0.59319
+376 0.40076 0.54588
+SURF 0x24
+mat 0
+refs 5
+368 0.34425 0.67289
+373 0.34712 0.59319
+368 0.34425 0.67289
+374 0.32069 0.60227
+375 0.28647 0.71625
+SURF 0x24
+mat 0
+refs 7
+363 0.47415 0.60425
+365 0.41805 0.65651
+363 0.47415 0.60425
+364 0.41854 0.65254
+362 0.47072 0.59748
+371 0.41916 0.63354
+372 0.46827 0.58817
+SURF 0x24
+mat 0
+refs 22
+359 0.55826 0.53647
+361 0.57231 0.52889
+359 0.55826 0.53647
+360 0.58437 0.54352
+356 0.57176 0.55400
+357 0.60580 0.56284
+355 0.59412 0.57923
+349 0.61740 0.57328
+350 0.60709 0.59224
+345 0.62254 0.57492
+344 0.61237 0.59379
+346 0.62805 0.57723
+340 0.61755 0.59649
+347 0.62245 0.56667
+341 0.61019 0.58495
+348 0.60022 0.53794
+341 0.61019 0.58495
+342 0.58301 0.55183
+333 0.60291 0.61325
+334 0.56940 0.56630
+335 0.56562 0.64110
+336 0.54214 0.59241
+SURF 0x24
+mat 0
+refs 15
+335 0.56562 0.64110
+338 0.59247 0.68538
+333 0.60291 0.61325
+337 0.61361 0.62968
+341 0.61019 0.58495
+337 0.61361 0.62968
+340 0.61755 0.59649
+339 0.60737 0.62559
+344 0.61237 0.59379
+343 0.60121 0.62259
+350 0.60709 0.59224
+351 0.58091 0.60538
+355 0.59412 0.57923
+354 0.55078 0.57020
+356 0.57176 0.55400
+SURF 0x24
+mat 0
+refs 7
+358 0.52355 0.59164
+354 0.55078 0.57020
+358 0.52355 0.59164
+351 0.58091 0.60538
+352 0.56023 0.64069
+343 0.60121 0.62259
+353 0.58294 0.67117
+SURF 0x24
+mat 0
+refs 5
+330 0.60777 0.29672
+332 0.50618 0.34758
+330 0.60777 0.29672
+331 0.51389 0.34164
+329 0.54780 0.39525
+SURF 0x24
+mat 0
+refs 5
+326 0.54787 0.34459
+328 0.55086 0.37119
+326 0.54787 0.34459
+327 0.59400 0.34324
+325 0.58163 0.32770
+SURF 0x24
+mat 0
+refs 5
+310 0.22561 0.54436
+312 0.29294 0.57882
+310 0.22561 0.54436
+311 0.27032 0.55875
+309 0.18160 0.51571
+SURF 0x24
+mat 0
+refs 7
+308 0.43385 0.12616
+307 0.41414 0.12263
+305 0.44647 0.14612
+303 0.41180 0.13534
+305 0.44647 0.14612
+304 0.40956 0.14234
+306 0.46590 0.15712
+SURF 0x24
+mat 0
+refs 20
+302 0.65111 0.38117
+301 0.66881 0.47958
+300 0.64560 0.39711
+299 0.65464 0.46261
+298 0.63807 0.41328
+297 0.65043 0.48128
+296 0.62847 0.43630
+295 0.64406 0.50817
+294 0.62759 0.45021
+293 0.62054 0.52480
+292 0.62084 0.46128
+291 0.59857 0.54038
+290 0.61464 0.46820
+289 0.58211 0.55529
+288 0.59692 0.47552
+287 0.57722 0.56410
+286 0.58910 0.46440
+285 0.56875 0.53904
+284 0.57809 0.44175
+283 0.55048 0.50397
+SURF 0x24
+mat 0
+refs 14
+282 0.39928 0.46145
+281 0.36335 0.47969
+282 0.39928 0.46145
+280 0.46836 0.63646
+279 0.44662 0.47607
+280 0.46836 0.63646
+278 0.45482 0.47601
+277 0.45810 0.63104
+275 0.46303 0.46207
+276 0.45529 0.60760
+274 0.47979 0.44856
+273 0.45419 0.57737
+272 0.48709 0.43611
+271 0.45668 0.53136
+SURF 0x24
+mat 0
+refs 32
+270 0.58705 0.42129
+269 0.56215 0.47760
+267 0.59725 0.39822
+268 0.56391 0.47362
+266 0.60037 0.39117
+265 0.56569 0.46959
+263 0.60701 0.37616
+264 0.57842 0.44082
+262 0.61415 0.36002
+261 0.58545 0.42492
+260 0.62083 0.34493
+259 0.58953 0.41572
+260 0.62083 0.34493
+257 0.59010 0.41442
+258 0.61275 0.36319
+257 0.59010 0.41442
+256 0.60802 0.37388
+255 0.58445 0.42720
+254 0.59875 0.39483
+253 0.57117 0.45720
+252 0.59190 0.41032
+251 0.56086 0.48051
+250 0.58717 0.42100
+249 0.55071 0.50346
+248 0.58272 0.43106
+247 0.54145 0.52438
+246 0.58075 0.43551
+245 0.53555 0.53772
+244 0.58127 0.43433
+243 0.54079 0.52588
+242 0.58269 0.43113
+241 0.55047 0.50399
+SURF 0x24
+mat 0
+refs 5
+238 0.40333 0.19986
+240 0.38045 0.20610
+238 0.40333 0.19986
+239 0.37288 0.19927
+237 0.40333 0.19311
+SURF 0x24
+mat 0
+refs 5
+234 0.45488 0.30298
+236 0.45212 0.29001
+234 0.45488 0.30298
+235 0.47548 0.29235
+233 0.47462 0.30251
+SURF 0x24
+mat 0
+refs 8
+231 0.45086 0.32362
+232 0.44283 0.31735
+231 0.45086 0.32362
+229 0.45170 0.29799
+230 0.45487 0.30295
+229 0.45170 0.29799
+228 0.47476 0.30268
+227 0.47370 0.29390
+SURF 0x24
+mat 0
+refs 5
+224 0.40333 0.20056
+226 0.38268 0.20701
+224 0.40333 0.20056
+225 0.36881 0.19613
+223 0.40333 0.18780
+SURF 0x24
+mat 0
+refs 5
+220 0.45681 0.30517
+222 0.45025 0.28631
+220 0.45681 0.30517
+221 0.47551 0.28720
+219 0.47524 0.30484
+SURF 0x24
+mat 0
+refs 8
+217 0.45133 0.32346
+218 0.43833 0.31565
+217 0.45133 0.32346
+215 0.44926 0.29472
+216 0.45663 0.30469
+215 0.44926 0.29472
+214 0.47698 0.30694
+213 0.47347 0.28894
+SURF 0x24
+mat 0
+refs 5
+210 0.40332 0.20218
+212 0.38351 0.20796
+210 0.40332 0.20218
+211 0.36980 0.19622
+209 0.40327 0.18757
+SURF 0x24
+mat 0
+refs 5
+206 0.45737 0.30590
+208 0.45140 0.28977
+206 0.45737 0.30590
+207 0.47604 0.28805
+205 0.47499 0.30607
+SURF 0x24
+mat 0
+refs 8
+203 0.45193 0.32146
+204 0.43436 0.31164
+203 0.45193 0.32146
+201 0.44783 0.29271
+202 0.45790 0.30631
+201 0.44783 0.29271
+200 0.47480 0.30600
+199 0.47083 0.28392
+SURF 0x24
+mat 0
+refs 5
+196 0.40332 0.20218
+198 0.38351 0.20796
+196 0.40332 0.20218
+197 0.37428 0.19595
+195 0.40327 0.18782
+SURF 0x24
+mat 0
+refs 5
+192 0.45737 0.30590
+194 0.45415 0.29331
+192 0.45737 0.30590
+193 0.47897 0.29146
+191 0.47499 0.30607
+SURF 0x24
+mat 0
+refs 8
+189 0.45193 0.32146
+190 0.43689 0.31535
+189 0.45193 0.32146
+187 0.45054 0.29627
+188 0.45790 0.30631
+187 0.45054 0.29627
+186 0.47480 0.30600
+185 0.47374 0.28734
+SURF 0x24
+mat 0
+refs 8
+183 0.45504 0.32487
+184 0.43962 0.31821
+183 0.45504 0.32487
+181 0.45302 0.29950
+182 0.45862 0.30721
+181 0.45302 0.29950
+180 0.47680 0.30927
+179 0.47578 0.29073
+SURF 0x24
+mat 0
+refs 5
+176 0.40332 0.20379
+178 0.38688 0.20907
+176 0.40332 0.20379
+177 0.37564 0.19887
+175 0.40330 0.19065
+SURF 0x24
+mat 0
+refs 5
+172 0.46006 0.31340
+174 0.45267 0.29822
+172 0.46006 0.31340
+173 0.47746 0.29430
+171 0.47614 0.30943
+SURF 0x24
+mat 0
+refs 8
+169 0.38641 0.23522
+170 0.37428 0.24074
+169 0.38641 0.23522
+167 0.36749 0.22153
+168 0.37451 0.22169
+167 0.36749 0.22153
+166 0.38716 0.20846
+165 0.37428 0.20106
+SURF 0x24
+mat 0
+refs 8
+163 0.38031 0.22428
+164 0.36625 0.22110
+163 0.38031 0.22428
+161 0.37814 0.20178
+162 0.38688 0.20907
+161 0.37814 0.20178
+160 0.40332 0.20379
+159 0.40330 0.19443
+SURF 0x24
+mat 0
+refs 8
+157 0.38989 0.23260
+158 0.37970 0.23974
+157 0.38989 0.23260
+155 0.37345 0.22146
+156 0.37844 0.22163
+155 0.37345 0.22146
+154 0.39093 0.21113
+153 0.37970 0.20380
+SURF 0x24
+mat 0
+refs 8
+151 0.37971 0.22193
+152 0.37397 0.21787
+151 0.37971 0.22193
+149 0.38347 0.20491
+150 0.39059 0.21111
+149 0.38347 0.20491
+148 0.40332 0.20649
+147 0.40330 0.19862
+SURF 0x24
+mat 0
+refs 8
+145 0.38717 0.22190
+146 0.38114 0.21963
+145 0.38717 0.22190
+143 0.38915 0.21291
+144 0.39525 0.21420
+143 0.38915 0.21291
+142 0.40333 0.21103
+141 0.40324 0.20788
+SURF 0x24
+mat 0
+refs 8
+139 0.39551 0.22957
+140 0.38801 0.23028
+139 0.39551 0.22957
+137 0.38454 0.22127
+138 0.38711 0.22183
+137 0.38454 0.22127
+136 0.40085 0.21675
+135 0.38801 0.21375
+SURF 0x24
+mat 0
+refs 5
+132 0.40333 0.24401
+134 0.40333 0.25076
+132 0.40333 0.24401
+133 0.37288 0.24460
+131 0.38045 0.23777
+SURF 0x24
+mat 0
+refs 5
+128 0.45514 0.30278
+130 0.44941 0.32167
+128 0.45514 0.30278
+129 0.43939 0.31978
+127 0.44339 0.29665
+SURF 0x24
+mat 0
+refs 5
+124 0.40333 0.24331
+126 0.40333 0.25607
+124 0.40333 0.24331
+125 0.36881 0.24774
+123 0.38268 0.23686
+SURF 0x24
+mat 0
+refs 5
+120 0.45673 0.30522
+122 0.45148 0.32289
+120 0.45673 0.30522
+121 0.43442 0.31844
+119 0.44032 0.29386
+SURF 0x24
+mat 0
+refs 5
+116 0.40332 0.24170
+118 0.40326 0.25631
+116 0.40332 0.24170
+117 0.36980 0.24765
+115 0.38351 0.23591
+SURF 0x24
+mat 0
+refs 5
+112 0.45729 0.30596
+114 0.45274 0.32298
+112 0.45729 0.30596
+113 0.43509 0.31917
+111 0.44334 0.29589
+SURF 0x24
+mat 0
+refs 5
+108 0.40332 0.24170
+110 0.40326 0.25605
+108 0.40332 0.24170
+109 0.37428 0.24792
+107 0.38351 0.23591
+SURF 0x24
+mat 0
+refs 5
+104 0.45729 0.30596
+106 0.45274 0.32298
+104 0.45729 0.30596
+105 0.43759 0.32290
+103 0.44602 0.29949
+SURF 0x24
+mat 0
+refs 5
+100 0.40332 0.24009
+102 0.40330 0.25322
+100 0.40332 0.24009
+101 0.37564 0.24500
+99 0.38688 0.23480
+SURF 0x24
+mat 0
+refs 5
+96 0.46380 0.31056
+98 0.45566 0.32499
+96 0.46380 0.31056
+97 0.44074 0.32221
+95 0.45115 0.29937
+SURF 0x24
+mat 0
+refs 7
+93 0.36625 0.22277
+94 0.38031 0.21959
+91 0.37814 0.24209
+89 0.38688 0.23480
+91 0.37814 0.24209
+90 0.40332 0.24009
+92 0.40330 0.24944
+SURF 0x24
+mat 0
+refs 7
+87 0.37397 0.22600
+88 0.37971 0.22194
+85 0.38347 0.23896
+83 0.39059 0.23276
+85 0.38347 0.23896
+84 0.40332 0.23738
+86 0.40330 0.24525
+SURF 0x24
+mat 0
+refs 7
+81 0.38114 0.22424
+82 0.38717 0.22197
+79 0.38915 0.23096
+77 0.39525 0.22967
+79 0.38915 0.23096
+78 0.40333 0.23284
+80 0.40324 0.23599
+SURF 0x24
+mat 0
+refs 34
+66 0.35987 0.42764
+72 0.37036 0.45094
+66 0.35987 0.42764
+73 0.37572 0.43707
+67 0.36468 0.41521
+74 0.38774 0.42602
+68 0.37545 0.40531
+75 0.40320 0.42076
+69 0.38930 0.40059
+76 0.41795 0.42270
+69 0.38930 0.40059
+70 0.40252 0.40233
+63 0.38071 0.39759
+70 0.40252 0.40233
+64 0.38851 0.39862
+71 0.41157 0.41005
+64 0.38851 0.39862
+54 0.39385 0.40317
+53 0.37596 0.40616
+52 0.39529 0.41005
+53 0.37596 0.40616
+55 0.39245 0.41739
+53 0.37596 0.40616
+56 0.38609 0.42323
+53 0.37596 0.40616
+57 0.37791 0.42602
+53 0.37596 0.40616
+58 0.37010 0.42499
+53 0.37596 0.40616
+59 0.36477 0.42043
+60 0.36332 0.41356
+59 0.36477 0.42043
+66 0.35987 0.42764
+65 0.36231 0.43928
+SURF 0x24
+mat 0
+refs 12
+60 0.36332 0.41356
+66 0.35987 0.42764
+60 0.36332 0.41356
+67 0.36468 0.41521
+61 0.36616 0.40622
+68 0.37545 0.40531
+62 0.37253 0.40038
+69 0.38930 0.40059
+62 0.37253 0.40038
+63 0.38071 0.39759
+53 0.37596 0.40616
+64 0.38851 0.39862
+SURF 0x24
+mat 0
+refs 4
+62 0.37253 0.40038
+53 0.37596 0.40616
+61 0.36616 0.40622
+60 0.36332 0.41356
+SURF 0x24
+mat 0
+refs 19
+51 0.31512 0.36992
+50 0.34050 0.36705
+51 0.31512 0.36992
+41 0.35306 0.36277
+27 0.32637 0.36608
+42 0.36561 0.36705
+28 0.33762 0.36992
+43 0.37480 0.37874
+31 0.34586 0.38040
+44 0.37817 0.39472
+33 0.34887 0.39472
+45 0.37480 0.41069
+35 0.34586 0.40904
+46 0.36561 0.42239
+37 0.33762 0.41952
+47 0.35306 0.42667
+39 0.32637 0.42336
+48 0.34050 0.42239
+49 0.31512 0.41952
+SURF 0x24
+mat 0
+refs 15
+29 0.31142 0.37781
+27 0.32637 0.36608
+29 0.31142 0.37781
+28 0.33762 0.36992
+30 0.31806 0.38008
+31 0.34586 0.38040
+32 0.32293 0.38627
+33 0.34887 0.39472
+34 0.32471 0.39472
+35 0.34586 0.40904
+36 0.32293 0.40317
+37 0.33762 0.41952
+38 0.31806 0.40936
+39 0.32637 0.42336
+40 0.31142 0.41163
+SURF 0x24
+mat 0
+refs 12
+22 0.40860 0.35760
+26 0.38617 0.37982
+22 0.40860 0.35760
+25 0.37779 0.36867
+23 0.40289 0.33253
+24 0.38868 0.35103
+23 0.40289 0.33253
+17 0.39710 0.34146
+12 0.42226 0.31640
+17 0.39710 0.34146
+18 0.42676 0.33337
+19 0.39778 0.34884
+SURF 0x24
+mat 0
+refs 32
+14 0.41985 0.34580
+22 0.40860 0.35760
+14 0.41985 0.34580
+23 0.40289 0.33253
+13 0.42067 0.31616
+12 0.42226 0.31640
+10 0.44515 0.29489
+12 0.42226 0.31640
+9 0.44668 0.29837
+18 0.42676 0.33337
+9 0.44668 0.29837
+20 0.45251 0.32129
+4 0.47394 0.27635
+21 0.47063 0.29747
+5 0.48540 0.27449
+16 0.47905 0.28932
+5 0.48540 0.27449
+15 0.47064 0.30029
+5 0.48540 0.27449
+6 0.47291 0.28710
+3 0.49361 0.26653
+7 0.47592 0.28485
+3 0.49361 0.26653
+8 0.47330 0.30569
+3 0.49361 0.26653
+2 0.48930 0.28471
+1 0.47642 0.27319
+0 0.47472 0.29362
+10 0.44515 0.29489
+11 0.44223 0.32610
+13 0.42067 0.31616
+14 0.41985 0.34580
+SURF 0x24
+mat 0
+refs 6
+10 0.44515 0.29489
+9 0.44668 0.29837
+1 0.47642 0.27319
+4 0.47394 0.27635
+3 0.49361 0.26653
+5 0.48540 0.27449
+SURF 0x24
+mat 0
+refs 88
+529 0.59962 0.48966
+533 0.55076 0.37720
+529 0.59962 0.48966
+535 0.52901 0.39466
+534 0.58292 0.49637
+535 0.52901 0.39466
+539 0.56404 0.50611
+538 0.53486 0.39651
+551 0.56917 0.50296
+547 0.54747 0.39057
+552 0.59460 0.48600
+547 0.54747 0.39057
+553 0.57520 0.37877
+562 0.56493 0.35240
+553 0.57520 0.37877
+578 0.58228 0.34315
+576 0.59406 0.36911
+578 0.58228 0.34315
+564 0.53797 0.43597
+577 0.57171 0.31661
+565 0.52846 0.41375
+579 0.50138 0.39955
+589 0.52160 0.38792
+484 0.48679 0.36753
+485 0.51263 0.35259
+475 0.56043 0.32510
+589 0.52160 0.38792
+587 0.56339 0.36180
+565 0.52846 0.41375
+557 0.56045 0.39182
+564 0.53797 0.43597
+557 0.56045 0.39182
+555 0.56423 0.41424
+556 0.56067 0.38751
+550 0.56394 0.40929
+567 0.55491 0.38931
+546 0.55677 0.41262
+566 0.50682 0.41710
+541 0.51021 0.42832
+558 0.54327 0.32543
+541 0.51021 0.42832
+540 0.54968 0.33727
+537 0.58943 0.35805
+540 0.54968 0.33727
+532 0.56837 0.36881
+543 0.53183 0.34744
+533 0.55076 0.37720
+542 0.51157 0.37113
+535 0.52901 0.39466
+544 0.51856 0.37088
+538 0.53486 0.39651
+548 0.53320 0.36530
+547 0.54747 0.39057
+548 0.53320 0.36530
+562 0.56493 0.35240
+561 0.51841 0.34813
+562 0.56493 0.35240
+563 0.55730 0.32956
+578 0.58228 0.34315
+563 0.55730 0.32956
+577 0.57171 0.31661
+563 0.55730 0.32956
+579 0.50138 0.39955
+580 0.48701 0.40781
+579 0.50138 0.39955
+483 0.46666 0.37916
+484 0.48679 0.36753
+483 0.46666 0.37916
+482 0.41626 0.40829
+580 0.48701 0.40781
+571 0.49864 0.33054
+563 0.55730 0.32956
+571 0.49864 0.33054
+561 0.51841 0.34813
+572 0.48177 0.33852
+561 0.51841 0.34813
+570 0.50381 0.35531
+548 0.53320 0.36530
+570 0.50381 0.35531
+544 0.51856 0.37088
+560 0.49843 0.35700
+542 0.51157 0.37113
+560 0.49843 0.35700
+543 0.53183 0.34744
+559 0.52391 0.33714
+543 0.53183 0.34744
+558 0.54327 0.32543
+540 0.54968 0.33727
+SURF 0x24
+mat 0
+refs 41
+559 0.52391 0.33714
+558 0.54327 0.32543
+568 0.47464 0.39966
+566 0.50682 0.41710
+569 0.50796 0.38367
+567 0.55491 0.38931
+583 0.56147 0.35640
+556 0.56067 0.38751
+582 0.56773 0.35483
+557 0.56045 0.39182
+582 0.56773 0.35483
+587 0.56339 0.36180
+474 0.56350 0.32319
+475 0.56043 0.32510
+476 0.54808 0.33224
+484 0.48679 0.36753
+480 0.40356 0.41563
+482 0.41626 0.40829
+481 0.39642 0.41976
+571 0.49864 0.33054
+481 0.39642 0.41976
+572 0.48177 0.33852
+480 0.40356 0.41563
+572 0.48177 0.33852
+581 0.48243 0.33721
+570 0.50381 0.35531
+581 0.48243 0.33721
+560 0.49843 0.35700
+581 0.48243 0.33721
+559 0.52391 0.33714
+588 0.50866 0.31456
+568 0.47464 0.39966
+479 0.43511 0.39740
+568 0.47464 0.39966
+478 0.46802 0.37837
+569 0.50796 0.38367
+477 0.49874 0.36062
+583 0.56147 0.35640
+476 0.54808 0.33224
+582 0.56773 0.35483
+474 0.56350 0.32319
+SURF 0x24
+mat 0
+refs 8
+477 0.49874 0.36062
+476 0.54808 0.33224
+478 0.46802 0.37837
+480 0.40356 0.41563
+479 0.43511 0.39740
+480 0.40356 0.41563
+588 0.50866 0.31456
+581 0.48243 0.33721
+SURF 0x24
+mat 0
+refs 84
+1398 0.38175 0.26849
+1330 0.37769 0.30512
+1328 0.38034 0.26924
+1329 0.37613 0.30080
+1318 0.37246 0.29730
+1317 0.37348 0.30998
+1283 0.37749 0.32055
+1317 0.37348 0.30998
+1267 0.37077 0.32114
+1317 0.37348 0.30998
+1321 0.36862 0.31066
+1329 0.37613 0.30080
+1321 0.36862 0.31066
+1330 0.37769 0.30512
+1331 0.37084 0.29531
+1330 0.37769 0.30512
+1399 0.37606 0.26287
+1398 0.38175 0.26849
+1404 0.38203 0.23507
+1400 0.38739 0.23809
+1405 0.37403 0.20622
+1400 0.38739 0.23809
+1403 0.37264 0.19459
+1400 0.38739 0.23809
+1402 0.37627 0.20792
+1401 0.38599 0.24155
+1413 0.36715 0.19814
+1412 0.37189 0.24155
+1436 0.36718 0.19438
+1411 0.37039 0.24397
+1441 0.38218 0.20908
+1410 0.39191 0.26007
+1441 0.38218 0.20908
+1440 0.39649 0.23848
+1490 0.37517 0.18364
+1439 0.39787 0.22685
+1490 0.37517 0.18364
+1437 0.39189 0.23168
+1438 0.37344 0.20065
+1437 0.39189 0.23168
+1407 0.37964 0.24616
+1406 0.40346 0.27574
+1396 0.38178 0.27589
+1395 0.40355 0.28896
+1323 0.38437 0.29200
+1324 0.40364 0.30206
+1266 0.38848 0.32330
+1324 0.40364 0.30206
+1271 0.39856 0.32020
+1326 0.41052 0.30683
+1271 0.39856 0.32020
+1290 0.40210 0.32057
+1288 0.41409 0.29618
+1290 0.40210 0.32057
+1289 0.40188 0.32175
+1290 0.40210 0.32057
+1325 0.40935 0.30821
+1326 0.41052 0.30683
+1397 0.40955 0.29938
+1326 0.41052 0.30683
+1394 0.41058 0.29527
+1324 0.40364 0.30206
+1394 0.41058 0.29527
+1395 0.40355 0.28896
+1408 0.41069 0.27970
+1406 0.40346 0.27574
+1408 0.41069 0.27970
+1437 0.39189 0.23168
+1408 0.41069 0.27970
+1439 0.39787 0.22685
+1408 0.41069 0.27970
+1440 0.39649 0.23848
+1409 0.40991 0.28426
+1410 0.39191 0.26007
+1393 0.39483 0.29092
+1410 0.39191 0.26007
+1392 0.37278 0.28176
+1411 0.37039 0.24397
+1327 0.37155 0.27090
+1412 0.37189 0.24155
+1328 0.38034 0.26924
+1401 0.38599 0.24155
+1398 0.38175 0.26849
+1400 0.38739 0.23809
+SURF 0x24
+mat 0
+refs 18
+1328 0.38034 0.26924
+1318 0.37246 0.29730
+1327 0.37155 0.27090
+1319 0.37367 0.29398
+1392 0.37278 0.28176
+1319 0.37367 0.29398
+1393 0.39483 0.29092
+1320 0.39671 0.30475
+1397 0.40955 0.29938
+1320 0.39671 0.30475
+1325 0.40935 0.30821
+1320 0.39671 0.30475
+1289 0.40188 0.32175
+1320 0.39671 0.30475
+1286 0.39312 0.32155
+1319 0.37367 0.29398
+1283 0.37749 0.32055
+1318 0.37246 0.29730
+SURF 0x24
+mat 0
+refs 5
+1393 0.39483 0.29092
+1397 0.40955 0.29938
+1409 0.40991 0.28426
+1394 0.41058 0.29527
+1408 0.41069 0.27970
+SURF 0x24
+mat 0
+refs 24
+1715 0.52711 0.28896
+1726 0.53677 0.31977
+1719 0.53325 0.28922
+1730 0.54353 0.32154
+1721 0.54259 0.27889
+1729 0.56002 0.30816
+1721 0.54259 0.27889
+1732 0.55481 0.25651
+1721 0.54259 0.27889
+1722 0.54189 0.24713
+1720 0.53025 0.26506
+1714 0.46925 0.23258
+1720 0.53025 0.26506
+1709 0.46377 0.24102
+1708 0.52232 0.27278
+1705 0.46055 0.24316
+1708 0.52232 0.27278
+1704 0.51551 0.27185
+1708 0.52232 0.27278
+1715 0.52711 0.28896
+1708 0.52232 0.27278
+1719 0.53325 0.28922
+1720 0.53025 0.26506
+1721 0.54259 0.27889
+SURF 0x24
+mat 0
+refs 8
+1874 0.43378 0.32370
+1851 0.39406 0.30763
+1874 0.43378 0.32370
+1852 0.42982 0.30062
+1875 0.46648 0.31560
+1852 0.42982 0.30062
+1853 0.46713 0.29331
+1851 0.39406 0.30763
+SURF 0x24
+mat 0
+refs 15
+2225 0.47967 0.62243
+2180 0.49342 0.63026
+2190 0.46173 0.62926
+2181 0.47102 0.63468
+2190 0.46173 0.62926
+2187 0.45825 0.63618
+2190 0.46173 0.62926
+2189 0.44020 0.63196
+2190 0.46173 0.62926
+2192 0.43662 0.61614
+2190 0.46173 0.62926
+2191 0.44866 0.61303
+2190 0.46173 0.62926
+2228 0.46325 0.60834
+2225 0.47967 0.62243
+SURF 0x24
+mat 0
+refs 60
+2529 0.48171 0.58408
+2524 0.43802 0.57883
+2528 0.46222 0.60087
+2527 0.43209 0.59145
+2528 0.46222 0.60087
+2530 0.44499 0.61413
+2577 0.45693 0.61955
+2530 0.44499 0.61413
+2578 0.44824 0.62328
+2532 0.43778 0.61837
+2578 0.44824 0.62328
+2579 0.44494 0.62062
+2598 0.45852 0.62729
+2575 0.45881 0.61081
+2599 0.48803 0.62112
+2576 0.47639 0.59465
+2590 0.51168 0.60835
+2535 0.48676 0.59810
+2589 0.51325 0.61073
+2534 0.48457 0.60677
+2582 0.50732 0.62353
+2574 0.48466 0.60836
+2573 0.50988 0.62625
+2541 0.51487 0.62266
+2543 0.54441 0.62751
+2541 0.51487 0.62266
+2544 0.56462 0.62054
+2542 0.53239 0.60677
+2581 0.56857 0.62125
+2592 0.53475 0.60379
+2581 0.56857 0.62125
+2593 0.54972 0.62932
+2581 0.56857 0.62125
+2586 0.56442 0.63803
+2581 0.56857 0.62125
+2580 0.58251 0.63332
+2544 0.56462 0.62054
+2546 0.57163 0.62980
+2543 0.54441 0.62751
+2545 0.55555 0.63114
+2573 0.50988 0.62625
+2591 0.54192 0.62884
+2582 0.50732 0.62353
+2584 0.55463 0.62466
+2589 0.51325 0.61073
+2583 0.55803 0.62627
+2590 0.51168 0.60835
+2585 0.53840 0.63371
+2599 0.48803 0.62112
+2587 0.50570 0.63434
+2598 0.45852 0.62729
+2597 0.46232 0.62992
+2578 0.44824 0.62328
+2597 0.46232 0.62992
+2577 0.45693 0.61955
+2596 0.46896 0.62502
+2577 0.45693 0.61955
+2572 0.47793 0.60528
+2528 0.46222 0.60087
+2529 0.48171 0.58408
+SURF 0x24
+mat 0
+refs 11
+2586 0.56442 0.63803
+2587 0.50570 0.63434
+2586 0.56442 0.63803
+2585 0.53840 0.63371
+2580 0.58251 0.63332
+2583 0.55803 0.62627
+2580 0.58251 0.63332
+2584 0.55463 0.62466
+2546 0.57163 0.62980
+2591 0.54192 0.62884
+2545 0.55555 0.63114
+SURF 0x24
+mat 0
+refs 75
+1526 0.50334 0.56759
+1528 0.47265 0.54415
+1526 0.50334 0.56759
+1538 0.48423 0.55063
+1525 0.51664 0.56671
+1537 0.49907 0.54965
+1524 0.52930 0.55938
+1536 0.51320 0.54147
+1523 0.53794 0.54757
+1535 0.52283 0.52829
+1522 0.54022 0.53443
+1534 0.52538 0.51363
+1521 0.53556 0.52350
+1533 0.52017 0.50144
+1520 0.52518 0.51770
+1532 0.50860 0.49496
+1519 0.51188 0.51858
+1531 0.49376 0.49594
+1518 0.49921 0.52591
+1530 0.47963 0.50412
+1517 0.49058 0.53772
+1529 0.47000 0.51730
+1515 0.48829 0.55085
+1527 0.46744 0.53196
+1516 0.49296 0.56179
+1528 0.47265 0.54415
+1516 0.49296 0.56179
+1526 0.50334 0.56759
+1514 0.51780 0.56849
+1526 0.50334 0.56759
+1513 0.52566 0.56797
+1525 0.51664 0.56671
+1512 0.53314 0.56365
+1524 0.52930 0.55938
+1511 0.53823 0.55667
+1523 0.53794 0.54757
+1510 0.53959 0.54892
+1522 0.54022 0.53443
+1509 0.53683 0.54246
+1521 0.53556 0.52350
+1508 0.53070 0.53903
+1520 0.52518 0.51770
+1507 0.52285 0.53955
+1519 0.51188 0.51858
+1506 0.51537 0.54388
+1518 0.49921 0.52591
+1505 0.51027 0.55086
+1517 0.49058 0.53772
+1504 0.50892 0.55861
+1515 0.48829 0.55085
+1502 0.51168 0.56507
+1516 0.49296 0.56179
+1502 0.51168 0.56507
+1514 0.51780 0.56849
+1503 0.52864 0.55864
+1513 0.52566 0.56797
+1503 0.52864 0.55864
+1512 0.53314 0.56365
+1503 0.52864 0.55864
+1511 0.53823 0.55667
+1503 0.52864 0.55864
+1510 0.53959 0.54892
+1503 0.52864 0.55864
+1509 0.53683 0.54246
+1503 0.52864 0.55864
+1508 0.53070 0.53903
+1503 0.52864 0.55864
+1507 0.52285 0.53955
+1503 0.52864 0.55864
+1506 0.51537 0.54388
+1503 0.52864 0.55864
+1505 0.51027 0.55086
+1503 0.52864 0.55864
+1504 0.50892 0.55861
+1502 0.51168 0.56507
+kids 0
diff --git a/test/models/FBX/maxPbrMaterial_metalRough.fbx b/test/models/FBX/maxPbrMaterial_metalRough.fbx
new file mode 100644
index 000000000..a66275269
--- /dev/null
+++ b/test/models/FBX/maxPbrMaterial_metalRough.fbx
@@ -0,0 +1,618 @@
+; FBX 7.7.0 project file
+; ----------------------------------------------------
+
+FBXHeaderExtension:  {
+	FBXHeaderVersion: 1004
+	FBXVersion: 7700
+	CreationTimeStamp:  {
+		Version: 1000
+		Year: 2020
+		Month: 12
+		Day: 1
+		Hour: 9
+		Minute: 35
+		Second: 57
+		Millisecond: 532
+	}
+	Creator: "FBX SDK/FBX Plugins version 2020.0.1"
+	OtherFlags:  {
+		TCDefinition: 127
+	}
+	SceneInfo: "SceneInfo::GlobalInfo", "UserData" {
+		Type: "UserData"
+		Version: 100
+		MetaData:  {
+			Version: 100
+			Title: ""
+			Subject: ""
+			Author: ""
+			Keywords: ""
+			Revision: ""
+			Comment: ""
+		}
+		Properties70:  {
+			P: "DocumentUrl", "KString", "Url", "", "G:\Temp\Max2021PbrMaterials\MaxPbrMaterial.fbx"
+			P: "SrcDocumentUrl", "KString", "Url", "", "G:\Temp\Max2021PbrMaterials\MaxPbrMaterial.fbx"
+			P: "Original", "Compound", "", ""
+			P: "Original|ApplicationVendor", "KString", "", "", "Autodesk"
+			P: "Original|ApplicationName", "KString", "", "", "3ds Max"
+			P: "Original|ApplicationVersion", "KString", "", "", "2021"
+			P: "Original|DateTime_GMT", "DateTime", "", "", "01/12/2020 09:35:57.532"
+			P: "Original|FileName", "KString", "", "", "G:\Temp\Max2021PbrMaterials\MaxPbrMaterial.fbx"
+			P: "LastSaved", "Compound", "", ""
+			P: "LastSaved|ApplicationVendor", "KString", "", "", "Autodesk"
+			P: "LastSaved|ApplicationName", "KString", "", "", "3ds Max"
+			P: "LastSaved|ApplicationVersion", "KString", "", "", "2021"
+			P: "LastSaved|DateTime_GMT", "DateTime", "", "", "01/12/2020 09:35:57.532"
+			P: "Original|ApplicationActiveProject", "KString", "", "", "C:\3ds Max 2021"
+			P: "Original|ApplicationNativeFile", "KString", "", "", "C;\3ds Max 2021\MaxPbrMaterial.max"
+		}
+	}
+}
+GlobalSettings:  {
+	Version: 1000
+	Properties70:  {
+		P: "UpAxis", "int", "Integer", "",1
+		P: "UpAxisSign", "int", "Integer", "",1
+		P: "FrontAxis", "int", "Integer", "",2
+		P: "FrontAxisSign", "int", "Integer", "",1
+		P: "CoordAxis", "int", "Integer", "",0
+		P: "CoordAxisSign", "int", "Integer", "",1
+		P: "OriginalUpAxis", "int", "Integer", "",2
+		P: "OriginalUpAxisSign", "int", "Integer", "",1
+		P: "UnitScaleFactor", "double", "Number", "",100
+		P: "OriginalUnitScaleFactor", "double", "Number", "",100.00000066
+		P: "AmbientColor", "ColorRGB", "Color", "",0,0,0
+		P: "DefaultCamera", "KString", "", "", "Producer Perspective"
+		P: "TimeMode", "enum", "", "",6
+		P: "TimeProtocol", "enum", "", "",2
+		P: "SnapOnFrameMode", "enum", "", "",0
+		P: "TimeSpanStart", "KTime", "Time", "",0
+		P: "TimeSpanStop", "KTime", "Time", "",153953860000
+		P: "CustomFrameRate", "double", "Number", "",-1
+		P: "TimeMarker", "Compound", "", ""
+		P: "CurrentTimeMarker", "int", "Integer", "",-1
+	}
+}
+
+; Documents Description
+;------------------------------------------------------------------
+
+Documents:  {
+	Count: 1
+	Document: 2188301813872, "", "Scene" {
+		Properties70:  {
+			P: "SourceObject", "object", "", ""
+			P: "ActiveAnimStackName", "KString", "", "", ""
+		}
+		RootNode: 0
+	}
+}
+
+; Document References
+;------------------------------------------------------------------
+
+References:  {
+}
+
+; Object definitions
+;------------------------------------------------------------------
+
+Definitions:  {
+	Version: 100
+	Count: 18
+	ObjectType: "GlobalSettings" {
+		Count: 1
+	}
+	ObjectType: "Model" {
+		Count: 1
+		PropertyTemplate: "FbxNode" {
+			Properties70:  {
+				P: "QuaternionInterpolate", "enum", "", "",0
+				P: "RotationOffset", "Vector3D", "Vector", "",0,0,0
+				P: "RotationPivot", "Vector3D", "Vector", "",0,0,0
+				P: "ScalingOffset", "Vector3D", "Vector", "",0,0,0
+				P: "ScalingPivot", "Vector3D", "Vector", "",0,0,0
+				P: "TranslationActive", "bool", "", "",0
+				P: "TranslationMin", "Vector3D", "Vector", "",0,0,0
+				P: "TranslationMax", "Vector3D", "Vector", "",0,0,0
+				P: "TranslationMinX", "bool", "", "",0
+				P: "TranslationMinY", "bool", "", "",0
+				P: "TranslationMinZ", "bool", "", "",0
+				P: "TranslationMaxX", "bool", "", "",0
+				P: "TranslationMaxY", "bool", "", "",0
+				P: "TranslationMaxZ", "bool", "", "",0
+				P: "RotationOrder", "enum", "", "",0
+				P: "RotationSpaceForLimitOnly", "bool", "", "",0
+				P: "RotationStiffnessX", "double", "Number", "",0
+				P: "RotationStiffnessY", "double", "Number", "",0
+				P: "RotationStiffnessZ", "double", "Number", "",0
+				P: "AxisLen", "double", "Number", "",10
+				P: "PreRotation", "Vector3D", "Vector", "",0,0,0
+				P: "PostRotation", "Vector3D", "Vector", "",0,0,0
+				P: "RotationActive", "bool", "", "",0
+				P: "RotationMin", "Vector3D", "Vector", "",0,0,0
+				P: "RotationMax", "Vector3D", "Vector", "",0,0,0
+				P: "RotationMinX", "bool", "", "",0
+				P: "RotationMinY", "bool", "", "",0
+				P: "RotationMinZ", "bool", "", "",0
+				P: "RotationMaxX", "bool", "", "",0
+				P: "RotationMaxY", "bool", "", "",0
+				P: "RotationMaxZ", "bool", "", "",0
+				P: "InheritType", "enum", "", "",0
+				P: "ScalingActive", "bool", "", "",0
+				P: "ScalingMin", "Vector3D", "Vector", "",0,0,0
+				P: "ScalingMax", "Vector3D", "Vector", "",1,1,1
+				P: "ScalingMinX", "bool", "", "",0
+				P: "ScalingMinY", "bool", "", "",0
+				P: "ScalingMinZ", "bool", "", "",0
+				P: "ScalingMaxX", "bool", "", "",0
+				P: "ScalingMaxY", "bool", "", "",0
+				P: "ScalingMaxZ", "bool", "", "",0
+				P: "GeometricTranslation", "Vector3D", "Vector", "",0,0,0
+				P: "GeometricRotation", "Vector3D", "Vector", "",0,0,0
+				P: "GeometricScaling", "Vector3D", "Vector", "",1,1,1
+				P: "MinDampRangeX", "double", "Number", "",0
+				P: "MinDampRangeY", "double", "Number", "",0
+				P: "MinDampRangeZ", "double", "Number", "",0
+				P: "MaxDampRangeX", "double", "Number", "",0
+				P: "MaxDampRangeY", "double", "Number", "",0
+				P: "MaxDampRangeZ", "double", "Number", "",0
+				P: "MinDampStrengthX", "double", "Number", "",0
+				P: "MinDampStrengthY", "double", "Number", "",0
+				P: "MinDampStrengthZ", "double", "Number", "",0
+				P: "MaxDampStrengthX", "double", "Number", "",0
+				P: "MaxDampStrengthY", "double", "Number", "",0
+				P: "MaxDampStrengthZ", "double", "Number", "",0
+				P: "PreferedAngleX", "double", "Number", "",0
+				P: "PreferedAngleY", "double", "Number", "",0
+				P: "PreferedAngleZ", "double", "Number", "",0
+				P: "LookAtProperty", "object", "", ""
+				P: "UpVectorProperty", "object", "", ""
+				P: "Show", "bool", "", "",1
+				P: "NegativePercentShapeSupport", "bool", "", "",1
+				P: "DefaultAttributeIndex", "int", "Integer", "",-1
+				P: "Freeze", "bool", "", "",0
+				P: "LODBox", "bool", "", "",0
+				P: "Lcl Translation", "Lcl Translation", "", "A",0,0,0
+				P: "Lcl Rotation", "Lcl Rotation", "", "A",0,0,0
+				P: "Lcl Scaling", "Lcl Scaling", "", "A",1,1,1
+				P: "Visibility", "Visibility", "", "A",1
+				P: "Visibility Inheritance", "Visibility Inheritance", "", "",1
+			}
+		}
+	}
+	ObjectType: "Geometry" {
+		Count: 1
+		PropertyTemplate: "FbxMesh" {
+			Properties70:  {
+				P: "Color", "ColorRGB", "Color", "",0.8,0.8,0.8
+				P: "BBoxMin", "Vector3D", "Vector", "",0,0,0
+				P: "BBoxMax", "Vector3D", "Vector", "",0,0,0
+				P: "Primary Visibility", "bool", "", "",1
+				P: "Casts Shadows", "bool", "", "",1
+				P: "Receive Shadows", "bool", "", "",1
+			}
+		}
+	}
+	ObjectType: "Material" {
+		Count: 1
+		PropertyTemplate: "FbxSurfaceMaterial" {
+			Properties70:  {
+				P: "ShadingModel", "KString", "", "", "Unknown"
+				P: "MultiLayer", "bool", "", "",0
+			}
+		}
+	}
+	ObjectType: "Texture" {
+		Count: 7
+		PropertyTemplate: "FbxFileTexture" {
+			Properties70:  {
+				P: "TextureTypeUse", "enum", "", "",0
+				P: "Texture alpha", "Number", "", "A",1
+				P: "CurrentMappingType", "enum", "", "",0
+				P: "WrapModeU", "enum", "", "",0
+				P: "WrapModeV", "enum", "", "",0
+				P: "UVSwap", "bool", "", "",0
+				P: "PremultiplyAlpha", "bool", "", "",1
+				P: "Translation", "Vector", "", "A",0,0,0
+				P: "Rotation", "Vector", "", "A",0,0,0
+				P: "Scaling", "Vector", "", "A",1,1,1
+				P: "TextureRotationPivot", "Vector3D", "Vector", "",0,0,0
+				P: "TextureScalingPivot", "Vector3D", "Vector", "",0,0,0
+				P: "CurrentTextureBlendMode", "enum", "", "",1
+				P: "UVSet", "KString", "", "", "default"
+				P: "UseMaterial", "bool", "", "",0
+				P: "UseMipMap", "bool", "", "",0
+			}
+		}
+	}
+	ObjectType: "Video" {
+		Count: 7
+		PropertyTemplate: "FbxVideo" {
+			Properties70:  {
+				P: "Path", "KString", "XRefUrl", "", ""
+				P: "RelPath", "KString", "XRefUrl", "", ""
+				P: "Color", "ColorRGB", "Color", "",0.8,0.8,0.8
+				P: "ClipIn", "KTime", "Time", "",0
+				P: "ClipOut", "KTime", "Time", "",0
+				P: "Offset", "KTime", "Time", "",0
+				P: "PlaySpeed", "double", "Number", "",0
+				P: "FreeRunning", "bool", "", "",0
+				P: "Loop", "bool", "", "",0
+				P: "Mute", "bool", "", "",0
+				P: "AccessMode", "enum", "", "",0
+				P: "ImageSequence", "bool", "", "",0
+				P: "ImageSequenceOffset", "int", "Integer", "",0
+				P: "FrameRate", "double", "Number", "",0
+				P: "LastFrame", "int", "Integer", "",0
+				P: "Width", "int", "Integer", "",0
+				P: "Height", "int", "Integer", "",0
+				P: "StartFrame", "int", "Integer", "",0
+				P: "StopFrame", "int", "Integer", "",0
+				P: "InterlaceMode", "enum", "", "",0
+			}
+		}
+	}
+}
+
+; Object properties
+;------------------------------------------------------------------
+
+Objects:  {
+	Geometry: 2188426094640, "Geometry::", "Mesh" {
+		Properties70:  {
+			P: "Color", "ColorRGB", "Color", "",0.341176470588235,0.882352941176471,0.776470588235294
+		}
+		Vertices: *24 {
+			a: -8.91135215759277,-10.98219871521,0,8.91135215759277,-10.98219871521,0,-8.91135215759277,10.98219871521,0,8.91135215759277,10.98219871521,0,-8.91135215759277,-10.98219871521,16.787576675415,8.91135215759277,-10.98219871521,16.787576675415,-8.91135215759277,10.98219871521,16.787576675415,8.91135215759277,10.98219871521,16.787576675415
+		} 
+		PolygonVertexIndex: *24 {
+			a: 0,2,3,-2,4,5,7,-7,0,1,5,-5,1,3,7,-6,3,2,6,-8,2,0,4,-7
+		} 
+		Edges: *12 {
+			a: 0,1,2,3,4,5,6,7,9,11,13,17
+		} 
+		GeometryVersion: 124
+		LayerElementNormal: 0 {
+			Version: 102
+			Name: ""
+			MappingInformationType: "ByPolygonVertex"
+			ReferenceInformationType: "Direct"
+			Normals: *72 {
+				a: 0,0,-1,0,0,-1,0,0,-1,0,0,-1,0,0,1,0,0,1,0,0,1,0,0,1,0,-1,0,0,-1,0,0,-1,0,0,-1,0,1,0,0,1,0,0,1,0,0,1,0,0,0,1,0,0,1,0,0,1,0,0,1,0,-1,0,0,-1,0,0,-1,0,0,-1,0,0
+			} 
+			NormalsW: *24 {
+				a: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+			} 
+		}
+		LayerElementUV: 0 {
+			Version: 101
+			Name: "UVChannel_1"
+			MappingInformationType: "ByPolygonVertex"
+			ReferenceInformationType: "IndexToDirect"
+			UV: *48 {
+				a: 1,0,0,0,1,1,0,1,0,0,1,0,0,1,1,1,0,0,1,0,0,1,1,1,0,0,1,0,0,1,1,1,0,0,1,0,0,1,1,1,0,0,1,0,0,1,1,1
+			} 
+			UVIndex: *24 {
+				a: 0,2,3,1,4,5,7,6,8,9,11,10,12,13,15,14,16,17,19,18,20,21,23,22
+			} 
+		}
+		LayerElementMaterial: 0 {
+			Version: 101
+			Name: ""
+			MappingInformationType: "AllSame"
+			ReferenceInformationType: "IndexToDirect"
+			Materials: *1 {
+				a: 0
+			} 
+		}
+		Layer: 0 {
+			Version: 100
+			LayerElement:  {
+				Type: "LayerElementNormal"
+				TypedIndex: 0
+			}
+			LayerElement:  {
+				Type: "LayerElementMaterial"
+				TypedIndex: 0
+			}
+			LayerElement:  {
+				Type: "LayerElementUV"
+				TypedIndex: 0
+			}
+		}
+	}
+	Model: 2187845653184, "Model::Box001", "Mesh" {
+		Version: 232
+		Properties70:  {
+			P: "PreRotation", "Vector3D", "Vector", "",-90,-0,0
+			P: "RotationActive", "bool", "", "",1
+			P: "InheritType", "enum", "", "",1
+			P: "ScalingMax", "Vector3D", "Vector", "",0,0,0
+			P: "DefaultAttributeIndex", "int", "Integer", "",0
+			P: "Lcl Translation", "Lcl Translation", "", "A",0.570660591125488,0,-0.671265125274658
+			P: "MaxHandle", "int", "Integer", "UH",2
+		}
+		Shading: T
+		Culling: "CullingOff"
+	}
+	Material: 2188102329504, "Material::PBR Material", "" {
+		Version: 102
+		ShadingModel: "unknown"
+		MultiLayer: 0
+		Properties70:  {
+			P: "ShadingModel", "KString", "", "", "unknown"
+			P: "AmbientColor", "ColorRGB", "Color", "",0,1,1
+			P: "DiffuseColor", "ColorRGB", "Color", "",0,1,1
+			P: "SpecularColor", "ColorRGB", "Color", "",0.75,1,1
+			P: "SpecularFactor", "double", "Number", "",2.25
+			P: "ShininessExponent", "double", "Number", "",32
+			P: "TransparencyFactor", "double", "Number", "",0
+			P: "EmissiveColor", "ColorRGB", "Color", "",3.14159274101257,3.14159250259399,0
+			P: "EmissiveFactor", "double", "Number", "",1
+			P: "3dsMax", "Compound", "", ""
+			P: "3dsMax|ClassIDa", "int", "Integer", "",-804315648
+			P: "3dsMax|ClassIDb", "int", "Integer", "",-1099438848
+			P: "3dsMax|SuperClassID", "int", "Integer", "",3072
+			P: "3dsMax|settings", "Compound", "", ""
+			P: "3dsMax|settings|ao_affects_diffuse", "Bool", "", "A",1
+			P: "3dsMax|settings|ao_affects_reflection", "Bool", "", "A",1
+			P: "3dsMax|settings|normal_flip_red", "Bool", "", "A",0
+			P: "3dsMax|settings|normal_flip_green", "Bool", "", "A",0
+			P: "3dsMax|main", "Compound", "", ""
+			P: "3dsMax|main|basecolor", "ColorAndAlpha", "", "A",0,1,1,1
+			P: "3dsMax|main|base_color_map", "Reference", "", "A"
+			P: "3dsMax|main|metalness", "Float", "", "A",0.25
+			P: "3dsMax|main|metalness_map", "Reference", "", "A"
+			P: "3dsMax|main|roughness", "Float", "", "A",0.5
+			P: "3dsMax|main|roughness_map", "Reference", "", "A"
+			P: "3dsMax|main|useGlossiness", "Integer", "", "A",2
+			P: "3dsMax|main|ao_map", "Reference", "", "A"
+			P: "3dsMax|main|bump_map_amt", "Float", "", "A",0.75
+			P: "3dsMax|main|norm_map", "Reference", "", "A"
+			P: "3dsMax|main|emit_color", "ColorAndAlpha", "", "A",1,1,0,1
+			P: "3dsMax|main|emit_color_map", "Reference", "", "A"
+			P: "3dsMax|main|opacity_map", "Reference", "", "A"
+		}
+	}
+	Video: 2188262711712, "Video::Albedo", "Clip" {
+		Type: "Clip"
+		Properties70:  {
+			P: "Path", "KString", "XRefUrl", "", "Textures\albedo.png"
+			P: "RelPath", "KString", "XRefUrl", "", "Textures\albedo.png"
+		}
+		UseMipMap: 0
+		Filename: "Textures\albedo.png"
+		RelativeFilename: "Textures\albedo.png"
+	}
+	Video: 2188262695872, "Video::Metalness", "Clip" {
+		Type: "Clip"
+		Properties70:  {
+			P: "Path", "KString", "XRefUrl", "", "Textures\metalness.png"
+			P: "RelPath", "KString", "XRefUrl", "", "Textures\metalness.png"
+		}
+		UseMipMap: 0
+		Filename: "Textures\metalness.png"
+		RelativeFilename: "Textures\metalness.png"
+	}
+	Video: 2188262686752, "Video::Roughness", "Clip" {
+		Type: "Clip"
+		Properties70:  {
+			P: "Path", "KString", "XRefUrl", "", "Textures\roughness.png"
+			P: "RelPath", "KString", "XRefUrl", "", "Textures\roughness.png"
+		}
+		UseMipMap: 0
+		Filename: "Textures\roughness.png"
+		RelativeFilename: "Textures\roughness.png"
+	}
+	Video: 2188262700672, "Video::Occlusion", "Clip" {
+		Type: "Clip"
+		Properties70:  {
+			P: "Path", "KString", "XRefUrl", "", "Textures\occlusion.png"
+			P: "RelPath", "KString", "XRefUrl", "", "Textures\occlusion.png"
+		}
+		UseMipMap: 0
+		Filename: "Textures\occlusion.png"
+		RelativeFilename: "Textures\occlusion.png"
+	}
+	Video: 2188262708832, "Video::Normal", "Clip" {
+		Type: "Clip"
+		Properties70:  {
+			P: "Path", "KString", "XRefUrl", "", "Textures\normal.png"
+			P: "RelPath", "KString", "XRefUrl", "", "Textures\normal.png"
+		}
+		UseMipMap: 0
+		Filename: "Textures\normal.png"
+		RelativeFilename: "Textures\normal.png"
+	}
+	Video: 2188262712672, "Video::Emission", "Clip" {
+		Type: "Clip"
+		Properties70:  {
+			P: "Path", "KString", "XRefUrl", "", "Textures\emission.png"
+			P: "RelPath", "KString", "XRefUrl", "", "Textures\emission.png"
+		}
+		UseMipMap: 0
+		Filename: "Textures\emission.png"
+		RelativeFilename: "Textures\emission.png"
+	}
+	Video: 2188262696352, "Video::Opacity", "Clip" {
+		Type: "Clip"
+		Properties70:  {
+			P: "Path", "KString", "XRefUrl", "", "Textures\opacity.png"
+			P: "RelPath", "KString", "XRefUrl", "", "Textures\opacity.png"
+		}
+		UseMipMap: 0
+		Filename: "Textures\opacity.png"
+		RelativeFilename: "Textures\opacity.png"
+	}
+	Texture: 2188262656992, "Texture::Albedo", "" {
+		Type: "TextureVideoClip"
+		Version: 202
+		TextureName: "Texture::Albedo"
+		Properties70:  {
+			P: "UVSet", "KString", "", "", "UVChannel_1"
+			P: "UseMaterial", "bool", "", "",1
+		}
+		Media: "Video::Albedo"
+		FileName: "Textures\albedo.png"
+		RelativeFilename: "Textures\albedo.png"
+		ModelUVTranslation: 0,0
+		ModelUVScaling: 1,1
+		Texture_Alpha_Source: "None"
+		Cropping: 0,0,0,0
+	}
+	Texture: 2188262678592, "Texture::Metalness", "" {
+		Type: "TextureVideoClip"
+		Version: 202
+		TextureName: "Texture::Metalness"
+		Properties70:  {
+			P: "UVSet", "KString", "", "", "UVChannel_1"
+			P: "UseMaterial", "bool", "", "",1
+		}
+		Media: "Video::Metalness"
+		FileName: "Textures\metalness.png"
+		RelativeFilename: "Textures\metalness.png"
+		ModelUVTranslation: 0,0
+		ModelUVScaling: 1,1
+		Texture_Alpha_Source: "None"
+		Cropping: 0,0,0,0
+	}
+	Texture: 2188262682432, "Texture::Roughness", "" {
+		Type: "TextureVideoClip"
+		Version: 202
+		TextureName: "Texture::Roughness"
+		Properties70:  {
+			P: "UVSet", "KString", "", "", "UVChannel_1"
+			P: "UseMaterial", "bool", "", "",1
+		}
+		Media: "Video::Roughness"
+		FileName: "Textures\roughness.png"
+		RelativeFilename: "Textures\roughness.png"
+		ModelUVTranslation: 0,0
+		ModelUVScaling: 1,1
+		Texture_Alpha_Source: "None"
+		Cropping: 0,0,0,0
+	}
+	Texture: 2188262656032, "Texture::Occlusion", "" {
+		Type: "TextureVideoClip"
+		Version: 202
+		TextureName: "Texture::Occlusion"
+		Properties70:  {
+			P: "UVSet", "KString", "", "", "UVChannel_1"
+			P: "UseMaterial", "bool", "", "",1
+		}
+		Media: "Video::Occlusion"
+		FileName: "Textures\occlusion.png"
+		RelativeFilename: "Textures\occlusion.png"
+		ModelUVTranslation: 0,0
+		ModelUVScaling: 1,1
+		Texture_Alpha_Source: "None"
+		Cropping: 0,0,0,0
+	}
+	Texture: 2188262659392, "Texture::Normal", "" {
+		Type: "TextureVideoClip"
+		Version: 202
+		TextureName: "Texture::Normal"
+		Properties70:  {
+			P: "UVSet", "KString", "", "", "UVChannel_1"
+			P: "UseMaterial", "bool", "", "",1
+		}
+		Media: "Video::Normal"
+		FileName: "Textures\normal.png"
+		RelativeFilename: "Textures\normal.png"
+		ModelUVTranslation: 0,0
+		ModelUVScaling: 1,1
+		Texture_Alpha_Source: "None"
+		Cropping: 0,0,0,0
+	}
+	Texture: 2188262700192, "Texture::Emission", "" {
+		Type: "TextureVideoClip"
+		Version: 202
+		TextureName: "Texture::Emission"
+		Properties70:  {
+			P: "UVSet", "KString", "", "", "UVChannel_1"
+			P: "UseMaterial", "bool", "", "",1
+		}
+		Media: "Video::Emission"
+		FileName: "Textures\emission.png"
+		RelativeFilename: "Textures\emission.png"
+		ModelUVTranslation: 0,0
+		ModelUVScaling: 1,1
+		Texture_Alpha_Source: "None"
+		Cropping: 0,0,0,0
+	}
+	Texture: 2188262684832, "Texture::Opacity", "" {
+		Type: "TextureVideoClip"
+		Version: 202
+		TextureName: "Texture::Opacity"
+		Properties70:  {
+			P: "UVSet", "KString", "", "", "UVChannel_1"
+			P: "UseMaterial", "bool", "", "",1
+		}
+		Media: "Video::Opacity"
+		FileName: "Textures\opacity.png"
+		RelativeFilename: "Textures\opacity.png"
+		ModelUVTranslation: 0,0
+		ModelUVScaling: 1,1
+		Texture_Alpha_Source: "None"
+		Cropping: 0,0,0,0
+	}
+}
+
+; Object connections
+;------------------------------------------------------------------
+
+Connections:  {
+	
+	;Model::Box001, Model::RootNode
+	C: "OO",2187845653184,0
+	
+	;Geometry::, Model::Box001
+	C: "OO",2188426094640,2187845653184
+	
+	;Material::PBR Material, Model::Box001
+	C: "OO",2188102329504,2187845653184
+	
+	;Texture::Albedo, Material::PBR Material
+	C: "OP",2188262656992,2188102329504, "3dsMax|main|base_color_map"
+	
+	;Texture::Metalness, Material::PBR Material
+	C: "OP",2188262678592,2188102329504, "3dsMax|main|metalness_map"
+	
+	;Texture::Roughness, Material::PBR Material
+	C: "OP",2188262682432,2188102329504, "3dsMax|main|roughness_map"
+	
+	;Texture::Occlusion, Material::PBR Material
+	C: "OP",2188262656032,2188102329504, "3dsMax|main|ao_map"
+	
+	;Texture::Normal, Material::PBR Material
+	C: "OP",2188262659392,2188102329504, "3dsMax|main|norm_map"
+	
+	;Texture::Emission, Material::PBR Material
+	C: "OP",2188262700192,2188102329504, "3dsMax|main|emit_color_map"
+	
+	;Texture::Opacity, Material::PBR Material
+	C: "OP",2188262684832,2188102329504, "3dsMax|main|opacity_map"
+	
+	;Video::Albedo, Texture::Albedo
+	C: "OO",2188262711712,2188262656992
+	
+	;Video::Metalness, Texture::Metalness
+	C: "OO",2188262695872,2188262678592
+	
+	;Video::Roughness, Texture::Roughness
+	C: "OO",2188262686752,2188262682432
+	
+	;Video::Occlusion, Texture::Occlusion
+	C: "OO",2188262700672,2188262656032
+	
+	;Video::Normal, Texture::Normal
+	C: "OO",2188262708832,2188262659392
+	
+	;Video::Emission, Texture::Emission
+	C: "OO",2188262712672,2188262700192
+	
+	;Video::Opacity, Texture::Opacity
+	C: "OO",2188262696352,2188262684832
+}
diff --git a/test/models/FBX/maxPbrMaterial_specGloss.fbx b/test/models/FBX/maxPbrMaterial_specGloss.fbx
new file mode 100644
index 000000000..83a4432c9
--- /dev/null
+++ b/test/models/FBX/maxPbrMaterial_specGloss.fbx
@@ -0,0 +1,618 @@
+; FBX 7.7.0 project file
+; ----------------------------------------------------
+
+FBXHeaderExtension:  {
+	FBXHeaderVersion: 1004
+	FBXVersion: 7700
+	CreationTimeStamp:  {
+		Version: 1000
+		Year: 2020
+		Month: 12
+		Day: 1
+		Hour: 11
+		Minute: 50
+		Second: 44
+		Millisecond: 89
+	}
+	Creator: "FBX SDK/FBX Plugins version 2020.0.1"
+	OtherFlags:  {
+		TCDefinition: 127
+	}
+	SceneInfo: "SceneInfo::GlobalInfo", "UserData" {
+		Type: "UserData"
+		Version: 100
+		MetaData:  {
+			Version: 100
+			Title: ""
+			Subject: ""
+			Author: ""
+			Keywords: ""
+			Revision: ""
+			Comment: ""
+		}
+		Properties70:  {
+			P: "DocumentUrl", "KString", "Url", "", "C:\3ds Max 2021\maxPbrMaterial_specGloss.fbx"
+			P: "SrcDocumentUrl", "KString", "Url", "", "C:\3ds Max 2021\maxPbrMaterial_specGloss.fbx"
+			P: "Original", "Compound", "", ""
+			P: "Original|ApplicationVendor", "KString", "", "", "Autodesk"
+			P: "Original|ApplicationName", "KString", "", "", "3ds Max"
+			P: "Original|ApplicationVersion", "KString", "", "", "2021"
+			P: "Original|DateTime_GMT", "DateTime", "", "", "01/12/2020 11:50:44.088"
+			P: "Original|FileName", "KString", "", "", "C:\3ds Max 2021\maxPbrMaterial_specGloss.fbx"
+			P: "LastSaved", "Compound", "", ""
+			P: "LastSaved|ApplicationVendor", "KString", "", "", "Autodesk"
+			P: "LastSaved|ApplicationName", "KString", "", "", "3ds Max"
+			P: "LastSaved|ApplicationVersion", "KString", "", "", "2021"
+			P: "LastSaved|DateTime_GMT", "DateTime", "", "", "01/12/2020 11:50:44.088"
+			P: "Original|ApplicationActiveProject", "KString", "", "", "C:\3ds Max 2021"
+			P: "Original|ApplicationNativeFile", "KString", "", "", "C:\3ds Max 2021\MaxPbrMaterial2.max"
+		}
+	}
+}
+GlobalSettings:  {
+	Version: 1000
+	Properties70:  {
+		P: "UpAxis", "int", "Integer", "",1
+		P: "UpAxisSign", "int", "Integer", "",1
+		P: "FrontAxis", "int", "Integer", "",2
+		P: "FrontAxisSign", "int", "Integer", "",1
+		P: "CoordAxis", "int", "Integer", "",0
+		P: "CoordAxisSign", "int", "Integer", "",1
+		P: "OriginalUpAxis", "int", "Integer", "",2
+		P: "OriginalUpAxisSign", "int", "Integer", "",1
+		P: "UnitScaleFactor", "double", "Number", "",100
+		P: "OriginalUnitScaleFactor", "double", "Number", "",100.00000066
+		P: "AmbientColor", "ColorRGB", "Color", "",0,0,0
+		P: "DefaultCamera", "KString", "", "", "Producer Perspective"
+		P: "TimeMode", "enum", "", "",6
+		P: "TimeProtocol", "enum", "", "",2
+		P: "SnapOnFrameMode", "enum", "", "",0
+		P: "TimeSpanStart", "KTime", "Time", "",0
+		P: "TimeSpanStop", "KTime", "Time", "",153953860000
+		P: "CustomFrameRate", "double", "Number", "",-1
+		P: "TimeMarker", "Compound", "", ""
+		P: "CurrentTimeMarker", "int", "Integer", "",-1
+	}
+}
+
+; Documents Description
+;------------------------------------------------------------------
+
+Documents:  {
+	Count: 1
+	Document: 2188636931248, "", "Scene" {
+		Properties70:  {
+			P: "SourceObject", "object", "", ""
+			P: "ActiveAnimStackName", "KString", "", "", ""
+		}
+		RootNode: 0
+	}
+}
+
+; Document References
+;------------------------------------------------------------------
+
+References:  {
+}
+
+; Object definitions
+;------------------------------------------------------------------
+
+Definitions:  {
+	Version: 100
+	Count: 18
+	ObjectType: "GlobalSettings" {
+		Count: 1
+	}
+	ObjectType: "Model" {
+		Count: 1
+		PropertyTemplate: "FbxNode" {
+			Properties70:  {
+				P: "QuaternionInterpolate", "enum", "", "",0
+				P: "RotationOffset", "Vector3D", "Vector", "",0,0,0
+				P: "RotationPivot", "Vector3D", "Vector", "",0,0,0
+				P: "ScalingOffset", "Vector3D", "Vector", "",0,0,0
+				P: "ScalingPivot", "Vector3D", "Vector", "",0,0,0
+				P: "TranslationActive", "bool", "", "",0
+				P: "TranslationMin", "Vector3D", "Vector", "",0,0,0
+				P: "TranslationMax", "Vector3D", "Vector", "",0,0,0
+				P: "TranslationMinX", "bool", "", "",0
+				P: "TranslationMinY", "bool", "", "",0
+				P: "TranslationMinZ", "bool", "", "",0
+				P: "TranslationMaxX", "bool", "", "",0
+				P: "TranslationMaxY", "bool", "", "",0
+				P: "TranslationMaxZ", "bool", "", "",0
+				P: "RotationOrder", "enum", "", "",0
+				P: "RotationSpaceForLimitOnly", "bool", "", "",0
+				P: "RotationStiffnessX", "double", "Number", "",0
+				P: "RotationStiffnessY", "double", "Number", "",0
+				P: "RotationStiffnessZ", "double", "Number", "",0
+				P: "AxisLen", "double", "Number", "",10
+				P: "PreRotation", "Vector3D", "Vector", "",0,0,0
+				P: "PostRotation", "Vector3D", "Vector", "",0,0,0
+				P: "RotationActive", "bool", "", "",0
+				P: "RotationMin", "Vector3D", "Vector", "",0,0,0
+				P: "RotationMax", "Vector3D", "Vector", "",0,0,0
+				P: "RotationMinX", "bool", "", "",0
+				P: "RotationMinY", "bool", "", "",0
+				P: "RotationMinZ", "bool", "", "",0
+				P: "RotationMaxX", "bool", "", "",0
+				P: "RotationMaxY", "bool", "", "",0
+				P: "RotationMaxZ", "bool", "", "",0
+				P: "InheritType", "enum", "", "",0
+				P: "ScalingActive", "bool", "", "",0
+				P: "ScalingMin", "Vector3D", "Vector", "",0,0,0
+				P: "ScalingMax", "Vector3D", "Vector", "",1,1,1
+				P: "ScalingMinX", "bool", "", "",0
+				P: "ScalingMinY", "bool", "", "",0
+				P: "ScalingMinZ", "bool", "", "",0
+				P: "ScalingMaxX", "bool", "", "",0
+				P: "ScalingMaxY", "bool", "", "",0
+				P: "ScalingMaxZ", "bool", "", "",0
+				P: "GeometricTranslation", "Vector3D", "Vector", "",0,0,0
+				P: "GeometricRotation", "Vector3D", "Vector", "",0,0,0
+				P: "GeometricScaling", "Vector3D", "Vector", "",1,1,1
+				P: "MinDampRangeX", "double", "Number", "",0
+				P: "MinDampRangeY", "double", "Number", "",0
+				P: "MinDampRangeZ", "double", "Number", "",0
+				P: "MaxDampRangeX", "double", "Number", "",0
+				P: "MaxDampRangeY", "double", "Number", "",0
+				P: "MaxDampRangeZ", "double", "Number", "",0
+				P: "MinDampStrengthX", "double", "Number", "",0
+				P: "MinDampStrengthY", "double", "Number", "",0
+				P: "MinDampStrengthZ", "double", "Number", "",0
+				P: "MaxDampStrengthX", "double", "Number", "",0
+				P: "MaxDampStrengthY", "double", "Number", "",0
+				P: "MaxDampStrengthZ", "double", "Number", "",0
+				P: "PreferedAngleX", "double", "Number", "",0
+				P: "PreferedAngleY", "double", "Number", "",0
+				P: "PreferedAngleZ", "double", "Number", "",0
+				P: "LookAtProperty", "object", "", ""
+				P: "UpVectorProperty", "object", "", ""
+				P: "Show", "bool", "", "",1
+				P: "NegativePercentShapeSupport", "bool", "", "",1
+				P: "DefaultAttributeIndex", "int", "Integer", "",-1
+				P: "Freeze", "bool", "", "",0
+				P: "LODBox", "bool", "", "",0
+				P: "Lcl Translation", "Lcl Translation", "", "A",0,0,0
+				P: "Lcl Rotation", "Lcl Rotation", "", "A",0,0,0
+				P: "Lcl Scaling", "Lcl Scaling", "", "A",1,1,1
+				P: "Visibility", "Visibility", "", "A",1
+				P: "Visibility Inheritance", "Visibility Inheritance", "", "",1
+			}
+		}
+	}
+	ObjectType: "Geometry" {
+		Count: 1
+		PropertyTemplate: "FbxMesh" {
+			Properties70:  {
+				P: "Color", "ColorRGB", "Color", "",0.8,0.8,0.8
+				P: "BBoxMin", "Vector3D", "Vector", "",0,0,0
+				P: "BBoxMax", "Vector3D", "Vector", "",0,0,0
+				P: "Primary Visibility", "bool", "", "",1
+				P: "Casts Shadows", "bool", "", "",1
+				P: "Receive Shadows", "bool", "", "",1
+			}
+		}
+	}
+	ObjectType: "Material" {
+		Count: 1
+		PropertyTemplate: "FbxSurfaceMaterial" {
+			Properties70:  {
+				P: "ShadingModel", "KString", "", "", "Unknown"
+				P: "MultiLayer", "bool", "", "",0
+			}
+		}
+	}
+	ObjectType: "Texture" {
+		Count: 7
+		PropertyTemplate: "FbxFileTexture" {
+			Properties70:  {
+				P: "TextureTypeUse", "enum", "", "",0
+				P: "Texture alpha", "Number", "", "A",1
+				P: "CurrentMappingType", "enum", "", "",0
+				P: "WrapModeU", "enum", "", "",0
+				P: "WrapModeV", "enum", "", "",0
+				P: "UVSwap", "bool", "", "",0
+				P: "PremultiplyAlpha", "bool", "", "",1
+				P: "Translation", "Vector", "", "A",0,0,0
+				P: "Rotation", "Vector", "", "A",0,0,0
+				P: "Scaling", "Vector", "", "A",1,1,1
+				P: "TextureRotationPivot", "Vector3D", "Vector", "",0,0,0
+				P: "TextureScalingPivot", "Vector3D", "Vector", "",0,0,0
+				P: "CurrentTextureBlendMode", "enum", "", "",1
+				P: "UVSet", "KString", "", "", "default"
+				P: "UseMaterial", "bool", "", "",0
+				P: "UseMipMap", "bool", "", "",0
+			}
+		}
+	}
+	ObjectType: "Video" {
+		Count: 7
+		PropertyTemplate: "FbxVideo" {
+			Properties70:  {
+				P: "Path", "KString", "XRefUrl", "", ""
+				P: "RelPath", "KString", "XRefUrl", "", ""
+				P: "Color", "ColorRGB", "Color", "",0.8,0.8,0.8
+				P: "ClipIn", "KTime", "Time", "",0
+				P: "ClipOut", "KTime", "Time", "",0
+				P: "Offset", "KTime", "Time", "",0
+				P: "PlaySpeed", "double", "Number", "",0
+				P: "FreeRunning", "bool", "", "",0
+				P: "Loop", "bool", "", "",0
+				P: "Mute", "bool", "", "",0
+				P: "AccessMode", "enum", "", "",0
+				P: "ImageSequence", "bool", "", "",0
+				P: "ImageSequenceOffset", "int", "Integer", "",0
+				P: "FrameRate", "double", "Number", "",0
+				P: "LastFrame", "int", "Integer", "",0
+				P: "Width", "int", "Integer", "",0
+				P: "Height", "int", "Integer", "",0
+				P: "StartFrame", "int", "Integer", "",0
+				P: "StopFrame", "int", "Integer", "",0
+				P: "InterlaceMode", "enum", "", "",0
+			}
+		}
+	}
+}
+
+; Object properties
+;------------------------------------------------------------------
+
+Objects:  {
+	Geometry: 2188631051296, "Geometry::", "Mesh" {
+		Properties70:  {
+			P: "Color", "ColorRGB", "Color", "",0.341176470588235,0.882352941176471,0.776470588235294
+		}
+		Vertices: *24 {
+			a: -8.91135215759277,-10.98219871521,0,8.91135215759277,-10.98219871521,0,-8.91135215759277,10.98219871521,0,8.91135215759277,10.98219871521,0,-8.91135215759277,-10.98219871521,16.787576675415,8.91135215759277,-10.98219871521,16.787576675415,-8.91135215759277,10.98219871521,16.787576675415,8.91135215759277,10.98219871521,16.787576675415
+		} 
+		PolygonVertexIndex: *24 {
+			a: 0,2,3,-2,4,5,7,-7,0,1,5,-5,1,3,7,-6,3,2,6,-8,2,0,4,-7
+		} 
+		Edges: *12 {
+			a: 0,1,2,3,4,5,6,7,9,11,13,17
+		} 
+		GeometryVersion: 124
+		LayerElementNormal: 0 {
+			Version: 102
+			Name: ""
+			MappingInformationType: "ByPolygonVertex"
+			ReferenceInformationType: "Direct"
+			Normals: *72 {
+				a: 0,0,-1,0,0,-1,0,0,-1,0,0,-1,0,0,1,0,0,1,0,0,1,0,0,1,0,-1,0,0,-1,0,0,-1,0,0,-1,0,1,0,0,1,0,0,1,0,0,1,0,0,0,1,0,0,1,0,0,1,0,0,1,0,-1,0,0,-1,0,0,-1,0,0,-1,0,0
+			} 
+			NormalsW: *24 {
+				a: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+			} 
+		}
+		LayerElementUV: 0 {
+			Version: 101
+			Name: "UVChannel_1"
+			MappingInformationType: "ByPolygonVertex"
+			ReferenceInformationType: "IndexToDirect"
+			UV: *48 {
+				a: 1,0,0,0,1,1,0,1,0,0,1,0,0,1,1,1,0,0,1,0,0,1,1,1,0,0,1,0,0,1,1,1,0,0,1,0,0,1,1,1,0,0,1,0,0,1,1,1
+			} 
+			UVIndex: *24 {
+				a: 0,2,3,1,4,5,7,6,8,9,11,10,12,13,15,14,16,17,19,18,20,21,23,22
+			} 
+		}
+		LayerElementMaterial: 0 {
+			Version: 101
+			Name: ""
+			MappingInformationType: "AllSame"
+			ReferenceInformationType: "IndexToDirect"
+			Materials: *1 {
+				a: 0
+			} 
+		}
+		Layer: 0 {
+			Version: 100
+			LayerElement:  {
+				Type: "LayerElementNormal"
+				TypedIndex: 0
+			}
+			LayerElement:  {
+				Type: "LayerElementMaterial"
+				TypedIndex: 0
+			}
+			LayerElement:  {
+				Type: "LayerElementUV"
+				TypedIndex: 0
+			}
+		}
+	}
+	Model: 2188763600256, "Model::Box001", "Mesh" {
+		Version: 232
+		Properties70:  {
+			P: "PreRotation", "Vector3D", "Vector", "",-90,-0,0
+			P: "RotationActive", "bool", "", "",1
+			P: "InheritType", "enum", "", "",1
+			P: "ScalingMax", "Vector3D", "Vector", "",0,0,0
+			P: "DefaultAttributeIndex", "int", "Integer", "",0
+			P: "Lcl Translation", "Lcl Translation", "", "A",0.570660591125488,0,-0.671265125274658
+			P: "MaxHandle", "int", "Integer", "UH",2
+		}
+		Shading: T
+		Culling: "CullingOff"
+	}
+	Material: 2188661245104, "Material::02 - Default", "" {
+		Version: 102
+		ShadingModel: "unknown"
+		MultiLayer: 0
+		Properties70:  {
+			P: "ShadingModel", "KString", "", "", "unknown"
+			P: "AmbientColor", "ColorRGB", "Color", "",0,1,1
+			P: "DiffuseColor", "ColorRGB", "Color", "",0,1,1
+			P: "SpecularColor", "ColorRGB", "Color", "",1,1,1
+			P: "SpecularFactor", "double", "Number", "",2
+			P: "ShininessExponent", "double", "Number", "",1024
+			P: "TransparencyFactor", "double", "Number", "",0
+			P: "EmissiveColor", "ColorRGB", "Color", "",3.14159274101257,0,3.14159321784973
+			P: "EmissiveFactor", "double", "Number", "",1
+			P: "3dsMax", "Compound", "", ""
+			P: "3dsMax|ClassIDa", "int", "Integer", "",-804315648
+			P: "3dsMax|ClassIDb", "int", "Integer", "",31173939
+			P: "3dsMax|SuperClassID", "int", "Integer", "",3072
+			P: "3dsMax|settings", "Compound", "", ""
+			P: "3dsMax|settings|ao_affects_diffuse", "Bool", "", "A",1
+			P: "3dsMax|settings|ao_affects_reflection", "Bool", "", "A",1
+			P: "3dsMax|settings|normal_flip_red", "Bool", "", "A",0
+			P: "3dsMax|settings|normal_flip_green", "Bool", "", "A",0
+			P: "3dsMax|main", "Compound", "", ""
+			P: "3dsMax|main|basecolor", "ColorAndAlpha", "", "A",0,1,1,1
+			P: "3dsMax|main|base_color_map", "Reference", "", "A"
+			P: "3dsMax|main|Specular", "ColorAndAlpha", "", "A",1,1,0,1
+			P: "3dsMax|main|specular_map", "Reference", "", "A"
+			P: "3dsMax|main|glossiness", "Float", "", "A",0.33
+			P: "3dsMax|main|glossiness_map", "Reference", "", "A"
+			P: "3dsMax|main|useGlossiness", "Integer", "", "A",1
+			P: "3dsMax|main|ao_map", "Reference", "", "A"
+			P: "3dsMax|main|bump_map_amt", "Float", "", "A",0.66
+			P: "3dsMax|main|norm_map", "Reference", "", "A"
+			P: "3dsMax|main|emit_color", "ColorAndAlpha", "", "A",1,0,1,1
+			P: "3dsMax|main|emit_color_map", "Reference", "", "A"
+			P: "3dsMax|main|opacity_map", "Reference", "", "A"
+		}
+	}
+	Video: 2188262470272, "Video::Albedo", "Clip" {
+		Type: "Clip"
+		Properties70:  {
+			P: "Path", "KString", "XRefUrl", "", "Textures\albedo.png"
+			P: "RelPath", "KString", "XRefUrl", "", "Textures\albedo.png"
+		}
+		UseMipMap: 0
+		Filename: "Textures\albedo.png"
+		RelativeFilename: "Textures\albedo.png"
+	}
+	Video: 2188262470752, "Video::Specular", "Clip" {
+		Type: "Clip"
+		Properties70:  {
+			P: "Path", "KString", "XRefUrl", "", "Textures\specular.png"
+			P: "RelPath", "KString", "XRefUrl", "", "Textures\specular.png"
+		}
+		UseMipMap: 0
+		Filename: "Textures\specular.png"
+		RelativeFilename: "Textures\specular.png"
+	}
+	Video: 2188262476032, "Video::Glossiness", "Clip" {
+		Type: "Clip"
+		Properties70:  {
+			P: "Path", "KString", "XRefUrl", "", "Textures\glossiness.png"
+			P: "RelPath", "KString", "XRefUrl", "", "Textures\glossiness.png"
+		}
+		UseMipMap: 0
+		Filename: "Textures\glossiness.png"
+		RelativeFilename: "Textures\glossiness.png"
+	}
+	Video: 2188262483232, "Video::Occlusion", "Clip" {
+		Type: "Clip"
+		Properties70:  {
+			P: "Path", "KString", "XRefUrl", "", "Textures\occlusion.png"
+			P: "RelPath", "KString", "XRefUrl", "", "Textures\occlusion.png"
+		}
+		UseMipMap: 0
+		Filename: "Textures\occlusion.png"
+		RelativeFilename: "Textures\occlusion.png"
+	}
+	Video: 2188262486112, "Video::Normal", "Clip" {
+		Type: "Clip"
+		Properties70:  {
+			P: "Path", "KString", "XRefUrl", "", "Textures\normal.png"
+			P: "RelPath", "KString", "XRefUrl", "", "Textures\normal.png"
+		}
+		UseMipMap: 0
+		Filename: "Textures\normal.png"
+		RelativeFilename: "Textures\normal.png"
+	}
+	Video: 2188262486592, "Video::Emission", "Clip" {
+		Type: "Clip"
+		Properties70:  {
+			P: "Path", "KString", "XRefUrl", "", "Textures\emission.png"
+			P: "RelPath", "KString", "XRefUrl", "", "Textures\emission.png"
+		}
+		UseMipMap: 0
+		Filename: "Textures\emission.png"
+		RelativeFilename: "Textures\emission.png"
+	}
+	Video: 2188262687712, "Video::Opacity", "Clip" {
+		Type: "Clip"
+		Properties70:  {
+			P: "Path", "KString", "XRefUrl", "", "Textures\opacity.png"
+			P: "RelPath", "KString", "XRefUrl", "", "Textures\opacity.png"
+		}
+		UseMipMap: 0
+		Filename: "Textures\opacity.png"
+		RelativeFilename: "Textures\opacity.png"
+	}
+	Texture: 2188262484672, "Texture::Albedo", "" {
+		Type: "TextureVideoClip"
+		Version: 202
+		TextureName: "Texture::Albedo"
+		Properties70:  {
+			P: "UVSet", "KString", "", "", "UVChannel_1"
+			P: "UseMaterial", "bool", "", "",1
+		}
+		Media: "Video::Albedo"
+		FileName: "Textures\albedo.png"
+		RelativeFilename: "Textures\albedo.png"
+		ModelUVTranslation: 0,0
+		ModelUVScaling: 1,1
+		Texture_Alpha_Source: "None"
+		Cropping: 0,0,0,0
+	}
+	Texture: 2188262499552, "Texture::Specular", "" {
+		Type: "TextureVideoClip"
+		Version: 202
+		TextureName: "Texture::Specular"
+		Properties70:  {
+			P: "UVSet", "KString", "", "", "UVChannel_1"
+			P: "UseMaterial", "bool", "", "",1
+		}
+		Media: "Video::Specular"
+		FileName: "Textures\specular.png"
+		RelativeFilename: "Textures\specular.png"
+		ModelUVTranslation: 0,0
+		ModelUVScaling: 1,1
+		Texture_Alpha_Source: "None"
+		Cropping: 0,0,0,0
+	}
+	Texture: 2188262475552, "Texture::Glossiness", "" {
+		Type: "TextureVideoClip"
+		Version: 202
+		TextureName: "Texture::Glossiness"
+		Properties70:  {
+			P: "UVSet", "KString", "", "", "UVChannel_1"
+			P: "UseMaterial", "bool", "", "",1
+		}
+		Media: "Video::Glossiness"
+		FileName: "Textures\glossiness.png"
+		RelativeFilename: "Textures\glossiness.png"
+		ModelUVTranslation: 0,0
+		ModelUVScaling: 1,1
+		Texture_Alpha_Source: "None"
+		Cropping: 0,0,0,0
+	}
+	Texture: 2188262480352, "Texture::Occlusion", "" {
+		Type: "TextureVideoClip"
+		Version: 202
+		TextureName: "Texture::Occlusion"
+		Properties70:  {
+			P: "UVSet", "KString", "", "", "UVChannel_1"
+			P: "UseMaterial", "bool", "", "",1
+		}
+		Media: "Video::Occlusion"
+		FileName: "Textures\occlusion.png"
+		RelativeFilename: "Textures\occlusion.png"
+		ModelUVTranslation: 0,0
+		ModelUVScaling: 1,1
+		Texture_Alpha_Source: "None"
+		Cropping: 0,0,0,0
+	}
+	Texture: 2188262482752, "Texture::Normal", "" {
+		Type: "TextureVideoClip"
+		Version: 202
+		TextureName: "Texture::Normal"
+		Properties70:  {
+			P: "UVSet", "KString", "", "", "UVChannel_1"
+			P: "UseMaterial", "bool", "", "",1
+		}
+		Media: "Video::Normal"
+		FileName: "Textures\normal.png"
+		RelativeFilename: "Textures\normal.png"
+		ModelUVTranslation: 0,0
+		ModelUVScaling: 1,1
+		Texture_Alpha_Source: "None"
+		Cropping: 0,0,0,0
+	}
+	Texture: 2188262481312, "Texture::Emission", "" {
+		Type: "TextureVideoClip"
+		Version: 202
+		TextureName: "Texture::Emission"
+		Properties70:  {
+			P: "UVSet", "KString", "", "", "UVChannel_1"
+			P: "UseMaterial", "bool", "", "",1
+		}
+		Media: "Video::Emission"
+		FileName: "Textures\emission.png"
+		RelativeFilename: "Textures\emission.png"
+		ModelUVTranslation: 0,0
+		ModelUVScaling: 1,1
+		Texture_Alpha_Source: "None"
+		Cropping: 0,0,0,0
+	}
+	Texture: 2188262469792, "Texture::Opacity", "" {
+		Type: "TextureVideoClip"
+		Version: 202
+		TextureName: "Texture::Opacity"
+		Properties70:  {
+			P: "UVSet", "KString", "", "", "UVChannel_1"
+			P: "UseMaterial", "bool", "", "",1
+		}
+		Media: "Video::Opacity"
+		FileName: "Textures\opacity.png"
+		RelativeFilename: "Textures\opacity.png"
+		ModelUVTranslation: 0,0
+		ModelUVScaling: 1,1
+		Texture_Alpha_Source: "None"
+		Cropping: 0,0,0,0
+	}
+}
+
+; Object connections
+;------------------------------------------------------------------
+
+Connections:  {
+	
+	;Model::Box001, Model::RootNode
+	C: "OO",2188763600256,0
+	
+	;Geometry::, Model::Box001
+	C: "OO",2188631051296,2188763600256
+	
+	;Material::02 - Default, Model::Box001
+	C: "OO",2188661245104,2188763600256
+	
+	;Texture::Albedo, Material::02 - Default
+	C: "OP",2188262484672,2188661245104, "3dsMax|main|base_color_map"
+	
+	;Texture::Specular, Material::02 - Default
+	C: "OP",2188262499552,2188661245104, "3dsMax|main|specular_map"
+	
+	;Texture::Glossiness, Material::02 - Default
+	C: "OP",2188262475552,2188661245104, "3dsMax|main|glossiness_map"
+	
+	;Texture::Occlusion, Material::02 - Default
+	C: "OP",2188262480352,2188661245104, "3dsMax|main|ao_map"
+	
+	;Texture::Normal, Material::02 - Default
+	C: "OP",2188262482752,2188661245104, "3dsMax|main|norm_map"
+	
+	;Texture::Emission, Material::02 - Default
+	C: "OP",2188262481312,2188661245104, "3dsMax|main|emit_color_map"
+	
+	;Texture::Opacity, Material::02 - Default
+	C: "OP",2188262469792,2188661245104, "3dsMax|main|opacity_map"
+	
+	;Video::Albedo, Texture::Albedo
+	C: "OO",2188262470272,2188262484672
+	
+	;Video::Specular, Texture::Specular
+	C: "OO",2188262470752,2188262499552
+	
+	;Video::Glossiness, Texture::Glossiness
+	C: "OO",2188262476032,2188262475552
+	
+	;Video::Occlusion, Texture::Occlusion
+	C: "OO",2188262483232,2188262480352
+	
+	;Video::Normal, Texture::Normal
+	C: "OO",2188262486112,2188262482752
+	
+	;Video::Emission, Texture::Emission
+	C: "OO",2188262486592,2188262481312
+	
+	;Video::Opacity, Texture::Opacity
+	C: "OO",2188262687712,2188262469792
+}
diff --git a/test/models/glTF2/IndexOutOfRange/AllIndicesOutOfRange.bin b/test/models/glTF2/IndexOutOfRange/AllIndicesOutOfRange.bin
new file mode 100644
index 000000000..8fef5c7c0
Binary files /dev/null and b/test/models/glTF2/IndexOutOfRange/AllIndicesOutOfRange.bin differ
diff --git a/test/models/glTF2/IndexOutOfRange/AllIndicesOutOfRange.gltf b/test/models/glTF2/IndexOutOfRange/AllIndicesOutOfRange.gltf
new file mode 100644
index 000000000..3dbb6efe4
--- /dev/null
+++ b/test/models/glTF2/IndexOutOfRange/AllIndicesOutOfRange.gltf
@@ -0,0 +1,142 @@
+{
+    "asset": {
+        "generator": "COLLADA2GLTF",
+        "version": "2.0"
+    },
+    "scene": 0,
+    "scenes": [
+        {
+            "nodes": [
+                0
+            ]
+        }
+    ],
+    "nodes": [
+        {
+            "children": [
+                1
+            ],
+            "matrix": [
+                1.0,
+                0.0,
+                0.0,
+                0.0,
+                0.0,
+                0.0,
+                -1.0,
+                0.0,
+                0.0,
+                1.0,
+                0.0,
+                0.0,
+                0.0,
+                0.0,
+                0.0,
+                1.0
+            ]
+        },
+        {
+            "mesh": 0
+        }
+    ],
+    "meshes": [
+        {
+            "primitives": [
+                {
+                    "attributes": {
+                        "NORMAL": 1,
+                        "POSITION": 2
+                    },
+                    "indices": 0,
+                    "mode": 4,
+                    "material": 0
+                }
+            ],
+            "name": "Mesh"
+        }
+    ],
+    "accessors": [
+        {
+            "bufferView": 0,
+            "byteOffset": 0,
+            "componentType": 5123,
+            "count": 36,
+            "max": [
+                255
+            ],
+            "min": [
+                0
+            ],
+            "type": "SCALAR"
+        },
+        {
+            "bufferView": 1,
+            "byteOffset": 0,
+            "componentType": 5126,
+            "count": 24,
+            "max": [
+                1.0,
+                1.0,
+                1.0
+            ],
+            "min": [
+                -1.0,
+                -1.0,
+                -1.0
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 1,
+            "byteOffset": 288,
+            "componentType": 5126,
+            "count": 24,
+            "max": [
+                0.5,
+                0.5,
+                0.5
+            ],
+            "min": [
+                -0.5,
+                -0.5,
+                -0.5
+            ],
+            "type": "VEC3"
+        }
+    ],
+    "materials": [
+        {
+            "pbrMetallicRoughness": {
+                "baseColorFactor": [
+                    0.800000011920929,
+                    0.0,
+                    0.0,
+                    1.0
+                ],
+                "metallicFactor": 0.0
+            },
+            "name": "Red"
+        }
+    ],
+    "bufferViews": [
+        {
+            "buffer": 0,
+            "byteOffset": 576,
+            "byteLength": 72,
+            "target": 34963
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 0,
+            "byteLength": 576,
+            "byteStride": 12,
+            "target": 34962
+        }
+    ],
+    "buffers": [
+        {
+            "byteLength": 648,
+            "uri": "AllIndicesOutOfRange.bin"
+        }
+    ]
+}
diff --git a/test/models/glTF2/IndexOutOfRange/IndexOutOfRange.bin b/test/models/glTF2/IndexOutOfRange/IndexOutOfRange.bin
new file mode 100644
index 000000000..b7cfe377b
Binary files /dev/null and b/test/models/glTF2/IndexOutOfRange/IndexOutOfRange.bin differ
diff --git a/test/models/glTF2/IndexOutOfRange/IndexOutOfRange.gltf b/test/models/glTF2/IndexOutOfRange/IndexOutOfRange.gltf
new file mode 100644
index 000000000..67561c591
--- /dev/null
+++ b/test/models/glTF2/IndexOutOfRange/IndexOutOfRange.gltf
@@ -0,0 +1,142 @@
+{
+    "asset": {
+        "generator": "COLLADA2GLTF",
+        "version": "2.0"
+    },
+    "scene": 0,
+    "scenes": [
+        {
+            "nodes": [
+                0
+            ]
+        }
+    ],
+    "nodes": [
+        {
+            "children": [
+                1
+            ],
+            "matrix": [
+                1.0,
+                0.0,
+                0.0,
+                0.0,
+                0.0,
+                0.0,
+                -1.0,
+                0.0,
+                0.0,
+                1.0,
+                0.0,
+                0.0,
+                0.0,
+                0.0,
+                0.0,
+                1.0
+            ]
+        },
+        {
+            "mesh": 0
+        }
+    ],
+    "meshes": [
+        {
+            "primitives": [
+                {
+                    "attributes": {
+                        "NORMAL": 1,
+                        "POSITION": 2
+                    },
+                    "indices": 0,
+                    "mode": 4,
+                    "material": 0
+                }
+            ],
+            "name": "Mesh"
+        }
+    ],
+    "accessors": [
+        {
+            "bufferView": 0,
+            "byteOffset": 0,
+            "componentType": 5123,
+            "count": 36,
+            "max": [
+                255
+            ],
+            "min": [
+                0
+            ],
+            "type": "SCALAR"
+        },
+        {
+            "bufferView": 1,
+            "byteOffset": 0,
+            "componentType": 5126,
+            "count": 24,
+            "max": [
+                1.0,
+                1.0,
+                1.0
+            ],
+            "min": [
+                -1.0,
+                -1.0,
+                -1.0
+            ],
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 1,
+            "byteOffset": 288,
+            "componentType": 5126,
+            "count": 24,
+            "max": [
+                0.5,
+                0.5,
+                0.5
+            ],
+            "min": [
+                -0.5,
+                -0.5,
+                -0.5
+            ],
+            "type": "VEC3"
+        }
+    ],
+    "materials": [
+        {
+            "pbrMetallicRoughness": {
+                "baseColorFactor": [
+                    0.800000011920929,
+                    0.0,
+                    0.0,
+                    1.0
+                ],
+                "metallicFactor": 0.0
+            },
+            "name": "Red"
+        }
+    ],
+    "bufferViews": [
+        {
+            "buffer": 0,
+            "byteOffset": 576,
+            "byteLength": 72,
+            "target": 34963
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 0,
+            "byteLength": 576,
+            "byteStride": 12,
+            "target": 34962
+        }
+    ],
+    "buffers": [
+        {
+            "byteLength": 648,
+            "uri": "IndexOutOfRange.bin"
+        }
+    ]
+}
diff --git a/test/unit/AssimpAPITest.cpp b/test/unit/AssimpAPITest.cpp
index c30f6f384..32df1a0a9 100644
--- a/test/unit/AssimpAPITest.cpp
+++ b/test/unit/AssimpAPITest.cpp
@@ -5,8 +5,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -46,14 +44,19 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 using namespace Assimp;
 
 class AssimpAPITest : public ::testing::Test {
-
+    // empty
 };
 
 TEST_F( AssimpAPITest, aiGetImporterDescTest ) {
-    const aiImporterDesc *desc( NULL );
-    desc = aiGetImporterDesc( NULL );
-    EXPECT_EQ( NULL, desc );
+    const aiImporterDesc *desc( nullptr );
+    desc = aiGetImporterDesc(nullptr);
+    EXPECT_EQ(nullptr, desc);
 
     desc = aiGetImporterDesc( "obj" );
-    EXPECT_TRUE( NULL != desc );
+    EXPECT_TRUE(nullptr != desc);
+}
+
+TEST_F( AssimpAPITest, aiGetLastErrorTest ) {
+    const char *error = aiGetErrorString();
+    EXPECT_NE(nullptr, error);
 }
diff --git a/test/unit/AssimpAPITest_aiMatrix4x4.cpp b/test/unit/AssimpAPITest_aiMatrix4x4.cpp
index 2c89726e0..89883dc0d 100644
--- a/test/unit/AssimpAPITest_aiMatrix4x4.cpp
+++ b/test/unit/AssimpAPITest_aiMatrix4x4.cpp
@@ -176,7 +176,7 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4DecomposeIntoScalingAxisAnglePosition
     aiVector3D scaling_c, scaling_cpp,
         axis_c, axis_cpp,
         position_c, position_cpp;
-    float angle_c, angle_cpp;
+    ai_real angle_c, angle_cpp;
 
     result_c = result_cpp = get_predetermined_transformation_matrix_for_decomposition();
     result_cpp.Decompose(scaling_cpp, axis_cpp, angle_cpp, position_cpp);
diff --git a/test/unit/Common/uiScene.cpp b/test/unit/Common/uiScene.cpp
index d5b123b48..7fdf5f05c 100644
--- a/test/unit/Common/uiScene.cpp
+++ b/test/unit/Common/uiScene.cpp
@@ -43,7 +43,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <assimp/scene.h>
 
-
 using namespace Assimp;
 
 class utScene : public ::testing::Test {
diff --git a/test/unit/Common/utStandardShapes.cpp b/test/unit/Common/utStandardShapes.cpp
new file mode 100644
index 000000000..8469fecd6
--- /dev/null
+++ b/test/unit/Common/utStandardShapes.cpp
@@ -0,0 +1,57 @@
+/*
+Open Asset Import Library (assimp)
+----------------------------------------------------------------------
+Copyright (c) 2006-2020, assimp team
+All rights reserved.
+Redistribution and use of this software in source and binary forms,
+with or without modification, are permitted provided that the
+following conditions are met:
+* Redistributions of source code must retain the above
+  copyright notice, this list of conditions and the
+  following disclaimer.
+* Redistributions in binary form must reproduce the above
+  copyright notice, this list of conditions and the
+  following disclaimer in the documentation and/or other
+  materials provided with the distribution.
+* Neither the name of the assimp team, nor the names of its
+  contributors may be used to endorse or promote products
+  derived from this software without specific prior
+  written permission of the assimp team.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+----------------------------------------------------------------------
+*/
+#include "UnitTestPCH.h"
+#include <assimp/mesh.h>
+#include <assimp/StandardShapes.h>
+
+using namespace Assimp;
+
+class utStandardShapes : public ::testing::Test {
+    // empty
+};
+
+TEST_F( utStandardShapes, testMakeMesh ) {
+    // Make sphere positions
+    std::vector<aiVector3D> positions;
+    Assimp::StandardShapes::MakeSphere(1, positions);
+
+    // Make mesh
+    const auto numIndicesPerPrimitive = 3;
+    aiMesh *aiMeshPtr = Assimp::StandardShapes::MakeMesh(positions, numIndicesPerPrimitive);
+
+    // The mNumIndices member of the second face is now incorrect
+    const auto& face = aiMeshPtr->mFaces[0];
+    EXPECT_EQ(face.mNumIndices, numIndicesPerPrimitive); 
+    delete aiMeshPtr;
+}
+
diff --git a/test/unit/Common/utXmlParser.cpp b/test/unit/Common/utXmlParser.cpp
new file mode 100644
index 000000000..2395a5066
--- /dev/null
+++ b/test/unit/Common/utXmlParser.cpp
@@ -0,0 +1,88 @@
+/*-------------------------------------------------------------------------
+Open Asset Import Library (assimp)
+---------------------------------------------------------------------------
+
+Copyright (c) 2006-2020, assimp team
+
+All rights reserved.
+
+Redistribution and use of this software in source and binary forms,
+with or without modification, are permitted provided that the following
+conditions are met:
+
+* Redistributions of source code must retain the above
+copyright notice, this list of conditions and the
+following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the
+following disclaimer in the documentation and/or other
+materials provided with the distribution.
+
+* Neither the name of the assimp team, nor the names of its
+contributors may be used to endorse or promote products
+derived from this software without specific prior
+written permission of the assimp team.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-------------------------------------------------------------------------*/
+#include "UnitTestPCH.h"
+#include <assimp/XmlParser.h>
+#include <assimp/DefaultIOStream.h>
+#include <assimp/DefaultIOSystem.h>
+
+using namespace Assimp;
+
+class utXmlParser : public ::testing::Test {
+public:
+    utXmlParser() :
+            Test(),
+            mIoSystem() {
+        // empty
+    }
+
+protected:
+    DefaultIOSystem mIoSystem;
+};
+
+TEST_F(utXmlParser, parse_xml_test) {
+    XmlParser parser;
+    std::string filename = ASSIMP_TEST_MODELS_DIR "/X3D/ComputerKeyboard.x3d";
+    std::unique_ptr<IOStream> stream(mIoSystem.Open(filename.c_str(), "rb"));
+    EXPECT_NE(stream.get(), nullptr);
+    bool result = parser.parse(stream.get());
+    EXPECT_TRUE(result);
+}
+
+TEST_F(utXmlParser, parse_xml_and_traverse_test) {
+    XmlParser parser;
+    std::string filename = ASSIMP_TEST_MODELS_DIR "/X3D/ComputerKeyboard.x3d";
+    std::unique_ptr<IOStream> stream(mIoSystem.Open(filename.c_str(), "rb"));
+    EXPECT_NE(stream.get(), nullptr);
+    bool result = parser.parse(stream.get());
+    EXPECT_TRUE(result);
+    XmlNode root = parser.getRootNode();
+
+    XmlNodeIterator nodeIt(root);
+    EXPECT_TRUE(nodeIt.isEmpty());
+    nodeIt.collectChildrenPreOrder(root);
+    const size_t numNodes = nodeIt.size();
+    bool empty = nodeIt.isEmpty();
+    EXPECT_FALSE(empty);
+    EXPECT_NE(numNodes, 0U);
+    XmlNode node;
+    while (nodeIt.getNext(node)) {
+        const std::string nodeName = node.name();
+        EXPECT_FALSE(nodeName.empty());
+    }
+}
diff --git a/test/unit/UnitTestFileGenerator.h b/test/unit/UnitTestFileGenerator.h
index 91d69357f..2166c6939 100644
--- a/test/unit/UnitTestFileGenerator.h
+++ b/test/unit/UnitTestFileGenerator.h
@@ -44,21 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <cstdlib>
 #include <gtest/gtest.h>
 
-#if defined(__GNUC__) || defined(__clang__)
-#define TMP_PATH "/tmp/"
-inline FILE* MakeTmpFile(char* tmplate)
-{
-    auto fd = mkstemp(tmplate);
-    EXPECT_NE(-1, fd);
-    if(fd == -1)
-    {
-        return nullptr;
-    }
-    auto fs = fdopen(fd, "w+");
-    EXPECT_NE(nullptr, fs);
-    return fs;
-}
-#elif defined(_MSC_VER)
+#if defined(_MSC_VER)
 #include <io.h>
 #define TMP_PATH "./"
 inline FILE* MakeTmpFile(char* tmplate)
@@ -73,4 +59,18 @@ inline FILE* MakeTmpFile(char* tmplate)
     EXPECT_NE(fs, nullptr);
     return fs;
 }
+#elif defined(__GNUC__) || defined(__clang__)
+#define TMP_PATH "/tmp/"
+inline FILE* MakeTmpFile(char* tmplate)
+{
+    auto fd = mkstemp(tmplate);
+    EXPECT_NE(-1, fd);
+    if(fd == -1)
+    {
+        return nullptr;
+    }
+    auto fs = fdopen(fd, "w+");
+    EXPECT_NE(nullptr, fs);
+    return fs;
+}
 #endif
diff --git a/test/unit/UnitTestPCH.h b/test/unit/UnitTestPCH.h
index d47371292..4570dce81 100644
--- a/test/unit/UnitTestPCH.h
+++ b/test/unit/UnitTestPCH.h
@@ -43,7 +43,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 // We need to be sure to have the same STL settings as Assimp
 
 #include <assimp/cimport.h>
+#ifdef _MSC_VER
+#  pragma warning(push)
+#  pragma warning(disable : 4389)
+#endif
 #include <gtest/gtest.h>
+#ifdef _MSC_VER
+#  pragma warning(pop)
+#endif
 #include <memory>
 #include <math.h>
 #include "UTLogStream.h"
diff --git a/test/unit/ut3DImportExport.cpp b/test/unit/ut3DImportExport.cpp
index 4588289e2..17117d706 100644
--- a/test/unit/ut3DImportExport.cpp
+++ b/test/unit/ut3DImportExport.cpp
@@ -5,8 +5,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -46,10 +44,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/Importer.hpp>
 #include <assimp/postprocess.h>
 
-
 using namespace Assimp;
 
-
 TEST(ut3DImportExport, importBoxA) {
     Assimp::Importer importer;
     const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/3D/box_a.3d", aiProcess_ValidateDataStructure);
diff --git a/test/unit/utACImportExport.cpp b/test/unit/utACImportExport.cpp
index a7f432a56..573e716b6 100644
--- a/test/unit/utACImportExport.cpp
+++ b/test/unit/utACImportExport.cpp
@@ -101,6 +101,12 @@ TEST(utACImportExport, importWuson) {
     ASSERT_NE(nullptr, scene);
 }
 
+TEST(utACImportExport, importWusonACC) {
+    Assimp::Importer importer;
+    const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/AC/Wuson.acc", aiProcess_ValidateDataStructure);
+    ASSERT_NE(nullptr, scene);
+}
+
 TEST(utACImportExport, testFormatDetection) {
     Assimp::Importer importer;
     const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/AC/TestFormatDetection", aiProcess_ValidateDataStructure);
diff --git a/test/unit/utAMFImportExport.cpp b/test/unit/utAMFImportExport.cpp
index e4406702a..6acfdda25 100644
--- a/test/unit/utAMFImportExport.cpp
+++ b/test/unit/utAMFImportExport.cpp
@@ -49,7 +49,7 @@ using namespace Assimp;
 
 class utAMFImportExport : public AbstractImportExportBase {
 public:
-    virtual bool importerTest() {
+    bool importerTest() override {
         Assimp::Importer importer;
         const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/AMF/test1.amf", aiProcess_ValidateDataStructure);
         return nullptr != scene;
diff --git a/test/unit/utColladaExport.cpp b/test/unit/utColladaExport.cpp
index efb2d7f17..56b24798e 100644
--- a/test/unit/utColladaExport.cpp
+++ b/test/unit/utColladaExport.cpp
@@ -47,6 +47,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/Exporter.hpp>
 #include <assimp/Importer.hpp>
 
+#include <array>
+
 #ifndef ASSIMP_BUILD_NO_EXPORT
 
 class utColladaExport : public ::testing::Test {
@@ -77,6 +79,7 @@ TEST_F(utColladaExport, testExportCamera) {
 
     EXPECT_EQ(AI_SUCCESS, ex->Export(pTest, "collada", file));
     const unsigned int origNumCams(pTest->mNumCameras);
+    //std::vector<float> origFOV;
     std::unique_ptr<float[]> origFOV(new float[origNumCams]);
     std::unique_ptr<float[]> orifClipPlaneNear(new float[origNumCams]);
     std::unique_ptr<float[]> orifClipPlaneFar(new float[origNumCams]);
diff --git a/test/unit/utColladaImportExport.cpp b/test/unit/utColladaImportExport.cpp
index 451c8e235..02779e855 100644
--- a/test/unit/utColladaImportExport.cpp
+++ b/test/unit/utColladaImportExport.cpp
@@ -157,7 +157,6 @@ public:
 
     static inline void CheckNodeIdNames(IdNameMap &nodeIdMap, IdNameMap &nodeNameMap, const aiNode *parent, size_t index) {
         IdNameString namePair = GetItemIdName(parent, index);
-        const auto result = nodeNameMap.insert(namePair);
         IdNameString idPair = GetColladaIdName(parent, index);
         ReportDuplicate(nodeIdMap, idPair, typeid(aiNode).name());
 
@@ -356,7 +355,7 @@ public:
             EXPECT_EQ(scene->mNumMeshes, 1u);
             EXPECT_EQ(scene->mNumMaterials, 1u);
             EXPECT_EQ(scene->mNumAnimations, 0u);
-            EXPECT_EQ(scene->mNumTextures, 1u);
+            //EXPECT_EQ(scene->mNumTextures, 1u);
             EXPECT_EQ(scene->mNumLights, 1u);
             EXPECT_EQ(scene->mNumCameras, 1u);
         }
@@ -371,7 +370,7 @@ public:
             EXPECT_EQ(scene->mNumMeshes, 1u);
             EXPECT_EQ(scene->mNumMaterials, 1u);
             EXPECT_EQ(scene->mNumAnimations, 0u);
-            EXPECT_EQ(scene->mNumTextures, 1u);
+            //EXPECT_EQ(scene->mNumTextures, 1u);
             EXPECT_EQ(scene->mNumLights, 1u);
             EXPECT_EQ(scene->mNumCameras, 1u);
         }
diff --git a/test/unit/utD3MFImportExport.cpp b/test/unit/utD3MFImportExport.cpp
index f252ecfb4..31c5d2c84 100644
--- a/test/unit/utD3MFImportExport.cpp
+++ b/test/unit/utD3MFImportExport.cpp
@@ -50,9 +50,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 class utD3MFImporterExporter : public AbstractImportExportBase {
 public:
-    virtual bool importerTest() {
+    bool importerTest() override {
         Assimp::Importer importer;
         const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/3MF/box.3mf", aiProcess_ValidateDataStructure);
+        if (nullptr == scene) {
+            return false;
+        }
+
         EXPECT_EQ(1u, scene->mNumMeshes);
         aiMesh *mesh = scene->mMeshes[0];
         EXPECT_NE(nullptr, mesh);
@@ -64,7 +68,7 @@ public:
 
 #ifndef ASSIMP_BUILD_NO_EXPORT
 
-    virtual bool exporterTest() {
+    bool exporterTest() override {
         Assimp::Importer importer;
         const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/3MF/box.3mf", 0);
 
diff --git a/test/unit/utFBXImporterExporter.cpp b/test/unit/utFBXImporterExporter.cpp
index 2f1ea79e8..332bfc1ec 100644
--- a/test/unit/utFBXImporterExporter.cpp
+++ b/test/unit/utFBXImporterExporter.cpp
@@ -317,3 +317,109 @@ TEST_F(utFBXImporterExporter, importCubesWithOutOfRangeFloat) {
     ASSERT_NE(nullptr, scene);
     ASSERT_TRUE(scene->mRootNode);
 }
+
+TEST_F(utFBXImporterExporter, importMaxPbrMaterialsMetalRoughness) {
+    Assimp::Importer importer;
+    const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/FBX/maxPbrMaterial_metalRough.fbx", aiProcess_ValidateDataStructure);
+    ASSERT_NE(nullptr, scene);
+    ASSERT_TRUE(scene->mRootNode);
+
+    ASSERT_EQ(scene->mNumMaterials, 1);
+    const aiMaterial* mat = scene->mMaterials[0];
+    aiString texture;
+    ASSERT_EQ(mat->Get(AI_MATKEY_TEXTURE(aiTextureType_BASE_COLOR, 0), texture), AI_SUCCESS);
+    EXPECT_EQ(texture, aiString("Textures\\albedo.png"));
+    ASSERT_EQ(mat->Get(AI_MATKEY_TEXTURE(aiTextureType_METALNESS, 0), texture), AI_SUCCESS);
+    EXPECT_EQ(texture, aiString("Textures\\metalness.png"));
+    ASSERT_EQ(mat->Get(AI_MATKEY_TEXTURE(aiTextureType_EMISSION_COLOR, 0), texture), AI_SUCCESS);
+    EXPECT_EQ(texture, aiString("Textures\\emission.png"));
+    ASSERT_EQ(mat->Get(AI_MATKEY_TEXTURE(aiTextureType_NORMAL_CAMERA, 0), texture), AI_SUCCESS);
+    EXPECT_EQ(texture, aiString("Textures\\normal.png"));
+    ASSERT_EQ(mat->Get(AI_MATKEY_TEXTURE(aiTextureType_DIFFUSE_ROUGHNESS, 0), texture), AI_SUCCESS);
+    EXPECT_EQ(texture, aiString("Textures\\roughness.png"));
+    ASSERT_EQ(mat->Get(AI_MATKEY_TEXTURE(aiTextureType_AMBIENT_OCCLUSION, 0), texture), AI_SUCCESS);
+    EXPECT_EQ(texture, aiString("Textures\\occlusion.png"));
+    ASSERT_EQ(mat->Get(AI_MATKEY_TEXTURE(aiTextureType_OPACITY, 0), texture), AI_SUCCESS);
+    EXPECT_EQ(texture, aiString("Textures\\opacity.png"));
+
+    // The material contains values for standard properties (e.g. SpecularColor), where 3ds Max has presumably
+    // used formulas to map the Pbr values into the standard material model. However, the pbr values themselves
+    // are available in the material as untyped "raw" properties. We check that these are correctly parsed:
+
+    aiColor4D baseColor;
+    ASSERT_EQ(mat->Get("$raw.3dsMax|main|basecolor", aiTextureType_NONE, 0, baseColor), aiReturn_SUCCESS);
+    EXPECT_EQ(baseColor, aiColor4D(0, 1, 1, 1));
+
+    float metalness;
+    ASSERT_EQ(mat->Get("$raw.3dsMax|main|metalness", aiTextureType_NONE, 0, metalness), aiReturn_SUCCESS);
+    EXPECT_EQ(metalness, 0.25f);
+
+    float roughness;
+    ASSERT_EQ(mat->Get("$raw.3dsMax|main|roughness", aiTextureType_NONE, 0, roughness), aiReturn_SUCCESS);
+    EXPECT_EQ(roughness, 0.5f);
+
+    int useGlossiness;
+    ASSERT_EQ(mat->Get("$raw.3dsMax|main|useGlossiness", aiTextureType_NONE, 0, useGlossiness), aiReturn_SUCCESS);
+    EXPECT_EQ(useGlossiness, 2); // 1 = Roughness map is glossiness, 2 = Roughness map is roughness.
+
+    float bumpMapAmt; // Presumably amount.
+    ASSERT_EQ(mat->Get("$raw.3dsMax|main|bump_map_amt", aiTextureType_NONE, 0, bumpMapAmt), aiReturn_SUCCESS);
+    EXPECT_EQ(bumpMapAmt, 0.75f);
+    
+    aiColor4D emitColor;
+    ASSERT_EQ(mat->Get("$raw.3dsMax|main|emit_color", aiTextureType_NONE, 0, emitColor), aiReturn_SUCCESS);
+    EXPECT_EQ(emitColor, aiColor4D(1, 1, 0, 1));
+}
+
+TEST_F(utFBXImporterExporter, importMaxPbrMaterialsSpecularGloss) {
+    Assimp::Importer importer;
+    const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/FBX/maxPbrMaterial_specGloss.fbx", aiProcess_ValidateDataStructure);
+    ASSERT_NE(nullptr, scene);
+    ASSERT_TRUE(scene->mRootNode);
+
+    ASSERT_EQ(scene->mNumMaterials, 1);
+    const aiMaterial* mat = scene->mMaterials[0];
+    aiString texture;
+    ASSERT_EQ(mat->Get(AI_MATKEY_TEXTURE(aiTextureType_BASE_COLOR, 0), texture), AI_SUCCESS);
+    EXPECT_EQ(texture, aiString("Textures\\albedo.png"));
+    ASSERT_EQ(mat->Get(AI_MATKEY_TEXTURE(aiTextureType_SPECULAR, 0), texture), AI_SUCCESS);
+    EXPECT_EQ(texture, aiString("Textures\\specular.png"));
+    ASSERT_EQ(mat->Get(AI_MATKEY_TEXTURE(aiTextureType_EMISSION_COLOR, 0), texture), AI_SUCCESS);
+    EXPECT_EQ(texture, aiString("Textures\\emission.png"));
+    ASSERT_EQ(mat->Get(AI_MATKEY_TEXTURE(aiTextureType_NORMAL_CAMERA, 0), texture), AI_SUCCESS);
+    EXPECT_EQ(texture, aiString("Textures\\normal.png"));
+    ASSERT_EQ(mat->Get(AI_MATKEY_TEXTURE(aiTextureType_SHININESS, 0), texture), AI_SUCCESS);
+    EXPECT_EQ(texture, aiString("Textures\\glossiness.png"));
+    ASSERT_EQ(mat->Get(AI_MATKEY_TEXTURE(aiTextureType_AMBIENT_OCCLUSION, 0), texture), AI_SUCCESS);
+    EXPECT_EQ(texture, aiString("Textures\\occlusion.png"));
+    ASSERT_EQ(mat->Get(AI_MATKEY_TEXTURE(aiTextureType_OPACITY, 0), texture), AI_SUCCESS);
+    EXPECT_EQ(texture, aiString("Textures\\opacity.png"));
+
+    // The material contains values for standard properties (e.g. SpecularColor), where 3ds Max has presumably
+    // used formulas to map the Pbr values into the standard material model. However, the pbr values themselves
+    // are available in the material as untyped "raw" properties. We check that these are correctly parsed:
+
+    aiColor4D baseColor;
+    ASSERT_EQ(mat->Get("$raw.3dsMax|main|basecolor", aiTextureType_NONE, 0, baseColor), aiReturn_SUCCESS);
+    EXPECT_EQ(baseColor, aiColor4D(0, 1, 1, 1));
+
+    aiColor4D specular;
+    ASSERT_EQ(mat->Get("$raw.3dsMax|main|Specular", aiTextureType_NONE, 0, specular), aiReturn_SUCCESS);
+    EXPECT_EQ(specular, aiColor4D(1, 1, 0, 1));
+
+    float glossiness;
+    ASSERT_EQ(mat->Get("$raw.3dsMax|main|glossiness", aiTextureType_NONE, 0, glossiness), aiReturn_SUCCESS);
+    EXPECT_EQ(glossiness, 0.33f);
+
+    int useGlossiness;
+    ASSERT_EQ(mat->Get("$raw.3dsMax|main|useGlossiness", aiTextureType_NONE, 0, useGlossiness), aiReturn_SUCCESS);
+    EXPECT_EQ(useGlossiness, 1); // 1 = Glossiness map is glossiness, 2 = Glossiness map is roughness.
+
+    float bumpMapAmt; // Presumably amount.
+    ASSERT_EQ(mat->Get("$raw.3dsMax|main|bump_map_amt", aiTextureType_NONE, 0, bumpMapAmt), aiReturn_SUCCESS);
+    EXPECT_EQ(bumpMapAmt, 0.66f);
+    
+    aiColor4D emitColor;
+    ASSERT_EQ(mat->Get("$raw.3dsMax|main|emit_color", aiTextureType_NONE, 0, emitColor), aiReturn_SUCCESS);
+    EXPECT_EQ(emitColor, aiColor4D(1, 0, 1, 1));
+}
diff --git a/test/unit/utFindDegenerates.cpp b/test/unit/utFindDegenerates.cpp
index 88ad9640a..280a5199d 100644
--- a/test/unit/utFindDegenerates.cpp
+++ b/test/unit/utFindDegenerates.cpp
@@ -40,8 +40,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #include "UnitTestPCH.h"
 
+#include "../../include/assimp/scene.h"
 #include "PostProcessing/FindDegenerates.h"
 
+#include <memory>
+
 using namespace std;
 using namespace Assimp;
 
@@ -147,3 +150,59 @@ TEST_F(FindDegeneratesProcessTest, testDegeneratesRemovalWithAreaCheck) {
 
     EXPECT_EQ(mMesh->mNumUVComponents[1] - 100, mMesh->mNumFaces);
 }
+
+namespace
+{
+    std::unique_ptr<aiMesh> getDegenerateMesh()
+    {
+        std::unique_ptr<aiMesh> mesh(new aiMesh);
+        mesh->mNumVertices = 2;
+        mesh->mVertices = new aiVector3D[2];
+        mesh->mVertices[0] = aiVector3D{ 0.0f, 0.0f, 0.0f };
+        mesh->mVertices[1] = aiVector3D{ 1.0f, 0.0f, 0.0f };
+        mesh->mNumFaces = 1;
+        mesh->mFaces = new aiFace[1];
+        mesh->mFaces[0].mNumIndices = 3;
+        mesh->mFaces[0].mIndices = new unsigned int[3];
+        mesh->mFaces[0].mIndices[0] = 0;
+        mesh->mFaces[0].mIndices[1] = 1;
+        mesh->mFaces[0].mIndices[2] = 0;
+        return mesh;
+    }
+}
+
+TEST_F(FindDegeneratesProcessTest, meshRemoval) {
+    mProcess->EnableAreaCheck(true);
+    mProcess->EnableInstantRemoval(true);
+    mProcess->ExecuteOnMesh(mMesh);
+
+    std::unique_ptr<aiScene> scene(new aiScene);
+    scene->mNumMeshes = 5;
+    scene->mMeshes = new aiMesh*[5];
+
+    /// Use the mesh which doesn't get completely stripped of faces from the main test.
+    aiMesh* meshWhichSurvives = mMesh;
+    mMesh = nullptr;
+
+    scene->mMeshes[0] = getDegenerateMesh().release();
+    scene->mMeshes[1] = getDegenerateMesh().release();
+    scene->mMeshes[2] = meshWhichSurvives;
+    scene->mMeshes[3] = getDegenerateMesh().release();
+    scene->mMeshes[4] = getDegenerateMesh().release();
+
+    scene->mRootNode = new aiNode;
+    scene->mRootNode->mNumMeshes = 5;
+    scene->mRootNode->mMeshes = new unsigned int[5];
+    scene->mRootNode->mMeshes[0] = 0;
+    scene->mRootNode->mMeshes[1] = 1;
+    scene->mRootNode->mMeshes[2] = 2;
+    scene->mRootNode->mMeshes[3] = 3;
+    scene->mRootNode->mMeshes[4] = 4;
+
+    mProcess->Execute(scene.get());    
+
+    EXPECT_EQ(scene->mNumMeshes, 1);
+    EXPECT_EQ(scene->mMeshes[0], meshWhichSurvives);
+    EXPECT_EQ(scene->mRootNode->mNumMeshes, 1);
+    EXPECT_EQ(scene->mRootNode->mMeshes[0], 0);    
+}
diff --git a/test/unit/utImporter.cpp b/test/unit/utImporter.cpp
index 0be0037df..5e84b2ae4 100644
--- a/test/unit/utImporter.cpp
+++ b/test/unit/utImporter.cpp
@@ -279,3 +279,105 @@ TEST_F(ImporterTest, SearchFileHeaderForTokenTest) {
     //DefaultIOSystem ioSystem;
     //    BaseImporter::SearchFileHeaderForToken( &ioSystem, assetPath, Token, 2 )
 }
+
+
+namespace
+{
+    // Description for an importer which fails in specific ways.
+    aiImporterDesc s_failingImporterDescription = {
+        "Failing importer",
+        "assimp team",
+        "",
+        "",
+        0,
+        1,
+        0,
+        1,
+        0,
+        "fail"
+    };
+
+    // This importer fails in specific ways.
+    class FailingImporter : public Assimp::BaseImporter {
+    public:
+        virtual ~FailingImporter() = default;
+        virtual bool CanRead( const std::string&, Assimp::IOSystem*, bool ) const override
+        {
+            return true;
+        }
+
+    protected:
+        virtual const aiImporterDesc* GetInfo() const override { return &s_failingImporterDescription; }
+
+        virtual void InternReadFile( const std::string& pFile, aiScene*, Assimp::IOSystem* ) override
+        {
+            if (pFile == "deadlyImportError.fail")
+            {
+                throw DeadlyImportError("Deadly import error test. Details: ", 42, " More Details: ", "Failure");
+            }
+            else if (pFile == "stdException.fail")
+            {
+                throw std::runtime_error("std::exception test");
+            }
+            else if (pFile == "unexpectedException.fail")
+            {
+                throw 5;
+            }
+        }
+    };
+}
+
+TEST_F(ImporterTest, deadlyImportError)
+{
+    pImp->RegisterLoader(new FailingImporter);
+    pImp->SetIOHandler(new TestIOSystem);
+    const aiScene* scene = pImp->ReadFile("deadlyImportError.fail", 0);
+    EXPECT_EQ(scene, nullptr);
+    EXPECT_STREQ(pImp->GetErrorString(), "Deadly import error test. Details: 42 More Details: Failure");
+    EXPECT_NE(pImp->GetException(), std::exception_ptr());
+}
+
+TEST_F(ImporterTest, stdException)
+{
+    pImp->RegisterLoader(new FailingImporter);
+    pImp->SetIOHandler(new TestIOSystem);
+    const aiScene* scene = pImp->ReadFile("stdException.fail", 0);
+    EXPECT_EQ(scene, nullptr);
+    EXPECT_STREQ(pImp->GetErrorString(), "std::exception test");
+    EXPECT_NE(pImp->GetException(), std::exception_ptr());
+    try
+    {
+        std::rethrow_exception(pImp->GetException());
+    }
+    catch(const std::exception& e)
+    {
+        EXPECT_STREQ(e.what(), "std::exception test");
+    }
+    catch(...)
+    {
+        EXPECT_TRUE(false);
+    }
+}
+
+TEST_F(ImporterTest, unexpectedException)
+{
+    pImp->RegisterLoader(new FailingImporter);
+    pImp->SetIOHandler(new TestIOSystem);
+    const aiScene* scene = pImp->ReadFile("unexpectedException.fail", 0);
+
+    EXPECT_EQ(scene, nullptr);
+    EXPECT_STREQ(pImp->GetErrorString(), "Unknown exception");
+    ASSERT_NE(pImp->GetException(), std::exception_ptr());
+    try
+    {
+        std::rethrow_exception(pImp->GetException());
+    }
+    catch(int x)
+    {
+        EXPECT_EQ(x, 5);
+    }
+    catch(...)
+    {
+        EXPECT_TRUE(false);
+    }
+}
diff --git a/test/unit/utIssues.cpp b/test/unit/utIssues.cpp
index 19d1815cb..5dba553ec 100644
--- a/test/unit/utIssues.cpp
+++ b/test/unit/utIssues.cpp
@@ -52,7 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 using namespace Assimp;
 
 class utIssues : public ::testing::Test {
-
+    // empty
 };
 
 #ifndef ASSIMP_BUILD_NO_EXPORT
@@ -64,12 +64,13 @@ TEST_F( utIssues, OpacityBugWhenExporting_727 ) {
     Assimp::Exporter exporter;
                 
     std::string path = "dae";
-    const aiExportFormatDesc *desc( exporter.GetExportFormatDescription( 0 ) );
+    const aiExportFormatDesc *desc = exporter.GetExportFormatDescription( 0 );
     EXPECT_NE( desc, nullptr );
+    path.append(".");
     path.append( desc->fileExtension );
     EXPECT_EQ( AI_SUCCESS, exporter.Export( scene, desc->id, path ) );
     const aiScene *newScene( importer.ReadFile( path, aiProcess_ValidateDataStructure ) );
-    EXPECT_TRUE( NULL != newScene );
+    ASSERT_NE( nullptr, newScene );
     float newOpacity;
     if ( newScene->mNumMaterials > 0 ) {
         std::cout << "Desc = " << desc->description << "\n";
diff --git a/test/unit/utOpenGEXImportExport.cpp b/test/unit/utOpenGEXImportExport.cpp
index 86836bfea..9362dc2a3 100644
--- a/test/unit/utOpenGEXImportExport.cpp
+++ b/test/unit/utOpenGEXImportExport.cpp
@@ -48,7 +48,7 @@ using namespace Assimp;
 
 class utOpenGEXImportExport : public AbstractImportExportBase {
 public:
-    virtual bool importerTest() {
+    bool importerTest() override {
         Assimp::Importer importer;
         const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/OpenGEX/Example.ogex", 0);
         return nullptr != scene;
diff --git a/test/unit/utX3DImportExport.cpp b/test/unit/utX3DImportExport.cpp
index 5b3438d91..9c487c679 100644
--- a/test/unit/utX3DImportExport.cpp
+++ b/test/unit/utX3DImportExport.cpp
@@ -52,7 +52,7 @@ public:
     virtual bool importerTest() {
         Assimp::Importer importer;
         const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/X3D/ComputerKeyboard.x3d", aiProcess_ValidateDataStructure);
-        return nullptr != scene;
+        return nullptr == scene;
     }
 };
 
diff --git a/test/unit/utglTF2ImportExport.cpp b/test/unit/utglTF2ImportExport.cpp
index 6791d5f89..e991b04f3 100644
--- a/test/unit/utglTF2ImportExport.cpp
+++ b/test/unit/utglTF2ImportExport.cpp
@@ -46,11 +46,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/scene.h>
 #include <assimp/Exporter.hpp>
 #include <assimp/Importer.hpp>
+#include <assimp/LogStream.hpp>
+#include <assimp/DefaultLogger.hpp>
+
 
 #include <array>
 
 #include <assimp/pbrmaterial.h>
-
 using namespace Assimp;
 
 class utglTF2ImportExport : public AbstractImportExportBase {
@@ -541,3 +543,34 @@ TEST_F(utglTF2ImportExport, norootnode_issue_3269) {
     const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/glTF2/issue_3269/texcoord_crash.gltf", aiProcess_ValidateDataStructure);
     ASSERT_EQ(scene, nullptr);
 }
+
+TEST_F(utglTF2ImportExport, indexOutOfRange) {
+    // The contents of an asset should not lead to an assert.
+    Assimp::Importer importer;
+
+    struct LogObserver : Assimp::LogStream {
+        bool m_observedWarning = false;
+        void write(const char *message) override {
+            m_observedWarning = m_observedWarning || std::strstr(message, "faces were dropped");
+        }
+    };
+    LogObserver logObserver;
+    
+    DefaultLogger::get()->attachStream(&logObserver);
+    const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/glTF2/IndexOutOfRange/IndexOutOfRange.gltf", aiProcess_ValidateDataStructure);
+    ASSERT_NE(scene, nullptr);
+    ASSERT_NE(scene->mRootNode, nullptr);
+    ASSERT_EQ(scene->mNumMeshes, 1u);
+    EXPECT_EQ(scene->mMeshes[0]->mNumFaces, 11u);
+    DefaultLogger::get()->detachStream(&logObserver);
+    EXPECT_TRUE(logObserver.m_observedWarning);
+}
+
+TEST_F(utglTF2ImportExport, allIndicesOutOfRange) {
+    // The contents of an asset should not lead to an assert.
+    Assimp::Importer importer;
+    const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/glTF2/IndexOutOfRange/AllIndicesOutOfRange.gltf", aiProcess_ValidateDataStructure);
+    ASSERT_EQ(scene, nullptr);
+    std::string error = importer.GetErrorString();
+    ASSERT_NE(error.find("Mesh \"Mesh\" has no faces"), std::string::npos);
+}
diff --git a/tools/assimp_cmd/CMakeLists.txt b/tools/assimp_cmd/CMakeLists.txt
index d46d09c2b..a0eb98a89 100644
--- a/tools/assimp_cmd/CMakeLists.txt
+++ b/tools/assimp_cmd/CMakeLists.txt
@@ -59,6 +59,8 @@ ADD_EXECUTABLE( assimp_cmd
   Export.cpp
 )
 
+TARGET_USE_COMMON_OUTPUT_DIRECTORY(assimp_cmd)
+
 SET_PROPERTY(TARGET assimp_cmd PROPERTY DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
 
 TARGET_LINK_LIBRARIES( assimp_cmd assimp ${ZLIB_LIBRARIES} )
diff --git a/tools/assimp_view/CMakeLists.txt b/tools/assimp_view/CMakeLists.txt
index 2785bd882..222722388 100644
--- a/tools/assimp_view/CMakeLists.txt
+++ b/tools/assimp_view/CMakeLists.txt
@@ -86,6 +86,8 @@ ADD_EXECUTABLE(  assimp_viewer WIN32
   txi.bmp
 )
 
+TARGET_USE_COMMON_OUTPUT_DIRECTORY(assimp_viewer)
+
 SET_PROPERTY(TARGET assimp_viewer PROPERTY DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
 
 IF ( MSVC )
diff --git a/tools/assimp_view/MeshRenderer.cpp b/tools/assimp_view/MeshRenderer.cpp
index d93bb4aea..972b3db24 100644
--- a/tools/assimp_view/MeshRenderer.cpp
+++ b/tools/assimp_view/MeshRenderer.cpp
@@ -161,4 +161,4 @@ int CMeshRenderer::DrawSorted(unsigned int iIndex,const aiMatrix4x4& mWorld) {
 
     return 1;
 }
-};
+}
diff --git a/tools/assimp_view/MessageProc.cpp b/tools/assimp_view/MessageProc.cpp
index 80589e647..cebb78e22 100644
--- a/tools/assimp_view/MessageProc.cpp
+++ b/tools/assimp_view/MessageProc.cpp
@@ -2143,7 +2143,7 @@ INT_PTR CALLBACK AboutMessageProc(HWND hwndDlg,UINT uMsg,
         }
     return FALSE;
     }
-};
+}
 
 using namespace AssimpView;