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

rename np

This commit is contained in:
Sébastien Loriot 2023-03-02 14:49:17 +01:00
parent b1d2744821
commit f8cc9e6bd0
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/remesh_planar_patches.h
View File

@ -1340,7 +1340,7 @@ bool decimate_meshes_with_common_interfaces_impl(TriangleMeshRange& meshes,
* as key type and `std::size_t` as value type}
* \cgalParamDefault{None}
* \cgalParamNEnd
* \cgalParamNBegin{cosinus_threshold}
* \cgalParamNBegin{cosine_of_maxium_angle}
* \cgalParamDescription{the cosinus an angle that is used as the lower bound of both the dihedral angle between two adjacent
* triangles to consider then as coplanar, and the angle between adjacent segments to consider then as collinear.}
* \cgalParamType{`FT` type from the `geom_traits` parameter}
@ -1407,7 +1407,7 @@ void remesh_planar_patches(const TriangleMeshIn& tm_in,
typedef typename graph_traits::vertex_descriptor vertex_descriptor;
typedef typename graph_traits::face_descriptor face_descriptor;
double coplanar_cos_threshold = choose_parameter(get_parameter(np_in, internal_np::cosinus_threshold), -1);
double coplanar_cos_threshold = choose_parameter(get_parameter(np_in, internal_np::cosine_of_maxium_angle), -1);
CGAL_precondition(coplanar_cos_threshold<0);
// initialize property maps (fill user provided or user internal ones)

6
Polygon_mesh_processing/test/Polygon_mesh_processing/test_decimation_of_planar_patches.cpp
View File

@ -115,7 +115,7 @@ int main()
// call the decimation function
Surface_mesh sm_out;
PMP::remesh_planar_patches(sm, sm_out, CGAL::parameters::cosinus_threshold(-0.99));
PMP::remesh_planar_patches(sm, sm_out, CGAL::parameters::cosine_of_maxium_angle(-0.99));
ss=std::stringstream();
ss << "out_a" << i << ".off";
std::ofstream out(ss.str().c_str());
@ -391,7 +391,7 @@ int main()
std::ifstream in("data/decimation/sphere.off");
in >> sm;
Surface_mesh sm_out;
PMP::remesh_planar_patches(sm, sm_out, CGAL::parameters::cosinus_threshold(-0.99));
PMP::remesh_planar_patches(sm, sm_out, CGAL::parameters::cosine_of_maxium_angle(-0.99));
}
{
Surface_mesh sm;
@ -399,7 +399,7 @@ int main()
std::ifstream in("data/decimation/sphere_selection.off");
in >> sm;
Surface_mesh sm_out;
PMP::remesh_planar_patches(sm, sm_out, CGAL::parameters::cosinus_threshold(-0.99));
PMP::remesh_planar_patches(sm, sm_out, CGAL::parameters::cosine_of_maxium_angle(-0.99));
std::ofstream out("sphere_selection_app.off");
out << sm_out;
std::cout << "output written to sphere_selection_app.off\n";

4
Polyhedron/demo/Polyhedron/Plugins/PMP/Remesh_planar_patches_plugin.cpp
View File

@ -202,7 +202,7 @@ public Q_SLOTS:
CGAL::Polygon_mesh_processing::remesh_planar_patches(pmesh,
out,
CGAL::parameters::cosinus_threshold(cos_threshold)
CGAL::parameters::cosine_of_maxium_angle(cos_threshold)
.face_patch_map(in_fpmap)
.do_not_triangulate_faces(do_not_triangulate_faces),
CGAL::parameters::face_patch_map(out_fpmap));
@ -226,7 +226,7 @@ public Q_SLOTS:
{
CGAL::Polygon_mesh_processing::remesh_planar_patches(pmesh,
pmesh,
CGAL::parameters::cosinus_threshold(cos_threshold)
CGAL::parameters::cosine_of_maxium_angle(cos_threshold)
.do_not_triangulate_faces(do_not_triangulate_faces),
CGAL::parameters::visitor([](Mesh& pmesh){pmesh.clear_without_removing_property_maps ();}));

1
STL_Extension/include/CGAL/STL_Extension/internal/parameters_interface.h
View File

@ -147,7 +147,6 @@ CGAL_add_named_parameter(mesh_facet_angle_t, mesh_facet_angle, mesh_facet_angle)
CGAL_add_named_parameter(mesh_facet_distance_t, mesh_facet_distance, mesh_facet_distance)
CGAL_add_named_parameter(mesh_facet_topology_t, mesh_facet_topology, mesh_facet_topology)
CGAL_add_named_parameter(polyline_constraints_t, polyline_constraints, polyline_constraints)
CGAL_add_named_parameter(cosinus_threshold_t, cosinus_threshold, cosinus_threshold)
CGAL_add_named_parameter(vertex_corner_map_t, vertex_corner_map, vertex_corner_map)
CGAL_add_named_parameter(normals_of_patches_t, normals_of_patches, normals_of_patches)