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

Fix compilation on recent clang.

Browse Source
This commit is contained in:
Syoyo Fujita
2017-12-28 18:45:14 +09:00
parent cc73127bf0
commit 609139f370
2 changed files with 166 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
loader_example.cc
View File

@@ -29,6 +29,12 @@ extern "C" {
#endif #endif
#endif #endif
#ifdef __clang__
#if __has_warning("-Wzero-as-null-pointer-constant")
#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
#endif
#endif
class timerutil { class timerutil {
public: public:
#ifdef _WIN32 #ifdef _WIN32

276
tiny_obj_loader.h
View File

@@ -53,6 +53,13 @@ THE SOFTWARE.
namespace tinyobj { namespace tinyobj {
#ifdef __clang__
#pragma clang diagnostic push
#if __has_warning("-Wzero-as-null-pointer-constant")
#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
#endif
#endif
// https://en.wikipedia.org/wiki/Wavefront_.obj_file says ... // https://en.wikipedia.org/wiki/Wavefront_.obj_file says ...
// //
// -blendu on | off # set horizontal texture blending // -blendu on | off # set horizontal texture blending
@@ -110,13 +117,43 @@ typedef double real_t;
typedef float real_t; typedef float real_t;
#endif #endif
struct vec3_t { real_t x,y,z; }; struct vec3_t {
inline vec3_t operator+(const vec3_t &l,const vec3_t &r){vec3_t o;o.x=l.x+r.x;o.y=l.y+r.y;o.z=l.z+r.z;return o;} real_t x, y, z;
inline vec3_t operator-(const vec3_t &l,const vec3_t &r){vec3_t o;o.x=l.x-r.x;o.y=l.y-r.y;o.z=l.z-r.z;return o;} };
inline vec3_t operator*(const vec3_t &l,real_t r){vec3_t o;o.x=l.x*r;o.y=l.y*r;o.z=l.z*r;return o;} inline vec3_t operator+(const vec3_t &l, const vec3_t &r) {
inline vec3_t cross(const vec3_t &l,const vec3_t &r){vec3_t o;o.x=l.y*r.z-r.y*l.z;o.y=l.z*r.x-r.z*l.x;o.z=l.x*r.y-r.x*l.y;return o;} vec3_t o;
inline real_t dot(const vec3_t &l,const vec3_t &r){return l.x*r.x+l.y*r.y+l.z*r.z;} o.x = l.x + r.x;
struct vec2_t { real_t x,y; }; o.y = l.y + r.y;
o.z = l.z + r.z;
return o;
}
inline vec3_t operator-(const vec3_t &l, const vec3_t &r) {
vec3_t o;
o.x = l.x - r.x;
o.y = l.y - r.y;
o.z = l.z - r.z;
return o;
}
inline vec3_t operator*(const vec3_t &l, real_t r) {
vec3_t o;
o.x = l.x * r;
o.y = l.y * r;
o.z = l.z * r;
return o;
}
inline vec3_t cross(const vec3_t &l, const vec3_t &r) {
vec3_t o;
o.x = l.y * r.z - r.y * l.z;
o.y = l.z * r.x - r.z * l.x;
o.z = l.x * r.y - r.x * l.y;
return o;
}
inline real_t dot(const vec3_t &l, const vec3_t &r) {
return l.x * r.x + l.y * r.y + l.z * r.z;
}
struct vec2_t {
real_t x, y;
};
typedef enum { typedef enum {
TEXTURE_TYPE_NONE, // default TEXTURE_TYPE_NONE, // default
@@ -1320,7 +1357,7 @@ static void InitMaterial(material_t *material) {
static bool exportFaceGroupToShape( static bool exportFaceGroupToShape(
shape_t *shape, const std::vector<std::vector<vertex_index> > &faceGroup, shape_t *shape, const std::vector<std::vector<vertex_index> > &faceGroup,
const std::vector<tag_t> &tags, const int material_id, const std::vector<tag_t> &tags, const int material_id,
const std::string &name, bool triangulate, const std::vector<vec3_t> &v ) { const std::string &name, bool triangulate, const std::vector<vec3_t> &v) {
if (faceGroup.empty()) { if (faceGroup.empty()) {
return false; return false;
} }
@@ -1336,124 +1373,129 @@ static bool exportFaceGroupToShape(
size_t npolys = face.size(); size_t npolys = face.size();
if (triangulate) { if (triangulate) {
vec3_t face_normal = {0,0,0}; vec3_t face_normal = {0, 0, 0};
for(size_t k = 0; k < npolys; ++k) { for (size_t k = 0; k < npolys; ++k) {
int vi0 = face[(k+0)%npolys].v_idx; int vi0 = face[(k + 0) % npolys].v_idx;
int vi1 = face[(k+1)%npolys].v_idx; int vi1 = face[(k + 1) % npolys].v_idx;
int vi2 = face[(k+2)%npolys].v_idx; int vi2 = face[(k + 2) % npolys].v_idx;
const vec3_t &v0 = v[vi0]; const vec3_t &v0 = v[size_t(vi0)];
const vec3_t &v1 = v[vi1]; const vec3_t &v1 = v[size_t(vi1)];
const vec3_t &v2 = v[vi2]; const vec3_t &v2 = v[size_t(vi2)];
const vec3_t e0 = v1 - v0; const vec3_t e0 = v1 - v0;
const vec3_t e1 = v2 - v1; const vec3_t e1 = v2 - v1;
const vec3_t n = cross( e0, e1 ); const vec3_t n = cross(e0, e1);
face_normal = face_normal + n; face_normal = face_normal + n;
} }
// face_normal is currently area of face // face_normal is currently area of face
{ {
real_t l = sqrt(dot( face_normal, face_normal )); real_t l = std::sqrt(dot(face_normal, face_normal));
face_normal = face_normal * (1.0/l); face_normal = face_normal * (static_cast<real_t>(1.0) / l);
} }
int maxRounds = 10; // arbitrary max loop count to protect against unexpected errors int maxRounds =
10; // arbitrary max loop count to protect against unexpected errors
std::vector<vertex_index> remainingFace = face; std::vector<vertex_index> remainingFace = face;
size_t guess_vert = 0; size_t guess_vert = 0;
while( remainingFace.size() > 3 && maxRounds > 0 ) { while (remainingFace.size() > 3 && maxRounds > 0) {
npolys = remainingFace.size(); npolys = remainingFace.size();
if( guess_vert >= npolys ) { if (guess_vert >= npolys) {
maxRounds -= 1; maxRounds -= 1;
guess_vert -= npolys; guess_vert -= npolys;
} }
i0 = remainingFace[(guess_vert+0)%npolys]; i0 = remainingFace[(guess_vert + 0) % npolys];
i1 = remainingFace[(guess_vert+1)%npolys]; i1 = remainingFace[(guess_vert + 1) % npolys];
i2 = remainingFace[(guess_vert+2)%npolys]; i2 = remainingFace[(guess_vert + 2) % npolys];
int vi0 = i0.v_idx; int vi0 = i0.v_idx;
int vi1 = i1.v_idx; int vi1 = i1.v_idx;
int vi2 = i2.v_idx; int vi2 = i2.v_idx;
const vec3_t &v0 = v[vi0]; const vec3_t &v0 = v[size_t(vi0)];
const vec3_t &v1 = v[vi1]; const vec3_t &v1 = v[size_t(vi1)];
const vec3_t &v2 = v[vi2]; const vec3_t &v2 = v[size_t(vi2)];
const vec3_t e0 = v1 - v0; const vec3_t e0 = v1 - v0;
const vec3_t e1 = v2 - v1; const vec3_t e1 = v2 - v1;
const vec3_t n = cross( e0, e1 ); const vec3_t n = cross(e0, e1);
bool internal = dot( n, face_normal ) < 0.0f; bool internal = dot(n, face_normal) < 0.0f;
if( internal ) { guess_vert += 1; continue; } if (internal) {
guess_vert += 1;
continue;
}
// check all other verts in case they are inside this triangle // check all other verts in case they are inside this triangle
bool overlap = false; bool overlap = false;
for( size_t otherVert = 3; otherVert < npolys; ++otherVert ) { for (size_t otherVert = 3; otherVert < npolys; ++otherVert) {
int ovi = remainingFace[(guess_vert+otherVert)%npolys].v_idx; int ovi = remainingFace[(guess_vert + otherVert) % npolys].v_idx;
const vec3_t &ov = v[ovi]; const vec3_t &ov = v[size_t(ovi)];
if( dot( face_normal, cross( e0, ov-v0 ) ) < 0 ) if (dot(face_normal, cross(e0, ov - v0)) < 0) continue;
continue; if (dot(face_normal, cross(e1, ov - v1)) < 0) continue;
if( dot( face_normal, cross( e1, ov-v1 ) ) < 0 ) if (dot(face_normal, cross(v0 - v2, ov - v2)) < 0) continue;
continue; // vert inside triangle
if( dot( face_normal, cross( v0-v2, ov-v2 ) ) < 0 ) overlap = true;
continue; break;
// vert inside triangle }
overlap = true;
break;
}
if( overlap ) { guess_vert += 1; continue; } if (overlap) {
guess_vert += 1;
continue;
}
// this triangle is an ear // this triangle is an ear
{ {
index_t idx0, idx1, idx2; index_t idx0, idx1, idx2;
idx0.vertex_index = i0.v_idx; idx0.vertex_index = i0.v_idx;
idx0.normal_index = i0.vn_idx; idx0.normal_index = i0.vn_idx;
idx0.texcoord_index = i0.vt_idx; idx0.texcoord_index = i0.vt_idx;
idx1.vertex_index = i1.v_idx; idx1.vertex_index = i1.v_idx;
idx1.normal_index = i1.vn_idx; idx1.normal_index = i1.vn_idx;
idx1.texcoord_index = i1.vt_idx; idx1.texcoord_index = i1.vt_idx;
idx2.vertex_index = i2.v_idx; idx2.vertex_index = i2.v_idx;
idx2.normal_index = i2.vn_idx; idx2.normal_index = i2.vn_idx;
idx2.texcoord_index = i2.vt_idx; idx2.texcoord_index = i2.vt_idx;
shape->mesh.indices.push_back(idx0); shape->mesh.indices.push_back(idx0);
shape->mesh.indices.push_back(idx1); shape->mesh.indices.push_back(idx1);
shape->mesh.indices.push_back(idx2); shape->mesh.indices.push_back(idx2);
shape->mesh.num_face_vertices.push_back(3); shape->mesh.num_face_vertices.push_back(3);
shape->mesh.material_ids.push_back(material_id); shape->mesh.material_ids.push_back(material_id);
} }
// remove v1 from the list // remove v1 from the list
size_t removed_vert_index = (guess_vert+1)%npolys; size_t removed_vert_index = (guess_vert + 1) % npolys;
while( removed_vert_index + 1 < npolys ) { while (removed_vert_index + 1 < npolys) {
remainingFace[removed_vert_index] = remainingFace[removed_vert_index+1]; remainingFace[removed_vert_index] =
removed_vert_index += 1; remainingFace[removed_vert_index + 1];
} removed_vert_index += 1;
remainingFace.pop_back(); }
} remainingFace.pop_back();
}
if( remainingFace.size() == 3 ) { if (remainingFace.size() == 3) {
i0 = remainingFace[0]; i0 = remainingFace[0];
i1 = remainingFace[1]; i1 = remainingFace[1];
i2 = remainingFace[2]; i2 = remainingFace[2];
{ {
index_t idx0, idx1, idx2; index_t idx0, idx1, idx2;
idx0.vertex_index = i0.v_idx; idx0.vertex_index = i0.v_idx;
idx0.normal_index = i0.vn_idx; idx0.normal_index = i0.vn_idx;
idx0.texcoord_index = i0.vt_idx; idx0.texcoord_index = i0.vt_idx;
idx1.vertex_index = i1.v_idx; idx1.vertex_index = i1.v_idx;
idx1.normal_index = i1.vn_idx; idx1.normal_index = i1.vn_idx;
idx1.texcoord_index = i1.vt_idx; idx1.texcoord_index = i1.vt_idx;
idx2.vertex_index = i2.v_idx; idx2.vertex_index = i2.v_idx;
idx2.normal_index = i2.vn_idx; idx2.normal_index = i2.vn_idx;
idx2.texcoord_index = i2.vt_idx; idx2.texcoord_index = i2.vt_idx;
shape->mesh.indices.push_back(idx0); shape->mesh.indices.push_back(idx0);
shape->mesh.indices.push_back(idx1); shape->mesh.indices.push_back(idx1);
shape->mesh.indices.push_back(idx2); shape->mesh.indices.push_back(idx2);
shape->mesh.num_face_vertices.push_back(3); shape->mesh.num_face_vertices.push_back(3);
shape->mesh.material_ids.push_back(material_id); shape->mesh.material_ids.push_back(material_id);
} }
} }
} else { } else {
for (size_t k = 0; k < npolys; k++) { for (size_t k = 0; k < npolys; k++) {
index_t idx; index_t idx;
@@ -2116,9 +2158,6 @@ bool LoadObj(attrib_t *attrib, std::vector<shape_t> *shapes,
parseVertexWithColor(&vtx.x, &vtx.y, &vtx.z, &r, &g, &b, &token); parseVertexWithColor(&vtx.x, &vtx.y, &vtx.z, &r, &g, &b, &token);
v.push_back(vtx); v.push_back(vtx);
real_t color;
vc.push_back(r); vc.push_back(r);
vc.push_back(g); vc.push_back(g);
vc.push_back(b); vc.push_back(b);
@@ -2717,6 +2756,11 @@ bool LoadObjWithCallback(std::istream &inStream, const callback_t &callback,
return true; return true;
} }
#ifdef __clang__
#pragma clang diagnostic pop
#endif
} // namespace tinyobj } // namespace tinyobj
#endif #endif