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

Merge pull request #6502 from sloriot/PMP-silent_smoothing 

prevent remove_self_intersections from emitting a warning
This commit is contained in:
Laurent Rineau 2022-04-27 16:31:56 +02:00
parent b62bf2d887 ec53e0a8dd
commit 7539f02be8
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/angle_and_area_smoothing.h
View File

@ -189,13 +189,19 @@ void angle_and_area_smoothing(const FaceRange& faces,
bool use_area_smoothing = choose_parameter(get_parameter(np, internal_np::use_area_smoothing), true); bool use_area_smoothing = choose_parameter(get_parameter(np, internal_np::use_area_smoothing), true);
#ifndef CGAL_PMP_USE_CERES_SOLVER #ifndef CGAL_PMP_USE_CERES_SOLVER
std::cerr << "Area-based smoothing requires the Ceres Library, which is not available." << std::endl; if (use_area_smoothing)
std::cerr << "No such smoothing will be performed!" << std::endl; {
use_area_smoothing = false; std::cerr << "Area-based smoothing requires the Ceres Library, which is not available." << std::endl;
std::cerr << "No such smoothing will be performed!" << std::endl;
use_area_smoothing = false;
}
#endif #endif
if(!use_angle_smoothing && !use_area_smoothing) if(!use_angle_smoothing && !use_area_smoothing)
{
std::cerr << "Called PMP::angle_and_area_smoothing() without any smoothing method selected or available" << std::endl; std::cerr << "Called PMP::angle_and_area_smoothing() without any smoothing method selected or available" << std::endl;
return;
}
unsigned int nb_iterations = choose_parameter(get_parameter(np, internal_np::number_of_iterations), 1); unsigned int nb_iterations = choose_parameter(get_parameter(np, internal_np::number_of_iterations), 1);
const bool do_project = choose_parameter(get_parameter(np, internal_np::do_project), true); const bool do_project = choose_parameter(get_parameter(np, internal_np::do_project), true);

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

@ -550,7 +550,11 @@ bool remove_self_intersections_with_smoothing(std::set<typename boost::graph_tra
local_mesh, local_mesh,
CP::edge_is_constrained_map(eif) CP::edge_is_constrained_map(eif)
.number_of_iterations(100) .number_of_iterations(100)
.use_safety_constraints(false)); .use_safety_constraints(false)
#ifndef CGAL_PMP_USE_CERES_SOLVER
.use_area_smoothing(false)
#endif
);
#ifdef CGAL_PMP_REMOVE_SELF_INTERSECTION_OUTPUT #ifdef CGAL_PMP_REMOVE_SELF_INTERSECTION_OUTPUT
CGAL::IO::write_polygon_mesh("results/post_smoothing_local_mesh.off", local_mesh, CGAL::parameters::stream_precision(17)); CGAL::IO::write_polygon_mesh("results/post_smoothing_local_mesh.off", local_mesh, CGAL::parameters::stream_precision(17));