Fix issue with joining walls with negative direction sense.

This commit is contained in:
Bruno Perdigão
2024-10-17 17:36:49 -03:00
committed by Dion Moult
parent 0e5008d21e
commit 01c67eea48
+33 -12
View File
@@ -1469,22 +1469,43 @@ class DumbWallJoiner:
if connection1 == connection2: if connection1 == connection2:
if (connected_at_end and angle > 0) or (not connected_at_end and angle < 0): if (connected_at_end and angle > 0) or (not connected_at_end and angle < 0):
pt = bbf.to_2d().to_3d() if layers1['direction_sense'] == 'POSITIVE':
x_axis = bsn - bbf pt = bbf.to_2d().to_3d()
y_axis = tbf - bbf x_axis = bsn - bbf
y_axis = tbf - bbf
else:
pt = bsf.to_2d().to_3d()
x_axis = bbn - bsf
y_axis = tsf - bsf
else: else:
pt = bbn.to_2d().to_3d() print(">>>>B")
x_axis = bsf - bbn if layers1['direction_sense'] == 'POSITIVE':
y_axis = tbn - bbn pt = bbn.to_2d().to_3d()
x_axis = bsf - bbn
y_axis = tbn - bbn
else:
pt = bsn.to_2d().to_3d()
x_axis = bbf - bsn
y_axis = tsn - bsn
else: else:
if (connected_at_end and angle < 0) or (not connected_at_end and angle > 0): if (connected_at_end and angle < 0) or (not connected_at_end and angle > 0):
pt = bbf.to_2d().to_3d() if layers1['direction_sense'] == 'POSITIVE':
x_axis = bsn - bbf pt = bbf.to_2d().to_3d()
y_axis = tbf - bbf x_axis = bsn - bbf
y_axis = tbf - bbf
else:
pt = bsf.to_2d().to_3d()
x_axis = bbn - bsf
y_axis = tsf - bsf
else: else:
pt = bbn.to_2d().to_3d() if layers1['direction_sense'] == 'POSITIVE':
x_axis = bsf - bbn pt = bbn.to_2d().to_3d()
y_axis = tbn - bbn x_axis = bsf - bbn
y_axis = tbn - bbn
else:
pt = bsn.to_2d().to_3d()
x_axis = bbf - bsn
y_axis = tsn - bsn
if connection1 != "ATEND": if connection1 != "ATEND":
y_axis *= -1 y_axis *= -1