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

bug fix

This commit is contained in:
Sébastien Loriot 2023-03-03 10:33:16 +01:00
parent 0bf300d5c5
commit 4fa600bc5f
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Intersections_3/include/CGAL/Intersections_3/internal/Triangle_3_Triangle_3_intersection.h
View File

@ -33,6 +33,7 @@ namespace CGAL {
namespace Intersections {
namespace internal{
//TODO: move into a functor
template <class K>
typename K::FT
coplanar_segment_segment_alpha_intersection(const typename K::Point_3& p1, const typename K::Point_3& p2, // segment 1
@ -248,8 +249,18 @@ intersection(const Point_on_triangle<Kernel>& p,
return Point_on_triangle<Kernel>(p.id1()==1?2:0); // vertex of t1
}
default: // (ip1, ip2) - (iq1, iq2)
CGAL_assertion(p.id1()==q.id1());
return Point_on_triangle<Kernel>((p.id1()+1)%3==edge_id_t1?edge_id_t1:(edge_id_t1+1)%3, -1); // vertex of t1
{
CGAL_assertion(p.id1()==q.id1() || p.id2()==q.id2() );
if (p.id1()==q.id1())
return Point_on_triangle<Kernel>((p.id1()+1)%3==edge_id_t1?edge_id_t1:(edge_id_t1+1)%3, -1); // vertex of t1
typename Kernel::FT alpha =
coplanar_segment_segment_alpha_intersection(p1, q1,
Pot::point_from_id(p2, q2, r2, q.id2()),
Pot::point_from_id(p2, q2, r2, (q.id2()+1)%3), k);
return Point_on_triangle<Kernel>(edge_id_t1, q.id2(), alpha);
}
}
}
}