Format code.

Remove unused file.

README.md

@@ -98,7 +98,6 @@ TinyObjLoader is successfully used in ...
 * PBR material extension for .MTL. Its proposed here: http://exocortex.com/blog/extending_wavefront_mtl_to_support_pbr
 * Callback API for custom loading.
 * Double precision support(for HPC application).
-* Smoothing group
 
 
 ## TODO
@@ -106,6 +105,8 @@ TinyObjLoader is successfully used in ...
 * [ ] Fix obj_sticker example.
 * [ ] More unit test codes.
 * [x] Texture options
+* [ ] Normal vector generation
+  * [ ] Support smoothing groups
 
 ## License
 

examples/callback_api/main.cc

@@ -129,7 +129,6 @@ int main(int argc, char **argv) {
   cb.object_cb = object_cb;
 
   MyMesh mesh;
-  std::string warn;
   std::string err;
   std::string filename = "../../models/cornell_box.obj";
   if (argc > 1) {
@@ -144,11 +143,7 @@ int main(int argc, char **argv) {
 
   tinyobj::MaterialFileReader mtlReader("../../models/");
 
-  bool ret = tinyobj::LoadObjWithCallback(ifs, cb, &mesh, &mtlReader, &warn, &err);
+  bool ret = tinyobj::LoadObjWithCallback(ifs, cb, &mesh, &mtlReader, &err);
-
-  if (!warn.empty()) {
-    std::cout << "WARN: " << warn << std::endl;
-  }
 
   if (!err.empty()) {
     std::cerr << err << std::endl;

examples/obj_sticher/obj_sticher.cc

@@ -1,9 +1,8 @@
 //
-// Stiches multiple .obj files into one .obj.
+// Stiches multiple .obj files into one .obj. 
 //
-#include "obj_writer.h"
-
 #include "../../tiny_obj_loader.h"
+#include "obj_writer.h"
 
 #include <cassert>
 #include <iostream>
@@ -12,59 +11,27 @@
 
 typedef std::vector<tinyobj::shape_t> Shape;
 typedef std::vector<tinyobj::material_t> Material;
-typedef tinyobj::attrib_t Attribute;
 
 void
 StichObjs(
-  tinyobj::attrib_t& out_attribute,
   std::vector<tinyobj::shape_t>& out_shape,
   std::vector<tinyobj::material_t>& out_material,
-  const std::vector<Attribute>& attributes,
   const std::vector<Shape>& shapes,
   const std::vector<Material>& materials)
 {
-  // The amount of attributes, shape-vectors and material-vecotrs should be the same.
+  int numShapes = 0;
-  if(attributes.size() != shapes.size() && attributes.size() != materials.size()){
+  for (size_t i = 0; i < shapes.size(); i++) {
-    std::cerr << "Size of attributes, shapes and Materials don't fit!" << attributes.size() << " " << shapes.size() <<" " << materials.size() << std::endl;;
+    numShapes += (int)shapes[i].size();
-    exit(1);
-  }
-  int num_shapes = 0;
-  // 4 values (vertices, normals, texcoords, colors)
-  std::vector<int> num_attributes(4, 0);
-  int num_materials = 0;
-  for(int i = 0; i < shapes.size(); i++){
-    num_shapes += shapes[i].size();
-  }
-  for(int i = 0; i < attributes.size(); i++){
-    num_attributes[0] += attributes[i].vertices.size();
-    num_attributes[1] += attributes[i].normals.size();
-    num_attributes[2] += attributes[i].texcoords.size();
-    num_attributes[3] += attributes[i].colors.size();
-  }
-  for(int i = 0; i < materials.size(); i++){
-    num_materials += materials[i].size();
   }
 
-  // More performant, than push_back
+  printf("Total # of shapes = %d\n", numShapes);
-  out_attribute.vertices.resize(num_attributes[0]);
+  int materialIdOffset = 0;
-  out_attribute.normals.resize(num_attributes[1]);
-  out_attribute.texcoords.resize(num_attributes[2]);
-  out_attribute.colors.resize(num_attributes[3]);
-  out_shape.resize(num_shapes);
-  out_material.resize(num_materials);
 
-  int material_id_offset = 0;
+  size_t face_offset = 0;
-  int shape_id_offset = 0;
-  int vertex_idx_offset = 0;
-  int normal_idx_offset = 0;
-  int texcoord_idx_offset = 0;
-  int color_idx_offset = 0;
-
-  // shapes.size() = attributes.size() = materials.size()
   for (size_t i = 0; i < shapes.size(); i++) {
 
-    // Copy shapes
     for (size_t k = 0; k < shapes[i].size(); k++) {
+
       std::string new_name = shapes[i][k].name;
       // Add suffix
       char buf[1024];
@@ -72,51 +39,36 @@ StichObjs(
       new_name += std::string(buf);
 
       printf("shape[%ld][%ld].name = %s\n", i, k, shapes[i][k].name.c_str());
+      assert((shapes[i][k].mesh.indices.size() % 3) == 0);
+      assert((shapes[i][k].mesh.positions.size() % 3) == 0);
 
       tinyobj::shape_t new_shape = shapes[i][k];
-      // Add material offset.
+      // Add offset.
-      for(size_t f = 0; f < new_shape.mesh.material_ids.size(); f++) {
+      for (size_t f = 0; f < new_shape.mesh.material_ids.size(); f++) {
-        new_shape.mesh.material_ids[f] += material_id_offset;
+        new_shape.mesh.material_ids[f] += materialIdOffset;
-      }
-      // Add indices offset.
-      for(size_t f = 0; f < new_shape.mesh.indices.size(); f++){
-        tinyobj::index_t& ref = new_shape.mesh.indices[f];
-        if(ref.vertex_index > -1){
-          ref.vertex_index += vertex_idx_offset;
-        }
-        if(ref.normal_index > -1){
-          ref.normal_index += normal_idx_offset;
-        }
-        if(ref.texcoord_index > -1){
-          ref.texcoord_index += texcoord_idx_offset;
-        }
       }
 
       new_shape.name = new_name;
       printf("shape[%ld][%ld].new_name = %s\n", i, k, new_shape.name.c_str());
 
-      out_shape[shape_id_offset++] = new_shape;
+      out_shape.push_back(new_shape);
     }
 
-    // Copy materials
+    materialIdOffset += materials[i].size();
-    for (size_t k = 0; k < materials[i].size(); k++) {
-      out_material[material_id_offset++] = materials[i][k];
-    }
-
-    // Copy attributes (3 floats per vertex, 3 floats per normal, 2 floats per texture-coordinate, 3 floats per color)
-    // You could also include a check here, if the sizes are dividable by 3 (resp. 2), but it's safe to simply assume, they do.
-    std::copy(attributes[i].vertices.begin(), attributes[i].vertices.end(), out_attribute.vertices.begin() + vertex_idx_offset * 3);
-    vertex_idx_offset += attributes[i].vertices.size() / 3;
-    std::copy(attributes[i].normals.begin(), attributes[i].normals.end(), out_attribute.normals.begin() + normal_idx_offset * 3);
-    normal_idx_offset += attributes[i].normals.size() / 3;
-    std::copy(attributes[i].texcoords.begin(), attributes[i].texcoords.end(), out_attribute.texcoords.begin() + texcoord_idx_offset * 2);
-    texcoord_idx_offset += attributes[i].texcoords.size() / 2;
-    std::copy(attributes[i].colors.begin(), attributes[i].colors.end(), out_attribute.colors.begin() + color_idx_offset);
-    color_idx_offset += attributes[i].colors.size();
   }
+
+  for (size_t i = 0; i < materials.size(); i++) {
+    for (size_t k = 0; k < materials[i].size(); k++) {
+      out_material.push_back(materials[i][k]);
+    }
+  }
+
 }
 
-int main(int argc, char **argv)
+int
+main(
+  int argc,
+  char **argv)
 {
   if (argc < 3) {
     printf("Usage: obj_sticher input0.obj input1.obj ... output.obj\n");
@@ -126,16 +78,16 @@ int main(int argc, char **argv)
   int num_objfiles = argc - 2;
   std::string out_filename = std::string(argv[argc-1]); // last element
 
-  std::vector<Attribute> attributes(num_objfiles);
+  std::vector<Shape> shapes;
-  std::vector<Shape> shapes(num_objfiles);
+  std::vector<Material> materials;
-  std::vector<Material> materials(num_objfiles);
+  shapes.resize(num_objfiles);
+  materials.resize(num_objfiles);
 
   for (int i = 0; i < num_objfiles; i++) {
     std::cout << "Loading " << argv[i+1] << " ... " << std::flush;
     
-    std::string warn;
     std::string err;
-    bool ret = tinyobj::LoadObj(&attributes[i], &shapes[i], &materials[i], &warn, &err, argv[i+1]);
+    bool ret = tinyobj::LoadObj(shapes[i], materials[i], err, argv[i+1]);
     if (!err.empty()) {
       std::cerr << err << std::endl;
     }
@@ -146,13 +98,12 @@ int main(int argc, char **argv)
     std::cout << "DONE." << std::endl;
   }
 
-  Attribute out_attribute;
+  std::vector<tinyobj::shape_t> out_shape;
-  Shape out_shape;
+  std::vector<tinyobj::material_t> out_material;
-  Material out_material;
+  StichObjs(out_shape, out_material, shapes, materials);
-  StichObjs(out_attribute, out_shape, out_material, attributes, shapes, materials);
 
   bool coordTransform = true;
-  bool ret = WriteObj(out_filename, out_attribute, out_shape, out_material, coordTransform);
+  bool ret = WriteObj(out_filename, out_shape, out_material, coordTransform);
   assert(ret);
 
   return 0;

examples/obj_sticher/obj_writer.cc

@@ -30,8 +30,6 @@ bool WriteMat(const std::string& filename, const std::vector<tinyobj::material_t
     fprintf(fp, "Ke %f %f %f\n", mat.emission[0], mat.emission[1], mat.emission[2]);
     fprintf(fp, "Ns %f\n", mat.shininess);
     fprintf(fp, "Ni %f\n", mat.ior);
-    fprintf(fp, "illum %d\n", mat.illum);
-    fprintf(fp, "\n");
     // @todo { texture }
   }
   
@@ -40,7 +38,7 @@ bool WriteMat(const std::string& filename, const std::vector<tinyobj::material_t
   return true;
 }
 
-bool WriteObj(const std::string& filename, const tinyobj::attrib_t& attributes, const std::vector<tinyobj::shape_t>& shapes, const std::vector<tinyobj::material_t>& materials, bool coordTransform) {
+bool WriteObj(const std::string& filename, const std::vector<tinyobj::shape_t>& shapes, const std::vector<tinyobj::material_t>& materials, bool coordTransform) {
   FILE* fp = fopen(filename.c_str(), "w");
   if (!fp) {
     fprintf(stderr, "Failed to open file [ %s ] for write.\n", filename.c_str());
@@ -50,53 +48,17 @@ bool WriteObj(const std::string& filename, const tinyobj::attrib_t& attributes,
   std::string basename = GetFileBasename(filename);
   std::string material_filename = basename + ".mtl";
 
+  int v_offset = 0;
+  int vn_offset = 0;
+  int vt_offset = 0;
   int prev_material_id = -1;
 
-  fprintf(fp, "mtllib %s\n\n", material_filename.c_str());
+  fprintf(fp, "mtllib %s\n", material_filename.c_str());
-
-  // facevarying vtx
-  for (size_t k = 0; k < attributes.vertices.size(); k+=3) {
-    if (coordTransform) {
-      fprintf(fp, "v %f %f %f\n",
-        attributes.vertices[k + 0],
-        attributes.vertices[k + 2],
-        -attributes.vertices[k + 1]);
-    } else {
-      fprintf(fp, "v %f %f %f\n",
-        attributes.vertices[k + 0],
-        attributes.vertices[k + 1],
-        attributes.vertices[k + 2]);
-    }
-  }
-
-  fprintf(fp, "\n");
-
-  // facevarying normal
-  for (size_t k = 0; k < attributes.normals.size(); k += 3) {
-    if (coordTransform) {
-      fprintf(fp, "vn %f %f %f\n",
-        attributes.normals[k + 0],
-        attributes.normals[k + 2],
-        -attributes.normals[k + 1]);
-    } else {
-      fprintf(fp, "vn %f %f %f\n",
-        attributes.normals[k + 0],
-        attributes.normals[k + 1],
-        attributes.normals[k + 2]);
-    }
-  }
-
-  fprintf(fp, "\n");
-
-  // facevarying texcoord
-  for (size_t k = 0; k < attributes.texcoords.size(); k += 2) {
-    fprintf(fp, "vt %f %f\n",
-      attributes.texcoords[k + 0],
-      attributes.texcoords[k + 1]);
-  }
 
   for (size_t i = 0; i < shapes.size(); i++) {
-    fprintf(fp, "\n");
+
+    bool has_vn = false;
+    bool has_vt = false;
 
     if (shapes[i].name.empty()) {
       fprintf(fp, "g Unknown\n");
@@ -104,53 +66,101 @@ bool WriteObj(const std::string& filename, const tinyobj::attrib_t& attributes,
       fprintf(fp, "g %s\n", shapes[i].name.c_str());
     }
 
-    bool has_vn = false;
+    //if (!shapes[i].material.name.empty()) {
-    bool has_vt = false;
+    //  fprintf(fp, "usemtl %s\n", shapes[i].material.name.c_str());
-    // Assumes normals and textures are set shape-wise.
+    //}
-    if(shapes[i].mesh.indices.size() > 0){
+
-      has_vn = shapes[i].mesh.indices[0].normal_index != -1;
+    // facevarying vtx
-      has_vt = shapes[i].mesh.indices[0].texcoord_index != -1;
+    for (size_t k = 0; k < shapes[i].mesh.indices.size() / 3; k++) {
+      for (int j = 0; j < 3; j++) {
+        int idx = shapes[i].mesh.indices[3*k+j];
+        if (coordTransform) {
+          fprintf(fp, "v %f %f %f\n",
+            shapes[i].mesh.positions[3*idx+0],
+            shapes[i].mesh.positions[3*idx+2],
+            -shapes[i].mesh.positions[3*idx+1]);
+        } else {
+          fprintf(fp, "v %f %f %f\n",
+            shapes[i].mesh.positions[3*idx+0],
+            shapes[i].mesh.positions[3*idx+1],
+            shapes[i].mesh.positions[3*idx+2]);
+        }
+      }
     }
 
+    // facevarying normal
+    if (shapes[i].mesh.normals.size() > 0) {
+      for (size_t k = 0; k < shapes[i].mesh.indices.size() / 3; k++) {
+        for (int j = 0; j < 3; j++) {
+          int idx = shapes[i].mesh.indices[3*k+j];
+          if (coordTransform) {
+            fprintf(fp, "vn %f %f %f\n",
+              shapes[i].mesh.normals[3*idx+0],
+              shapes[i].mesh.normals[3*idx+2],
+              -shapes[i].mesh.normals[3*idx+1]);
+          } else {
+            fprintf(fp, "vn %f %f %f\n",
+              shapes[i].mesh.normals[3*idx+0],
+              shapes[i].mesh.normals[3*idx+1],
+              shapes[i].mesh.normals[3*idx+2]);
+          }
+        }
+      }
+    }
+    if (shapes[i].mesh.normals.size() > 0) has_vn = true;
+
+    // facevarying texcoord
+    if (shapes[i].mesh.texcoords.size() > 0) {
+      for (size_t k = 0; k < shapes[i].mesh.indices.size() / 3; k++) {
+        for (int j = 0; j < 3; j++) {
+          int idx = shapes[i].mesh.indices[3*k+j];
+          fprintf(fp, "vt %f %f\n",
+            shapes[i].mesh.texcoords[2*idx+0],
+            shapes[i].mesh.texcoords[2*idx+1]);
+        }
+      }
+    }
+    if (shapes[i].mesh.texcoords.size() > 0) has_vt = true;
+
     // face
-    int face_index = 0;
+    for (size_t k = 0; k < shapes[i].mesh.indices.size() / 3; k++) {
-    for (size_t k = 0; k < shapes[i].mesh.indices.size(); k += shapes[i].mesh.num_face_vertices[face_index++]) {
+  
-      // Check Materials
+      // Face index is 1-base.
-      int material_id = shapes[i].mesh.material_ids[face_index];
+      //int v0 = shapes[i].mesh.indices[3*k+0] + 1 + v_offset;
+      //int v1 = shapes[i].mesh.indices[3*k+1] + 1 + v_offset;
+      //int v2 = shapes[i].mesh.indices[3*k+2] + 1 + v_offset;
+      int v0 = (3*k + 0) + 1 + v_offset;
+      int v1 = (3*k + 1) + 1 + v_offset;
+      int v2 = (3*k + 2) + 1 + v_offset;
+
+      int vt0 = (3*k + 0) + 1 + vt_offset;
+      int vt1 = (3*k + 1) + 1 + vt_offset;
+      int vt2 = (3*k + 2) + 1 + vt_offset;
+
+      int material_id = shapes[i].mesh.material_ids[k];
       if (material_id != prev_material_id) {
         std::string material_name = materials[material_id].name;
         fprintf(fp, "usemtl %s\n", material_name.c_str());
         prev_material_id = material_id;
       }
 
-      unsigned char v_per_f = shapes[i].mesh.num_face_vertices[face_index];
+      if (has_vn && has_vt) {
-      // Imperformant, but if you want to have variable vertices per face, you need some kind of a dynamic loop.
+        fprintf(fp, "f %d/%d/%d %d/%d/%d %d/%d/%d\n",
-      fprintf(fp, "f");
+          v0, vt0, v0, v1, vt1, v1, v2, vt2, v2);
-      for(int l = 0; l < v_per_f; l++){
+      } else if (has_vn && !has_vt) {
-        const tinyobj::index_t& ref = shapes[i].mesh.indices[k + l];
+        fprintf(fp, "f %d//%d %d//%d %d//%d\n", v0, v0, v1, v1, v2, v2);
-        if(has_vn && has_vt){
+      } else if (!has_vn && has_vt) {
-          // v0/t0/vn0
+        fprintf(fp, "f %d/%d %d/%d %d/%d\n", v0, v0, v1, v1, v2, v2);
-          fprintf(fp, " %d/%d/%d", ref.vertex_index + 1, ref.texcoord_index + 1, ref.normal_index + 1);
+      } else {
-          continue;
+        fprintf(fp, "f %d %d %d\n", v0, v1, v2);
-        }
-        if(has_vn && !has_vt){
-          // v0//vn0
-          fprintf(fp, " %d//%d", ref.vertex_index + 1, ref.normal_index + 1);
-          continue;
-        }
-        if(!has_vn && has_vt){
-          // v0/vt0
-          fprintf(fp, " %d/%d", ref.vertex_index + 1, ref.texcoord_index + 1);
-          continue;
-        }
-        if(!has_vn && !has_vt){
-          // v0 v1 v2
-          fprintf(fp, " %d", ref.vertex_index + 1);
-          continue;
-        }
       }
-      fprintf(fp, "\n");
+      
     }
+
+    v_offset  += shapes[i].mesh.indices.size();
+    //vn_offset += shapes[i].mesh.normals.size() / 3;
+    vt_offset += shapes[i].mesh.texcoords.size() / 2;
+
   }
 
   fclose(fp);
@@ -162,3 +172,5 @@ bool WriteObj(const std::string& filename, const tinyobj::attrib_t& attributes,
 
   return ret;
 }
+
+

examples/obj_sticher/obj_writer.h

@@ -3,6 +3,7 @@
 
 #include "../../tiny_obj_loader.h"
 
-extern bool WriteObj(const std::string& filename, const tinyobj::attrib_t& attributes, const std::vector<tinyobj::shape_t>& shapes, const std::vector<tinyobj::material_t>& materials, bool coordTransform = false);
+extern bool WriteObj(const std::string& filename, const std::vector<tinyobj::shape_t>& shapes, const std::vector<tinyobj::material_t>& materials, bool coordTransform = false);
+
 
 #endif // __OBJ_WRITER_H__

examples/viewer/viewer.cc

@@ -37,11 +37,11 @@ extern "C" {
 #include <windows.h>
 
 #ifdef max
-#undef max
+ #undef max
 #endif
 
 #ifdef min
-#undef min
+ #undef min
 #endif
 
 #include <mmsystem.h>
@@ -143,15 +143,15 @@ float eye[3], lookat[3], up[3];
 
 GLFWwindow* window;
 
-static std::string GetBaseDir(const std::string& filepath) {
+static std::string GetBaseDir(const std::string &filepath) {
   if (filepath.find_last_of("/\\") != std::string::npos)
     return filepath.substr(0, filepath.find_last_of("/\\"));
   return "";
 }
 
-static bool FileExists(const std::string& abs_filename) {
+static bool FileExists(const std::string &abs_filename) {
   bool ret;
-  FILE* fp = fopen(abs_filename.c_str(), "rb");
+  FILE *fp = fopen(abs_filename.c_str(), "rb");
   if (fp) {
     ret = true;
     fclose(fp);
@@ -191,106 +191,14 @@ static void CalcNormal(float N[3], float v0[3], float v1[3], float v2[3]) {
 
     N[0] /= len;
     N[1] /= len;
-    N[2] /= len;
   }
 }
 
-namespace  // Local utility functions
-{
-struct vec3 {
-  float v[3];
-  vec3() {
-    v[0] = 0.0f;
-    v[1] = 0.0f;
-    v[2] = 0.0f;
-  }
-};
-
-void normalizeVector(vec3 &v) {
-  float len2 = v.v[0] * v.v[0] + v.v[1] * v.v[1] + v.v[2] * v.v[2];
-  if (len2 > 0.0f) {
-    float len = sqrtf(len2);
-
-    v.v[0] /= len;
-    v.v[1] /= len;
-    v.v[2] /= len;
-  }
-}
-
-// Check if `mesh_t` contains smoothing group id.
-bool hasSmoothingGroup(const tinyobj::shape_t& shape)
-{
-  for (size_t i = 0; i < shape.mesh.smoothing_group_ids.size(); i++) {
-    if (shape.mesh.smoothing_group_ids[i] > 0) {
-      return true;
-    }
-  }
-  return false;
-}
-
-void computeSmoothingNormals(const tinyobj::attrib_t& attrib, const tinyobj::shape_t& shape,
-                             std::map<int, vec3>& smoothVertexNormals) {
-  smoothVertexNormals.clear();
-  std::map<int, vec3>::iterator iter;
-
-  for (size_t f = 0; f < shape.mesh.indices.size() / 3; f++) {
-    // Get the three indexes of the face (all faces are triangular)
-    tinyobj::index_t idx0 = shape.mesh.indices[3 * f + 0];
-    tinyobj::index_t idx1 = shape.mesh.indices[3 * f + 1];
-    tinyobj::index_t idx2 = shape.mesh.indices[3 * f + 2];
-
-    // Get the three vertex indexes and coordinates
-    int vi[3];      // indexes
-    float v[3][3];  // coordinates
-
-    for (int k = 0; k < 3; k++) {
-      vi[0] = idx0.vertex_index;
-      vi[1] = idx1.vertex_index;
-      vi[2] = idx2.vertex_index;
-      assert(vi[0] >= 0);
-      assert(vi[1] >= 0);
-      assert(vi[2] >= 0);
-
-      v[0][k] = attrib.vertices[3 * vi[0] + k];
-      v[1][k] = attrib.vertices[3 * vi[1] + k];
-      v[2][k] = attrib.vertices[3 * vi[2] + k];
-    }
-
-    // Compute the normal of the face
-    float normal[3];
-    CalcNormal(normal, v[0], v[1], v[2]);
-
-    // Add the normal to the three vertexes
-    for (size_t i = 0; i < 3; ++i) {
-      iter = smoothVertexNormals.find(vi[i]);
-      if (iter != smoothVertexNormals.end()) {
-        // add
-        iter->second.v[0] += normal[0];
-        iter->second.v[1] += normal[1];
-        iter->second.v[2] += normal[2];
-      } else {
-        smoothVertexNormals[vi[i]].v[0] = normal[0];
-        smoothVertexNormals[vi[i]].v[1] = normal[1];
-        smoothVertexNormals[vi[i]].v[2] = normal[2];
-      }
-    }
-
-  }  // f
-
-  // Normalize the normals, that is, make them unit vectors
-  for (iter = smoothVertexNormals.begin(); iter != smoothVertexNormals.end();
-       iter++) {
-    normalizeVector(iter->second);
-  }
-
-}  // computeSmoothingNormals
-}  // namespace
-
 static bool LoadObjAndConvert(float bmin[3], float bmax[3],
-                              std::vector<DrawObject>* drawObjects,
+                       std::vector<DrawObject>* drawObjects,
-                              std::vector<tinyobj::material_t>& materials,
+                       std::vector<tinyobj::material_t>& materials,
-                              std::map<std::string, GLuint>& textures,
+                       std::map<std::string, GLuint>& textures,
-                              const char* filename) {
+                       const char* filename) {
   tinyobj::attrib_t attrib;
   std::vector<tinyobj::shape_t> shapes;
 
@@ -308,13 +216,9 @@ static bool LoadObjAndConvert(float bmin[3], float bmax[3],
   base_dir += "/";
 #endif
 
-  std::string warn;
   std::string err;
-  bool ret = tinyobj::LoadObj(&attrib, &shapes, &materials, &warn, &err, filename,
+  bool ret =
-                              base_dir.c_str());
+      tinyobj::LoadObj(&attrib, &shapes, &materials, &err, filename, base_dir.c_str());
-  if (!warn.empty()) {
-    std::cout << "WARN: " << warn << std::endl;
-  }
   if (!err.empty()) {
     std::cerr << err << std::endl;
   }
@@ -338,62 +242,56 @@ static bool LoadObjAndConvert(float bmin[3], float bmax[3],
   materials.push_back(tinyobj::material_t());
 
   for (size_t i = 0; i < materials.size(); i++) {
-    printf("material[%d].diffuse_texname = %s\n", int(i),
+    printf("material[%d].diffuse_texname = %s\n", int(i), materials[i].diffuse_texname.c_str());
-           materials[i].diffuse_texname.c_str());
   }
 
   // Load diffuse textures
   {
-    for (size_t m = 0; m < materials.size(); m++) {
+      for (size_t m = 0; m < materials.size(); m++) {
-      tinyobj::material_t* mp = &materials[m];
+          tinyobj::material_t* mp = &materials[m];
+          
+          if (mp->diffuse_texname.length() > 0) {
+              // Only load the texture if it is not already loaded
+              if (textures.find(mp->diffuse_texname) == textures.end()) {
+                  GLuint texture_id;
+                  int w, h;
+                  int comp;
 
-      if (mp->diffuse_texname.length() > 0) {
+                  std::string texture_filename = mp->diffuse_texname;
-        // Only load the texture if it is not already loaded
+                  if (!FileExists(texture_filename)) {
-        if (textures.find(mp->diffuse_texname) == textures.end()) {
+                    // Append base dir.
-          GLuint texture_id;
+                    texture_filename = base_dir + mp->diffuse_texname;
-          int w, h;
+                    if (!FileExists(texture_filename)) {
-          int comp;
+                      std::cerr << "Unable to find file: " << mp->diffuse_texname << std::endl;
+                      exit(1);
+                    }
+                  }
+                  
+                  unsigned char* image = stbi_load(texture_filename.c_str(), &w, &h, &comp, STBI_default);
+                  if (!image) {
+                      std::cerr << "Unable to load texture: " << texture_filename << std::endl;
+                      exit(1);
+                  }
+                  std::cout << "Loaded texture: " << texture_filename << ", w = " << w << ", h = " << h << ", comp = " << comp << std::endl;
 
-          std::string texture_filename = mp->diffuse_texname;
+                  glGenTextures(1, &texture_id);
-          if (!FileExists(texture_filename)) {
+                  glBindTexture(GL_TEXTURE_2D, texture_id);
-            // Append base dir.
+                  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-            texture_filename = base_dir + mp->diffuse_texname;
+                  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-            if (!FileExists(texture_filename)) {
+                  if (comp == 3) {
-              std::cerr << "Unable to find file: " << mp->diffuse_texname
+                      glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, w, h, 0, GL_RGB, GL_UNSIGNED_BYTE, image);
-                        << std::endl;
+                  }
-              exit(1);
+                  else if (comp == 4) {
-            }
+                      glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, image);
+                  } else {
+                      assert(0); // TODO
+                  }
+                  glBindTexture(GL_TEXTURE_2D, 0);
+                  stbi_image_free(image);
+                  textures.insert(std::make_pair(mp->diffuse_texname, texture_id));
+              }
           }
-
-          unsigned char* image =
-              stbi_load(texture_filename.c_str(), &w, &h, &comp, STBI_default);
-          if (!image) {
-            std::cerr << "Unable to load texture: " << texture_filename
-                      << std::endl;
-            exit(1);
-          }
-          std::cout << "Loaded texture: " << texture_filename << ", w = " << w
-                    << ", h = " << h << ", comp = " << comp << std::endl;
-
-          glGenTextures(1, &texture_id);
-          glBindTexture(GL_TEXTURE_2D, texture_id);
-          glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-          glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-          if (comp == 3) {
-            glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, w, h, 0, GL_RGB,
-                         GL_UNSIGNED_BYTE, image);
-          } else if (comp == 4) {
-            glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, GL_RGBA,
-                         GL_UNSIGNED_BYTE, image);
-          } else {
-            assert(0);  // TODO
-          }
-          glBindTexture(GL_TEXTURE_2D, 0);
-          stbi_image_free(image);
-          textures.insert(std::make_pair(mp->diffuse_texname, texture_id));
-        }
       }
-    }
   }
 
   bmin[0] = bmin[1] = bmin[2] = std::numeric_limits<float>::max();
@@ -403,55 +301,30 @@ static bool LoadObjAndConvert(float bmin[3], float bmax[3],
     for (size_t s = 0; s < shapes.size(); s++) {
       DrawObject o;
       std::vector<float> buffer;  // pos(3float), normal(3float), color(3float)
-
-      // Check for smoothing group and compute smoothing normals
-      std::map<int, vec3> smoothVertexNormals;
-      if (hasSmoothingGroup(shapes[s]) > 0) {
-        std::cout << "Compute smoothingNormal for shape [" << s << "]" << std::endl;
-        computeSmoothingNormals(attrib, shapes[s], smoothVertexNormals);
-      }
-
       for (size_t f = 0; f < shapes[s].mesh.indices.size() / 3; f++) {
         tinyobj::index_t idx0 = shapes[s].mesh.indices[3 * f + 0];
         tinyobj::index_t idx1 = shapes[s].mesh.indices[3 * f + 1];
         tinyobj::index_t idx2 = shapes[s].mesh.indices[3 * f + 2];
-
+        
         int current_material_id = shapes[s].mesh.material_ids[f];
 
-        if ((current_material_id < 0) ||
+        if ((current_material_id < 0) || (current_material_id >= static_cast<int>(materials.size()))) {
-            (current_material_id >= static_cast<int>(materials.size()))) {
           // Invaid material ID. Use default material.
-          current_material_id =
+          current_material_id = materials.size() - 1; // Default material is added to the last item in `materials`.
-              materials.size() -
-              1;  // Default material is added to the last item in `materials`.
         }
-        // if (current_material_id >= materials.size()) {
+        //if (current_material_id >= materials.size()) {
-        //    std::cerr << "Invalid material index: " << current_material_id <<
+        //    std::cerr << "Invalid material index: " << current_material_id << std::endl;
-        //    std::endl;
         //}
         //
         float diffuse[3];
         for (size_t i = 0; i < 3; i++) {
-          diffuse[i] = materials[current_material_id].diffuse[i];
+            diffuse[i] = materials[current_material_id].diffuse[i];
         }
         float tc[3][2];
         if (attrib.texcoords.size() > 0) {
-          if ((idx0.texcoord_index < 0) || (idx1.texcoord_index < 0) ||
+            assert(attrib.texcoords.size() > 2 * idx0.texcoord_index + 1);
-              (idx2.texcoord_index < 0)) {
+            assert(attrib.texcoords.size() > 2 * idx1.texcoord_index + 1);
-            // face does not contain valid uv index.
+            assert(attrib.texcoords.size() > 2 * idx2.texcoord_index + 1);
-            tc[0][0] = 0.0f;
-            tc[0][1] = 0.0f;
-            tc[1][0] = 0.0f;
-            tc[1][1] = 0.0f;
-            tc[2][0] = 0.0f;
-            tc[2][1] = 0.0f;
-          } else {
-            assert(attrib.texcoords.size() >
-                   size_t(2 * idx0.texcoord_index + 1));
-            assert(attrib.texcoords.size() >
-                   size_t(2 * idx1.texcoord_index + 1));
-            assert(attrib.texcoords.size() >
-                   size_t(2 * idx2.texcoord_index + 1));
 
             // Flip Y coord.
             tc[0][0] = attrib.texcoords[2 * idx0.texcoord_index];
@@ -460,14 +333,13 @@ static bool LoadObjAndConvert(float bmin[3], float bmax[3],
             tc[1][1] = 1.0f - attrib.texcoords[2 * idx1.texcoord_index + 1];
             tc[2][0] = attrib.texcoords[2 * idx2.texcoord_index];
             tc[2][1] = 1.0f - attrib.texcoords[2 * idx2.texcoord_index + 1];
-          }
         } else {
-          tc[0][0] = 0.0f;
+            tc[0][0] = 0.0f;
-          tc[0][1] = 0.0f;
+            tc[0][1] = 0.0f;
-          tc[1][0] = 0.0f;
+            tc[1][0] = 0.0f;
-          tc[1][1] = 0.0f;
+            tc[1][1] = 0.0f;
-          tc[2][0] = 0.0f;
+            tc[2][0] = 0.0f;
-          tc[2][1] = 0.0f;
+            tc[2][1] = 0.0f;
         }
 
         float v[3][3];
@@ -491,63 +363,27 @@ static bool LoadObjAndConvert(float bmin[3], float bmax[3],
         }
 
         float n[3][3];
-        {
+        if (attrib.normals.size() > 0) {
-          bool invalid_normal_index = false;
+          int f0 = idx0.normal_index;
-          if (attrib.normals.size() > 0) {
+          int f1 = idx1.normal_index;
-            int nf0 = idx0.normal_index;
+          int f2 = idx2.normal_index;
-            int nf1 = idx1.normal_index;
+          assert(f0 >= 0);
-            int nf2 = idx2.normal_index;
+          assert(f1 >= 0);
-
+          assert(f2 >= 0);
-            if ((nf0 < 0) || (nf1 < 0) || (nf2 < 0)) {
+          for (int k = 0; k < 3; k++) {
-              // normal index is missing from this face.
+            n[0][k] = attrib.normals[3 * f0 + k];
-              invalid_normal_index = true;
+            n[1][k] = attrib.normals[3 * f1 + k];
-            } else {
+            n[2][k] = attrib.normals[3 * f2 + k];
-              for (int k = 0; k < 3; k++) {
-                assert(size_t(3 * nf0 + k) < attrib.normals.size());
-                assert(size_t(3 * nf1 + k) < attrib.normals.size());
-                assert(size_t(3 * nf2 + k) < attrib.normals.size());
-                n[0][k] = attrib.normals[3 * nf0 + k];
-                n[1][k] = attrib.normals[3 * nf1 + k];
-                n[2][k] = attrib.normals[3 * nf2 + k];
-              }
-            }
-          } else {
-            invalid_normal_index = true;
-          }
-
-          if (invalid_normal_index && !smoothVertexNormals.empty()) {
-            // Use smoothing normals
-            int f0 = idx0.vertex_index;
-            int f1 = idx1.vertex_index;
-            int f2 = idx2.vertex_index;
-
-            if (f0 >= 0 && f1 >= 0 && f2 >= 0) {
-              n[0][0] = smoothVertexNormals[f0].v[0];
-              n[0][1] = smoothVertexNormals[f0].v[1];
-              n[0][2] = smoothVertexNormals[f0].v[2];
-
-              n[1][0] = smoothVertexNormals[f1].v[0];
-              n[1][1] = smoothVertexNormals[f1].v[1];
-              n[1][2] = smoothVertexNormals[f1].v[2];
-
-              n[2][0] = smoothVertexNormals[f2].v[0];
-              n[2][1] = smoothVertexNormals[f2].v[1];
-              n[2][2] = smoothVertexNormals[f2].v[2];
-
-              invalid_normal_index = false;
-            }
-          }
-
-          if (invalid_normal_index) {
-            // compute geometric normal
-            CalcNormal(n[0], v[0], v[1], v[2]);
-            n[1][0] = n[0][0];
-            n[1][1] = n[0][1];
-            n[1][2] = n[0][2];
-            n[2][0] = n[0][0];
-            n[2][1] = n[0][1];
-            n[2][2] = n[0][2];
           }
+        } else {
+          // compute geometric normal
+          CalcNormal(n[0], v[0], v[1], v[2]);
+          n[1][0] = n[0][0];
+          n[1][1] = n[0][1];
+          n[1][2] = n[0][2];
+          n[2][0] = n[0][0];
+          n[2][1] = n[0][1];
+          n[2][2] = n[0][2];
         }
 
         for (int k = 0; k < 3; k++) {
@@ -560,9 +396,11 @@ static bool LoadObjAndConvert(float bmin[3], float bmax[3],
           // Combine normal and diffuse to get color.
           float normal_factor = 0.2;
           float diffuse_factor = 1 - normal_factor;
-          float c[3] = {n[k][0] * normal_factor + diffuse[0] * diffuse_factor,
+          float c[3] = {
-                        n[k][1] * normal_factor + diffuse[1] * diffuse_factor,
+              n[k][0] * normal_factor + diffuse[0] * diffuse_factor,
-                        n[k][2] * normal_factor + diffuse[2] * diffuse_factor};
+              n[k][1] * normal_factor + diffuse[1] * diffuse_factor,
+              n[k][2] * normal_factor + diffuse[2] * diffuse_factor
+          };
           float len2 = c[0] * c[0] + c[1] * c[1] + c[2] * c[2];
           if (len2 > 0.0f) {
             float len = sqrtf(len2);
@@ -574,7 +412,7 @@ static bool LoadObjAndConvert(float bmin[3], float bmax[3],
           buffer.push_back(c[0] * 0.5 + 0.5);
           buffer.push_back(c[1] * 0.5 + 0.5);
           buffer.push_back(c[2] * 0.5 + 0.5);
-
+          
           buffer.push_back(tc[k][0]);
           buffer.push_back(tc[k][1]);
         }
@@ -584,22 +422,19 @@ static bool LoadObjAndConvert(float bmin[3], float bmax[3],
       o.numTriangles = 0;
 
       // OpenGL viewer does not support texturing with per-face material.
-      if (shapes[s].mesh.material_ids.size() > 0 &&
+      if (shapes[s].mesh.material_ids.size() > 0 && shapes[s].mesh.material_ids.size() > s) {
-          shapes[s].mesh.material_ids.size() > s) {
+          o.material_id = shapes[s].mesh.material_ids[0]; // use the material ID of the first face.
-        o.material_id = shapes[s].mesh.material_ids[0];  // use the material ID
-                                                         // of the first face.
       } else {
-        o.material_id = materials.size() - 1;  // = ID for default material.
+          o.material_id = materials.size() - 1; // = ID for default material.
       }
       printf("shape[%d] material_id %d\n", int(s), int(o.material_id));
-
+          
       if (buffer.size() > 0) {
         glGenBuffers(1, &o.vb_id);
         glBindBuffer(GL_ARRAY_BUFFER, o.vb_id);
-        glBufferData(GL_ARRAY_BUFFER, buffer.size() * sizeof(float),
+        glBufferData(GL_ARRAY_BUFFER, buffer.size() * sizeof(float), &buffer.at(0),
-                     &buffer.at(0), GL_STATIC_DRAW);
+                     GL_STATIC_DRAW);
-        o.numTriangles = buffer.size() / (3 + 3 + 3 + 2) /
+        o.numTriangles = buffer.size() / (3 + 3 + 3 + 2) / 3; // 3:vtx, 3:normal, 3:col, 2:texcoord
-                         3;  // 3:vtx, 3:normal, 3:col, 2:texcoord
 
         printf("shape[%d] # of triangles = %d\n", static_cast<int>(s),
                o.numTriangles);
@@ -632,7 +467,7 @@ static void reshapeFunc(GLFWwindow* window, int w, int h) {
 }
 
 static void keyboardFunc(GLFWwindow* window, int key, int scancode, int action,
-                         int mods) {
+                  int mods) {
   (void)window;
   (void)scancode;
   (void)mods;
@@ -714,9 +549,7 @@ static void motionFunc(GLFWwindow* window, double mouse_x, double mouse_y) {
   prevMouseY = mouse_y;
 }
 
-static void Draw(const std::vector<DrawObject>& drawObjects,
+static void Draw(const std::vector<DrawObject>& drawObjects, std::vector<tinyobj::material_t>& materials, std::map<std::string, GLuint>& textures) {
-                 std::vector<tinyobj::material_t>& materials,
-                 std::map<std::string, GLuint>& textures) {
   glPolygonMode(GL_FRONT, GL_FILL);
   glPolygonMode(GL_BACK, GL_FILL);
 
@@ -739,7 +572,7 @@ static void Draw(const std::vector<DrawObject>& drawObjects,
     if ((o.material_id < materials.size())) {
       std::string diffuse_texname = materials[o.material_id].diffuse_texname;
       if (textures.find(diffuse_texname) != textures.end()) {
-        glBindTexture(GL_TEXTURE_2D, textures[diffuse_texname]);
+          glBindTexture(GL_TEXTURE_2D, textures[diffuse_texname]);
       }
     }
     glVertexPointer(3, GL_FLOAT, stride, (const void*)0);
@@ -835,8 +668,7 @@ int main(int argc, char** argv) {
   float bmin[3], bmax[3];
   std::vector<tinyobj::material_t> materials;
   std::map<std::string, GLuint> textures;
-  if (false == LoadObjAndConvert(bmin, bmax, &gDrawObjects, materials, textures,
+  if (false == LoadObjAndConvert(bmin, bmax, &gDrawObjects, materials, textures, argv[1])) {
-                                 argv[1])) {
     return -1;
   }
 

examples/voxelize/main.cc

@@ -9,9 +9,8 @@ bool Voxelize(const char* filename, float voxelsizex, float voxelsizey, float vo
     tinyobj::attrib_t attrib;
     std::vector<tinyobj::shape_t> shapes;
     std::vector<tinyobj::material_t> materials;
-    std::string warn;
     std::string err;
-    bool ret = tinyobj::LoadObj(&attrib, &shapes, &materials, &warn, &err, filename);
+    bool ret = tinyobj::LoadObj(&attrib, &shapes, &materials, &err, filename);
 
     if (!err.empty()) {
       printf("err: %s\n", err.c_str());

experimental/README.md

@@ -6,21 +6,11 @@
 
 * C++-11 compiler
 
-## How to build
-
-```
-$ premak5 gmake
-```
-
 ## Compile options
 
 * zstd compressed .obj support. `--with-zstd` premake option.
 * gzip compressed .obj support. `--with-zlib` premake option.
 
-## Notes on AMD GPU + Linux
-
-You may need to link with libdrm(`-ldrm`).
-
 ## Licenses
 
 * lfpAlloc : MIT license.

experimental/tinyobj_loader_opt.h

@@ -312,10 +312,6 @@ typedef struct {
 
 typedef struct {
   std::string name;  // group name or object name.
-  // Shape's corresponding faces are accessed by attrib.indices[face_offset,
-  // face_offset + length] NOTE: you'll need to sum up
-  // attrib.face_num_verts[face_offset, face_offset + length] to find actual
-  // number of faces.
   unsigned int face_offset;
   unsigned int length;
 } shape_t;
@@ -334,14 +330,7 @@ typedef struct {
   std::vector<float, lfpAlloc::lfpAllocator<float> > normals;
   std::vector<float, lfpAlloc::lfpAllocator<float> > texcoords;
   std::vector<index_t, lfpAlloc::lfpAllocator<index_t> > indices;
-
-  // # of vertices for each face.
-  // 3 for triangle, 4 for qual, ...
-  // If triangulation is enabled and the original face are quad,
-  // face_num_verts will be 6(3 + 3)
   std::vector<int, lfpAlloc::lfpAllocator<int> > face_num_verts;
-
-  // Per-face material IDs.
   std::vector<int, lfpAlloc::lfpAllocator<int> > material_ids;
 } attrib_t;
 
@@ -1057,7 +1046,7 @@ bool parseObj(attrib_t *attrib, std::vector<shape_t> *shapes,
               std::vector<material_t> *materials, const char *buf, size_t len,
               const LoadOption &option);
 
-}  // namespace tinyobj_opt
+} // namespace tinyobj_opt
 
 #endif  // TINOBJ_LOADER_OPT_H_
 
@@ -1249,8 +1238,6 @@ typedef struct {
 // 3. Do parallel parsing for each line.
 // 4. Reconstruct final mesh data structure.
 
-// Raise # of max threads if you have more CPU cores...
-// In 2018, 32 cores are getting common in high-end workstaion PC.
 #define kMaxThreads (32)
 
 static inline bool is_line_ending(const char *p, size_t i, size_t end_i) {
@@ -1319,19 +1306,15 @@ bool parseObj(attrib_t *attrib, std::vector<shape_t> *shapes,
           end_idx = len - 1;
         }
 
-        // true if the line currently read must be added to the current line
-        // info
-        bool new_line_found =
-            (t == 0) || is_line_ending(buf, start_idx - 1, end_idx);
-
         size_t prev_pos = start_idx;
         for (size_t i = start_idx; i < end_idx; i++) {
           if (is_line_ending(buf, i, end_idx)) {
-            if (!new_line_found) {
+            if ((t > 0) && (prev_pos == start_idx) &&
+                (!is_line_ending(buf, start_idx - 1, end_idx))) {
               // first linebreak found in (chunk > 0), and a line before this
               // linebreak belongs to previous chunk, so skip it.
               prev_pos = i + 1;
-              new_line_found = true;
+              continue;
             } else {
               LineInfo info;
               info.pos = prev_pos;
@@ -1346,11 +1329,11 @@ bool parseObj(attrib_t *attrib, std::vector<shape_t> *shapes,
           }
         }
 
-        // If at least one line started in this chunk, find where it ends in the
+        // Find extra line which spand across chunk boundary.
-        // rest of the buffer
+        if ((t < num_threads) && (buf[end_idx - 1] != '\n')) {
-        if (new_line_found && (t < num_threads) && (buf[end_idx - 1] != '\n')) {
+          auto extra_span_idx = (std::min)(end_idx - 1 + chunk_size, len);
-          for (size_t i = end_idx; i < len; i++) {
+          for (size_t i = end_idx; i < extra_span_idx; i++) {
-            if (is_line_ending(buf, i, len)) {
+            if (is_line_ending(buf, i, extra_span_idx)) {
               LineInfo info;
               info.pos = prev_pos;
               info.len = i - prev_pos;
@@ -1407,6 +1390,7 @@ bool parseObj(attrib_t *attrib, std::vector<shape_t> *shapes,
 
     for (size_t t = 0; t < num_threads; t++) {
       workers->push_back(std::thread([&, t]() {
+
         for (size_t i = 0; i < line_infos[t].size(); i++) {
           Command command;
           bool ret = parseLine(&command, &buf[line_infos[t][i].pos],
@@ -1431,6 +1415,7 @@ bool parseObj(attrib_t *attrib, std::vector<shape_t> *shapes,
             commands[t].emplace_back(std::move(command));
           }
         }
+
       }));
     }
 
@@ -1455,9 +1440,7 @@ bool parseObj(attrib_t *attrib, std::vector<shape_t> *shapes,
     // std::cout << "mtllib :" << material_filename << std::endl;
 
     auto t1 = std::chrono::high_resolution_clock::now();
-    if (material_filename.back() == '\r') {
+
-      material_filename.pop_back();
-    }
     std::ifstream ifs(material_filename);
     if (ifs.good()) {
       LoadMtl(&material_map, materials, &ifs);
@@ -1508,7 +1491,7 @@ bool parseObj(attrib_t *attrib, std::vector<shape_t> *shapes,
     attrib->texcoords.resize(num_vt * 2);
     attrib->indices.resize(num_f);
     attrib->face_num_verts.resize(num_indices);
-    attrib->material_ids.resize(num_indices, -1);
+    attrib->material_ids.resize(num_indices);
 
     size_t v_offsets[kMaxThreads];
     size_t n_offsets[kMaxThreads];
@@ -1533,6 +1516,7 @@ bool parseObj(attrib_t *attrib, std::vector<shape_t> *shapes,
     StackVector<std::thread, 16> workers;
 
     for (size_t t = 0; t < num_threads; t++) {
+      int material_id = -1;  // -1 = default unknown material.
       workers->push_back(std::thread([&, t]() {
         size_t v_count = v_offsets[t];
         size_t n_count = n_offsets[t];
@@ -1545,40 +1529,15 @@ bool parseObj(attrib_t *attrib, std::vector<shape_t> *shapes,
             continue;
           } else if (commands[t][i].type == COMMAND_USEMTL) {
             if (commands[t][i].material_name &&
-                commands[t][i].material_name_len > 0 &&
+                commands[t][i].material_name_len > 0) {
-                // check if there are still faces after this command
+              std::string material_name(commands[t][i].material_name,
-                face_count < num_indices) {
+                                        commands[t][i].material_name_len);
-              // Find next face
+
-              bool found = false;
+              if (material_map.find(material_name) != material_map.end()) {
-              size_t i_start = i + 1, t_next, i_next;
+                material_id = material_map[material_name];
-              for (t_next = t; t_next < num_threads; t_next++) {
+              } else {
-                for (i_next = i_start; i_next < commands[t_next].size();
+                // Assign invalid material ID
-                     i_next++) {
+                material_id = -1;
-                  if (commands[t_next][i_next].type == COMMAND_F) {
-                    found = true;
-                    break;
-                  }
-                }
-                if (found) break;
-                i_start = 0;
-              }
-              // Assign material to this face
-              if (found) {
-                std::string material_name(commands[t][i].material_name,
-                                          commands[t][i].material_name_len);
-                for (size_t k = 0;
-                     k < commands[t_next][i_next].f_num_verts.size(); k++) {
-                  if (material_map.find(material_name) != material_map.end()) {
-                    attrib->material_ids[face_count + k] =
-                        material_map[material_name];
-                  } else {
-                    // Assign invalid material ID
-                    // Set a different value than the default, to
-                    // prevent following faces from being assigned a valid
-                    // material
-                    attrib->material_ids[face_count + k] = -2;
-                  }
-                }
               }
             }
           } else if (commands[t][i].type == COMMAND_V) {
@@ -1605,6 +1564,7 @@ bool parseObj(attrib_t *attrib, std::vector<shape_t> *shapes,
                   index_t(vertex_index, texcoord_index, normal_index);
             }
             for (size_t k = 0; k < commands[t][i].f_num_verts.size(); k++) {
+              attrib->material_ids[face_count + k] = material_id;
               attrib->face_num_verts[face_count + k] =
                   commands[t][i].f_num_verts[k];
             }
@@ -1620,12 +1580,6 @@ bool parseObj(attrib_t *attrib, std::vector<shape_t> *shapes,
       workers[t].join();
     }
 
-    // To each face with uninitialized material id,
-    // assign the material id of the last face preceding it that has one
-    for (size_t face_count = 1; face_count < num_indices; ++face_count)
-      if (attrib->material_ids[face_count] == -1)
-        attrib->material_ids[face_count] = attrib->material_ids[face_count - 1];
-
     auto t_end = std::chrono::high_resolution_clock::now();
     ms_merge = t_end - t_start;
   }
@@ -1685,8 +1639,7 @@ bool parseObj(attrib_t *attrib, std::vector<shape_t> *shapes,
           }
         }
         if (commands[t][i].type == COMMAND_F) {
-          // Consider generation of multiple faces per `f` line by triangulation
+          face_count++;
-          face_count += commands[t][i].f_num_verts.size();
         }
       }
     }

experimental/viewer.cc

@@ -357,7 +357,7 @@ bool LoadObjAndConvert(float bmin[3], float bmax[3], const char* filename, int n
         std::vector<float> vb; // pos(3float), normal(3float), color(3float)
         size_t face_offset = 0;
         for (size_t v = 0; v < attrib.face_num_verts.size(); v++) {
-          assert(attrib.face_num_verts[v] % 3 == 0); // assume all triangle face(multiple of 3).
+          assert(attrib.face_num_verts[v] % 3 == 0); // assume all triangle face.
           for (size_t f = 0; f < attrib.face_num_verts[v] / 3; f++) {
             tinyobj_opt::index_t idx0 = attrib.indices[face_offset+3*f+0];
             tinyobj_opt::index_t idx1 = attrib.indices[face_offset+3*f+1];

fuzzer/runner.py

@@ -1,20 +0,0 @@
-import os, sys
-import glob
-import subprocess
-
-def main():
-    for g in glob.glob("../tests/afl/id*"):
-        print(g)
-    
-        cmd = ["../a.out", g]
-
-        proc = subprocess.Popen(cmd)
-        try:
-            outs, errs = proc.communicate(timeout=15)
-            print(outs)
-        except TimeoutExpired:
-            proc.kill()
-            outs, errs = proc.communicate()
-
-
-main()

loader_example.cc

@@ -29,13 +29,6 @@ extern "C" {
 #endif
 #endif
 
-#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
-
 class timerutil {
  public:
 #ifdef _WIN32
@@ -137,19 +130,14 @@ static void PrintInfo(const tinyobj::attrib_t& attrib,
   for (size_t i = 0; i < shapes.size(); i++) {
     printf("shape[%ld].name = %s\n", static_cast<long>(i),
            shapes[i].name.c_str());
-    printf("Size of shape[%ld].mesh.indices: %lu\n", static_cast<long>(i),
+    printf("Size of shape[%ld].indices: %lu\n", static_cast<long>(i),
            static_cast<unsigned long>(shapes[i].mesh.indices.size()));
-    printf("Size of shape[%ld].path.indices: %lu\n", static_cast<long>(i),
-           static_cast<unsigned long>(shapes[i].path.indices.size()));
 
     size_t index_offset = 0;
 
     assert(shapes[i].mesh.num_face_vertices.size() ==
            shapes[i].mesh.material_ids.size());
 
-    assert(shapes[i].mesh.num_face_vertices.size() ==
-           shapes[i].mesh.smoothing_group_ids.size());
-
     printf("shape[%ld].num_faces: %lu\n", static_cast<long>(i),
            static_cast<unsigned long>(shapes[i].mesh.num_face_vertices.size()));
 
@@ -170,8 +158,6 @@ static void PrintInfo(const tinyobj::attrib_t& attrib,
 
       printf("  face[%ld].material_id = %d\n", static_cast<long>(f),
              shapes[i].mesh.material_ids[f]);
-      printf("  face[%ld].smoothing_group_id = %d\n", static_cast<long>(f),
-             shapes[i].mesh.smoothing_group_ids[f]);
 
       index_offset += fnum;
     }
@@ -285,19 +271,14 @@ static bool TestLoadObj(const char* filename, const char* basepath = NULL,
 
   timerutil t;
   t.start();
-  std::string warn;
   std::string err;
-  bool ret = tinyobj::LoadObj(&attrib, &shapes, &materials, &warn, &err, filename,
+  bool ret = tinyobj::LoadObj(&attrib, &shapes, &materials, &err, filename,
                               basepath, triangulate);
   t.end();
   printf("Parsing time: %lu [msecs]\n", t.msec());
 
-  if (!warn.empty()) {
-    std::cout << "WARN: " << warn << std::endl;
-  }
-
   if (!err.empty()) {
-    std::cerr << "ERR: " << err << std::endl;
+    std::cerr << err << std::endl;
   }
 
   if (!ret) {
@@ -380,13 +361,17 @@ static bool TestStreamLoadObj() {
     virtual ~MaterialStringStreamReader() {}
     virtual bool operator()(const std::string& matId,
                             std::vector<material_t>* materials,
-                            std::map<std::string, int>* matMap,
+                            std::map<unsigned int, int>* matMap,
-                            std::string* warn,
                             std::string* err) {
-      (void)err;
       (void)matId;
-      LoadMtl(matMap, materials, &m_matSStream, warn, err);
+      std::string warning;
+      LoadMtl(matMap, materials, &m_matSStream, &warning);
 
+      if (!warning.empty()) {
+        if (err) {
+          (*err) += warning;
+        }
+      }
       return true;
     }
 
@@ -398,9 +383,8 @@ static bool TestStreamLoadObj() {
   tinyobj::attrib_t attrib;
   std::vector<tinyobj::shape_t> shapes;
   std::vector<tinyobj::material_t> materials;
-  std::string warn;
   std::string err;
-  bool ret = tinyobj::LoadObj(&attrib, &shapes, &materials, &warn, &err, &objStream,
+  bool ret = tinyobj::LoadObj(&attrib, &shapes, &materials, &err, &objStream,
                               &matSSReader);
 
   if (!err.empty()) {

models/colorspace-issue-184.mtl

@@ -1,9 +0,0 @@
-newmtl default
-Ka 0 0 0
-Kd 0 0 0
-Ks 0 0 0
-Kt 0.1 0.2 0.3
-map_Kd -colorspace sRGB -o 0.1 diffuse.jpg
-map_Ks -s 0.1 0.2 specular.jpg
-map_bump -colorspace linear -bm 3 bumpmap.jpg
-

models/colorspace-issue-184.obj

@@ -1,7 +0,0 @@
-mtllib colorspace-issue-184.mtl
-o Test
-v 1.864151 -1.219172 -5.532511
-v 0.575869 -0.666304 5.896140
-v 0.940448 1.000000 -1.971128
-usemtl default
-f 1 2 3

models/cube.obj

@@ -13,8 +13,7 @@ v 2.000000 2.000000 0.000000
 g front cube
 usemtl white
 f 1 2 3 4
-# two white spaces between 'back' and 'cube'
+g back cube
-g back  cube
 # expects white material
 f 8 7 6 5
 g right cube

models/invalid-face-definition.mtl

@@ -1,24 +0,0 @@
-newmtl white
-Ka 0 0 0
-Kd 1 1 1
-Ks 0 0 0
-
-newmtl red
-Ka 0 0 0
-Kd 1 0 0
-Ks 0 0 0
-
-newmtl green
-Ka 0 0 0
-Kd 0 1 0
-Ks 0 0 0
-
-newmtl blue
-Ka 0 0 0
-Kd 0 0 1
-Ks 0 0 0
-
-newmtl light
-Ka 20 20 20
-Kd 1 1 1
-Ks 0 0 0

models/invalid-face-definition.obj

@@ -1,18 +0,0 @@
-mtllib invalid-face-definition.mtl
-
-v 0.000000 2.000000 2.000000
-v 0.000000 0.000000 2.000000
-v 2.000000 0.000000 2.000000
-v 2.000000 2.000000 2.000000
-v 0.000000 2.000000 0.000000
-v 0.000000 0.000000 0.000000
-v 2.000000 0.000000 0.000000
-v 2.000000 2.000000 0.000000
-# 8 vertices
-
-g front cube
-usemtl white
-f 1
-g back cube
-# expects white material
-f 8 7

models/issue-161-inconsistent-f.obj

@@ -1,37 +0,0 @@
-o cube
-mtllib cube.mtl
-
-v -0.500000 -0.500000 0.500000
-v 0.500000 -0.500000 0.500000
-v -0.500000 0.500000 0.500000
-v 0.500000 0.500000 0.500000
-v -0.500000 0.500000 -0.500000
-v 0.500000 0.500000 -0.500000
-v -0.500000 -0.500000 -0.500000
-v 0.500000 -0.500000 -0.500000
-
-vt 0.000000 0.000000
-vt 1.000000 0.000000
-vt 0.000000 1.000000
-vt 1.000000 1.000000
-
-g cube
-usemtl cube
-s 1
-f 1/1 2/2 3/3
-f 3/3 2/2 4/4
-s 2
-f 3/1 4/2 5/3
-f 5/3 4/2 6/4
-s 3
-f 5/4 6/3 7/2
-f 7/2 6/3 8/1
-s 4
-f 7/1 8/2 1/3
-f 1/3 8/2 2/4
-s 5
-f 2/1 8/2 4/3
-f 4/3 8/2 6/4
-s 6
-f 7/1 1/2 5/3
-f 5 1 3

models/issue-162-smoothing-group.mtl

@@ -1,23 +0,0 @@
-newmtl test1
-  Ns 10.0000
-  Ni 1.5000
-  d 1.0000
-  Tr 0.0000
-  Tf 1.0000 1.0000 1.0000 
-  illum 2
-  Ka 0.0000 0.0000 0.0000
-  Kd 0.5 0.2 0.2
-  Ks 0.0000 0.0000 0.0000
-  Ke 0.0000 0.0000 0.0000
-
- newmtl test2
-  Ns 10.0000
-  Ni 1.5000
-  d 1.0000
-  Tr 0.0000
-  Tf 1.0000 1.0000 1.0000 
-  illum 2
-  Ka 0.0000 0.0000 0.0000
-  Kd 0.2 0.5 0.2
-  Ks 0.0000 0.0000 0.0000
-  Ke 0.0000 0.0000 0.0000

models/issue-162-smoothing-group.obj

@@ -1,51 +0,0 @@
-
-# cube.obj
-#
-
-mtllib issue-162-smoothing-group.mtl
-
-v -0.500000 -0.500000 0.500000
-v 0.500000 -0.500000 0.500000
-v -0.500000 0.500000 0.500000
-v 0.500000 0.500000 0.500000
-v -0.500000 0.500000 -0.500000
-v 0.500000 0.500000 -0.500000
-v -0.500000 -0.500000 -0.500000
-v 0.500000 -0.500000 -0.500000
-
-vt 0.000000 0.000000
-vt 1.000000 0.000000
-vt 0.000000 1.000000
-vt 1.000000 1.000000
-
-vn 0.000000 0.000000 1.000000
-vn 0.000000 1.000000 0.000000
-vn 0.000000 0.000000 -1.000000
-vn 0.000000 -1.000000 0.000000
-vn 1.000000 0.000000 0.000000
-vn -1.000000 0.000000 0.000000
-
-usemtl test1
-g test1
-s 1
-f 1/1/1 2/2/1 3/3/1
-f 3/3/1 2/2/1 4/4/1
-
-usemtl test2
-g test2
-
-s off
-f 3/1/2 4/2/2 5/3/2
-f 5/3/2 4/2/2 6/4/2
-s 3
-f 5/4/3 6/3/3 7/2/3
-f 7/2/3 6/3/3 8/1/3
-s 4
-f 7/1/4 8/2/4 1/3/4
-f 1/3/4 8/2/4 2/4/4
-s 0
-f 2/1/5 8/2/5 4/3/5
-f 4/3/5 8/2/5 6/4/5
-s 6
-f 7/1/6 1/2/6 5/3/6
-f 5/3/6 1/2/6 3/4/6

models/line-prim.obj

@@ -1,16 +0,0 @@
-mtllib cube.mtl
-
-v 0.000000 2.000000 2.000000
-v 0.000000 0.000000 2.000000
-v 2.000000 0.000000 2.000000
-v 2.000000 2.000000 2.000000
-v 0.000000 2.000000 0.000000
-v 0.000000 0.000000 0.000000
-v 2.000000 0.000000 0.000000
-v 2.000000 2.000000 0.000000
-# 8 vertices
-
-g g0
-usemtl white
-l 1 2 3 4
-l 5 6 7

models/smoothing-group-two-squares.obj

@@ -1,22 +0,0 @@
-# from tinyobjloader issue #29
-
-v 0.000000 2.000000 0.000000
-v 0.000000 0.000000 0.000000
-v 2.000000 0.000000 0.000000
-v 2.000000 2.000000 0.000000
-v 4.000000 0.000000 -3.255298
-v 4.000000 2.000000 -3.255298
-#vn 0.000000 0.000000 1.000000
-#vn 0.000000 0.000000 1.000000
-#vn 0.276597 0.000000 0.960986
-#vn 0.276597 0.000000 0.960986
-#vn 0.531611 0.000000 0.846988
-#vn 0.531611 0.000000 0.846988
-# 6 vertices
-
-# 6 normals
-
-g all
-s 1
-f 1//1 2//2 3//3 4//4
-f 4//4 3//3 5//5

models/smoothing-normal.mtl

@@ -1,24 +0,0 @@
-newmtl white
-Ka 0 0 0
-Kd 1 1 1
-Ks 0 0 0
-
-newmtl red
-Ka 0 0 0
-Kd 1 0 0
-Ks 0 0 0
-
-newmtl green
-Ka 0 0 0
-Kd 0 1 0
-Ks 0 0 0
-
-newmtl blue
-Ka 0 0 0
-Kd 0 0 1
-Ks 0 0 0
-
-newmtl light
-Ka 20 20 20
-Kd 1 1 1
-Ks 0 0 0

models/smoothing-normal.obj

@@ -1,35 +0,0 @@
-mtllib smoothing-normal.mtl
-
-v 0.000000 2.000000 2.000000
-v 0.000000 0.000000 2.000000
-v 2.000000 0.000000 2.000000
-v 2.000000 2.000000 2.000000
-v 0.000000 2.000000 0.000000
-v 0.000000 0.000000 0.000000
-v 2.000000 0.000000 0.000000
-v 2.000000 2.000000 0.000000
-# 8 vertices
-
-g front cube
-usemtl white
-s 1
-f 1 2 3 4
-#g bottom cube
-#usemtl white
-s 1
-f 2 6 7 3
-
-g back cube
-# expects white material
-s off
-f 8 7 6 5
-#g right cube
-#usemtl red
-#f 4 3 7 8
-#g top cube
-#usemtl white
-#f 5 1 4 8
-#g left cube
-#usemtl green
-#f 5 6 2 1
-# 6 elements

tests/issue-177.mtl

@@ -1,24 +0,0 @@
-newmtl white
-Ka 0 0 0
-Kd 1 1 1
-Ks 0 0 0
-
-newmtl red
-Ka 0 0 0
-Kd 1 0 0
-Ks 0 0 0
-
-newmtl green
-Ka 0 0 0
-Kd 0 1 0
-Ks 0 0 0
-
-newmtl blue
-Ka 0 0 0
-Kd 0 0 1
-Ks 0 0 0
-
-newmtl light
-Ka 20 20 20
-Kd 1 1 1
-Ks 0 0 0

tests/issue-177.obj

@@ -1,31 +0,0 @@
-mtllib issue-177.mtl
-
-v 0.000000 2.000000 2.000000
-v 0.000000 0.000000 2.000000
-v 2.000000 0.000000 2.000000
-v 2.000000 2.000000 2.000000
-v 0.000000 2.000000 0.000000
-v 0.000000 0.000000 0.000000
-v 2.000000 0.000000 0.000000
-v 2.000000 2.000000 0.000000
-# 8 vertices
-
-g front cube
-usemtl white
-f 1 2 3 4
-g back cube
-# expects white material
-f 8 7 6 5
-g right cube
-usemtl red
-f 4 3 7 8
-g top cube
-usemtl white
-f 5 1 4 8
-g left cube
-usemtl green
-f 5 6 2 1
-g bottom cube
-usemtl white
-f 2 6 7 3
-# 6 elements