From cb0a8794c3f9f8ce78a8c368034e9039739ba128 Mon Sep 17 00:00:00 2001 From: Syoyo Fujita Date: Wed, 11 Mar 2020 19:30:57 +0900 Subject: [PATCH] Keep up with tinyobj's API update. --- examples/raytrace/obj-loader.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/examples/raytrace/obj-loader.cc b/examples/raytrace/obj-loader.cc index d55fb45..cf31b13 100644 --- a/examples/raytrace/obj-loader.cc +++ b/examples/raytrace/obj-loader.cc @@ -150,6 +150,7 @@ bool LoadObj(const std::string &filename, float scale, tinyobj::attrib_t attrib; std::vector shapes; std::vector materials; + std::string warn; std::string err; std::string basedir = GetBaseDir(filename) + "/"; @@ -158,12 +159,16 @@ bool LoadObj(const std::string &filename, float scale, // auto t_start = std::chrono::system_clock::now(); bool ret = - tinyobj::LoadObj(&attrib, &shapes, &materials, &err, filename.c_str(), + tinyobj::LoadObj(&attrib, &shapes, &materials, &warn, &err, filename.c_str(), basepath, /* triangulate */ true); // auto t_end = std::chrono::system_clock::now(); // std::chrono::duration ms = t_end - t_start; + if (!warn.empty()) { + std::cout << warn << std::endl; + } + if (!err.empty()) { std::cerr << err << std::endl; }