From 3c4c73b1005ccb975e3398aa95ed42e52d95f658 Mon Sep 17 00:00:00 2001 From: Marcus Brummer Date: Thu, 10 Feb 2022 00:24:52 +0100 Subject: Fixed issues with 3D region-select in the editor --- editor/plugins/node_3d_editor_plugin.cpp | 27 ++++++++++++++++----------- editor/plugins/node_3d_editor_plugin.h | 1 + 2 files changed, 17 insertions(+), 11 deletions(-) (limited to 'editor/plugins') diff --git a/editor/plugins/node_3d_editor_plugin.cpp b/editor/plugins/node_3d_editor_plugin.cpp index e35af6dd64..bee3aa3bfe 100644 --- a/editor/plugins/node_3d_editor_plugin.cpp +++ b/editor/plugins/node_3d_editor_plugin.cpp @@ -1595,9 +1595,9 @@ void Node3DEditorViewport::_sinput(const Ref &p_event) { } if (after != EditorPlugin::AFTER_GUI_INPUT_DESELECT) { - clicked = _select_ray(b->get_position()); - //clicking is always deferred to either move or release + clicked = _select_ray(b->get_position()); + selection_in_progress = true; if (clicked.is_null()) { //default to regionselect @@ -1616,6 +1616,8 @@ void Node3DEditorViewport::_sinput(const Ref &p_event) { } if (after != EditorPlugin::AFTER_GUI_INPUT_DESELECT) { + selection_in_progress = false; + if (clicked.is_valid()) { _select_clicked(false); } @@ -1720,17 +1722,14 @@ void Node3DEditorViewport::_sinput(const Ref &p_event) { nav_mode = NAVIGATION_ORBIT; } else { const bool movement_threshold_passed = _edit.original_mouse_pos.distance_to(_edit.mouse_pos) > 8 * EDSCALE; - if (clicked.is_valid() && movement_threshold_passed) { - _compute_edit(_edit.original_mouse_pos); - clicked = ObjectID(); - - _edit.mode = TRANSFORM_TRANSLATE; - } // enable region-select if nothing has been selected yet or multi-select (shift key) is active - if (movement_threshold_passed && (get_selected_count() == 0 || clicked_wants_append)) { - cursor.region_select = true; - cursor.region_begin = _edit.original_mouse_pos; + if (selection_in_progress && movement_threshold_passed) { + if (get_selected_count() == 0 || clicked_wants_append) { + cursor.region_select = true; + cursor.region_begin = _edit.original_mouse_pos; + clicked = ObjectID(); + } } if (cursor.region_select) { @@ -1739,6 +1738,12 @@ void Node3DEditorViewport::_sinput(const Ref &p_event) { return; } + if (clicked.is_valid() && movement_threshold_passed) { + _compute_edit(_edit.original_mouse_pos); + clicked = ObjectID(); + _edit.mode = TRANSFORM_TRANSLATE; + } + if (_edit.mode == TRANSFORM_NONE) { return; } diff --git a/editor/plugins/node_3d_editor_plugin.h b/editor/plugins/node_3d_editor_plugin.h index bbe5615570..16d9815288 100644 --- a/editor/plugins/node_3d_editor_plugin.h +++ b/editor/plugins/node_3d_editor_plugin.h @@ -269,6 +269,7 @@ private: ObjectID clicked; Vector<_RayResult> selection_results; bool clicked_wants_append; + bool selection_in_progress = false; PopupMenu *selection_menu; -- cgit v1.2.3