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

name get_base similarly to the static arrangement functions

This commit is contained in:
Sébastien Loriot 2015-09-27 15:30:35 +02:00
parent 9968192330
commit e6c2511ef6
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_on_surface_base_2.h
View File

@ -936,19 +936,19 @@ protected:
} }
typename Aos_2::Dcel::Halfedge* typename Aos_2::Dcel::Halfedge*
get_base(Halfedge_handle h) _halfedge(Halfedge_handle h)
{ {
return static_cast<typename Aos_2::Dcel::Halfedge*>(&(*h)); return static_cast<typename Aos_2::Dcel::Halfedge*>(&(*h));
} }
typename Aos_2::Dcel::Vertex* typename Aos_2::Dcel::Vertex*
get_base(Vertex_handle v) _vertex(Vertex_handle v)
{ {
return static_cast<typename Aos_2::Dcel::Vertex*>(&(*v)); return static_cast<typename Aos_2::Dcel::Vertex*>(&(*v));
} }
typename Aos_2::Dcel::Face* typename Aos_2::Dcel::Face*
get_base(Face_handle f) _face(Face_handle f)
{ {
return static_cast<typename Aos_2::Dcel::Face*>(&(*f)); return static_cast<typename Aos_2::Dcel::Face*>(&(*f));
} }
@ -1107,12 +1107,12 @@ protected:
non_redundant_edges.push_back(non_redundant_edges.front()); non_redundant_edges.push_back(non_redundant_edges.front());
//update vertex halfedge //update vertex halfedge
get_base(vi)->set_halfedge(get_base(non_redundant_edges.back())); _vertex(vi)->set_halfedge(_halfedge(non_redundant_edges.back()));
for (std::size_t i=0; i<nb_edges; ++i) for (std::size_t i=0; i<nb_edges; ++i)
{ {
Halfedge_handle h1 = non_redundant_edges[i], h2=non_redundant_edges[i+1]; Halfedge_handle h1 = non_redundant_edges[i], h2=non_redundant_edges[i+1];
if ( h1->next()->twin()!=h2) if ( h1->next()->twin()!=h2)
get_base(h1)->set_next(get_base(h2->twin())); _halfedge(h1)->set_next(_halfedge(h2->twin()));
} }
} }
@ -1135,13 +1135,12 @@ protected:
it_end=uf_faces.end(); it!=it_end; ++it) it_end=uf_faces.end(); it!=it_end; ++it)
{ {
typename UF_faces::handle master=uf_faces.find(it); typename UF_faces::handle master=uf_faces.find(it);
//remove faces that are not the master of their set //remove faces that are not the master of their set (but the unbounded face)
if ( master!=it) if ( master!=it)
{
// update the unbounded pointer of the face to be kept
if (get_base(*it)->is_unbounded())
{ {
// force to keep the unbounded face // force to keep the unbounded face
if (_face(*it)->is_unbounded())
{
(*master)->uf_handle=it; (*master)->uf_handle=it;
faces_to_remove.push_back(*master); faces_to_remove.push_back(*master);
} }
@ -1150,12 +1149,12 @@ protected:
} }
//collect for reuse/removal all inner and outer ccbs //collect for reuse/removal all inner and outer ccbs
BOOST_FOREACH(void* ptr, get_base(*it)->outer_ccbs) BOOST_FOREACH(void* ptr, _face(*it)->outer_ccbs)
outer_ccbs_to_remove.push_back( static_cast<typename Aos_2::Dcel::Halfedge*>(ptr)->outer_ccb() ); outer_ccbs_to_remove.push_back( static_cast<typename Aos_2::Dcel::Halfedge*>(ptr)->outer_ccb() );
BOOST_FOREACH(void* ptr, get_base(*it)->inner_ccbs) BOOST_FOREACH(void* ptr, _face(*it)->inner_ccbs)
inner_ccbs_to_remove.push_back( static_cast<typename Aos_2::Dcel::Halfedge*>(ptr)->inner_ccb() ); inner_ccbs_to_remove.push_back( static_cast<typename Aos_2::Dcel::Halfedge*>(ptr)->inner_ccb() );
get_base(*it)->outer_ccbs.clear(); _face(*it)->outer_ccbs.clear();
get_base(*it)->inner_ccbs.clear(); _face(*it)->inner_ccbs.clear();
} }
// accessor for low-level arrangement fonctionalities // accessor for low-level arrangement fonctionalities
@ -1187,13 +1186,13 @@ protected:
Halfedge_handle hstart=h; Halfedge_handle hstart=h;
do{ do{
get_base(h)->set_inner_ccb(inner_ccb); _halfedge(h)->set_inner_ccb(inner_ccb);
h->set_new_ccb_assigned(); h->set_new_ccb_assigned();
h=h->next(); h=h->next();
}while(hstart!=h); }while(hstart!=h);
f->add_inner_ccb(inner_ccb,get_base(h)); f->add_inner_ccb(inner_ccb,_halfedge(h));
inner_ccb->set_halfedge(get_base(h)); inner_ccb->set_halfedge(_halfedge(h));
inner_ccb->set_face(get_base(f)); inner_ccb->set_face(_face(f));
} }
else{ else{
CGAL_assertion(!outer_ccbs_to_remove.empty()); CGAL_assertion(!outer_ccbs_to_remove.empty());
@ -1201,13 +1200,13 @@ protected:
outer_ccbs_to_remove.pop_back(); outer_ccbs_to_remove.pop_back();
Halfedge_handle hstart=h; Halfedge_handle hstart=h;
do{ do{
get_base(h)->set_outer_ccb(outer_ccb); _halfedge(h)->set_outer_ccb(outer_ccb);
h->set_new_ccb_assigned(); h->set_new_ccb_assigned();
h=h->next(); h=h->next();
}while(hstart!=h); }while(hstart!=h);
f->add_outer_ccb(outer_ccb,get_base(h)); f->add_outer_ccb(outer_ccb,_halfedge(h));
outer_ccb->set_halfedge(get_base(h)); outer_ccb->set_halfedge(_halfedge(h));
outer_ccb->set_face(get_base(f)); outer_ccb->set_face(_face(f));
} }
} }
} }