diff options
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_edit.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_edit.c | 39 |
1 files changed, 27 insertions, 12 deletions
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 4fdae8f8b24..b0b5643f2ba 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -671,28 +671,46 @@ static void viewrotate_apply(ViewOpsData *vod, int x, int y) } else { /* New turntable view code by John Aughey */ - float phi, q1[4]; + float q1[4]; float m[3][3]; float m_inv[3][3]; - float xvec[3] = {1.0f, 0.0f, 0.0f}; - /* Sensitivity will control how fast the viewport rotates. 0.0035 was + const float zvec_global[3] = {0.0f, 0.0f, 1.0f}; + float xaxis[3]; + + /* Sensitivity will control how fast the viewport rotates. 0.007 was * obtained experimentally by looking at viewport rotation sensitivities * on other modeling programs. */ /* Perhaps this should be a configurable user parameter. */ - const float sensitivity = 0.0035f; + const float sensitivity = 0.007f; /* Get the 3x3 matrix and its inverse from the quaternion */ quat_to_mat3(m, vod->viewquat); invert_m3_m3(m_inv, m); + /* avoid gimble lock */ +#if 1 + if (len_squared_v3v3(zvec_global, m_inv[2]) > 0.001f) { + float fac; + cross_v3_v3v3(xaxis, zvec_global, m_inv[2]); + if (dot_v3v3(xaxis, m_inv[0]) < 0) { + negate_v3(xaxis); + } + fac = angle_normalized_v3v3(zvec_global, m_inv[2]) / M_PI; + fac = fabsf(fac - 0.5f) * 2; + fac = fac * fac; + interp_v3_v3v3(xaxis, xaxis, m_inv[0], fac); + } + else +#endif + { + copy_v3_v3(xaxis, m_inv[0]); + } + /* Determine the direction of the x vector (for rotating up and down) */ /* This can likely be computed directly from the quaternion. */ - mul_m3_v3(m_inv, xvec); /* Perform the up/down rotation */ - phi = sensitivity * -(y - vod->oldy); - q1[0] = cos(phi); - mul_v3_v3fl(q1 + 1, xvec, sin(phi)); + axis_angle_to_quat(q1, xaxis, sensitivity * -(y - vod->oldy)); mul_qt_qtqt(vod->viewquat, vod->viewquat, q1); if (vod->use_dyn_ofs) { @@ -703,10 +721,7 @@ static void viewrotate_apply(ViewOpsData *vod, int x, int y) } /* Perform the orbital rotation */ - phi = sensitivity * vod->reverse * (x - vod->oldx); - q1[0] = cos(phi); - q1[1] = q1[2] = 0.0; - q1[3] = sin(phi); + axis_angle_to_quat(q1, zvec_global, sensitivity * vod->reverse * (x - vod->oldx)); mul_qt_qtqt(vod->viewquat, vod->viewquat, q1); if (vod->use_dyn_ofs) { |