diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2014-02-18 17:05:45 +0400 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2014-02-18 17:08:45 +0400 |
| commit | cbbc67a0b5759ef5153d9b18a825c42ad9a3792b (patch) | |
| tree | 85f378f105453526c6c94a3118ea3fb4eb1ecfa0 /source | |
| parent | e965afcdccbeb80469ca4e14c116d5e1bf1e6cf0 (diff) | |
fix - T38561: Fly mode vs. Walk Mode Navigation Keyboard Controls
* QE as up/down to Fly Navigator
* Alt as slow modifier to Fly Navigator
* Update on Walk header info
Note: I left the original RF/Ctrl shortcuts working for fly navigator
but they are no longer visible in the header info. So old users will
still be using what they were used to, while new ones get used to what
walk navigation is using.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_fly.c | 12 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_walk.c | 1 |
2 files changed, 11 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/view3d_fly.c b/source/blender/editors/space_view3d/view3d_fly.c index 4933e004855..fed94d6b6ab 100644 --- a/source/blender/editors/space_view3d/view3d_fly.c +++ b/source/blender/editors/space_view3d/view3d_fly.c @@ -152,6 +152,10 @@ void fly_modal_keymap(wmKeyConfig *keyconf) WM_modalkeymap_add_item(keymap, SKEY, KM_PRESS, 0, 0, FLY_MODAL_DIR_BACKWARD); WM_modalkeymap_add_item(keymap, AKEY, KM_PRESS, 0, 0, FLY_MODAL_DIR_LEFT); WM_modalkeymap_add_item(keymap, DKEY, KM_PRESS, 0, 0, FLY_MODAL_DIR_RIGHT); + WM_modalkeymap_add_item(keymap, EKEY, KM_PRESS, 0, 0, FLY_MODAL_DIR_UP); + WM_modalkeymap_add_item(keymap, QKEY, KM_PRESS, 0, 0, FLY_MODAL_DIR_DOWN); + + /* for legacy reasons, leave R/F working */ WM_modalkeymap_add_item(keymap, RKEY, KM_PRESS, 0, 0, FLY_MODAL_DIR_UP); WM_modalkeymap_add_item(keymap, FKEY, KM_PRESS, 0, 0, FLY_MODAL_DIR_DOWN); @@ -163,6 +167,10 @@ void fly_modal_keymap(wmKeyConfig *keyconf) WM_modalkeymap_add_item(keymap, XKEY, KM_PRESS, 0, 0, FLY_MODAL_AXIS_LOCK_X); WM_modalkeymap_add_item(keymap, ZKEY, KM_PRESS, 0, 0, FLY_MODAL_AXIS_LOCK_Z); + WM_modalkeymap_add_item(keymap, LEFTALTKEY, KM_PRESS, KM_ANY, 0, FLY_MODAL_PRECISION_ENABLE); + WM_modalkeymap_add_item(keymap, LEFTALTKEY, KM_RELEASE, KM_ANY, 0, FLY_MODAL_PRECISION_DISABLE); + + /* for legacy reasons, leave shift working */ WM_modalkeymap_add_item(keymap, LEFTSHIFTKEY, KM_PRESS, KM_ANY, 0, FLY_MODAL_PRECISION_ENABLE); WM_modalkeymap_add_item(keymap, LEFTSHIFTKEY, KM_RELEASE, KM_ANY, 0, FLY_MODAL_PRECISION_DISABLE); @@ -281,8 +289,8 @@ static void fly_update_header(bContext *C, FlyInfo *fly) BLI_snprintf(header, HEADER_LENGTH, IFACE_("LMB/Return: confirm, " "RMB/Esc: cancel, " "MMB: pan, " - "WASDRF: direction, " - "Shift: slow, " + "WASDQE: direction, " + "Alt: slow, " "Ctrl: free look, " "X: Upright x axis (%s), " "Z: Upright z axis (%s), " diff --git a/source/blender/editors/space_view3d/view3d_walk.c b/source/blender/editors/space_view3d/view3d_walk.c index b49e26241b8..9a57fee95f9 100644 --- a/source/blender/editors/space_view3d/view3d_walk.c +++ b/source/blender/editors/space_view3d/view3d_walk.c @@ -348,6 +348,7 @@ static void walk_update_header(bContext *C, WalkInfo *walk) BLI_snprintf(header, HEADER_LENGTH, IFACE_("LMB/Return: confirm, Esc/RMB: cancel, " "Tab: gravity (%s), " "WASD: move around, " + "Shift: fast, Alt: slow, " "QE: up and down, MMB/Space: teleport, V: jump, " "Pad +/Wheel Up: increase speed, Pad -/Wheel Down: decrease speed"), WM_bool_as_string(gravity)); |