Skip to content

Commit 085cd89

Browse files
committed
fix(Triangle): deleting strict normal computation functions.
1 parent b23b89a commit 085cd89

File tree

2 files changed

+0
-52
lines changed

2 files changed

+0
-52
lines changed

include/geode/geometry/basic_objects/triangle.hpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,6 @@ namespace geode
6868
normal() const;
6969
template < index_t T = dimension >
7070
[[nodiscard]]
71-
typename std::enable_if< T == 3, std::optional< Vector3D > >::type
72-
strict_normal() const;
73-
template < index_t T = dimension >
74-
[[nodiscard]]
7571
typename std::enable_if< T == 3, std::optional< Plane > >::type
7672
plane() const;
7773
template < index_t T = dimension >
@@ -83,10 +79,6 @@ namespace geode
8379
typename std::enable_if< T == 3, std::optional< local_index_t > >::type
8480
pivot() const;
8581
template < index_t T = dimension >
86-
[[nodiscard]] typename std::enable_if< T == 3,
87-
std::optional< std::pair< local_index_t, Vector3D > > >::type
88-
strict_pivot_and_normal() const;
89-
template < index_t T = dimension >
9082
[[nodiscard]] typename std::enable_if< T == 3,
9183
std::optional< std::pair< local_index_t, Vector3D > > >::type
9284
pivot_and_normal() const;

src/geode/geometry/basic_objects/triangle.cpp

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -128,18 +128,6 @@ namespace geode
128128
return std::nullopt;
129129
}
130130

131-
template < typename PointType, index_t dimension >
132-
template < index_t T >
133-
typename std::enable_if< T == 3, std::optional< Vector3D > >::type
134-
GenericTriangle< PointType, dimension >::strict_normal() const
135-
{
136-
if( const auto result = strict_pivot_and_normal() )
137-
{
138-
return result->second;
139-
}
140-
return std::nullopt;
141-
}
142-
143131
template < typename PointType, index_t dimension >
144132
template < index_t T >
145133
typename std::enable_if< T == 3, std::optional< Plane > >::type
@@ -178,27 +166,6 @@ namespace geode
178166
return std::nullopt;
179167
}
180168

181-
template < typename PointType, index_t dimension >
182-
template < index_t T >
183-
typename std::enable_if< T == 3,
184-
std::optional< std::pair< local_index_t, Vector3D > > >::type
185-
GenericTriangle< PointType, dimension >::strict_pivot_and_normal() const
186-
{
187-
const auto result = simple_pivot_and_normal(
188-
{ vertices_[0], vertices_[1], vertices_[2] } );
189-
if( !result )
190-
{
191-
return std::nullopt;
192-
}
193-
if( result->pivot != NO_LID )
194-
{
195-
return std::optional< std::pair< local_index_t, Vector3D > >{
196-
std::make_pair( result->pivot, result->normal )
197-
};
198-
}
199-
return std::nullopt;
200-
}
201-
202169
template < typename PointType, index_t dimension >
203170
template < index_t T >
204171
typename std::enable_if< T == 3,
@@ -406,8 +373,6 @@ namespace geode
406373

407374
template opengeode_geometry_api std::optional< Vector3D >
408375
GenericTriangle< Point< 3 >, 3 >::normal< 3 >() const;
409-
template opengeode_geometry_api std::optional< Vector3D >
410-
GenericTriangle< Point< 3 >, 3 >::strict_normal< 3 >() const;
411376
template opengeode_geometry_api std::optional< Plane >
412377
GenericTriangle< Point< 3 >, 3 >::plane< 3 >() const;
413378
template opengeode_geometry_api std::optional< OwnerPlane >
@@ -417,14 +382,9 @@ namespace geode
417382
template opengeode_geometry_api
418383
std::optional< std::pair< local_index_t, Vector3D > >
419384
GenericTriangle< Point< 3 >, 3 >::pivot_and_normal< 3 >() const;
420-
template opengeode_geometry_api
421-
std::optional< std::pair< local_index_t, Vector3D > >
422-
GenericTriangle< Point< 3 >, 3 >::strict_pivot_and_normal< 3 >() const;
423385

424386
template opengeode_geometry_api std::optional< Vector3D >
425387
GenericTriangle< RefPoint< 3 >, 3 >::normal< 3 >() const;
426-
template opengeode_geometry_api std::optional< Vector3D >
427-
GenericTriangle< RefPoint< 3 >, 3 >::strict_normal< 3 >() const;
428388
template opengeode_geometry_api std::optional< Plane >
429389
GenericTriangle< RefPoint< 3 >, 3 >::plane< 3 >() const;
430390
template opengeode_geometry_api std::optional< OwnerPlane >
@@ -434,8 +394,4 @@ namespace geode
434394
template opengeode_geometry_api
435395
std::optional< std::pair< local_index_t, Vector3D > >
436396
GenericTriangle< RefPoint< 3 >, 3 >::pivot_and_normal< 3 >() const;
437-
template opengeode_geometry_api
438-
std::optional< std::pair< local_index_t, Vector3D > >
439-
GenericTriangle< RefPoint< 3 >, 3 >::strict_pivot_and_normal< 3 >()
440-
const;
441397
} // namespace geode

0 commit comments

Comments
 (0)