godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Corrected rotation gizmo plane math for off-center perspective view.

Browse Source 
(cherry picked from commit 1fc8255355)
This commit is contained in:
Zi Ye 2024-08-11 14:19:23 -05:00 committed by Rémi Verschelde
parent a70df8537e
commit 2eec361f5f
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
editor/plugins/node_3d_editor_plugin.cpp
View File

@ -5001,14 +5001,24 @@ void Node3DEditorViewport::update_transform(bool p_shift) {
} break;
case TRANSFORM_ROTATE: {
Plane plane = Plane(_get_camera_normal(), _edit.center);
Plane plane;
if (camera->get_projection() == Camera3D::PROJECTION_PERSPECTIVE) {
Vector3 cam_to_obj = _edit.center - _get_camera_position();
if (!cam_to_obj.is_zero_approx()) {
plane = Plane(cam_to_obj.normalized(), _edit.center);
} else {
plane = Plane(_get_camera_normal(), _edit.center);
}
} else {
plane = Plane(_get_camera_normal(), _edit.center);
}
Vector3 local_axis;
Vector3 global_axis;
switch (_edit.plane) {
case TRANSFORM_VIEW:
// local_axis unused
global_axis = _get_camera_normal();
global_axis = plane.normal;
break;
case TRANSFORM_X_AXIS:
local_axis = Vector3(1, 0, 0);
@ -5039,7 +5049,7 @@ void Node3DEditorViewport::update_transform(bool p_shift) {
break;
}
static const float orthogonal_threshold = Math::cos(Math::deg_to_rad(87.0f));
static const float orthogonal_threshold = Math::cos(Math::deg_to_rad(85.0f));
bool axis_is_orthogonal = ABS(plane.normal.dot(global_axis)) < orthogonal_threshold;
double angle = 0.0f;