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

Changes after review

This commit is contained in:
Maxime Gimeno 2021-07-21 12:47:03 +02:00
parent 3cfa3e8c86
commit 83e7abf042
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/orient_polygon_soup.h
View File

@ -42,10 +42,10 @@ namespace internal {
struct Polygon_soup_orientation_visitor{ struct Polygon_soup_orientation_visitor{
inline virtual void non_manifold_edge(const std::size_t&, const std::size_t&){} inline virtual void non_manifold_edge(const std::size_t&, const std::size_t&){}
inline virtual void duplicate_vertex(const std::size_t&, const std::size_t&){} inline virtual void duplicated_vertex(const std::size_t&, const std::size_t&){}
inline virtual void non_manifold_vertex(const std::size_t&){} inline virtual void non_manifold_vertex(const std::size_t&){}
inline virtual void update_polygon_id(const std::size_t&, const std::size_t&, const std::size_t&){} inline virtual void point_id_in_polygon_updated(const std::size_t&, const std::size_t&, const std::size_t&){}
inline virtual void reverse_polygon(const std::size_t&) {} inline virtual void polygon_orientation_reversed(const std::size_t&) {}
}; };
template<class PointRange, class PolygonRange, class Visitor = Polygon_soup_orientation_visitor> template<class PointRange, class PolygonRange, class Visitor = Polygon_soup_orientation_visitor>
@ -134,7 +134,7 @@ struct Polygon_soup_orienter
} }
void inverse_orientation(const std::size_t index) { void inverse_orientation(const std::size_t index) {
visitor.reverse_polygon(index); visitor.polygon_orientation_reversed(index);
std::reverse(polygons[index].begin(), polygons[index].end()); std::reverse(polygons[index].begin(), polygons[index].end());
} }
@ -143,7 +143,7 @@ struct Polygon_soup_orienter
V_ID old_index, V_ID old_index,
V_ID new_index) V_ID new_index)
{ {
visitor.update_polygon_id(polygon_id, old_index, new_index); visitor.point_id_in_polygon_updated(polygon_id, old_index, new_index);
for(V_ID& i : polygons[polygon_id]) for(V_ID& i : polygons[polygon_id])
if( i==old_index ) if( i==old_index )
i=new_index; i=new_index;
@ -331,7 +331,7 @@ struct Polygon_soup_orienter
} // end while loop on all non-oriented polygons remaining } // end while loop on all non-oriented polygons remaining
} }
/// A vertex is said to be .3 if its link is neither a cycle nor a chain, /// A vertex is said to be singular if its link is neither a cycle nor a chain,
/// but several cycles and chains. /// but several cycles and chains.
/// For each such vertex v, we consider each set of polygons incident to v /// For each such vertex v, we consider each set of polygons incident to v
/// and sharing a non-marked edge incident to v. A copy of v is assigned to /// and sharing a non-marked edge incident to v. A copy of v is assigned to
@ -402,7 +402,7 @@ struct Polygon_soup_orienter
for(const V_ID_and_Polygon_ids& vid_and_pids : vertices_to_duplicate) for(const V_ID_and_Polygon_ids& vid_and_pids : vertices_to_duplicate)
{ {
V_ID new_index = static_cast<V_ID>(points.size()); V_ID new_index = static_cast<V_ID>(points.size());
visitor.duplicate_vertex(vid_and_pids.first, new_index); visitor.duplicated_vertex(vid_and_pids.first, new_index);
points.push_back( points[vid_and_pids.first] ); points.push_back( points[vid_and_pids.first] );
for(P_ID polygon_id : vid_and_pids.second) for(P_ID polygon_id : vid_and_pids.second)
replace_vertex_index_in_polygon(polygon_id, vid_and_pids.first, new_index); replace_vertex_index_in_polygon(polygon_id, vid_and_pids.first, new_index);

5
Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
View File

@ -429,10 +429,7 @@ Scene_polygon_soup_item::orient(std::vector<std::pair<std::size_t, std::size_t>
Visitor(std::vector<std::pair<std::size_t, std::size_t> >& nm_vertices) Visitor(std::vector<std::pair<std::size_t, std::size_t> >& nm_vertices)
:nm_vertices(nm_vertices){} :nm_vertices(nm_vertices){}
Visitor(const Visitor& other) void duplicated_vertex(const std::size_t& v1, const std::size_t& v2) final
:nm_vertices(other.nm_vertices){}
void duplicate_vertex(const std::size_t& v1, const std::size_t& v2) final
{ {
nm_vertices.push_back(std::make_pair(v1, v2)); nm_vertices.push_back(std::make_pair(v1, v2));
} }