Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-12 02:23:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved plane selection for Measure tool

Browse Source
This commit is contained in:
Bruno Perdigão
2024-08-15 18:34:10 -03:00
committed by Bruno Perdigão
parent 2f4093f958
commit c477173096
2 changed files with 53 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bonsai/bonsai/bim/module/project/operator.py
+10
View File
@@ -2349,6 +2349,16 @@ class MeasureTool(bpy.types.Operator):
tool.Snap.remove_last_polyline_point()
tool.Blender.update_viewport()
if event.shift and event.type == "X":
tool.Snap.set_use_default_container(False)
WallPolylineDecorator.set_use_default_container(False)
tool.Snap.set_snap_plane_method('YZ')
if event.shift and event.type == "Y":
tool.Snap.set_use_default_container(False)
WallPolylineDecorator.set_use_default_container(False)
tool.Snap.set_snap_plane_method('XZ')
if event.shift and event.type == "Z":
tool.Snap.set_use_default_container(False)
WallPolylineDecorator.set_use_default_container(False)
src/bonsai/bonsai/tool/snap.py
+43 -12
View File
@@ -266,19 +266,40 @@ class Snap(bonsai.core.tool.Snap):
(offset, -offset),
)
# TODO Create option for different planes. RANDOM, XY, YZ, XZ. This should change the code in the bottom
if cls.snap_plane_method == "No Plane":
camera_rotation = rv3d.view_rotation
plane_origin = Vector((0, 0, 0))
plane_normal = Vector((0, 1, 1, 1)) * Vector((camera_rotation))
elif cls.snap_plane_method == "XY":
if cls.use_default_container:
elevation = tool.Ifc.get_object(tool.Root.get_default_container()).location.z
else:
elevation = 0
plane_origin = Vector((0, 0, elevation))
plane_normal = Vector((0, 0, 1))
def select_plane_method():
if cls.snap_plane_method == "No Plane":
camera_rotation = rv3d.view_rotation
plane_origin = Vector((0, 0, 0))
plane_normal = Vector((0, 1, 1, 1)) * Vector((camera_rotation))
if cls.snap_plane_method == "XY":
if cls.use_default_container:
plane_origin_point = elevation
elif not last_polyline_point:
plane_origin_point = 0
else:
plane_origin_point = last_polyline_point.z
plane_origin = Vector((0, 0, plane_origin_point))
plane_normal = Vector((0, 0, 1))
elif cls.snap_plane_method == "XZ":
if not last_polyline_point:
plane_origin_point = 0
else:
plane_origin_point = last_polyline_point.y
plane_origin = Vector((0, plane_origin_point, 0))
plane_normal = Vector((0, 1, 0))
elif cls.snap_plane_method == "YZ":
if not last_polyline_point:
plane_origin_point = 0
else:
plane_origin_point = last_polyline_point.x
plane_origin = Vector((plane_origin_point, 0, 0))
plane_normal = Vector((1, 0, 0))
return plane_origin, plane_normal
def cast_rays_and_get_best_object():
best_length_squared = 1.0
@@ -322,6 +343,16 @@ class Snap(bonsai.core.tool.Snap):
snap_threshold = 0.3
ray_origin, ray_target, ray_direction = tool.Raycast.get_viewport_ray_data(context, event)
obj, hit, face_index = cast_rays_and_get_best_object()
try:
polyline_data = bpy.context.scene.BIMModelProperties.polyline_point
last_polyline_point = polyline_data[len(polyline_data) - 1]
except:
last_polyline_point = None
elevation = tool.Ifc.get_object(tool.Root.get_default_container()).location.z
plane_origin, plane_normal = select_plane_method()
intersection = tool.Raycast.ray_cast_to_plane(context, event, plane_origin, plane_normal)
if cls.use_default_container: