Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-09 21:53:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improves angle snapping

Browse Source
This commit is contained in:
Bruno Perdigão
2024-10-10 17:06:45 -03:00
parent dd646d2763
commit 095c854d41
1 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bonsai/bonsai/tool/snap.py
+27 -15
View File
@@ -154,7 +154,7 @@ class Snap(bonsai.core.tool.Snap):
return (v1, v2, v3, v4) return (v1, v2, v3, v4)
# Makes the snapping point more or less sticky then others # Makes the snapping point more or less sticky than others
# It changes the distance and affects how the snapping point is sorted # It changes the distance and affects how the snapping point is sorted
stick_factor = 0.15 stick_factor = 0.15
@@ -170,7 +170,7 @@ class Snap(bonsai.core.tool.Snap):
# Translates intersection point based on last_point # Translates intersection point based on last_point
translated_intersection = intersection - last_point translated_intersection = intersection - last_point
snap_axis = [] snap_axis = []
if not tool_state.snap_angle: if not tool_state.lock_axis:
for i in range(1, 25): for i in range(1, 25):
angle = 15 * i angle = 15 * i
snap_axis.append(angle) snap_axis.append(angle)
@@ -183,27 +183,39 @@ class Snap(bonsai.core.tool.Snap):
if tool_state.plane_method == "YZ": if tool_state.plane_method == "YZ":
pivot_axis = "X" pivot_axis = "X"
# Get axis that are closer than the stick factor threshold
elegible_axis = []
for axis in snap_axis: for axis in snap_axis:
rot_mat = Matrix.Rotation(math.radians(360 - axis), 3, pivot_axis) rot_mat = Matrix.Rotation(math.radians(360 - axis), 3, pivot_axis)
start, end = create_axis_line_data(rot_mat, last_point)
rot_intersection = rot_mat @ translated_intersection rot_intersection = rot_mat @ translated_intersection
proximity = rot_intersection.y proximity = rot_intersection.y
if tool_state.plane_method == "XZ": if tool_state.plane_method == "XZ":
proximity = rot_intersection.z proximity = rot_intersection.z
PolylineDecorator.set_angle_axis_line(start, end)
if lock_angle:
is_on_rot_axis = True
else:
is_on_rot_axis = abs(proximity) <= stick_factor
is_on_rot_axis = abs(proximity) <= stick_factor
if is_on_rot_axis: if is_on_rot_axis:
# Snap to axis elegible_axis.append((abs(proximity), axis))
rot_intersection = Vector((rot_intersection.x, 0, rot_intersection.z))
if tool_state.plane_method == "XZ":
rot_intersection = Vector((rot_intersection.x, rot_intersection.y, 0)) # Get the elegible axis with the lowest proximity
# Convert it back if elegible_axis:
snap_intersection = rot_mat.inverted() @ rot_intersection + last_point proximity, axis = sorted(elegible_axis)[0]
return snap_intersection, axis, start, end
# If lock axis is on it will use the snap angle so there is no need to search for elegible axis
if elegible_axis or tool_state.lock_axis:
rot_mat = Matrix.Rotation(math.radians(360 - axis), 3, pivot_axis)
rot_intersection = rot_mat @ translated_intersection
start, end = create_axis_line_data(rot_mat, last_point)
PolylineDecorator.set_angle_axis_line(start, end)
# Snap to axis
rot_intersection = Vector((rot_intersection.x, 0, rot_intersection.z))
if tool_state.plane_method == "XZ":
rot_intersection = Vector((rot_intersection.x, rot_intersection.y, 0))
# Convert it back
snap_intersection = rot_mat.inverted() @ rot_intersection + last_point
return snap_intersection, axis, start, end
return None, None, None, None return None, None, None, None