Merge pull request #92 from walf443/respect_stb_image_write_error

handling stbi_write_xxx_to_func return code

Makefile

@@ -1,6 +1,6 @@
 
 # Use this for strict compilation check(will work on clang 3.8+)
-#EXTRA_CXXFLAGS := -fsanitize=address -Wall -Werror -Weverything -Wno-c++11-long-long
+#EXTRA_CXXFLAGS := -fsanitize=address -Wall -Werror -Weverything -Wno-c++11-long-long -Wno-c++98-compat
 
 all:
 	clang++  $(EXTRA_CXXFLAGS) -std=c++11 -g -O0 -o loader_example loader_example.cc

README.md

@@ -22,7 +22,7 @@ If you are looking for old, C++03 version, please use `devel-picojson` branch.
   * [x] iOS + clang
   * [x] Linux + gcc/clang
   * [x] Windows + MinGW
-  * [x] Windows + Visual Studio 2015 or later.
+  * [x] Windows + Visual Studio 2015 Update 3 or later.
     * Visual Studio 2013 is not supported since they have limited C++11 support and failed to compile `json.hpp`.
   * [x] Android + CrystaX(NDK drop-in replacement) GCC
   * [x] Web using Emscripten(LLVM)
@@ -49,8 +49,11 @@ If you are looking for old, C++03 version, please use `devel-picojson` branch.
 
 ## Projects using TinyGLTF
 
+* px_render Single header C++ Libraries for Thread Scheduling, Rendering, and so on... https://github.com/pplux/px
 * Physical based rendering with Vulkan using glTF 2.0 models https://github.com/SaschaWillems/Vulkan-glTF-PBR
