Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change inclusion order to check dependencies #8010

Merged
merged 2 commits into from
Feb 22, 2024
Merged

Change inclusion order to check dependencies #8010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d7b080
PMP: Change inclusion order to check dependencies
afabri Jan 31, 2024
5b187bd
Provide a fix for distance.h
afabri Jan 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...n_mesh_processing/examples/Polygon_mesh_processing/corefinement_parallel_union_meshes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel;
typedef Kernel::Point_3 Point_3;
typedef Kernel::Aff_transformation_3 Aff_transformation_3;
sloriot marked this conversation as resolved.
Show resolved Hide resolved
typedef CGAL::Surface_mesh<Point_3> Mesh;

namespace PMP = CGAL::Polygon_mesh_processing;
Expand All @@ -23,7 +24,7 @@ int main(int argc, char** argv)
in >> meshes[0];
for (int i=1; i<nb_copies; ++i)
{
CGAL::Aff_transformation_3<Kernel> trans(CGAL::Translation(), Kernel::Vector_3(i*0.2, 0, 0));
Aff_transformation_3 trans(CGAL::Translation(), Kernel::Vector_3(i*0.2, 0, 0));
meshes[i]=meshes[0];
PMP::transform(trans, meshes[i]);
}
Expand Down
13 changes: 6 additions & 7 deletions ..._processing/examples/Polygon_mesh_processing/hausdorff_bounded_error_distance_example.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Aff_transformation_3.h>
#include <CGAL/IO/OFF.h>

#include <CGAL/Surface_mesh.h>
Expand All @@ -8,15 +7,15 @@
#include <CGAL/Polygon_mesh_processing/distance.h>
#include <CGAL/Polygon_mesh_processing/transform.h>

using Kernel = CGAL::Exact_predicates_inexact_constructions_kernel;
using FT = typename Kernel::FT;
using Point_3 = typename Kernel::Point_3;
using Vector_3 = typename Kernel::Vector_3;

using Kernel = CGAL::Exact_predicates_inexact_constructions_kernel;
using FT = typename Kernel::FT;
using Point_3 = typename Kernel::Point_3;
using Vector_3 = typename Kernel::Vector_3;
using Affine_transformation_3 = typename Kernel::Aff_transformation_3;
using TAG = CGAL::Sequential_tag;
using Surface_mesh = CGAL::Surface_mesh<Point_3>;
using Polyhedron = CGAL::Polyhedron_3<Kernel>;
using Affine_transformation_3 = CGAL::Aff_transformation_3<Kernel>;


namespace PMP = CGAL::Polygon_mesh_processing;

