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

Tetranedral_remeshing

This commit is contained in:
Andreas Fabri 2022-10-13 07:47:13 +01:00
parent 0346bec7fa
commit f002f06642
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/smooth_vertices.h
View File

@ -414,10 +414,11 @@ public:
#ifdef CGAL_TETRAHEDRAL_REMESHING_VERBOSE #ifdef CGAL_TETRAHEDRAL_REMESHING_VERBOSE
std::cout << "Smooth vertices..."; std::cout << "Smooth vertices...";
std::cout.flush(); std::cout.flush();
#endif
std::size_t nb_done_3d = 0; std::size_t nb_done_3d = 0;
std::size_t nb_done_2d = 0; std::size_t nb_done_2d = 0;
std::size_t nb_done_1d = 0; std::size_t nb_done_1d = 0;
#endif
FT total_move = 0.; FT total_move = 0.;
Tr& tr = c3t3.triangulation(); Tr& tr = c3t3.triangulation();
@ -540,8 +541,11 @@ public:
#endif #endif
// move vertex // move vertex
const typename Tr::Point new_pos(final_position.x(), final_position.y(), final_position.z()); const typename Tr::Point new_pos(final_position.x(), final_position.y(), final_position.z());
if(check_inversion_and_move(v, new_pos, inc_cells[vid], tr, total_move)) if(check_inversion_and_move(v, new_pos, inc_cells[vid], tr, total_move)){
#ifdef CGAL_TETRAHEDRAL_REMESHING_VERBOSE
nb_done_1d++; nb_done_1d++;
#endif
}
} }
else if (neighbors[vid] > 0) else if (neighbors[vid] > 0)
{ {
@ -574,8 +578,11 @@ public:
#endif #endif
// move vertex // move vertex
const typename Tr::Point new_pos(final_position.x(), final_position.y(), final_position.z()); const typename Tr::Point new_pos(final_position.x(), final_position.y(), final_position.z());
if(check_inversion_and_move(v, new_pos, inc_cells[vid], tr, total_move)) if(check_inversion_and_move(v, new_pos, inc_cells[vid], tr, total_move)){
#ifdef CGAL_TETRAHEDRAL_REMESHING_VERBOSE
nb_done_1d++; nb_done_1d++;
#endif
}
} }
} }
} }
@ -647,8 +654,11 @@ public:
os_surf << "2 " << current_pos << " " << final_position << std::endl; os_surf << "2 " << current_pos << " " << final_position << std::endl;
#endif #endif
const typename Tr::Point new_pos(final_position.x(), final_position.y(), final_position.z()); const typename Tr::Point new_pos(final_position.x(), final_position.y(), final_position.z());
if(check_inversion_and_move(v, new_pos, inc_cells[vid], tr, total_move)) if(check_inversion_and_move(v, new_pos, inc_cells[vid], tr, total_move)){
#ifdef CGAL_TETRAHEDRAL_REMESHING_VERBOSE
nb_done_2d++; nb_done_2d++;
#endif
}
} }
else if (neighbors[vid] > 0) else if (neighbors[vid] > 0)
{ {
@ -660,8 +670,11 @@ public:
if (boost::optional<Vector_3> mls_projection = project(si, current_pos)) if (boost::optional<Vector_3> mls_projection = project(si, current_pos))
{ {
const typename Tr::Point new_pos(CGAL::ORIGIN + *mls_projection); const typename Tr::Point new_pos(CGAL::ORIGIN + *mls_projection);
if(check_inversion_and_move(v, new_pos, inc_cells[vid], tr, total_move)) if(check_inversion_and_move(v, new_pos, inc_cells[vid], tr, total_move)){
#ifdef CGAL_TETRAHEDRAL_REMESHING_VERBOSE
nb_done_2d++; nb_done_2d++;
#endif
}
#ifdef CGAL_TETRAHEDRAL_REMESHING_DEBUG #ifdef CGAL_TETRAHEDRAL_REMESHING_DEBUG
os_surf0 << "2 " << current_pos << " " << new_pos << std::endl; os_surf0 << "2 " << current_pos << " " << new_pos << std::endl;
@ -715,8 +728,11 @@ public:
#endif #endif
const Vector_3 p = smoothed_positions[vid] / static_cast<FT>(neighbors[vid]); const Vector_3 p = smoothed_positions[vid] / static_cast<FT>(neighbors[vid]);
typename Tr::Point new_pos(p.x(), p.y(), p.z()); typename Tr::Point new_pos(p.x(), p.y(), p.z());
if(check_inversion_and_move(v, new_pos, inc_cells[vid], tr, total_move)) if(check_inversion_and_move(v, new_pos, inc_cells[vid], tr, total_move)){
#ifdef CGAL_TETRAHEDRAL_REMESHING_VERBOSE
nb_done_3d++; nb_done_3d++;
#endif
}
#ifdef CGAL_TETRAHEDRAL_REMESHING_DEBUG #ifdef CGAL_TETRAHEDRAL_REMESHING_DEBUG
os_vol << " " << point(v->point()) << std::endl; os_vol << " " << point(v->point()) << std::endl;