godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Merge pull request #105613 from ryevdokimov/fix-editor-camera-transform

Browse Source 
Fix incorrect transform when editor camera is moved externally
This commit is contained in:
Thaddeus Crews
2025-04-27 19:21:12 -05:00
parent 113ef4df78 81df850492
commit 9b35aaf2e2
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
editor/plugins/node_3d_editor_plugin.cpp
View File

@@ -2986,9 +2986,10 @@ void Node3DEditorViewport::_notification(int p_what) {
if (_camera_moved_externally()) { if (_camera_moved_externally()) {
// If camera moved after this plugin last set it, presumably a tool script has moved it, accept the new camera transform as the cursor position. // If camera moved after this plugin last set it, presumably a tool script has moved it, accept the new camera transform as the cursor position.
_apply_camera_transform_to_cursor(); _apply_camera_transform_to_cursor();
} _update_camera(0);
} else {
_update_camera(delta); _update_camera(delta);
}
const HashMap<Node *, Object *> &selection = editor_selection->get_selection(); const HashMap<Node *, Object *> &selection = editor_selection->get_selection();
@@ -3494,8 +3495,18 @@ bool Node3DEditorViewport::_camera_moved_externally() {
void Node3DEditorViewport::_apply_camera_transform_to_cursor() { void Node3DEditorViewport::_apply_camera_transform_to_cursor() {
// Effectively the reverse of to_camera_transform, use camera transform to set cursor position and rotation. // Effectively the reverse of to_camera_transform, use camera transform to set cursor position and rotation.
Transform3D camera_transform = camera->get_camera_transform(); const Transform3D camera_transform = camera->get_camera_transform();
cursor.pos = camera_transform.origin; const Basis basis = camera_transform.basis;
real_t distance;
if (orthogonal) {
distance = (get_zfar() - get_znear()) / 2.0;
} else {
distance = cursor.distance;
}
cursor.pos = camera_transform.origin - basis.get_column(2) * distance;
cursor.x_rot = -camera_transform.basis.get_euler().x; cursor.x_rot = -camera_transform.basis.get_euler().x;
cursor.y_rot = -camera_transform.basis.get_euler().y; cursor.y_rot = -camera_transform.basis.get_euler().y;
} }