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

Replace Bounded_normal_change_placement per Bounded_normal_change_filter

This commit is contained in:
lvalque 2025-10-17 16:47:31 +02:00
parent d3c069a10d
commit 8ad92851a1
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Surface_mesh_simplification/benchmark/Surface_mesh_simplification/bench_garland_heckbert.cpp
View File

@ -2,7 +2,7 @@
#include <CGAL/Surface_mesh.h> #include <CGAL/Surface_mesh.h>
#include <CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Edge_count_ratio_stop_predicate.h> #include <CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Edge_count_ratio_stop_predicate.h>
#include <CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Bounded_normal_change_placement.h> #include <CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Bounded_normal_change_filter.h>
#include <CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_policies.h> #include <CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_policies.h>
#include <CGAL/Polygon_mesh_processing/autorefinement.h> #include <CGAL/Polygon_mesh_processing/autorefinement.h>
@ -70,14 +70,13 @@ double collapse_gh(Surface_mesh& mesh,
typedef typename GHPolicies::Get_cost GH_cost; typedef typename GHPolicies::Get_cost GH_cost;
typedef typename GHPolicies::Get_placement GH_placement; typedef typename GHPolicies::Get_placement GH_placement;
typedef SMS::Bounded_normal_change_placement<GH_placement> Bounded_GH_placement; typedef SMS::Bounded_normal_change_filter<> Filter;
// GHPolicies gh_policies(mesh); // GHPolicies gh_policies(mesh);
const GH_cost& gh_cost = gh_policies.get_cost(); const GH_cost& gh_cost = gh_policies.get_cost();
const GH_placement& gh_placement = gh_policies.get_placement(); const GH_placement& gh_placement = gh_policies.get_placement();
Bounded_GH_placement placement(gh_placement);
SMS::edge_collapse(mesh, stop, CGAL::parameters::get_cost(gh_cost).get_placement(placement)); SMS::edge_collapse(mesh, stop, CGAL::parameters::get_cost(gh_cost).filter(Filter()).get_placement(gh_placement));
std::chrono::steady_clock::time_point end_time = std::chrono::steady_clock::now(); std::chrono::steady_clock::time_point end_time = std::chrono::steady_clock::now();

9
Surface_mesh_simplification/examples/Surface_mesh_simplification/edge_collapse_garland_heckbert.cpp
View File

@ -2,7 +2,7 @@
#include <CGAL/Surface_mesh.h> #include <CGAL/Surface_mesh.h>
#include <CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Edge_count_ratio_stop_predicate.h> #include <CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Edge_count_ratio_stop_predicate.h>
#include <CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Bounded_normal_change_placement.h> #include <CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Bounded_normal_change_filter.h>
#include <CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_policies.h> #include <CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_policies.h>
#include <CGAL/Surface_mesh_simplification/edge_collapse.h> #include <CGAL/Surface_mesh_simplification/edge_collapse.h>
@ -38,16 +38,17 @@ void collapse_gh(Surface_mesh& mesh,
typedef typename GHPolicies::Get_cost GH_cost; typedef typename GHPolicies::Get_cost GH_cost;
typedef typename GHPolicies::Get_placement GH_placement; typedef typename GHPolicies::Get_placement GH_placement;
typedef SMS::Bounded_normal_change_placement<GH_placement> Bounded_GH_placement; typedef SMS::Bounded_normal_change_filter<> Filter;
GHPolicies gh_policies(mesh); GHPolicies gh_policies(mesh);
const GH_cost& gh_cost = gh_policies.get_cost(); const GH_cost& gh_cost = gh_policies.get_cost();
const GH_placement& gh_placement = gh_policies.get_placement(); const GH_placement& gh_placement = gh_policies.get_placement();
Bounded_GH_placement placement(gh_placement); Filter filter;
int r = SMS::edge_collapse(mesh, stop, int r = SMS::edge_collapse(mesh, stop,
CGAL::parameters::get_cost(gh_cost) CGAL::parameters::get_cost(gh_cost)
.get_placement(placement)); .filter(filter)
.get_placement(gh_placement));
std::chrono::steady_clock::time_point end_time = std::chrono::steady_clock::now(); std::chrono::steady_clock::time_point end_time = std::chrono::steady_clock::now();