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

Change default

This commit is contained in:
Andreas Fabri 2023-09-25 16:20:25 +01:00
parent eadd12cdb0
commit aad5976559
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Surface_mesh_approximation/include/CGAL/Variational_shape_approximation.h
View File

@ -799,7 +799,7 @@ public:
* \cgalParamNBegin{boundary_subdivision_ratio} * \cgalParamNBegin{boundary_subdivision_ratio}
* \cgalParamDescription{the chord subdivision ratio threshold to the chord length or average edge length for boundary edges} * \cgalParamDescription{the chord subdivision ratio threshold to the chord length or average edge length for boundary edges}
* \cgalParamType{`geom_traits::FT`} * \cgalParamType{`geom_traits::FT`}
* \cgalParamDefault{`5.0`} * \cgalParamDefault{`subdivision_ratio`}
* \cgalParamNEnd * \cgalParamNEnd
* *
* \cgalParamNBegin{relative_to_chord} * \cgalParamNBegin{relative_to_chord}
@ -840,7 +840,7 @@ public:
using parameters::choose_parameter; using parameters::choose_parameter;
const FT subdivision_ratio = choose_parameter(get_parameter(np, internal_np::subdivision_ratio), FT(5.0)); const FT subdivision_ratio = choose_parameter(get_parameter(np, internal_np::subdivision_ratio), FT(5.0));
const FT boundary_subdivision_ratio = choose_parameter(get_parameter(np, internal_np::boundary_subdivision_ratio), FT(5.0)); const FT boundary_subdivision_ratio = choose_parameter(get_parameter(np, internal_np::boundary_subdivision_ratio), subdivision_ratio);
const bool relative_to_chord = choose_parameter(get_parameter(np, internal_np::relative_to_chord), false); const bool relative_to_chord = choose_parameter(get_parameter(np, internal_np::relative_to_chord), false);
const bool with_dihedral_angle = choose_parameter(get_parameter(np, internal_np::with_dihedral_angle), false); const bool with_dihedral_angle = choose_parameter(get_parameter(np, internal_np::with_dihedral_angle), false);
const bool optimize_anchor_location = choose_parameter(get_parameter(np, internal_np::optimize_anchor_location), true); const bool optimize_anchor_location = choose_parameter(get_parameter(np, internal_np::optimize_anchor_location), true);
@ -1912,9 +1912,6 @@ private:
Segment_3 seg(pt_begin, pt_end); Segment_3 seg(pt_begin, pt_end);
chord_vec = scale_functor(chord_vec, FT(1.0) / chord_len); chord_vec = scale_functor(chord_vec, FT(1.0) / chord_len);
for (Boundary_chord_iterator citr = chord_begin; citr != chord_end; ++citr) { for (Boundary_chord_iterator citr = chord_begin; citr != chord_end; ++citr) {
//Vector_3 vec = vector_functor(pt_begin, m_vpoint_map[target(*citr, *m_ptm)]);
//vec = cross_product_functor(chord_vec, vec);
//const FT dist = CGAL::approximate_sqrt(vec.squared_length());
const FT dist = CGAL::approximate_sqrt(CGAL::squared_distance(m_vpoint_map[target(*citr, *m_ptm)], seg)); const FT dist = CGAL::approximate_sqrt(CGAL::squared_distance(m_vpoint_map[target(*citr, *m_ptm)], seg));
if (dist > dist_max) { if (dist > dist_max) {
chord_max = citr; chord_max = citr;
@ -1926,7 +1923,7 @@ private:
degenerate_chord = true; degenerate_chord = true;
for (Boundary_chord_iterator citr = chord_begin; citr != chord_end; ++citr) { for (Boundary_chord_iterator citr = chord_begin; citr != chord_end; ++citr) {
const FT dist = CGAL::approximate_sqrt(CGAL::squared_distance( const FT dist = CGAL::approximate_sqrt(CGAL::squared_distance(
pt_begin, m_vpoint_map[target(*citr, *m_ptm)])); pt_begin, m_vpoint_map[target(*citr, *m_ptm)]));
if (dist > dist_max) { if (dist > dist_max) {
chord_max = citr; chord_max = citr;
dist_max = dist; dist_max = dist;
@ -1949,7 +1946,7 @@ private:
FT norm_sin(1.0); FT norm_sin(1.0);
if (!CGAL::is_border(opposite(he_first, *m_ptm), *m_ptm)) { if (!CGAL::is_border(opposite(he_first, *m_ptm), *m_ptm)) {
Vector_3 vec = cross_product_functor( Vector_3 vec = cross_product_functor(
m_px_planes[px_left].normal, m_px_planes[px_right].normal); m_px_planes[px_left].normal, m_px_planes[px_right].normal);
norm_sin = CGAL::approximate_sqrt(vec.squared_length()); norm_sin = CGAL::approximate_sqrt(vec.squared_length());
} }
criterion *= norm_sin; criterion *= norm_sin;