Merge branch 'main' into importlib_resources

g4edge · Oct 2, 2024 · 4a3783d · 4a3783d
2 parents c52f2ab + c746f0d
commit 4a3783d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/src/pyg4ometry/pycgal/Polygon_mesh_processing.cxx b/src/pyg4ometry/pycgal/Polygon_mesh_processing.cxx
@@ -36,11 +36,11 @@ typedef CGAL::Aff_transformation_3<Kernel_ECER> Aff_transformation_3_ECER;
 #include <CGAL/Polygon_mesh_processing/corefinement.h>
 #include <CGAL/Polygon_mesh_processing/distance.h>
 #include <CGAL/Polygon_mesh_processing/orientation.h>
-#include <CGAL/Polygon_mesh_processing/remesh.h>
+// #include <CGAL/Polygon_mesh_processing/remesh.h>
 #include <CGAL/Polygon_mesh_processing/transform.h>
 #include <CGAL/Polygon_mesh_processing/triangulate_faces.h>
 // #include <CGAL/Polygon_mesh_processing/angle_and_area_smoothing.h>
-#include <CGAL/Polygon_mesh_processing/smooth_mesh.h>
+// #include <CGAL/Polygon_mesh_processing/smooth_mesh.h>
 #include <CGAL/Polygon_mesh_processing/smooth_shape.h>
 
 PYBIND11_MODULE(Polygon_mesh_processing, m) {
@@ -92,13 +92,13 @@ PYBIND11_MODULE(Polygon_mesh_processing, m) {
   m.def("volume", [](Surface_mesh_EPICK &pm1) {
     return CGAL::to_double(CGAL::Polygon_mesh_processing::volume(pm1));
   });
-  m.def("isotropic_remeshing", [](Surface_mesh_EPICK &pm1,
-                                  double target_mesh_length, int nb_iter) {
-    return CGAL::Polygon_mesh_processing::isotropic_remeshing(
-        faces(pm1), target_mesh_length, pm1,
-        CGAL::parameters::number_of_iterations(nb_iter).protect_constraints(
-            true));
-  });
+  //  m.def("isotropic_remeshing", [](Surface_mesh_EPICK &pm1,
+  //                                  double target_mesh_length, int nb_iter) {
+  //    return CGAL::Polygon_mesh_processing::isotropic_remeshing(
+  //        faces(pm1), target_mesh_length, pm1,
+  //        CGAL::parameters::number_of_iterations(nb_iter).protect_constraints(
+  //            true));
+  //  });
   /*
   m.def("angle_and_area_smoothing", [](Surface_mesh_EPICK &pm1, int nb_iter) {
     return CGAL::Polygon_mesh_processing::angle_and_area_smoothing(pm1,
@@ -163,13 +163,13 @@ PYBIND11_MODULE(Polygon_mesh_processing, m) {
   m.def("volume", [](Surface_mesh_EPECK &pm1) {
     return CGAL::to_double(CGAL::Polygon_mesh_processing::volume(pm1));
   });
-  m.def("isotropic_remeshing", [](Surface_mesh_EPECK &pm1,
-                                  double target_mesh_length, int nb_iter) {
-    return CGAL::Polygon_mesh_processing::isotropic_remeshing(
-        faces(pm1), target_mesh_length, pm1,
-        CGAL::parameters::number_of_iterations(nb_iter).protect_constraints(
-            true));
-  });
+  //  m.def("isotropic_remeshing", [](Surface_mesh_EPECK &pm1,
+  //                                  double target_mesh_length, int nb_iter) {
+  //    return CGAL::Polygon_mesh_processing::isotropic_remeshing(
+  //        faces(pm1), target_mesh_length, pm1,
+  //        CGAL::parameters::number_of_iterations(nb_iter).protect_constraints(
+  //            true));
+  //  });
 
   /**********************************************************************
   ECER

diff --git a/src/pyg4ometry/visualisation/VtkViewerNew.py b/src/pyg4ometry/visualisation/VtkViewerNew.py
@@ -7,7 +7,8 @@
 from .VisualisationOptions import (
     getPredefinedMaterialVisOptions as _getPredefinedMaterialVisOptions,
 )
-from pyg4ometry.pycgal.Polygon_mesh_processing import isotropic_remeshing as _isotropic_remeshing
+
+# from pyg4ometry.pycgal.Polygon_mesh_processing import isotropic_remeshing as _isotropic_remeshing
 
 
 class VtkViewerNew(_ViewerBase):