griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.5-release'

Browse Source
This commit is contained in:
Campbell Barton
2025-07-04 19:51:49 +10:00
parent 389a9197ae c53a0cfcb6
commit dcf59ca85a
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/editors/space_view3d/view3d_navigate_view_ndof.cc
View File

@@ -185,9 +185,22 @@ static void view3d_ndof_pan_zoom(const wmNDOFMotionData &ndof,
}
if (has_translate) {
const float speed = view3d_ndof_pan_speed_calc(rv3d);
pan_vec *= speed * ndof.time_delta;
if (U.ndof_navigation_mode == NDOF_NAVIGATION_MODE_FLY) {
/* For "Fly Mode" translations we use arbitrary defined, constant
* speed values for each axis. Normally, these values are defined
* by the 3Dconnexion navigation library. To recreate original navigation
* experience, the translation speed values were picked experimentally here.
* This is intended to apply only for the "Fly Mode" (3D viewport). */
const float fly_speed[3] = {6.5f, 3.3f, 8.0f};
pan_vec[0] *= fly_speed[0] * ndof.time_delta;
pan_vec[1] *= fly_speed[1] * ndof.time_delta;
pan_vec[2] *= fly_speed[2] * ndof.time_delta;
}
else {
const float speed = view3d_ndof_pan_speed_calc(rv3d);
pan_vec *= speed * ndof.time_delta;
}
/* transform motion from view to world coordinates */
float view_inv[4];