Manipulator: support operator per-part

A single manipulator could only assign a single operator to each part.
Now each part can have it's own.

Also modify 2D selection callback, 2D started at 1, 3D at 0.
Now use -1 for unset value, start both at 0.

6 files changed, 61 insertions, 32 deletions

diff --git a/source/blender/windowmanager/manipulators/WM_manipulator_api.h b/source/blender/windowmanager/manipulators/WM_manipulator_api.h
index 84e93c2ca29..726e560a061 100644
--- a/source/blender/windowmanager/manipulators/WM_manipulator_api.h
+++ b/source/blender/windowmanager/manipulators/WM_manipulator_api.h
@@ -73,8 +73,11 @@ void WM_manipulator_name_set(struct wmManipulatorGroup *mgroup, struct wmManipul
 bool WM_manipulator_select_unlink(struct wmManipulatorMap *mmap, struct wmManipulator *mpr);
 bool WM_manipulator_select_set(struct wmManipulatorMap *mmap, struct wmManipulator *mpr, bool select);
 
-struct PointerRNA *WM_manipulator_set_operator(
-        struct wmManipulator *, struct wmOperatorType *ot, struct IDProperty *properties);
+struct wmManipulatorOpElem *WM_manipulator_operator_get(
+        struct wmManipulator *mpr, int part_index);
+struct PointerRNA *WM_manipulator_operator_set(
+        struct wmManipulator *mpr, int part_index,
+        struct wmOperatorType *ot, struct IDProperty *properties);
 
 /* callbacks */
 void WM_manipulator_set_fn_custom_modal(struct wmManipulator *mpr, wmManipulatorFnModal fn);
diff --git a/source/blender/windowmanager/manipulators/WM_manipulator_types.h b/source/blender/windowmanager/manipulators/WM_manipulator_types.h
index 23c0fa305a9..df4dd9668d4 100644
--- a/source/blender/windowmanager/manipulators/WM_manipulator_types.h
+++ b/source/blender/windowmanager/manipulators/WM_manipulator_types.h
@@ -138,6 +138,13 @@ typedef enum {
 
 #include "wm_manipulator_fn.h"
 
+typedef struct wmManipulatorOpElem {
+	struct wmOperatorType *type;
+	/* operator properties if manipulator spawns and controls an operator,
+	 * or owner pointer if manipulator spawns and controls a property */
+	PointerRNA ptr;
+} wmManipulatorOpElem;
+
 /* manipulators are set per region by registering them on manipulator-maps */
 struct wmManipulator {
 	struct wmManipulator *next, *prev;
@@ -162,7 +169,8 @@ struct wmManipulator {
 	/* state flags (active, highlighted, selected) */
 	eWM_ManipulatorState state;
 
-	/* Optional ID for highlighting different parts of this manipulator. */
+	/* Optional ID for highlighting different parts of this manipulator.
+	 * -1 when unset, otherwise a valid index. (Used as index to 'op_data'). */
 	int highlight_part;
 
 	/* Transformation of the manipulator in 2d or 3d space.
@@ -192,13 +200,10 @@ struct wmManipulator {
 	/* data used during interaction */
 	void *interaction_data;
 
-	/* name of operator to spawn when activating the manipulator */
-	struct {
-		struct wmOperatorType *type;
-		/* operator properties if manipulator spawns and controls an operator,
-		 * or owner pointer if manipulator spawns and controls a property */
-		PointerRNA ptr;
-	} op_data;
+	/* Operator to spawn when activating the manipulator (overrides property editing),
+	 * an array of items (aligned with #wmManipulator.highlight_part). */
+	wmManipulatorOpElem *op_data;
+	int op_data_len;
 
 	struct IDProperty *properties;
 
@@ -267,7 +272,8 @@ typedef struct wmManipulatorType {
 	/* determines 3d intersection by rendering the manipulator in a selection routine. */
 	wmManipulatorFnDrawSelect draw_select;
 
-	/* determine if the mouse intersects with the manipulator. The calculation should be done in the callback itself */
+	/* Determine if the mouse intersects with the manipulator.
+	 * The calculation should be done in the callback itself, -1 for no seleciton. */
 	wmManipulatorFnTestSelect test_select;
 
 	/* handler used by the manipulator. Usually handles interaction tied to a manipulator type */
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator.c b/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
index 316254202fa..ee7c10aa50b 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
@@ -172,8 +172,11 @@ void WM_manipulator_free(wmManipulator *mpr)
 	}
 #endif
 
-	if (mpr->op_data.ptr.data) {
-		WM_operator_properties_free(&mpr->op_data.ptr);
+	if (mpr->op_data) {
+		for (int i = 0; i < mpr->op_data_len; i++) {
+			WM_operator_properties_free(&mpr->op_data[i].ptr);
+		}
+		MEM_freeN(mpr->op_data);
 	}
 
 	if (mpr->ptr != NULL) {
@@ -228,22 +231,38 @@ void WM_manipulator_unlink(ListBase *manipulatorlist, wmManipulatorMap *mmap, wm
  *
  * \{ */
 
+struct wmManipulatorOpElem *WM_manipulator_operator_get(
+        wmManipulator *mpr, int part_index)
+{
+	if (mpr->op_data && ((part_index >= 0) && (part_index < mpr->op_data_len))) {
+		return &mpr->op_data[part_index];
+	}
+	return NULL;
+}
 
-PointerRNA *WM_manipulator_set_operator(
-        wmManipulator *mpr, wmOperatorType *ot, IDProperty *properties)
+PointerRNA *WM_manipulator_operator_set(
+        wmManipulator *mpr, int part_index,
+        wmOperatorType *ot, IDProperty *properties)
 {
-	mpr->op_data.type = ot;
+	BLI_assert(part_index < 255);
+	/* We could pre-allocate these but using multiple is such a rare thing. */
+	if (part_index >= mpr->op_data_len) {
+		mpr->op_data_len = part_index + 1;
+		mpr->op_data = MEM_recallocN(mpr->op_data, sizeof(*mpr->op_data) * mpr->op_data_len);
+	}
+	wmManipulatorOpElem *mpop = &mpr->op_data[part_index];
+	mpop->type = ot;
 
-	if (mpr->op_data.ptr.data) {
-		WM_operator_properties_free(&mpr->op_data.ptr);
+	if (mpop->ptr.data) {
+		WM_operator_properties_free(&mpop->ptr);
 	}
-	WM_operator_properties_create_ptr(&mpr->op_data.ptr, ot);
+	WM_operator_properties_create_ptr(&mpop->ptr, ot);
 
 	if (properties) {
-		mpr->op_data.ptr.data = properties;
+		mpop->ptr.data = properties;
 	}
 
-	return &mpr->op_data.ptr;
+	return &mpop->ptr;
 }
 
 static void wm_manipulator_set_matrix_rotation_from_z_axis__internal(
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c b/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c
index 94064c84701..bc09fa30931 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c
@@ -146,7 +146,7 @@ wmManipulator *wm_manipulatorgroup_find_intersected_mainpulator(
 {
 	for (wmManipulator *mpr = mgroup->manipulators.first; mpr; mpr = mpr->next) {
 		if (mpr->type->test_select && (mpr->flag & WM_MANIPULATOR_HIDDEN) == 0) {
-			if ((*r_part = mpr->type->test_select(C, mpr, event))) {
+			if ((*r_part = mpr->type->test_select(C, mpr, event)) != -1) {
 				return mpr;
 			}
 		}
@@ -385,8 +385,9 @@ static int manipulator_tweak_invoke(bContext *C, wmOperator *op, const wmEvent *
 
 	/* XXX temporary workaround for modal manipulator operator
 	 * conflicting with modal operator attached to manipulator */
-	if (mpr->op_data.type) {
-		if (mpr->op_data.type->modal) {
+	wmManipulatorOpElem *mpop = WM_manipulator_operator_get(mpr, mpr->highlight_part);
+	if (mpop && mpop->type) {
+		if (mpop->type->modal) {
 			return OPERATOR_FINISHED;
 		}
 	}
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c b/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c
index 51ad133daed..e0c803067d6 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c
@@ -643,9 +643,8 @@ void wm_manipulatormaps_handled_modal_update(
 
 	/* regular update for running operator */
 	if (modal_running) {
-		if (mpr && (mpr->op_data.type != NULL) &&
-		    (mpr->op_data.type == handler->op->type))
-		{
+		wmManipulatorOpElem *mpop = mpr ? WM_manipulator_operator_get(mpr, mpr->highlight_part) : NULL;
+		if (mpr && mpop && (mpop->type != NULL) && (mpop->type == handler->op->type)) {
 			wmManipulatorFnModal modal_fn = mpr->custom_modal ? mpr->custom_modal : mpr->type->modal;
 			if (modal_fn != NULL) {
 				int retval = modal_fn(C, mpr, event, 0);
@@ -813,7 +812,7 @@ void wm_manipulatormap_highlight_set(
 	{
 		if (mmap->mmap_context.highlight) {
 			mmap->mmap_context.highlight->state &= ~WM_MANIPULATOR_STATE_HIGHLIGHT;
-			mmap->mmap_context.highlight->highlight_part = 0;
+			mmap->mmap_context.highlight->highlight_part = -1;
 		}
 
 		mmap->mmap_context.highlight = mpr;
@@ -873,8 +872,9 @@ void wm_manipulatormap_modal_set(
 		mpr->state |= WM_MANIPULATOR_STATE_MODAL;
 		mmap->mmap_context.modal = mpr;
 
-		if (mpr->op_data.type) {
-			WM_operator_name_call_ptr(C, mpr->op_data.type, WM_OP_INVOKE_DEFAULT, &mpr->op_data.ptr);
+		struct wmManipulatorOpElem *mpop = WM_manipulator_operator_get(mpr, mpr->highlight_part);
+		if (mpop && mpop->type) {
+			WM_operator_name_call_ptr(C, mpop->type, WM_OP_INVOKE_DEFAULT, &mpop->ptr);
 
 			/* we failed to hook the manipulator to the operator handler or operator was cancelled, return */
 			if (!mmap->mmap_context.modal) {
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c b/source/blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c
index 50e1d82a0fc..9ef3590de96 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c
@@ -87,7 +87,7 @@ void WM_manipulator_target_property_def_rna_ptr(
 	wmManipulatorProperty *mpr_prop = WM_manipulator_target_property_at_index(mpr, mpr_prop_type->index_in_type);
 
 	/* if manipulator evokes an operator we cannot use it for property manipulation */
-	mpr->op_data.type = NULL;
+	BLI_assert(mpr->op_data == NULL);
 
 	mpr_prop->type = mpr_prop_type;
 
@@ -116,7 +116,7 @@ void WM_manipulator_target_property_def_func_ptr(
 	wmManipulatorProperty *mpr_prop = WM_manipulator_target_property_at_index(mpr, mpr_prop_type->index_in_type);
 
 	/* if manipulator evokes an operator we cannot use it for property manipulation */
-	mpr->op_data.type = NULL;
+	BLI_assert(mpr->op_data == NULL);
 
 	mpr_prop->type = mpr_prop_type;