From 33d5e9aa07625db7d24bafab39e3bb55ddf02a5b Mon Sep 17 00:00:00 2001 From: Vazquinhos Date: Fri, 13 May 2016 12:28:10 +0200 Subject: [PATCH] Test.cc modified with the new flags --- obj/x32/Debug/link.7608-cvtres.read.1.tlog | 1 + obj/x32/Debug/link.7608-cvtres.write.1.tlog | 1 + obj/x32/Debug/link.7608.read.1.tlog | 1 + obj/x32/Debug/link.7608.write.1.tlog | 1 + test.cc | 7 ++++--- 5 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 obj/x32/Debug/link.7608-cvtres.read.1.tlog create mode 100644 obj/x32/Debug/link.7608-cvtres.write.1.tlog create mode 100644 obj/x32/Debug/link.7608.read.1.tlog create mode 100644 obj/x32/Debug/link.7608.write.1.tlog diff --git a/obj/x32/Debug/link.7608-cvtres.read.1.tlog b/obj/x32/Debug/link.7608-cvtres.read.1.tlog new file mode 100644 index 0000000..46b134b --- /dev/null +++ b/obj/x32/Debug/link.7608-cvtres.read.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/obj/x32/Debug/link.7608-cvtres.write.1.tlog b/obj/x32/Debug/link.7608-cvtres.write.1.tlog new file mode 100644 index 0000000..46b134b --- /dev/null +++ b/obj/x32/Debug/link.7608-cvtres.write.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/obj/x32/Debug/link.7608.read.1.tlog b/obj/x32/Debug/link.7608.read.1.tlog new file mode 100644 index 0000000..46b134b --- /dev/null +++ b/obj/x32/Debug/link.7608.read.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/obj/x32/Debug/link.7608.write.1.tlog b/obj/x32/Debug/link.7608.write.1.tlog new file mode 100644 index 0000000..46b134b --- /dev/null +++ b/obj/x32/Debug/link.7608.write.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/test.cc b/test.cc index 2539faa..523973f 100644 --- a/test.cc +++ b/test.cc @@ -124,7 +124,7 @@ static bool TestLoadObj( const char* filename, const char* basepath = NULL, - bool triangulate = true) + unsigned int flags = 1 ) { std::cout << "Loading " << filename << std::endl; @@ -132,7 +132,7 @@ TestLoadObj( std::vector materials; std::string err; - bool ret = tinyobj::LoadObj(shapes, materials, err, filename, basepath, triangulate); + bool ret = tinyobj::LoadObj(shapes, materials, err, filename, basepath, flags); if (!err.empty()) { std::cerr << err << std::endl; @@ -143,7 +143,8 @@ TestLoadObj( return false; } - PrintInfo(shapes, materials, triangulate); + bool triangulate( ( flags & tinyobj::triangulation ) == tinyobj::triangulation ); + PrintInfo(shapes, materials, triangulate ); return true; }