Add unit test for each function.

Author: tatsy

.github/workflows/macos.yml

@@ -110,5 +110,5 @@ jobs:
 
     - name: Python Module Test
       run: |
-        poetry run nose2
+        poetry run nose2 -s tests/python
 

.github/workflows/ubuntu.yml

@@ -110,5 +110,5 @@ jobs:
 
     - name: Python Module Test
       run: |
-        poetry run nose2
+        poetry run nose2 -s tests/python
 

.github/workflows/windows.yml

@@ -61,4 +61,4 @@ jobs:
 
     - name: Python Module Test
       run: |
-        poetry run nose2
+        poetry run nose2 -s tests/python

data/.gitignore

@@ -1,4 +1,5 @@
 !models/bunny.ply
+!models/bunny_mini.ply
 !models/fandisk.ply
 !models/box.obj
 !models/plane.obj

data/models/bunny_mini.ply

@@ -16,10 +16,10 @@ int main(int argc, char **argv) {
     tinymesh::Mesh mesh(argv[1]);
 
     // Simplify
-    const int target = (int)(ratio * mesh.numVertices());
+    const int target = (int)(ratio * mesh.numFaces());
     tinymesh::holeFill(mesh);
-    tinymesh::simplifyQEM(mesh, target);
-    tinymesh::remeshTriangular(mesh);
+    tinymesh::simplifyQEM(mesh, target, 10, true);
+    tinymesh::remeshTriangular(mesh, 0.0, 1e6);  // remesh by keeping #faces
 
     // Save
     const fs::path filepath = fs::canonical(fs::path(argv[1]));

examples/example_simplify.cpp

@@ -63,7 +63,8 @@ PYBIND11_MODULE(tinymesh, m) {
         .def("num_vertices", &Mesh::numVertices)
         .def("num_edges", &Mesh::numEdges)
         .def("num_halfedges", &Mesh::numHalfedges)
-        .def("num_faces", &Mesh::numFaces);
+        .def("num_faces", &Mesh::numFaces)
+        .def("verify", &Mesh::verify);
 
     py::class_<Vertex, std::shared_ptr<Vertex>>(m, "Vertex")
         .def(py::init<>())
@@ -129,14 +130,17 @@ PYBIND11_MODULE(tinymesh, m) {
           py::arg("short_length") = 0.8,
           py::arg("long_length") = 1.333,
           py::arg("angle_keep_less_than") = 0.0,
-          py::arg("iterations") = 5);
+          py::arg("iterations") = 5,
+          py::arg("verbose") = false);
 
     /*** Simplification ***/
 
     m.def("simplify_qem", &simplifyQEM,
           "QEM-based simplification",
           py::arg("mesh"),
-          py::arg("n_triangles"));
+          py::arg("n_triangles"),
+          py::arg("n_trials") = 10,
+          py::arg("verbose") = false);
 
     /*** Hole filling ***/
 

src/pybind11.cpp

@@ -20,8 +20,8 @@ class ProgressBar {
     }
     virtual ~ProgressBar() {}
 
-    void step() {
-        m_step += 1;
+    void step(int n = 1) {
+        m_step += n;
         auto now = std::chrono::system_clock::now();
 
         const double percent = 100.0 * m_step / m_total;
@@ -54,6 +54,10 @@ class ProgressBar {
         }
     }
 
+    void finish() {
+        printf("\n");
+    }
+
 private:
     const int m_width = 40;
     int m_step, m_total;

src/tinymesh/core/progress.h

@@ -6,6 +6,7 @@
 #include <atomic>
 
 #include "core/vec.h"
+#include "core/debug.h"
 #include "core/openmp.h"
 #include "core/mesh.h"
 #include "core/vertex.h"
@@ -15,7 +16,7 @@
 
 namespace tinymesh {
 
-void remeshTriangular(Mesh &mesh, double shortLength, double longLength, double keepAngleLessThan, int iterations) {
+void remeshTriangular(Mesh &mesh, double shortLength, double longLength, double keepAngleLessThan, int iterations, bool verbose) {
     Assertion(mesh.verify(), "Invalid mesh!");
 
     // Compute average edge length
@@ -70,9 +71,11 @@ void remeshTriangular(Mesh &mesh, double shortLength, double longLength, double
 
     // Remesh loop
     for (int k = 0; k < iterations; k++) {
-        printf("*** Original #%d ***\n", k + 1);
-        printf("#vert: %d\n", (int)mesh.numVertices());
-        printf("#face: %d\n", (int)mesh.numFaces());
+        if (verbose) {
+            Info("*** Original #%d ***\n", k + 1);
+            Info("#vert: %d\n", (int)mesh.numVertices());
+            Info("#face: %d\n", (int)mesh.numFaces());
+        }
 
         // Split long edges
         indices.clear();
@@ -95,9 +98,11 @@ void remeshTriangular(Mesh &mesh, double shortLength, double longLength, double
             }
         }
 
-        printf("*** After split ***\n");
-        printf("#vert: %d\n", (int)mesh.numVertices());
-        printf("#face: %d\n", (int)mesh.numFaces());
+        if (verbose) {
+            Info("*** After split ***\n");
+            Info("#vert: %d\n", (int)mesh.numVertices());
+            Info("#face: %d\n", (int)mesh.numFaces());
+        }
 
         mesh.verify();
 
@@ -146,9 +151,11 @@ void remeshTriangular(Mesh &mesh, double shortLength, double longLength, double
             }
         }
 
-        printf("*** After collapse ***\n");
-        printf("#vert: %d\n", (int)mesh.numVertices());
-        printf("#face: %d\n", (int)mesh.numFaces());
+        if (verbose) {
+            Info("*** After collapse ***\n");
+            Info("#vert: %d\n", (int)mesh.numVertices());
+            Info("#face: %d\n", (int)mesh.numFaces());
+        }
 
         // Flip edges
         for (int i = 0; i < (int)mesh.numHalfedges(); i++) {

src/tinymesh/remesh/remesh.cpp

@@ -10,19 +10,20 @@
 namespace tinymesh {
 
 /**
- * Triangular remeshing [Hoppe 1996]
+ * Minimum direhdral hole filling [Leipa 2003]
  */
-TINYMESH_API void remeshTriangular(Mesh &mesh, double shortLength = 0.8, double longLength = 1.333, double keepAngleLessThan = 0.0, int maxiter = 5);
+TINYMESH_API void holeFill(Mesh &mesh, double dihedralBound = Pi);
 
 /**
- * QEM-based simplification [Garland and Heckbert 1997]
+ * Triangular remeshing [Hoppe 1996]
  */
-TINYMESH_API void simplifyQEM(Mesh &mesh, int numTarget);
+TINYMESH_API void remeshTriangular(Mesh &mesh, double shortLength = 0.8, double longLength = 1.333,
+                                   double keepAngleLessThan = 0.0, int maxiter = 5, bool verbose = false);
 
 /**
- * Minimum direhdral hole filling [Leipa 2003]
+ * QEM-based simplification [Garland and Heckbert 1997]
  */
-TINYMESH_API void holeFill(Mesh &mesh, double dihedralBound = Pi);
+TINYMESH_API void simplifyQEM(Mesh &mesh, int numTarget, int maxTrials = 10, bool verbose = false);
 
 }  // namespace tinymesh