diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-02-28 15:07:53 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-02-28 15:07:53 +0400 |
commit | a04c132a7efe09846aad1b68e0f604e9a3ff3156 (patch) | |
tree | 8eaee1ee320eb9d7111d610fc648b1768a92c04a /source/blender/windowmanager/intern/wm_event_system.c | |
parent | f4bf97729a4e83e462f63574a32f5209be8812f6 (diff) |
NDOF: minor tweaks based on feedback.
- invert Y axis when swap YZ is enabled.
- allow rotating when not in ortho mode.
Diffstat (limited to 'source/blender/windowmanager/intern/wm_event_system.c')
-rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 6a70be36419..ecf56bcbc3a 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -2883,14 +2883,11 @@ static void attach_ndof_data(wmEvent *event, const GHOST_TEventNDOFMotionData *g mul_v3_v3fl(data->tvec, &ghost->tx, ts); mul_v3_v3fl(data->rvec, &ghost->rx, rs); - /** - * \note - * - optionally swap Y/Z. - * - maintain handed-ness? or just do what feels right? not for now. - * - after testing seems best not to apply this to rotation. - */ if (U.ndof_flag & NDOF_PAN_YZ_SWAP_AXIS) { - SWAP(float, data->tvec[1], data->tvec[2]); + float t; + t = data->tvec[1]; + data->tvec[1] = -data->tvec[2]; + data->tvec[2] = t; } data->dt = ghost->dt; |