fix(OpenGeode): update to new intersections

Author: BotellaA

src/geode/inspector/criterion/intersections/surface_intersections.cpp

@@ -37,34 +37,19 @@
 
 #include <geode/mesh/core/triangulated_surface.hpp>
 #include <geode/mesh/helpers/aabb_surface_helpers.hpp>
+#include <geode/mesh/helpers/detail/mesh_intersection_detection.hpp>
 
 namespace
 {
-    geode::local_index_t surface_vertex_position_to_index(
-        geode::POSITION position )
-    {
-        if( position == geode::POSITION::vertex0 )
-        {
-            return 0;
-        }
-        if( position == geode::POSITION::vertex1 )
-        {
-            return 1;
-        }
-        if( position == geode::POSITION::vertex2 )
-        {
-            return 2;
-        }
-        return geode::NO_LID;
-    }
-
     template < geode::index_t dimension >
-    class TriangleTriangleIntersectionBase
+    class TriangleTriangleIntersection
     {
     public:
-        TriangleTriangleIntersectionBase(
-            const geode::TriangulatedSurface< dimension >& mesh )
-            : mesh_( mesh )
+        TriangleTriangleIntersection(
+            const geode::TriangulatedSurface< dimension >& mesh,
+            bool stop_at_first_intersection )
+            : mesh_( mesh ),
+              stop_at_first_intersection_{ stop_at_first_intersection }
         {
         }
 
@@ -74,56 +59,6 @@ namespace
             return std::move( intersecting_triangles_ );
         }
 
-    protected:
-        void emplace( geode::index_t t1_id, geode::index_t t2_id )
-        {
-            intersecting_triangles_.emplace_back( t1_id, t2_id );
-        }
-
-        const geode::TriangulatedSurface< dimension >& mesh() const
-        {
-            return mesh_;
-        }
-
-        geode::PolygonVertices triangles_common_points(
-            const geode::PolygonVertices& t1_vertices,
-            const geode::PolygonVertices& t2_vertices ) const
-        {
-            geode::PolygonVertices common_points;
-            for( const auto vertex_id : t1_vertices )
-            {
-                if( absl::c_find( t2_vertices, vertex_id )
-                    != t2_vertices.end() )
-                {
-                    common_points.push_back( vertex_id );
-                }
-            }
-            return common_points;
-        }
-
-        bool triangles_intersect( geode::index_t t1_id,
-            geode::index_t t2_id,
-            const geode::PolygonVertices& t1_vertices,
-            const geode::PolygonVertices& t2_vertices,
-            const geode::PolygonVertices& common_points ) const;
-
-    private:
-        const geode::TriangulatedSurface< dimension >& mesh_;
-        std::vector< std::pair< geode::index_t, geode::index_t > >
-            intersecting_triangles_;
-    };
-
-    template < geode::index_t dimension >
-    class OneTriangleTriangleIntersection
-        : public TriangleTriangleIntersectionBase< dimension >
-    {
-    public:
-        OneTriangleTriangleIntersection(
-            const geode::TriangulatedSurface< dimension >& surface )
-            : TriangleTriangleIntersectionBase< dimension >( surface )
-        {
-        }
-
         bool operator()( geode::index_t t1_id, geode::index_t t2_id )
         {
             if( t1_id == t2_id )
@@ -132,225 +67,33 @@ namespace
             }
             const auto t1_vertices = this->mesh().polygon_vertices( t1_id );
             const auto t2_vertices = this->mesh().polygon_vertices( t2_id );
-            const auto common_points =
-                this->triangles_common_points( t1_vertices, t2_vertices );
-            if( common_points.size() == 3
-                || this->triangles_intersect(
-                    t1_id, t2_id, t1_vertices, t2_vertices, common_points ) )
+            if( geode::detail::polygons_intersection_detection<
+                    geode::SurfaceMesh< dimension > >(
+                    mesh_, t1_vertices, t2_vertices ) )
             {
                 this->emplace( t1_id, t2_id );
-                return true;
+                return stop_at_first_intersection_;
             }
             return false;
         }
