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

Change selection option to set

This commit is contained in:
Ivan Paden 2023-07-05 20:29:59 +02:00
parent 63e3180517
commit 4a5283b22e
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Isotropic_remeshing/Adaptive_sizing_field.h
View File

@ -35,10 +35,9 @@ public:
typedef typename Base::K K;
typedef typename Base::FT FT;
typedef typename Base::Point_3 Point_3;
typedef typename Base::face_descriptor face_descriptor;
typedef typename Base::halfedge_descriptor halfedge_descriptor;
typedef typename Base::vertex_descriptor vertex_descriptor;
//todo ip: send this over to Sizing_field to be consistent
typedef typename boost::graph_traits<PolygonMesh>::face_descriptor face_descriptor;
typedef typename CGAL::dynamic_vertex_property_t<FT> Vertex_property_tag;
typedef typename boost::property_map<PolygonMesh,
@ -81,7 +80,7 @@ public:
}
template <typename FaceRange>
void calc_sizing_map(const FaceRange& faces_)
void calc_sizing_map(const FaceRange& face_range)
{
#ifdef CGAL_PMP_REMESHING_VERBOSE
int oversize = 0;
@ -90,22 +89,16 @@ public:
std::cout << "Calculating sizing field..." << std::endl;
#endif
///// FaceRange->expand->Face_filtered_graph->use ffg onwards
std::vector<face_descriptor> selection(faces_.begin(), faces_.end());
auto is_selected = get(CGAL::dynamic_face_property_t<bool>(), m_pmesh);
for (face_descriptor f : faces(m_pmesh))
put(is_selected, f, false);
CGAL::expand_face_selection(selection, m_pmesh, 1, is_selected, std::back_inserter(selection));
// expand face selection for curvature calculation
std::set<face_descriptor> selection(face_range.begin(), face_range.end());
CGAL::expand_face_selection(selection, m_pmesh, 1
, make_boolean_property_map(selection), Emptyset_iterator());
CGAL::Face_filtered_graph<PolygonMesh> ffg(m_pmesh, selection);
///////
Vertex_curvature_map vertex_curvature_map;
vertex_curvature_map = get(Vertex_curvature_tag(), ffg);
// calculate curvature
Vertex_curvature_map vertex_curvature_map = get(Vertex_curvature_tag(), ffg);
interpolated_corrected_principal_curvatures_and_directions(ffg
, vertex_curvature_map);
// calculate vertex sizing field L(x_i) from curvature field
for(vertex_descriptor v : vertices(ffg))
{

1
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Isotropic_remeshing/Sizing_field.h
View File

@ -33,6 +33,7 @@ private:
public:
typedef typename CGAL::Kernel_traits<Point>::Kernel K;
typedef typename boost::graph_traits<PM>::face_descriptor face_descriptor;
typedef typename boost::graph_traits<PM>::halfedge_descriptor halfedge_descriptor;
typedef typename boost::graph_traits<PM>::vertex_descriptor vertex_descriptor;
typedef Point Point_3;