feat: add toggleable "halt" mode to all operators, allowing event / k…

…eybinding passthrough

generators/ring_and_bolt.py

@@ -1,7 +1,7 @@
 import bpy
 import bmesh
 from math import radians
-from .. lib.overlay import update_overlay, init_overlay, toggle_pin_overlay, register_draw_handler, unregister_draw_handler, draw_header, draw_property
+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.objects import add_single_vertex_object, align_object_to_3d_cursor
 from .. lib.events import capture_modifier_keys
 
@@ -20,9 +20,16 @@ def modal(self, context, event):
         width_factor = (self.base_width_factor / 10.0) if self.key_shift else self.base_width_factor
         segment_factor = 1 if self.key_shift else 2
 
+        if self.key_toggle_operator_passthrough:
+            toggle_operator_passthrough(self)
+
         if self.key_toggle_pin_overlay:
             toggle_pin_overlay(self)
 
+        if self.operator_passthrough:
+            self.update_overlay_wrapper(context, event)
+            return {'PASS_THROUGH'}
+
         elif self.key_increase_factor:
             if self.key_alt:
                 self.base_inner_radius_factor = min(1, self.base_inner_radius_factor * 10.0)
@@ -66,11 +73,15 @@ def modal(self, context, event):
             return {'PASS_THROUGH'}
 
         self.operate(context)
-        update_overlay(self, context, event, x_offset=300, lines=3)
+        self.update_overlay_wrapper(context, event)
 
         return {'RUNNING_MODAL'}
 
 
+    def update_overlay_wrapper(self, context, event):
+        update_overlay(self, context, event, x_offset=300, lines=3)
+
+
     def invoke(self, context, event):
         self.base_inner_radius_factor = 0.001
         self.base_width_factor = 0.001

lib/events.py

@@ -9,6 +9,7 @@ def capture_modifier_keys(cls, event=None):
     cls.key_shift =False if event is None else event.shift
     cls.key_shift_no_modifiers = False if event is None else event.shift and cls.key_no_modifiers
     cls.key_toggle_pin_overlay = False if event is None else event.type == 'P' and event.value == 'PRESS'
+    cls.key_toggle_operator_passthrough = False if event is None else event.type == 'BACK_SLASH' and event.value == 'PRESS'
     cls.key_increase_factor = False if event is None else event.type in {'PLUS', 'EQUAL', 'NUMPAD_PLUS'} and event.value == 'PRESS'
     cls.key_decrease_factor = False if event is None else event.type in {'MINUS', 'NUMPAD_MINUS'} and event.value == 'PRESS'
     cls.key_step_up = False if event is None else event.type == 'WHEELUPMOUSE'

lib/overlay.py

@@ -35,6 +35,10 @@ def toggle_pin_overlay(cls):
     cls.pin_overlay = not cls.pin_overlay
 
 
+def toggle_operator_passthrough(cls):
+    cls.operator_passthrough = not cls.operator_passthrough
+
+
 def init_overlay(cls, event):
     cls.overlay_offset_x = 25
     cls.overlay_offset_y = -15
@@ -49,6 +53,7 @@ def init_overlay(cls, event):
     cls.overlay_y = event.mouse_y - cls.region_offset_y + cls.overlay_offset_y
 
     cls.pin_overlay = False
+    cls.operator_passthrough = False
 
 
 def update_overlay(cls, context, event, x_offset=400, lines=1):
@@ -77,8 +82,19 @@ def update_overlay(cls, context, event, x_offset=400, lines=1):
 
 
 def draw_header(cls):
+    if cls.operator_passthrough:
+        blf.size(0, 12, 72)
+        blf.color(0, .933, 0.231, 0.169, 1.0)
+        blf.position(0, cls.overlay_x + 1, cls.overlay_y + 26, 0)
+        blf.draw(0, "HALTED")
+
     blf.size(0, 24, 72)
