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

Fix inequality of texture index check when serializing texture of material.

Browse Source 
Texture info was written even if it have invalid index(-1). Fixes #189
This commit is contained in:
Syoyo Fujita 2019-08-15 12:25:50 +09:00
parent 67d3d2504d
commit 4ebd6368fb
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tiny_gltf.h
View File

@ -5382,13 +5382,13 @@ static void SerializeGltfPbrMetallicRoughness(PbrMetallicRoughness &pbr,
SerializeNumberProperty("roughnessFactor", pbr.roughnessFactor, o); SerializeNumberProperty("roughnessFactor", pbr.roughnessFactor, o);
} }
if (pbr.baseColorTexture.index >= -1) { if (pbr.baseColorTexture.index > -1) {
json texinfo; json texinfo;
SerializeGltfTextureInfo(pbr.baseColorTexture, texinfo); SerializeGltfTextureInfo(pbr.baseColorTexture, texinfo);
o["baseColorTexture"] = texinfo; o["baseColorTexture"] = texinfo;
} }
if (pbr.metallicRoughnessTexture.index >= -1) { if (pbr.metallicRoughnessTexture.index > -1) {
json texinfo; json texinfo;
SerializeGltfTextureInfo(pbr.metallicRoughnessTexture, texinfo); SerializeGltfTextureInfo(pbr.metallicRoughnessTexture, texinfo);
o["metallicRoughnessTexture"] = texinfo; o["metallicRoughnessTexture"] = texinfo;
@ -5418,19 +5418,19 @@ static void SerializeGltfMaterial(Material &material, json &o) {
o["doubleSided"] = json(material.doubleSided); o["doubleSided"] = json(material.doubleSided);
if (material.normalTexture.index >= -1) { if (material.normalTexture.index > -1) {
json texinfo; json texinfo;
SerializeGltfNormalTextureInfo(material.normalTexture, texinfo); SerializeGltfNormalTextureInfo(material.normalTexture, texinfo);
o["normalTexture"] = texinfo; o["normalTexture"] = texinfo;
} }
if (material.occlusionTexture.index >= -1) { if (material.occlusionTexture.index > -1) {
json texinfo; json texinfo;
SerializeGltfOcclusionTextureInfo(material.occlusionTexture, texinfo); SerializeGltfOcclusionTextureInfo(material.occlusionTexture, texinfo);
o["occlusionTexture"] = texinfo; o["occlusionTexture"] = texinfo;
} }
if (material.emissiveTexture.index >= -1) { if (material.emissiveTexture.index > -1) {
json texinfo; json texinfo;
SerializeGltfTextureInfo(material.emissiveTexture, texinfo); SerializeGltfTextureInfo(material.emissiveTexture, texinfo);
o["emissiveTexture"] = texinfo; o["emissiveTexture"] = texinfo;