GitHub-Proxy/tinygltf
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/syoyo/tinygltf.git synced 2025-07-31 22:41:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Keep up with tinyobj's API update.

Browse Source
This commit is contained in:
Syoyo Fujita 2020-03-11 19:30:57 +09:00
parent 60e22f3281
commit cb0a8794c3
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
examples/raytrace/obj-loader.cc
View File

@ -150,6 +150,7 @@ bool LoadObj(const std::string &filename, float scale,
tinyobj::attrib_t attrib; tinyobj::attrib_t attrib;
std::vector<tinyobj::shape_t> shapes; std::vector<tinyobj::shape_t> shapes;
std::vector<tinyobj::material_t> materials; std::vector<tinyobj::material_t> materials;
std::string warn;
std::string err; std::string err;
std::string basedir = GetBaseDir(filename) + "/"; 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(); // auto t_start = std::chrono::system_clock::now();
bool ret = bool ret =
tinyobj::LoadObj(&attrib, &shapes, &materials, &err, filename.c_str(), tinyobj::LoadObj(&attrib, &shapes, &materials, &warn, &err, filename.c_str(),
basepath, /* triangulate */ true); basepath, /* triangulate */ true);
// auto t_end = std::chrono::system_clock::now(); // auto t_end = std::chrono::system_clock::now();
// std::chrono::duration<double, std::milli> ms = t_end - t_start; // std::chrono::duration<double, std::milli> ms = t_end - t_start;
if (!warn.empty()) {
std::cout << warn << std::endl;
}
if (!err.empty()) { if (!err.empty()) {
std::cerr << err << std::endl; std::cerr << err << std::endl;
} }