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

Merge pull request #6309 from sloriot/PMP-size_t_FT 

Avoid std::size_t to FT conversion
This commit is contained in:
Laurent Rineau 2022-02-10 22:59:48 +01:00
parent d411bf42c6 62b54dab3f
commit 19f16f4719
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Hole_filling/Triangulate_hole_polyline.h
View File

@ -1244,7 +1244,7 @@ bool is_planar_2(
const Squared_distance_3 squared_distance_3 =
traits.compute_squared_distance_3_object();
const std::size_t n = points.size() - 1; // the first equals to the last
const double n = static_cast<double>(points.size() - 1); // the first equals to the last
if (n < 3) {
return false; // cant be a plane!
}
@ -1256,8 +1256,8 @@ bool is_planar_2(
// Compute covariance matrix.
FT xx = FT(0), yy = FT(0), zz = FT(0);
FT xy = FT(0), xz = FT(0), yz = FT(0);
for (std::size_t i = 0; i < n; ++i) {
const Point_3& p = points[i];
for (const Point_3& p : points)
{
const FT dx = p.x() - centroid.x();
const FT dy = p.y() - centroid.y();
const FT dz = p.z() - centroid.z();
@ -1281,12 +1281,12 @@ bool is_planar_2(
CGAL_assertion(avg_normal != typename Traits::Vector_3());
const Plane_3 plane = Plane_3(centroid, avg_normal);
FT avg_squared_distance = FT(0);
for (std::size_t i = 0; i < n; ++i) {
const Point_3& p = points[i];
for (const Point_3& p : points)
{
const Point_3 q = projection_3(plane, p);
avg_squared_distance += CGAL::abs(squared_distance_3(p, q));
}
avg_squared_distance /= static_cast<FT>(n);
avg_squared_distance /= FT(n);
// std::cout << "avg squared distance: " << avg_squared_distance << std::endl;
CGAL_assertion(max_squared_distance >= FT(0));
@ -1327,7 +1327,7 @@ triangulate_hole_polyline_with_cdt(const PointRange& points,
}
FT x = FT(0), y = FT(0), z = FT(0);
std::size_t num_normals = 0;
int num_normals = 0;
const Point_3& ref_point = P[0];
const std::size_t size = P.size() - 1;
for (std::size_t i = 1; i < size - 1; ++i) {
@ -1362,9 +1362,10 @@ triangulate_hole_polyline_with_cdt(const PointRange& points,
}
// Setting the final normal.
x /= static_cast<FT>(num_normals);
y /= static_cast<FT>(num_normals);
z /= static_cast<FT>(num_normals);
FT ft_nn(num_normals);
x /= ft_nn;
y /= ft_nn;
z /= ft_nn;
const Vector_3 avg_normal = Vector_3(x, y, z);
// std::cout << "avg normal: " << avg_normal << std::endl;