-* Your projects here!(Plese send PR)
+* GLTF loader plugin for OGRE 2.1. Support for PBR materials via HLMS/PBS https://github.com/Ybalrid/Ogre_glTF
+* [TinyGltfImporter](http://doc.magnum.graphics/magnum/classMagnum_1_1Trade_1_1TinyGltfImporter.html) plugin for [Magnum](https://github.com/mosra/magnum), a lightweight and modular C++11/C++14 graphics middleware for games and data visualization.
+* Your projects here! (Please send PR)
 
 ## TODOs
 
@@ -70,12 +73,13 @@ TinyGLTF uses the following third party libraries.
 
 * json.hpp : Copyright (c) 2013-2017 Niels Lohmann. MIT license.
 * base64 : Copyright (C) 2004-2008 René Nyffenegger
-* stb_image.h : v2.08 - public domain image loader - http://nothings.org/stb_image.h
+* stb_image.h : v2.08 - public domain image loader - [Github link](https://github.com/nothings/stb/blob/master/stb_image.h)
+* stb_image_write.h : v1.09 - public domain image writer - [Github link](https://github.com/nothings/stb/blob/master/stb_image_write.h)
 
 
 ## Build and example
 
-Copy `stb_image.h`, `json.hpp` and `tiny_gltf.h` to your project.
+Copy `stb_image.h`, `stb_image_write.h`, `json.hpp` and `tiny_gltf.h` to your project.
 
 ### Loading glTF 2.0 model
 
@@ -83,6 +87,7 @@ Copy `stb_image.h`, `json.hpp` and `tiny_gltf.h` to your project.
 // Define these only in *one* .cc file.
 #define TINYGLTF_IMPLEMENTATION
 #define STB_IMAGE_IMPLEMENTATION
+#define STB_IMAGE_WRITE_IMPLEMENTATION
 // #define TINYGLTF_NOEXCEPTION // optional. disable exception handling.
 #include "tiny_gltf.h"
 
@@ -108,10 +113,17 @@ if (!ret) {
 
 * `TINYGLTF_NOEXCEPTION` : Disable C++ exception in JSON parsing. You can use `-fno-exceptions` or by defining the symbol `JSON_NOEXCEPTION` and `TINYGLTF_NOEXCEPTION`  to fully remove C++ exception codes when compiling TinyGLTF.
 * `TINYGLTF_NO_STB_IMAGE` : Do not load images with stb_image. Instead use `TinyGLTF::SetImageLoader(LoadimageDataFunction LoadImageData, void *user_data)` to set a callback for loading images.
+* `TINYGLTF_NO_STB_IMAGE_WRITE` : Do not write images with stb_image_write. Instead use `TinyGLTF::SetImageWriter(WriteimageDataFunction WriteImageData, void *user_data)` to set a callback for writing images.
 
 ### Saving gltTF 2.0 model
-
-T.B.W.
+* [ ] Buffers.
+  * [x] To file
+  * [x] Embedded
+  * [ ] Draco compressed?
+* [x] Images
+  * [x] To file
+  * [x] Embedded
+* [ ] Binary(.glb)
 
 ## Running tests.
 

examples/gltfutil/main.cc

@@ -69,13 +69,14 @@ int parse_args(int argc, char** argv) {
     tinygltf::TinyGLTF loader;
     tinygltf::Model model;
     std::string error;
+    std::string warning;
     bool state;
     switch (detectType(config.input_path)) {
       case FileType::Ascii:
-        state = loader.LoadASCIIFromFile(&model, &error, config.input_path);
+        state = loader.LoadASCIIFromFile(&model, &error, &warning, config.input_path);
         break;
       case FileType::Binary:
-        state = loader.LoadBinaryFromFile(&model, &error, config.input_path);
+        state = loader.LoadBinaryFromFile(&model, &error, &warning, config.input_path);
         break;
       case FileType::Unknown:
       default:

examples/gltfutil/texture_dumper.cc

@@ -1,4 +1,5 @@
 #include <iostream>
+#include <algorithm>
 
 #include "stb_image_write.h"
 #include "texture_dumper.h"

examples/glview/glview.cc

@@ -16,6 +16,7 @@
 
 #define TINYGLTF_IMPLEMENTATION
 #define STB_IMAGE_IMPLEMENTATION
+#define STB_IMAGE_WRITE_IMPLEMENTATION
 #include "tiny_gltf.h"
 
 #define BUFFER_OFFSET(i) ((char *)NULL + (i))
@@ -732,16 +733,21 @@ int main(int argc, char **argv) {
   tinygltf::Model model;
   tinygltf::TinyGLTF loader;
   std::string err;
+  std::string warn;
   std::string input_filename(argv[1]);
   std::string ext = GetFilePathExtension(input_filename);
 
   bool ret = false;
   if (ext.compare("glb") == 0) {
     // assume binary glTF.
-    ret = loader.LoadBinaryFromFile(&model, &err, input_filename.c_str());
+    ret = loader.LoadBinaryFromFile(&model, &err, &warn, input_filename.c_str());
   } else {
     // assume ascii glTF.
-    ret = loader.LoadASCIIFromFile(&model, &err, input_filename.c_str());
+    ret = loader.LoadASCIIFromFile(&model, &err, &warn, input_filename.c_str());
+  }
+
+  if (!warn.empty()) {
+    printf("Warn: %s\n", warn.c_str());
   }
 
   if (!err.empty()) {

examples/raytrace/gltf-loader.cc

@@ -3,6 +3,7 @@
 #include <iostream>
 #include <memory>  // c++11
 #define TINYGLTF_IMPLEMENTATION
+#define TINYGLTF_NO_STB_IMAGE_WRITE
 #include <tiny_gltf.h>
 
 namespace example {
@@ -25,15 +26,20 @@ bool LoadGLTF(const std::string &filename, float scale,
   tinygltf::Model model;
   tinygltf::TinyGLTF loader;
   std::string err;
+  std::string warn;
   const std::string ext = GetFilePathExtension(filename);
 
   bool ret = false;
   if (ext.compare("glb") == 0) {
     // assume binary glTF.
-    ret = loader.LoadBinaryFromFile(&model, &err, filename.c_str());
+    ret = loader.LoadBinaryFromFile(&model, &err, &warn, filename.c_str());
   } else {
     // assume ascii glTF.
-    ret = loader.LoadASCIIFromFile(&model, &err, filename.c_str());
+    ret = loader.LoadASCIIFromFile(&model, &err, &warn, filename.c_str());
+  }
+
+  if (!warn.empty()) {
+    std::cout << "glTF parse warning: " << warn << std::endl;
   }
 
   if (!err.empty()) {
@@ -292,7 +298,7 @@ bool LoadGLTF(const std::string &filename, float scale,
 
                         loadedMesh.facevarying_normals.push_back(n1.x);
                         loadedMesh.facevarying_normals.push_back(n1.y);
-                        loadedMesh.facevarying_normals.push_back(n2.z);
+                        loadedMesh.facevarying_normals.push_back(n1.z);
 
                         loadedMesh.facevarying_normals.push_back(n2.x);
                         loadedMesh.facevarying_normals.push_back(n2.y);
@@ -327,7 +333,7 @@ bool LoadGLTF(const std::string &filename, float scale,
 
                         loadedMesh.facevarying_normals.push_back(n1.x);
                         loadedMesh.facevarying_normals.push_back(n1.y);
-                        loadedMesh.facevarying_normals.push_back(n2.z);
+                        loadedMesh.facevarying_normals.push_back(n1.z);
 
                         loadedMesh.facevarying_normals.push_back(n2.x);
                         loadedMesh.facevarying_normals.push_back(n2.y);

examples/saver/main.cc

@@ -3,11 +3,21 @@
 
 #define TINYGLTF_IMPLEMENTATION
 #define STB_IMAGE_IMPLEMENTATION
+
+//#define TINYGLTF_NO_STB_IMAGE_WRITE
+
+#ifndef TINYGLTF_NO_STB_IMAGE_WRITE
+#define STB_IMAGE_WRITE_IMPLEMENTATION
+#endif
+
+// If using a modern Microsoft Compiler, this define supress compilation
+// warnings in stb_image_write
+//#define STBI_MSC_SECURE_CRT
+
 #include "tiny_gltf.h"
 
-int main(int argc, char *argv[])
-{
-	if (argc != 3) {
+int main(int argc, char *argv[]) {
+  if (argc != 3) {
     std::cout << "Needs input.gltf output.gltf" << std::endl;
     return EXIT_FAILURE;
   }
@@ -15,11 +25,17 @@ int main(int argc, char *argv[])
   tinygltf::Model model;
   tinygltf::TinyGLTF loader;
   std::string err;
+  std::string warn;
   std::string input_filename(argv[1]);
   std::string output_filename(argv[2]);
+  std::string embedded_filename =
+      output_filename.substr(0, output_filename.size() - 5) + "-Embedded.gltf";
 
   // assume ascii glTF.
-  bool ret = loader.LoadASCIIFromFile(&model, &err, input_filename.c_str());
+  bool ret = loader.LoadASCIIFromFile(&model, &err, &warn, input_filename.c_str());
+  if (!warn.empty()) {
+    std::cout << "warn : " << warn << std::endl;
+  }
   if (!ret) {
     if (!err.empty()) {
       std::cerr << err << std::endl;
@@ -28,6 +44,10 @@ int main(int argc, char *argv[])
   }
   loader.WriteGltfSceneToFile(&model, output_filename);
 
-  return EXIT_SUCCESS;
+  // Embedd buffers and images
+#ifndef TINYGLTF_NO_STB_IMAGE_WRITE
+  loader.WriteGltfSceneToFile(&model, embedded_filename, true, true);
+#endif
 
+  return EXIT_SUCCESS;
 }

loader_example.cc

@@ -1,5 +1,6 @@
 #define TINYGLTF_IMPLEMENTATION
 #define STB_IMAGE_IMPLEMENTATION
+#define STB_IMAGE_WRITE_IMPLEMENTATION
 #include "tiny_gltf.h"
 
 #include <cstdio>
@@ -210,8 +211,21 @@ static std::string PrintParameterValue(const tinygltf::Parameter &param) {
   }
 }
 
+#if 0
+static std::string PrintParameterMap(const tinygltf::ParameterMap &pmap) {
+  std::stringstream ss;
+
+  ss << pmap.size() << std::endl;
+  for (auto &kv : pmap) {
+    ss << kv.first << " : " << PrintParameterValue(kv.second) << std::endl;
+  }
+
+  return ss.str();
+}
+#endif
+
 static std::string PrintValue(const std::string &name,
-                              const tinygltf::Value &value, const int indent) {
+                              const tinygltf::Value &value, const int indent, const bool tag = true) {
   std::stringstream ss;
 
   if (value.IsObject()) {
@@ -219,19 +233,45 @@ static std::string PrintValue(const std::string &name,
     tinygltf::Value::Object::const_iterator it(o.begin());
     tinygltf::Value::Object::const_iterator itEnd(o.end());
     for (; it != itEnd; it++) {
-      ss << PrintValue(name, it->second, indent + 1);
+      ss << PrintValue(it->first, it->second, indent + 1) << std::endl;
     }
   } else if (value.IsString()) {
-    ss << Indent(indent) << name << " : " << value.Get<std::string>()
-       << std::endl;
+    if (tag) {
+      ss << Indent(indent) << name << " : " << value.Get<std::string>();
+    } else {
+      ss << " " << value.Get<std::string>() << " ";
+    }
   } else if (value.IsBool()) {
-    ss << Indent(indent) << name << " : " << value.Get<bool>() << std::endl;
+    if (tag) {
+      ss << Indent(indent) << name << " : " << value.Get<bool>();
+    } else {
+      ss << " " << value.Get<bool>() << " ";
+    }
   } else if (value.IsNumber()) {
-    ss << Indent(indent) << name << " : " << value.Get<double>() << std::endl;
+    if (tag) {
+      ss << Indent(indent) << name << " : " << value.Get<double>();
+    } else {
+      ss << " " << value.Get<double>() << " ";
+    }
   } else if (value.IsInt()) {
-    ss << Indent(indent) << name << " : " << value.Get<int>() << std::endl;
+    if (tag) {
+      ss << Indent(indent) << name << " : " << value.Get<int>();
+    } else {
+      ss << " " << value.Get<int>() << " ";
+    }
+  } else if (value.IsArray()) {
+    ss << Indent(indent) << name << " [ ";
+    for (size_t i = 0; i < value.Size(); i++) {
+      ss << PrintValue("", value.Get(int(i)), indent + 1, /* tag */false);
+      if (i != (value.ArrayLen()-1)) {
+        ss << ", ";
+      }
+
+    }
+    ss << Indent(indent) << "] ";
   }
-  // @todo { binary, array }
+
+  // @todo { binary }
 
   return ss.str();
 }
@@ -287,6 +327,15 @@ static void DumpPrimitive(const tinygltf::Primitive &primitive, int indent) {
             << PrintValue("extras", primitive.extras, indent + 1) << std::endl;
 }
 
+static void DumpExtensions(const tinygltf::ExtensionMap &extension, const int indent)
+{
+  // TODO(syoyo): pritty print Value
+  for (auto &e : extension) {
+    std::cout << Indent(indent) << e.first << std::endl;
+    std::cout << PrintValue("extensions", e.second, indent+1) << std::endl;
+  }  
+}
+
 static void Dump(const tinygltf::Model &model) {
   std::cout << "=== Dump glTF ===" << std::endl;
   std::cout << "asset.copyright          : " << model.asset.copyright
@@ -307,6 +356,7 @@ static void Dump(const tinygltf::Model &model) {
     for (size_t i = 0; i < model.scenes.size(); i++) {
       std::cout << Indent(1) << "scene[" << i
                 << "] name  : " << model.scenes[i].name << std::endl;
+      DumpExtensions(model.scenes[i].extensions, 1);
     }
   }
 
@@ -344,7 +394,7 @@ static void Dump(const tinygltf::Model &model) {
         std::cout << Indent(2) << "min          : [";
         for (size_t k = 0; k < accessor.minValues.size(); k++) {
           std::cout << accessor.minValues[k]
-                    << ((i != accessor.minValues.size() - 1) ? ", " : "");
+                    << ((k != accessor.minValues.size() - 1) ? ", " : "");
         }
         std::cout << "]" << std::endl;
       }
@@ -352,7 +402,7 @@ static void Dump(const tinygltf::Model &model) {
         std::cout << Indent(2) << "max          : [";
         for (size_t k = 0; k < accessor.maxValues.size(); k++) {
           std::cout << accessor.maxValues[k]
-                    << ((i != accessor.maxValues.size() - 1) ? ", " : "");
+                    << ((k != accessor.maxValues.size() - 1) ? ", " : "");
         }
         std::cout << "]" << std::endl;
       }
@@ -530,6 +580,12 @@ static void Dump(const tinygltf::Model &model) {
       }
     }
   }
+  
+  // toplevel extensions
+  {
+    std::cout << "extensions(items=" << model.extensions.size() << ")" << std::endl;
+    DumpExtensions(model.extensions, 1);
+  }
 }
 
 int main(int argc, char **argv) {
@@ -541,6 +597,7 @@ int main(int argc, char **argv) {
   tinygltf::Model model;
   tinygltf::TinyGLTF gltf_ctx;
   std::string err;
+  std::string warn; 
   std::string input_filename(argv[1]);
   std::string ext = GetFilePathExtension(input_filename);
 
@@ -548,13 +605,18 @@ int main(int argc, char **argv) {
   if (ext.compare("glb") == 0) {
     std::cout << "Reading binary glTF" << std::endl;
     // assume binary glTF.
-    ret = gltf_ctx.LoadBinaryFromFile(&model, &err, input_filename.c_str());
+    ret = gltf_ctx.LoadBinaryFromFile(&model, &err, &warn, input_filename.c_str());
   } else {
     std::cout << "Reading ASCII glTF" << std::endl;
     // assume ascii glTF.
-    ret = gltf_ctx.LoadASCIIFromFile(&model, &err, input_filename.c_str());
+    ret = gltf_ctx.LoadASCIIFromFile(&model, &err, &warn, input_filename.c_str());
   }
 
+  if (!warn.empty()) {
+    printf("Warn: %s\n", warn.c_str());
+  }
+
+
   if (!err.empty()) {
     printf("Err: %s\n", err.c_str());
   }

test_runner.py

@@ -28,7 +28,7 @@ def run(filename):
         p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         (stdout, stderr) = p.communicate()
     except:
-        print "Failed to execute: ", cmd
+        print("Failed to execute: ", cmd)
         raise
 
     if p.returncode != 0:

tests/tester.cc

@@ -1,5 +1,6 @@
 #define TINYGLTF_IMPLEMENTATION
 #define STB_IMAGE_IMPLEMENTATION
+#define STB_IMAGE_WRITE_IMPLEMENTATION
 #include "tiny_gltf.h"
 
 #define CATCH_CONFIG_MAIN  // This tells Catch to provide a main() - only do this in one cpp file
@@ -24,3 +25,18 @@ TEST_CASE("parse-error", "[parse]") {
 
 }
 
+TEST_CASE("datauri-in-glb", "[issue-79]") {
+
+  tinygltf::Model model;
+  tinygltf::TinyGLTF ctx;
+  std::string err;
+
+  bool ret = ctx.LoadBinaryFromFile(&model, &err, "../models/box01.glb");
+  if (!err.empty()) {
+    std::cerr << err << std::endl;
+  }
+    
+  REQUIRE(true == ret);
+}
+
+