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

Remove the adaptive sizing field dependency in remesh.h

This commit is contained in:
Ivan Paden 2023-08-06 12:16:31 +02:00
parent 1f2c0f2471
commit 00b4b93d1c
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Polygon_mesh_processing/examples/Polygon_mesh_processing/CMakeLists.txt
View File

@ -25,8 +25,8 @@ create_single_source_cgal_program("orient_polygon_soup_example.cpp")
create_single_source_cgal_program("triangulate_polyline_example.cpp")
create_single_source_cgal_program("mesh_slicer_example.cpp")
#create_single_source_cgal_program( "remove_degeneracies_example.cpp")
#create_single_source_cgal_program("isotropic_remeshing_example.cpp")
#create_single_source_cgal_program("isotropic_remeshing_of_patch_example.cpp")
create_single_source_cgal_program("isotropic_remeshing_example.cpp")
create_single_source_cgal_program("isotropic_remeshing_of_patch_example.cpp")
create_single_source_cgal_program("tangential_relaxation_example.cpp")
create_single_source_cgal_program("surface_mesh_intersection.cpp")
create_single_source_cgal_program("corefinement_SM.cpp")
@ -69,10 +69,6 @@ if(TARGET CGAL::Eigen3_support)
target_link_libraries(hole_filling_example_LCC PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("mesh_smoothing_example.cpp")
target_link_libraries(mesh_smoothing_example PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("isotropic_remeshing_example.cpp")
target_link_libraries(isotropic_remeshing_example PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("isotropic_remeshing_of_patch_example.cpp")
target_link_libraries(isotropic_remeshing_of_patch_example PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("isotropic_remeshing_with_sizing_example.cpp")
target_link_libraries(isotropic_remeshing_with_sizing_example PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("delaunay_remeshing_example.cpp")

1
Polygon_mesh_processing/examples/Polygon_mesh_processing/isotropic_remeshing_with_sizing_example.cpp
View File

@ -2,6 +2,7 @@
#include <CGAL/Surface_mesh.h>
#include <CGAL/Polygon_mesh_processing/remesh.h>
#include <CGAL/Polygon_mesh_processing/IO/polygon_mesh_io.h>
#include <CGAL/Polygon_mesh_processing/internal/Isotropic_remeshing/Adaptive_sizing_field.h>
#include <fstream>

1
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Isotropic_remeshing/Adaptive_sizing_field.h
View File

@ -79,6 +79,7 @@ private:
template <typename FaceGraph>
void calc_sizing_map(FaceGraph& face_graph)
{
//todo ip: please check if this is good enough to store curvature
typedef Principal_curvatures_and_directions<K> Principal_curvatures;
typedef typename CGAL::dynamic_vertex_property_t<Principal_curvatures> Vertex_curvature_tag;
typedef typename boost::property_map<FaceGraph,

1
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/remesh.h
View File

@ -19,7 +19,6 @@
#include <CGAL/Polygon_mesh_processing/internal/Isotropic_remeshing/remesh_impl.h>
#include <CGAL/Polygon_mesh_processing/internal/Isotropic_remeshing/Uniform_sizing_field.h>
#include <CGAL/Polygon_mesh_processing/internal/Isotropic_remeshing/Adaptive_sizing_field.h>
#include <CGAL/Named_function_parameters.h>
#include <CGAL/boost/graph/named_params_helper.h>

3
Polyhedron/demo/Polyhedron/Plugins/PMP/Isotropic_remeshing_plugin.cpp
View File

@ -14,6 +14,7 @@
#include <CGAL/iterator.h>
#include <CGAL/Polygon_mesh_processing/remesh.h>
#include <CGAL/Polygon_mesh_processing/internal/Isotropic_remeshing/Adaptive_sizing_field.h>
#include <CGAL/Polygon_mesh_processing/triangulate_faces.h>
#include <CGAL/utility.h>
#include <CGAL/property_map.h>
@ -405,6 +406,7 @@ public Q_SLOTS:
else //not edges_only
{
if(protect &&
edge_sizing_type == 0 && //todo ip: current solution for adaptive remeshing
!CGAL::Polygon_mesh_processing::internal::constraints_are_short_enough(
*selection_item->polyhedron(),
selection_item->constrained_edges_pmap(),
@ -672,6 +674,7 @@ public Q_SLOTS:
}
if(protect &&
edge_sizing_type == 0 && //todo ip: current solution for adaptive remeshing
!CGAL::Polygon_mesh_processing::internal::constraints_are_short_enough(
pmesh,
ecm,