From 0f88c2360406c29327eee305eb98ad328a7b2f10 Mon Sep 17 00:00:00 2001 From: Xiao Qi Date: Tue, 7 Mar 2023 22:59:23 +0800 Subject: [PATCH] Added cpp14 define for tinygltf Commented out block in tinygltf that loads images from gltf file --- premake5.lua | 3 ++- src/Includes/tiny_gltf.h | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/premake5.lua b/premake5.lua index 9c27ce6..b6b258b 100644 --- a/premake5.lua +++ b/premake5.lua @@ -43,7 +43,8 @@ project "ModelCompiler" "TINYGLTF_NO_INCLUDE_STB_IMAGE", "TINYGLTF_NO_INCLUDE_STB_IMAGE_WRITE", "TINYGLTF_NO_STB_IMAGE_WRITE", - "TINYGLTF_NO_STB_IMAGE" + "TINYGLTF_NO_STB_IMAGE", + "TINYGLTF_USE_CPP14" } filter "configurations:Debug" diff --git a/src/Includes/tiny_gltf.h b/src/Includes/tiny_gltf.h index c935b89..a7b1bfd 100644 --- a/src/Includes/tiny_gltf.h +++ b/src/Includes/tiny_gltf.h @@ -6058,6 +6058,7 @@ bool TinyGLTF::LoadFromString(Model *model, std::string *err, std::string *warn, } // 11. Parse Image + /* void *load_image_user_data{nullptr}; LoadImageDataOption load_image_option; @@ -6136,6 +6137,7 @@ bool TinyGLTF::LoadFromString(Model *model, std::string *err, std::string *warn, return false; } } + */ // 12. Parse Texture {