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

fix CK3 demo

This commit is contained in:
Sébastien Loriot 2023-08-04 10:39:37 +02:00
parent cc41b54116
commit 5db2fd0195
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Circular_kernel_3/demo/Circular_kernel_3/Viewer.cpp
View File

@ -893,20 +893,19 @@ void Viewer::naive_compute_intersection_points(const std::vector<EPIC::Point_3>&
for (std::vector<SK::Circle_3>::const_iterator it_f=circles.begin();it_f!=--circles.end();++it_f){
std::vector<SK::Circle_3>::const_iterator it_s=it_f;
++it_s;
typedef std::pair<SK::Circular_arc_point_3,unsigned> Point_and_multiplicity;
for (;it_s!=circles.end();++it_s){
std::vector <CGAL::Object> intersections;
std::vector<Point_and_multiplicity> intersections;
//ensure_circles are different
CGAL_precondition(*it_s!=*it_f);
CGAL::intersection(*it_f,*it_s,std::back_inserter(intersections));
CGAL::intersection(*it_f,*it_s,CGAL::dispatch_or_drop_output<Point_and_multiplicity>(std::back_inserter(intersections)));
if (!intersections.empty()){
for (std::vector <CGAL::Object>::const_iterator it_pt=intersections.begin();it_pt!=intersections.end();++it_pt){
const std::pair<SK::Circular_arc_point_3,unsigned>* pt=
CGAL::object_cast< std::pair<SK::Circular_arc_point_3,unsigned> > (&(*it_pt));
assert(pt!=nullptr);
*out++=EPIC::Point_3( CGAL::to_double(pt->first.x()),
CGAL::to_double(pt->first.y()),
CGAL::to_double(pt->first.z())
);
for (const Point_and_multiplicity& pt : intersections)
{
*out++=EPIC::Point_3( CGAL::to_double(pt.first.x()),
CGAL::to_double(pt.first.y()),
CGAL::to_double(pt.first.z())
);
}
}
}