Merge pull request #46 from petrasvestartas/remesh_dual

ADD remesh_dual

Author: tomvanmele

.github/workflows/build.yml

@@ -10,17 +10,81 @@ on:
 
 jobs:
   Build:
-    if: "!contains(github.event.pull_request.labels.*.name, 'docs-only')"
+    if: ${{ !contains(github.event.pull_request.labels.*.name, 'docs-only') }} 
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
         python: ["3.10"]
 
     steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          
+      - name: Set up conda
+        uses: conda-incubator/setup-miniconda@v3
+        with:
+          python-version: ${{ matrix.python }}
+          channels: conda-forge
+          activate-environment: "compas_123-dev"
+          
+      - name: Configure conda channels
+        shell: bash -el {0}
+        run: |
+          conda config --add channels defaults
+          conda config --set channel_priority strict
+          
       - uses: compas-dev/compas-actions.build@v4
         with:
           invoke_lint: true
           use_conda: true
           check_import: true
           python: ${{ matrix.python }}
+          
+  build_wheels:
+    name: cibuildwheel on ${{ matrix.platform }}
+    needs: [Build]  # Only run if Build job succeeds
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-latest
+            platform: manylinux
+          - os: macos-latest
+            platform: mac
+          - os: windows-latest
+            platform: windows
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Install cibuildwheel
+        run: pipx install cibuildwheel==2.23.1
+
+      - name: Build wheels
+        run: cibuildwheel --output-dir wheelhouse .
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: wheels-${{ matrix.platform }}
+          path: wheelhouse/*.whl
+
+  build_sdist:
+    name: Test source distribution
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Build SDist
+        run: pipx run build --sdist
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: sdist
+          path: dist/*.tar.gz

CHANGELOG.md

@@ -18,6 +18,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+* Added `compas_cgal.meshing.mesh_remesh_dual`.
+
 ### Changed
 
 ### Removed

docs/examples/example_meshing.py

@@ -1,45 +1,35 @@
-import math
-from pathlib import Path
-
+from compas.geometry import Sphere
 from compas.datastructures import Mesh
-from compas.geometry import Rotation
-from compas.geometry import Scale
 from compas.geometry import Translation
-from compas.geometry import Vector
-from compas.geometry import scale_vector
 from compas.geometry import transform_points_numpy
 from compas_viewer import Viewer
 
-from compas_cgal.meshing import mesh_remesh
-
+from compas_cgal.meshing import mesh_remesh, mesh_dual
 
 def main():
-    """Remesh a bunny mesh that is loaded from .ply file."""
-
-    FILE = Path(__file__).parent.parent.parent / "data" / "Bunny.ply"
-    bunny = Mesh.from_ply(FILE)
-    bunny.remove_unused_vertices()
-
-    centroid = bunny.vertex_point(0)
-
-    vector = scale_vector(centroid, -1)
+    """Remesh a mesh."""
 
-    T = Translation.from_vector(vector)
-    S = Scale.from_factors([100, 100, 100])
-    R = Rotation.from_axis_and_angle(Vector(1, 0, 0), math.radians(90))
+    mesh = Mesh.from_shape(Sphere(1))
+    mesh.quads_to_triangles()
 
-    # bunny.transform(R * S * T)
-    V0, F0 = bunny.to_vertices_and_faces()
-    V1 = transform_points_numpy(V0, R * S * T)
+    edge_length = 0.5
+    iterations = 10
+    x_translation = 2
 
-    V1, F1 = mesh_remesh((V0, F0), 0.3, 10)
-    V1 = transform_points_numpy(V1, Translation.from_vector([20, 0, 0]))
-    mesh = Mesh.from_vertices_and_faces(V1, F1)
+    # Remesh
+    V1, F1 = mesh_remesh(mesh.to_vertices_and_faces(), edge_length, iterations)
+    V1 = transform_points_numpy(V1, Translation.from_vector([x_translation, 0, 0]))
+    remeshed = Mesh.from_vertices_and_faces(V1, F1)
+    
+    # Dual
+    V2, F2 = mesh_dual((V1, F1), 2.14, True)
+    V2 = transform_points_numpy(V2, Translation.from_vector([x_translation, 0, 0]))
+    dual = Mesh.from_vertices_and_faces(V2, F2)
 
-    return bunny, mesh
+    return mesh, remeshed, dual
 
 
-bunny, mesh = main()
+mesh, remeshed, dual = main()
 
 
 # ==============================================================================
@@ -49,9 +39,10 @@ def main():
 viewer = Viewer(width=1600, height=900)
 
 viewer.renderer.camera.target = [0, 0, 0]
-viewer.renderer.camera.position = [0, -25, 10]
+viewer.renderer.camera.position = [0, -0.25, 0.10]
 
-viewer.scene.add(bunny, show_points=False)
 viewer.scene.add(mesh, show_points=False)
+viewer.scene.add(remeshed, show_points=False)
+viewer.scene.add(dual, show_points=True)
 
 viewer.show()

src/compas_cgal/meshing.py

@@ -2,6 +2,7 @@
 from compas.plugins import plugin
 
 from compas_cgal import _meshing
+from compas_cgal import _types_std  # noqa: F401
 
 from .types import VerticesFaces
 from .types import VerticesFacesNumpy
@@ -51,4 +52,45 @@ def mesh_remesh(
     V, F = mesh
     V = np.asarray(V, dtype=np.float64, order="C")
     F = np.asarray(F, dtype=np.int32, order="C")
-    return _meshing.remesh(V, F, target_edge_length, number_of_iterations)
+    return _meshing.remesh(V, F, target_edge_length, number_of_iterations, do_project)
+
+
+def mesh_dual(
+    mesh: VerticesFaces,
+    angle_radians: float = 0.0,
+    circumcenter: bool = True,
+    scale_factor: float = 1.0,
+) -> tuple[np.ndarray, list[list[int]]]:
+    """Create a dual mesh from a triangular mesh with variable-length faces.
+
+    Parameters
+    ----------
+    mesh : :attr:`compas_cgal.types.VerticesFaces`
+        The mesh to create a dual from.
+    angle_radians : double, optional
+        Angle limit in radians for boundary vertices to remove.
+    circumcenter : bool, optional
+        Whether to use the circumcenter of the triangle instead of the centroid.
+    scale_factor : double, optional
+        Scale factor for inner vertices.
+
+    Returns
+    -------
+    tuple
+        A tuple containing:
+        - Dual mesh vertices as an Nx3 numpy array.
+        - Variable-length faces as a list of lists of vertex indices.
+
+    Notes
+    -----
+    This dual mesh implementation includes proper boundary handling by:
+    1. Creating vertices at face centroids of the primal mesh
+    2. Creating additional vertices at boundary edge midpoints
+    3. Creating proper connections for boundary edges
+
+    """
+    V, F = mesh
+    V = np.asarray(V, dtype=np.float64, order="C")
+    F = np.asarray(F, dtype=np.int32, order="C")
+    vertices, var_faces = _meshing.dual(V, F, angle_radians, circumcenter, scale_factor)
+    return vertices, var_faces