Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #115856 from ryevdokimov/begin-rotate-trackball

Browse source 
Make consecutive presses of `Begin Rotate Transformation` shortcut enable trackball rotation
This commit is contained in:
Thaddeus Crews 2026-02-10 08:29:43 -06:00
commit 486c73409a
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
1 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

29
editor/scene/3d/node_3d_editor_plugin.cpp
View file

@ -2740,12 +2740,29 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
begin_transform(TRANSFORM_TRANSLATE, true);
}
}
if (ED_IS_SHORTCUT("spatial_editor/instant_rotate", event_mod) && _edit.mode != TRANSFORM_ROTATE) {
if (_edit.mode == TRANSFORM_NONE) {
begin_transform(TRANSFORM_ROTATE, true);
} else if (_edit.instant || collision_reposition) {
commit_transform();
begin_transform(TRANSFORM_ROTATE, true);
if (ED_IS_SHORTCUT("spatial_editor/instant_rotate", event_mod)) {
if (_edit.mode == TRANSFORM_ROTATE && _edit.instant) {
_edit.is_trackball = !_edit.is_trackball;
_edit.show_rotation_line = !_edit.is_trackball;
_edit.plane = TRANSFORM_VIEW;
_edit.original_mouse_pos = _edit.mouse_pos;
if (_edit.is_trackball) {
set_message(TTR("Trackball Rotation"));
} else {
_edit.initial_click_vector = Vector3();
_edit.previous_rotation_vector = Vector3();
_edit.accumulated_rotation_angle = 0.0;
_edit.display_rotation_angle = 0.0;
set_message(vformat(TTR("Rotating %s degrees."), String::num(0, 0)));
}
surface->queue_redraw();
} else if (_edit.mode != TRANSFORM_ROTATE) {
if (_edit.mode == TRANSFORM_NONE) {
begin_transform(TRANSFORM_ROTATE, true);
} else if (_edit.instant || collision_reposition) {
commit_transform();
begin_transform(TRANSFORM_ROTATE, true);
}
}
}
if (ED_IS_SHORTCUT("spatial_editor/instant_scale", event_mod) && _edit.mode != TRANSFORM_SCALE) {