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

fix compilation with some C3t3 types

This commit is contained in:
Jane Tournois 2020-04-24 08:02:07 +02:00
parent 02e7841421
commit 0039cf45cc
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/FMLS.h
View File

@ -566,9 +566,12 @@ void createMLSSurfaces(Subdomain__FMLS& subdomain_FMLS,
if (upsample > 0)
{
#ifdef CGAL_TETRAHEDRAL_REMESHING_VERBOSE
std::cout << "Up sampling MLS " << upsample << std::endl;
for (typename C3t3::Facet_iterator fit = c3t3.facets_begin();
fit != c3t3.facets_end(); ++fit)
#endif
for (typename C3t3::Facets_in_complex_iterator
fit = c3t3.facets_in_complex_begin();
fit != c3t3.facets_in_complex_end(); ++fit)
{
const Surface_index surf_i = c3t3.surface_patch_index(*fit);
if (upsample == 1)
@ -629,8 +632,9 @@ void createMLSSurfaces(Subdomain__FMLS& subdomain_FMLS,
{
std::unordered_set<Edge_vv, boost::hash<Edge_vv> > edgeMap;
for (typename C3t3::Facet_iterator fit = c3t3.facets_begin();
fit != c3t3.facets_end(); ++fit)
for (typename C3t3::Facets_in_complex_iterator
fit = c3t3.facets_in_complex_begin();
fit != c3t3.facets_in_complex_end(); ++fit)
{
for (int i = 0; i < 2; i++)
{
@ -661,8 +665,9 @@ void createMLSSurfaces(Subdomain__FMLS& subdomain_FMLS,
if (upsample > 0)
{
for (typename C3t3::Facet_iterator fit = c3t3.facets_begin();
fit != c3t3.facets_end(); ++fit)
for (typename C3t3::Facets_in_complex_iterator
fit = c3t3.facets_in_complex_begin();
fit != c3t3.facets_in_complex_end(); ++fit)
{
const Surface_index surf_i = c3t3.surface_patch_index(*fit);

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

@ -368,8 +368,9 @@ private:
boost::unordered_map<Vertex_handle,
std::vector<Surface_patch_index> >& vertices_surface_indices)
{
for (typename C3t3::Facet_iterator fit = c3t3.facets_begin();
fit != c3t3.facets_end(); ++fit)
for (typename C3t3::Facets_in_complex_iterator
fit = c3t3.facets_in_complex_begin();
fit != c3t3.facets_in_complex_end(); ++fit)
{
const Surface_patch_index& surface_index = c3t3.surface_patch_index(*fit);

2
Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/tetrahedral_adaptive_remeshing_impl.h
View File

@ -469,7 +469,7 @@ private:
if(m_c3t3.number_of_facets() == 0)
patch = 1;
else
patch = m_c3t3.surface_patch_index(*m_c3t3.facets_begin());
patch = m_c3t3.surface_patch_index(*m_c3t3.facets_in_complex_begin());
}
void set_surface_patch_index_to_default(const Subdomain_index& s1,