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

use ternary op instead of max from omitted lib

Browse Source
This commit is contained in:
Vincent de Marignac
2018-08-16 00:00:22 +03:00
parent fdc70abdc6
commit 7d20e9b901
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tiny_obj_loader.h
View File

@@ -1789,9 +1789,9 @@ 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_v_idx = -1;
int greatest_normal_index = -1; int greatest_vn_idx = -1;
int greatest_texcoord_index = -1; int greatest_vt_idx = -1;
shape_t shape; shape_t shape;
@@ -1911,9 +1911,9 @@ 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_v_idx = greatest_v_idx > vi.v_idx ? greatest_v_idx : vi.v_idx;
greatest_normal_index = std::max(greatest_normal_index, vi.vn_idx); greatest_vn_idx = greatest_vn_idx > vi.vn_idx ? greatest_vn_idx : vi.vn_idx;
greatest_texcoord_index = std::max(greatest_texcoord_index, vi.vt_idx); greatest_vt_idx = greatest_vt_idx > vi.vt_idx ? greatest_vt_idx : 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");
@@ -2161,9 +2161,9 @@ bool LoadObj(attrib_t *attrib, std::vector<shape_t> *shapes,
// Ignore unknown command. // Ignore unknown command.
} }
if (greatest_vertex_index * 3 >= int(v.size()) if (greatest_v_idx * 3 >= int(v.size())
|| greatest_normal_index * 3 >= int(vn.size()) || greatest_vn_idx * 3 >= int(vn.size())
|| greatest_texcoord_index * 2 >= int(vt.size())) || greatest_vt_idx * 2 >= int(vt.size()))
{ {
if (err) { if (err) {
std::stringstream ss; std::stringstream ss;