CLEANUP

Author: petrasvestartas

CMakeLists.txt

@@ -171,4 +171,4 @@ add_nanobind_module(_isolines src/isolines.cpp)
 add_nanobind_module(_massmatrix src/massmatrix.cpp)
 add_nanobind_module(_meshing src/meshing.cpp)
 add_nanobind_module(_parametrisation src/parametrisation.cpp)
-add_nanobind_module(_planarize src/planarize.cpp)
+add_nanobind_module(_planarize src/planarize.cpp)

docs/devguide/cmake_configuration.rst

@@ -9,7 +9,7 @@ Core Settings
 
 .. code-block:: cmake
 
-    set(CMAKE_CXX_STANDARD 17)
+    set(CMAKE_CXX_STANDARD 20)
     set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 External Dependencies

docs/examples/example_curvature_gaussian.rst

@@ -1,5 +1,6 @@
 import compas
 import compas_libigl as igl
+import numpy as np
 from compas.colors import ColorMap
 from compas.datastructures import Mesh
 from compas_viewer import Viewer
@@ -18,23 +19,25 @@
 # ==============================================================================
 
 mass = igl.trimesh_massmatrix(trimesh.to_vertices_and_faces())
+# Convert sparse diagonal to dense array
+mass_diag = np.array(mass.diagonal())
 
 # ==============================================================================
 # Visualisation
 # ==============================================================================
 
 cmap = ColorMap.from_rgb()
 
-minval = min(mass)
-maxval = max(mass)
+minval = mass_diag.min()
+maxval = mass_diag.max()
 
 viewer = Viewer(width=1600, height=900)
 # viewer.view.camera.position = [1, -6, 2]
 # viewer.view.camera.look_at([1, 1, 1])
 
 viewer.scene.add(mesh, show_points=False)
 
-for m, vertex in zip(mass, mesh.vertices()):
+for m, vertex in zip(mass_diag, mesh.vertices()):
     point = mesh.vertex_point(vertex)
     viewer.scene.add(point, pointsize=30, pointcolor=cmap(m, minval, maxval))
 

docs/examples/example_massmatrix.py

@@ -8,3 +8,4 @@ ruff
 sphinx_compas2_theme
 twine
 wheel
+line_profiler

requirements-dev.txt

@@ -1,6 +1,6 @@
 #include "boundaries.hpp"
 
-std::vector<std::vector<int>> trimesh_boundaries(const compas::RowMatrixXi& F) {
+std::vector<std::vector<int>> trimesh_boundaries( Eigen::Ref<const compas::RowMatrixXi> F) {
     std::vector<std::vector<int>> L;
     igl::boundary_loop(F, L);
     return L;

src/boundaries.cpp

@@ -11,5 +11,4 @@
  *
  * @note The input mesh should be manifold for correct results.
  */
-std::vector<std::vector<int>> trimesh_boundaries(
-    const compas::RowMatrixXi& F);
+ std::vector<std::vector<int>> trimesh_boundaries(Eigen::Ref<const compas::RowMatrixXi> F);

src/boundaries.hpp

@@ -12,7 +12,7 @@ def trimesh_boundaries(M):
 
     Parameters
     ----------
-    M : tuple[:class:`list`, :class:`list`]
+    M : tuple[list[list[float]], list[list[int]]]
         A mesh represented by a list of vertices and a list of faces.
         The vertices should be 3D points, and faces should be triangles.
 

src/compas_libigl/boundaries.py

@@ -11,7 +11,7 @@ def trimesh_gaussian_curvature(M):
 
     Parameters
     ----------
-    M : tuple[:class:`list`, :class:`list`]
+    M : tuple[list[list[float]], list[list[int]]]
         A mesh represented by a list of vertices and a list of faces.
         The vertices should be 3D points, and faces should be triangles.
 
@@ -36,7 +36,7 @@ def trimesh_principal_curvature(M):
 
     Parameters
     ----------
-    M : tuple[:class:`list`, :class:`list`]
+    M : tuple[list[list[float]], list[list[int]]]
         A mesh represented by a list of vertices and a list of faces.
         The vertices should be 3D points, and faces should be triangles.
 

src/compas_libigl/curvature.py

@@ -38,11 +38,9 @@ def trimesh_geodistance(M, source, method="exact"):
     V, F = M
     V = np.asarray(V, dtype=np.float64)
     F = np.asarray(F, dtype=np.int32)
-    if method == "exact":
-        return _geodistance.trimesh_geodistance_exact(V, F, source)
-    if method == "heat":
-        return _geodistance.trimesh_geodistance_heat(V, F, source)
-    raise NotImplementedError
+    # Extract single integer from source array if needed
+    source = int(source)  # Ensure it's a scalar
+    return _geodistance.trimesh_geodistance(V, F, source, method)
 
 
 @plugin(category="trimesh")
@@ -80,8 +78,4 @@ def trimesh_geodistance_multiple(M, sources, method="exact"):
     V = np.asarray(V, dtype=np.float64)
     F = np.asarray(F, dtype=np.int32)
     sources = np.asarray(sources, dtype=np.int32)
-    if method == "exact":
-        return _geodistance.trimesh_geodistance_exact_multiple(V, F, sources)
-    if method == "heat":
-        return _geodistance.trimesh_geodistance_heat_multiple(V, F, sources)
-    raise NotImplementedError
+    return _geodistance.trimesh_geodistance_multiple(V, F, sources, method)