Merge pull request #6 from lukesanantonio/master

Only use valid (triangle) primitive sets
This commit is contained in:
Syoyo Fujita 2016-06-15 15:33:13 +09:00 committed by GitHub
commit 7b91552bb1

View File

@ -1343,8 +1343,10 @@ static bool ParseMesh(Mesh *mesh, std::string *err, const picojson::object &o) {
(primObject->second).get<picojson::array>(); (primObject->second).get<picojson::array>();
for (size_t i = 0; i < primArray.size(); i++) { for (size_t i = 0; i < primArray.size(); i++) {
Primitive primitive; Primitive primitive;
ParsePrimitive(&primitive, err, primArray[i].get<picojson::object>()); if(ParsePrimitive(&primitive, err, primArray[i].get<picojson::object>())){
mesh->primitives.push_back(primitive); // Only add the primitive if the parsing succeeds.
mesh->primitives.push_back(primitive);
}
} }
} }