Expand Down
22 changes: 13 additions & 9 deletions Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/distance.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1449,6 +1449,8 @@ bounded_error_squared_Hausdorff_distance_impl(const TriangleMesh1& tm1,
using Point_3 = typename Kernel::Point_3;
using Triangle_3 = typename Kernel::Triangle_3;

auto midpoint = Kernel().construct_midpoint_3_object();

#ifdef CGAL_HAUSDORFF_DEBUG
std::cout << " -- Bounded Hausdorff --" << std::endl;
std::cout << "error bound: " << error_bound << std::endl;
Expand Down Expand Up @@ -1645,9 +1647,9 @@ bounded_error_squared_Hausdorff_distance_impl(const TriangleMesh1& tm1,
}

// Subdivide the triangle into four smaller triangles.
const Point_3 v01 = CGAL::midpoint(v0, v1);
const Point_3 v02 = CGAL::midpoint(v0, v2);
const Point_3 v12 = CGAL::midpoint(v1, v2);
const Point_3 v01 = midpoint(v0, v1);
const Point_3 v02 = midpoint(v0, v2);
const Point_3 v12 = midpoint(v1, v2);
const std::array<Triangle_3, 4> sub_triangles = { Triangle_3(v0, v01, v02), Triangle_3(v1 , v01, v12),
Triangle_3(v2, v02, v12), Triangle_3(v01, v02, v12) };

Expand Down Expand Up @@ -2372,17 +2374,19 @@ typename Kernel::FT recursive_hausdorff_subdivision(const typename Kernel::Point
using FT = typename Kernel::FT;
using Point_3 = typename Kernel::Point_3;

auto midpoint = Kernel().construct_midpoint_3_object();
auto squared_distance = Kernel().compute_squared_distance_3_object();
// If all edge lengths of the triangle are below the error bound,
// return the maximum of the distances of the three points to TM2 (via TM2_tree).
const FT max_squared_edge_length = (CGAL::max)((CGAL::max)(CGAL::squared_distance(p0, p1),
CGAL::squared_distance(p0, p2)),
CGAL::squared_distance(p1, p2));
const FT max_squared_edge_length = (CGAL::max)((CGAL::max)(squared_distance(p0, p1),
squared_distance(p0, p2)),
squared_distance(p1, p2));

if(max_squared_edge_length < sq_error_bound)
{
return (CGAL::max)((CGAL::max)(CGAL::squared_distance(p0, tm2_tree.closest_point(p0)),
CGAL::squared_distance(p1, tm2_tree.closest_point(p1))),
CGAL::squared_distance(p2, tm2_tree.closest_point(p2)));
return (CGAL::max)((CGAL::max)(squared_distance(p0, tm2_tree.closest_point(p0)),
squared_distance(p1, tm2_tree.closest_point(p1))),
squared_distance(p2, tm2_tree.closest_point(p2)));
}

// Else subdivide the triangle and proceed recursively.
Expand Down
9 changes: 5 additions & 4 deletions Polygon_mesh_processing/test/Polygon_mesh_processing/delaunay_remeshing_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>

#include <CGAL/Surface_mesh.h>
#include <CGAL/Polyhedron_3.h>
#include <CGAL/Polygon_mesh_processing/detect_features.h>
#include <CGAL/Polygon_mesh_processing/surface_Delaunay_remeshing.h>
#include <CGAL/Polygon_mesh_processing/IO/polygon_mesh_io.h>

#include <CGAL/Surface_mesh.h>
#include <CGAL/Polyhedron_3.h>

#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>

#include <vector>
#include <fstream>

Expand Down
4 changes: 3 additions & 1 deletion Polygon_mesh_processing/test/Polygon_mesh_processing/extrude_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#include <CGAL/Polygon_mesh_processing/extrude.h>

#include <CGAL/Surface_mesh.h>
#include <CGAL/Polyhedron_3.h>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Polygon_mesh_processing/extrude.h>

#include <iostream>
#include <fstream>

Expand Down
7 changes: 4 additions & 3 deletions Polygon_mesh_processing/test/Polygon_mesh_processing/fairing_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Polygon_mesh_processing/fair.h>

#include <CGAL/Surface_mesh.h>

#include <CGAL/Polygon_mesh_processing/fair.h>
#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>

#include <CGAL/Timer.h>

Expand Down
7 changes: 3 additions & 4 deletions Polygon_mesh_processing/test/Polygon_mesh_processing/measures_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#include <CGAL/Polygon_mesh_processing/measure.h>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
#include <CGAL/Polygon_mesh_processing/bbox.h>

#include <CGAL/Polyhedron_3.h>
#include <CGAL/Surface_mesh.h>

#include <CGAL/Polygon_mesh_processing/bbox.h>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Exact_predicates_exact_constructions_kernel.h>

#include <CGAL/Bbox_3.h>

Expand Down Expand Up @@ -376,4 +376,3 @@ int main(int argc, char* argv[])
std::cerr << "All done." << std::endl;
return 0;
}

8 changes: 5 additions & 3 deletions Polygon_mesh_processing/test/Polygon_mesh_processing/orient_polygon_mesh_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
#include <CGAL/Polygon_mesh_processing/orientation.h>

#include <CGAL/Polyhedron_3.h>
#include <CGAL/Surface_mesh.h>
#include <CGAL/Polygon_mesh_processing/orientation.h>

#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Exact_predicates_exact_constructions_kernel.h>

#include <CGAL/Timer.h>

Expand Down
20 changes: 11 additions & 9 deletions Polygon_mesh_processing/test/Polygon_mesh_processing/orient_polygon_soup_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Exact_predicates_exact_constructions_kernel.h>

#include <CGAL/Polyhedron_3.h>
#include <CGAL/Surface_mesh.h>

#include <CGAL/Cartesian_converter.h>
#include <CGAL/IO/polygon_mesh_io.h>
#include <CGAL/IO/polygon_soup_io.h>
#include <CGAL/Polygon_mesh_processing/polygon_soup_to_polygon_mesh.h>
#include <CGAL/Polygon_mesh_processing/polygon_mesh_to_polygon_soup.h>
#include <CGAL/Polygon_mesh_processing/orientation.h>
#include <CGAL/Polygon_mesh_processing/orient_polygon_soup.h>
#include <CGAL/Polygon_mesh_processing/orient_polygon_soup_extension.h>

#include <CGAL/IO/polygon_mesh_io.h>
#include <CGAL/IO/polygon_soup_io.h>

#include <CGAL/Polyhedron_3.h>
#include <CGAL/Surface_mesh.h>

#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Exact_predicates_exact_constructions_kernel.h>

#include <CGAL/Cartesian_converter.h>

#include <algorithm>
#include <cstdlib>
#include <fstream>
Expand Down
11 changes: 6 additions & 5 deletions Polygon_mesh_processing/test/Polygon_mesh_processing/pmp_compute_normals_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
// #define CGAL_PMP_COMPUTE_NORMAL_DEBUG_PP

#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
//#include <CGAL/Exact_predicates_exact_constructions_kernel_with_sqrt.h>
#include <CGAL/Polygon_mesh_processing/compute_normal.h>
#include <CGAL/Polygon_mesh_processing/bbox.h>
#include <CGAL/Polygon_mesh_processing/shape_predicates.h>

#include <CGAL/Surface_mesh.h>
#include <CGAL/Polyhedron_3.h>

#include <CGAL/centroid.h>
#include <CGAL/Polygon_mesh_processing/compute_normal.h>
#include <CGAL/Polygon_mesh_processing/bbox.h>
#include <CGAL/Polygon_mesh_processing/shape_predicates.h>

#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
//#include <CGAL/Exact_predicates_exact_constructions_kernel_with_sqrt.h>

#include <iostream>
#include <fstream>
Expand Down
14 changes: 7 additions & 7 deletions Polygon_mesh_processing/test/Polygon_mesh_processing/pmp_do_intersect_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
#include <CGAL/Polygon_mesh_processing/intersection.h>

#include <cstdlib>
#include <iostream>
#include <fstream>
#include <sstream>
#include <CGAL/Surface_mesh.h>

#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
#include <CGAL/Polygon_mesh_processing/intersection.h>

#include <CGAL/Surface_mesh.h>

#include <CGAL/Timer.h>

#include <cstdlib>
#include <iostream>
#include <fstream>
#include <sstream>

typedef CGAL::Exact_predicates_inexact_constructions_kernel Epic;
typedef CGAL::Exact_predicates_exact_constructions_kernel Epec;

Expand Down
3 changes: 1 addition & 2 deletions ...on_mesh_processing/test/Polygon_mesh_processing/point_inside_polyhedron_boundary_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@

#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Side_of_triangle_mesh.h>
#include <CGAL/Polyhedron_3.h>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>

#include "point_inside_helpers.h"

Expand Down
6 changes: 3 additions & 3 deletions Polygon_mesh_processing/test/Polygon_mesh_processing/point_inside_surface_mesh_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#include <CGAL/Side_of_triangle_mesh.h>

#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
#include <CGAL/Surface_mesh.h>
#include <CGAL/AABB_face_graph_triangle_primitive.h>
#include <CGAL/boost/graph/helpers.h>

#include <CGAL/Side_of_triangle_mesh.h>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Exact_predicates_exact_constructions_kernel.h>

#include "point_inside_helpers.h"

Expand Down
9 changes: 6 additions & 3 deletions Polygon_mesh_processing/test/Polygon_mesh_processing/polygon_mesh_slicer_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
// #define USE_SURFACE_MESH

#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
#include <CGAL/Polygon_mesh_slicer.h>

#ifdef USE_SURFACE_MESH
#include <CGAL/Surface_mesh.h>
#else
#include <CGAL/Polyhedron_3.h>
#endif

#include <CGAL/AABB_halfedge_graph_segment_primitive.h>

#include <CGAL/Polygon_mesh_slicer.h>
#include <CGAL/Polygon_mesh_processing/orientation.h>
#include <CGAL/AABB_tree.h>
#include <CGAL/AABB_traits.h>
#include <CGAL/Polygon_2.h>

#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Exact_predicates_exact_constructions_kernel.h>

#include <fstream>
#include <cassert>

Expand Down
6 changes: 4 additions & 2 deletions Polygon_mesh_processing/test/Polygon_mesh_processing/remeshing_quality_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Surface_mesh.h>
#include <CGAL/Polygon_mesh_processing/remesh.h>
#include <CGAL/Polygon_mesh_processing/Adaptive_sizing_field.h>
#include <CGAL/Polygon_mesh_processing/IO/polygon_mesh_io.h>

#include <CGAL/Surface_mesh.h>

#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>

#include <fstream>
#include <limits>

Expand Down
9 changes: 5 additions & 4 deletions Polygon_mesh_processing/test/Polygon_mesh_processing/remeshing_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,18 @@
//#define CGAL_PMP_REMESHING_VERY_VERBOSE
//#define CGAL_PMP_REMESHING_EXPENSIVE_DEBUG

#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>

#include <CGAL/Surface_mesh.h>

#include <CGAL/Polygon_mesh_processing/remesh.h>
#include <CGAL/Polygon_mesh_processing/border.h>
#include <CGAL/Polygon_mesh_processing/connected_components.h>
#include <CGAL/Polygon_mesh_processing/self_intersections.h>
#include <CGAL/Polygon_mesh_processing/detect_features.h>

#include <CGAL/Surface_mesh.h>

#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>

#include <CGAL/Timer.h>

#include <fstream>
#include <vector>
#include <cstdlib>
Expand Down
11 changes: 7 additions & 4 deletions Polygon_mesh_processing/test/Polygon_mesh_processing/remeshing_test_P_SM_OM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Polygon_mesh_processing/remesh.h>

#include <CGAL/Surface_mesh.h>
#include <CGAL/Polyhedron_3.h>
#include <fstream>
#include <map>
#include <OpenMesh/Core/IO/MeshIO.hh>
#include <OpenMesh/Core/Mesh/PolyMesh_ArrayKernelT.hh>
#include <OpenMesh/Core/Mesh/TriMesh_ArrayKernelT.hh>
#include <CGAL/boost/graph/graph_traits_PolyMesh_ArrayKernelT.h>
#include <CGAL/boost/graph/graph_traits_TriMesh_ArrayKernelT.h>
#include <CGAL/Polygon_mesh_processing/remesh.h>

#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>

#include <fstream>
#include <map>

namespace PMP = CGAL::Polygon_mesh_processing;

Expand Down
9 changes: 5 additions & 4 deletions ...mesh_processing/test/Polygon_mesh_processing/remeshing_with_isolated_constraints_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Surface_mesh.h>
#include <CGAL/Polygon_mesh_processing/remesh.h>
#include <CGAL/Polygon_mesh_processing/triangulate_faces.h>

#include <CGAL/Surface_mesh.h>
#include <CGAL/boost/graph/helpers.h>
#include <CGAL/boost/graph/generators.h>
#include <CGAL/Polygon_mesh_processing/remesh.h>
#include <CGAL/Polygon_mesh_processing/triangulate_faces.h>

#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>

#include <fstream>
#include <iostream>
Expand Down
16 changes: 8 additions & 8 deletions Polygon_mesh_processing/test/Polygon_mesh_processing/self_intersection_polyhedron_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
#include <cstdlib>
#include <iostream>
#include <fstream>
#include <sstream>
#include <CGAL/Polygon_mesh_processing/self_intersections.h>

#include <CGAL/Polyhedron_3.h>
#include <CGAL/Timer.h>

#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Exact_predicates_exact_constructions_kernel.h>

#include <CGAL/Polyhedron_3.h>
#include <CGAL/Polygon_mesh_processing/self_intersections.h>

#include <CGAL/Timer.h>
#include <cstdlib>
#include <iostream>
#include <fstream>
#include <sstream>

typedef CGAL::Exact_predicates_inexact_constructions_kernel Epic;
typedef CGAL::Exact_predicates_exact_constructions_kernel Epec;
Expand Down
Loading