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

Remove redundant & buggy memcpy.

Browse Source 
Add verbose option.
This commit is contained in:
Syoyo Fujita
2016-07-15 01:38:39 +09:00
parent d4a7eefc54
commit 7d6318c3ad
2 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
experimental/viewer.cc
View File

@@ -214,9 +214,8 @@ const char* get_file_data(size_t *len, const char* filename)
}
bool LoadObjAndConvert(float bmin[3], float bmax[3], const char* filename, int num_threads)
bool LoadObjAndConvert(float bmin[3], float bmax[3], const char* filename, int num_threads, bool verbose)
{
#if 1
tinyobj_opt::attrib_t attrib;
std::vector<tinyobj_opt::shape_t> shapes;
@@ -229,6 +228,7 @@ bool LoadObjAndConvert(float bmin[3], float bmax[3], const char* filename, int n
printf("filesize: %d\n", (int)data_len);
tinyobj_opt::LoadOption option;
option.req_num_threads = num_threads;
option.verbose = verbose;
bool ret = parseObj(&attrib, &shapes, data, data_len, option);
bmin[0] = bmin[1] = bmin[2] = std::numeric_limits<float>::max();
@@ -330,9 +330,6 @@ bool LoadObjAndConvert(float bmin[3], float bmax[3], const char* filename, int n
printf("bmax = %f, %f, %f\n", bmax[0], bmax[1], bmax[2]);
return true;
#else
return false;
#endif
}
void reshapeFunc(GLFWwindow* window, int w, int h)
@@ -499,12 +496,14 @@ static void Init() {
int main(int argc, char **argv)
{
if (argc < 2) {
std::cout << "Needs input.obj\n" << std::endl;
std::cout << "view input.obj <num_threads> <benchark_only> <verbose>" << std::endl;
return 0;
}
bool benchmark_only = false;
int num_threads = -1;
bool verbose = false;
if (argc > 2) {
num_threads = atoi(argv[2]);
}
@@ -513,6 +512,10 @@ int main(int argc, char **argv)
benchmark_only = true;
}
if (argc > 4) {
verbose = true;
}
if (benchmark_only) {
tinyobj_opt::attrib_t attrib;
@@ -527,6 +530,8 @@ int main(int argc, char **argv)
printf("filesize: %d\n", (int)data_len);
tinyobj_opt::LoadOption option;
option.req_num_threads = num_threads;
option.verbose = true;
bool ret = parseObj(&attrib, &shapes, data, data_len, option);
return ret;
@@ -569,7 +574,7 @@ int main(int argc, char **argv)
reshapeFunc(window, width, height);
float bmin[3], bmax[3];
if (false == LoadObjAndConvert(bmin, bmax, argv[1], num_threads)) {
if (false == LoadObjAndConvert(bmin, bmax, argv[1], num_threads, verbose)) {
printf("failed to load & conv\n");
return -1;
}