EditMesh: updated extrude manipulator

Now plus icons are used to add,
arrows are used to adjust existing extrusions.

1 files changed, 109 insertions, 85 deletions

diff --git a/source/blender/editors/mesh/editmesh_extrude.c b/source/blender/editors/mesh/editmesh_extrude.c
index 614694907c3..2e3d0a9c675 100644
--- a/source/blender/editors/mesh/editmesh_extrude.c
+++ b/source/blender/editors/mesh/editmesh_extrude.c
@@ -365,13 +365,26 @@ void MESH_OT_extrude_repeat(wmOperatorType *ot)
 
 #ifdef USE_MANIPULATOR
 
+const float extrude_button_scale = 0.15f;
+const float extrude_button_offset_scale = 1.5f;
+const float extrude_arrow_scale = 1.0f;
+const float extrude_arrow_xyz_axis_scale = 1.0f;
+const float extrude_arrow_normal_axis_scale = 1.75f;
+
+static const uchar shape_plus[] = {
+	0x5f, 0xfb, 0x40, 0xee, 0x25, 0xda, 0x11, 0xbf, 0x4, 0xa0, 0x0, 0x80, 0x4, 0x5f, 0x11,
+	0x40, 0x25, 0x25, 0x40, 0x11, 0x5f, 0x4, 0x7f, 0x0, 0xa0, 0x4, 0xbf, 0x11, 0xda, 0x25,
+	0xee, 0x40, 0xfb, 0x5f, 0xff, 0x7f, 0xfb, 0xa0, 0xee, 0xbf, 0xda, 0xda, 0xbf, 0xee,
+	0xa0, 0xfb, 0x80, 0xff, 0x6e, 0xd7, 0x92, 0xd7, 0x92, 0x90, 0xd8, 0x90, 0xd8, 0x6d,
+	0x92, 0x6d, 0x92, 0x27, 0x6e, 0x27, 0x6e, 0x6d, 0x28, 0x6d, 0x28, 0x90, 0x6e,
+	0x90, 0x6e, 0xd7, 0x80, 0xff, 0x5f, 0xfb, 0x5f, 0xfb,
+};
+
 typedef struct ManipulatorExtrudeGroup {
-	/* Extrude . */
-	struct wmManipulator *axis_normal;
-	/* Redo Z-axis translation. */
-	struct wmManipulator *axis_redo;
 
-	struct wmManipulator *axis_xyz[3];
+	/* XYZ & normal. */
+	struct wmManipulator *invoke_xyz_no[4];
+	struct wmManipulator *adjust_xyz_no[5];
 
 	struct {
 		float normal_mat3[3][3];  /* use Z axis for normal. */
@@ -387,16 +400,20 @@ static void manipulator_mesh_extrude_orientation_matrix_set(
 	for (int i = 0; i < 3; i++) {
 		/* Set orientation without location. */
 		for (int j = 0; j < 3; j++) {
-			copy_v3_v3(man->axis_xyz[i]->matrix_basis[j], mat[j]);
+			copy_v3_v3(man->adjust_xyz_no[i]->matrix_basis[j], mat[j]);
 		}
 		/* nop when (i == 2). */
-		swap_v3_v3(man->axis_xyz[i]->matrix_basis[i], man->axis_xyz[i]->matrix_basis[2]);
+		swap_v3_v3(man->adjust_xyz_no[i]->matrix_basis[i], man->adjust_xyz_no[i]->matrix_basis[2]);
 		/* Orient to normal gives generally less awkward results. */
 		if (man->data.orientation_type != V3D_MANIP_NORMAL) {
-			if (dot_v3v3(man->axis_xyz[i]->matrix_basis[2], man->data.normal_mat3[2]) < 0.0f) {
-				negate_v3(man->axis_xyz[i]->matrix_basis[2]);
+			if (dot_v3v3(man->adjust_xyz_no[i]->matrix_basis[2], man->data.normal_mat3[2]) < 0.0f) {
+				negate_v3(man->adjust_xyz_no[i]->matrix_basis[2]);
 			}
 		}
+		mul_v3_v3fl(
+		        man->invoke_xyz_no[i]->matrix_offset[3],
+		        man->adjust_xyz_no[i]->matrix_basis[2],
+		        (extrude_arrow_xyz_axis_scale * extrude_button_offset_scale) / extrude_button_scale);
 	}
 }
 
@@ -414,79 +431,72 @@ static bool manipulator_mesh_extrude_poll(const bContext *C, wmManipulatorGroupT
 
 static void manipulator_mesh_extrude_setup(const bContext *UNUSED(C), wmManipulatorGroup *mgroup)
 {
-	const int constraint_z[3] = {0, 0, 1};
-
 	struct ManipulatorExtrudeGroup *man = MEM_callocN(sizeof(ManipulatorExtrudeGroup), __func__);
 	mgroup->customdata = man;
 
 	const wmManipulatorType *wt_arrow = WM_manipulatortype_find("MANIPULATOR_WT_arrow_3d", true);
-	const wmManipulatorType *wt_grab = WM_manipulatortype_find("MANIPULATOR_WT_grab_3d", true);
+	const wmManipulatorType *wt_grab = WM_manipulatortype_find("MANIPULATOR_WT_button_2d", true);
 
-	for (int i = 0; i < 3; i++) {
-		man->axis_xyz[i] = WM_manipulator_new_ptr(wt_arrow, mgroup, NULL);
+	for (int i = 0; i < 4; i++) {
+		man->adjust_xyz_no[i] = WM_manipulator_new_ptr(wt_arrow, mgroup, NULL);
+		man->invoke_xyz_no[i] = WM_manipulator_new_ptr(wt_grab, mgroup, NULL);
+		man->invoke_xyz_no[i]->flag |= WM_MANIPULATOR_DRAW_OFFSET_SCALE;
 	}
-	man->axis_normal = WM_manipulator_new_ptr(wt_arrow, mgroup, NULL);
-	man->axis_redo = WM_manipulator_new_ptr(wt_grab, mgroup, NULL);
 
-	man->ot_extrude = WM_operatortype_find("MESH_OT_extrude_context_move", true);
-
-	for (int i = 0; i < 3; i++) {
-		UI_GetThemeColor3fv(TH_AXIS_X + i, man->axis_xyz[i]->color);
+	{
+		PropertyRNA *prop = RNA_struct_find_property(man->invoke_xyz_no[3]->ptr, "shape");
+		for (int i = 0; i < 4; i++) {
+			RNA_property_string_set_bytes(
+			        man->invoke_xyz_no[i]->ptr, prop,
+			        (const char *)shape_plus, ARRAY_SIZE(shape_plus));
+		}
 	}
-	UI_GetThemeColor3fv(TH_MANIPULATOR_PRIMARY, man->axis_normal->color);
-	UI_GetThemeColor3fv(TH_MANIPULATOR_SECONDARY, man->axis_redo->color);
 
-	man->axis_redo->color[3] = 0.3f;
-	man->axis_redo->color_hi[3] = 0.3f;
+	man->ot_extrude = WM_operatortype_find("MESH_OT_extrude_context_move", true);
 
 	for (int i = 0; i < 3; i++) {
-		WM_manipulator_set_scale(man->axis_xyz[i], 1.0);
+		UI_GetThemeColor3fv(TH_AXIS_X + i, man->invoke_xyz_no[i]->color);
+		UI_GetThemeColor3fv(TH_AXIS_X + i, man->adjust_xyz_no[i]->color);
 	}
-	WM_manipulator_set_scale(man->axis_normal, 2.0);
-	WM_manipulator_set_scale(man->axis_redo, 0.6);
+	UI_GetThemeColor3fv(TH_MANIPULATOR_PRIMARY, man->invoke_xyz_no[3]->color);
+	UI_GetThemeColor3fv(TH_MANIPULATOR_PRIMARY, man->adjust_xyz_no[3]->color);
 
-	for (int i = 0; i < 3; i++) {
-		RNA_enum_set(man->axis_xyz[i]->ptr, "draw_style", ED_MANIPULATOR_ARROW_STYLE_NORMAL);
+	for (int i = 0; i < 4; i++) {
+		WM_manipulator_set_scale(man->invoke_xyz_no[i], extrude_button_scale);
+		WM_manipulator_set_scale(man->adjust_xyz_no[i], extrude_arrow_scale);
 	}
-	RNA_enum_set(man->axis_normal->ptr, "draw_style", ED_MANIPULATOR_ARROW_STYLE_NORMAL);
-	RNA_enum_set(man->axis_redo->ptr, "draw_style", ED_MANIPULATOR_GRAB_STYLE_RING_2D);
+	WM_manipulator_set_scale(man->adjust_xyz_no[3], extrude_arrow_normal_axis_scale);
 
-	RNA_enum_set(man->axis_redo->ptr, "draw_options",
-	             ED_MANIPULATOR_GRAB_DRAW_FLAG_FILL |
-	             ED_MANIPULATOR_GRAB_DRAW_FLAG_ALIGN_VIEW);
+	for (int i = 0; i < 4; i++) {
+	}
 
-	WM_manipulator_set_flag(man->axis_redo, WM_MANIPULATOR_DRAW_VALUE, true);
+	for (int i = 0; i < 4; i++) {
+		WM_manipulator_set_flag(man->adjust_xyz_no[i], WM_MANIPULATOR_DRAW_VALUE, true);
+	}
 
-	/* XYZ axis extrude. */
-	for (int i = 0; i < 3; i++) {
-		PointerRNA *ptr = WM_manipulator_operator_set(man->axis_xyz[i], 0, man->ot_extrude, NULL);
+	/* XYZ & normal axis extrude. */
+	for (int i = 0; i < 4; i++) {
+		PointerRNA *ptr = WM_manipulator_operator_set(man->invoke_xyz_no[i], 0, man->ot_extrude, NULL);
 		{
 			int constraint[3] = {0, 0, 0};
-			constraint[i] = 1;
+			constraint[MIN2(i, 2)] = 1;
 			PointerRNA macroptr = RNA_pointer_get(ptr, "TRANSFORM_OT_translate");
 			RNA_boolean_set(&macroptr, "release_confirm", true);
 			RNA_boolean_set_array(&macroptr, "constraint_axis", constraint);
 		}
 	}
 
-	/* Normal axis extrude. */
-	{
-		PointerRNA *ptr = WM_manipulator_operator_set(man->axis_normal, 0, man->ot_extrude, NULL);
-		{
-			PointerRNA macroptr = RNA_pointer_get(ptr, "TRANSFORM_OT_translate");
-			RNA_boolean_set(&macroptr, "release_confirm", true);
-			RNA_boolean_set_array(&macroptr, "constraint_axis", constraint_z);
-		}
-	}
 	/* Adjust extrude. */
-	{
-		PointerRNA *ptr = WM_manipulator_operator_set(man->axis_redo, 0, man->ot_extrude, NULL);
+	for (int i = 0; i < 4; i++) {
+		PointerRNA *ptr = WM_manipulator_operator_set(man->adjust_xyz_no[i], 0, man->ot_extrude, NULL);
 		{
+			int constraint[3] = {0, 0, 0};
+			constraint[MIN2(i, 2)] = 1;
 			PointerRNA macroptr = RNA_pointer_get(ptr, "TRANSFORM_OT_translate");
 			RNA_boolean_set(&macroptr, "release_confirm", true);
-			RNA_boolean_set_array(&macroptr, "constraint_axis", constraint_z);
+			RNA_boolean_set_array(&macroptr, "constraint_axis", constraint);
 		}
-		wmManipulatorOpElem *mpop = WM_manipulator_operator_get(man->axis_redo, 0);
+		wmManipulatorOpElem *mpop = WM_manipulator_operator_get(man->adjust_xyz_no[i], 0);
 		mpop->is_redo = true;
 	}
 }
@@ -495,11 +505,10 @@ static void manipulator_mesh_extrude_refresh(const bContext *C, wmManipulatorGro
 {
 	ManipulatorExtrudeGroup *man = mgroup->customdata;
 
-	for (int i = 0; i < 3; i++) {
-		WM_manipulator_set_flag(man->axis_xyz[i], WM_MANIPULATOR_HIDDEN, true);
+	for (int i = 0; i < 4; i++) {
+		WM_manipulator_set_flag(man->invoke_xyz_no[i], WM_MANIPULATOR_HIDDEN, true);
+		WM_manipulator_set_flag(man->adjust_xyz_no[i], WM_MANIPULATOR_HIDDEN, true);
 	}
-	WM_manipulator_set_flag(man->axis_normal, WM_MANIPULATOR_HIDDEN, true);
-	WM_manipulator_set_flag(man->axis_redo, WM_MANIPULATOR_HIDDEN, true);
 
 	if (G.moving) {
 		return;
@@ -508,6 +517,7 @@ static void manipulator_mesh_extrude_refresh(const bContext *C, wmManipulatorGro
 	Scene *scene = CTX_data_scene(C);
 	man->data.orientation_type = scene->orientation_type;
 	bool use_normal = (man->data.orientation_type != V3D_MANIP_NORMAL);
+	const int axis_len_used = use_normal ? 4 : 3;
 
 	struct TransformBounds tbounds;
 
@@ -537,63 +547,77 @@ static void manipulator_mesh_extrude_refresh(const bContext *C, wmManipulatorGro
 		copy_m3_m3(man->data.normal_mat3, tbounds.axis);
 	}
 
+	/* Offset the add icon. */
+	mul_v3_v3fl(
+	        man->invoke_xyz_no[3]->matrix_offset[3],
+	        man->data.normal_mat3[2],
+	        (extrude_arrow_normal_axis_scale * extrude_button_offset_scale) / extrude_button_scale);
+
 	/* Needed for normal orientation. */
 	manipulator_mesh_extrude_orientation_matrix_set(man, tbounds.axis);
 	if (use_normal) {
-		copy_m4_m3(man->axis_normal->matrix_basis, man->data.normal_mat3);
+		copy_m4_m3(man->adjust_xyz_no[3]->matrix_basis, man->data.normal_mat3);
 	}
-	copy_m4_m3(man->axis_redo->matrix_basis, tbounds.axis);
 
 	/* Location. */
-	for (int i = 0; i < 3; i++) {
-		WM_manipulator_set_matrix_location(man->axis_xyz[i], tbounds.center);
-	}
-	if (use_normal) {
-		WM_manipulator_set_matrix_location(man->axis_normal, tbounds.center);
+	for (int i = 0; i < axis_len_used; i++) {
+		WM_manipulator_set_matrix_location(man->invoke_xyz_no[i], tbounds.center);
+		WM_manipulator_set_matrix_location(man->adjust_xyz_no[i], tbounds.center);
 	}
-	WM_manipulator_set_matrix_location(man->axis_redo, tbounds.center);
 
 	wmOperator *op = WM_operator_last_redo(C);
 	bool has_redo = (op && op->type == man->ot_extrude);
 
 	/* Un-hide. */
-	for (int i = 0; i < 3; i++) {
-		WM_manipulator_set_flag(man->axis_xyz[i], WM_MANIPULATOR_HIDDEN, false);
-	}
-	if (use_normal) {
-		WM_manipulator_set_flag(man->axis_normal, WM_MANIPULATOR_HIDDEN, false);
+	for (int i = 0; i < axis_len_used; i++) {
+		WM_manipulator_set_flag(man->invoke_xyz_no[i], WM_MANIPULATOR_HIDDEN, false);
+		WM_manipulator_set_flag(man->adjust_xyz_no[i], WM_MANIPULATOR_HIDDEN, !has_redo);
 	}
-	WM_manipulator_set_flag(man->axis_redo, WM_MANIPULATOR_HIDDEN, !has_redo);
 
 	/* Operator properties. */
-	for (int i = 0; i < 3; i++) {
-		/* Existing orientation is OK. */
-	}
 	if (use_normal) {
-		wmManipulatorOpElem *mpop = WM_manipulator_operator_get(man->axis_normal, 0);
+		wmManipulatorOpElem *mpop = WM_manipulator_operator_get(man->invoke_xyz_no[3], 0);
 		PointerRNA macroptr = RNA_pointer_get(&mpop->ptr, "TRANSFORM_OT_translate");
 		RNA_enum_set(&macroptr, "constraint_orientation", V3D_MANIP_NORMAL);
 	}
 
 	/* Redo with current settings. */
 	if (has_redo) {
-		/* We could also access this from 'ot->last_properties' */
-
 		wmOperator *op_transform = op->macro.last;
-		wmManipulatorOpElem *mpop = WM_manipulator_operator_get(man->axis_redo, 0);
-
-		PointerRNA macroptr = RNA_pointer_get(&mpop->ptr, "TRANSFORM_OT_translate");
-
 		float value[4];
 		RNA_float_get_array(op_transform->ptr, "value", value);
-		RNA_float_set_array(&macroptr, "value", value);
-
 		int constraint_axis[3];
 		RNA_boolean_get_array(op_transform->ptr, "constraint_axis", constraint_axis);
-		RNA_boolean_set_array(&macroptr, "constraint_axis", constraint_axis);
-
 		int orientation_type = RNA_enum_get(op_transform->ptr, "constraint_orientation");
-		RNA_enum_set(&macroptr, "constraint_orientation", orientation_type);
+
+		/* We could also access this from 'ot->last_properties' */
+		for (int i = 0; i < 4; i++) {
+			if ((i != 3) ?
+			    (orientation_type == man->data.orientation_type && constraint_axis[i]) :
+			    (orientation_type == V3D_MANIP_NORMAL && constraint_axis[2]))
+			{
+				wmManipulatorOpElem *mpop = WM_manipulator_operator_get(man->adjust_xyz_no[i], 0);
+
+				PointerRNA macroptr = RNA_pointer_get(&mpop->ptr, "TRANSFORM_OT_translate");
+
+				RNA_float_set_array(&macroptr, "value", value);
+				RNA_boolean_set_array(&macroptr, "constraint_axis", constraint_axis);
+				RNA_enum_set(&macroptr, "constraint_orientation", orientation_type);
+			}
+			else {
+				/* TODO(campbell): ideally we could adjust all,
+				 * this is complicated by how operator redo and the transform macro works. */
+				WM_manipulator_set_flag(man->adjust_xyz_no[i], WM_MANIPULATOR_HIDDEN, true);
+			}
+		}
+	}
+
+	for (int i = 0; i < 4; i++) {
+		RNA_enum_set(
+		        man->invoke_xyz_no[i]->ptr,
+		        "draw_options",
+		        (man->adjust_xyz_no[i]->flag & WM_MANIPULATOR_HIDDEN) ?
+		        ED_MANIPULATOR_BUTTON_SHOW_HELPLINE : 0);
 	}
 }