Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tinyRenderer, remove both \r and \n, not just \n

Browse Source
This commit is contained in:
Erwin Coumans
2018-10-13 11:46:46 -07:00
parent c441a9469c
commit fd3d292fcf
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
examples/ThirdPartyLibs/Wavefront/tiny_obj_loader.cpp
View File

@@ -407,7 +407,7 @@ std::string LoadMtl(
} }
if (linebuf.size() > 0) if (linebuf.size() > 0)
{ {
if (linebuf[linebuf.size() - 1] == '\n') linebuf.erase(linebuf.size() - 1); if (linebuf[linebuf.size() - 1] == '\r') linebuf.erase(linebuf.size() - 1);
} }
// Skip if empty line. // Skip if empty line.
@@ -417,11 +417,10 @@ std::string LoadMtl(
} }
linebuf = linebuf.substr(0, linebuf.find_last_not_of(" \t") + 1); linebuf = linebuf.substr(0, linebuf.find_last_not_of(" \t") + 1);
// Skip leading space. // Skip leading space.
const char* token = linebuf.c_str(); const char* token = linebuf.c_str();
token += strspn(token, " \t"); token += strspn(token, " \t");
assert(token); assert(token);
if (token[0] == '\0') continue; // empty line if (token[0] == '\0') continue; // empty line