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

final adaptations to the new indexed_items

This commit is contained in:
Peter Hachenberger 2007-08-01 11:58:52 +00:00
parent 13dcfb940e
commit 1f8a68ea1b
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Nef_S2/include/CGAL/Nef_S2/SM_overlayer.h
View File

@ -166,7 +166,9 @@ void trivial_segment(Vertex_handle v, IT it) const
if(CGAL::assign(se, si._o)) { if(CGAL::assign(se, si._o)) {
if(se->source()->point() != v->point()) if(se->source()->point() != v->point())
se = se->twin(); se = se->twin();
CGAL_assertion(se->source()->point() == v->point()); if(se->source()->point() != v->point())
G.supp_object(v,si._from) = si._o;
else
G.supp_object(v,si._from) = Object_handle(se->source()); G.supp_object(v,si._from) = Object_handle(se->source());
} else if(CGAL::assign(sl, si._o)) { } else if(CGAL::assign(sl, si._o)) {
G.supp_object(v,si._from) = si._o; G.supp_object(v,si._from) = si._o;
@ -1500,6 +1502,7 @@ subdivide(const Map* M0, const Map* M1,
if(compute_halfsphere[cs][0]) { if(compute_halfsphere[cs][0]) {
PH_geometry phg(cs); PH_geometry phg(cs);
/*
// the following is only needed for indexed items // the following is only needed for indexed items
SHalfedge_const_handle se; SHalfedge_const_handle se;
SHalfloop_const_handle sl; SHalfloop_const_handle sl;
@ -1511,11 +1514,12 @@ subdivide(const Map* M0, const Map* M1,
if(it->sphere_circle() == se->circle()) if(it->sphere_circle() == se->circle())
From[it] = Seg_info(se->twin(), From[it]._from); From[it] = Seg_info(se->twin(), From[it]._from);
} else if(CGAL::assign(sl, o)) { } else if(CGAL::assign(sl, o)) {
CGAL_assertion(it->sphere_circle()==sl->circle()); if(it->sphere_circle() == sl->circle())
From[it] = Seg_info(sl->twin(), From[it]._from); From[it] = Seg_info(sl->twin(), From[it]._from);
} }
} }
} }
*/
Positive_halfsphere_sweep SP( Positive_halfsphere_sweep SP(
Input_range(L_pos.begin(),L_pos.end()),O,phg); Input_range(L_pos.begin(),L_pos.end()),O,phg);
@ -1529,6 +1533,7 @@ subdivide(const Map* M0, const Map* M1,
if(compute_halfsphere[cs][1]) { if(compute_halfsphere[cs][1]) {
NH_geometry nhg(cs); NH_geometry nhg(cs);
/*
SHalfedge_const_handle se; SHalfedge_const_handle se;
SHalfloop_const_handle sl; SHalfloop_const_handle sl;
for(Seg_iterator it=L_neg.begin(); it!=L_neg.end();++it) { for(Seg_iterator it=L_neg.begin(); it!=L_neg.end();++it) {
@ -1539,11 +1544,12 @@ subdivide(const Map* M0, const Map* M1,
if(it->sphere_circle() == se->circle()) if(it->sphere_circle() == se->circle())
From[it] = Seg_info(se->twin(), From[it]._from); From[it] = Seg_info(se->twin(), From[it]._from);
} else if(CGAL::assign(sl, o)) { } else if(CGAL::assign(sl, o)) {
CGAL_assertion(it->sphere_circle()==sl->circle()); if(it->sphere_circle() == sl->circle())
From[it] = Seg_info(sl->twin(), From[it]._from); From[it] = Seg_info(sl->twin(), From[it]._from);
} }
} }
} }
*/
Negative_halfsphere_sweep SM( Negative_halfsphere_sweep SM(
Input_range(L_neg.begin(),L_neg.end()),O, Input_range(L_neg.begin(),L_neg.end()),O,
@ -1650,7 +1656,7 @@ template <typename Map>
template <typename Association> template <typename Association>
void SM_overlayer<Map>:: void SM_overlayer<Map>::
transfer_data(Association& A) { transfer_data(Association& A) {
// std::cerr << "transfer data " << std::endl;
SVertex_iterator sv; SVertex_iterator sv;
SHalfedge_handle se; SHalfedge_handle se;
SVertex_const_handle sv0,sv1; SVertex_const_handle sv0,sv1;
@ -1880,7 +1886,13 @@ create_face_objects(SHalfedge_iterator e_start, SHalfedge_iterator e_end,
CGAL_NEF_TRACEN(" face cycle numbering "<<i); CGAL_NEF_TRACEN(" face cycle numbering "<<i);
CGAL_For_all(hfc,hend) { CGAL_For_all(hfc,hend) {
SFaceCycle[hfc]=i; // assign face cycle number SFaceCycle[hfc]=i; // assign face cycle number
if ( SG.compare_xy(hfc->twin()->source()->point(), e_min->twin()->source()->point()) < 0 ) if (hfc->twin()->source() == e_min->twin()->source()) {
Sphere_point p1 = e->source()->point(),
p2 = e->twin()->source()->point(),
p3 = e->snext()->twin()->source()->point();
if ( SG.orientation(p1,p2,p3) <= 0 )
e_min = hfc;
} else if ( SG.compare_xy(hfc->twin()->source()->point(), e_min->twin()->source()->point()) < 0 )
e_min = hfc; e_min = hfc;
CGAL_NEF_TRACEN(PH(hfc)); CGAL_NEF_TRACEN(PH(hfc));
} CGAL_NEF_TRACEN(""); } CGAL_NEF_TRACEN("");