dqn
/
FBX2glTF
mirror of https://github.com/facebookincubator/FBX2glTF.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed targetNames array name

This commit is contained in:
Gordon Chapman 2019-10-07 13:48:20 -07:00
parent 112376ae91
commit f1a6c24368
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gltf/properties/MeshData.cpp
View File

@ -14,12 +14,12 @@ MeshData::MeshData(const std::string& name, const std::vector<float>& weights)
json MeshData::serialize() const { json MeshData::serialize() const {
json jsonPrimitivesArray = json::array(); json jsonPrimitivesArray = json::array();
json targetNames = json::array(); json jsonTargetNamesArray = json::array();
for (const auto& primitive : primitives) { for (const auto& primitive : primitives) {
jsonPrimitivesArray.push_back(*primitive); jsonPrimitivesArray.push_back(*primitive);
if (!primitive->targetNames.empty()) { if (!primitive->targetNames.empty()) {
for (auto targetName : primitive->targetNames) { for (auto targetName : primitive->targetNames) {
targetNames.push_back(targetName); jsonTargetNamesArray.push_back(targetName);
} }
} }
} }
@ -27,8 +27,8 @@ json MeshData::serialize() const {
if (!weights.empty()) { if (!weights.empty()) {
result["weights"] = weights; result["weights"] = weights;
} }
if (!targetNames.empty()) { if (!jsonTargetNamesArray.empty()) {
result["extras"]["targetNames"] = targetNames; result["extras"]["targetNames"] = jsonTargetNamesArray;
} }
return result; return result;
} }