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

add an extra overload of choose_parameter for dynamic property maps

This commit is contained in:
Sébastien Loriot 2022-07-13 12:48:27 +02:00
parent ab7183b42e
commit 916e48284d
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_np_function.cpp
View File

@ -53,7 +53,7 @@ void my_function_with_named_parameters(PolygonMesh& mesh, const NamedParameters&
bool do_project = choose_parameter(get_parameter(np, internal_np::do_project), false);
// If the NPs provide a vertex-normal-map use it, otherwise initialize the default one
VNM vnm = choose_parameter(get_parameter(np, internal_np::vertex_normal_map), get(Vector_map_tag(), mesh));
VNM vnm = choose_parameter<Default_vector_map>(get_parameter(np, internal_np::vertex_normal_map), Vector_map_tag(), mesh);
if (is_default_parameter<NamedParameters, internal_np::vertex_normal_map_t>::value)
Polygon_mesh_processing::compute_vertex_normals(mesh, vnm);

13
STL_Extension/include/CGAL/Named_function_parameters.h
View File

@ -359,6 +359,19 @@ const T& choose_parameter(const T& t)
return t;
}
// Version with three parameters for dynamic property maps
template <typename D, typename Dynamic_tag, typename PolygonMesh>
D choose_parameter(const internal_np::Param_not_found&, Dynamic_tag tag, PolygonMesh& pm)
{
return get(tag, pm);
}
template <typename D, typename T, typename Dynamic_tag, typename PolygonMesh>
const T& choose_parameter(const T& t, Dynamic_tag, PolygonMesh&)
{
return t;
}
template <class NamedParameters, class Parameter>
struct is_default_parameter
{