Remove some assert()

.github/instructions/copilot-instructions.md

@@ -1,92 +0,0 @@
-# Copilot Review Instructions for TinyGLTF
-
-This document provides guidelines for reviewing code changes in the TinyGLTF repository.
-
-## Memory Safety
-
-- **Buffer Overflows**: Check for proper bounds checking when accessing arrays, vectors, and buffers. Verify that buffer sizes are validated before read/write operations.
-- **Null Pointer Dereferences**: Ensure all pointers are checked for null before dereferencing, especially when handling optional glTF fields.
-- **Memory Leaks**: Verify proper resource management, including RAII patterns for file handles, image data, and dynamically allocated memory.
-- **Use-After-Free**: Check for proper lifetime management of objects, especially when dealing with callbacks and asynchronous operations.
-
-## Error Handling
-
-- **File I/O**: Verify that all file operations have proper error checking and meaningful error messages.
-- **JSON Parsing**: Ensure JSON parsing errors are caught and reported with helpful context about the location and nature of the error.
-- **Resource Loading**: Check that failures in loading images, buffers, and other resources are properly handled and don't cause crashes.
-- **Error Propagation**: Verify that errors are properly propagated through the call stack with appropriate error messages.
-
-## glTF 2.0 Specification Compliance
-
-- **Required Fields**: Ensure all required glTF fields are validated and present.
-- **Data Types**: Verify that data types match the glTF specification (e.g., component types, accessor types).
-- **Constraints**: Check that glTF constraints are enforced (e.g., valid ranges for enums, buffer stride requirements).
-- **Extensions**: Verify proper handling of glTF extensions and that unknown extensions are handled gracefully.
-- **Validation**: Ensure new features align with the glTF 2.0 specification from the Khronos Group.
-
-## Cross-Platform Compatibility
-
-- **Windows**: Check for proper handling of Windows-specific issues (path separators, line endings, file operations).
-- **Linux**: Verify compatibility with various Linux distributions and compilers (GCC, Clang).
-- **macOS**: Ensure macOS-specific considerations are addressed (case-sensitive filesystems, Clang compatibility).
-- **Mobile Platforms**: Consider Android and iOS compatibility where applicable.
-- **Endianness**: Verify proper handling of byte order when reading binary data.
-- **Compiler Compatibility**: Ensure code compiles with C++11 standard and supported compilers (MSVC, GCC, Clang).
-
-## Edge Cases in glTF Parsing
-
-- **Empty/Minimal Files**: Verify handling of minimal valid glTF files.
-- **Large Files**: Check for proper handling of large glTF files and buffers without memory exhaustion.
-- **Malformed Data**: Ensure graceful handling of malformed or invalid glTF data.
-- **Missing Optional Fields**: Verify correct behavior when optional glTF fields are absent.
-- **Edge Values**: Check handling of boundary values (e.g., maximum buffer sizes, extreme floating-point values).
-- **Base64 Encoding**: Verify proper handling of base64-encoded data URIs and invalid encodings.
-
-## Backwards Compatibility
-
-- **API Changes**: Ensure public API changes maintain backwards compatibility or are properly deprecated.
-- **Breaking Changes**: Flag any breaking changes for major version updates and document migration paths.
-- **Binary Compatibility**: Consider ABI stability for header-only library changes.
-- **Default Behavior**: Verify that default behavior of existing functionality remains unchanged.
-
-## Performance Considerations
-
-- **Parsing Performance**: Check for unnecessary copies, redundant allocations, and inefficient algorithms in parsing logic.
-- **Memory Usage**: Verify efficient memory usage, especially when loading large glTF files.
-- **I/O Operations**: Ensure efficient file reading and minimize unnecessary disk access.
-- **String Operations**: Check for efficient string handling (use of string_view, move semantics).
-- **STL Usage**: Verify appropriate use of STL containers and algorithms.
-
-## Documentation
-
-- **Public API**: Ensure all public functions, classes, and methods have clear documentation comments.
-- **Parameters**: Verify that function parameters are documented, including expected ranges and constraints.
-- **Return Values**: Document return values and possible error conditions.
-- **Examples**: Check that complex features include usage examples.
-- **Changelog**: Verify that significant changes are documented in release notes or changelog.
-
-## Testing
-
-- **Test Coverage**: Ensure new features include appropriate unit tests or integration tests.
-- **Edge Cases**: Verify that tests cover edge cases and error conditions.
-- **Cross-Platform Tests**: Check that tests run on all supported platforms.
-- **Regression Tests**: Ensure bug fixes include regression tests to prevent recurrence.
-- **Sample Files**: Verify that changes are tested with various valid and invalid glTF sample files.
-
-## Code Style Consistency
-
-- **Header-Only Pattern**: Maintain the header-only library structure.
-- **Naming Conventions**: Follow existing naming conventions (CamelCase for types, snake_case for functions where applicable).
-- **Formatting**: Adhere to the existing code formatting style (check `.clang-format` if available).
-- **Include Guards**: Verify proper include guards and header organization.
-- **Namespace Usage**: Ensure proper use of the `tinygltf` namespace.
-- **Comments**: Maintain consistent comment style with existing code.
-- **C++11 Compliance**: Verify that code uses C++11 features appropriately and doesn't require newer standards unless specified.
-
-## Additional Considerations
-
-- **Third-Party Dependencies**: Minimize new dependencies; prefer existing dependencies (json.hpp, stb_image).
-- **Warnings**: Ensure code compiles without warnings on supported compilers.
-- **const Correctness**: Verify proper use of const for parameters and methods.
-- **RAII**: Prefer RAII patterns for resource management over manual cleanup.
-- **noexcept**: Use noexcept appropriately for move constructors and move assignment operators.

.github/workflows/ci.yml

