Added cpp14 define for tinygltf
Commented out block in tinygltf that loads images from gltf file
This commit is contained in:
parent
92105f1f31
commit
0f88c23604
|
@ -43,7 +43,8 @@ project "ModelCompiler"
|
||||||
"TINYGLTF_NO_INCLUDE_STB_IMAGE",
|
"TINYGLTF_NO_INCLUDE_STB_IMAGE",
|
||||||
"TINYGLTF_NO_INCLUDE_STB_IMAGE_WRITE",
|
"TINYGLTF_NO_INCLUDE_STB_IMAGE_WRITE",
|
||||||
"TINYGLTF_NO_STB_IMAGE_WRITE",
|
"TINYGLTF_NO_STB_IMAGE_WRITE",
|
||||||
"TINYGLTF_NO_STB_IMAGE"
|
"TINYGLTF_NO_STB_IMAGE",
|
||||||
|
"TINYGLTF_USE_CPP14"
|
||||||
}
|
}
|
||||||
|
|
||||||
filter "configurations:Debug"
|
filter "configurations:Debug"
|
||||||
|
|
|
@ -6058,6 +6058,7 @@ bool TinyGLTF::LoadFromString(Model *model, std::string *err, std::string *warn,
|
||||||
}
|
}
|
||||||
|
|
||||||
// 11. Parse Image
|
// 11. Parse Image
|
||||||
|
/*
|
||||||
void *load_image_user_data{nullptr};
|
void *load_image_user_data{nullptr};
|
||||||
|
|
||||||
LoadImageDataOption load_image_option;
|
LoadImageDataOption load_image_option;
|
||||||
|
@ -6136,6 +6137,7 @@ bool TinyGLTF::LoadFromString(Model *model, std::string *err, std::string *warn,
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
// 12. Parse Texture
|
// 12. Parse Texture
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue