Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-09 17:31:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Polyline tool a snapping system small refactor.

Browse Source
This commit is contained in:
Bruno Perdigão
2025-02-13 14:14:15 -03:00
parent 8acd5321b0
commit b87cd33b12
2 changed files with 17 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bonsai/bonsai/tool/polyline.py
+11 -11
View File
@@ -123,7 +123,7 @@ class Polyline(bonsai.core.tool.Polyline):
default_container_elevation = 0
last_point_data = None
snap_prop = context.scene.BIMPolylineProperties.snap_mouse_point[0]
mouse_point = context.scene.BIMPolylineProperties.snap_mouse_point[0]
if last_point_data:
last_point = Vector((last_point_data.x, last_point_data.y, last_point_data.z))
@@ -132,18 +132,18 @@ class Polyline(bonsai.core.tool.Polyline):
if tool_state.is_input_on:
if tool_state.use_default_container:
snap_vector = Vector(
mouse_vector = Vector(
(input_ui.get_number_value("X"), input_ui.get_number_value("Y"), default_container_elevation)
)
else:
snap_vector = Vector(
mouse_vector = Vector(
(input_ui.get_number_value("X"), input_ui.get_number_value("Y"), input_ui.get_number_value("Z"))
)
else:
if tool_state.use_default_container:
snap_vector = Vector((snap_prop.x, snap_prop.y, default_container_elevation))
mouse_vector = Vector((mouse_point.x, mouse_point.y, default_container_elevation))
else:
snap_vector = Vector((snap_prop.x, snap_prop.y, snap_prop.z))
mouse_vector = Vector((mouse_point.x, mouse_point.y, mouse_point.z))
second_to_last_point = None
if len(polyline_points) > 1:
@@ -162,19 +162,19 @@ class Polyline(bonsai.core.tool.Polyline):
if tool_state.plane_method == "YZ":
world_second_to_last_point = Vector((last_point.x, last_point.y + 1000, last_point.z))
distance = (snap_vector - last_point).length
distance = (mouse_vector - last_point).length
if distance < 0:
return
if distance > 0:
angle = tool.Cad.angle_3_vectors(
second_to_last_point, last_point, snap_vector, new_angle=None, degrees=True
second_to_last_point, last_point, mouse_vector, new_angle=None, degrees=True
)
# Round angle to the nearest 0.05
angle = round(angle / 0.05) * 0.05
orientation_angle = tool.Cad.angle_3_vectors(
world_second_to_last_point, last_point, snap_vector, new_angle=None, degrees=True
world_second_to_last_point, last_point, mouse_vector, new_angle=None, degrees=True
)
# Round angle to the nearest 0.05
@@ -188,10 +188,10 @@ class Polyline(bonsai.core.tool.Polyline):
angle = 5 * round(angle / 5)
factor = tool.Snap.get_increment_snap_value(context)
distance = factor * round(distance / factor)
input_ui.set_value("X", snap_vector.x)
input_ui.set_value("Y", snap_vector.y)
input_ui.set_value("X", mouse_vector.x)
input_ui.set_value("Y", mouse_vector.y)
if input_ui.get_number_value("Z") is not None:
input_ui.set_value("Z", snap_vector.z)
input_ui.set_value("Z", mouse_vector.z)
input_ui.set_value("D", distance)
input_ui.set_value("A", angle)
src/bonsai/bonsai/tool/snap.py
+6 -22
View File
@@ -152,26 +152,6 @@ class Snap(bonsai.core.tool.Snap):
return start, end
def create_axis_rectangle_data(origin):
size = 0.5
direction = Vector((1, 0, 0))
if tool_state.plane_method == "YZ":
direction = Vector((0, 0, 1))
rot_mat = Matrix.Rotation(math.radians(360), 3, pivot_axis)
rot_dir = rot_mat.inverted() @ direction
v1 = origin + rot_dir * 0
v2 = origin + rot_dir * size
if tool_state.plane_method == "XY":
angle = 270
else:
angle = 90
rot_mat = Matrix.Rotation(math.radians(angle), 3, pivot_axis)
rot_dir = rot_mat.inverted() @ direction
v3 = origin + rot_dir * size
v4 = v2 + rot_dir * size
return (v1, v2, v3, v4)
# Makes the snapping point more or less sticky than others
# It changes the distance and affects how the snapping point is sorted
stick_factor = 0.15
@@ -217,14 +197,18 @@ class Snap(bonsai.core.tool.Snap):
if is_on_rot_axis:
elegible_axis.append((abs(proximity), axis))
# Get the elegible axis with the lowest proximity
# Get the eligible axis with the lowest proximity
if elegible_axis:
proximity, axis = sorted(elegible_axis)[0]
else:
pass
# If lock axis is on it will use the snap angle so there is no need to search for elegible axis
# If lock axis is on it will use the snap angle so there is no need to search for eligible axis
if elegible_axis or tool_state.lock_axis:
if tool_state.plane_method == "XZ":
axis = -axis
if tool_state.plane_method == "YZ":
axis = 90 - (axis * -1) # Don't know why this works
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)