@@ -1,330 +0,0 @@
-name: Comprehensive CI
-
-on:
-  push:
-    branches:
-      - master
-      - release
-      - devel
-  pull_request:
-    branches:
-      - master
-      - release
-      - devel
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-jobs:
-  # Linux x64 - GCC
-  linux-gcc-x64:
-    runs-on: ubuntu-latest
-    name: Linux x64 (GCC)
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Configure
-        run: cmake -B build -DTINYGLTF_BUILD_LOADER_EXAMPLE=ON
-
-      - name: Build
-        run: cmake --build build
-
-      - name: Run loader_example
-        run: ./build/loader_example models/Cube/Cube.gltf
-
-      - name: Run tests
-        run: ctest --test-dir build --output-on-failure
-
-  # Linux x64 - Clang 21
-  linux-clang-x64:
-    runs-on: ubuntu-24.04
-    name: Linux x64 (Clang 21)
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Install Clang 21
-        run: |
-          wget https://apt.llvm.org/llvm.sh
-          chmod +x llvm.sh
-          sudo ./llvm.sh 21
-
-      - name: Configure
-        run: |
-          cmake -B build -DCMAKE_C_COMPILER=clang-21 -DCMAKE_CXX_COMPILER=clang++-21 -DTINYGLTF_BUILD_LOADER_EXAMPLE=ON
-
-      - name: Build
-        run: cmake --build build
-
-      - name: Run loader_example
-        run: |
-          ./build/loader_example models/Cube/Cube.gltf
-
-      - name: Run tests
-        run: ctest --test-dir build --output-on-failure
-
-  # Linux ARM64 - GCC (native)
-  linux-arm64:
-    runs-on: ubuntu-24.04-arm
-    name: Linux ARM64 (GCC)
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Configure
-        run: cmake -B build -DTINYGLTF_BUILD_LOADER_EXAMPLE=ON
-
-      - name: Build
-        run: cmake --build build
-
-      - name: Run loader_example
-        run: ./build/loader_example models/Cube/Cube.gltf
-
-      - name: Run tests
-        run: ctest --test-dir build --output-on-failure
-
-  # macOS ARM64 Apple Silicon
-  macos-arm64:
-    runs-on: macos-14
-    name: macOS ARM64 Apple Silicon (Clang)
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Configure
-        run: cmake -B build -DTINYGLTF_BUILD_LOADER_EXAMPLE=ON
-
-      - name: Build
-        run: cmake --build build
-
-      - name: Run loader_example
-        run: ./build/loader_example models/Cube/Cube.gltf
-
-      - name: Run tests
-        run: ctest --test-dir build --output-on-failure
-
-  # Windows x64 - MSVC
-  windows-msvc-x64:
-    runs-on: windows-latest
-    name: Windows x64 (MSVC)
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Configure
-        run: |
-          mkdir build
-          cd build
-          cmake -G "Visual Studio 17 2022" -A x64 -DTINYGLTF_BUILD_LOADER_EXAMPLE=On -DTINYGLTF_BUILD_GL_EXAMPLES=Off -DTINYGLTF_BUILD_VALIDATOR_EXAMPLE=Off ..
-
-      - name: Build
-        run: cmake --build build --config Release
-
-      - name: Run loader_example
-        run: |
-          .\build\Release\loader_example.exe models\Cube\Cube.gltf
-
-      - name: Run tests
-        run: ctest --test-dir build -C Release --output-on-failure
-
-  # Windows x86 - MSVC
-  windows-msvc-x86:
-    runs-on: windows-latest
-    name: Windows x86 (MSVC)
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Configure
-        run: |
-          mkdir build
-          cd build
-          cmake -G "Visual Studio 17 2022" -A Win32 -DTINYGLTF_BUILD_LOADER_EXAMPLE=On -DTINYGLTF_BUILD_GL_EXAMPLES=Off -DTINYGLTF_BUILD_VALIDATOR_EXAMPLE=Off ..
-
-      - name: Build
-        run: cmake --build build --config Release
-
-      - name: Run tests
-        run: ctest --test-dir build -C Release --output-on-failure
-
-  # Windows ARM64 - MSVC (cross-compile)
-  windows-msvc-arm64:
-    runs-on: windows-latest
-    name: Windows ARM64 (MSVC) - Cross-compile
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Configure
-        run: |
-          mkdir build
-          cd build
-          cmake -G "Visual Studio 17 2022" -A ARM64 -DTINYGLTF_BUILD_LOADER_EXAMPLE=On -DTINYGLTF_BUILD_GL_EXAMPLES=Off -DTINYGLTF_BUILD_VALIDATOR_EXAMPLE=Off ..
-
-      - name: Build
-        run: cmake --build build --config Release
-
-  # Windows MinGW - MSYS2
-  windows-mingw-msys2:
-    runs-on: windows-latest
-    name: Windows x64 (MinGW MSYS2)
-    defaults:
-      run:
-        shell: msys2 {0}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: UCRT64
-          install: base-devel
-          pacboy: >-
-            cc:p cmake:p ninja:p
-          update: true
-          release: false
-
-      - name: Build with CMake
-        run: |
-          cmake -G"Ninja" -S . -B build
-          cmake --build build
-
-      - name: Run loader_example
-        run: |
-          ./build/loader_example models/Cube/Cube.gltf
-
-      - name: Run tests
-        run: ctest --test-dir build --output-on-failure
-
-  # Linux -> Windows MinGW Cross-compile
-  linux-mingw-cross:
-    runs-on: ubuntu-latest
-    name: Linux→Windows (MinGW Cross) - Build Only
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Install MinGW
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y build-essential mingw-w64
-
-      - name: Build
-        run: |
-          x86_64-w64-mingw32-g++ -std=c++11 -o loader_example.exe loader_example.cc
-
-  # Special Configuration: No Exceptions
-  linux-noexception:
-    runs-on: ubuntu-latest
-    name: Linux x64 (GCC) - No Exceptions
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Build loader_example
-        run: |
-          g++ -DTINYGLTF_NOEXCEPTION -std=c++11 -o loader_example loader_example.cc
-
-      - name: Run loader_example
-        run: |
-          ./loader_example models/Cube/Cube.gltf
-
-      - name: Build and run unit tests
-        run: |
-          cd tests
-          g++ -DTINYGLTF_NOEXCEPTION -I../ -std=c++11 -g -O0 -o tester_noexcept tester.cc
-          ./tester_noexcept
-
-  # Special Configuration: Header-Only Mode
-  linux-header-only:
-    runs-on: ubuntu-latest
-    name: Linux x64 (GCC) - Header-Only Mode
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Build with CMake Header-Only
-        run: |
-          mkdir build
-          cmake -B build -DTINYGLTF_HEADER_ONLY=ON -DTINYGLTF_BUILD_LOADER_EXAMPLE=ON
-          cmake --build build
-
-      - name: Run loader_example
-        run: |
-          ./build/loader_example models/Cube/Cube.gltf
-
-      - name: Run tests
-        run: ctest --test-dir build --output-on-failure
-
-  # Special Configuration: RapidJSON Backend
-  linux-rapidjson:
-    runs-on: ubuntu-latest
-    name: Linux x64 (GCC) - RapidJSON Backend
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Clone RapidJSON
-        run: |
-          git clone https://github.com/Tencent/rapidjson
-
-      - name: Configure
-        run: |
-          cmake -B build -DTINYGLTF_USE_RAPIDJSON=ON -DTINYGLTF_BUILD_LOADER_EXAMPLE=ON -DCMAKE_PREFIX_PATH=$PWD/rapidjson
-
-      - name: Build
-        run: cmake --build build
-
-      - name: Run loader_example
-        run: |
-          ./build/loader_example models/Cube/Cube.gltf
-
-      - name: Run tests
-        run: ctest --test-dir build --output-on-failure
-
-  # Special Configuration: AddressSanitizer
-  linux-asan:
-    runs-on: ubuntu-latest
-    name: Linux x64 (Clang) - AddressSanitizer
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Build loader_example with ASan
-        run: |
-          clang++ -fsanitize=address -std=c++11 -g -O1 -o loader_example loader_example.cc
-
-      - name: Run loader_example
-        run: |
-          ./loader_example models/Cube/Cube.gltf
-
-      - name: Build and run unit tests with ASan
-        run: |
-          cd tests
-          clang++ -fsanitize=address -I../ -std=c++11 -g -O1 -o tester tester.cc
-          ./tester
-
-  # Special Configuration: UndefinedBehaviorSanitizer
-  linux-ubsan:
-    runs-on: ubuntu-latest
-    name: Linux x64 (Clang) - UndefinedBehaviorSanitizer
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Build loader_example with UBSan
-        run: |
-          clang++ -fsanitize=undefined -std=c++11 -g -O1 -o loader_example loader_example.cc
-
-      - name: Run loader_example
-        run: |
-          ./loader_example models/Cube/Cube.gltf
-
-      - name: Build and run unit tests with UBSan
-        run: |
-          cd tests
-          clang++ -fsanitize=undefined -I../ -std=c++11 -g -O1 -o tester tester.cc
-          ./tester