-    };
-
-    template < geode::index_t dimension >
-    class AllTriangleTriangleIntersection
-        : public TriangleTriangleIntersectionBase< dimension >
-    {
-    public:
-        AllTriangleTriangleIntersection(
-            const geode::TriangulatedSurface< dimension >& surface )
-            : TriangleTriangleIntersectionBase< dimension >( surface )
-        {
-        }
 
-        bool operator()( geode::index_t t1_id, geode::index_t t2_id )
-        {
-            if( t1_id == t2_id )
-            {
-                return false;
-            }
-            const auto t1_vertices = this->mesh().polygon_vertices( t1_id );
-            const auto t2_vertices = this->mesh().polygon_vertices( t2_id );
-            const auto common_points =
-                this->triangles_common_points( t1_vertices, t2_vertices );
-            if( common_points.size() == 3
-                || this->triangles_intersect(
-                    t1_id, t2_id, t1_vertices, t2_vertices, common_points ) )
-            {
-                this->emplace( t1_id, t2_id );
-            }
-            return false;
-        }
-    };
-
-    geode::index_t third_point_index( const geode::PolygonVertices& vertices,
-        const geode::PolygonVertices& vertices_to_avoid )
-    {
-        for( const auto vertex_id : vertices )
-        {
-            if( vertex_id == vertices_to_avoid[0]
-                || vertex_id == vertices_to_avoid[1] )
-            {
-                continue;
-            }
-            return vertex_id;
-        }
-        OPENGEODE_ASSERT_NOT_REACHED( "Should have found a third point index" );
-        return geode::NO_ID;
-    }
-
-    template <>
-    bool TriangleTriangleIntersectionBase< 2 >::triangles_intersect(
-        geode::index_t t1_id,
-        geode::index_t t2_id,
-        const geode::PolygonVertices& t1_vertices,
-        const geode::PolygonVertices& t2_vertices,
-        const geode::PolygonVertices& common_points ) const
-    {
-        if( common_points.size() == 2 )
-        {
-            const auto& common_pt0 = mesh_.point( common_points[0] );
-            const auto& common_pt1 = mesh_.point( common_points[1] );
-            const auto& t1_third_pt =
-                mesh_.point( third_point_index( t1_vertices, common_points ) );
-            const auto& t2_third_pt =
-                mesh_.point( third_point_index( t2_vertices, common_points ) );
-            if( geode::segment_segment_intersection_detection(
-                    { common_pt0, t1_third_pt }, { common_pt1, t2_third_pt } )
-                        .first
-                    != geode::POSITION::outside
-                || geode::segment_segment_intersection_detection(
-                       { common_pt1, t1_third_pt },
-                       { common_pt0, t2_third_pt } )
-                           .first
-                       != geode::POSITION::outside )
-            {
-                return true;
-            }
-            const auto t1 = mesh_.triangle( t1_id );
-            const auto t2 = mesh_.triangle( t2_id );
-            if( geode::point_triangle_position( t1_third_pt, t2 )
-                    != geode::POSITION::outside
-                || geode::point_triangle_position( t2_third_pt, t1 )
-                       != geode::POSITION::outside )
-            {
-                return true;
-            }
-            return false;
-        }
-        for( const auto t1_edge_v : geode::LRange{ 3 } )
+    protected:
+        void emplace( geode::index_t t1_id, geode::index_t t2_id )
         {
-            const std::array< geode::index_t, 2 > edge1_vertices{
-                t1_vertices[t1_edge_v],
-                t1_vertices[t1_edge_v == 2 ? 0 : t1_edge_v + 1]
-            };
-            const geode::Segment2D t1_edge{ mesh_.point( edge1_vertices[0] ),
-                mesh_.point( edge1_vertices[1] ) };
-            for( const auto t2_edge_v : geode::LRange{ 3 } )
-            {
-                const std::array< geode::index_t, 2 > edge2_vertices{
-                    t2_vertices[t2_edge_v],
-                    t2_vertices[t2_edge_v == 2 ? 0 : t2_edge_v + 1]
-                };
-                const auto edge_edge_inter =
-                    geode::segment_segment_intersection_detection(
-                        t1_edge, { mesh_.point( edge2_vertices[0] ),
-                                     mesh_.point( edge2_vertices[1] ) } );
-                if( edge_edge_inter.first == geode::POSITION::outside
-                    || edge_edge_inter.first == geode::POSITION::parallel )
-                {
-                    continue;
-                }
-                if( common_points.size() != 1 )
-                {
-                    return true;
-                }
-                const auto t1_edge_inter_pt_id =
-                    surface_vertex_position_to_index( edge_edge_inter.first );
-                const auto t2_edge_inter_pt_id =
-                    surface_vertex_position_to_index( edge_edge_inter.second );
-                if( t1_edge_inter_pt_id == geode::NO_LID
-                    || t2_edge_inter_pt_id == geode::NO_LID )
-                {
-                    return true;
-                }
-                if( edge1_vertices[t1_edge_inter_pt_id]
-                        != edge2_vertices[t2_edge_inter_pt_id]
-                    || edge1_vertices[t1_edge_inter_pt_id] != common_points[0] )
-                {
-                    return true;
-                }
-            }
+            intersecting_triangles_.emplace_back( t1_id, t2_id );
         }
-        return false;
-    }
 
