diff options
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/transform/transform.c | 5 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform.h | 5 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform_convert_node.c | 16 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform_generics.c | 72 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform_input.c | 26 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform_ops.c | 331 |
6 files changed, 27 insertions, 428 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 51167b327d6..c376c718245 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -108,6 +108,9 @@ void setTransformViewMatrices(TransInfo *t) unit_m4(t->persinv); t->persp = RV3D_ORTHO; } + + calculateCenter2D(t); + calculateCenterLocal(t, t->center_global); } void setTransformViewAspect(TransInfo *t, float r_aspect[3]) @@ -899,6 +902,8 @@ int transformEvent(TransInfo *t, const wmEvent *event) t->con.mode |= CON_SELECT; } + copy_v2_v2_int(t->mval, event->mval); + /* Use this for soft redraw. Might cause flicker in object mode */ // t->redraw |= TREDRAW_SOFT; t->redraw |= TREDRAW_HARD; diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h index 9046f1970a3..6219bdba6b7 100644 --- a/source/blender/editors/transform/transform.h +++ b/source/blender/editors/transform/transform.h @@ -155,9 +155,6 @@ typedef enum { /** No cursor wrapping on region bounds */ T_NO_CURSOR_WRAP = 1 << 23, - - /** To indicate that V3D matrices have changed due to navigation. */ - T_VIEW_DIRTY = 1 << 24, } eTFlag; /** #TransInfo.modifiers */ @@ -769,7 +766,6 @@ void applyMouseInput(struct TransInfo *t, const int mval[2], float output[3]); void transform_input_reset(MouseInput *mi, const int mval[2]); -void transform_input_update(TransInfo *t, const float fac); void setCustomPoints(TransInfo *t, MouseInput *mi, const int start[2], const int end[2]); void setCustomPointsFromDirection(TransInfo *t, MouseInput *mi, const float dir[2]); @@ -802,7 +798,6 @@ void calculateCenter2D(TransInfo *t); void calculateCenterLocal(TransInfo *t, const float center_global[3]); void calculateCenter(TransInfo *t); -void tranformViewUpdate(TransInfo *t); /* API functions for getting center points */ void calculateCenterBound(TransInfo *t, float r_center[3]); diff --git a/source/blender/editors/transform/transform_convert_node.c b/source/blender/editors/transform/transform_convert_node.c index 10c0ee48749..da11666d445 100644 --- a/source/blender/editors/transform/transform_convert_node.c +++ b/source/blender/editors/transform/transform_convert_node.c @@ -164,7 +164,6 @@ void createTransNodeData(TransInfo *t) void flushTransNodes(TransInfo *t) { const float dpi_fac = UI_DPI_FAC; - float offset[2] = {0.0f, 0.0f}; View2DEdgePanData *customdata = (View2DEdgePanData *)t->custom.type.data; @@ -178,16 +177,14 @@ void flushTransNodes(TransInfo *t) t->region->winrct.xmin + t->mval[0], t->region->winrct.ymin + t->mval[1], }; - const rctf rect = t->region->v2d.cur; UI_view2d_edge_pan_apply(t->context, customdata, xy); - if (!BLI_rctf_compare(&rect, &t->region->v2d.cur, FLT_EPSILON)) { - /* Additional offset due to change in view2D rect. */ - BLI_rctf_transform_pt_v(&t->region->v2d.cur, &rect, offset, offset); - t->flag |= T_VIEW_DIRTY; - } } } + /* Initial and current view2D rects for additional transform due to view panning and zooming */ + const rctf *rect_src = &customdata->initial_rect; + const rctf *rect_dst = &t->region->v2d.cur; + FOREACH_TRANS_DATA_CONTAINER (t, tc) { applyGridAbsolute(t); @@ -198,7 +195,10 @@ void flushTransNodes(TransInfo *t) bNode *node = td->extra; float loc[2]; - add_v2_v2v2(loc, td2d->loc, offset); + copy_v2_v2(loc, td2d->loc); + + /* additional offset due to change in view2D rect */ + BLI_rctf_transform_pt_v(rect_dst, rect_src, loc, loc); #ifdef USE_NODE_CENTER loc[0] -= 0.5f * BLI_rctf_size_x(&node->totr); diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 7846fa93f03..4194fb2a0ad 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -679,8 +679,6 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve } setTransformViewMatrices(t); - calculateCenter2D(t); - calculateCenterLocal(t, t->center_global); initNumInput(&t->num); } @@ -1142,33 +1140,6 @@ static void calculateCenter_FromAround(TransInfo *t, int around, float r_center[ } } -static void calculateZfac(TransInfo *t) -{ - /* ED_view3d_calc_zfac() defines a factor for perspective depth correction, - * used in ED_view3d_win_to_delta() */ - - /* zfac is only used convertViewVec only in cases operator was invoked in RGN_TYPE_WINDOW - * and never used in other cases. - * - * We need special case here as well, since ED_view3d_calc_zfac will crash when called - * for a region different from RGN_TYPE_WINDOW. - */ - if (t->spacetype == SPACE_VIEW3D) { - t->zfac = ED_view3d_calc_zfac(t->region->regiondata, t->center_global, NULL); - } - else if (t->spacetype == SPACE_IMAGE) { - SpaceImage *sima = t->area->spacedata.first; - t->zfac = 1.0f / sima->zoom; - } - else { - View2D *v2d = &t->region->v2d; - /* Get zoom fac the same way as in - * `ui_view2d_curRect_validate_resize` - better keep in sync! */ - const float zoomx = (float)(BLI_rcti_size_x(&v2d->mask) + 1) / BLI_rctf_size_x(&v2d->cur); - t->zfac = 1.0f / zoomx; - } -} - void calculateCenter(TransInfo *t) { if ((t->flag & T_OVERRIDE_CENTER) == 0) { @@ -1203,38 +1174,23 @@ void calculateCenter(TransInfo *t) } } - calculateZfac(t); -} - -/* Called every time the view changes due to navigation. - * Adjusts the mouse position relative to the object. */ -void tranformViewUpdate(TransInfo *t) -{ if (t->spacetype == SPACE_VIEW3D) { - setTransformViewMatrices(t); - - for (int i = 0; i < ARRAY_SIZE(t->orient); i++) { - if (t->orient[i].type == V3D_ORIENT_VIEW) { - copy_m3_m4(t->orient[i].matrix, t->viewinv); - normalize_m3(t->orient[i].matrix); - if (t->orient_curr == i) { - copy_m3_m3(t->spacemtx, t->orient[i].matrix); - invert_m3_m3_safe_ortho(t->spacemtx_inv, t->spacemtx); - } - } + /* ED_view3d_calc_zfac() defines a factor for perspective depth correction, + * used in ED_view3d_win_to_delta() */ + + /* zfac is only used convertViewVec only in cases operator was invoked in RGN_TYPE_WINDOW + * and never used in other cases. + * + * We need special case here as well, since ED_view3d_calc_zfac will crash when called + * for a region different from RGN_TYPE_WINDOW. + */ + if (t->region->regiontype == RGN_TYPE_WINDOW) { + t->zfac = ED_view3d_calc_zfac(t->region->regiondata, t->center_global, NULL); + } + else { + t->zfac = 0.0f; } } - - float fac = 1.0f; - if (ELEM(t->spacetype, SPACE_VIEW3D, SPACE_IMAGE, SPACE_NODE)) { - float zfac_prev = t->zfac; - calculateZfac(t); - fac = zfac_prev / t->zfac; - } - - calculateCenter2D(t); - transform_input_update(t, fac); - t->flag &= ~T_VIEW_DIRTY; } void calculatePropRatio(TransInfo *t) diff --git a/source/blender/editors/transform/transform_input.c b/source/blender/editors/transform/transform_input.c index 5d437e3c1d1..d9a29b8d6b7 100644 --- a/source/blender/editors/transform/transform_input.c +++ b/source/blender/editors/transform/transform_input.c @@ -459,32 +459,6 @@ void applyMouseInput(TransInfo *t, MouseInput *mi, const int mval[2], float outp } } -void transform_input_update(TransInfo *t, const float fac) -{ - MouseInput *mi = &t->mouse; - int offset[2], center_2d_int[2] = {mi->center[0], mi->center[1]}; - sub_v2_v2v2_int(offset, mi->imval, center_2d_int); - offset[0] *= fac; - offset[1] *= fac; - t->mouse.factor *= fac; - - center_2d_int[0] = t->center2d[0]; - center_2d_int[1] = t->center2d[1]; - add_v2_v2v2_int(mi->imval, center_2d_int, offset); - - float center_old[2]; - copy_v2_v2(center_old, mi->center); - copy_v2_v2(mi->center, t->center2d); - - if (ELEM(mi->apply, InputAngle, InputAngleSpring)) { - float offset_center[2]; - sub_v2_v2v2(offset_center, mi->center, center_old); - struct InputAngle_Data *data = mi->data; - data->mval_prev[0] += offset_center[0]; - data->mval_prev[1] += offset_center[1]; - } -} - void transform_input_reset(MouseInput *mi, const int mval[2]) { copy_v2_v2_int(mi->imval, mval); diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c index 37eb85bfda2..5ed340abf97 100644 --- a/source/blender/editors/transform/transform_ops.c +++ b/source/blender/editors/transform/transform_ops.c @@ -23,10 +23,7 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BLI_alloca.h" -#include "BLI_listbase.h" #include "BLI_math.h" -#include "BLI_string.h" #include "BLI_utildefines.h" #include "BLT_translation.h" @@ -424,17 +421,7 @@ static int transform_modal(bContext *C, wmOperator *op, const wmEvent *event) return OPERATOR_PASS_THROUGH; } #endif - if (event->type == MOUSEMOVE) { - copy_v2_v2_int(t->mval, event->mval); - } - if (WM_operator_do_navigation(C, op, event)) { - t->flag |= T_VIEW_DIRTY; - return OPERATOR_RUNNING_MODAL; - } - else if (t->flag & T_VIEW_DIRTY) { - tranformViewUpdate(t); - } /* XXX insert keys are called here, and require context */ t->context = C; exit_code = transformEvent(t, event); @@ -1365,321 +1352,6 @@ static void TRANSFORM_OT_from_gizmo(struct wmOperatorType *ot) ot->invoke = transform_from_gizmo_invoke; } -static wmKeyMapItem **navigation_keymaps(bContext *C, int *r_kmi_len) -{ - wmKeyMapItem *km_items[70]; - int kmi_len = 0; - - const char *op_names[] = { - /* 3D View. */ - "VIEW3D_OT_zoom", - "VIEW3D_OT_rotate", - "VIEW3D_OT_move", - "VIEW3D_OT_view_pan", - "VIEW3D_OT_dolly", - "VIEW3D_OT_view_orbit", - "VIEW3D_OT_view_roll", -#ifdef WITH_INPUT_NDOF - "VIEW3D_OT_ndof_orbit_zoom", - "VIEW3D_OT_ndof_orbit", - "VIEW3D_OT_ndof_pan", - "VIEW3D_OT_ndof_all", -#endif - /* Image. */ - "IMAGE_OT_view_pan", - "IMAGE_OT_view_zoom_in", - "IMAGE_OT_view_zoom_out", -#ifdef WITH_INPUT_NDOF - "IMAGE_OT_view_ndof", -#endif - /* View2D. */ - "VIEW2D_OT_pan", - "VIEW2D_OT_zoom_in", - "VIEW2D_OT_zoom_out", -#ifdef WITH_INPUT_NDOF - "VIEW2D_OT_ndof", -#endif - }; - - wmWindowManager *wm = CTX_wm_manager(C); - wmKeyMap *keymap[3]; - keymap[0] = WM_keymap_find_all(wm, "3D View", SPACE_VIEW3D, 0); - keymap[1] = WM_keymap_find_all(wm, "Image", SPACE_IMAGE, 0); - keymap[2] = WM_keymap_find_all(wm, "View2D", 0, 0); - - for (int i = 0; i < 3; i++) { - LISTBASE_FOREACH (wmKeyMapItem *, kmi, &keymap[i]->items) { - if (!(STRPREFIX(kmi->idname, "VIEW") || STRPREFIX(kmi->idname, "IMAGE"))) { - continue; - } - if (kmi->flag & KMI_INACTIVE) { - continue; - } - for (int i = 0; i < ARRAY_SIZE(op_names); i++) { - if (STREQ(kmi->idname, op_names[i])) { - km_items[kmi_len++] = kmi; - break; - } - } - if (kmi_len == ARRAY_SIZE(km_items)) { - BLI_assert(false); - break; - } - } - } - size_t km_items_size = sizeof(void *) * kmi_len; - wmKeyMapItem **r_km_items = MEM_mallocN(km_items_size, __func__); - memcpy(r_km_items, km_items, km_items_size); - - *r_kmi_len = kmi_len; - return r_km_items; -} - -static bool kmi_cmp(const wmKeyMapItem *kmi_a, const wmKeyMapItem *kmi_b) -{ - if (kmi_a->shift != kmi_b->shift) { - return false; - } - if (kmi_a->ctrl != kmi_b->ctrl) { - return false; - } - if (kmi_a->alt != kmi_b->alt) { - return false; - } - if (kmi_a->oskey != kmi_b->oskey) { - return false; - } - if (!ELEM(kmi_b->type, kmi_a->type, KM_ANY)) { - bool is_wheelin_modal = ELEM(kmi_b->type, WHEELUPMOUSE, WHEELINMOUSE); - bool is_wheelout_modal = ELEM(kmi_b->type, WHEELDOWNMOUSE, WHEELOUTMOUSE); - bool is_wheelin = ELEM(kmi_a->type, WHEELUPMOUSE, WHEELINMOUSE); - bool is_wheelout = ELEM(kmi_a->type, WHEELDOWNMOUSE, WHEELOUTMOUSE); - if (!(is_wheelin_modal || is_wheelout_modal) || - ((is_wheelin_modal != is_wheelin) || (is_wheelout_modal != is_wheelout))) { - return false; - } - } - if (!ELEM(kmi_b->val, kmi_a->val, KM_ANY)) { - return false; - } - if (kmi_a->keymodifier != kmi_b->keymodifier) { - return false; - } - return true; -} - -static const wmKeyMapItem *modalmap_is_conflicting(wmKeyMapItem **km_items, - const int km_items_len, - wmKeyMapItem *kmi_modal) -{ - for (int i = 0; i < km_items_len; i++) { - const wmKeyMapItem *kmi = km_items[i]; - if (kmi_cmp(kmi, kmi_modal)) { - return kmi; - } - } - return NULL; -} - -#define LABEL_LINE_SIZE 140 -struct KMConflict { - wmKeyMapItem *kmi; - wmKeyMapItem kmi_new; - char descr[LABEL_LINE_SIZE]; -}; - -struct KMConflictOPData { - int conflicts_len; - struct KMConflict conflicts[0]; -}; - -static void modalkeymap_conflict_free(wmOperator *op) -{ - struct KMConflictOPData *data = op->customdata; - MEM_freeN(data); -} - -static int modalkeymap_update_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event)) -{ - int kmi_navigate_len; - wmKeyMapItem **kmi_navigate = navigation_keymaps(C, &kmi_navigate_len); - - struct KMConflict conflicts[10]; - int conflicts_len = 0; - - wmWindowManager *wm = CTX_wm_manager(C); - wmKeyConfig *keyconf = wm->userconf; - wmKeyMap *modalmap = WM_keymap_active(wm, WM_modalkeymap_find(keyconf, "Transform Modal Map")); - LISTBASE_FOREACH (wmKeyMapItem *, kmi_modal, &modalmap->items) { - if (kmi_modal->flag & KMI_INACTIVE) { - continue; - } - const wmKeyMapItem *kmi = modalmap_is_conflicting(kmi_navigate, kmi_navigate_len, kmi_modal); - if (kmi) { - struct KMConflict *conflict = &conflicts[conflicts_len++]; - conflict->kmi = kmi_modal; - conflict->kmi_new = *kmi_modal; - conflict->kmi_new.alt = true; - wmKeyMapItem *kmi_new = &conflict->kmi_new; - - const char *name; - char descriptor[LABEL_LINE_SIZE], descriptor_new[LABEL_LINE_SIZE]; - WM_keymap_item_to_string(kmi_modal, false, descriptor, LABEL_LINE_SIZE); - WM_keymap_item_to_string(kmi_new, false, descriptor_new, LABEL_LINE_SIZE); - RNA_enum_name(modalmap->modal_items, kmi_modal->propvalue, &name); - - BLI_snprintf(conflict->descr, - LABEL_LINE_SIZE, - "\"%s\" will change from '%s' to '%s' (as it conflicts with \"%s\")", - TIP_(name), - descriptor, - descriptor_new, - kmi->idname); - } - } - MEM_freeN(kmi_navigate); - - if (!conflicts_len) { - return OPERATOR_CANCELLED; - } - - struct KMConflictOPData *data; - size_t conflicts_size = sizeof(struct KMConflict) * conflicts_len; - data = MEM_mallocN(sizeof(struct KMConflictOPData) + conflicts_size, __func__); - data->conflicts_len = conflicts_len; - memcpy(data->conflicts, conflicts, conflicts_size); - - op->customdata = data; - return WM_operator_props_dialog_popup(C, op, 750); -} - -static int modalkeymap_exec(bContext *UNUSED(C), wmOperator *op) -{ - struct KMConflictOPData *data = op->customdata; - struct KMConflict *conflicts = data->conflicts; - for (int i = 0; i < data->conflicts_len; i++) { - struct KMConflict *conflict = &conflicts[i]; - *conflict->kmi = conflict->kmi_new; - WM_keyconfig_update_tag(NULL, conflict->kmi); - } - - modalkeymap_conflict_free(op); - if (U.runtime.is_dirty == false) { - U.runtime.is_dirty = true; - WM_main_add_notifier(NC_WINDOW, NULL); - } - return OPERATOR_FINISHED; -} - -static void modalkeymap_cancel(bContext *UNUSED(C), wmOperator *op) -{ - modalkeymap_conflict_free(op); -} - -static void modalkeymap_draw(bContext *UNUSED(C), wmOperator *op) -{ - struct KMConflictOPData *data = op->customdata; - struct KMConflict *conflicts = data->conflicts; - for (int i = 0; i < data->conflicts_len; i++) { - struct KMConflict *conflict = &conflicts[i]; - uiItemL(op->layout, conflict->descr, ICON_DOT); - } -} - -static void TRANSFORM_OT_modalkeymap_update(struct wmOperatorType *ot) -{ - /* identifiers */ - ot->name = "Update Transform Modal Map"; - ot->description = "Edit the Transform Modal Map to avoid conflicts with navigation shortcuts"; - ot->idname = "TRANSFORM_OT_modalkeymap_update"; - ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; - - /* api callbacks */ - ot->invoke = modalkeymap_update_invoke; - ot->exec = modalkeymap_exec; - ot->cancel = modalkeymap_cancel; - ot->ui = modalkeymap_draw; -} - -static int modalkeymap_restore_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event)) -{ - struct KMConflict conflicts[10]; - int conflicts_len = 0; - - wmWindowManager *wm = CTX_wm_manager(C); - wmKeyMap *modalmap = WM_modalkeymap_find(wm->defaultconf, "Transform Modal Map"); - wmKeyMap *modalmap_act = WM_keymap_active( - wm, WM_modalkeymap_find(wm->userconf, "Transform Modal Map")); - - wmKeyMapItem *kmi_orig = modalmap->items.first, *kmi = modalmap_act->items.first; - while (kmi_orig && kmi) { - if (!kmi_cmp(kmi_orig, kmi)) { - struct KMConflict *conflict = &conflicts[conflicts_len++]; - conflict->kmi = kmi; - conflict->kmi_new = *kmi_orig; - wmKeyMapItem *kmi_new = &conflict->kmi_new; - - const char *name; - char descriptor[LABEL_LINE_SIZE], descriptor_new[LABEL_LINE_SIZE]; - WM_keymap_item_to_string(kmi, false, descriptor, LABEL_LINE_SIZE); - WM_keymap_item_to_string(kmi_new, false, descriptor_new, LABEL_LINE_SIZE); - RNA_enum_name(modalmap->modal_items, kmi->propvalue, &name); - - BLI_snprintf(conflict->descr, - LABEL_LINE_SIZE, - "\"%s\" will be restored from '%s' to '%s'", - TIP_(name), - descriptor, - descriptor_new); - } - kmi_orig = kmi_orig->next; - kmi = kmi->next; - } - - if (!conflicts_len) { - return OPERATOR_CANCELLED; - } - - struct KMConflictOPData *data; - size_t conflicts_size = sizeof(struct KMConflict) * conflicts_len; - data = MEM_mallocN(sizeof(struct KMConflictOPData) + conflicts_size, __func__); - data->conflicts_len = conflicts_len; - memcpy(data->conflicts, conflicts, conflicts_size); - - op->customdata = data; - return WM_operator_props_dialog_popup(C, op, 600); -} - -static int modalkeymap_restore_exec(bContext *C, wmOperator *op) -{ - wmWindowManager *wm = CTX_wm_manager(C); - wmKeyConfig *keyconf = wm->userconf; - wmKeyMap *modalmap = WM_modalkeymap_find(keyconf, "Transform Modal Map"); - WM_keymap_restore_to_default(modalmap, wm); - - modalkeymap_conflict_free(op); - if (U.runtime.is_dirty == false) { - U.runtime.is_dirty = true; - WM_main_add_notifier(NC_WINDOW, NULL); - } - return OPERATOR_FINISHED; -} - -static void TRANSFORM_OT_modalkeymap_restore(struct wmOperatorType *ot) -{ - /* identifiers */ - ot->name = "Restore Transform Modal Map"; - ot->description = "Restore Transform Modal Map to Default"; - ot->idname = "TRANSFORM_OT_modalkeymap_restore"; - ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; - - /* api callbacks */ - ot->invoke = modalkeymap_restore_invoke; - ot->exec = modalkeymap_restore_exec; - ot->cancel = modalkeymap_cancel; - ot->ui = modalkeymap_draw; -} - void transform_operatortypes(void) { TransformModeItem *tmode; @@ -1695,9 +1367,6 @@ void transform_operatortypes(void) WM_operatortype_append(TRANSFORM_OT_delete_orientation); WM_operatortype_append(TRANSFORM_OT_from_gizmo); - - WM_operatortype_append(TRANSFORM_OT_modalkeymap_update); - WM_operatortype_append(TRANSFORM_OT_modalkeymap_restore); } void ED_keymap_transform(wmKeyConfig *keyconf) |