.github/workflows/mingw-w64-msys2.yml

@@ -1,45 +0,0 @@
-name: MSYS2 MinGW-w64 Windows 64bit Build
-
-on:
-  push:
-    branches:
-      - release
-      - devel
-    paths:
-    - 'tiny_gltf.*'
-    - 'CMakeLists.txt'
-    - '.github/workflows/mingw-w64-msys2.yml'
-  pull_request:
-  workflow_dispatch:
-
-jobs:
-  mingw-w64-msys2-build:
-    name: MSYS2 MinGW-w64 Windows Build
-    runs-on: windows-latest
-    defaults:
-      run:
-        shell: msys2 {0}
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Install core & build dependencies
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: UCRT64
-          install: base-devel
-          pacboy: >-
-            cc:p cmake:p ninja:p
-          update: true
-          release: false
-
-      - name: Configure
-        run: |
-          cmake \
-            -G"Ninja" \
-            -S . \
-            -B build
-
-      - name: Build
-        run: |
-          cmake --build build
-

.gitignore

@@ -24,7 +24,6 @@ premake5.tar.gz
 #binary directories
 bin/
 obj/
-out/
 
 #runtime gui config
 imgui.ini

.travis-before-install.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+if [[ "$TRAVIS_OS_NAME" == "osx" ]]
+then
+    brew upgrade
+    curl -o premake5.tar.gz https://github.com/premake/premake-core/releases/download/v5.0.0-alpha12/premake-5.0.0-alpha12-macosx.tar.gz
+else
+    wget https://github.com/premake/premake-core/releases/download/v5.0.0-alpha12/premake-5.0.0-alpha12-linux.tar.gz -O premake5.tar.gz
+fi
+tar xzf premake5.tar.gz

.travis.yml

@@ -0,0 +1,63 @@
+language: cpp
+sudo: false
+matrix:
+  include:
+  - addons: &1
+      apt:
+        sources:
+        - george-edison55-precise-backports
+        - ubuntu-toolchain-r-test
+        - llvm-toolchain-trusty-3.9
+        packages:
+        - g++-4.9
+        - clang-3.9
+    compiler: clang
+    env: COMPILER_VERSION=3.9 BUILD_TYPE=Debug
+  - addons: *1
+    compiler: clang
+    env: COMPILER_VERSION=3.9 BUILD_TYPE=Release
+  - addons: &2
+      apt:
+        sources:
+        - george-edison55-precise-backports
+        - ubuntu-toolchain-r-test
+        packages:
+        - g++-4.9
+    compiler: gcc
+    env: COMPILER_VERSION=4.9 BUILD_TYPE=Debug EXTRA_CXXFLAGS="-fsanitize=address"
+  - addons: *2
+    compiler: gcc
+    env: COMPILER_VERSION=4.9 BUILD_TYPE=Release EXTRA_CXXFLAGS="-fsanitize=address"
+  - addons: *1
+    compiler: clang
+    env: COMPILER_VERSION=3.9 BUILD_TYPE=Debug CFLAGS="-O0" CXXFLAGS="-O0"
+  - addons: &3
+      apt:
+        sources:
+        - ubuntu-toolchain-r-test
+        packages:
+        - g++-4.8
+    compiler: gcc
+    env: COMPILER_VERSION=4.8 BUILD_TYPE=Debug
+  - addons: *3
+    compiler: gcc
+    env: COMPILER_VERSION=4.8 BUILD_TYPE=Release
+
+before_install:
+  - ./.travis-before-install.sh
+
+
+script:
+  - export CC="${CC}-${COMPILER_VERSION}"
+  - export CXX="${CXX}-${COMPILER_VERSION}"
+  - ${CC} -v
+  - ${CXX} ${EXTRA_CXXFLAGS} -std=c++11 -Wall -g -o loader_example loader_example.cc
+  - ./loader_example ./models/Cube/Cube.gltf
+  - cd tests
+  - clang++ -v
+  - make
+  - ./tester
+  - ./tester_noexcept
+  - cd ../examples/raytrace
+  - ../../premake5 gmake
+  - make

CMakeLists.txt

@@ -1,53 +1,38 @@
 cmake_minimum_required(VERSION 3.6)
 
-project(tinygltf)
+PROJECT (tinygltf)
 
 include(GNUInstallDirs)
 include(CMakePackageConfigHelpers)
 
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_STANDARD_REQUIRED On)
-set(CMAKE_CXX_EXTENSIONS Off)
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+SET(CMAKE_CXX_STANDARD 11)
 
 option(TINYGLTF_BUILD_LOADER_EXAMPLE "Build loader_example(load glTF and dump infos)" ON)
 option(TINYGLTF_BUILD_GL_EXAMPLES "Build GL exampels(requires glfw, OpenGL, etc)" OFF)
 option(TINYGLTF_BUILD_VALIDATOR_EXAMPLE "Build validator exampe" OFF)
 option(TINYGLTF_BUILD_BUILDER_EXAMPLE "Build glTF builder example" OFF)
