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

Revert "more than one curve can be on the left of an event with overlapping curves on the right" 

This reverts commit 2260c4fab3.
This commit is contained in:
Sébastien Loriot 2023-12-07 16:09:31 +01:00
parent 0714c960bb
commit a54f189980
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Surface_sweep_2/include/CGAL/Surface_sweep_2/Surface_sweep_2_impl.h
View File

@ -110,28 +110,19 @@ void Surface_sweep_2<Vis>::_handle_left_curves()
this->m_currentEvent->push_back_curve_to_right(sc); this->m_currentEvent->push_back_curve_to_right(sc);
} }
else { else {
this->m_currentEvent->push_back_curve_to_left(sc);
this->m_currentEvent->set_weak_intersection(); this->m_currentEvent->set_weak_intersection();
auto status_line_it = this->m_status_line_insert_hint; this->m_visitor->update_event(this->m_currentEvent, sc);
do{ _add_curve_to_right(this->m_currentEvent, sc);
this->m_currentEvent->push_back_curve_to_left(sc);
this->m_visitor->update_event(this->m_currentEvent, sc);
_add_curve_to_right(this->m_currentEvent, sc);
++status_line_it;
if (status_line_it==this->m_statusLine.end()) break;
if (this->m_statusLineCurveLess(this->m_currentEvent->point(), *status_line_it)!=EQUAL)
break;
sc = *status_line_it;
}
while(true); // the loop is only needed in case there are overlapping curve in right curves
} }
// some subcurves have been addded on the left // sc is now on the left
CGAL_SS_PRINT_TEXT("Event after update:"); CGAL_SS_PRINT_TEXT("Event after update:");
CGAL_SS_PRINT_EOL(); CGAL_SS_PRINT_EOL();
CGAL_SS_PRINT_EVENT_INFO(this->m_currentEvent); CGAL_SS_PRINT_EVENT_INFO(this->m_currentEvent);
CGAL_SS_PRINT_EOL(); CGAL_SS_PRINT_EOL();
CGAL_assertion(std::distance(this->m_currentEvent->left_curves_begin(), CGAL_assertion(std::distance(this->m_currentEvent->left_curves_begin(),
this->m_currentEvent->left_curves_end())!=0); this->m_currentEvent->left_curves_end())==1);
} }
else { else {
// The event is not located on any subcurve. // The event is not located on any subcurve.