minijson experiment.

CMakeLists.txt

@@ -16,7 +16,6 @@ option(TINYGLTF_BUILD_VALIDATOR_EXAMPLE "Build validator exampe" OFF)
 option(TINYGLTF_BUILD_BUILDER_EXAMPLE "Build glTF builder example" 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
@@ -62,26 +61,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).
@@ -159,10 +159,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());
@@ -173,7 +172,8 @@ if (!err.empty()) {
 }
 
 if (!ret) {
-  printf("Failed to parse glTF: %s\n", filename.c_str());
+  printf("Failed to parse glTF\n");
+  return -1;
 }
 ```
 
@@ -194,6 +194,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
@@ -210,11 +211,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
 

loader_example.cc

@@ -1,6 +1,7 @@
 //
 // TODO(syoyo): Print extensions and extras for each glTF object.
 //
+#include <iostream>
 #define TINYGLTF_IMPLEMENTATION
 #define STB_IMAGE_IMPLEMENTATION
 #define STB_IMAGE_WRITE_IMPLEMENTATION

tests/tester.cc

@@ -1182,68 +1182,3 @@ TEST_CASE("images-as-is", "[issue-487]") {
     }
   }
 }
-
-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);
-}

tiny_gltf.h

@@ -50,6 +50,12 @@
 #include <utility>
 #include <vector>
 
+// Auto-detect C++14 standard version
+#if !defined(TINYGLTF_USE_CPP14) && defined(__cplusplus) && \
+    (__cplusplus >= 201402L)
+#define TINYGLTF_USE_CPP14
+#endif
+
 #ifdef __ANDROID__
 #ifdef TINYGLTF_ANDROID_LOAD_FROM_ASSETS
 #include <android/asset_manager.h>
@@ -828,20 +834,20 @@ struct Accessor {
       maxValues;  // optional. integer value is promoted to double
 
   struct Sparse {
-    int count{0};
-    bool isSparse{false};
+    int count;
+    bool isSparse;
     struct {
-      size_t byteOffset{0};
-      int bufferView{-1};
-      int componentType{-1};  // a TINYGLTF_COMPONENT_TYPE_ value
+      size_t byteOffset;
+      int bufferView;
+      int componentType;  // a TINYGLTF_COMPONENT_TYPE_ value
       Value extras;
       ExtensionMap extensions;
       std::string extras_json_string;
       std::string extensions_json_string;
     } indices;
     struct {
-      int bufferView{-1};
-      size_t byteOffset{0};
+      int bufferView;
+      size_t byteOffset;
       Value extras;
       ExtensionMap extensions;
       std::string extras_json_string;
@@ -892,7 +898,11 @@ struct Accessor {
     // unreachable return 0;
   }
 
-  Accessor() = default;
+  Accessor()
+
+  {
+    sparse.isSparse = false;
+  }
   DEFAULT_METHODS(Accessor)
   bool operator==(const tinygltf::Accessor &) const;
 };
@@ -1711,6 +1721,9 @@ class TinyGLTF {
 #endif  // __GNUC__
 
 #ifndef TINYGLTF_NO_INCLUDE_JSON
+#ifdef TINYGLTF_USE_MINIJSON
+#include "minijson.h"
+#else // !TINYGLTF_USE_MINIJSON
 #ifndef TINYGLTF_USE_RAPIDJSON
 #include "json.hpp"
 #else
@@ -1722,6 +1735,7 @@ class TinyGLTF {
 #include "writer.h"
 #endif
 #endif
+#endif // !TINYGLTF_USE_MINIJSON
 #endif
 
 #ifdef TINYGLTF_ENABLE_DRACO
@@ -2757,12 +2771,6 @@ bool WriteImageData(const std::string *basepath, const std::string *filename,
                     const Image *image, bool embedImages,
                     const FsCallbacks* fs_cb, const URICallbacks *uri_cb,
                     std::string *out_uri, void *) {
-  // Early out on empty images, report the original uri if the image was not written.
-  if (image->image.empty()) {
-    *out_uri = *filename;
-    return true;
-  }
-
   const std::string ext = GetFilePathExtension(*filename);
 
   // Write image to temporary buffer
@@ -3305,12 +3313,11 @@ static bool UpdateImageObject(const Image &image, std::string &baseDir,
     filename = std::to_string(index) + "." + ext;
   }
 
-  // If callback is set, modify image data object.
-  // Note that the callback is also invoked for images without data.
-  // The default callback implementation simply returns true for
-  // empty images and sets the out URI to filename.
+  // If callback is set and image data exists, modify image data object. If
+  // image data does not exist, this is not considered a failure and the
+  // original uri should be maintained.
   bool imageWritten = false;
-  if (WriteImageData != nullptr && !filename.empty()) {
+  if (WriteImageData != nullptr && !filename.empty() && !image.image.empty()) {
     imageWritten = WriteImageData(&baseDir, &filename, &image, embedImages,
                                   fs_cb, uri_cb, out_uri, user_data);
     if (!imageWritten) {
@@ -4352,7 +4359,7 @@ static bool ParseImage(Image *image, const int image_idx, std::string *err,
     // Just only save some information here. Loading actual image data from
     // bufferView is done after this `ParseImage` function.
     image->bufferView = bufferView;
-    image->mimeType = std::move( mime_type );
+    image->mimeType = mime_type;
     image->width = width;
     image->height = height;
 
@@ -4384,7 +4391,7 @@ static bool ParseImage(Image *image, const int image_idx, std::string *err,
     }
   } else {
     // Assume external file
-    // Unconditionally keep the external URI of the image
+    // Keep texture path (for textures that cannot be decoded)
     image->uri = uri;
 #ifdef TINYGLTF_NO_EXTERNAL_IMAGE
     return true;
@@ -4431,7 +4438,6 @@ static bool ParseImage(Image *image, const int image_idx, std::string *err,
     }
     return false;
   }
-
   return LoadImageData(image, image_idx, err, warn, 0, 0, &img.at(0),
                        static_cast<int>(img.size()), load_image_user_data);
 }
@@ -5251,7 +5257,7 @@ static bool ParseNode(Node *node, std::string *err, const detail::json &o,
   if (node->extensions.count("MSFT_lod") != 0) {
     auto const &msft_lod_ext = node->extensions["MSFT_lod"];
     if (msft_lod_ext.Has("ids")) {
-      const auto &idsArr = msft_lod_ext.Get("ids");
+      auto idsArr = msft_lod_ext.Get("ids");
       for (size_t i = 0; i < idsArr.ArrayLen(); ++i) {
         node->lods.emplace_back(idsArr.Get(i).GetNumberAsInt());
       }
@@ -5280,7 +5286,7 @@ static bool ParseScene(Scene *scene, std::string *err, const detail::json &o,
   if (scene->extensions.count("KHR_audio") != 0) {
     auto const &audio_ext = scene->extensions["KHR_audio"];
     if (audio_ext.Has("emitters")) {
-      const auto &emittersArr = audio_ext.Get("emitters");
+      auto emittersArr = audio_ext.Get("emitters");
       for (size_t i = 0; i < emittersArr.ArrayLen(); ++i) {
         scene->audioEmitters.emplace_back(emittersArr.Get(i).GetNumberAsInt());
       }
@@ -5316,7 +5322,7 @@ static bool ParsePbrMetallicRoughness(
       }
       return false;
     }
-    pbr->baseColorFactor = std::move( baseColorFactor );
+    pbr->baseColorFactor = baseColorFactor;
   }
 
   {
@@ -5468,7 +5474,7 @@ static bool ParseMaterial(Material *material, std::string *err, std::string *war
   if (material->extensions.count("MSFT_lod") != 0) {
     auto const &msft_lod_ext = material->extensions["MSFT_lod"];
     if (msft_lod_ext.Has("ids")) {
-      const auto &idsArr = msft_lod_ext.Get("ids");
+      auto idsArr = msft_lod_ext.Get("ids");
       for (size_t i = 0; i < idsArr.ArrayLen(); ++i) {
         material->lods.emplace_back(idsArr.Get(i).GetNumberAsInt());
       }
@@ -5595,7 +5601,7 @@ static bool ParseAnimation(Animation *animation, std::string *err,
         }
         sampler.input = inputIndex;
         sampler.output = outputIndex;
-        ParseExtrasAndExtensions(&sampler, err, s,
+        ParseExtrasAndExtensions(&sampler, err, o,
                                  store_original_json_for_extras_and_extensions);
 
         animation->samplers.emplace_back(std::move(sampler));
@@ -5658,7 +5664,7 @@ static bool ParseSkin(Skin *skin, std::string *err, const detail::json &o,
   skin->skeleton = skeleton;
 
   int invBind = -1;
-  ParseIntegerProperty(&invBind, err, o, "inverseBindMatrices", false, "Skin");
+  ParseIntegerProperty(&invBind, err, o, "inverseBindMatrices", true, "Skin");
   skin->inverseBindMatrices = invBind;
 
   ParseExtrasAndExtensions(skin, err, o,
@@ -6106,8 +6112,16 @@ bool TinyGLTF::LoadFromString(Model *model, std::string *err, std::string *warn,
     }
   }
 
-  // Reset the model
-  (*model) = Model();
+  model->buffers.clear();
+  model->bufferViews.clear();
+  model->accessors.clear();
+  model->meshes.clear();
+  model->cameras.clear();
+  model->nodes.clear();
+  model->extensionsUsed.clear();
+  model->extensionsRequired.clear();
+  model->extensions.clear();
+  model->defaultScene = -1;
 
   // 1. Parse Asset
   {
@@ -6443,15 +6457,6 @@ bool TinyGLTF::LoadFromString(Model *model, std::string *err, std::string *warn,
           return false;
         }
         const Buffer &buffer = model->buffers[size_t(bufferView.buffer)];
-        if (bufferView.byteOffset >= buffer.data.size()) {
-          if (err) {
-            std::stringstream ss;
-            ss << "image[" << idx << "] bufferView \"" << image.bufferView
-               << "\" indexed out of bounds of its buffer." << std::endl;
-            (*err) += ss.str();
-          }
-          return false;
-        }
 
         if (LoadImageData == nullptr) {
           if (err) {
@@ -7206,7 +7211,6 @@ static void SerializeGltfBufferData(const std::vector<unsigned char> &data,
 
 static bool SerializeGltfBufferData(const std::vector<unsigned char> &data,
                                     const std::string &binFilename) {
-#ifndef TINYGLTF_NO_FS
 #ifdef _WIN32
 #if defined(__GLIBCXX__)  // mingw
   int file_descriptor = _wopen(UTF8ToWchar(binFilename).c_str(),
@@ -7235,9 +7239,6 @@ static bool SerializeGltfBufferData(const std::vector<unsigned char> &data,
     // write empty file.
   }
   return true;
-#else
-  return false;
-#endif
 }
 
 #if 0  // FIXME(syoyo): not used. will be removed in the future release.
@@ -8459,7 +8460,6 @@ static bool WriteGltfStream(std::ostream &stream, const std::string &content) {
 
 static bool WriteGltfFile(const std::string &output,
                           const std::string &content) {
-#ifndef TINYGLTF_NO_FS
 #ifdef _WIN32
 #if defined(_MSC_VER)
   std::ofstream gltfFile(UTF8ToWchar(output).c_str());
@@ -8479,9 +8479,6 @@ static bool WriteGltfFile(const std::string &output,
   if (!gltfFile.is_open()) return false;
 #endif
   return WriteGltfStream(gltfFile, content);
-#else
-    return false;
-#endif
 }
 
 static bool WriteBinaryGltfStream(std::ostream &stream,
@@ -8548,7 +8545,6 @@ static bool WriteBinaryGltfStream(std::ostream &stream,
 static bool WriteBinaryGltfFile(const std::string &output,
                                 const std::string &content,
                                 const std::vector<unsigned char> &binBuffer) {
-#ifndef TINYGLTF_NO_FS
 #ifdef _WIN32
 #if defined(_MSC_VER)
   std::ofstream gltfFile(UTF8ToWchar(output).c_str(), std::ios::binary);
@@ -8565,9 +8561,6 @@ static bool WriteBinaryGltfFile(const std::string &output,
   std::ofstream gltfFile(output.c_str(), std::ios::binary);
 #endif
   return WriteBinaryGltfStream(gltfFile, content, binBuffer);
-#else
-    return false;
-#endif
 }
 
 bool TinyGLTF::WriteGltfSceneToStream(const Model *model, std::ostream &stream,