[Bf-blender-cvs] [d54c9fd490b] soc-2021-knife-tools: Knife: Updated header/footer for constrained axis

[Cian Jinks]

Commit: d54c9fd490bdbc8bb138b0d589bc89818324dd56
Author: Cian Jinks
Date:   Wed Jun 16 14:27:43 2021 +0100
Branches: soc-2021-knife-tools
https://developer.blender.org/rBd54c9fd490bdbc8bb138b0d589bc89818324dd56

Knife: Updated header/footer for constrained axis

Now the header/footer shows X,Y,Z when constrained globally in the respective axis and x,y,z when constrained locally.

===================================================================

M	source/blender/editors/mesh/editmesh_knife.c

===================================================================

diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c
index 1387e5eee89..550e4ceb0bd 100644
--- a/source/blender/editors/mesh/editmesh_knife.c
+++ b/source/blender/editors/mesh/editmesh_knife.c
@@ -262,6 +262,7 @@ typedef struct KnifeTool_OpData {
   short constrain_axis_mode;
   bool axis_constrained;
   float curr_cage_adjusted[3];
+  char axis_string[2];
 } KnifeTool_OpData;
 
 enum {
@@ -613,32 +614,33 @@ static void knife_update_header(bContext *C, wmOperator *op, KnifeTool_OpData *k
   WM_modalkeymap_operator_items_to_string_buf( \
       op->type, (_id), true, UI_MAX_SHORTCUT_STR, &available_len, &p)
 
-  BLI_snprintf(header,
-               sizeof(header),
-               TIP_("%s: confirm, %s: cancel, "
-                    "%s: start/define cut, %s: close cut, %s: new cut, "
-                    "%s: midpoint snap (%s), %s: ignore snap (%s), "
-                    "%s: angle constraint %.2f (%s), %s: cut through (%s), "
-                    "%s: panning, XYZ: orientation lock (%s)"),
-               WM_MODALKEY(KNF_MODAL_CONFIRM),
-               WM_MODALKEY(KNF_MODAL_CANCEL),
-               WM_MODALKEY(KNF_MODAL_ADD_CUT),
-               WM_MODALKEY(KNF_MODAL_ADD_CUT_CLOSED),
-               WM_MODALKEY(KNF_MODAL_NEW_CUT),
-               WM_MODALKEY(KNF_MODAL_MIDPOINT_ON),
-               WM_bool_as_string(kcd->snap_midpoints),
-               WM_MODALKEY(KNF_MODAL_IGNORE_SNAP_ON),
-               WM_bool_as_string(kcd->ignore_edge_snapping),
-               WM_MODALKEY(KNF_MODAL_ANGLE_SNAP_TOGGLE),
-               (kcd->angle_snapping_increment > KNIFE_MIN_ANGLE_SNAPPING_INCREMENT &&
-                kcd->angle_snapping_increment < KNIFE_MAX_ANGLE_SNAPPING_INCREMENT) ?
-                   kcd->angle_snapping_increment :
-                   KNIFE_DEFAULT_ANGLE_SNAPPING_INCREMENT,
-               WM_bool_as_string(kcd->angle_snapping),
-               WM_MODALKEY(KNF_MODAL_CUT_THROUGH_TOGGLE),
-               WM_bool_as_string(kcd->cut_through),
-               WM_MODALKEY(KNF_MODAL_PANNING),
-               WM_bool_as_string(kcd->axis_constrained));
+  BLI_snprintf(
+      header,
+      sizeof(header),
+      TIP_("%s: confirm, %s: cancel, "
+           "%s: start/define cut, %s: close cut, %s: new cut, "
+           "%s: midpoint snap (%s), %s: ignore snap (%s), "
+           "%s: angle constraint %.2f (%s), %s: cut through (%s), "
+           "%s: panning, XYZ: orientation lock (%s)"),
+      WM_MODALKEY(KNF_MODAL_CONFIRM),
+      WM_MODALKEY(KNF_MODAL_CANCEL),
+      WM_MODALKEY(KNF_MODAL_ADD_CUT),
+      WM_MODALKEY(KNF_MODAL_ADD_CUT_CLOSED),
+      WM_MODALKEY(KNF_MODAL_NEW_CUT),
+      WM_MODALKEY(KNF_MODAL_MIDPOINT_ON),
+      WM_bool_as_string(kcd->snap_midpoints),
+      WM_MODALKEY(KNF_MODAL_IGNORE_SNAP_ON),
+      WM_bool_as_string(kcd->ignore_edge_snapping),
+      WM_MODALKEY(KNF_MODAL_ANGLE_SNAP_TOGGLE),
+      (kcd->angle_snapping_increment > KNIFE_MIN_ANGLE_SNAPPING_INCREMENT &&
+       kcd->angle_snapping_increment < KNIFE_MAX_ANGLE_SNAPPING_INCREMENT) ?
+          kcd->angle_snapping_increment :
+          KNIFE_DEFAULT_ANGLE_SNAPPING_INCREMENT,
+      WM_bool_as_string(kcd->angle_snapping),
+      WM_MODALKEY(KNF_MODAL_CUT_THROUGH_TOGGLE),
+      WM_bool_as_string(kcd->cut_through),
+      WM_MODALKEY(KNF_MODAL_PANNING),
+      (kcd->axis_constrained ? kcd->axis_string : WM_bool_as_string(kcd->axis_constrained)));
 
 #undef WM_MODALKEY
 
@@ -3291,19 +3293,23 @@ static int knifetool_modal(bContext *C, wmOperator *op, const wmEvent *event)
     if (event->type == EVT_XKEY && kcd->constrain_axis != KNF_CONSTRAIN_AXIS_X) {
       kcd->constrain_axis = KNF_CONSTRAIN_AXIS_X;
       kcd->constrain_axis_mode = KNF_CONSTRAIN_AXIS_MODE_GLOBAL;
+      kcd->axis_string[0] = 'X';
     }
     else if (event->type == EVT_YKEY && kcd->constrain_axis != KNF_CONSTRAIN_AXIS_Y) {
       kcd->constrain_axis = KNF_CONSTRAIN_AXIS_Y;
       kcd->constrain_axis_mode = KNF_CONSTRAIN_AXIS_MODE_GLOBAL;
+      kcd->axis_string[0] = 'Y';
     }
     else if (event->type == EVT_ZKEY && kcd->constrain_axis != KNF_CONSTRAIN_AXIS_Z) {
       kcd->constrain_axis = KNF_CONSTRAIN_AXIS_Z;
       kcd->constrain_axis_mode = KNF_CONSTRAIN_AXIS_MODE_GLOBAL;
+      kcd->axis_string[0] = 'Z';
     }
     else {
       /* Cycle through modes with repeated key presses */
       if (kcd->constrain_axis_mode != KNF_CONSTRAIN_AXIS_MODE_LOCAL) {
         kcd->constrain_axis_mode++;
+        kcd->axis_string[0] += 32; /* lower case */
       }
       else {
         kcd->constrain_axis = KNF_CONSTRAIN_AXIS_NONE;
@@ -3377,6 +3383,9 @@ static int knifetool_invoke(bContext *C, wmOperator *op, const wmEvent *event)
     UNUSED_VARS_NDEBUG(ret);
   }
 
+  kcd->axis_string[0] = ' ';
+  kcd->axis_string[1] = '\0';
+
   knife_update_header(C, op, kcd);
 
   /* Initialise num input handling for angle snapping */