Refactor.

This commit is contained in:
Syoyo Fujita
2016-06-11 19:34:12 +09:00
parent 5fc9842e97
commit 164dcb8121
2 changed files with 44 additions and 21 deletions

View File

@@ -227,7 +227,9 @@ bool LoadObjAndConvert(float bmin[3], float bmax[3], const char* filename, int n
return false;
}
printf("filesize: %d\n", (int)data_len);
bool ret = parseObj(&attrib, &shapes, data, data_len, num_threads);
tinyobj_opt::LoadOption option;
option.req_num_threads = num_threads;
bool ret = parseObj(&attrib, &shapes, data, data_len, option);
bmin[0] = bmin[1] = bmin[2] = std::numeric_limits<float>::max();
bmax[0] = bmax[1] = bmax[2] = -std::numeric_limits<float>::max();
@@ -523,7 +525,9 @@ int main(int argc, char **argv)
return false;
}
printf("filesize: %d\n", (int)data_len);
bool ret = parseObj(&attrib, &shapes, data, data_len, num_threads);
tinyobj_opt::LoadOption option;
option.req_num_threads = num_threads;
bool ret = parseObj(&attrib, &shapes, data, data_len, option);
return ret;
}