feat: add edge_bevel operator

interface/bevel_menu.py

@@ -10,7 +10,9 @@ class ND_MT_bevel_menu(bpy.types.Menu):
     def draw(self, context):
         layout = self.layout
         layout.operator_context = 'INVOKE_DEFAULT'
-        layout.operator("nd.vertex_bevel", icon='MOD_BEVEL')
+        layout.operator("nd.vertex_bevel", icon='VERTEXSEL')
+        layout.operator("nd.edge_bevel", icon='EDGESEL')
+        layout.separator()
         layout.operator("nd.bevel", icon='MOD_BEVEL')
         layout.operator("nd.weighted_normal_bevel", icon='MOD_BEVEL')
 

interface/main_ui_panel.py

@@ -79,7 +79,11 @@ def draw(self, context):
 
         row = column.row(align=True)
         row.scale_y = 1.2
-        row.operator("nd.vertex_bevel", icon='MOD_BEVEL')
+        row.operator("nd.vertex_bevel", icon='VERTEXSEL')
+
+        row = column.row(align=True)
+        row.scale_y = 1.2
+        row.operator("nd.edge_bevel", icon='EDGESEL')
 
         row = column.row(align=True)
         row.scale_y = 1.2

power_mods/__init__.py

@@ -9,6 +9,7 @@
 from . import circular_array
 from . import square_array
 from . import array_cubed
+from . import edge_bevel
 from . import bevel
 
 
@@ -23,6 +24,7 @@ def reload():
     importlib.reload(circular_array)
     importlib.reload(square_array)
     importlib.reload(array_cubed)
+    importlib.reload(edge_bevel)
     importlib.reload(bevel)
 
 
@@ -37,6 +39,7 @@ def register():
     circular_array.register()
     square_array.register()
     array_cubed.register()
+    edge_bevel.register()
     bevel.register()
 
 
@@ -51,6 +54,7 @@ def unregister():
     circular_array.unregister()
     square_array.unregister()
     array_cubed.unregister()
+    edge_bevel.unregister()
     bevel.unregister()
 
 

power_mods/edge_bevel.py

