Skip to content

Commit c849ad6

Browse files
committed
Use two-argument .cross in lineIntersection
1 parent b5fb51f commit c849ad6

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

content/geometry/lineIntersection.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ template<class P>
2424
int lineIntersection(const P& s1, const P& e1, const P& s2,
2525
const P& e2, P& r) {
2626
if ((e1-s1).cross(e2-s2)) { // if not parallel
27-
r = s2-(e2-s2)*(e1-s1).cross(s2-s1)/(e1-s1).cross(e2-s2);
27+
r = s2-(e2-s2)*s1.cross(e1, s2)/(e1-s1).cross(e2-s2);
2828
return 1;
2929
} else
30-
return -((e1-s1).cross(s2-s1)==0 || s2==e2);
30+
return -(s1.cross(e1, s2)==0 || s2==e2);
3131
}

0 commit comments

Comments
 (0)