-    bool triangle_intersects_other( const geode::Triangle3D& t1,
-        const geode::Triangle3D& t2,
-        const geode::PolygonVertices& t1_vertices,
-        const geode::PolygonVertices& t2_vertices,
-        const geode::PolygonVertices& common_points )
-    {
-        for( const auto v_id : geode::LRange{ 3 } )
+        const geode::TriangulatedSurface< dimension >& mesh() const
         {
-            const auto v2_id = v_id == 2 ? 0 : v_id + 1;
-            const auto intersection = segment_triangle_intersection_detection(
-                { t1.vertices()[v_id], t1.vertices()[v2_id] }, t2 );
-            if( intersection.first != geode::POSITION::outside )
-            {
-                if( common_points.size() != 1 )
-                {
-                    return true;
-                }
-                const auto edge_inter_pt_id =
-                    surface_vertex_position_to_index( intersection.first );
-                const auto t2_inter_pt_id =
-                    surface_vertex_position_to_index( intersection.second );
-                if( edge_inter_pt_id == geode::NO_LID
-                    || t2_inter_pt_id == geode::NO_LID )
-                {
-                    return true;
-                }
-                if( t1_vertices[edge_inter_pt_id == 0 ? v_id : v2_id]
-                        != t2_vertices[t2_inter_pt_id]
-                    || t2_vertices[t2_inter_pt_id] != common_points[0] )
-                {
-                    return true;
-                }
-            }
+            return mesh_;
         }
-        return false;
-    }
 
-    template <>
-    bool TriangleTriangleIntersectionBase< 3 >::triangles_intersect(
-        geode::index_t t1_id,
-        geode::index_t t2_id,
-        const geode::PolygonVertices& t1_vertices,
-        const geode::PolygonVertices& t2_vertices,
-        const geode::PolygonVertices& common_points ) const
-    {
-        const auto t2 = mesh_.triangle( t2_id );
-        if( common_points.size() == 2 )
-        {
-            const auto& t1_third_pt =
-                mesh_.point( third_point_index( t1_vertices, common_points ) );
-            if( geode::segment_triangle_intersection_detection(
-                    { mesh_.point( common_points[0] ), t1_third_pt }, t2 )
-                        .first
-                    == geode::POSITION::parallel
-                || geode::segment_triangle_intersection_detection(
-                       { mesh_.point( common_points[1] ), t1_third_pt }, t2 )
-                           .first
-                       == geode::POSITION::parallel )
-            {
-                return true;
-            }
-            return false;
-        }
-        const auto t1 = mesh_.triangle( t1_id );
-        if( triangle_intersects_other(
-                t1, t2, t1_vertices, t2_vertices, common_points )
-            || triangle_intersects_other(
-                t2, t1, t2_vertices, t1_vertices, common_points ) )
-        {
-            return true;
-        }
-        return false;
-    }
+    private:
+        const geode::TriangulatedSurface< dimension >& mesh_;
+        bool stop_at_first_intersection_;
+        std::vector< std::pair< geode::index_t, geode::index_t > >
+            intersecting_triangles_;
+    };
 } // namespace
 
 namespace geode
@@ -366,8 +109,7 @@ namespace geode
 
         bool mesh_has_self_intersections() const
         {
-            const auto intersections = intersecting_triangles<
-                OneTriangleTriangleIntersection< dimension > >();
+            const auto intersections = intersecting_triangles( true );
             if( intersections.empty() )
             {
                 return false;
@@ -378,8 +120,7 @@ namespace geode
         InspectionIssues< std::pair< index_t, index_t > >
             intersecting_elements() const
         {
-            const auto intersections = intersecting_triangles<
-                AllTriangleTriangleIntersection< dimension > >();
+            const auto intersections = intersecting_triangles( false );
             InspectionIssues< std::pair< index_t, index_t > > issues{
                 "Triangle - triangle intersections."
             };
@@ -394,12 +135,12 @@ namespace geode
         }
 
     private:
-        template < typename Action >
-        std::vector< std::pair< index_t, index_t > >
-            intersecting_triangles() const
+        std::vector< std::pair< index_t, index_t > > intersecting_triangles(
+            bool stop_at_first_intersection ) const
         {
             const auto surface_aabb = create_aabb_tree( mesh_ );
-            Action action{ mesh_ };
+            TriangleTriangleIntersection< dimension > action{ mesh_,
+                stop_at_first_intersection };
             surface_aabb.compute_self_element_bbox_intersections( action );
             return action.intersecting_triangles();
         }