Add parsing p line(point primtive).

syoyo · syoyo · commit 87b906c64831 · 2019-04-14T15:59:33.000+09:00
diff --git a/README.md b/README.md
@@ -26,6 +26,7 @@ Old version is available `v0.9.x` branch https://github.com/syoyo/tinyobjloader/
 
 ## What's new
 
+* 14 Apr, 2019 : Bump version v2.0.0 rc0. New C++ API and python bindings!(1.x API still exists for backward compatibility)
 * 20 Aug, 2016 : Bump version v1.0.0. New data structure and API!
 
 ### Old version
@@ -39,11 +40,11 @@ Previous old version is avaiable in `v0.9.x` branch.
 tinyobjloader can successfully load 6M triangles Rungholt scene.
 http://casual-effects.com/data/index.html
 
-![](images/sanmugel.png) 
+![](images/sanmugel.png)
 
-* [examples/viewer/](examples/viewer) OpenGL .obj viewer 
-* [examples/callback_api/](examples/callback_api/) Callback API example 
-* [examples/voxelize/](examples/voxelize/) Voxelizer example 
+* [examples/viewer/](examples/viewer) OpenGL .obj viewer
+* [examples/callback_api/](examples/callback_api/) Callback API example
+* [examples/voxelize/](examples/voxelize/) Voxelizer example
 
 ## Use case
 
