GitHub-Proxy/tinygltf
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/syoyo/tinygltf.git synced 2025-08-17 06:15:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Allow parsing integer number value as double(For example, glTF-Sample-Models/2.0/Cameras/glTF has zfar number property with integer value, which trigerred a parsing failure).

Browse Source
This commit is contained in:
Syoyo Fujita 2019-10-30 15:16:34 +09:00
parent 2b66c81f67
commit 1100f0f1eb
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tiny_gltf.h
View File

@ -2567,23 +2567,16 @@ bool GetInt(const json &o, int &val) {
#endif #endif
} }
bool GetDouble(const json &o, double &val) {
#ifdef TINYGLTF_USE_RAPIDJSON #ifdef TINYGLTF_USE_RAPIDJSON
bool GetDouble(const json &o, double &val) {
if (o.IsDouble()) { if (o.IsDouble()) {
val = o.GetDouble(); val = o.GetDouble();
return true; return true;
} }
return false; return false;
#else
if (o.type() == json::value_t::number_float) {
val = static_cast<double>(o.get<double>());
return true;
}
return false;
#endif
} }
#endif
bool GetNumber(const json &o, double &val) { bool GetNumber(const json &o, double &val) {
#ifdef TINYGLTF_USE_RAPIDJSON #ifdef TINYGLTF_USE_RAPIDJSON
@ -2961,10 +2954,10 @@ static bool ParseNumberProperty(double *ret, std::string *err, const json &o,
return false; return false;
} }
double doubleValue; double numberValue;
bool isDouble = GetDouble(GetValue(it), doubleValue); bool isNumber = GetNumber(GetValue(it), numberValue);
if (!isDouble) { if (!isNumber) {
if (required) { if (required) {
if (err) { if (err) {
(*err) += "'" + property + "' property is not a number type.\n"; (*err) += "'" + property + "' property is not a number type.\n";
@ -2974,7 +2967,7 @@ static bool ParseNumberProperty(double *ret, std::string *err, const json &o,
} }
if (ret) { if (ret) {
(*ret) = doubleValue; (*ret) = numberValue;
} }
return true; return true;