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

Merge branch 'master' of github.com:syoyo/tinygltf

Browse Source
This commit is contained in:
Syoyo Fujita 2019-08-20 17:11:29 +09:00
commit 5150a46072
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tiny_gltf.h
View File

@ -3743,8 +3743,22 @@ static bool ParsePbrMetallicRoughness(PbrMetallicRoughness *pbr,
static bool ParseMaterial(Material *material, std::string *err, const json &o) {
ParseStringProperty(&material->name, err, o, "name", /* required */ false);
ParseNumberArrayProperty(&material->emissiveFactor, err, o, "emissiveFactor",
/* required */ false);
if(ParseNumberArrayProperty(&material->emissiveFactor, err, o, "emissiveFactor",
/* required */ false)) {
if (material->emissiveFactor.size() != 3) {
if (err) {
(*err) +=
"Array length of `emissiveFactor` parameter in "
"material must be 3, but got " +
std::to_string(material->emissiveFactor.size()) + "\n";
}
return false;
}
}
else {
// fill with default values
material->emissiveFactor = {0.0, 0.0, 0.0};
}
ParseStringProperty(&material->alphaMode, err, o, "alphaMode",
/* required */ false);