Merge remote-tracking branch 'origin/main'

Author: tomvanmele

CHANGELOG.md

@@ -22,6 +22,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 
+* Removed all the types_std imports from the code. Instead type casters are used: https://nanobind.readthedocs.io/en/latest/exchanging.html .
+
 
 ## [0.7.1] 2025-06-24
 

CMakeLists.txt

@@ -150,15 +150,14 @@ function(add_nanobind_module module_name source_file)
 endfunction()
 
 # === Add your modules ===
-add_nanobind_module(_nanobind src/nanobind.cpp)
-add_nanobind_module(_types_std src/types_std.cpp)
 add_nanobind_module(_boundaries src/boundaries.cpp)
 add_nanobind_module(_curvature src/curvature.cpp)
 add_nanobind_module(_geodistance src/geodistance.cpp)
 add_nanobind_module(_intersections src/intersections.cpp)
 add_nanobind_module(_isolines src/isolines.cpp)
-add_nanobind_module(_massmatrix src/massmatrix.cpp)
+add_nanobind_module(_mapping src/mapping.cpp)
 add_nanobind_module(_meshing src/meshing.cpp)
+add_nanobind_module(_massmatrix src/massmatrix.cpp)
 add_nanobind_module(_parametrisation src/parametrisation.cpp)
 add_nanobind_module(_planarize src/planarize.cpp)
-add_nanobind_module(_mapping src/mapping.cpp)
+

mesh_flattened.json

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

src/boundaries.cpp

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

src/boundaries.hpp

@@ -11,21 +11,46 @@
 #include <cmath>
 #include <iostream>
 #include <limits>
-#include <iostream>
+#include <unordered_map>
+#include <tuple>
+#include <iomanip>
 
 // Nanobind includes
 #include <nanobind/nanobind.h>
 #include <nanobind/eigen/dense.h>
 #include <nanobind/eigen/sparse.h>
 #include <nanobind/stl/tuple.h>
-#include <nanobind/stl/bind_vector.h>
+#include <nanobind/stl/vector.h>
 #include <nanobind/stl/string.h>
 
+namespace nb = nanobind;
+
+using namespace nb::literals;
+
+// Nanobind type casters: https://nanobind.readthedocs.io/en/latest/exchanging.html
+
 namespace compas {
+    // Basic Eigen types with clear naming
     using RowMatrixXd = Eigen::Matrix<double, Eigen::Dynamic, Eigen::Dynamic, Eigen::RowMajor>;
     using RowMatrixXi = Eigen::Matrix<int, Eigen::Dynamic, Eigen::Dynamic, Eigen::RowMajor>;
-}
-
-namespace nb = nanobind;
-
-using namespace nb::literals;
+    using VectorXi = Eigen::VectorXi;
+    using VectorXd = Eigen::VectorXd;
+    
+    // STL containers with descriptive names
+    using VectorInt = std::vector<int>;
+    using VectorFloat = std::vector<float>;
+    using VectorBool = std::vector<bool>;
+    using VectorVectorInt = std::vector<VectorInt>;
+    
+    // Complex types with descriptive names
+    using TupleIntFloatFloatFloat = std::tuple<int, float, float, float>;  // face_id, u, v, t
+    using VectorTupleIntFloatFloatFloat = std::vector<TupleIntFloatFloatFloat>;
+    using VectorVectorTupleIntFloatFloatFloat = std::vector<VectorTupleIntFloatFloatFloat>;
+    
+    // Tuple types with descriptive names
+    using IsolinesResult = std::tuple<RowMatrixXd, RowMatrixXi, RowMatrixXi>;  // vertices, edges, indices
+    using RemeshIsolineResult = std::tuple<RowMatrixXd, RowMatrixXi, VectorXi>;  // vertices, faces, labels
+    using RemeshIsolinesResult = std::tuple<RowMatrixXd, RowMatrixXi, VectorXd, VectorXi>;  // vertices, faces, scalar_values, face_groups
+    using PrincipalCurvatureResult = std::tuple<RowMatrixXd, RowMatrixXd, VectorXd, VectorXd>;  // PD1, PD2, PV1, PV2
+    using MeshMapResult = std::tuple<RowMatrixXd, VectorVectorInt, RowMatrixXd, VectorBool, VectorInt>;  // pattern_vertices, pattern_faces, pattern_normals, is_boundary, groups
+}

src/compas.hpp

@@ -1,7 +1,6 @@
 import numpy as np
 
 from compas_libigl import _boundaries
-from compas_libigl import _types_std  # noqa: F401
 
 
 def trimesh_boundaries(M):
@@ -29,5 +28,5 @@ def trimesh_boundaries(M):
     """
     V, F = M
     F = np.asarray(F, dtype=np.int32)
-    result: _types_std.VectorVectorInt = _boundaries.trimesh_boundaries(F)
+    result = _boundaries.trimesh_boundaries(F)
     return [list(loop) for loop in result]

src/compas_libigl/boundaries.py

@@ -2,7 +2,6 @@
 from compas.plugins import plugin
 
 from compas_libigl import _intersections
-from compas_libigl import _types_std  # noqa: F401
 
 
 @plugin(category="intersections")

src/compas_libigl/intersections.py

@@ -21,7 +21,6 @@
 from tessagon.types.zig_zag_tessagon import ZigZagTessagon
 
 from compas_libigl import _mapping  # type: ignore
-from compas_libigl import _types_std  # noqa: F401
 
 TESSAGON_TYPES = {
     "Hex": HexTessagon,
@@ -90,15 +89,15 @@ def map_mesh(target_mesh, pattern_mesh, clip_boundaries=True, simplify_borders=T
 
     # Handle fixed_vertices - provide empty array if None
 
-    fixed_vertices_vectorint = _types_std.VectorInt()
+    fixed_vertices_vectorint = []
     if fixed_vertices is None:
-        fixed_vertices_vectorint = _types_std.VectorInt()
+        fixed_vertices_vectorint = []
     else:
-        fixed_vertices_vectorint = _types_std.VectorInt(fixed_vertices)
+        fixed_vertices_vectorint = fixed_vertices
 
     # Convert pattern_f from Python list to VectorVectorInt which is expected by C++ code
 
-    pattern_f_vec = _types_std.VectorVectorInt()
+    pattern_f_vec = []
     for face in pf:
         pattern_f_vec.append(face)
 

src/compas_libigl/mapping.py

@@ -2,7 +2,6 @@
 from compas.plugins import plugin
 
 from compas_libigl import _parametrisation
-from compas_libigl import _types_std  # noqa: F401
 
 
 @plugin(category="trimesh")