diff options
author | Germano Cavalcante <mano-wii> | 2021-11-17 17:02:54 +0300 |
---|---|---|
committer | Germano Cavalcante <germano.costa@ig.com.br> | 2021-11-18 19:42:45 +0300 |
commit | 805181bffae647a24e939c651da72a08c5c2b7cb (patch) | |
tree | 80fdb0d603e8eeed715efe9474ace36ecdc7e26c /source/blender/editors/transform | |
parent | 77df32548b9f377a834b54d0b740a6a51bb2f0a5 (diff) |
Revert "Transform: interactive mode for editing a 'Snap Source'"
This reverts commit f19bd637e2c38b8b967944a88609a190b5179439.
Diffstat (limited to 'source/blender/editors/transform')
-rw-r--r-- | source/blender/editors/transform/transform.c | 59 | ||||
-rw-r--r-- | source/blender/editors/transform/transform.h | 7 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_input.c | 15 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_snap.c | 158 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_snap.h | 4 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_snap_object.c | 36 |
6 files changed, 35 insertions, 244 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index c376c718245..ae4c3f02c46 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -578,21 +578,6 @@ static void viewRedrawPost(bContext *C, TransInfo *t) static bool transform_modal_item_poll(const wmOperator *op, int value) { const TransInfo *t = op->customdata; - if (t->modifiers & MOD_EDIT_SNAP_SOURCE) { - if (value == TFM_MODAL_EDIT_SNAP_SOURCE) { - return true; - } - else if (!ELEM(value, - TFM_MODAL_CANCEL, - TFM_MODAL_CONFIRM, - TFM_MODAL_SNAP_INV_ON, - TFM_MODAL_SNAP_INV_OFF, - TFM_MODAL_ADD_SNAP, - TFM_MODAL_REMOVE_SNAP)) { - return false; - } - } - switch (value) { case TFM_MODAL_CANCEL: { /* TODO: Canceling with LMB is not possible when the operator is activated @@ -608,13 +593,6 @@ static bool transform_modal_item_poll(const wmOperator *op, int value) } break; } - case TFM_MODAL_SNAP_INV_ON: - case TFM_MODAL_SNAP_INV_OFF: { - if (t->modifiers & MOD_SNAP_TEMP) { - return false; - } - break; - } case TFM_MODAL_ADD_SNAP: case TFM_MODAL_REMOVE_SNAP: { if (t->spacetype != SPACE_VIEW3D) { @@ -686,19 +664,6 @@ static bool transform_modal_item_poll(const wmOperator *op, int value) } break; } - case TFM_MODAL_EDIT_SNAP_SOURCE: { - if (t->spacetype != SPACE_VIEW3D) { - return false; - } - if (t->flag & T_RELEASE_CONFIRM) { - return false; - } - if (!ELEM(t->mode, TFM_TRANSLATION, TFM_ROTATION, TFM_RESIZE)) { - /* More modes can be added over time if this feature proves useful for them. */ - return false; - } - break; - } } return true; } @@ -749,7 +714,6 @@ wmKeyMap *transform_modal_keymap(wmKeyConfig *keyconf) {TFM_MODAL_AUTOCONSTRAINT, "AUTOCONSTRAIN", 0, "Automatic Constraint", ""}, {TFM_MODAL_AUTOCONSTRAINTPLANE, "AUTOCONSTRAINPLANE", 0, "Automatic Constraint Plane", ""}, {TFM_MODAL_PRECISION, "PRECISION", 0, "Precision Mode", ""}, - {TFM_MODAL_EDIT_SNAP_SOURCE, "EDIT_SNAP_SOURCE", 0, "Snap Source Toggle", ""}, {0, NULL, 0, NULL, NULL}, }; @@ -927,12 +891,7 @@ int transformEvent(TransInfo *t, const wmEvent *event) handled = true; break; case TFM_MODAL_CONFIRM: - if (t->modifiers & MOD_EDIT_SNAP_SOURCE) { - tranform_snap_source_mod_confirm(t); - } - else { - t->state = TRANS_CONFIRM; - } + t->state = TRANS_CONFIRM; handled = true; break; case TFM_MODAL_TRANSLATE: @@ -1197,9 +1156,6 @@ int transformEvent(TransInfo *t, const wmEvent *event) t->redraw |= TREDRAW_HARD; } break; - case TFM_MODAL_EDIT_SNAP_SOURCE: - tranform_snap_source_mod_toggle(t); - break; /* Those two are only handled in transform's own handler, see T44634! */ case TFM_MODAL_EDGESLIDE_UP: case TFM_MODAL_EDGESLIDE_DOWN: @@ -1576,7 +1532,7 @@ void saveTransform(bContext *C, TransInfo *t, wmOperator *op) if (t->flag & T_MODAL) { /* do we check for parameter? */ - if (transformModeUseSnap(t) && !(t->modifiers & MOD_SNAP_TEMP)) { + if (transformModeUseSnap(t)) { if (!(t->modifiers & MOD_SNAP) != !(ts->snap_flag & SCE_SNAP)) { if (t->modifiers & MOD_SNAP) { ts->snap_flag |= SCE_SNAP; @@ -1964,17 +1920,14 @@ void transformApply(bContext *C, TransInfo *t) if ((t->redraw & TREDRAW_HARD) || (t->draw_handle_apply == NULL && (t->redraw & TREDRAW_SOFT))) { selectConstraint(t); - if (t->modifiers & MOD_EDIT_SNAP_SOURCE) { - tranform_snap_source_mod_update(t); - } - else if (t->transform) { + if (t->transform) { t->transform(t, t->mval); /* calls recalcData() */ + viewRedrawForce(C, t); } + t->redraw = TREDRAW_NOTHING; } - - if (t->redraw & (TREDRAW_HARD | TREDRAW_SOFT)) { + else if (t->redraw & TREDRAW_SOFT) { viewRedrawForce(C, t); - t->redraw = TREDRAW_NOTHING; } /* If auto confirm is on, break after one pass */ diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h index 6219bdba6b7..d78cd13f8b8 100644 --- a/source/blender/editors/transform/transform.h +++ b/source/blender/editors/transform/transform.h @@ -163,9 +163,7 @@ typedef enum { MOD_PRECISION = 1 << 1, MOD_SNAP = 1 << 2, MOD_SNAP_INVERT = 1 << 3, - MOD_SNAP_TEMP = 1 << 4, - MOD_CONSTRAINT_SELECT_PLANE = 1 << 5, - MOD_EDIT_SNAP_SOURCE = 1 << 6, + MOD_CONSTRAINT_SELECT_PLANE = 1 << 4, } eTModifier; /** #TransSnap.status */ @@ -296,8 +294,6 @@ enum { TFM_MODAL_AUTOCONSTRAINTPLANE = 29, TFM_MODAL_PRECISION = 30, - - TFM_MODAL_EDIT_SNAP_SOURCE = 31, }; /** \} */ @@ -765,7 +761,6 @@ void applyMouseInput(struct TransInfo *t, struct MouseInput *mi, const int mval[2], float output[3]); -void transform_input_reset(MouseInput *mi, const int mval[2]); void setCustomPoints(TransInfo *t, MouseInput *mi, const int start[2], const int end[2]); void setCustomPointsFromDirection(TransInfo *t, MouseInput *mi, const float dir[2]); diff --git a/source/blender/editors/transform/transform_input.c b/source/blender/editors/transform/transform_input.c index d9a29b8d6b7..0b46d0b9a13 100644 --- a/source/blender/editors/transform/transform_input.c +++ b/source/blender/editors/transform/transform_input.c @@ -418,10 +418,6 @@ void setInputPostFct(MouseInput *mi, void (*post)(struct TransInfo *t, float val void applyMouseInput(TransInfo *t, MouseInput *mi, const int mval[2], float output[3]) { - if (t->modifiers & MOD_EDIT_SNAP_SOURCE) { - return; - } - double mval_db[2]; if (mi->use_virtual_mval) { @@ -459,15 +455,4 @@ void applyMouseInput(TransInfo *t, MouseInput *mi, const int mval[2], float outp } } -void transform_input_reset(MouseInput *mi, const int mval[2]) -{ - copy_v2_v2_int(mi->imval, mval); - if (ELEM(mi->apply, InputAngle, InputAngleSpring)) { - struct InputAngle_Data *data = mi->data; - data->mval_prev[0] = mi->imval[0]; - data->mval_prev[1] = mi->imval[1]; - data->angle = 0.0f; - } -} - /** \} */ diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index f52061f8910..71f26ef0594 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -136,10 +136,6 @@ bool validSnap(const TransInfo *t) bool activeSnap(const TransInfo *t) { - if (t->modifiers & MOD_SNAP_TEMP) { - return true; - } - return ((t->modifiers & (MOD_SNAP | MOD_SNAP_INVERT)) == MOD_SNAP) || ((t->modifiers & (MOD_SNAP | MOD_SNAP_INVERT)) == MOD_SNAP_INVERT); } @@ -182,7 +178,7 @@ bool transformModeUseSnap(const TransInfo *t) static bool doForceIncrementSnap(const TransInfo *t) { - return !(t->modifiers & MOD_SNAP_TEMP) && !transformModeUseSnap(t); + return !transformModeUseSnap(t); } void drawSnapping(const struct bContext *C, TransInfo *t) @@ -236,15 +232,6 @@ void drawSnapping(const struct bContext *C, TransInfo *t) imm_drawcircball(p->co, ED_view3d_pixel_size(rv3d, p->co) * size, view_inv, pos); } - if (t->modifiers & MOD_EDIT_SNAP_SOURCE) { - float snap_point[3]; - getSnapPoint(t, snap_point); - - immUniformColor4ubv(col); - imm_drawX( - snap_point, 0.75f * size * ED_view3d_pixel_size(rv3d, snap_point), view_inv, pos); - } - immUnbindProgram(); } @@ -257,7 +244,7 @@ void drawSnapping(const struct bContext *C, TransInfo *t) loc_prev = t->tsnap.snapTarget; } - if (t->tsnap.status & POINT_INIT) { + if (validSnap(t)) { loc_cur = t->tsnap.snapPoint; } @@ -490,7 +477,8 @@ void applyGridAbsolute(TransInfo *t) void applySnapping(TransInfo *t, float *vec) { - if (!transformModeUseSnap(t) && !(t->modifiers & MOD_SNAP_TEMP)) { + /* Each Trans Data already makes the snap to face */ + if (doForceIncrementSnap(t)) { return; } @@ -671,20 +659,6 @@ static short snap_select_type_get(TransInfo *t) return r_snap_select; } -static void snap_object_context_setup(TransInfo *t) -{ - if (t->data_type != TC_MESH_VERTS) { - return; - } - /* Ignore elements being transformed. */ - ED_transform_snap_object_context_set_editmesh_callbacks( - t->tsnap.object_context, - (bool (*)(BMVert *, void *))BM_elem_cb_check_hflag_disabled, - bm_edge_is_snap_target, - bm_face_is_snap_target, - POINTER_FROM_UINT((BM_ELEM_SELECT | BM_ELEM_HIDDEN))); -} - static void initSnappingMode(TransInfo *t) { ToolSettings *ts = t->settings; @@ -696,13 +670,27 @@ static void initSnappingMode(TransInfo *t) t->tsnap.project = 0; } - setSnappingCallback(t); + if (ELEM(t->spacetype, SPACE_VIEW3D, SPACE_IMAGE, SPACE_NODE, SPACE_SEQ)) { + /* Not with camera selected in camera view. */ + if (!(t->options & CTX_CAMERA)) { + setSnappingCallback(t); + } + } if (t->spacetype == SPACE_VIEW3D) { if (t->tsnap.object_context == NULL) { t->tsnap.use_backface_culling = snap_use_backface_culling(t); t->tsnap.object_context = ED_transform_snap_object_context_create(t->scene, 0); - snap_object_context_setup(t); + + if (t->data_type == TC_MESH_VERTS) { + /* Ignore elements being transformed. */ + ED_transform_snap_object_context_set_editmesh_callbacks( + t->tsnap.object_context, + (bool (*)(BMVert *, void *))BM_elem_cb_check_hflag_disabled, + bm_edge_is_snap_target, + bm_face_is_snap_target, + POINTER_FROM_UINT((BM_ELEM_SELECT | BM_ELEM_HIDDEN))); + } } } else if (t->spacetype == SPACE_SEQ) { @@ -787,16 +775,10 @@ void freeSnapping(TransInfo *t) static void setSnappingCallback(TransInfo *t) { if (t->spacetype == SPACE_VIEW3D) { - if (t->options & CTX_CAMERA) { - /* Not with camera selected in camera view. */ - return; - } t->tsnap.calcSnap = snap_calc_view3d_fn; } - else if (t->spacetype == SPACE_IMAGE) { - if (t->obedit_type == OB_MESH) { - t->tsnap.calcSnap = snap_calc_uv_fn; - } + else if (t->spacetype == SPACE_IMAGE && t->obedit_type == OB_MESH) { + t->tsnap.calcSnap = snap_calc_uv_fn; } else if (t->spacetype == SPACE_NODE) { t->tsnap.calcSnap = snap_calc_node_fn; @@ -806,9 +788,6 @@ static void setSnappingCallback(TransInfo *t) /* The target is calculated along with the snap point. */ return; } - else { - return; - } switch (t->tsnap.target) { case SCE_SNAP_TARGET_CLOSEST: @@ -926,15 +905,6 @@ void getSnapPoint(const TransInfo *t, float vec[3]) } } -static void transform_snap_multipoints_free(TransInfo *t) -{ - if (t->tsnap.status & MULTI_POINTS) { - BLI_freelistN(&t->tsnap.points); - t->tsnap.status &= ~MULTI_POINTS; - t->tsnap.selectedPoint = NULL; - } -} - /** \} */ /* -------------------------------------------------------------------- */ @@ -1649,90 +1619,6 @@ bool transform_snap_increment(const TransInfo *t, float *r_val) return transform_snap_increment_ex(t, false, r_val); } -static void snap_source_mod_start(TransInfo *t) -{ - t->modifiers |= MOD_EDIT_SNAP_SOURCE; - t->tsnap.modeSelect = SNAP_ALL; - if ((t->tsnap.status & TARGET_INIT) == 0) { - /* Calculate the current target for the perpendicular snap. */ - t->tsnap.targetSnap(t); - - /* Fallback. */ - TargetSnapMedian(t); - } - t->tsnap.targetSnap = NULL; - - if ((t->tsnap.mode & ~(SCE_SNAP_MODE_INCREMENT | SCE_SNAP_MODE_GRID)) == 0) { - /* Initialize snap modes for geometry. */ - t->tsnap.mode &= ~(SCE_SNAP_MODE_INCREMENT | SCE_SNAP_MODE_GRID); - t->tsnap.mode |= SCE_SNAP_MODE_GEOM; - } - - if (!activeSnap(t) || !transformModeUseSnap(t)) { - t->modifiers |= MOD_SNAP_TEMP; - } - - restoreTransObjects(t); - - if (t->data_type == TC_MESH_VERTS) { - ED_transform_snap_object_context_set_editmesh_callbacks( - t->tsnap.object_context, NULL, NULL, NULL, NULL); - } - - t->redraw |= TREDRAW_SOFT; -} - -static void snap_source_mod_end(TransInfo *t) -{ - t->modifiers &= ~MOD_EDIT_SNAP_SOURCE; - - /* Restore. */ - t->tsnap.modeSelect = snap_select_type_get(t); - snap_object_context_setup(t); - transform_snap_multipoints_free(t); -} - -void tranform_snap_source_mod_toggle(TransInfo *t) -{ - if (t->flag & T_RELEASE_CONFIRM) { - return; - } - - if (!(t->modifiers & MOD_EDIT_SNAP_SOURCE)) { - snap_source_mod_start(t); - } - else if (t->modifiers & MOD_EDIT_SNAP_SOURCE) { - /* Cancel. */ - t->modifiers &= ~MOD_SNAP_TEMP; - t->tsnap.mode = snap_mode_from_scene(t); - setSnappingCallback(t); - snap_source_mod_end(t); - } -} - -void tranform_snap_source_mod_update(TransInfo *t) -{ - BLI_assert(t->modifiers & MOD_EDIT_SNAP_SOURCE); - - /* Time base quirky code to go around findnearest slowness */ - /* TODO: add exception for object mode, no need to slow it down then. */ - double current = PIL_check_seconds_timer(); - if (current - t->tsnap.last >= 0.01) { - t->tsnap.calcSnap(t, NULL); - t->tsnap.last = current; - t->redraw |= TREDRAW_SOFT; - } -} - -void tranform_snap_source_mod_confirm(TransInfo *t) -{ - BLI_assert(t->modifiers & MOD_EDIT_SNAP_SOURCE); - getSnapPoint(t, t->tsnap.snapTarget); - - transform_input_reset(&t->mouse, t->mval); - snap_source_mod_end(t); -} - /** \} */ /* -------------------------------------------------------------------- */ diff --git a/source/blender/editors/transform/transform_snap.h b/source/blender/editors/transform/transform_snap.h index af13dac7ee7..ed7f93304bc 100644 --- a/source/blender/editors/transform/transform_snap.h +++ b/source/blender/editors/transform/transform_snap.h @@ -52,10 +52,6 @@ bool transform_snap_increment_ex(const TransInfo *t, bool use_local_space, float bool transform_snap_increment(const TransInfo *t, float *val); bool transform_snap_grid(TransInfo *t, float *val); -void tranform_snap_source_mod_toggle(TransInfo *t); -void tranform_snap_source_mod_update(TransInfo *t); -void tranform_snap_source_mod_confirm(TransInfo *t); - bool activeSnap(const TransInfo *t); bool activeSnap_with_project(const TransInfo *t); diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c index 9f05a0a9562..4b981e763f1 100644 --- a/source/blender/editors/transform/transform_snap_object.c +++ b/source/blender/editors/transform/transform_snap_object.c @@ -391,8 +391,9 @@ static SnapObjectData *snap_object_data_editmesh_get(SnapObjectContext *sctx, } else if (sod->mesh_runtime) { if (sod->mesh_runtime != snap_object_data_editmesh_runtime_get(ob_eval)) { - if (G.moving && !sod->treedata_editmesh.cached && !sod->cached[0] && !sod->cached[1]) { + if (G.moving) { /* Hack to avoid updating while transforming. */ + BLI_assert(!sod->treedata_editmesh.cached && !sod->cached[0] && !sod->cached[1]); sod->mesh_runtime = snap_object_data_editmesh_runtime_get(ob_eval); } else { @@ -2829,15 +2830,6 @@ void ED_transform_snap_object_context_destroy(SnapObjectContext *sctx) MEM_freeN(sctx); } -static void transform_snap_object_context_cache_clear(SnapObjectContext *sctx) -{ - BLI_ghash_clear(sctx->cache.object_map, NULL, snap_object_data_free); - if (sctx->cache.data_to_object_map != NULL) { - BLI_ghash_clear(sctx->cache.data_to_object_map, NULL, NULL); - } - BLI_memarena_clear(sctx->cache.mem_arena); -} - void ED_transform_snap_object_context_set_editmesh_callbacks( SnapObjectContext *sctx, bool (*test_vert_fn)(BMVert *, void *user_data), @@ -2845,27 +2837,11 @@ void ED_transform_snap_object_context_set_editmesh_callbacks( bool (*test_face_fn)(BMFace *, void *user_data), void *user_data) { - bool is_cache_dirty = false; - if (sctx->callbacks.edit_mesh.test_vert_fn != test_vert_fn) { - sctx->callbacks.edit_mesh.test_vert_fn = test_vert_fn; - is_cache_dirty = true; - } - if (sctx->callbacks.edit_mesh.test_edge_fn != test_edge_fn) { - sctx->callbacks.edit_mesh.test_edge_fn = test_edge_fn; - is_cache_dirty = true; - } - if (sctx->callbacks.edit_mesh.test_face_fn != test_face_fn) { - sctx->callbacks.edit_mesh.test_face_fn = test_face_fn; - is_cache_dirty = true; - } - if (sctx->callbacks.edit_mesh.user_data != user_data) { - sctx->callbacks.edit_mesh.user_data = user_data; - is_cache_dirty = true; - } + sctx->callbacks.edit_mesh.test_vert_fn = test_vert_fn; + sctx->callbacks.edit_mesh.test_edge_fn = test_edge_fn; + sctx->callbacks.edit_mesh.test_face_fn = test_face_fn; - if (is_cache_dirty) { - transform_snap_object_context_cache_clear(sctx); - } + sctx->callbacks.edit_mesh.user_data = user_data; } bool ED_transform_snap_object_project_ray_ex(SnapObjectContext *sctx, |