-    blf.color(0, 1.0, 0.529, 0.216, 1.0)
+
+    if cls.operator_passthrough:
+        blf.color(0, .933, 0.231, 0.169, 1.0)
+    else:
+        blf.color(0, 1.0, 0.529, 0.216, 1.0)
+
     blf.position(0, cls.overlay_x, cls.overlay_y, 0)
     blf.draw(0, "ND — " + cls.bl_label)
 
@@ -88,7 +104,9 @@ def draw_header(cls):
 def draw_property(cls, property_content, metadata_content, active=False, alt_mode=False):
     blf.size(0, 28, 72)
 
-    if active:
+    if cls.operator_passthrough:
+        blf.color(0, 1.0, 1.0, 1.0, 0.2)
+    elif active:
         blf.color(0, 0.216, 0.686, 1.0, 1.0)
     else:
         blf.color(0, 1.0, 1.0, 1.0, 0.1)
@@ -101,12 +119,22 @@ def draw_property(cls, property_content, metadata_content, active=False, alt_mod
         blf.draw(0, "●")
 
     blf.size(0, 16, 72)
-    blf.color(0, 1.0, 1.0, 1.0, 1.0)
+
+    if cls.operator_passthrough:
+        blf.color(0, 1.0, 1.0, 1.0, 0.2)
+    else:
+        blf.color(0, 1.0, 1.0, 1.0, 1.0)
+
     blf.position(0, cls.overlay_x + 25, cls.overlay_y - (25 + (cls.line_spacer * cls.line_step)), 0)
     blf.draw(0, property_content)
 
     blf.size(0, 11, 72)
-    blf.color(0, 1.0, 1.0, 1.0, 0.3)
+
+    if cls.operator_passthrough:
+        blf.color(0, 1.0, 1.0, 1.0, 0.2)
+    else:
+        blf.color(0, 1.0, 1.0, 1.0, 0.3)
+
     blf.position(0, cls.overlay_x + 25, cls.overlay_y - (40 + (cls.line_spacer * cls.line_step)), 0)
     blf.draw(0, metadata_content)
 
@@ -116,17 +144,31 @@ def draw_property(cls, property_content, metadata_content, active=False, alt_mod
 def draw_hint(cls, hint_content, metadata_content):
     blf.size(0, 22, 72)
 
-    blf.color(0, 1.0, 1.0, 1.0, 0.5)
+    if cls.operator_passthrough:
+        blf.color(0, 1.0, 1.0, 1.0, 0.2)
+    else:
+        blf.color(0, 1.0, 1.0, 1.0, 0.5)
+
     blf.position(0, cls.overlay_x - 3, cls.overlay_y - (36 + (cls.line_spacer * cls.line_step)), 0)
     blf.draw(0, "◈")
 
     blf.size(0, 16, 72)
-    blf.color(0, 1.0, 1.0, 1.0, 1.0)
+
+    if cls.operator_passthrough:
+        blf.color(0, 1.0, 1.0, 1.0, 0.2)
+    else:
+        blf.color(0, 1.0, 1.0, 1.0, 1.0)
+
     blf.position(0, cls.overlay_x + 25, cls.overlay_y - (25 + (cls.line_spacer * cls.line_step)), 0)
     blf.draw(0, hint_content)
 
     blf.size(0, 11, 72)
-    blf.color(0, 1.0, 1.0, 1.0, 0.3)
+
+    if cls.operator_passthrough:
+        blf.color(0, 1.0, 1.0, 1.0, 0.2)
+    else:
+        blf.color(0, 1.0, 1.0, 1.0, 0.3)
+
     blf.position(0, cls.overlay_x + 25, cls.overlay_y - (40 + (cls.line_spacer * cls.line_step)), 0)
     blf.draw(0, metadata_content)
 

power_mods/screw.py

@@ -1,7 +1,7 @@
 import bpy
 import bmesh
 from math import radians
-from .. lib.overlay import update_overlay, init_overlay, toggle_pin_overlay, register_draw_handler, unregister_draw_handler, draw_header, draw_property
+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
 
 
@@ -19,9 +19,16 @@ def modal(self, context, event):
         angle_factor = 1 if self.key_shift else 10
         offset_factor = (self.base_offset_factor / 10.0) if self.key_shift else self.base_offset_factor
 
+        if self.key_toggle_operator_passthrough:
+            toggle_operator_passthrough(self)
+
         if self.key_toggle_pin_overlay:
             toggle_pin_overlay(self)
 
+        if self.operator_passthrough:
+            self.update_overlay_wrapper(context, event)
+            return {'PASS_THROUGH'}
+
         elif self.key_increase_factor:
             if self.key_ctrl_alt:
                 self.base_offset_factor = min(1, self.base_offset_factor * 10.0)
@@ -70,10 +77,14 @@ def modal(self, context, event):
             return {'PASS_THROUGH'}
 
         self.operate(context)
-        update_overlay(self, context, event, x_offset=360, lines=4)
+        self.update_overlay_wrapper(context, event)
 
         return {'RUNNING_MODAL'}
 
+
+    def update_overlay_wrapper(self, context, event):
+        update_overlay(self, context, event, x_offset=340, lines=4)
+
 
     def invoke(self, context, event):
         self.base_offset_factor = 0.01

power_mods/solidify.py

@@ -1,7 +1,7 @@
 import bpy
 import bmesh
 from math import radians
-from .. lib.overlay import update_overlay, init_overlay, toggle_pin_overlay, register_draw_handler, unregister_draw_handler, draw_header, draw_property
+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
 
 
@@ -18,9 +18,16 @@ def modal(self, context, event):
         thickness_factor = (self.base_thickness_factor / 10.0) if self.key_shift else self.base_thickness_factor
         offset_factor = (self.base_offset_factor / 10.0) if self.key_shift else self.base_offset_factor
 
+        if self.key_toggle_operator_passthrough:
+            toggle_operator_passthrough(self)
+
         if self.key_toggle_pin_overlay:
             toggle_pin_overlay(self)
 
+        if self.operator_passthrough:
+            self.update_overlay_wrapper(context, event)
+            return {'PASS_THROUGH'}
+
         elif self.key_increase_factor:
             if self.key_ctrl:
                 self.base_offset_factor = min(1, self.base_offset_factor * 10.0)
@@ -63,10 +70,14 @@ def modal(self, context, event):
             return {'PASS_THROUGH'}
 
         self.operate(context)
-        update_overlay(self, context, event, x_offset=300, lines=3)
+        self.update_overlay_wrapper(context, event)
 
         return {'RUNNING_MODAL'}
 
+
+    def update_overlay_wrapper(self, context, event):
+        update_overlay(self, context, event, x_offset=300, lines=3)
+
 
     def invoke(self, context, event):
         self.base_thickness_factor = 0.01

power_mods/weighted_normal_bevel.py

@@ -1,7 +1,7 @@
 import bpy
 import bmesh
 from math import radians
-from .. lib.overlay import update_overlay, init_overlay, toggle_pin_overlay, register_draw_handler, unregister_draw_handler, draw_header, draw_property
+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
 
 
@@ -17,9 +17,16 @@ def modal(self, context, event):
 
         width_factor = (self.base_width_factor / 10.0) if event.shift else self.base_width_factor
 
+        if self.key_toggle_operator_passthrough:
+            toggle_operator_passthrough(self)
+
         if self.key_toggle_pin_overlay:
             toggle_pin_overlay(self)
 
+        if self.operator_passthrough:
+            self.update_overlay_wrapper(context, event)
+            return {'PASS_THROUGH'}
+
         elif self.key_increase_factor:
             self.base_width_factor = min(1, self.base_width_factor * 10.0)
 
@@ -46,10 +53,14 @@ def modal(self, context, event):
             return {'PASS_THROUGH'}
 
         self.operate(context)
-        update_overlay(self, context, event, x_offset=270, lines=1)
+        self.update_overlay_wrapper(context, event)
 
         return {'RUNNING_MODAL'}
 
+
+    def update_overlay_wrapper(self, context, event):
+        update_overlay(self, context, event, x_offset=270, lines=1)
+
 
     def invoke(self, context, event):
         self.base_width_factor = 0.001

sketching/blank_sketch.py

@@ -1,6 +1,6 @@
 import bpy
 import bmesh
-from .. lib.overlay import update_overlay, init_overlay, toggle_pin_overlay, register_draw_handler, unregister_draw_handler, draw_header, draw_hint
+from .. lib.overlay import update_overlay, init_overlay, toggle_pin_overlay, toggle_operator_passthrough, register_draw_handler, unregister_draw_handler, draw_header, draw_hint
 from .. lib.objects import add_single_vertex_object, align_object_to_3d_cursor
 from .. lib.events import capture_modifier_keys
 
@@ -15,9 +15,16 @@ class ND_OT_blank_sketch(bpy.types.Operator):
     def modal(self, context, event):
         capture_modifier_keys(self, event)
 
+        if self.key_toggle_operator_passthrough:
+            toggle_operator_passthrough(self)
+
         if self.key_toggle_pin_overlay:
             toggle_pin_overlay(self)
 
+        if self.operator_passthrough:
+            self.update_overlay_wrapper(context, event)
+            return {'PASS_THROUGH'}
+
         elif self.key_confirm_alternative:
             self.finish(context)
 
@@ -44,11 +51,15 @@ def modal(self, context, event):
         elif self.key_movement_passthrough:
             return {'PASS_THROUGH'}
 
-        update_overlay(self, context, event, x_offset=280, lines=1)
+        self.update_overlay_wrapper(context, event)
 
         return {'RUNNING_MODAL'}
 
 
+    def update_overlay_wrapper(self, context, event):
+        update_overlay(self, context, event, x_offset=280, lines=1)
+
+
     def invoke(self, context, event):
         add_single_vertex_object(self, context, "Sketch")
         align_object_to_3d_cursor(self, context)

sketching/face_sketch.py

@@ -1,6 +1,6 @@
 import bpy
 import bmesh
-from .. lib.overlay import update_overlay, init_overlay, toggle_pin_overlay, register_draw_handler, unregister_draw_handler, draw_header, draw_hint, draw_property
+from .. lib.overlay import update_overlay, init_overlay, toggle_pin_overlay, toggle_operator_passthrough, register_draw_handler, unregister_draw_handler, draw_header, draw_hint, draw_property
 from .. lib.math import averaged_vector, create_rotation_matrix_from_face
 from .. lib.viewport import set_3d_cursor
 from .. lib.events import capture_modifier_keys
@@ -16,9 +16,16 @@ class ND_OT_face_sketch(bpy.types.Operator):
     def modal(self, context, event):
         capture_modifier_keys(self, event)
 
+        if self.key_toggle_operator_passthrough:
+            toggle_operator_passthrough(self)
+
         if self.key_toggle_pin_overlay:
             toggle_pin_overlay(self)
 
+        if self.operator_passthrough:
+            self.update_overlay_wrapper(context, event)
+            return {'PASS_THROUGH'}
+
         elif self.key_step_up:
             if self.key_alt:
                 self.face_operation_mode = (self.face_operation_mode + 1) % 2
@@ -44,10 +51,14 @@ def modal(self, context, event):
         elif self.key_movement_passthrough:
             return {'PASS_THROUGH'}
 
-        update_overlay(self, context, event, x_offset=320, lines=2)
+        self.update_overlay_wrapper(context, event)
 
         return {'RUNNING_MODAL'}
 
+
+    def update_overlay_wrapper(self, context, event):
+        update_overlay(self, context, event, x_offset=320, lines=2)
+
 
     def invoke(self, context, event):
         self.face_operation_mode = 0 # Sketch Only (0), Extract & Sketch (1)