@@ -191,7 +192,7 @@ mesh_t::num_face_vertices => array of the number of vertices per face(e.g. 3 = t
 
   |    face[0]   |       face[1]     |    face[2]   |     |      face[n-1]           |
   +----+----+----+----+----+----+----+----+----+----+     +--------+--------+--------+
-  | i0 | i1 | i2 | i3 | i4 | i5 | i6 | i7 | i8 | i9 | ... | i(n-3) | i(n-2) | i(n-1) | 
+  | i0 | i1 | i2 | i3 | i4 | i5 | i6 | i7 | i8 | i9 | ... | i(n-3) | i(n-2) | i(n-1) |
   +----+----+----+----+----+----+----+----+----+----+     +--------+--------+--------+
 
 ```
@@ -201,7 +202,7 @@ Note that when `triangulate` flas is true in `tinyobj::LoadObj()` argument, `num
 ### float data type
 
 TinyObjLoader now use `real_t` for floating point data type.
-Default is `float(32bit)`. 
+Default is `float(32bit)`.
 You can enable `double(64bit)` precision by using `TINYOBJLOADER_USE_DOUBLE` define.
 
 #### Example code
@@ -218,7 +219,7 @@ std::vector<tinyobj::material_t> materials;
 std::string warn;
 std::string err;
 bool ret = tinyobj::LoadObj(&attrib, &shapes, &materials, &warn, &err, inputfile.c_str());
-  
+
 if (!err.empty()) { // `err` may contain warning message.
   std::cerr << err << std::endl;
 }
diff --git a/loader_example.cc b/loader_example.cc
@@ -139,8 +139,10 @@ static void PrintInfo(const tinyobj::attrib_t& attrib,
            shapes[i].name.c_str());
     printf("Size of shape[%ld].mesh.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()));
+    printf("Size of shape[%ld].lines.indices: %lu\n", static_cast<long>(i),
+           static_cast<unsigned long>(shapes[i].lines.indices.size()));
+    printf("Size of shape[%ld].points.indices: %lu\n", static_cast<long>(i),
+           static_cast<unsigned long>(shapes[i].points.indices.size()));
 
     size_t index_offset = 0;
 
diff --git a/models/points-prim.obj b/models/points-prim.obj
@@ -0,0 +1,15 @@
+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
+p 1 2 3 4 5 6 7 8
diff --git a/python/bindings.cc b/python/bindings.cc
@@ -8,7 +8,7 @@ namespace py = pybind11;
 
 using namespace tinyobj;
 
-PYBIND11_MODULE(tinyobjloader, tobj_module)
+PYBIND11_MODULE(tinyobj, tobj_module)
 {
   tobj_module.doc() = "Python bindings for TinyObjLoader.";
 
@@ -30,11 +30,25 @@ PYBIND11_MODULE(tinyobjloader, tobj_module)
     .def_property_readonly("vertices", &attrib_t::GetVertices);
 
   py::class_<shape_t>(tobj_module, "shape_t")
-    .def(py::init<>());
+    .def(py::init<>())
+    .def_readonly("name", &shape_t::name)
+    .def_readonly("mesh", &shape_t::mesh)
+    .def_readonly("lines", &shape_t::lines)
+    .def_readonly("points", &shape_t::points);
 
+  // TODO(syoyo): write more bindings
   py::class_<material_t>(tobj_module, "material_t")
     .def(py::init<>());
 
+  py::class_<mesh_t>(tobj_module, "mesh_t")
+    .def(py::init<>());
+
+  py::class_<lines_t>(tobj_module, "lines_t")
+    .def(py::init<>());
+
+  py::class_<points_t>(tobj_module, "points_t")
+    .def(py::init<>());
+
   py::class_<ObjReaderConfig>(tobj_module, "ObjReaderConfig")
     .def(py::init<>());
 
diff --git a/python/sample.py b/python/sample.py
@@ -1,19 +1,24 @@
 import sys
-import tinyobjloader
+import tinyobj
 
 filename = "../models/cornell_box.obj";
 
-config = tinyobjloader.ObjLoaderConfig()
+config = tinyobj.ObjReaderConfig()
 
-loader = tinyobjloader.ObjLoader()
+reader = tinyobj.ObjReader()
 
-ret = loader.Load(filename, config)
+ret = reader.ParseFromFile(filename, config)
 
 if ret == False:
     print("Failed to load : ", filename)
     sys.exit(-1)
 
-attrib = loader.GetAttrib()
+attrib = reader.GetAttrib()
 print("attrib.vertices = ", len(attrib.vertices))
 for v in attrib.vertices:
     print(v)
+
+# TODO(syoyo): print mesh
+for shape in reader.GetShapes():
+    print(shape.name)
+    print(len(shape.mesh.indices))
diff --git a/python/setup.py b/python/setup.py
@@ -1,14 +1,15 @@
 from distutils.core import setup, Extension
 
 
-m = Extension('tinyobjloader',
+# `../tiny_obj_loader.cc` contains implementation of tiny_obj_loader.
+m = Extension('tinyobj',
               sources = ['bindings.cc', '../tiny_obj_loader.cc'],
               extra_compile_args=['-std=c++11'],
               include_dirs = ['../', '../pybind11/include']
               )
 
 
-setup (name = 'tinyobjloader',
+setup (name = 'tinyobj',
        version = '0.1',
        description = 'Python module for tinyobjloader',
        ext_modules = [m])
diff --git a/tests/tester.cc b/tests/tester.cc
@@ -961,6 +961,29 @@ TEST_CASE("line-primitive", "[line]") {
   REQUIRE(2 == shapes[0].lines.num_line_vertices.size());
 }
 
+TEST_CASE("points-primitive", "[points]") {
+  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,
+                              "../models/points-prim.obj", gMtlBasePath);
+
+  if (!warn.empty()) {
+    std::cout << "WARN: " << warn << std::endl;
+  }
+
+  if (!err.empty()) {
+    std::cerr << "ERR: " << err << std::endl;
+  }
+
+  REQUIRE(true == ret);
+  REQUIRE(1 == shapes.size());
+  REQUIRE(8 == shapes[0].points.indices.size());
+}
+
 TEST_CASE("multiple-group-names", "[group]") {
   tinyobj::attrib_t attrib;
   std::vector<tinyobj::shape_t> shapes;
diff --git a/tiny_obj_loader.h b/tiny_obj_loader.h
@@ -24,6 +24,8 @@ THE SOFTWARE.
 
 //
 // version 2.0.0 : Add new object oriented API. 1.x API is still provided.
+//                 * Support line primitive.
+//                 * Support points primitive.
 // version 1.4.0 : Modifed ParseTextureNameAndOption API
 // version 1.3.1 : Make ParseTextureNameAndOption API public
 // version 1.3.0 : Separate warning and error message(breaking API of LoadObj)
@@ -410,13 +412,20 @@ class ObjReader {
   ///
   /// Load .obj and .mtl from a file.
   ///
+  /// @param[in] filename wavefront .obj filename
+  /// @param[in] config Reader configuration
+  ///
   bool ParseFromFile(const std::string &filename, const ObjReaderConfig &config);
 
   ///
   /// Parse .obj from a text string.
   /// Need to supply .mtl text string by `mtl_text`.
   /// This function ignores `mtllib` line in .obj text.
   ///
+  /// @param[in] obj_text wavefront .obj filename
+  /// @param[in] mtl_text wavefront .mtl filename
+  /// @param[in] config Reader configuration
+  ///
   bool ParseFromString(const std::string &obj_text, const std::string &mtl_text, const ObjReaderConfig &config);
 
   ///
@@ -551,15 +560,15 @@ struct face_t {
 };
 
 // Internal data structure for line representation
-struct line_t {
+struct __line_t {
   // l v1/vt1 v2/vt2 ...
   // In the specification, line primitrive does not have normal index, but
   // TinyObjLoader allow it
   std::vector<vertex_index_t> vertex_indices;
 };
 
-// Internal data structure for pint representation
-struct point_t {
+// Internal data structure for points representation
+struct __points_t {
   // p v1 v2 ...
   // In the specification, point primitrive does not have normal index and
   // texture coord index, but TinyObjLoader allow it.
@@ -580,20 +589,20 @@ struct obj_shape {
 };
 
 //
-// Manages group of primitives(face, line, point, ...)
+// Manages group of primitives(face, line, points, ...)
 struct PrimGroup {
   std::vector<face_t> faceGroup;
-  std::vector<line_t> lineGroup;
-  std::vector<point_t> pointGroup;
+  std::vector<__line_t> lineGroup;
+  std::vector<__points_t> pointsGroup;
 
   void clear() {
     faceGroup.clear();
     lineGroup.clear();
-    pointGroup.clear();
+    pointsGroup.clear();
   }
 
   bool IsEmpty() const {
-    return faceGroup.empty() && lineGroup.empty() && pointGroup.empty();
+    return faceGroup.empty() && lineGroup.empty() && pointsGroup.empty();
   }
 
   // TODO(syoyo): bspline, surface, ...
@@ -1494,6 +1503,24 @@ static bool exportGroupsToShape(shape_t *shape, const PrimGroup &prim_group,
     }
   }
 
+  // points
+  if (!prim_group.pointsGroup.empty()) {
+    // Flatten & convert indices
+    for (size_t i = 0; i < prim_group.pointsGroup.size(); i++) {
+      for (size_t j = 0; j < prim_group.pointsGroup[i].vertex_indices.size(); j++) {
+
+        const vertex_index_t &vi = prim_group.pointsGroup[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->points.indices.push_back(idx);
+      }
+    }
+  }
+
   return true;
 }
 
@@ -2077,7 +2104,7 @@ bool LoadObj(attrib_t *attrib, std::vector<shape_t> *shapes,
     if (token[0] == 'l' && IS_SPACE((token[1]))) {
       token += 2;
 
-      line_t line;
+      __line_t line;
 
       while (!IS_NEW_LINE(token[0])) {
         vertex_index_t vi;
@@ -2086,7 +2113,7 @@ bool LoadObj(attrib_t *attrib, std::vector<shape_t> *shapes,
                          static_cast<int>(vt.size() / 2), &vi)) {
           if (err) {
             std::stringstream ss;
-            ss << "Failed parse `l' line(e.g. zero value for face index. line "
+            ss << "Failed parse `l' line(e.g. zero value for vertex index. line "
                << line_num << ".)\n";
             (*err) += ss.str();
           }
@@ -2104,6 +2131,37 @@ bool LoadObj(attrib_t *attrib, std::vector<shape_t> *shapes,
       continue;
     }
 
+    // points
+    if (token[0] == 'p' && IS_SPACE((token[1]))) {
+      token += 2;
+
+      __points_t pts;
+
+      while (!IS_NEW_LINE(token[0])) {
+        vertex_index_t vi;
+        if (!parseTriple(&token, static_cast<int>(v.size() / 3),
+                         static_cast<int>(vn.size() / 3),
+                         static_cast<int>(vt.size() / 2), &vi)) {
+          if (err) {
+            std::stringstream ss;
+            ss << "Failed parse `p' line(e.g. zero value for vertex index. line "
+               << line_num << ".)\n";
+            (*err) += ss.str();
+          }
+          return false;
+        }
+
+        pts.vertex_indices.push_back(vi);
+
+        size_t n = strspn(token, " \t\r");
+        token += n;
+      }
+
+      prim_group.pointsGroup.push_back(pts);
+
+      continue;
+    }
+
     // face
     if (token[0] == 'f' && IS_SPACE((token[1]))) {
       token += 2;
