Fix parsing line primitive.

syoyo · syoyo · commit 776344bcde03 · 2019-04-13T20:57:07.000+09:00
diff --git a/models/line-prim.obj b/models/line-prim.obj
@@ -13,4 +13,4 @@ v 2.000000 2.000000 0.000000
 g g0
 usemtl white
 l 1 2 3 4
-l 5 6 7
+l 5 6 7 8
diff --git a/tests/Makefile b/tests/Makefile
@@ -3,13 +3,13 @@
 CXX ?= g++
 CXXFLAGS ?= -g -O2
 
-tester: tester.cc
-	$(CXX) $(CXXFLAGS) -o tester tester.cc
+tester: tester.cc ../tiny_obj_loader.h
+	$(CXX) $(CXXFLAGS) -fsanitize=address -o tester tester.cc
 
 all: tester
 
 check: tester
-	./tester	
+	./tester
 
 clean:
 	rm -rf tester
diff --git a/tests/tester.cc b/tests/tester.cc
@@ -957,7 +957,8 @@ TEST_CASE("line-primitive", "[line]") {
 
   REQUIRE(true == ret);
   REQUIRE(1 == shapes.size());
-  REQUIRE(6 == shapes[0].path.indices.size());
+  REQUIRE(8 == shapes[0].lines.indices.size());
+  REQUIRE(2 == shapes[0].lines.num_line_vertices.size());
 }
 
 TEST_CASE("multiple-group-names", "[group]") {
@@ -1060,7 +1061,7 @@ TEST_CASE("colorspace", "[Issue184]") {
 // Just check if it does not crash.
 // Disable by default since Windows filesystem can't create filename of afl
 // testdata
-#if 0 
+#if 0
 
 TEST_CASE("afl000000", "[AFL]") {
   tinyobj::attrib_t attrib;
diff --git a/tiny_obj_loader.h b/tiny_obj_loader.h
@@ -260,7 +260,7 @@ typedef struct {
 typedef struct {
   // Linear flattened indices.
   std::vector<index_t> indices;       // indices for vertices(poly lines)
-  std::vector<int> num_line_vertces;  // The number of vertices per line.
+  std::vector<int> num_line_vertices;  // The number of vertices per line.
 } lines_t;
 
 typedef struct {
@@ -592,6 +592,10 @@ struct PrimGroup {
     pointGroup.clear();
   }
 
+  bool IsEmpty() const {
+    return faceGroup.empty() && lineGroup.empty() && pointGroup.empty();
+  }
+
   // TODO(syoyo): bspline, surface, ...
 };
 
@@ -1221,10 +1225,13 @@ static bool exportGroupsToShape(shape_t *shape, const PrimGroup &prim_group,
                                 const int material_id, const std::string &name,
                                 bool triangulate,
                                 const std::vector<real_t> &v) {
-  if (prim_group.faceGroup.empty() && prim_group.lineGroup.empty()) {
+  if (prim_group.IsEmpty()) {
     return false;
   }
 
+  shape->name = name;
+
+  // polygon
   if (!prim_group.faceGroup.empty()) {
     // Flatten vertices and indices
     for (size_t i = 0; i < prim_group.faceGroup.size(); i++) {
@@ -1464,13 +1471,28 @@ static bool exportGroupsToShape(shape_t *shape, const PrimGroup &prim_group,
       }
     }
 
-    shape->name = name;
     shape->mesh.tags = tags;
   }
 
-  // if (!lineGroup.empty()) {
-  //  shape->lines.indices.swap(lineGroup);
-  //}
+  // line
+  if (!prim_group.lineGroup.empty()) {
+    // Flatten indices
+    for (size_t i = 0; i < prim_group.lineGroup.size(); i++) {
+      for (size_t j = 0; j < prim_group.lineGroup[i].vertex_indices.size(); j++) {
+
+        const vertex_index_t &vi = prim_group.lineGroup[i].vertex_indices[j];
+
+        index_t idx;
+        idx.vertex_index = vi.v_idx;
+        idx.normal_index = vi.vn_idx;
+        idx.texcoord_index = vi.vt_idx;
+
+        shape->lines.indices.push_back(idx);
+      }
+
+      shape->lines.num_line_vertices.push_back(int(prim_group.lineGroup[i].vertex_indices.size()));
+    }
+  }
 
   return true;
 }
