Merge branch 'devel' of github.com:syoyo/tinygltf into devel

This commit is contained in:
Syoyo Fujita 2017-06-23 00:26:14 +09:00
commit 06a2be8d9d

View File

@ -14,9 +14,9 @@
#include "trackball.h" #include "trackball.h"
#define TINYGLTF_LOADER_IMPLEMENTATION #define TINYGLTF_IMPLEMENTATION
#define STB_IMAGE_IMPLEMENTATION #define STB_IMAGE_IMPLEMENTATION
#include "tiny_gltf_loader.h" #include "tiny_gltf.h"
#define BUFFER_OFFSET(i) ((char *)NULL + (i)) #define BUFFER_OFFSET(i) ((char *)NULL + (i))
@ -727,7 +727,7 @@ int main(int argc, char **argv) {
} }
tinygltf::Model model; tinygltf::Model model;
tinygltf::TinyGLTFLoader loader; tinygltf::TinyGLTF loader;
std::string err; std::string err;
std::string input_filename(argv[1]); std::string input_filename(argv[1]);
std::string ext = GetFilePathExtension(input_filename); std::string ext = GetFilePathExtension(input_filename);