1berry/godotengine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #87756 from ryevdokimov/alt-transform

Browse Source 
Allow all tool modes to select
This commit is contained in:
Thaddeus Crews 2025-04-10 16:53:43 -05:00
commit 83ab8b94e5
No known key found for this signature in database
GPG Key ID: 8C6E5FEB5FC03CCC
1 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
editor/plugins/node_3d_editor_plugin.cpp
View File

@ -1950,35 +1950,39 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
bool node_selected = get_selected_count() > 0; bool node_selected = get_selected_count() > 0;
if (node_selected && ((spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_SELECT && b->is_command_or_control_pressed()) || spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_ROTATE)) { if (after != EditorPlugin::AFTER_GUI_INPUT_CUSTOM && !b->is_alt_pressed()) {
begin_transform(TRANSFORM_ROTATE, false);
break;
}
if (node_selected && spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_MOVE) {
begin_transform(TRANSFORM_TRANSLATE, false);
break;
}
if (node_selected && spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_SCALE) {
begin_transform(TRANSFORM_SCALE, false);
break;
}
if (after != EditorPlugin::AFTER_GUI_INPUT_CUSTOM) {
// Single item selection. // Single item selection.
clicked = _select_ray(b->get_position()); clicked = _select_ray(b->get_position());
selection_in_progress = true; if (clicked.is_valid() && !editor_selection->is_selected(ObjectDB::get_instance<Node>(clicked))) {
selection_in_progress = true;
break;
}
if (clicked.is_null()) { if (clicked.is_null()) {
// Default to region select. // Default to region select.
cursor.region_select = true; cursor.region_select = true;
cursor.region_begin = b->get_position(); cursor.region_begin = b->get_position();
cursor.region_end = b->get_position(); cursor.region_end = b->get_position();
break;
} }
} }
if (!clicked_wants_append && node_selected && ((spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_SELECT && b->is_command_or_control_pressed()) || spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_ROTATE)) {
begin_transform(TRANSFORM_ROTATE, false);
break;
}
if (!clicked_wants_append && node_selected && spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_MOVE) {
begin_transform(TRANSFORM_TRANSLATE, false);
break;
}
if (!clicked_wants_append && node_selected && spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_SCALE) {
begin_transform(TRANSFORM_SCALE, false);
break;
}
surface->queue_redraw(); surface->queue_redraw();
} else { } else {
if (spatial_editor->get_tool_mode() == Node3DEditor::TOOL_RULER) { if (spatial_editor->get_tool_mode() == Node3DEditor::TOOL_RULER) {
@ -2034,7 +2038,6 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
set_message(""); set_message("");
spatial_editor->update_transform_gizmo(); spatial_editor->update_transform_gizmo();
} }
surface->queue_redraw();
} }
} break; } break;
@ -2120,12 +2123,10 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
} else { } else {
const bool movement_threshold_passed = _edit.original_mouse_pos.distance_to(_edit.mouse_pos) > 8 * EDSCALE; const bool movement_threshold_passed = _edit.original_mouse_pos.distance_to(_edit.mouse_pos) > 8 * EDSCALE;
if (selection_in_progress && movement_threshold_passed && clicked.is_valid()) { if ((selection_in_progress || clicked_wants_append) && movement_threshold_passed && clicked.is_valid()) {
if (clicked_wants_append || !editor_selection->is_selected(ObjectDB::get_instance<Node>(clicked))) { cursor.region_select = true;
cursor.region_select = true; cursor.region_begin = _edit.original_mouse_pos;
cursor.region_begin = _edit.original_mouse_pos; clicked = ObjectID();
clicked = ObjectID();
}
} }
if (cursor.region_select) { if (cursor.region_select) {
@ -2134,7 +2135,7 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
return; return;
} }
if (clicked.is_valid() && movement_threshold_passed) { if (clicked.is_valid() && movement_threshold_passed && (spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_SELECT || spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_MOVE)) {
_compute_edit(_edit.original_mouse_pos); _compute_edit(_edit.original_mouse_pos);
clicked = ObjectID(); clicked = ObjectID();
_edit.mode = TRANSFORM_TRANSLATE; _edit.mode = TRANSFORM_TRANSLATE;
@ -2144,7 +2145,9 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
return; return;
} }
update_transform(_get_key_modifier(m) == Key::SHIFT); if (!selection_in_progress) {
update_transform(_get_key_modifier(m) == Key::SHIFT);
}
} }
} else if (m->get_button_mask().has_flag(MouseButtonMask::RIGHT) || freelook_active) { } else if (m->get_button_mask().has_flag(MouseButtonMask::RIGHT) || freelook_active) {
NavigationMode change_nav_from_shortcut = _get_nav_mode_from_shortcut_check(NAVIGATION_RIGHT_MOUSE, shortcut_check_sets, false); NavigationMode change_nav_from_shortcut = _get_nav_mode_from_shortcut_check(NAVIGATION_RIGHT_MOUSE, shortcut_check_sets, false);