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

Produce an error and return when indices and data dont match.

Browse Source
This commit is contained in:
Vincent de Marignac
2018-08-15 23:13:00 +03:00
parent cd65de860b
commit 8a885e14b8
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tiny_obj_loader.h
View File

@@ -1789,6 +1789,10 @@ bool LoadObj(attrib_t *attrib, std::vector<shape_t> *shapes,
unsigned int current_smoothing_id = unsigned int current_smoothing_id =
0; // Initial value. 0 means no smoothing. 0; // Initial value. 0 means no smoothing.
int greatest_vertex_index = -1;
int greatest_normal_index = -1;
int greatest_texcoord_index = -1;
shape_t shape; shape_t shape;
size_t line_num = 0; size_t line_num = 0;
@@ -1907,6 +1911,10 @@ bool LoadObj(attrib_t *attrib, std::vector<shape_t> *shapes,
return false; return false;
} }
greatest_vertex_index = std::max(greatest_vertex_index, vi.v_idx);
greatest_normal_index = std::max(greatest_normal_index, vi.vn_idx);
greatest_texcoord_index = std::max(greatest_texcoord_index, vi.vt_idx);
face.vertex_indices.push_back(vi); face.vertex_indices.push_back(vi);
size_t n = strspn(token, " \t\r"); size_t n = strspn(token, " \t\r");
token += n; token += n;
@@ -2153,6 +2161,18 @@ bool LoadObj(attrib_t *attrib, std::vector<shape_t> *shapes,
// Ignore unknown command. // Ignore unknown command.
} }
if (greatest_vertex_index >= v.size()
|| greatest_normal_index >= vn.size()
|| greatest_texcoord_index >= vt.size())
{
if (err) {
std::stringstream ss;
ss << "WARN: Indices do not match the data.\n" << std::endl;
(*err) += ss.str();
}
return false;
}
bool ret = exportGroupsToShape(&shape, faceGroup, lineGroup, tags, material, bool ret = exportGroupsToShape(&shape, faceGroup, lineGroup, tags, material,
name, triangulate, v); name, triangulate, v);
// exportGroupsToShape return false when `usemtl` is called in the last // exportGroupsToShape return false when `usemtl` is called in the last