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

Misc cleaning

This commit is contained in:
Mael Rouxel-Labbé 2020-02-06 15:49:33 +01:00
parent 5202712322
commit 035536527c
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Smoothing/mesh_smoothing_impl.h
View File

@ -133,7 +133,7 @@ public:
void operator()(const FaceRange& face_range)
{
#ifdef CGAL_PMP_SMOOTHING_DEBUG
std::cout << "Flipping faces" << std::endl;
std::cout << "Flipping edges" << std::endl;
#endif
// edges to consider
@ -187,6 +187,10 @@ public:
add_to_stack_if_unmarked(edge(prev(opposite(h, mesh_), mesh_), mesh_), marks, edge_range);
}
}
#ifdef CGAL_PMP_SMOOTHING_DEBUG
std::cout << flipped_n << " flips" << std::endl;
#endif
}
private:
@ -549,6 +553,7 @@ public:
#ifdef CGAL_PMP_SMOOTHING_DEBUG
FT total_displacement = 0;
std::cout << "apply_moves_in_single_batch: " << apply_moves_in_single_batch << std::endl;
#endif
std::size_t moved_points = 0;
@ -582,7 +587,6 @@ public:
{
#ifdef CGAL_PMP_SMOOTHING_DEBUG_PP
std::cout << "moving " << get(vpmap_, v) << " to " << new_pos << std::endl;
total_displacement += CGAL::approximate_sqrt(traits_.compute_squared_length_3_object()(move));
#endif
if(apply_moves_in_single_batch)
@ -590,6 +594,10 @@ public:
else
put(vpmap_, v, new_pos);
#ifdef CGAL_PMP_SMOOTHING_DEBUG
total_displacement += CGAL::approximate_sqrt(traits_.compute_squared_length_3_object()(move));
#endif
++moved_points;
}
else // some sanity check failed

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

@ -457,11 +457,6 @@ bool remove_self_intersections_with_smoothing(std::set<typename boost::graph_tra
CGAL_precondition(does_self_intersect(face_range, tmesh));
std::cout << "range: " << face_range.size() << " faces" << std::endl;
std::vector<typename boost::graph_traits<TriangleMesh>::face_descriptor> dfaces;
degenerate_faces(face_range, tmesh, std::back_inserter(dfaces));
std::cout << dfaces.size() << " dfaces" << std::endl;
// Rather than working directly on the mesh, copy a range and work on this instead
const CGAL::Face_filtered_graph<TriangleMesh> ffg(tmesh, face_range);
TriangleMesh local_mesh;
@ -1703,7 +1698,6 @@ remove_self_intersections_one_step(std::set<typename boost::graph_traits<Triangl
}
}
// sort halfedges so that they describe the sequence of halfedges of the hole to be made
if(!remove_self_intersections_with_hole_filling(cc_border_hedges, cc_faces, working_face_range,
tmesh, only_treat_self_intersections_locally,
strong_dihedral_angle, weak_dihedral_angle,

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

@ -173,7 +173,7 @@ void smooth_mesh(const FaceRange& faces,
const bool use_Delaunay_flips = choose_parameter(get_parameter(np, internal_np::use_Delaunay_flips), true);
VCMap vcmap = choose_parameter(get_parameter(np, internal_np::vertex_is_constrained),
get(Vertex_property_tag(), tmesh));
get(Vertex_property_tag(), tmesh));
// If it's the default vcmap, manually set everything to false because the dynamic pmap has no default initialization
if((std::is_same<VCMap, Default_VCMap>::value))