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

Scale_space_reconstruction

This commit is contained in:
Andreas Fabri 2022-10-14 10:34:54 +01:00
parent fb1b02eb94
commit 46969d6cf4
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Scale_space_reconstruction_3/include/CGAL/Scale_space_reconstruction_3/Alpha_shape_mesher.h
View File

@ -559,9 +559,6 @@ private:
{ {
std::set<Cell_handle> done; std::set<Cell_handle> done;
unsigned int nb_facets_removed = 0;
unsigned int nb_skipped = 0;
for (Cell_iterator cit = _shape->cells_begin (); cit != _shape->cells_end (); ++ cit) for (Cell_iterator cit = _shape->cells_begin (); cit != _shape->cells_end (); ++ cit)
{ {
if (_shape->is_infinite (cit)) if (_shape->is_infinite (cit))
@ -702,7 +699,6 @@ private:
} }
else else
{ {
nb_facets_removed ++;
mark_handled (f); mark_handled (f);
_garbage.push_back (ordered_facet_indices (f)); _garbage.push_back (ordered_facet_indices (f));
} }
@ -716,7 +712,6 @@ private:
} }
else else
{ {
nb_facets_removed ++;
mark_handled (_shape->mirror_facet (f)); mark_handled (_shape->mirror_facet (f));
_garbage.push_back (ordered_facet_indices (_shape->mirror_facet (f))); _garbage.push_back (ordered_facet_indices (_shape->mirror_facet (f)));
} }
@ -782,7 +777,6 @@ private:
// If number of layers is != 2, ignore volume and discard bubble // If number of layers is != 2, ignore volume and discard bubble
if (layer != 1) if (layer != 1)
{ {
nb_skipped ++;
for (unsigned int i = 0; i < 2; ++ i) for (unsigned int i = 0; i < 2; ++ i)
for (typename std::set<SFacet>::iterator fit = _bubbles.back()[i].begin (); for (typename std::set<SFacet>::iterator fit = _bubbles.back()[i].begin ();
fit != _bubbles.back()[i].end (); ++ fit) fit != _bubbles.back()[i].end (); ++ fit)
@ -790,7 +784,6 @@ private:
mark_handled (*fit); mark_handled (*fit);
_map_f2b.erase (*fit); _map_f2b.erase (*fit);
_garbage.push_back (ordered_facet_indices (*fit)); _garbage.push_back (ordered_facet_indices (*fit));
nb_facets_removed ++;
} }
_bubbles.pop_back (); _bubbles.pop_back ();
} }
@ -805,10 +798,6 @@ private:
typedef std::map<std::pair<VEdge, unsigned int>, std::set<Facet> > Edge_shell_map_triples; typedef std::map<std::pair<VEdge, unsigned int>, std::set<Facet> > Edge_shell_map_triples;
typedef typename Edge_shell_map_triples::iterator Edge_shell_map_triples_iterator; typedef typename Edge_shell_map_triples::iterator Edge_shell_map_triples_iterator;
unsigned int nb_facets_removed = 0;
unsigned int nb_nm_edges = 0;
// Store for each pair edge/shell the incident facets // Store for each pair edge/shell the incident facets
Edge_shell_map_triples eshell_triples; Edge_shell_map_triples eshell_triples;
std::map<Facet, SFacet> map_t2f; std::map<Facet, SFacet> map_t2f;
@ -841,8 +830,6 @@ private:
if (eit->second.size () < 3) if (eit->second.size () < 3)
continue; continue;
++ nb_nm_edges;
Facet_iterator tit = _shells[eit->first.second]; Facet_iterator tit = _shells[eit->first.second];
Facet_iterator end = (eit->first.second == _shells.size () - 1) Facet_iterator end = (eit->first.second == _shells.size () - 1)
? _surface.end () : _shells[eit->first.second + 1]; ? _surface.end () : _shells[eit->first.second + 1];
@ -863,7 +850,6 @@ private:
_map_f2s.erase (map_t2f[*current]); _map_f2s.erase (map_t2f[*current]);
_surface.erase (current); _surface.erase (current);
++ nb_facets_removed;
eit->second.erase (search); eit->second.erase (search);
} }
@ -931,14 +917,12 @@ private:
_surface.splice(end, tmp, tmp.begin(), tmp.end()); _surface.splice(end, tmp, tmp.begin(), tmp.end());
} }
unsigned int nb_facets_removed = 0;
unsigned int nb_nm_vertices = 0; unsigned int nb_nm_vertices = 0;
// Removing facets to fix non-manifold vertices might make some other vertices // Removing facets to fix non-manifold vertices might make some other vertices
// become non-manifold, therefore we iterate until no facet needs to be removed. // become non-manifold, therefore we iterate until no facet needs to be removed.
do do
{ {
nb_nm_vertices = 0; nb_nm_vertices = 0;
nb_facets_removed = 0;
// Store for each pair vertex/shell the incident facets // Store for each pair vertex/shell the incident facets
Vertex_shell_map_facets vshell_facets; Vertex_shell_map_facets vshell_facets;
@ -1052,7 +1036,6 @@ private:
_garbage.push_back (*current); _garbage.push_back (*current);
_surface.erase (current); _surface.erase (current);
++ nb_facets_removed;
++ tindex; ++ tindex;
} }