From 77f72ecdfa5e162c371e72456c89753f29211c51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Perdig=C3=A3o?= Date: Sun, 11 Aug 2024 12:15:50 -0300 Subject: [PATCH] renamed the tools to Snap and Raycast --- .../blenderbim/bim/module/model/wall.py | 50 +++++++++---------- src/blenderbim/blenderbim/core/tool.py | 4 +- src/blenderbim/blenderbim/tool/__init__.py | 4 +- .../tool/{raycasting.py => raycast.py} | 2 +- .../blenderbim/tool/{snaping.py => snap.py} | 2 +- 5 files changed, 31 insertions(+), 31 deletions(-) rename src/blenderbim/blenderbim/tool/{raycasting.py => raycast.py} (98%) rename src/blenderbim/blenderbim/tool/{snaping.py => snap.py} (99%) diff --git a/src/blenderbim/blenderbim/bim/module/model/wall.py b/src/blenderbim/blenderbim/bim/module/model/wall.py index 1ce212c860..d4c0ca9861 100644 --- a/src/blenderbim/blenderbim/bim/module/model/wall.py +++ b/src/blenderbim/blenderbim/bim/module/model/wall.py @@ -345,17 +345,17 @@ class DrawPolylineWall(bpy.types.Operator): for obj, bbox_2d in self.objs_2d_bbox: if obj.type == "MESH" and bbox_2d: - if tool.Raycasting.in_view_2d_bounding_box(self.mouse_pos, bbox_2d): + if tool.Raycast.in_view_2d_bounding_box(self.mouse_pos, bbox_2d): objs_to_raycast.append(obj) for obj in objs_to_raycast: - hit, normal, face_index = tool.Raycasting.obj_ray_cast(context, event, obj) + hit, normal, face_index = tool.Raycast.obj_ray_cast(context, event, obj) if hit is None: # Tried original mouse position. Now it will try the offsets. original_mouse_pos = self.mouse_pos for value in mouse_offset: self.mouse_pos = tuple(x + y for x, y in zip(original_mouse_pos, value)) - hit, normal, face_index = tool.Raycasting.obj_ray_cast(context, event, obj) + hit, normal, face_index = tool.Raycast.obj_ray_cast(context, event, obj) if hit: break self.mouse_pos = original_mouse_pos @@ -375,21 +375,21 @@ class DrawPolylineWall(bpy.types.Operator): return None, None, None snap_threshold = 0.3 - ray_origin, ray_target, ray_direction = tool.Raycasting.get_viewport_ray_data(context, event) + ray_origin, ray_target, ray_direction = tool.Raycast.get_viewport_ray_data(context, event) obj, hit, face_index = cast_rays_and_get_best_object() - intersection = tool.Raycasting.ray_cast_to_plane(context, event, plane_origin, plane_normal) + intersection = tool.Raycast.ray_cast_to_plane(context, event, plane_origin, plane_normal) # Locks snap into an angle axis if event.shift: - rot_intersection, _, axis_start, axis_end = tool.Snaping.snap_on_axis(intersection, self.snap_angle) + rot_intersection, _, axis_start, axis_end = tool.Snap.snap_on_axis(intersection, self.snap_angle) else: self.snap_angle = None - rot_intersection, self.snap_angle, _, _ = tool.Snaping.snap_on_axis(intersection) + rot_intersection, self.snap_angle, _, _ = tool.Snap.snap_on_axis(intersection) if obj is not None: - snap_points = tool.Snaping.get_snap_points_on_raycasted_obj(obj, face_index) - snap_point = tool.Snaping.select_snap_point(snap_points, hit, snap_threshold) + snap_points = tool.Snap.get_snap_points_on_raycasted_obj(obj, face_index) + snap_point = tool.Snap.select_snap_point(snap_points, hit, snap_threshold) if snap_point: # Creates a mixed snap point between the locked axis and @@ -422,24 +422,24 @@ class DrawPolylineWall(bpy.types.Operator): else: best_result = result_2 - tool.Snaping.update_snaping_point(best_result, "Axis") + tool.Snap.update_snaping_point(best_result, "Axis") except Exception as e: - tool.Snaping.update_snaping_point(snap_point[0], snap_point[1]) + tool.Snap.update_snaping_point(snap_point[0], snap_point[1]) else: - tool.Snaping.update_snaping_point(hit, "Face") + tool.Snap.update_snaping_point(hit, "Face") else: - snap_points = tool.Snaping.get_snap_points_on_polyline() - snap_point = tool.Snaping.select_snap_point(snap_points, intersection, snap_threshold) + snap_points = tool.Snap.get_snap_points_on_polyline() + snap_point = tool.Snap.select_snap_point(snap_points, intersection, snap_threshold) if snap_point: - tool.Snaping.update_snaping_point(snap_point[0], snap_point[1]) + tool.Snap.update_snaping_point(snap_point[0], snap_point[1]) elif rot_intersection: - tool.Snaping.update_snaping_point(rot_intersection, "Axis") + tool.Snap.update_snaping_point(rot_intersection, "Axis") else: - tool.Snaping.update_snaping_point(intersection, "Plane") + tool.Snap.update_snaping_point(intersection, "Plane") def validate_input(self, input_number): grammar = """ @@ -533,7 +533,7 @@ class DrawPolylineWall(bpy.types.Operator): if self.mousemove_count == 2: self.objs_2d_bbox = [] for obj in self.visible_objs: - self.objs_2d_bbox.append(tool.Raycasting.get_objects_2d_bounding_boxes(context, obj)) + self.objs_2d_bbox.append(tool.Raycast.get_objects_2d_bounding_boxes(context, obj)) if self.mousemove_count > 3: self.snaping_movement(context, event) @@ -543,11 +543,11 @@ class DrawPolylineWall(bpy.types.Operator): return {"RUNNING_MODAL"} if event.value == "RELEASE" and event.type == "LEFTMOUSE": - tool.Snaping.insert_polyline_point() + tool.Snap.insert_polyline_point() if not self.is_input_on: if event.value == "RELEASE" and event.type == "BACK_SPACE": - tool.Snaping.remove_last_polyline_point() + tool.Snap.remove_last_polyline_point() tool.Blender.update_viewport() if self.is_input_on and event.value == "PRESS" and event.type == "TAB": @@ -608,7 +608,7 @@ class DrawPolylineWall(bpy.types.Operator): if not self.is_input_on and event.value == "RELEASE" and event.type in {"RET", "NUMPAD_ENTER"}: self.create_walls_from_polyline(context) WallPolylineDecorator.uninstall() - tool.Snaping.clear_polyline() + tool.Snap.clear_polyline() tool.Blender.update_viewport() return {"FINISHED"} @@ -621,7 +621,7 @@ class DrawPolylineWall(bpy.types.Operator): WallPolylineDecorator.set_input_panel(self.input_panel, self.input_type) tool.Blender.update_viewport() else: - tool.Snaping.insert_polyline_point(float(self.input_panel["X"]), float(self.input_panel["Y"])) + tool.Snap.insert_polyline_point(float(self.input_panel["X"]), float(self.input_panel["Y"])) self.is_input_on = False self.input_type = "OFF" self.number_input = [] @@ -641,7 +641,7 @@ class DrawPolylineWall(bpy.types.Operator): else: if event.value == "RELEASE" and event.type in {"RIGHTMOUSE", "ESC"}: WallPolylineDecorator.uninstall() - tool.Snaping.clear_polyline() + tool.Snap.clear_polyline() tool.Blender.update_viewport() return {"CANCELLED"} @@ -651,9 +651,9 @@ class DrawPolylineWall(bpy.types.Operator): if context.space_data.type == "VIEW_3D": WallPolylineDecorator.install(context) WallPolylineDecorator.set_input_panel(self.input_panel, self.input_type) - self.visible_objs = tool.Raycasting.get_visible_objects(context) + self.visible_objs = tool.Raycast.get_visible_objects(context) for obj in self.visible_objs: - self.objs_2d_bbox.append(tool.Raycasting.get_objects_2d_bounding_boxes(context, obj)) + self.objs_2d_bbox.append(tool.Raycast.get_objects_2d_bounding_boxes(context, obj)) self.snaping_movement(context, event) WallPolylineDecorator.set_mouse_position(event) self.input_panel = WallPolylineDecorator.calculate_distance_and_angle(context, self.is_input_on) diff --git a/src/blenderbim/blenderbim/core/tool.py b/src/blenderbim/blenderbim/core/tool.py index 766b998bf3..f6e378d0ab 100644 --- a/src/blenderbim/blenderbim/core/tool.py +++ b/src/blenderbim/blenderbim/core/tool.py @@ -660,7 +660,7 @@ class Qto: def set_qto_result(cls, result): pass @interface -class Raycasting: +class Raycast: pass @interface @@ -938,7 +938,7 @@ class Covering: def get_z_from_ceiling_height(cls): pass @interface -class Snaping: +class Snap: pass @interface diff --git a/src/blenderbim/blenderbim/tool/__init__.py b/src/blenderbim/blenderbim/tool/__init__.py index 48cbb9e9ff..a3e40ad81a 100644 --- a/src/blenderbim/blenderbim/tool/__init__.py +++ b/src/blenderbim/blenderbim/tool/__init__.py @@ -47,11 +47,11 @@ from blenderbim.tool.project import Project from blenderbim.tool.profile import Profile from blenderbim.tool.pset import Pset from blenderbim.tool.qto import Qto -from blenderbim.tool.raycasting import Raycasting +from blenderbim.tool.raycast import Raycast from blenderbim.tool.resource import Resource from blenderbim.tool.root import Root from blenderbim.tool.sequence import Sequence -from blenderbim.tool.snaping import Snaping +from blenderbim.tool.snap import Snap from blenderbim.tool.spatial import Spatial from blenderbim.tool.covering import Covering from blenderbim.tool.structural import Structural diff --git a/src/blenderbim/blenderbim/tool/raycasting.py b/src/blenderbim/blenderbim/tool/raycast.py similarity index 98% rename from src/blenderbim/blenderbim/tool/raycasting.py rename to src/blenderbim/blenderbim/tool/raycast.py index 7f0c4bf1a1..70c2c9d5e7 100644 --- a/src/blenderbim/blenderbim/tool/raycasting.py +++ b/src/blenderbim/blenderbim/tool/raycast.py @@ -25,7 +25,7 @@ import mathutils from mathutils import Matrix, Vector -class Raycasting(blenderbim.core.tool.Raycasting): +class Raycast(blenderbim.core.tool.Raycast): @classmethod def get_visible_objects(cls, context): depsgraph = context.evaluated_depsgraph_get() diff --git a/src/blenderbim/blenderbim/tool/snaping.py b/src/blenderbim/blenderbim/tool/snap.py similarity index 99% rename from src/blenderbim/blenderbim/tool/snaping.py rename to src/blenderbim/blenderbim/tool/snap.py index 7ce731b798..6da9c80d3c 100644 --- a/src/blenderbim/blenderbim/tool/snaping.py +++ b/src/blenderbim/blenderbim/tool/snap.py @@ -25,7 +25,7 @@ import mathutils from mathutils import Matrix, Vector -class Snaping(blenderbim.core.tool.Snaping): +class Snap(blenderbim.core.tool.Snap): @classmethod def get_snap_points_on_raycasted_obj(cls, obj, face_index): snap_points = {}