Merge pull request #27 from compas-dev/tessagon_api

Tessagon api

Author: petrasvestartas

CHANGELOG.md

@@ -18,8 +18,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- Added map_pattern_to_mesh function.
+
 ### Changed
 
+- Changed map_mesh pattern to output more detailed information about the mapping: vertices, faces, normals, boundaries, group indices.
+- Changed examples and test to use new map_mesh function.
+
 ### Removed
 
 

docs/_images/example_mapping.png

@@ -2,31 +2,99 @@
 compas_libigl
 ********************************************************************************
 
-.. currentmodule:: compas_libigl
-
-Functions
-=========
-
-.. autosummary::
-    :toctree: generated/
-    :nosignatures:
-
-    add
-    get
-    get_beetle
-    get_armadillo
-    intersection_ray_mesh
-    intersection_rays_mesh
-    trimesh_boundaries
-    trimesh_gaussian_curvature
-    trimesh_principal_curvature
-    trimesh_geodistance
-    trimesh_geodistance_multiple
-    trimesh_isolines
-    groupsort_isolines
-    trimesh_massmatrix
-    trimesh_harmonic_mapping
-    trimesh_lsc_mapping
-    quadmesh_planarize
-    trimesh_remesh_along_isoline
-    trimesh_remesh_along_isolines
+Boundaries
+----------
+
+.. autosummary::
+    :toctree: generated/
+    :nosignatures:
+
+    compas_libigl.boundaries.trimesh_boundaries
+
+Curvature
+---------
+
+.. autosummary::
+    :toctree: generated/
+    :nosignatures:
+
+    compas_libigl.curvature.trimesh_gaussian_curvature
+    compas_libigl.curvature.trimesh_principal_curvature
+
+Geodesic Distance
+-----------------
+
+.. autosummary::
+    :toctree: generated/
+    :nosignatures:
+
+    compas_libigl.geodistance.trimesh_geodistance
+    compas_libigl.geodistance.trimesh_geodistance_multiple
+
+Intersections
+-------------
+
+.. autosummary::
+    :toctree: generated/
+    :nosignatures:
+
+    compas_libigl.intersections.intersection_ray_mesh
+    compas_libigl.intersections.intersection_rays_mesh
+
+Isolines
+--------
+
+.. autosummary::
+    :toctree: generated/
+    :nosignatures:
+
+    compas_libigl.isolines.trimesh_isolines
+    compas_libigl.isolines.groupsort_isolines
+
+Mapping
+-------
+
+.. autosummary::
+    :toctree: generated/
+    :nosignatures:
+
+    compas_libigl.mapping.map_mesh
+    compas_libigl.mapping.map_pattern_to_mesh
+
+Mass Matrix
+-----------
+
+.. autosummary::
+    :toctree: generated/
+    :nosignatures:
+
+    compas_libigl.massmatrix.trimesh_massmatrix
+
+Meshing
+-------
+
+.. autosummary::
+    :toctree: generated/
+    :nosignatures:
+
+    compas_libigl.meshing.trimesh_remesh_along_isoline
+    compas_libigl.meshing.trimesh_remesh_along_isolines
+
+Parametrisation
+---------------
+
+.. autosummary::
+    :toctree: generated/
+    :nosignatures:
+
+    compas_libigl.parametrisation.trimesh_harmonic_mapping
+    compas_libigl.parametrisation.trimesh_lsc_mapping
+
+Planarization
+-------------
+
+.. autosummary::
+    :toctree: generated/
+    :nosignatures:
+
+    compas_libigl.planarize.quadmesh_planarize

docs/_images/example_mapping_boundaries.png

@@ -1,20 +1,23 @@
 from pathlib import Path
 
 from compas.colors import Color
+from compas.geometry import Polyline
 from compas.datastructures import Mesh
 from compas_viewer import Viewer
 from compas_viewer.config import Config
 from tessagon.adaptors.list_adaptor import ListAdaptor
-from tessagon.types.hex_tessagon import HexTessagon
+from tessagon.types.zig_zag_tessagon import ZigZagTessagon
 
 from compas_libigl.mapping import map_mesh
 from compas_libigl.parametrisation import trimesh_lsc_mapping
 
+from compas import json_dump
+
 # ==============================================================================
 # Input geometry: 3D Mesh
 # ==============================================================================
 
-mesh = Mesh.from_obj(Path(__file__).parent.parent.parent / "data" / "minimal_surface.obj")
+mesh = Mesh.from_off(Path(__file__).parent.parent.parent / "data" / "beetle.off")
 
 for vertex in mesh.vertices():
     x, y, z = mesh.vertex_attributes(vertex, "xyz")  # type: ignore
@@ -32,24 +35,51 @@
     "function": lambda u, v: [u * 1, v * 1, 0],
     "u_range": [-0.255, 1.33],
     "v_range": [-0.34, 1.33],
-    "u_num": 16,
-    "v_num": 10,
+    "u_num": 20,
+    "v_num": 20,
     "u_cyclic": False,
     "v_cyclic": False,
     "adaptor_class": ListAdaptor,
 }
-tessagon = HexTessagon(**options)
+tessagon = ZigZagTessagon(**options)
 tessagon_mesh = tessagon.create_mesh()
 pv = tessagon_mesh["vert_list"]
 pf = tessagon_mesh["face_list"]
 
 # ==============================================================================
 # Mapping: 3D Mesh, 2D Pattern, UV
+# mv - mapped vertices
+# mf - mapped faces
+# mn - mapped normals
+# mg - mapped boundaries (True or False)
+# mb - mapped groups for polygons with holes (list of int)
 # ==============================================================================
-
-mv, mf = map_mesh((v, f), (pv, pf))
+mv, mf, mn, mb, mg = map_mesh((v, f), (pv, pf))
 mesh_mapped = Mesh.from_vertices_and_faces(mv, mf)
 
+# ==============================================================================
+# Offset mesh by normals, normals are interpolated from the original mesh.
+# ==============================================================================
+mesh_mapped_offset = mesh_mapped.copy()
+for i in range(mesh_mapped.number_of_vertices()):   
+    mesh_mapped_offset.vertex_attributes(i, "xyz", mesh_mapped.vertex_attributes(i, "xyz") - mn[i]*0.001)
+
+# ==============================================================================
+# Get Boundary Polylines
+# ==============================================================================
+boundaries = []
+for i in range(len(mb)):
+    if not mb[i]:
+        continue
+    points = []
+    for j in range(len(mf[i])):
+        id = mf[i][j]
+        points.append(mesh_mapped.vertex_attributes(id, "xyz") + mn[id]*0.002)
+    points.append(points[0])
+    polyline = Polyline(points)
+    boundaries.append(polyline)
+
+
 # ==============================================================================
 # Viewer
 # ==============================================================================
@@ -59,15 +89,20 @@
 config.camera.position = [5, 2, 1.5]
 
 viewer = Viewer(config=config)
-viewer.scene.add(mesh, name="mesh", show_faces=False, linecolor=Color.grey(), opacity=0.2)
+# viewer.scene.add(mesh, name="mesh", show_faces=False, linecolor=Color.grey(), opacity=0.2)
 viewer.scene.add(Mesh.from_vertices_and_faces(pv, pf), name="pattern2d")
-viewer.scene.add(mesh_mapped, name="mesh_mapped", facecolor=Color.red())
+viewer.scene.add(mesh_mapped, name="mesh_mapped", facecolor=Color.pink())
+viewer.scene.add(mesh_mapped_offset, name="mesh_mapped", facecolor=Color.blue())
+for boundary in boundaries:
+    viewer.scene.add(boundary, name="boundary", linecolor=Color.yellow(), linewidth=3)
 
 # To see where the pattern is mapped:
 uv = trimesh_lsc_mapping((v, f))
 mesh_flattened = mesh.copy()
 for i in range(mesh.number_of_vertices()):
     mesh_flattened.vertex_attributes(i, "xyz", [uv[i][0], uv[i][1], 0])
 
+json_dump([Mesh.from_vertices_and_faces(pv, pf), mesh_mapped, mesh_mapped_offset, boundaries, mesh_flattened], "mesh_flattened.json")
+
 viewer.scene.add(mesh_flattened, name="mesh_flattened")
 viewer.show()