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

A few updates on Snap and Raycast to improve the snap feel.

Browse Source
This commit is contained in:
Bruno Perdigão
2024-08-28 16:51:12 -03:00
parent 23ec2fc48e
commit 56e9488d3e
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bonsai/bonsai/tool/raycast.py
+12 -3
View File
@@ -98,8 +98,13 @@ class Raycast(bonsai.core.tool.Raycast):
return ray_origin_obj, ray_target_obj, ray_direction_obj return ray_origin_obj, ray_target_obj, ray_direction_obj
@classmethod @classmethod
def obj_ray_cast(cls, context, event, obj): def obj_ray_cast(cls, context, event, obj, mouse_pos=None):
ray_origin_obj, _, ray_direction_obj = cls.get_object_ray_data(context, event, obj.matrix_world.copy()) if mouse_pos:
ray_origin_obj, _, ray_direction_obj = cls.get_object_ray_data(
context, event, obj.matrix_world.copy(), mouse_pos
)
else:
ray_origin_obj, _, ray_direction_obj = cls.get_object_ray_data(context, event, obj.matrix_world.copy())
success, location, normal, face_index = obj.ray_cast(ray_origin_obj, ray_direction_obj) success, location, normal, face_index = obj.ray_cast(ray_origin_obj, ray_direction_obj)
if success: if success:
return location, normal, face_index return location, normal, face_index
@@ -114,6 +119,10 @@ class Raycast(bonsai.core.tool.Raycast):
ray_origin, ray_target, ray_direction = cls.get_viewport_ray_data(context, event) ray_origin, ray_target, ray_direction = cls.get_viewport_ray_data(context, event)
points = [] points = []
# Makes the snapping point more or less sticky then others
# It changes the distance and affects how the snapping point is sorted
stick_factor = 0.02
try: try:
loc = view3d_utils.region_2d_to_location_3d(region, rv3d, mouse_pos, ray_direction) loc = view3d_utils.region_2d_to_location_3d(region, rv3d, mouse_pos, ray_direction)
except: except:
@@ -150,7 +159,7 @@ class Raycast(bonsai.core.tool.Raycast):
if tool.Cad.is_point_on_edge(intersection[1], (world_v1, world_v2)): if tool.Cad.is_point_on_edge(intersection[1], (world_v1, world_v2)):
distance = (intersection[1] - intersection[0]).length distance = (intersection[1] - intersection[0]).length
if distance < 0.8: if distance < 0.8:
points.append((intersection[1], "Edge")) points.append([distance + 4 * stick_factor, (intersection[1], "Edge")])
bm.free() bm.free()
return points return points
src/bonsai/bonsai/tool/snap.py
+5 -5
View File
@@ -297,8 +297,8 @@ class Snap(bonsai.core.tool.Snap):
cls.mouse_pos = event.mouse_region_x, event.mouse_region_y cls.mouse_pos = event.mouse_region_x, event.mouse_region_y
detected_snaps = [] detected_snaps = []
offset = 15
snap_threshold = 0.3 snap_threshold = 0.3
offset = 10
mouse_offset = ( mouse_offset = (
(-offset, offset), (-offset, offset),
(0, offset), (0, offset),
@@ -487,6 +487,10 @@ class Snap(bonsai.core.tool.Snap):
snapping_points.append(op) snapping_points.append(op)
break break
if "Plane" in list(origin.keys()):
intersection = origin["Plane"]
snapping_points.append((intersection, "Plane"))
for origin in detected_snaps: for origin in detected_snaps:
if "Axis" in list(origin.keys()): if "Axis" in list(origin.keys()):
intersection = origin["Axis"] intersection = origin["Axis"]
@@ -494,10 +498,6 @@ class Snap(bonsai.core.tool.Snap):
axis_end = intersection[2] axis_end = intersection[2]
snapping_points.append((intersection[0], "Axis")) snapping_points.append((intersection[0], "Axis"))
if "Plane" in list(origin.keys()):
intersection = origin["Plane"]
snapping_points.append((intersection, "Plane"))
# Make Axis first priority # Make Axis first priority
if event.shift or cls.snap_axis_method in {"X", "Y", "Z"}: if event.shift or cls.snap_axis_method in {"X", "Y", "Z"}:
cls.update_snapping_ref(snapping_points[0][0], snapping_points[0][1]) cls.update_snapping_ref(snapping_points[0][0], snapping_points[0][1])