From cebd025e02f1147c48cd658816ad835f94128a4a Mon Sep 17 00:00:00 2001 From: Bataev Artem Date: Sun, 9 Feb 2020 11:32:08 +1100 Subject: 3D View: check view quaternion alignment which orbiting This makes auto-perspective work as expected when orbiting out of a snapped view. --- source/blender/editors/space_view3d/view3d_utils.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'source/blender/editors/space_view3d/view3d_utils.c') diff --git a/source/blender/editors/space_view3d/view3d_utils.c b/source/blender/editors/space_view3d/view3d_utils.c index 1af94e3ade5..e7d514baa41 100644 --- a/source/blender/editors/space_view3d/view3d_utils.c +++ b/source/blender/editors/space_view3d/view3d_utils.c @@ -470,7 +470,7 @@ bool ED_view3d_persp_ensure(const Depsgraph *depsgraph, View3D *v3d, ARegion *ar char persp = (autopersp && RV3D_VIEW_IS_AXIS(rv3d->lview)) ? RV3D_PERSP : rv3d->lpersp; ED_view3d_persp_switch_from_camera(depsgraph, v3d, rv3d, persp); } - else if (autopersp && RV3D_VIEW_IS_AXIS(rv3d->view)) { + else if (autopersp && ED_view3d_quat_is_axis_aligned(rv3d->viewquat)) { rv3d->persp = RV3D_PERSP; } return true; @@ -1339,6 +1339,22 @@ char ED_view3d_quat_to_axis_view(const float quat[4], const float epsilon) return RV3D_VIEW_USER; } +/** + * Returns true if input view quaternion is aligned view axis in direction & angle. + */ +bool ED_view3d_quat_is_axis_aligned(const float viewquat[4]) +{ + float mat[3][3]; + quat_to_mat3(mat, viewquat); + for (int row = 0; row < 3; row++) { + int axis = axis_dominant_v3_single(mat[row]); + if (fabsf(fabsf(mat[row][axis]) - 1.0f) > 1e-4f) { + return false; + } + } + return true; +} + char ED_view3d_lock_view_from_index(int index) { switch (index) { -- cgit v1.2.3