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

Merge branch 'Poisson-use_parallel_mesh_3-GF' of github.com:janetournois/cgal into Poisson-use_parallel_mesh_3-GF

This commit is contained in:
Andreas Fabri 2024-05-21 11:02:06 +01:00
parent 74bcf248b3 34b4b2cdf7
commit a1e11d0f60
2 changed files with 107 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Poisson_surface_reconstruction_3/examples/Poisson_surface_reconstruction_3/poisson_and_parallel_mesh_3.cpp
View File

@ -84,7 +84,7 @@ void poisson_reconstruction(const PointSet& points, const char* output)
// Computes average spacing
FT average_spacing = CGAL::compute_average_spacing<Concurrency_tag>
(points, 6 /* knn = 1 ring */, params::point_map (Point_map()));
(points, 6 /* knn = 1 ring */, params::point_map(Point_map()));
time.stop();
std::cout << "Average spacing : " << time.time() << " seconds." << std::endl;
@ -113,7 +113,7 @@ void poisson_reconstruction(const PointSet& points, const char* output)
time.start();
// Defines surface mesh generation criteria
CGAL::Mesh_criteria_3<Tr> criteria(params::facet_angle = sm_angle,
Mesh_criteria criteria(params::facet_angle = sm_angle,
params::facet_size = sm_radius * average_spacing,
params::facet_distance = sm_distance * average_spacing);
@ -158,8 +158,8 @@ void poisson_reconstruction(const PointSet& points, const char* output)
int main(int argc, char* argv[])
{
const std::string file = (argc < 2) ? CGAL::data_file_path("points_3/kitten.xyz")
: std::string(argv[1]);
const std::string file = (argc > 1) ? std::string(argv[1])
: CGAL::data_file_path("points_3/kitten.xyz");
// Reads the point set file in points[].
// Note: read_points() requires an iterator over points

20
Poisson_surface_reconstruction_3/examples/Poisson_surface_reconstruction_3/poisson_reconstruction_example.cpp
View File

@ -36,24 +36,26 @@ typedef CGAL::Implicit_surface_3<Kernel, Poisson_reconstruction_function> Surfac
int main(int argc, char* argv[])
{
// Poisson options
FT sm_angle = 20.0; // Min triangle angle in degrees.
FT sm_radius = 100; // Max triangle size w.r.t. point set average spacing.
FT sm_distance = 0.25; // Surface Approximation error w.r.t. point set average spacing.
const std::string file = (argc > 1) ? std::string(argv[1])
: CGAL::data_file_path("points_3/kitten.xyz");
// Reads the point set file in points[].
// Note: read_points() requires an iterator over points
// + property maps to access each point's position and normal.
PointList points;
char* filename = argv[1];
if(!CGAL::IO::read_points(filename, std::back_inserter(points),
if(!CGAL::IO::read_points(file, std::back_inserter(points),
CGAL::parameters::point_map(Point_map())
.normal_map (Normal_map())))
.normal_map(Normal_map())))
{
std::cerr << "Error: cannot read file input file!" << std::endl;
return EXIT_FAILURE;
}
// Poisson options
FT sm_angle = 20.0; // Min triangle angle in degrees.
FT sm_radius = 100; // Max triangle size w.r.t. point set average spacing.
FT sm_distance = 0.25; // Surface Approximation error w.r.t. point set average spacing.
CGAL::Real_timer total_time;
total_time.start();
@ -66,7 +68,7 @@ int main(int argc, char* argv[])
// Computes the Poisson indicator function f()
// at each vertex of the triangulation.
if ( ! function.compute_implicit_function() )
if (!function.compute_implicit_function())
return EXIT_FAILURE;
// Computes average spacing
@ -114,7 +116,7 @@ int main(int argc, char* argv[])
return EXIT_FAILURE;
// saves reconstructed surface mesh
std::ofstream out("kitten_poisson-20-30-0.375.off");
std::ofstream out("poisson_surface.off");
Polyhedron output_mesh;
CGAL::facets_in_complex_2_to_triangle_mesh(c2t3, output_mesh);