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

use get_property_map and get_const_property_map everywhere in PMP

This commit is contained in:
Jane Tournois 2016-08-25 15:22:16 +02:00
parent 76e6333a18
commit ef85908fe1
12 changed files with 36 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/bbox.h
View File

@ -58,9 +58,8 @@ namespace CGAL {
using boost::choose_const_pmap; using boost::choose_const_pmap;
using boost::get_param; using boost::get_param;
typename GetVertexPointMap<PolygonMesh, NamedParameters>::const_type typename GetVertexPointMap<PolygonMesh, NamedParameters>::const_type
vpm = choose_const_pmap(get_param(np, CGAL::vertex_point), vpm = choose_param(get_param(np, vertex_point),
pmesh, get_const_property_map(CGAL::vertex_point, pmesh));
CGAL::vertex_point);
typedef typename boost::graph_traits<PolygonMesh>::halfedge_descriptor halfedge_descriptor; typedef typename boost::graph_traits<PolygonMesh>::halfedge_descriptor halfedge_descriptor;

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

@ -139,7 +139,7 @@ compute_face_normal(typename boost::graph_traits<PolygonMesh>::face_descriptor f
Vector normal = traits.construct_vector_3_object()(CGAL::NULL_VECTOR); Vector normal = traits.construct_vector_3_object()(CGAL::NULL_VECTOR);
sum_normals<Point>(pmesh, f sum_normals<Point>(pmesh, f
, choose_const_pmap(get_param(np, CGAL::vertex_point), pmesh, CGAL::vertex_point) , choose_param(get_param(np, vertex_point), get_const_property_map(CGAL::vertex_point, pmesh))
, normal , normal
, traits); , traits);

3
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/fair.h
View File

@ -143,7 +143,8 @@ namespace internal {
typedef CGAL::internal::Cotangent_weight_with_voronoi_area_fairing<TriangleMesh, VPMap> typedef CGAL::internal::Cotangent_weight_with_voronoi_area_fairing<TriangleMesh, VPMap>
Default_Weight_calculator; Default_Weight_calculator;
VPMap vpmap_ = choose_param(get_param(np, vertex_point), get(CGAL::vertex_point, tmesh)); VPMap vpmap_ = choose_param(get_param(np, vertex_point),
get_property_map(vertex_point, tmesh));
return internal::fair(tmesh, vertices, return internal::fair(tmesh, vertices,
choose_param(get_param(np, sparse_linear_solver), Default_solver()), choose_param(get_param(np, sparse_linear_solver), Default_solver()),

15
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/measure.h
View File

@ -85,9 +85,8 @@ namespace Polygon_mesh_processing {
using boost::get_param; using boost::get_param;
typename GetVertexPointMap<PolygonMesh, NamedParameters>::const_type typename GetVertexPointMap<PolygonMesh, NamedParameters>::const_type
vpm = choose_const_pmap(get_param(np, CGAL::vertex_point), vpm = choose_param(get_param(np, vertex_point),
pmesh, get_const_property_map(CGAL::vertex_point, pmesh));
CGAL::vertex_point);
return CGAL::approximate_sqrt(CGAL::squared_distance(get(vpm, source(h, pmesh)), return CGAL::approximate_sqrt(CGAL::squared_distance(get(vpm, source(h, pmesh)),
get(vpm, target(h, pmesh)))); get(vpm, target(h, pmesh))));
@ -231,9 +230,8 @@ namespace Polygon_mesh_processing {
CGAL_precondition(boost::graph_traits<TriangleMesh>::null_face() != f); CGAL_precondition(boost::graph_traits<TriangleMesh>::null_face() != f);
typename GetVertexPointMap<TriangleMesh, CGAL_PMP_NP_CLASS>::const_type typename GetVertexPointMap<TriangleMesh, CGAL_PMP_NP_CLASS>::const_type
vpm = choose_const_pmap(get_param(np, CGAL::vertex_point), vpm = choose_param(get_param(np, vertex_point),
tmesh, get_const_property_map(CGAL::vertex_point, tmesh));
CGAL::vertex_point);
typedef typename boost::graph_traits<TriangleMesh>::halfedge_descriptor halfedge_descriptor; typedef typename boost::graph_traits<TriangleMesh>::halfedge_descriptor halfedge_descriptor;
halfedge_descriptor hd = halfedge(f, tmesh); halfedge_descriptor hd = halfedge(f, tmesh);
@ -416,9 +414,8 @@ namespace Polygon_mesh_processing {
using boost::get_param; using boost::get_param;
typename GetVertexPointMap<TriangleMesh, CGAL_PMP_NP_CLASS>::const_type typename GetVertexPointMap<TriangleMesh, CGAL_PMP_NP_CLASS>::const_type
vpm = choose_const_pmap(get_param(np, CGAL::vertex_point), vpm = choose_param(get_param(np, vertex_point),
tmesh, get_const_property_map(CGAL::vertex_point, tmesh));
CGAL::vertex_point);
typename GetGeomTraits<TriangleMesh, CGAL_PMP_NP_CLASS>::type::Point_3 typename GetGeomTraits<TriangleMesh, CGAL_PMP_NP_CLASS>::type::Point_3
origin(0, 0, 0); origin(0, 0, 0);

5
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/orientation.h
View File

@ -96,9 +96,8 @@ bool is_outward_oriented(const PolygonMesh& pmesh,
//VertexPointMap //VertexPointMap
typedef typename GetVertexPointMap<PolygonMesh, NamedParameters>::const_type VPMap; typedef typename GetVertexPointMap<PolygonMesh, NamedParameters>::const_type VPMap;
VPMap vpmap = choose_const_pmap(get_param(np, boost::vertex_point), VPMap vpmap = choose_param(get_param(np, vertex_point),
pmesh, get_const_property_map(vertex_point, pmesh));
boost::vertex_point);
//Kernel //Kernel
typedef typename GetGeomTraits<PolygonMesh, NamedParameters>::type Kernel; typedef typename GetGeomTraits<PolygonMesh, NamedParameters>::type Kernel;

5
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/refine.h
View File

@ -84,9 +84,8 @@ namespace Polygon_mesh_processing {
CGAL_precondition(is_triangle_mesh(tmesh) ); CGAL_precondition(is_triangle_mesh(tmesh) );
typedef typename GetVertexPointMap<TriangleMesh,NamedParameters>::type VPmap; typedef typename GetVertexPointMap<TriangleMesh,NamedParameters>::type VPmap;
VPmap vpm = choose_pmap(get_param(np, boost::vertex_point), VPmap vpm = choose_param(get_param(np, vertex_point),
tmesh, get_property_map(vertex_point, tmesh));
boost::vertex_point);
internal::Refine_Polyhedron_3<TriangleMesh, VPmap> refine_functor(tmesh, vpm); internal::Refine_Polyhedron_3<TriangleMesh, VPmap> refine_functor(tmesh, vpm);
refine_functor.refine(faces, refine_functor.refine(faces,

10
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/remesh.h
View File

@ -141,9 +141,8 @@ void isotropic_remeshing(const FaceRange& faces
typedef typename GetGeomTraits<PM, NamedParameters>::type GT; typedef typename GetGeomTraits<PM, NamedParameters>::type GT;
typedef typename GetVertexPointMap<PM, NamedParameters>::type VPMap; typedef typename GetVertexPointMap<PM, NamedParameters>::type VPMap;
VPMap vpmap = choose_pmap(get_param(np, boost::vertex_point), VPMap vpmap = choose_param(get_param(np, vertex_point),
pmesh, get_property_map(vertex_point, pmesh));
boost::vertex_point);
typedef typename GetFaceIndexMap<PM, NamedParameters>::type FIMap; typedef typename GetFaceIndexMap<PM, NamedParameters>::type FIMap;
FIMap fimap = choose_param(get_param(np, face_index), FIMap fimap = choose_param(get_param(np, face_index),
@ -311,9 +310,8 @@ void split_long_edges(const EdgeRange& edges
typedef typename GetGeomTraits<PM, NamedParameters>::type GT; typedef typename GetGeomTraits<PM, NamedParameters>::type GT;
typedef typename GetVertexPointMap<PM, NamedParameters>::type VPMap; typedef typename GetVertexPointMap<PM, NamedParameters>::type VPMap;
VPMap vpmap = choose_pmap(get_param(np, boost::vertex_point), VPMap vpmap = choose_param(get_param(np, vertex_point),
pmesh, get_property_map(vertex_point, pmesh));
boost::vertex_point);
typedef typename GetFaceIndexMap<PM, NamedParameters>::type FIMap; typedef typename GetFaceIndexMap<PM, NamedParameters>::type FIMap;
FIMap fimap = choose_param(get_param(np, face_index), FIMap fimap = choose_param(get_param(np, face_index),

10
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair.h
View File

@ -163,9 +163,8 @@ std::size_t remove_null_edges(
typedef typename GT::vertex_descriptor vertex_descriptor; typedef typename GT::vertex_descriptor vertex_descriptor;
typedef typename GetVertexPointMap<TM, NamedParameters>::type VertexPointMap; typedef typename GetVertexPointMap<TM, NamedParameters>::type VertexPointMap;
VertexPointMap vpmap = choose_pmap(get_param(np, boost::vertex_point), VertexPointMap vpmap = choose_param(get_param(np, vertex_point),
tmesh, get_property_map(vertex_point, tmesh));
boost::vertex_point);
typedef typename GetGeomTraits<TM, NamedParameters>::type Traits; typedef typename GetGeomTraits<TM, NamedParameters>::type Traits;
Traits traits = choose_param(get_param(np, geom_traits), Traits()); Traits traits = choose_param(get_param(np, geom_traits), Traits());
@ -485,9 +484,8 @@ std::size_t remove_degenerate_faces(TriangleMesh& tmesh,
typedef typename GT::vertex_descriptor vertex_descriptor; typedef typename GT::vertex_descriptor vertex_descriptor;
typedef typename GetVertexPointMap<TM, NamedParameters>::type VertexPointMap; typedef typename GetVertexPointMap<TM, NamedParameters>::type VertexPointMap;
VertexPointMap vpmap = choose_pmap(get_param(np, boost::vertex_point), VertexPointMap vpmap = choose_param(get_param(np, vertex_point),
tmesh, get_property_map(vertex_point, tmesh));
boost::vertex_point);
typedef typename GetGeomTraits<TM, NamedParameters>::type Traits; typedef typename GetGeomTraits<TM, NamedParameters>::type Traits;
Traits traits = choose_param(get_param(np, geom_traits), Traits()); Traits traits = choose_param(get_param(np, geom_traits), Traits());

5
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h
View File

@ -306,9 +306,8 @@ self_intersections( const FaceRange& face_range,
); );
typedef typename GetVertexPointMap<TM, NamedParameters>::const_type VertexPointMap; typedef typename GetVertexPointMap<TM, NamedParameters>::const_type VertexPointMap;
VertexPointMap vpmap = choose_const_pmap(get_param(np, boost::vertex_point), VertexPointMap vpmap = choose_param(get_param(np, vertex_point),
tmesh, get_const_property_map(vertex_point, tmesh));
boost::vertex_point);
BOOST_FOREACH(face_descriptor f, face_range) BOOST_FOREACH(face_descriptor f, face_range)
{ {

10
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/stitch_borders.h
View File

@ -304,9 +304,8 @@ void stitch_borders(PolygonMesh& pmesh,
using boost::get_param; using boost::get_param;
typedef typename GetVertexPointMap<PolygonMesh, NamedParameters>::const_type VPMap; typedef typename GetVertexPointMap<PolygonMesh, NamedParameters>::const_type VPMap;
VPMap vpm = choose_const_pmap(get_param(np, boost::vertex_point), VPMap vpm = choose_param(get_param(np, vertex_point),
pmesh, get_const_property_map(vertex_point, pmesh));
boost::vertex_point);
internal::Naive_border_stitching_modifier<PolygonMesh, VPMap, HalfedgePairsRange> internal::Naive_border_stitching_modifier<PolygonMesh, VPMap, HalfedgePairsRange>
modifier(hedge_pairs_to_stitch, vpm); modifier(hedge_pairs_to_stitch, vpm);
@ -356,9 +355,8 @@ void stitch_borders(PolygonMesh& pmesh, const CGAL_PMP_NP_CLASS& np)
std::vector< std::pair<halfedge_descriptor, halfedge_descriptor> > hedge_pairs_to_stitch; std::vector< std::pair<halfedge_descriptor, halfedge_descriptor> > hedge_pairs_to_stitch;
typedef typename GetVertexPointMap<PolygonMesh, CGAL_PMP_NP_CLASS>::const_type VPMap; typedef typename GetVertexPointMap<PolygonMesh, CGAL_PMP_NP_CLASS>::const_type VPMap;
VPMap vpm = choose_const_pmap(get_param(np, boost::vertex_point), VPMap vpm = choose_param(get_param(np, vertex_point),
pmesh, get_const_property_map(vertex_point, pmesh));
boost::vertex_point);
internal::detect_duplicated_boundary_edges(pmesh, internal::detect_duplicated_boundary_edges(pmesh,
std::back_inserter(hedge_pairs_to_stitch), std::back_inserter(hedge_pairs_to_stitch),

10
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h
View File

@ -329,9 +329,8 @@ bool triangulate_face(typename boost::graph_traits<PolygonMesh>::face_descripto
//VertexPointMap //VertexPointMap
typedef typename GetVertexPointMap<PolygonMesh, NamedParameters>::type VPMap; typedef typename GetVertexPointMap<PolygonMesh, NamedParameters>::type VPMap;
VPMap vpmap = choose_pmap(get_param(np, boost::vertex_point), VPMap vpmap = choose_param(get_param(np, vertex_point),
pmesh, get_property_map(vertex_point, pmesh));
boost::vertex_point);
//Kernel //Kernel
typedef typename GetGeomTraits<PolygonMesh, NamedParameters>::type Kernel; typedef typename GetGeomTraits<PolygonMesh, NamedParameters>::type Kernel;
@ -379,9 +378,8 @@ bool triangulate_faces(FaceRange face_range,
//VertexPointMap //VertexPointMap
typedef typename GetVertexPointMap<PolygonMesh, NamedParameters>::type VPMap; typedef typename GetVertexPointMap<PolygonMesh, NamedParameters>::type VPMap;
VPMap vpmap = choose_pmap(get_param(np, boost::vertex_point), VPMap vpmap = choose_param(get_param(np, vertex_point),
pmesh, get_property_map(vertex_point, pmesh));
boost::vertex_point);
//Kernel //Kernel
typedef typename GetGeomTraits<PolygonMesh, NamedParameters>::type Kernel; typedef typename GetGeomTraits<PolygonMesh, NamedParameters>::type Kernel;

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

@ -98,7 +98,7 @@ namespace Polygon_mesh_processing {
return internal::triangulate_hole_polygon_mesh(pmesh, return internal::triangulate_hole_polygon_mesh(pmesh,
border_halfedge, border_halfedge,
out, out,
choose_param(get_param(np, vertex_point), get(CGAL::vertex_point, pmesh)), choose_param(get_param(np, vertex_point), get_property_map(vertex_point, pmesh)),
use_dt3, use_dt3,
choose_param(get_param(np, geom_traits), typename GetGeomTraits<PolygonMesh,NamedParameters>::type())) choose_param(get_param(np, geom_traits), typename GetGeomTraits<PolygonMesh,NamedParameters>::type()))
.first; .first;