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

fixed one more bug in Line_face_circulator(Vertex_handle v,....

This commit is contained in:
Mariette Yvinec 1998-07-02 10:17:53 +00:00
parent 8c4cfd3146
commit 2c7a8f68bb
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Packages/Triangulation_2/include/CGAL/Triangulation_2.h
View File

@ -841,14 +841,14 @@ public:
p=v->point(); p=v->point();
q=dir; q=dir;
cerr << " p " << p << " q " << q << endl; //cerr << " p " << p << " q " << q << endl;
Face_circulator fc = v->incident_faces(); Face_circulator fc = v->incident_faces();
Face_circulator done = fc; Face_circulator done = fc;
cerr << "(" << fc->vertex(0)->point() << ", " //cerr << "(" << fc->vertex(0)->point() << ", "
<<fc->vertex(1)->point() << ", " // <<fc->vertex(1)->point() << ", "
<< fc->vertex(2)->point() << ")" << endl ; // << fc->vertex(2)->point() << ")" << endl ;
int ic = fc->index(v); int ic = fc->index(v);
Vertex_handle vt= fc->vertex(ccw(ic)); Vertex_handle vt= fc->vertex(ccw(ic));
@ -866,9 +866,9 @@ public:
{ ++fc;} { ++fc;}
ic = fc->index(_tr->infinite_vertex()); ic = fc->index(_tr->infinite_vertex());
if( _tr->geom_traits().orientation( if( _tr->geom_traits().orientation(
fc->vertex( cw(i))->point(), fc->vertex( cw(ic))->point(),
fc->vertex( ccw(i))->point(), fc->vertex( ccw(ic))->point(),
q) != CGAL_LEFTTURN) { ++fc;} q) != CGAL_RIGHTTURN) { ++fc;}
ptr() = &(*fc); ptr() = &(*fc);
i = fc->index(_tr->infinite_vertex()); i = fc->index(_tr->infinite_vertex());
s = vertex_vertex; s = vertex_vertex;
@ -881,7 +881,7 @@ public:
ptq = _tr->geom_traits().orientation(p, vt->point(), q); ptq = _tr->geom_traits().orientation(p, vt->point(), q);
} }
cerr << "t " << vt->point() << endl; //cerr << "t " << vt->point() << endl;
// now vt is a finite vertex and ptq is COLLINEAR or LEFTTURN // now vt is a finite vertex and ptq is COLLINEAR or LEFTTURN
@ -905,11 +905,11 @@ public:
vt= fc->vertex(ccw(ic)); vt= fc->vertex(ccw(ic));
ptq = _tr->geom_traits().orientation(p, vt->point(), q); ptq = _tr->geom_traits().orientation(p, vt->point(), q);
cerr << "t " << vt->point() << endl; //cerr << "t " << vt->point() << endl;
cerr << "r " << vr->point() << endl; //cerr << "r " << vr->point() << endl;
cerr << "face" << "(" << fc->vertex(0)->point() << ", " //cerr << "face" << "(" << fc->vertex(0)->point() << ", "
<<fc->vertex(1)->point() << ", " // <<fc->vertex(1)->point() << ", "
<< fc->vertex(2)->point() << ")" << endl ; // << fc->vertex(2)->point() << ")" << endl ;
if (_tr->is_infinite(vr)) { if (_tr->is_infinite(vr)) {
s = vertex_vertex; s = vertex_vertex;
@ -1291,7 +1291,7 @@ public:
if(o == CGAL_RIGHTTURN){ if(o == CGAL_RIGHTTURN){
return false; return false;
} }
if(o == CGAL_COLLINEAR){ if(o == CGAL_COLLINEAR){
lt = EDGE; lt = EDGE;
li = i; li = i;
return true; return true;