Merge pull request #115 from Geode-solutions/fix/update_surface_intersections_for_polygons

fix(SurfaceIntersections): Updated code by generalizing surface inter…

Author: MelchiorSchuh

bindings/python/src/inspector/criterion/intersections/surface_intersections.hpp

@@ -22,7 +22,7 @@
  */
 #include <absl/strings/str_cat.h>
 
-#include <geode/mesh/core/triangulated_surface.hpp>
+#include <geode/mesh/core/surface_mesh.hpp>
 
 #include <geode/inspector/criterion/intersections/surface_intersections.hpp>
 
@@ -31,18 +31,16 @@ namespace geode
     template < index_t dimension >
     void do_define_surface_intersections( pybind11::module& module )
     {
-        using TriangulatedSurface = TriangulatedSurface< dimension >;
-        using TriangulatedSurfaceIntersections =
-            TriangulatedSurfaceIntersections< dimension >;
+        using SurfaceMesh = SurfaceMesh< dimension >;
+        using SurfaceMeshIntersections = SurfaceMeshIntersections< dimension >;
         const auto name =
-            absl::StrCat( "TriangulatedSurfaceIntersections", dimension, "D" );
-        pybind11::class_< TriangulatedSurfaceIntersections >(
-            module, name.c_str() )
-            .def( pybind11::init< const TriangulatedSurface& >() )
+            absl::StrCat( "SurfaceMeshIntersections", dimension, "D" );
+        pybind11::class_< SurfaceMeshIntersections >( module, name.c_str() )
+            .def( pybind11::init< const SurfaceMesh& >() )
             .def( "mesh_has_self_intersections",
-                &TriangulatedSurfaceIntersections::mesh_has_self_intersections )
+                &SurfaceMeshIntersections::mesh_has_self_intersections )
             .def( "intersecting_elements",
-                &TriangulatedSurfaceIntersections::intersecting_elements );
+                &SurfaceMeshIntersections::intersecting_elements );
     }
     void define_surface_intersections( pybind11::module& module )
     {

bindings/python/src/inspector/surface_inspector.hpp

@@ -33,44 +33,25 @@ namespace geode
     {
         using SurfaceMesh = SurfaceMesh< dimension >;
         using SurfaceMeshInspector = SurfaceMeshInspector< dimension >;
-        using TriangulatedSurface = TriangulatedSurface< dimension >;
-        using TriangulatedSurfaceInspector =
-            TriangulatedSurfaceInspector< dimension >;
         const auto name =
             absl::StrCat( "SurfaceMeshInspector", dimension, "D" );
         pybind11::class_< SurfaceMeshInspector,
             SurfaceMeshAdjacency< dimension >,
             SurfaceMeshColocation< dimension >,
             SurfaceMeshDegeneration< dimension >,
             SurfaceMeshEdgeManifold< dimension >,
-            SurfaceMeshVertexManifold< dimension > >( module, name.c_str() )
+            SurfaceMeshVertexManifold< dimension >,
+            SurfaceMeshIntersections< dimension > >( module, name.c_str() )
             .def( pybind11::init< const SurfaceMesh& >() )
             .def( "inspect_surface", &SurfaceMeshInspector::inspect_surface );
 
-        const auto trgl_name =
-            absl::StrCat( "TriangulatedSurfaceInspector", dimension, "D" );
-        pybind11::class_< TriangulatedSurfaceInspector, SurfaceMeshInspector,
-            TriangulatedSurfaceIntersections< dimension > >(
-            module, trgl_name.c_str() )
-            .def( pybind11::init< const TriangulatedSurface& >() )
-            .def( "inspect_surface",
-                &TriangulatedSurfaceInspector::inspect_surface );
-
         const auto inspect_function_name =
             absl::StrCat( "inspect_surface", dimension, "D" );
         module.def(
             inspect_function_name.c_str(), []( const SurfaceMesh& surface ) {
                 SurfaceMeshInspector inspector{ surface };
                 return inspector.inspect_surface();
             } );
-
-        const auto inspect_function_name2 =
-            absl::StrCat( "inspect_triangulated_surface", dimension, "D" );
-        module.def( inspect_function_name2.c_str(),
-            []( const TriangulatedSurface& surface ) {
-                TriangulatedSurfaceInspector inspector{ surface };
-                return inspector.inspect_surface();
-            } );
     }
 
     void define_surface_inspector( pybind11::module& module )

bindings/python/tests/test-py-surface-intersections.py

@@ -47,7 +47,7 @@ def check_intersections2D():
     builder.set_polygon_adjacent(geode.PolygonEdge(1, 1), 2)
     builder.set_polygon_adjacent(geode.PolygonEdge(2, 0), 1)
 
-    intersections_inspector = inspector.TriangulatedSurfaceIntersections2D(
+    intersections_inspector = inspector.SurfaceMeshIntersections2D(
         surface)
     if not intersections_inspector.mesh_has_self_intersections():
         raise ValueError("[Test] 2D Surface should have intersections.")
@@ -83,7 +83,7 @@ def check_intersections3D():
     builder.set_polygon_adjacent(geode.PolygonEdge(2, 1), 3)
     builder.set_polygon_adjacent(geode.PolygonEdge(3, 0), 2)
 
-    intersections_inspector = inspector.TriangulatedSurfaceIntersections3D(
+    intersections_inspector = inspector.SurfaceMeshIntersections3D(
         surface)
     if not intersections_inspector.mesh_has_self_intersections():
         raise ValueError("[Test] 3D Surface should have intersections.")

include/geode/inspector/criterion/intersections/surface_intersections.hpp

@@ -32,24 +32,24 @@
 
 namespace geode
 {
-    FORWARD_DECLARATION_DIMENSION_CLASS( TriangulatedSurface );
+    FORWARD_DECLARATION_DIMENSION_CLASS( SurfaceMesh );
 } // namespace geode
 
 namespace geode
 {
     /*!
-     * Class for inspecting the intersections of TriangulatedSurfaces
+     * Class for inspecting the intersections of SurfaceMeshes
      */
     template < index_t dimension >
-    class TriangulatedSurfaceIntersections
+    class SurfaceMeshIntersections
     {
-        OPENGEODE_DISABLE_COPY( TriangulatedSurfaceIntersections );
+        OPENGEODE_DISABLE_COPY( SurfaceMeshIntersections );
 
     public:
-        explicit TriangulatedSurfaceIntersections(
-            const TriangulatedSurface< dimension >& mesh );
+        explicit SurfaceMeshIntersections(
+            const SurfaceMesh< dimension >& mesh );
 
-        ~TriangulatedSurfaceIntersections();
+        ~SurfaceMeshIntersections();
 
         [[nodiscard]] bool mesh_has_self_intersections() const;
 
@@ -59,5 +59,5 @@ namespace geode
     private:
         IMPLEMENTATION_MEMBER( impl_ );
     };
-    ALIAS_2D_AND_3D( TriangulatedSurfaceIntersections );
+    ALIAS_2D_AND_3D( SurfaceMeshIntersections );
 } // namespace geode

include/geode/inspector/surface_inspector.hpp

@@ -76,7 +76,8 @@ namespace geode
                                      SurfaceMeshColocation< dimension >,
                                      SurfaceMeshDegeneration< dimension >,
                                      SurfaceMeshEdgeManifold< dimension >,
-                                     SurfaceMeshVertexManifold< dimension > >
+                                     SurfaceMeshVertexManifold< dimension >,
+                                     SurfaceMeshIntersections< dimension > >
     {
         OPENGEODE_DISABLE_COPY( SurfaceMeshInspector );
 
@@ -88,23 +89,4 @@ namespace geode
         [[nodiscard]] virtual SurfaceInspectionResult inspect_surface() const;
     };
     ALIAS_2D_AND_3D( SurfaceMeshInspector );
-
-    /*!
-     * Class for inspecting a TriangulatedSurface
-     * @extends SurfaceMeshInspector
-     * @extends TriangulatedSurfaceIntersections
-     */
-    template < index_t dimension >
-    class TriangulatedSurfaceInspector
-        : public SurfaceMeshInspector< dimension >,
-          public AddInspectors< TriangulatedSurface< dimension >,
-              TriangulatedSurfaceIntersections< dimension > >
-    {
-    public:
-        explicit TriangulatedSurfaceInspector(
-            const TriangulatedSurface< dimension >& mesh );
-
-        [[nodiscard]] SurfaceInspectionResult inspect_surface() const final;
-    };
-    ALIAS_2D_AND_3D( TriangulatedSurfaceInspector );
 } // namespace geode