Remove some assert()

.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,14 +1,11 @@
 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)
@@ -18,22 +15,22 @@ option(TINYGLTF_HEADER_ONLY "On: header-only mode. Off: create tinygltf library(
 option(TINYGLTF_INSTALL "Install tinygltf files during install step. Usually set to OFF if you include tinygltf through add_subdirectory()" 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)
 
 #

README.md

@@ -26,6 +26,8 @@ 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)
@@ -107,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

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 )

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

@@ -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]") {
@@ -755,174 +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);
-}