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

Use VPM's reference

This commit is contained in:
Mael Rouxel-Labbé 2023-05-16 15:48:50 +02:00
parent 4798b1da0d
commit aa12591bc3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/refine_impl.h
View File

@ -42,6 +42,8 @@ template<class PolygonMesh, class VertexPointMap>
class Refine_Polyhedron_3 { class Refine_Polyhedron_3 {
//// typedefs //// typedefs
typedef typename boost::property_traits<VertexPointMap>::value_type Point_3; typedef typename boost::property_traits<VertexPointMap>::value_type Point_3;
typedef typename boost::property_traits<VertexPointMap>::reference Point_3_ref;
typedef typename boost::graph_traits<PolygonMesh>::vertex_descriptor vertex_descriptor; typedef typename boost::graph_traits<PolygonMesh>::vertex_descriptor vertex_descriptor;
typedef typename boost::graph_traits<PolygonMesh>::halfedge_descriptor halfedge_descriptor; typedef typename boost::graph_traits<PolygonMesh>::halfedge_descriptor halfedge_descriptor;
typedef typename boost::graph_traits<PolygonMesh>::face_descriptor face_descriptor; typedef typename boost::graph_traits<PolygonMesh>::face_descriptor face_descriptor;
@ -88,7 +90,6 @@ private:
bool relax(halfedge_descriptor h) bool relax(halfedge_descriptor h)
{ {
#ifdef CGAL_PMP_REFINE_DEBUG_PP #ifdef CGAL_PMP_REFINE_DEBUG_PP
typedef typename boost::property_traits<VertexPointMap>::reference Point_3_ref;
Point_3_ref p = get(vpmap, source(h,pmesh)); Point_3_ref p = get(vpmap, source(h,pmesh));
Point_3_ref q = get(vpmap, target(h,pmesh)); Point_3_ref q = get(vpmap, target(h,pmesh));
Point_3_ref r = get(vpmap, target(next(h,pmesh),pmesh)); Point_3_ref r = get(vpmap, target(next(h,pmesh),pmesh));
@ -227,7 +228,7 @@ private:
const std::set<face_descriptor>& interior_map, const std::set<face_descriptor>& interior_map,
bool accept_internal_facets) bool accept_internal_facets)
{ {
const Point_3& vp = get(vpmap, vh); const Point_3_ref vp = get(vpmap, vh);
Halfedge_around_target_circulator<PolygonMesh> circ(halfedge(vh,pmesh),pmesh), done(circ); Halfedge_around_target_circulator<PolygonMesh> circ(halfedge(vh,pmesh),pmesh), done(circ);
int deg = 0; int deg = 0;
double sum = 0; double sum = 0;
@ -239,7 +240,7 @@ private:
{ continue; } // which means current edge is an interior edge and should not be included in scale attribute calculation { continue; } // which means current edge is an interior edge and should not be included in scale attribute calculation
} }
const Point_3& vq = get(vpmap, target(opposite(*circ,pmesh),pmesh)); const Point_3_ref vq = get(vpmap, target(opposite(*circ,pmesh),pmesh));
sum += to_double(CGAL::approximate_sqrt(CGAL::squared_distance(vp, vq))); sum += to_double(CGAL::approximate_sqrt(CGAL::squared_distance(vp, vq)));
++deg; ++deg;
} while(++circ != done); } while(++circ != done);