merge with main

Author: akaszynski

.github/workflows/testing-and-deployment.yml

@@ -88,7 +88,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-2019, macos-14, macos-13]
+        os: [ubuntu-latest, windows-2025, macos-14, macos-13]
 
     steps:
     - uses: actions/checkout@v4

.pre-commit-config.yaml

@@ -5,7 +5,7 @@ ci:
 
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.11.8
+  rev: v0.11.12
   hooks:
   - id: ruff
     args: [--fix, --exit-non-zero-on-fix]

fast_simplification/_simplify.pyx

@@ -15,6 +15,7 @@ cdef extern from "wrapper.h" namespace "Simplify":
     void load_arrays_int32(const int, const int, double*, int*)
     void load_arrays_int64(const int, const int, double*, int64_t*)
     void simplify_mesh(int, double aggressiveness, bool verbose)
+    void simplify_mesh_lossless(bool)
     void get_points(double*)
     void get_triangles(int*)
     void get_collapses(int*)
@@ -44,6 +45,8 @@ def load_int64(
 def simplify(int target_count, double aggressiveness=7, bool verbose=False):
     simplify_mesh(target_count, aggressiveness, verbose)
 
+def simplify_lossless(bool verbose=False):
+    simplify_mesh_lossless(verbose)
 
 
 def save_obj(filename):

fast_simplification/simplify.py

@@ -34,6 +34,7 @@ def simplify(
     agg=7,
     verbose=False,
     return_collapses=False,
+    lossless=False,
 ):
     """Simplify a triangular mesh.
 
@@ -68,6 +69,8 @@ def simplify(
         ``collapses[i] = [i0, i1]`` means that durint the i-th
         collapse, the vertex ``i1`` was collapsed into the vertex
         ``i0``.
+    lossless : bool, optional
+        If True, simplify the mesh losslessly.
 
     Returns
     -------
@@ -107,11 +110,9 @@ def simplify(
     ... ]
     >>> points_out, faces_out = fast_simplification.simplify(points, faces, 0.5)
 
-
     """
-    if not isinstance(points, np.ndarray):
-        points = np.array(points, dtype=np.float64)
-    points = points.astype(np.float64, copy=False)
+
+    points = np.asarray(points, dtype=np.float64)
     if not isinstance(triangles, np.ndarray):
         triangles = np.array(triangles, dtype=np.int32)
 
@@ -126,10 +127,8 @@ def simplify(
         raise ValueError(f"Expected ``triangles`` array to be (n, 3), not {triangles.shape}")
 
     n_faces = triangles.shape[0]
-    target_count = _check_args(target_reduction, target_count, n_faces)
 
-    if not triangles.flags.c_contiguous:
-        triangles = np.ascontiguousarray(triangles)
+    triangles = np.ascontiguousarray(triangles)
 
     if triangles.dtype == np.int32:
         load = _simplify.load_int32
@@ -146,7 +145,11 @@ def simplify(
         triangles,
     )
 
-    _simplify.simplify(target_count, agg, verbose)
+    if lossless:
+        _simplify.simplify_lossless(verbose)
+    else:
+        target_count = _check_args(target_reduction, target_count, n_faces)
+        _simplify.simplify(target_count, agg, verbose)
     points = _simplify.return_points()
     faces = _simplify.return_faces_int32_no_padding().reshape(-1, 3)
 
@@ -199,8 +202,8 @@ def simplify_mesh(mesh, target_reduction=None, target_count=None, agg=7, verbose
     n_faces = mesh.n_cells
     _simplify.load_from_vtk(
         mesh.n_points,
-        mesh.points.astype(np.float64, copy=False),
-        mesh.faces.astype(np.int32, copy=False),
+        mesh.points.astype(np.float64, order="C", copy=False),
+        mesh.faces.astype(np.int32, order="C", copy=False),
         n_faces,
     )
 

tests/test_simplify.py

@@ -65,7 +65,7 @@ def test_simplify_trivial():
 
 @skip_no_vtk
 def test_simplify_none(mesh):
-    triangles = mesh.faces.reshape(-1, 4)[:, 1:]
+    triangles = mesh._connectivity_array.reshape(-1, 3)
 
     reduction = 0
     points, faces = fast_simplification.simplify(mesh.points, triangles, reduction)
@@ -75,7 +75,7 @@ def test_simplify_none(mesh):
 
 @skip_no_vtk
 def test_simplify(mesh):
-    triangles = mesh.faces.reshape(-1, 4)[:, 1:]
+    triangles = mesh._connectivity_array.reshape(-1, 3)
     reduction = 0.5
     points, faces, collapses = fast_simplification.simplify(
         mesh.points, triangles, reduction, return_collapses=True
@@ -91,9 +91,18 @@ def test_simplify(mesh):
     assert points.dtype == np.float64
 
 
+@skip_no_vtk
+def test_simplify_lossless(mesh):
+    triangles = mesh._connectivity_array.reshape(-1, 3)
+    reduction = 0.5
+    points, faces = fast_simplification.simplify(mesh.points, triangles, reduction, lossless=True)
+    assert np.allclose(mesh.points, points)
+    assert np.allclose(triangles, faces)
+
+
 @skip_no_vtk
 def test_simplify_agg(mesh):
-    triangles = mesh.faces.reshape(-1, 4)[:, 1:]
+    triangles = mesh._connectivity_array.reshape(-1, 3)
 
     reduction = 0.5
     points, faces = fast_simplification.simplify(