diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-08-12 05:07:31 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-08-12 05:07:31 +0400 |
commit | 9cce2d864554cb78abfb5e2909dfb1a506933d3c (patch) | |
tree | 57f1037cb16ce26791f4bb1cd5fb0a88293d8af9 /source/blender/editors/interface/view2d_ops.c | |
parent | 1aaaf67a9e42cfbba6d8c955a9e0a7519b296933 (diff) |
smooth-view for 2d views, graph editor, sequencer, node view, works with border zoom, view selected, view all.
Diffstat (limited to 'source/blender/editors/interface/view2d_ops.c')
-rw-r--r-- | source/blender/editors/interface/view2d_ops.c | 157 |
1 files changed, 139 insertions, 18 deletions
diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c index c70f661cb14..5b5ccc0582c 100644 --- a/source/blender/editors/interface/view2d_ops.c +++ b/source/blender/editors/interface/view2d_ops.c @@ -1100,6 +1100,7 @@ static int view_borderzoom_exec(bContext *C, wmOperator *op) ARegion *ar = CTX_wm_region(C); View2D *v2d = &ar->v2d; rctf rect; + rctf cur_new = v2d->cur; int gesture_mode; /* convert coordinates of rect to 'tot' rect coordinates */ @@ -1116,12 +1117,12 @@ static int view_borderzoom_exec(bContext *C, wmOperator *op) * if zoom is allowed to be changed */ if ((v2d->keepzoom & V2D_LOCKZOOM_X) == 0) { - v2d->cur.xmin = rect.xmin; - v2d->cur.xmax = rect.xmax; + cur_new.xmin = rect.xmin; + cur_new.xmax = rect.xmax; } if ((v2d->keepzoom & V2D_LOCKZOOM_Y) == 0) { - v2d->cur.ymin = rect.ymin; - v2d->cur.ymax = rect.ymax; + cur_new.ymin = rect.ymin; + cur_new.ymax = rect.ymax; } } else { /* if (gesture_mode == GESTURE_MODAL_OUT) */ @@ -1135,29 +1136,24 @@ static int view_borderzoom_exec(bContext *C, wmOperator *op) /* TODO: is this zoom factor calculation valid? It seems to produce same results everytime... */ if ((v2d->keepzoom & V2D_LOCKZOOM_X) == 0) { - size = (v2d->cur.xmax - v2d->cur.xmin); + size = (cur_new.xmax - cur_new.xmin); zoom = size / (rect.xmax - rect.xmin); - center = (v2d->cur.xmax + v2d->cur.xmin) * 0.5f; + center = (cur_new.xmax + cur_new.xmin) * 0.5f; - v2d->cur.xmin = center - (size * zoom); - v2d->cur.xmax = center + (size * zoom); + cur_new.xmin = center - (size * zoom); + cur_new.xmax = center + (size * zoom); } if ((v2d->keepzoom & V2D_LOCKZOOM_Y) == 0) { - size = (v2d->cur.ymax - v2d->cur.ymin); + size = (cur_new.ymax - cur_new.ymin); zoom = size / (rect.ymax - rect.ymin); - center = (v2d->cur.ymax + v2d->cur.ymin) * 0.5f; + center = (cur_new.ymax + cur_new.ymin) * 0.5f; - v2d->cur.ymin = center - (size * zoom); - v2d->cur.ymax = center + (size * zoom); + cur_new.ymin = center - (size * zoom); + cur_new.ymax = center + (size * zoom); } } - /* validate that view is in valid configuration after this operation */ - UI_view2d_curRect_validate(v2d); - - /* request updates to be done... */ - ED_region_tag_redraw(ar); - UI_view2d_sync(CTX_wm_screen(C), CTX_wm_area(C), v2d, V2D_LOCK_COPY); + UI_view2d_smooth_view(C, ar, &cur_new); return OPERATOR_FINISHED; } @@ -1182,6 +1178,127 @@ static void VIEW2D_OT_zoom_border(wmOperatorType *ot) } /* ********************************************************* */ +/* SMOOTH VIEW */ + +struct SmoothView2DStore { + rctf orig_cur, new_cur; + + double time_allowed; +}; + +/* will start timer if appropriate */ +/* the arguments are the desired situation */ +void UI_view2d_smooth_view(bContext *C, ARegion *ar, + const rctf *cur) +{ + wmWindowManager *wm = CTX_wm_manager(C); + wmWindow *win = CTX_wm_window(C); + + View2D *v2d = &ar->v2d; + struct SmoothView2DStore sms = {{0}}; + short ok = FALSE; + + /* initialize sms */ + sms.new_cur = v2d->cur; + + /* store the options we want to end with */ + if (cur) sms.new_cur = *cur; + + if (C && U.smooth_viewtx) { + int changed = 0; /* zero means no difference */ + + if (BLI_rctf_compare(&sms.new_cur, &v2d->cur, FLT_EPSILON) == FALSE) + changed = 1; + changed=1; + + /* The new view is different from the old one + * so animate the view */ + if (changed) { + sms.orig_cur = v2d->cur; + + sms.time_allowed = (double)U.smooth_viewtx / 1000.0; + + /* keep track of running timer! */ + if (v2d->sms == NULL) + v2d->sms = MEM_mallocN(sizeof(struct SmoothView2DStore), "smoothview v2d"); + *v2d->sms = sms; + if (v2d->smooth_timer) + WM_event_remove_timer(wm, win, v2d->smooth_timer); + /* TIMER1 is hardcoded in keymap */ + v2d->smooth_timer = WM_event_add_timer(wm, win, TIMER1, 1.0 / 100.0); /* max 30 frs/sec */ + + ok = TRUE; + } + } + + /* if we get here nothing happens */ + if (ok == FALSE) { + v2d->cur = sms.new_cur; + + UI_view2d_curRect_validate(v2d); + ED_region_tag_redraw(ar); + UI_view2d_sync(CTX_wm_screen(C), CTX_wm_area(C), v2d, V2D_LOCK_COPY); + } +} + +/* only meant for timer usage */ +static int view2d_smoothview_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *event) +{ + ARegion *ar = CTX_wm_region(C); + View2D *v2d = &ar->v2d; + struct SmoothView2DStore *sms = v2d->sms; + float step; + + /* escape if not our timer */ + if (v2d->smooth_timer == NULL || v2d->smooth_timer != event->customdata) + return OPERATOR_PASS_THROUGH; + + if (sms->time_allowed != 0.0) + step = (float)((v2d->smooth_timer->duration) / sms->time_allowed); + else + step = 1.0f; + + /* end timer */ + if (step >= 1.0f) { + v2d->cur = sms->new_cur; + + MEM_freeN(v2d->sms); + v2d->sms = NULL; + + WM_event_remove_timer(CTX_wm_manager(C), CTX_wm_window(C), v2d->smooth_timer); + v2d->smooth_timer = NULL; + } + else { + /* ease in/out */ + step = (3.0f * step * step - 2.0f * step * step * step); + + BLI_rctf_interp(&v2d->cur, &sms->orig_cur, &sms->new_cur, step); + } + + UI_view2d_curRect_validate(v2d); + UI_view2d_sync(CTX_wm_screen(C), CTX_wm_area(C), v2d, V2D_LOCK_COPY); + ED_region_tag_redraw(ar); + + return OPERATOR_FINISHED; +} + +static void VIEW2D_OT_smoothview(wmOperatorType *ot) +{ + /* identifiers */ + ot->name = "Smooth View 2D"; + ot->description = "Zoom in the view to the nearest item contained in the border"; + ot->idname = "VIEW2D_OT_smoothview"; + + /* api callbacks */ + ot->invoke = view2d_smoothview_invoke; + + ot->poll = view2d_poll; + + /* rna */ + WM_operator_properties_gesture_border(ot, FALSE); +} + +/* ********************************************************* */ /* SCROLLERS */ /* Scrollers should behave in the following ways, when clicked on with LMB (and dragged): @@ -1678,6 +1795,8 @@ void UI_view2d_operatortypes(void) WM_operatortype_append(VIEW2D_OT_zoom); WM_operatortype_append(VIEW2D_OT_zoom_border); + + WM_operatortype_append(VIEW2D_OT_smoothview); WM_operatortype_append(VIEW2D_OT_scroller_activate); @@ -1711,6 +1830,8 @@ void UI_view2d_keymap(wmKeyConfig *keyconf) WM_keymap_add_item(keymap, "VIEW2D_OT_zoom_out", PADMINUS, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "VIEW2D_OT_zoom_in", PADPLUSKEY, KM_PRESS, 0, 0); + WM_keymap_verify_item(keymap, "VIEW2D_OT_smoothview", TIMER1, KM_ANY, KM_ANY, 0); + /* scroll up/down - no modifiers, only when zoom fails */ /* these may fail if zoom is disallowed, in which case they should pass on event */ WM_keymap_add_item(keymap, "VIEW2D_OT_scroll_down", WHEELDOWNMOUSE, KM_PRESS, 0, 0); |