benkyd/tinyobjloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't create new shape by usemtl. Fixes #68.

Browse Source
This commit is contained in:
Syoyo Fujita
2016-03-12 02:14:52 +09:00
parent 31611161df
commit bc42bc47ad
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tiny_obj_loader.h
View File

@@ -5,6 +5,7 @@
//
//
// version 0.9.20: Fixes creating per-face material using `usemtl`(#68)
// version 0.9.17: Support n-polygon and crease tag(OpenSubdiv extension)
// version 0.9.16: Make tinyobjloader header-only
// version 0.9.15: Change API to handle no mtl file case correctly(#58)
@@ -978,21 +979,19 @@ bool LoadObj(std::vector<shape_t> &shapes, // [output]
sscanf(token, "%s", namebuf);
#endif
// Create face group per material.
bool ret =
exportFaceGroupToShape(shape, vertexCache, v, vn, vt, faceGroup, tags,
material, name, true, triangulate);
if (ret) {
shapes.push_back(shape);
}
shape = shape_t();
faceGroup.clear();
int newMaterialId = -1;
if (material_map.find(namebuf) != material_map.end()) {
material = material_map[namebuf];
newMaterialId = material_map[namebuf];
} else {
// { error!! material not found }
material = -1;
}
if (newMaterialId != material) {
// Create per-face material
exportFaceGroupToShape(shape, vertexCache, v, vn, vt, faceGroup, tags,
material, name, true, triangulate);
faceGroup.clear();
material = newMaterialId;
}
continue;