@@ -0,0 +1,289 @@
+import bpy
+import bmesh
+from .. lib.overlay import update_overlay, init_overlay, toggle_pin_overlay, toggle_operator_passthrough, register_draw_handler, unregister_draw_handler, draw_header, draw_property
+from .. lib.events import capture_modifier_keys
+from .. lib.preferences import get_preferences
+
+
+mod_bevel = "Bevel — ND EB"
+mod_weld = "Weld — ND EB"
+mod_summon_list = [mod_bevel, mod_weld]
+
+
+class ND_OT_edge_bevel(bpy.types.Operator):
+    bl_idname = "nd.edge_bevel"
+    bl_label = "Edge Bevel"
+    bl_description = "Adds a weighted edge bevel modifier to the selected object"
+    bl_options = {'UNDO'}
+
+
+    def modal(self, context, event):
+        capture_modifier_keys(self, event)
+
+        weight_factor = 0.01 if self.key_shift else 0.1
+        profile_factor = 0.01 if self.key_shift else 0.1
+        segment_factor = 1 if self.key_shift else 2
+
+        if self.key_toggle_operator_passthrough:
+            toggle_operator_passthrough(self)
+
+        elif self.key_toggle_pin_overlay:
+            toggle_pin_overlay(self, event)
+
+        elif self.operator_passthrough:
+            update_overlay(self, context, event)
+
+            return {'PASS_THROUGH'}
+
+        elif self.key_cancel:
+            self.revert(context)
+
+            return {'CANCELLED'}
+
+        elif self.key_increase_factor:
+            if self.key_no_modifiers:
+                self.base_weight_factor = min(1, self.base_weight_factor * 10.0)
+
+        elif self.key_decrease_factor:
+            if self.key_no_modifiers:
+                self.base_weight_factor = max(0.001, self.base_weight_factor / 10.0)
+
+        elif self.key_step_up:
+            if self.key_alt:
+                self.segments = 2 if self.segments == 1 else self.segments + segment_factor
+            elif self.key_ctrl:
+                self.profile = min(1, self.profile + profile_factor)
+            elif self.key_shift_ctrl_alt:
+                self.harden_normals = not self.harden_normals
+            elif self.key_ctrl_alt:
+                self.width = max(0, self.width + 0.1)
+            elif self.key_no_modifiers:
+                self.weight = max(0, min(1, self.weight + weight_factor))
+
+            self.dirty = True
+
+        elif self.key_step_down:
+            if self.key_alt:
+                self.segments = max(1, self.segments - segment_factor)
+            elif self.key_ctrl:
+                self.profile = max(0, self.profile - profile_factor)
+            elif self.key_shift_ctrl_alt:
+                self.harden_normals = not self.harden_normals
+            elif self.key_ctrl_alt:
+                self.width = max(0, self.width - 0.1)
+            elif self.key_no_modifiers:
+                self.weight = max(0, min(1, self.weight - weight_factor))
+
+            self.dirty = True
+
+        elif self.key_confirm:
+            self.finish(context)
+
+            return {'FINISHED'}
+
+        elif self.key_movement_passthrough:
+            return {'PASS_THROUGH'}
+
+        if get_preferences().enable_mouse_values:
+            if self.key_ctrl_alt:
+                self.width = max(0, self.width + self.mouse_value)
+            elif self.key_ctrl:
+                self.profile = max(0, min(1, self.profile + self.mouse_value))
+            elif self.key_no_modifiers:
+                self.weight = max(0, min(1, self.weight + self.mouse_value))
+
+            self.dirty = True
+
+        if self.dirty:
+            self.operate(context)
+
+        update_overlay(self, context, event)
+
+        return {'RUNNING_MODAL'}
+
+
+    def invoke(self, context, event):
+        self.dirty = False
+
+        self.segments = 1
+        self.weight = 0
+        self.width = 0.5
+        self.profile = 0.5
+        self.harden_normals = False
+
+        if not context.object.data.use_customdata_edge_bevel:
+            context.object.data.use_customdata_edge_bevel = True
+
+        self.take_edges_snapshot(context)
+
+        mods = context.active_object.modifiers
+        mod_names = list(map(lambda x: x.name, mods))
+        previous_op = all(m in mod_names for m in mod_summon_list)
+
+        if previous_op:
+            self.summon_old_operator(context, mods)
+        else:
+            self.prepare_new_operator(context)
+
+        self.operate(context)
+
+        capture_modifier_keys(self, None, event.mouse_x)
+
+        init_overlay(self, event)
+        register_draw_handler(self, draw_text_callback)
+
+        context.window_manager.modal_handler_add(self)
+
+        return {'RUNNING_MODAL'}
+
+
+    @classmethod
+    def poll(cls, context):
+        if context.mode == 'EDIT_MESH':
+            mesh = bmesh.from_edit_mesh(context.object.data)
+            return len([edge for edge in mesh.edges if edge.select]) >= 1
+
+
+    def prepare_new_operator(self, context):
+        self.summoned = False
+
+        self.add_bevel_modifier(context)
+
+
+    def summon_old_operator(self, context, mods):
+        self.summoned = True
+
+        self.bevel = mods[mod_bevel]
+
+        self.width_prev = self.width = self.bevel.width
+        self.segments_prev = self.segments = self.bevel.segments
+        self.profile_prev = self.profile = self.bevel.profile
+        self.harden_normals_prev = self.harden_normals = self.bevel.harden_normals
+
+
+    def add_bevel_modifier(self, context):
+        bevel = context.object.modifiers.new(mod_bevel, 'BEVEL')
+        bevel.offset_type = 'WIDTH'
+        bevel.limit_method = 'WEIGHT'
+
+        self.bevel = bevel
+
+
+    def add_weld_modifier(self, context):
+        mods = context.active_object.modifiers
+        mod_names = list(map(lambda x: x.name, mods))
+        previous_op = all(m in mod_names for m in mod_summon_list)
+
+        if not previous_op:
+            weld = context.object.modifiers.new(mod_weld, type='WELD')
+            weld.merge_threshold = 0.00001
+
+            self.weld = weld
+
+
+    def take_edges_snapshot(self, context):
+        self.edges_snapshot = {}
+
+        data = context.object.data
+        bm = bmesh.from_edit_mesh(data)
+        bevel_weight_layer = bm.edges.layers.bevel_weight.verify()
+
+        selected_edges = [edge for edge in bm.edges if edge.select]
+        for edge in selected_edges:
+            self.edges_snapshot[edge.index] = edge[bevel_weight_layer]
+
+
+    def operate(self, context):
+        self.bevel.width = self.width
+        self.bevel.segments = self.segments
+        self.bevel.profile = self.profile
+        self.bevel.harden_normals = self.harden_normals
+
+        data = context.object.data
+        bm = bmesh.from_edit_mesh(data)
+        bevel_weight_layer = bm.edges.layers.bevel_weight.verify()
+
+        selected_edges = [edge for edge in bm.edges if edge.select]
+        for edge in selected_edges:
+            edge[bevel_weight_layer] = self.weight
+
+        bmesh.update_edit_mesh(data)
+
+        self.dirty = False
+
+
+    def finish(self, context):
+        self.add_weld_modifier(context)
+        unregister_draw_handler()
+
+
+    def revert(self, context):
+        if not self.summoned:
+            bpy.ops.object.modifier_remove(modifier=self.bevel.name)
+
+        if self.summoned:
+            self.bevel.width = self.width_prev
+            self.bevel.segments = self.segments_prev
+            self.bevel.profile = self.profile_prev
+
+        data = context.object.data
+        bm = bmesh.from_edit_mesh(data)
+        bevel_weight_layer = bm.edges.layers.bevel_weight.verify()
+
+        selected_edges = [edge for edge in bm.edges if edge.select]
+        for edge in selected_edges:
+            edge[bevel_weight_layer] = self.edges_snapshot[edge.index]
+
+        bmesh.update_edit_mesh(data)
+
+        unregister_draw_handler()
+
+
+def draw_text_callback(self):
+    draw_header(self)
+
+    draw_property(
+        self,
+        "Weight: {0:.2f} ({1:.0f})".format(self.weight, self.width * 1000 * self.weight),
+        "(±0.1)  |  Shift (±0.01)",
+        active=self.key_no_modifiers,
+        alt_mode=self.key_shift_no_modifiers,
+        mouse_value=True)
+
+    draw_property(
+        self,
+        "Segments: {}".format(self.segments), 
+        "Alt (±2)  |  Shift (±1)",
+        active=self.key_alt,
+        alt_mode=self.key_shift_alt)
+
+    draw_property(
+        self, 
+        "Profile: {0:.2f}".format(self.profile),
+        "Ctrl (±0.1)  |  Shift + Ctrl (±0.01)",
+        active=self.key_ctrl,
+        alt_mode=self.key_shift_ctrl,
+        mouse_value=True)
+
+    draw_property(
+        self,
+        "Width: {0:.0f}  /  Harden Normals: {1}".format(self.width * 1000, "Yes" if self.harden_normals else "No"),
+        "Ctrl + Alt (±100)  |  Shift + Ctrl + Alt (Yes, No)",
+        active=self.key_ctrl_alt,
+        alt_mode=self.key_shift_ctrl_alt,
+        mouse_value=(not self.key_shift_ctrl_alt))
+
+
+def menu_func(self, context):
+    self.layout.operator(ND_OT_edge_bevel.bl_idname, text=ND_OT_edge_bevel.bl_label)
+
+
+def register():
+    bpy.utils.register_class(ND_OT_edge_bevel)
+    bpy.types.VIEW3D_MT_object.append(menu_func)
+
+
+def unregister():
+    bpy.utils.unregister_class(ND_OT_edge_bevel)
+    bpy.types.VIEW3D_MT_object.remove(menu_func)
+    unregister_draw_handler()