-option(TINYGLTF_BUILD_TESTS "Build unit tests" OFF)
 option(TINYGLTF_HEADER_ONLY "On: header-only mode. Off: create tinygltf library(No TINYGLTF_IMPLEMENTATION required in your project)" OFF)
 option(TINYGLTF_INSTALL "Install tinygltf files during install step. Usually set to OFF if you include tinygltf through add_subdirectory()" ON)
-option(TINYGLTF_INSTALL_VENDOR "Install vendored nlohmann/json and nothings/stb headers" ON)
 
 if (TINYGLTF_BUILD_LOADER_EXAMPLE)
-  add_executable(loader_example
+  ADD_EXECUTABLE ( loader_example
     loader_example.cc
     )
 endif (TINYGLTF_BUILD_LOADER_EXAMPLE)
 
 if (TINYGLTF_BUILD_GL_EXAMPLES)
-  add_subdirectory( examples/gltfutil )
-  add_subdirectory( examples/glview )
+  ADD_SUBDIRECTORY ( examples/gltfutil )
+  ADD_SUBDIRECTORY ( examples/glview )
 endif (TINYGLTF_BUILD_GL_EXAMPLES)
 
 if (TINYGLTF_BUILD_VALIDATOR_EXAMPLE)
-  add_subdirectory( examples/validator )
+  ADD_SUBDIRECTORY ( examples/validator )
 endif (TINYGLTF_BUILD_VALIDATOR_EXAMPLE)
 
 if (TINYGLTF_BUILD_BUILDER_EXAMPLE)
-  add_subdirectory ( examples/build-gltf )
+  ADD_SUBDIRECTORY ( examples/build-gltf )
 endif (TINYGLTF_BUILD_BUILDER_EXAMPLE)
 
-if (TINYGLTF_BUILD_TESTS)
-  enable_testing()
-  add_executable(tester tests/tester.cc)
-  target_include_directories(tester PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/tests
-  )
-  add_test(NAME tester COMMAND tester WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests)
-endif (TINYGLTF_BUILD_TESTS)
-
 #
 # for add_subdirectory and standalone build
 #
@@ -73,26 +58,19 @@ endif (TINYGLTF_HEADER_ONLY)
 
 if (TINYGLTF_INSTALL)
   install(TARGETS tinygltf EXPORT tinygltfTargets)
-  install(EXPORT tinygltfTargets NAMESPACE tinygltf:: FILE TinyGLTFTargets.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/tinygltf)
+  install(EXPORT tinygltfTargets NAMESPACE tinygltf:: FILE TinyGLTFTargets.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
   configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/TinyGLTFConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/TinyGLTFConfig.cmake INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/TinyGLTFConfig.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/tinygltf)
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/TinyGLTFConfig.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
   # Do not install .lib even if !TINYGLTF_HEADER_ONLY
 
   INSTALL ( FILES
+    json.hpp
+    stb_image.h
+    stb_image_write.h
     tiny_gltf.h
     ${TINYGLTF_EXTRA_SOUECES}
     DESTINATION
     include
     )
 
-    if(TINYGLTF_INSTALL_VENDOR)
-      INSTALL ( FILES
-        json.hpp
-        stb_image.h
-        stb_image_write.h
-        DESTINATION
-        include
-        )
-    endif()
-
 endif(TINYGLTF_INSTALL)

README.md

@@ -9,7 +9,7 @@ If you are looking for old, C++03 version, please use `devel-picojson` branch (b
 ## Status
 
 Currently TinyGLTF is stable and maintenance mode. No drastic changes and feature additions planned.
- - v2.9.0 Various fixes and improvements. Filesystem callback API change.
+
  - v2.8.0 Add URICallbacks for custom URI handling in Buffer and Image. PR#397
  - v2.7.0 Change WriteImageDataFunction user callback function signature. PR#393
  - v2.6.0 Support serializing sparse accessor(Thanks to @fynv).
@@ -26,6 +26,10 @@ Currently TinyGLTF is stable and maintenance mode. No drastic changes and featur
 
 ## Builds
 
+[![Build Status](https://travis-ci.org/syoyo/tinygltf.svg?branch=devel)](https://travis-ci.org/syoyo/tinygltf)
+
+[![Build status](https://ci.appveyor.com/api/projects/status/warngenu9wjjhlm8?svg=true)](https://ci.appveyor.com/project/syoyo/tinygltf)
+
 ![C/C++ CI](https://github.com/syoyo/tinygltf/workflows/C/C++%20CI/badge.svg)
 
 ## Features
@@ -105,7 +109,6 @@ WASI build example is located in [wasm](wasm) .
 * [SanityEngine](https://github.com/DethRaid/SanityEngine) - A C++/D3D12 renderer focused on the personal and professional development of its developer
 * [Open3D](http://www.open3d.org/) - A Modern Library for 3D Data Processing
 * [Supernova Engine](https://github.com/supernovaengine/supernova) - Game engine for 2D and 3D projects with Lua or C++ in data oriented design.
-* [Wicked Engine<img src="https://github.com/turanszkij/WickedEngine/blob/master/Content/logo_small.png" width="28px" align="center"/>](https://github.com/turanszkij/WickedEngine) - 3D engine with modern graphics
 * Your projects here! (Please send PR)
 
 ## TODOs
@@ -157,10 +160,9 @@ Model model;
 TinyGLTF loader;
 std::string err;
 std::string warn;
-std::string filename = "input.gltf";
 
-bool ret = loader.LoadASCIIFromFile(&model, &err, &warn, filename);
-//bool ret = loader.LoadBinaryFromFile(&model, &err, &warn, filename); // for binary glTF(.glb)
+bool ret = loader.LoadASCIIFromFile(&model, &err, &warn, argv[1]);
+//bool ret = loader.LoadBinaryFromFile(&model, &err, &warn, argv[1]); // for binary glTF(.glb)
 
 if (!warn.empty()) {
   printf("Warn: %s\n", warn.c_str());
@@ -171,7 +173,8 @@ if (!err.empty()) {
 }
 
 if (!ret) {
-  printf("Failed to parse glTF: %s\n", filename.c_str());
+  printf("Failed to parse glTF\n");
+  return -1;
 }
 ```
 
@@ -192,6 +195,7 @@ if (!ret) {
 * `TINYGLTF_NO_INCLUDE_STB_IMAGE `: Disable including `stb_image.h` from within `tiny_gltf.h` because it has been already included before or you want to include it using custom path before including `tiny_gltf.h`.
 * `TINYGLTF_NO_INCLUDE_STB_IMAGE_WRITE `: Disable including `stb_image_write.h` from within `tiny_gltf.h` because it has been already included before or you want to include it using custom path before including `tiny_gltf.h`.
 * `TINYGLTF_USE_RAPIDJSON` : Use RapidJSON as a JSON parser/serializer. RapidJSON files are not included in TinyGLTF repo. Please set an include path to RapidJSON if you enable this feature.
+* `TINYGLTF_USE_CPP14` : Use C++14 feature(requires C++14 compiler). This may give better performance than C++11.
 
 
 ## CMake options
@@ -208,11 +212,6 @@ set(TINYGLTF_INSTALL OFF CACHE INTERNAL "" FORCE)
 add_subdirectory(/path/to/tinygltf)
 ```
 
-NOTE: Using tinygltf as a submodule doesn't automatically add the headers to your include path (as standard for many libraries). To get this functionality, add the following to the CMakeLists.txt file from above:
-
-```
-target_include_directories(${PROJECT_NAME} PRIVATE "/path/to/tinygltf")
-```
 
 ### Saving gltTF 2.0 model
 

appveyor.yml

@@ -0,0 +1,18 @@
+version: 0.9.{build}
+
+image:
+  - Visual Studio 2015
+
+# scripts that runs after repo cloning.
+install:
+  - vcsetup.bat
+
+platform: x64
+configuration: Release
+
+build:
+  parallel: true
+  project: TinyGLTFSolution.sln
+
+after_build:
+  - examples.bat

examples/build-gltf/CMakeLists.txt

@@ -1,5 +0,0 @@
-
-include_directories(${CMAKE_SOURCE_DIR})
-add_executable(create_triangle_gltf create_triangle_gltf.cpp)
-target_compile_options(create_triangle_gltf PUBLIC -Wall)
-target_link_libraries(create_triangle_gltf )

examples/glview/glview.cc

@@ -788,10 +788,8 @@ static void QuatToAngleAxis(const std::vector<double> quaternion,
     return;
   }
 
-  constexpr double pi = 3.14159265358979323846;
-
   double denom = sqrt(1-qw*qw);
-  outAngleDegrees = angleRadians * 180.0 / pi;
+  outAngleDegrees = angleRadians * 180.0 / M_PI;
   axis[0] = qx / denom;
   axis[1] = qy / denom;
   axis[2] = qz / denom;

stb_image_write.h

@@ -773,7 +773,7 @@ static int stbi_write_hdr_core(stbi__write_context *s, int x, int y, int comp, f
 #ifdef __STDC_LIB_EXT1__
       len = sprintf_s(buffer, sizeof(buffer), "EXPOSURE=          1.0000000000000\n\n-Y %d +X %d\n", y, x);
 #else
-      len = snprintf(buffer, sizeof(buffer), "EXPOSURE=          1.0000000000000\n\n-Y %d +X %d\n", y, x);
+      len = sprintf(buffer, "EXPOSURE=          1.0000000000000\n\n-Y %d +X %d\n", y, x);
 #endif
       s->func(s->context, buffer, len);
 

tests/tester.cc

@@ -474,7 +474,7 @@ TEST_CASE("image-uri-spaces", "[issue-236]") {
     }
     REQUIRE(true == ret);
     REQUIRE(err.empty());
-    REQUIRE(warn.empty());
+    REQUIRE(!warn.empty());  // relative image path won't exist in tests/
     REQUIRE(saved.images.size() == model.images.size());
 
     // The image uri in CubeImageUriMultipleSpaces.gltf is not encoded and
@@ -494,23 +494,25 @@ TEST_CASE("image-uri-spaces", "[issue-236]") {
 }
 
 TEST_CASE("serialize-empty-material", "[issue-294]") {
+
   tinygltf::Model m;
-  // Add default constructed material to model
-  m.materials.push_back({});
-  // Serialize model to output stream
+
+  tinygltf::Material mat;
+  mat.pbrMetallicRoughness.baseColorFactor = {1.0f, 1.0f, 1.0f, 1.0f}; // default baseColorFactor
+  m.materials.push_back(mat);
+
   std::stringstream os;
+
   tinygltf::TinyGLTF ctx;
   bool ret = ctx.WriteGltfSceneToStream(&m, os, false, false);
   REQUIRE(true == ret);
-  // Parse serialized model
+
+  // use nlohmann json
   nlohmann::json j = nlohmann::json::parse(os.str());
-  // Serialized materials shall hold an empty object that
-  // represents the default constructed material
-  REQUIRE(j.find("materials") != j.end());
-  REQUIRE(j["materials"].is_array());
+
   REQUIRE(1 == j["materials"].size());
-  CHECK(j["materials"][0].is_object());
-  CHECK(j["materials"][0].empty());
+  REQUIRE(j["materials"][0].is_object());
+
 }
 
 TEST_CASE("empty-skeleton-id", "[issue-321]") {
@@ -662,11 +664,10 @@ TEST_CASE("serialize-image-callback", "[issue-394]") {
 
   auto writer = [](const std::string *basepath, const std::string *filename,
                    const tinygltf::Image *image, bool embedImages,
-                   const tinygltf::FsCallbacks* fs, const tinygltf::URICallbacks *uri_cb,
-                   std::string *out_uri, void *user_pointer) -> bool {
+                   const tinygltf::URICallbacks *uri_cb, std::string *out_uri,
+                   void *user_pointer) -> bool {
     (void)basepath;
     (void)image;
-    (void)fs;
     (void)uri_cb;
     REQUIRE(*filename == "foo");
     REQUIRE(embedImages == true);
@@ -700,13 +701,12 @@ TEST_CASE("serialize-image-failure", "[issue-394]") {
 
   auto writer = [](const std::string *basepath, const std::string *filename,
                    const tinygltf::Image *image, bool embedImages,
-                   const tinygltf::FsCallbacks* fs, const tinygltf::URICallbacks *uri_cb,
-                   std::string *out_uri, void *user_pointer) -> bool {
+                   const tinygltf::URICallbacks *uri_cb, std::string *out_uri,
+                   void *user_pointer) -> bool {
     (void)basepath;
     (void)filename;
     (void)image;
     (void)embedImages;
-    (void)fs;
     (void)uri_cb;
     (void)out_uri;
     (void)user_pointer;
@@ -757,495 +757,3 @@ TEST_CASE("load-issue-416-model", "[issue-416]") {
   // external file load fails, but reading glTF itself is ok.
   REQUIRE(true == ret);
 }
-
-TEST_CASE("serialize-empty-node", "[issue-457]") {
-  tinygltf::Model m;
-  // Add default constructed node to model
-  m.nodes.push_back({});
-  // Add scene to model
-  m.scenes.push_back({});
-  // The scene's only node is the empty node
-  m.scenes.front().nodes.push_back(0);
-
-  // Serialize model to output stream
-  std::stringstream os;
-  tinygltf::TinyGLTF ctx;
-  bool ret = ctx.WriteGltfSceneToStream(&m, os, false, false);
-  REQUIRE(true == ret);
-
-  // Parse serialized model
-  nlohmann::json j = nlohmann::json::parse(os.str());
-
-  // Serialized nodes shall hold an empty object that
-  // represents the default constructed node
-  REQUIRE(j.find("nodes") != j.end());
-  REQUIRE(j["nodes"].is_array());
-  REQUIRE(1 == j["nodes"].size());
-  CHECK(j["nodes"][0].is_object());
-  CHECK(j["nodes"][0].empty());
-
-  // We also want to make sure that the serialized scene
-  // is referencing the empty node.
-
-  // There shall be a single serialized scene
-  auto scenes = j.find("scenes");
-  REQUIRE(scenes != j.end());
-  REQUIRE(scenes->is_array());
-  REQUIRE(1 == scenes->size());
-  auto scene = scenes->at(0);
-  REQUIRE(scene.is_object());
-  // The scene's nodes array shall hold a reference
-  // to the single node
-  auto nodes = scene.find("nodes");
-  REQUIRE(nodes != scene.end());
-  REQUIRE(nodes->is_array());
-  REQUIRE(1 == nodes->size());
-  auto node = nodes->at(0);
-  CHECK(node.is_number_integer());
-  int idx = -1;
-  node.get_to(idx);
-  CHECK(0 == idx);
-}
-
-TEST_CASE("serialize-light-index", "[issue-458]") {
-
-  // Create the light
-  tinygltf::Light light;
-  light.type = "point";
-  light.intensity = 0.75;
-  light.color = std::vector<double>{1.0, 0.8, 0.95};
-
-  // Stream to serialize to
-  std::stringstream os;
-
-  {
-    tinygltf::Model m;
-    tinygltf::Scene scene;
-    // Add the light to the model
-    m.lights.push_back(light);
-    // Create a node that uses the light
-    tinygltf::Node node;
-    node.light = 0;
-    // Add the node to the model
-    m.nodes.push_back(node);
-    // Add the node to the scene
-    scene.nodes.push_back(0);
-    // Add the scene to the model
-    m.scenes.push_back(scene);
-    // Serialize model to output stream
-    tinygltf::TinyGLTF ctx;
-    bool ret = ctx.WriteGltfSceneToStream(&m, os, false, false);
-    REQUIRE(true == ret);
-  }
-
-  {
-    tinygltf::Model m;
-    tinygltf::TinyGLTF ctx;
-    // Parse the serialized model
-    bool ok = ctx.LoadASCIIFromString(&m, nullptr, nullptr, os.str().c_str(), os.str().size(), "");
-    REQUIRE(true == ok);
-    // Check if the light was correctly serialized
-    REQUIRE(1 == m.lights.size());
-    CHECK(m.lights[0] == light);
-    // Check that the node properly references the light
-    REQUIRE(1 == m.nodes.size());
-    CHECK(m.nodes[0].light == 0);
-  }
-}
-
-TEST_CASE("default-material", "[issue-459]") {
-  const std::vector<double> default_emissive_factor{ 0.0, 0.0, 0.0 };
-  const std::vector<double> default_base_color_factor{ 1.0, 1.0, 1.0, 1.0 };
-  const std::string default_alpha_mode = "OPAQUE";
-  const double default_alpha_cutoff = 0.5;
-  const bool default_double_sided = false;
-  const double default_metallic_factor = 1.0;
-  const double default_roughness_factor = 1.0;
-  // Check that default constructed material
-  // holds actual default GLTF material properties
-  tinygltf::Material mat;
-  CHECK(mat.alphaMode == default_alpha_mode);
-  CHECK(mat.alphaCutoff == default_alpha_cutoff);
-  CHECK(mat.doubleSided == default_double_sided);
-  CHECK(mat.emissiveFactor == default_emissive_factor);
-  CHECK(mat.pbrMetallicRoughness.baseColorFactor == default_base_color_factor);
-  CHECK(mat.pbrMetallicRoughness.metallicFactor == default_metallic_factor);
-  CHECK(mat.pbrMetallicRoughness.roughnessFactor == default_roughness_factor);
-  // None of the textures should be set
-  CHECK(mat.normalTexture.index == -1);
-  CHECK(mat.occlusionTexture.index == -1);
-  CHECK(mat.emissiveTexture.index == -1);
-}
-
-TEST_CASE("serialize-empty-scene", "[issue-464]") {
-  // Stream to serialize to
-  std::stringstream os;
-
-  {
-    tinygltf::Model m;
-    // Add empty scene to the model
-    m.scenes.push_back({});
-    // Serialize model to output stream
-    tinygltf::TinyGLTF ctx;
-    bool ret = ctx.WriteGltfSceneToStream(&m, os, false, false);
-    REQUIRE(true == ret);
-  }
-
-  {
-    tinygltf::Model m;
-    tinygltf::TinyGLTF ctx;
-    // Parse the serialized model
-    bool ok = ctx.LoadASCIIFromString(&m, nullptr, nullptr, os.str().c_str(), os.str().size(), "");
-    REQUIRE(true == ok);
-    // Make sure the empty scene is there
-    REQUIRE(1 == m.scenes.size());
-    tinygltf::Scene scene{};
-    // Check that the scene is empty
-    CHECK(m.scenes[0] == scene);
-  }
-}
-
-TEST_CASE("zero-sized-bin-chunk-glb", "[issue-440]") {
-
-  tinygltf::Model model;
-  tinygltf::TinyGLTF ctx;
-  std::string err;
-  std::string warn;
-
-  // Input glb has zero-sized data in bin chunk(8 bytes for BIN chunk, and chunksize == 0)
-  // The spec https://registry.khronos.org/glTF/specs/2.0/glTF-2.0.html#binary-buffer says
-  //
-  // When the binary buffer is empty or when it is stored by other means, this chunk SHOULD be omitted.
-  //
-  // 'SHOULD' mean 'RECOMMENDED', so we'll need to allow such zero-sized bin chunk is NOT omitted.
-  bool ret = ctx.LoadBinaryFromFile(&model, &err, &warn, "../models/regression/zero-sized-bin-chunk-issue-440.glb");
-  if (!warn.empty()) {
-    std::cout << "WARN: " << warn << "\n";
-  }
-  if (!err.empty()) {
-    std::cerr << err << std::endl;
-  }
-
-  REQUIRE(true == ret);
-}
-
-TEST_CASE("serialize-node-emitter", "[KHR_audio]") {
-  // Stream to serialize to
-  std::stringstream os;
-
-  {
-    tinygltf::Model m;
-    // Create a default audio emitter
-    m.audioEmitters.resize(1);
-    // Create a single node
-    m.nodes.resize(1);
-    // The node references the single emitter
-    m.nodes[0].emitter = 0;
-    // Create a single scene
-    m.scenes.resize(1);
-    // Make the scene reference the single node
-    m.scenes[0].nodes.push_back(0);
-
-    // Serialize model to output stream
-    tinygltf::TinyGLTF ctx;
-    bool ret = ctx.WriteGltfSceneToStream(&m, os, false, false);
-    REQUIRE(true == ret);
-  }
-
-  {
-    tinygltf::Model m;
-    tinygltf::TinyGLTF ctx;
-    // Parse the serialized model
-    bool ok = ctx.LoadASCIIFromString(&m, nullptr, nullptr, os.str().c_str(), os.str().size(), "");
-    REQUIRE(true == ok);
-
-    // Make sure the single scene is there
-    REQUIRE(1 == m.scenes.size());
-    // Make sure all three nodes are there
-    REQUIRE(1 == m.nodes.size());
-    // Make sure the single root node of the scene is there
-    REQUIRE(1 == m.scenes[0].nodes.size());
-    REQUIRE(0 == m.scenes[0].nodes[0]);
-    // Retrieve the scene root node
-    const tinygltf::Node& node = m.nodes[m.scenes[0].nodes[0]];
-    // Make sure the single root node has both lod nodes
-    REQUIRE(0 == node.emitter);
-  }
-}
-
-TEST_CASE("serialize-lods", "[lods]") {
-  // Stream to serialize to
-  std::stringstream os;
-
-  {
-    tinygltf::Model m;
-
-    m.nodes.resize(4);
-    // Add Node 1 and Node 2 as lods to Node 0
-    m.nodes[0].lods.push_back(1);
-    m.nodes[0].lods.push_back(2);
-
-    // Add Material 1 and Material 2 as lods to Material 0
-    m.materials.resize(4);
-    m.materials[0].lods.push_back(1);
-    m.materials[0].lods.push_back(2);
-
-    tinygltf::Scene scene;
-    // Scene uses Node 0 and 3 as root node
-    scene.nodes.push_back(0);
-    scene.nodes.push_back(3);
-    // Add scene to the model
-    m.scenes.push_back(scene);
-
-    // Serialize model to output stream
-    tinygltf::TinyGLTF ctx;
-    bool ret = ctx.WriteGltfSceneToStream(&m, os, false, false);
-    REQUIRE(true == ret);
-  }
-
-  {
-    tinygltf::Model m;
-    tinygltf::TinyGLTF ctx;
-    // Parse the serialized model
-    bool ok = ctx.LoadASCIIFromString(&m, nullptr, nullptr, os.str().c_str(), os.str().size(), "");
-    REQUIRE(true == ok);
-    // Make sure the model's used extensions hold MSFT_lod
-    CHECK(m.extensionsUsed.size() == 1);
-    CHECK(m.extensionsUsed[0].compare("MSFT_lod") == 0);
-    // MSFT_lod is not a required extension
-    CHECK(m.extensionsRequired.size() == 0);
-
-    // Make sure all four materials are there
-    REQUIRE(4 == m.materials.size());
-    // Make sure the first material has both lod materials
-    REQUIRE(2 == m.materials[0].lods.size());
-    // Make sure the order is still the same after serialization and deserialization
-    CHECK(1 == m.materials[0].lods[0]);
-    CHECK(2 == m.materials[0].lods[1]);
-    // Make sure the material with lods exposes the MSFT_lod extension
-    CHECK(m.materials[0].extensions.size() == 1);
-    CHECK(m.materials[0].extensions.count("MSFT_lod") == 1);
-    // Make sure the last material has no lod materials
-    CHECK(0 == m.materials[3].lods.size());
-    // Make sure the material without lods does not exposes the MSFT_lod extension
-    CHECK(m.materials[3].extensions.size() == 0);
-    CHECK(m.materials[3].extensions.count("MSFT_lod") == 0);
-
-    // Make sure the single scene is there
-    REQUIRE(1 == m.scenes.size());
-    // Make sure all four nodes are there
-    REQUIRE(4 == m.nodes.size());
-    // Make sure the two root nodes of the scene are there
-    REQUIRE(2 == m.scenes[0].nodes.size());
-    REQUIRE(0 == m.scenes[0].nodes[0]);
-    REQUIRE(3 == m.scenes[0].nodes[1]);
-    // Retrieve the node with lods
-    const tinygltf::Node& nodeWithLods = m.nodes[m.scenes[0].nodes[0]];
-    // Make sure the node has both lod nodes
-    REQUIRE(2 == nodeWithLods.lods.size());
-    // Make sure the order is still the same after serialization and deserialization
-    CHECK(1 == nodeWithLods.lods[0]);
-    CHECK(2 == nodeWithLods.lods[1]);
-    // Make sure the node with lods exposes the MSFT_lod extension
-    CHECK(nodeWithLods.extensions.size() == 1);
-    CHECK(nodeWithLods.extensions.count("MSFT_lod") == 1);
-    // Retrieve the node without lods
-    const tinygltf::Node& nodeWithoutLods = m.nodes[m.scenes[0].nodes[1]];
-    // Make sure the node has no lod nodes
-    CHECK(0 == nodeWithoutLods.lods.size());
-    // Make sure the node without lods does not exposes the MSFT_lod extension
-    CHECK(nodeWithoutLods.extensions.size() == 0);
-    CHECK(nodeWithoutLods.extensions.count("MSFT_lod") == 0);
-  }
-}
-
-TEST_CASE("write-image-issue", "[issue-473]") {
-  std::string err;
-  std::string warn;
-  tinygltf::Model model;
-  tinygltf::TinyGLTF ctx;
-  bool ok = ctx.LoadASCIIFromFile(&model, &err, &warn, "../models/Cube/Cube.gltf");
-  REQUIRE(ok);
-  REQUIRE(err.empty());
-  REQUIRE(warn.empty());
-
-  REQUIRE(model.images.size() == 2);
-  REQUIRE(model.images[0].uri == "Cube_BaseColor.png");
-  REQUIRE(model.images[1].uri == "Cube_MetallicRoughness.png");
-
-  REQUIRE_FALSE(model.images[0].image.empty());
-  REQUIRE_FALSE(model.images[1].image.empty());
-
-  ok = ctx.WriteGltfSceneToFile(&model, "Cube.gltf");
-  REQUIRE(ok);
-
-  for (const auto& image : model.images) {
-    std::fstream file(image.uri);
-    CHECK(file.good());
-  }
-}
-
-TEST_CASE("images-as-is", "[issue-487]") {
-  std::string err;
-  std::string warn;
-  tinygltf::Model model;
-  tinygltf::TinyGLTF ctx;
-  ctx.SetImagesAsIs(true);
-  bool ok = ctx.LoadASCIIFromFile(&model, &err, &warn, "../models/Cube/Cube.gltf");
-  REQUIRE(ok);
-  REQUIRE(err.empty());
-  REQUIRE(warn.empty());
-
-  for (const auto& image : model.images) {
-    CHECK(image.as_is == true);
-    CHECK_FALSE(image.uri.empty());
-    CHECK_FALSE(image.image.empty());
-
-#ifndef TINYGLTF_NO_STB_IMAGE
-    // Make sure we can decode the images
-    int w = -1, h = -1, component = -1;
-    unsigned char *data = stbi_load_from_memory(image.image.data(), static_cast<int>(image.image.size()), &w, &h, &component, 0);
-    CHECK(data != nullptr);
-    CHECK(w == 512);
-    CHECK(h == 512);
-    CHECK(component >= 3);
-    stbi_image_free(data);
-#endif
-  }
-
-  // Write glTF model to disk, and images as separate files
-  {
-    ok = ctx.WriteGltfSceneToFile(&model, "Cube_with_image_files.gltf");
-    REQUIRE(ok);
-
-    // All the images should have been written to disk with their original data
-    for (const auto& image : model.images)  {
-      // Make sure the image files exist
-      {
-        std::fstream file(image.uri);
-        CHECK(file.good());
-      } // Close file before stbi_load (Windows sharing violation fix)
-#ifndef TINYGLTF_NO_STB_IMAGE
-      // Make sure we can load the images
-      int w = -1, h = -1, component = -1;
-      unsigned char *data = stbi_load(image.uri.c_str(), &w, &h, &component, 0);
-      CHECK(data != nullptr);
-      CHECK(w == 512);
-      CHECK(h == 512);
-      CHECK(component >= 3);
-      stbi_image_free(data);
-#endif
-    }
-  }
-
-  // Write glTF model to disk, and embed images as data URIs
-  {
-    ok = ctx.WriteGltfSceneToFile(&model, "Cube_with_embedded_images.gltf", true, false);
-    REQUIRE(ok);
-
-    // Load above model again, and check if the images are loaded properly
-    tinygltf::Model embeddedImages;
-    ctx.SetImagesAsIs(false);
-    bool ok = ctx.LoadASCIIFromFile(&embeddedImages, &err, &warn, "Cube_with_embedded_images.gltf");
-    REQUIRE(ok);
-    REQUIRE(err.empty());
-    REQUIRE(warn.empty());
-
-    for (const auto& image : embeddedImages.images) {
-      CHECK(image.as_is == false);
-      CHECK_FALSE(image.mimeType.empty());
-      CHECK_FALSE(image.image.empty());
-      CHECK(image.width == 512);
-      CHECK(image.height == 512);
-      CHECK(image.component >= 3);
-    }
-  }
-
-  // Write glTF model to disk, as GLB
-  {
-    ok = ctx.WriteGltfSceneToFile(&model, "Cube.glb", true, true, true, true);
-    REQUIRE(ok);
-
-    // Load above model again, and check if the images are loaded properly
-    tinygltf::Model glbModel;
-    ctx.SetImagesAsIs(false);
-    bool ok = ctx.LoadBinaryFromFile(&glbModel, &err, &warn, "Cube.glb");
-    REQUIRE(ok);
-    REQUIRE(err.empty());
-    REQUIRE(warn.empty());
-
-    for (const auto& image : glbModel.images) {
-      CHECK(image.as_is == false);
-      CHECK_FALSE(image.mimeType.empty());
-      CHECK_FALSE(image.image.empty());
-      CHECK(image.width == 512);
-      CHECK(image.height == 512);
-      CHECK(image.component >= 3);
-    }
-  }
-}
-
-TEST_CASE("inverse-bind-matrices-optional", "[issue-492]") {
-  tinygltf::Model model;
-  tinygltf::TinyGLTF ctx;
-  std::string err;
-  std::string warn;
-
-  bool ret = ctx.LoadBinaryFromFile(&model, &err, &warn, "issue-492.glb");
-  if (!warn.empty()) {
-    std::cout << "WARN:" << warn << std::endl;
-  }
-  if (!err.empty()) {
-    std::cerr << "ERR:" << err << std::endl;
-  }
-
-  REQUIRE(true == ret);
-  REQUIRE(err.empty());
-}
-
-bool LoadImageData(tinygltf::Image * /* image */, const int /* image_idx */, std::string * /* err */,
-                   std::string * /* warn */, int /* req_width */, int /* req_height */,
-                   const unsigned char * /* bytes */, int /* size */, void * /*user_data */) {
-    return true;
-}
-
-bool WriteImageData(const std::string * /* basepath */, const std::string * /* filename */,
-                    const tinygltf::Image *image, bool /* embedImages */,
-                    const tinygltf::FsCallbacks * /* fs_cb */, const tinygltf::URICallbacks * /* uri_cb */,
-                    std::string * /* out_uri */, void * user_pointer) {
-    REQUIRE(user_pointer != nullptr);
-    auto counter = static_cast<int*>(user_pointer);
-    *counter = *counter + 1;
-    return true;
-}
-
-TEST_CASE("empty-images-not-written", "[issue-495]") {
-  std::string err;
-  std::string warn;
-  tinygltf::Model model;
-  tinygltf::TinyGLTF ctx;
-
-  ctx.SetImageLoader(LoadImageData, nullptr);
-  bool ok = ctx.LoadASCIIFromFile(&model, &err, &warn, "../models/Cube/Cube.gltf");
-  REQUIRE(ok);
-  REQUIRE(err.empty());
-  REQUIRE(warn.empty());
-
-  CHECK(model.images.size() == 2);
-  for (const auto& image : model.images) {
-    // No data loaded or decoded
-    CHECK(image.image.empty());
-    // The URI is kept
-    CHECK_FALSE(image.uri.empty());
-    // The URI should not be a data URI
-    CHECK(image.uri.find("data:") != 0);
-  }
-
-  // Now write the loaded model
-  int counter = 0;
-  ctx.SetImageWriter(WriteImageData, &counter);
-  ok = ctx.WriteGltfSceneToFile(&model, "issue-495-external.gltf");
-  CHECK(ok);
-  // WriteImageData should be invoked for both images
-  CHECK(counter == 2);
-}