Merge pull request #1195 from Geode-solutions/fix/changing_triangle_flip_check_when_swaping_edge

fix(Triangle): deleting strict normal computation functions.

Author: BotellaA

include/geode/geometry/basic_objects/triangle.hpp

@@ -68,10 +68,6 @@ namespace geode
             normal() const;
         template < index_t T = dimension >
         [[nodiscard]]
-        typename std::enable_if< T == 3, std::optional< Vector3D > >::type
-            strict_normal() const;
-        template < index_t T = dimension >
-        [[nodiscard]]
         typename std::enable_if< T == 3, std::optional< Plane > >::type
             plane() const;
         template < index_t T = dimension >
@@ -83,10 +79,6 @@ namespace geode
         typename std::enable_if< T == 3, std::optional< local_index_t > >::type
             pivot() const;
         template < index_t T = dimension >
-        [[nodiscard]] typename std::enable_if< T == 3,
-            std::optional< std::pair< local_index_t, Vector3D > > >::type
-            strict_pivot_and_normal() const;
-        template < index_t T = dimension >
         [[nodiscard]] typename std::enable_if< T == 3,
             std::optional< std::pair< local_index_t, Vector3D > > >::type
             pivot_and_normal() const;

src/geode/geometry/basic_objects/triangle.cpp

@@ -128,18 +128,6 @@ namespace geode
         return std::nullopt;
     }
 
-    template < typename PointType, index_t dimension >
-    template < index_t T >
-    typename std::enable_if< T == 3, std::optional< Vector3D > >::type
-        GenericTriangle< PointType, dimension >::strict_normal() const
-    {
-        if( const auto result = strict_pivot_and_normal() )
-        {
-            return result->second;
-        }
-        return std::nullopt;
-    }
-
     template < typename PointType, index_t dimension >
     template < index_t T >
     typename std::enable_if< T == 3, std::optional< Plane > >::type
@@ -178,27 +166,6 @@ namespace geode
         return std::nullopt;
     }
 
-    template < typename PointType, index_t dimension >
-    template < index_t T >
-    typename std::enable_if< T == 3,
-        std::optional< std::pair< local_index_t, Vector3D > > >::type
-        GenericTriangle< PointType, dimension >::strict_pivot_and_normal() const
-    {
-        const auto result = simple_pivot_and_normal(
-            { vertices_[0], vertices_[1], vertices_[2] } );
-        if( !result )
-        {
-            return std::nullopt;
-        }
-        if( result->pivot != NO_LID )
-        {
-            return std::optional< std::pair< local_index_t, Vector3D > >{
-                std::make_pair( result->pivot, result->normal )
-            };
-        }
-        return std::nullopt;
-    }
-
     template < typename PointType, index_t dimension >
     template < index_t T >
     typename std::enable_if< T == 3,
@@ -406,8 +373,6 @@ namespace geode
 
     template opengeode_geometry_api std::optional< Vector3D >
         GenericTriangle< Point< 3 >, 3 >::normal< 3 >() const;
-    template opengeode_geometry_api std::optional< Vector3D >
-        GenericTriangle< Point< 3 >, 3 >::strict_normal< 3 >() const;
     template opengeode_geometry_api std::optional< Plane >
         GenericTriangle< Point< 3 >, 3 >::plane< 3 >() const;
     template opengeode_geometry_api std::optional< OwnerPlane >
@@ -417,14 +382,9 @@ namespace geode
     template opengeode_geometry_api
         std::optional< std::pair< local_index_t, Vector3D > >
         GenericTriangle< Point< 3 >, 3 >::pivot_and_normal< 3 >() const;
-    template opengeode_geometry_api
-        std::optional< std::pair< local_index_t, Vector3D > >
-        GenericTriangle< Point< 3 >, 3 >::strict_pivot_and_normal< 3 >() const;
 
     template opengeode_geometry_api std::optional< Vector3D >
         GenericTriangle< RefPoint< 3 >, 3 >::normal< 3 >() const;
-    template opengeode_geometry_api std::optional< Vector3D >
-        GenericTriangle< RefPoint< 3 >, 3 >::strict_normal< 3 >() const;
     template opengeode_geometry_api std::optional< Plane >
         GenericTriangle< RefPoint< 3 >, 3 >::plane< 3 >() const;
     template opengeode_geometry_api std::optional< OwnerPlane >
@@ -434,8 +394,4 @@ namespace geode
     template opengeode_geometry_api
         std::optional< std::pair< local_index_t, Vector3D > >
         GenericTriangle< RefPoint< 3 >, 3 >::pivot_and_normal< 3 >() const;
-    template opengeode_geometry_api
-        std::optional< std::pair< local_index_t, Vector3D > >
-        GenericTriangle< RefPoint< 3 >, 3 >::strict_pivot_and_normal< 3 >()
-            const;
 } // namespace geode