songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

empty() -> is_empty()

This commit is contained in:
Sébastien Loriot 2020-12-03 18:55:05 +01:00
parent 698eca8698
commit 294b9cf1e3
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair_self_intersections.h
View File

@ -504,7 +504,7 @@ bool remove_self_intersections_with_smoothing(std::set<typename boost::graph_tra
return false; return false;
} }
#ifndef CGAL_PMP_REMOVE_SELF_INTERSECTION_NO_POLYHEDRAL_ENVELOPE_CHECK #ifndef CGAL_PMP_REMOVE_SELF_INTERSECTION_NO_POLYHEDRAL_ENVELOPE_CHECK
if (!cc_envelope.empty() && !cc_envelope(local_mesh)) if (!cc_envelope.is_empty() && !cc_envelope(local_mesh))
{ {
#ifdef CGAL_PMP_REMOVE_SELF_INTERSECTION_DEBUG #ifdef CGAL_PMP_REMOVE_SELF_INTERSECTION_DEBUG
std::cout << " DEBUG: patch is not in the input polyhedral envelope\n"; std::cout << " DEBUG: patch is not in the input polyhedral envelope\n";
@ -1093,7 +1093,7 @@ bool fill_hole(std::vector<typename boost::graph_traits<TriangleMesh>::halfedge_
} }
#ifndef CGAL_PMP_REMOVE_SELF_INTERSECTION_NO_POLYHEDRAL_ENVELOPE_CHECK #ifndef CGAL_PMP_REMOVE_SELF_INTERSECTION_NO_POLYHEDRAL_ENVELOPE_CHECK
if (!cc_envelope.empty() && !cc_envelope(patch)) if (!cc_envelope.is_empty() && !cc_envelope(patch))
{ {
#ifdef CGAL_PMP_REMOVE_SELF_INTERSECTION_DEBUG #ifdef CGAL_PMP_REMOVE_SELF_INTERSECTION_DEBUG
std::cout << " DEBUG: Patch is not inside the input polyhedral envelope\n"; std::cout << " DEBUG: Patch is not inside the input polyhedral envelope\n";
@ -1266,7 +1266,7 @@ bool fill_hole_with_constraints(std::vector<typename boost::graph_traits<Triangl
#ifndef CGAL_PMP_REMOVE_SELF_INTERSECTION_NO_POLYHEDRAL_ENVELOPE_CHECK #ifndef CGAL_PMP_REMOVE_SELF_INTERSECTION_NO_POLYHEDRAL_ENVELOPE_CHECK
// check if the patch is inside the input polyhedral envelope // check if the patch is inside the input polyhedral envelope
if(!cc_envelope.empty() && !cc_envelope(patch)) if(!cc_envelope.is_empty() && !cc_envelope(patch))
{ {
#ifdef CGAL_PMP_REMOVE_SELF_INTERSECTION_DEBUG #ifdef CGAL_PMP_REMOVE_SELF_INTERSECTION_DEBUG
std::cout << "Patch is not entirely inside the input polyhedral envelope, use base fill_hole" << std::endl; std::cout << "Patch is not entirely inside the input polyhedral envelope, use base fill_hole" << std::endl;
@ -1989,6 +1989,7 @@ bool remove_self_intersections(const FaceRange& face_range,
std::cout << "\tmax_steps: " << max_steps << std::endl; std::cout << "\tmax_steps: " << max_steps << std::endl;
std::cout << "\tstrong_dihedral_angle: " << strong_dihedral_angle << std::endl; std::cout << "\tstrong_dihedral_angle: " << strong_dihedral_angle << std::endl;
std::cout << "\tweak_dihedral_angle: " << weak_dihedral_angle << std::endl; std::cout << "\tweak_dihedral_angle: " << weak_dihedral_angle << std::endl;
std::cout << "\tcontainment_epsilon: " << containment_epsilon << std::endl;
#endif #endif
if(!preserve_genus) if(!preserve_genus)

2
Polygon_mesh_processing/include/CGAL/Polyhedral_envelope.h
View File

@ -2209,7 +2209,7 @@ public:
/// @} /// @}
/// returns `true` if the polyhedral envelope is empty and `false` otherwise. /// returns `true` if the polyhedral envelope is empty and `false` otherwise.
bool empty() const bool is_empty() const
{ {
return env_faces.empty(); return env_faces.empty();
} }