archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

NDOF: rename 'zoom updown' to 'pan xy swap axis'

Browse Source 
This swapped translation for all ndof events.
This commit is contained in:
Campbell Barton
2014-02-15 09:38:33 +11:00
parent 30e89552e2
commit eedba54aae
4 changed files with 18 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
source/blender/windowmanager/intern/wm_event_system.c
View File

@@ -2855,33 +2855,20 @@ static void attach_ndof_data(wmEvent *event, const GHOST_TEventNDOFMotionData *g
{
wmNDOFMotionData *data = MEM_mallocN(sizeof(wmNDOFMotionData), "customdata NDOF");
const float s = U.ndof_sensitivity;
const float ts = U.ndof_sensitivity;
const float rs = U.ndof_orbit_sensitivity;
data->tx = s * ghost->tx;
mul_v3_v3fl(data->tvec, &ghost->tx, ts);
mul_v3_v3fl(data->rvec, &ghost->rx, rs);
data->rx = rs * ghost->rx;
data->ry = rs * ghost->ry;
data->rz = rs * ghost->rz;
if (U.ndof_flag & NDOF_ZOOM_UPDOWN) {
/* rotate so Y is where Z was */
data->ty = s * ghost->tz;
data->tz = s * ghost->ty;
/* maintain handed-ness? or just do what feels right? */
/* should this affect rotation also?
* initial guess is 'yes', but get user feedback immediately!
*/
#if 0
/* after turning this on, my guess becomes 'no' */
data->ry = s * ghost->rz;
data->rz = s * ghost->ry;
#endif
}
else {
data->ty = s * ghost->ty;
data->tz = s * ghost->tz;
/**
* \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]);
}
data->dt = ghost->dt;