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

Merge pull request #65 from Ambal/master

Browse Source 
Performance tweaks
This commit is contained in:
Syoyo Fujita
2016-02-20 19:49:12 +09:00
parent 9c1826381c cf52401ca7
commit ab10b76eda
1 changed files with 45 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
tiny_obj_loader.h
View File

@@ -205,11 +205,9 @@ struct obj_shape {
std::vector<float> vt; std::vector<float> vt;
}; };
static inline bool isSpace(const char c) { return (c == ' ') || (c == '\t'); } #define IS_SPACE( x ) ( ( (x) == ' ') || ( (x) == '\t') )
#define IS_DIGIT( x ) ( (unsigned int)( (x) - '0' ) < (unsigned int)10 )
static inline bool isNewLine(const char c) { #define IS_NEW_LINE( x ) ( ( (x) == '\r') || ( (x) == '\n') || ( (x) == '\0') )
return (c == '\r') || (c == '\n') || (c == '\0');
}
// Make index zero-base, and also support relative index. // Make index zero-base, and also support relative index.
static inline int fixIndex(int idx, int n) { static inline int fixIndex(int idx, int n) {
@@ -297,13 +295,13 @@ static bool tryParseDouble(const char *s, const char *s_end, double *result) {
if (*curr == '+' || *curr == '-') { if (*curr == '+' || *curr == '-') {
sign = *curr; sign = *curr;
curr++; curr++;
} else if (isdigit(*curr)) { /* Pass through. */ } else if (IS_DIGIT(*curr)) { /* Pass through. */
} else { } else {
goto fail; goto fail;
} }
// Read the integer part. // Read the integer part.
while ((end_not_reached = (curr != s_end)) && isdigit(*curr)) { while ((end_not_reached = (curr != s_end)) && IS_DIGIT(*curr)) {
mantissa *= 10; mantissa *= 10;
mantissa += static_cast<int>(*curr - 0x30); mantissa += static_cast<int>(*curr - 0x30);
curr++; curr++;
@@ -321,7 +319,7 @@ static bool tryParseDouble(const char *s, const char *s_end, double *result) {
if (*curr == '.') { if (*curr == '.') {
curr++; curr++;
read = 1; read = 1;
while ((end_not_reached = (curr != s_end)) && isdigit(*curr)) { while ((end_not_reached = (curr != s_end)) && IS_DIGIT(*curr)) {
// NOTE: Don't use powf here, it will absolutely murder precision. // NOTE: Don't use powf here, it will absolutely murder precision.
mantissa += static_cast<int>(*curr - 0x30) * pow(10.0, -read); mantissa += static_cast<int>(*curr - 0x30) * pow(10.0, -read);
read++; read++;
@@ -342,14 +340,14 @@ static bool tryParseDouble(const char *s, const char *s_end, double *result) {
if ((end_not_reached = (curr != s_end)) && (*curr == '+' || *curr == '-')) { if ((end_not_reached = (curr != s_end)) && (*curr == '+' || *curr == '-')) {
exp_sign = *curr; exp_sign = *curr;
curr++; curr++;
} else if (isdigit(*curr)) { /* Pass through. */ } else if (IS_DIGIT(*curr)) { /* Pass through. */
} else { } else {
// Empty E is not allowed. // Empty E is not allowed.
goto fail; goto fail;
} }
read = 0; read = 0;
while ((end_not_reached = (curr != s_end)) && isdigit(*curr)) { while ((end_not_reached = (curr != s_end)) && IS_DIGIT(*curr)) {
exponent *= 10; exponent *= 10;
exponent += static_cast<int>(*curr - 0x30); exponent += static_cast<int>(*curr - 0x30);
curr++; curr++;
@@ -625,7 +623,7 @@ void LoadMtl(std::map<std::string, int> &material_map,
continue; // comment line continue; // comment line
// new mtl // new mtl
if ((0 == strncmp(token, "newmtl", 6)) && isSpace((token[6]))) { if ((0 == strncmp(token, "newmtl", 6)) && IS_SPACE((token[6]))) {
// flush previous material. // flush previous material.
if (!material.name.empty()) { if (!material.name.empty()) {
material_map.insert(std::pair<std::string, int>( material_map.insert(std::pair<std::string, int>(
@@ -649,7 +647,7 @@ void LoadMtl(std::map<std::string, int> &material_map,
} }
// ambient // ambient
if (token[0] == 'K' && token[1] == 'a' && isSpace((token[2]))) { if (token[0] == 'K' && token[1] == 'a' && IS_SPACE((token[2]))) {
token += 2; token += 2;
float r, g, b; float r, g, b;
parseFloat3(r, g, b, token); parseFloat3(r, g, b, token);
@@ -660,7 +658,7 @@ void LoadMtl(std::map<std::string, int> &material_map,
} }
// diffuse // diffuse
if (token[0] == 'K' && token[1] == 'd' && isSpace((token[2]))) { if (token[0] == 'K' && token[1] == 'd' && IS_SPACE((token[2]))) {
token += 2; token += 2;
float r, g, b; float r, g, b;
parseFloat3(r, g, b, token); parseFloat3(r, g, b, token);
@@ -671,7 +669,7 @@ void LoadMtl(std::map<std::string, int> &material_map,
} }
// specular // specular
if (token[0] == 'K' && token[1] == 's' && isSpace((token[2]))) { if (token[0] == 'K' && token[1] == 's' && IS_SPACE((token[2]))) {
token += 2; token += 2;
float r, g, b; float r, g, b;
parseFloat3(r, g, b, token); parseFloat3(r, g, b, token);
@@ -682,7 +680,7 @@ void LoadMtl(std::map<std::string, int> &material_map,
} }
// transmittance // transmittance
if (token[0] == 'K' && token[1] == 't' && isSpace((token[2]))) { if (token[0] == 'K' && token[1] == 't' && IS_SPACE((token[2]))) {
token += 2; token += 2;
float r, g, b; float r, g, b;
parseFloat3(r, g, b, token); parseFloat3(r, g, b, token);
@@ -693,14 +691,14 @@ void LoadMtl(std::map<std::string, int> &material_map,
} }
// ior(index of refraction) // ior(index of refraction)
if (token[0] == 'N' && token[1] == 'i' && isSpace((token[2]))) { if (token[0] == 'N' && token[1] == 'i' && IS_SPACE((token[2]))) {
token += 2; token += 2;
material.ior = parseFloat(token); material.ior = parseFloat(token);
continue; continue;
} }
// emission // emission
if (token[0] == 'K' && token[1] == 'e' && isSpace(token[2])) { if (token[0] == 'K' && token[1] == 'e' && IS_SPACE(token[2])) {
token += 2; token += 2;
float r, g, b; float r, g, b;
parseFloat3(r, g, b, token); parseFloat3(r, g, b, token);
@@ -711,26 +709,26 @@ void LoadMtl(std::map<std::string, int> &material_map,
} }
// shininess // shininess
if (token[0] == 'N' && token[1] == 's' && isSpace(token[2])) { if (token[0] == 'N' && token[1] == 's' && IS_SPACE(token[2])) {
token += 2; token += 2;
material.shininess = parseFloat(token); material.shininess = parseFloat(token);
continue; continue;
} }
// illum model // illum model
if (0 == strncmp(token, "illum", 5) && isSpace(token[5])) { if (0 == strncmp(token, "illum", 5) && IS_SPACE(token[5])) {
token += 6; token += 6;
material.illum = parseInt(token); material.illum = parseInt(token);
continue; continue;
} }
// dissolve // dissolve
if ((token[0] == 'd' && isSpace(token[1]))) { if ((token[0] == 'd' && IS_SPACE(token[1]))) {
token += 1; token += 1;
material.dissolve = parseFloat(token); material.dissolve = parseFloat(token);
continue; continue;
} }
if (token[0] == 'T' && token[1] == 'r' && isSpace(token[2])) { if (token[0] == 'T' && token[1] == 'r' && IS_SPACE(token[2])) {
token += 2; token += 2;
// Invert value of Tr(assume Tr is in range [0, 1]) // Invert value of Tr(assume Tr is in range [0, 1])
material.dissolve = 1.0f - parseFloat(token); material.dissolve = 1.0f - parseFloat(token);
@@ -738,56 +736,56 @@ void LoadMtl(std::map<std::string, int> &material_map,
} }
// ambient texture // ambient texture
if ((0 == strncmp(token, "map_Ka", 6)) && isSpace(token[6])) { if ((0 == strncmp(token, "map_Ka", 6)) && IS_SPACE(token[6])) {
token += 7; token += 7;
material.ambient_texname = token; material.ambient_texname = token;
continue; continue;
} }
// diffuse texture // diffuse texture
if ((0 == strncmp(token, "map_Kd", 6)) && isSpace(token[6])) { if ((0 == strncmp(token, "map_Kd", 6)) && IS_SPACE(token[6])) {
token += 7; token += 7;
material.diffuse_texname = token; material.diffuse_texname = token;
continue; continue;
} }
// specular texture // specular texture
if ((0 == strncmp(token, "map_Ks", 6)) && isSpace(token[6])) { if ((0 == strncmp(token, "map_Ks", 6)) && IS_SPACE(token[6])) {
token += 7; token += 7;
material.specular_texname = token; material.specular_texname = token;
continue; continue;
} }
// specular highlight texture // specular highlight texture
if ((0 == strncmp(token, "map_Ns", 6)) && isSpace(token[6])) { if ((0 == strncmp(token, "map_Ns", 6)) && IS_SPACE(token[6])) {
token += 7; token += 7;
material.specular_highlight_texname = token; material.specular_highlight_texname = token;
continue; continue;
} }
// bump texture // bump texture
if ((0 == strncmp(token, "map_bump", 8)) && isSpace(token[8])) { if ((0 == strncmp(token, "map_bump", 8)) && IS_SPACE(token[8])) {
token += 9; token += 9;
material.bump_texname = token; material.bump_texname = token;
continue; continue;
} }
// alpha texture // alpha texture
if ((0 == strncmp(token, "map_d", 5)) && isSpace(token[5])) { if ((0 == strncmp(token, "map_d", 5)) && IS_SPACE(token[5])) {
token += 6; token += 6;
material.alpha_texname = token; material.alpha_texname = token;
continue; continue;
} }
// bump texture // bump texture
if ((0 == strncmp(token, "bump", 4)) && isSpace(token[4])) { if ((0 == strncmp(token, "bump", 4)) && IS_SPACE(token[4])) {
token += 5; token += 5;
material.bump_texname = token; material.bump_texname = token;
continue; continue;
} }
// displacement texture // displacement texture
if ((0 == strncmp(token, "disp", 4)) && isSpace(token[4])) { if ((0 == strncmp(token, "disp", 4)) && IS_SPACE(token[4])) {
token += 5; token += 5;
material.displacement_texname = token; material.displacement_texname = token;
continue; continue;
@@ -914,7 +912,7 @@ bool LoadObj(std::vector<shape_t> &shapes, // [output]
continue; // comment line continue; // comment line
// vertex // vertex
if (token[0] == 'v' && isSpace((token[1]))) { if (token[0] == 'v' && IS_SPACE((token[1]))) {
token += 2; token += 2;
float x, y, z; float x, y, z;
parseFloat3(x, y, z, token); parseFloat3(x, y, z, token);
@@ -925,7 +923,7 @@ bool LoadObj(std::vector<shape_t> &shapes, // [output]
} }
// normal // normal
if (token[0] == 'v' && token[1] == 'n' && isSpace((token[2]))) { if (token[0] == 'v' && token[1] == 'n' && IS_SPACE((token[2]))) {
token += 3; token += 3;
float x, y, z; float x, y, z;
parseFloat3(x, y, z, token); parseFloat3(x, y, z, token);
@@ -936,7 +934,7 @@ bool LoadObj(std::vector<shape_t> &shapes, // [output]
} }
// texcoord // texcoord
if (token[0] == 'v' && token[1] == 't' && isSpace((token[2]))) { if (token[0] == 'v' && token[1] == 't' && IS_SPACE((token[2]))) {
token += 3; token += 3;
float x, y; float x, y;
parseFloat2(x, y, token); parseFloat2(x, y, token);
@@ -946,12 +944,14 @@ bool LoadObj(std::vector<shape_t> &shapes, // [output]
} }
// face // face
if (token[0] == 'f' && isSpace((token[1]))) { if (token[0] == 'f' && IS_SPACE((token[1]))) {
token += 2; token += 2;
token += strspn(token, " \t"); token += strspn(token, " \t");
std::vector<vertex_index> face; std::vector<vertex_index> face;
while (!isNewLine(token[0])) { face.reserve(3);
while (!IS_NEW_LINE(token[0])) {
vertex_index vi = parseTriple(token, static_cast<int>(v.size() / 3), vertex_index vi = parseTriple(token, static_cast<int>(v.size() / 3),
static_cast<int>(vn.size() / 3), static_cast<int>(vn.size() / 3),
static_cast<int>(vt.size() / 2)); static_cast<int>(vt.size() / 2));
@@ -960,13 +960,15 @@ bool LoadObj(std::vector<shape_t> &shapes, // [output]
token += n; token += n;
} }
faceGroup.push_back(face); // replace with emplace_back + std::move on C++11
faceGroup.push_back(std::vector<vertex_index>());
faceGroup[faceGroup.size() - 1].swap(face);
continue; continue;
} }
// use mtl // use mtl
if ((0 == strncmp(token, "usemtl", 6)) && isSpace((token[6]))) { if ((0 == strncmp(token, "usemtl", 6)) && IS_SPACE((token[6]))) {
char namebuf[TINYOBJ_SSCANF_BUFFER_SIZE]; char namebuf[TINYOBJ_SSCANF_BUFFER_SIZE];
token += 7; token += 7;
@@ -997,7 +999,7 @@ bool LoadObj(std::vector<shape_t> &shapes, // [output]
} }
// load mtl // load mtl
if ((0 == strncmp(token, "mtllib", 6)) && isSpace((token[6]))) { if ((0 == strncmp(token, "mtllib", 6)) && IS_SPACE((token[6]))) {
char namebuf[TINYOBJ_SSCANF_BUFFER_SIZE]; char namebuf[TINYOBJ_SSCANF_BUFFER_SIZE];
token += 7; token += 7;
#ifdef _MSC_VER #ifdef _MSC_VER
@@ -1019,7 +1021,7 @@ bool LoadObj(std::vector<shape_t> &shapes, // [output]
} }
// group name // group name
if (token[0] == 'g' && isSpace((token[1]))) { if (token[0] == 'g' && IS_SPACE((token[1]))) {
// flush previous face group. // flush previous face group.
bool ret = bool ret =
@@ -1035,7 +1037,9 @@ bool LoadObj(std::vector<shape_t> &shapes, // [output]
faceGroup.clear(); faceGroup.clear();
std::vector<std::string> names; std::vector<std::string> names;
while (!isNewLine(token[0])) { names.reserve(2);
while (!IS_NEW_LINE(token[0])) {
std::string str = parseString(token); std::string str = parseString(token);
names.push_back(str); names.push_back(str);
token += strspn(token, " \t\r"); // skip tag token += strspn(token, " \t\r"); // skip tag
@@ -1054,7 +1058,7 @@ bool LoadObj(std::vector<shape_t> &shapes, // [output]
} }
// object name // object name
if (token[0] == 'o' && isSpace((token[1]))) { if (token[0] == 'o' && IS_SPACE((token[1]))) {
// flush previous face group. // flush previous face group.
bool ret = bool ret =
@@ -1081,7 +1085,7 @@ bool LoadObj(std::vector<shape_t> &shapes, // [output]
continue; continue;
} }
if (token[0] == 't' && isSpace(token[1])) { if (token[0] == 't' && IS_SPACE(token[1])) {
tag_t tag; tag_t tag;
char namebuf[4096]; char namebuf[4096];