This commit is contained in:
2019-10-09 17:41:32 +02:00
parent 34734dd734
commit 8aa660d12d
2 changed files with 12 additions and 10 deletions

View File

@@ -7,13 +7,8 @@ def angle_to_vector(angle):
def segments_intersection(line1, line2):
x1,y1 = line1[0]
x2,y2 = line1[1]
x3,y3 = line2[0]
x4,y4 = line2[1]
xdiff = (x1 - x2, x3 - x4)
ydiff = (y1 - y2, y3 - y4)
xdiff = (line1[0][0] - line1[1][0], line2[0][0] - line2[1][0])
ydiff = (line1[0][1] - line1[1][1], line2[0][1] - line2[1][1])
def det(a, b):
return a[0] * b[1] - a[1] * b[0]
@@ -26,9 +21,15 @@ def segments_intersection(line1, line2):
x = det(d, xdiff) / div
y = det(d, ydiff) / div
if min(x1,x2) <= x <= max(x1,x2) :
if (
min(line1[0][0],line1[1][0]) <= x <= max(line1[0][0],line1[1][0])
and min(line2[0][0],line2[1][0]) <= x <= max(line2[0][0],line2[1][0])
and min(line1[0][1],line1[1][1]) <= y <= max(line1[0][1],line1[1][1])
and min(line2[0][1],line2[1][1]) <= y <= max(line2[0][1],line2[1][1])
):
return x, y
return None
return x, y
def distance(point1, point2):
return math.hypot(point1[0] - point2[0], point1[1] - point2[1])