gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-09-05 12:58:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #92188 from SaracenOne/ownerless_node_select

Browse source 
Disallow selection of ownerless nodes
This commit is contained in:
Rémi Verschelde 2024-05-28 15:48:54 +02:00
parent ca708b5706 596026a1ee
commit 25b17bd245
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 59 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
editor/plugins/node_3d_editor_plugin.cpp
View file

@ -739,9 +739,21 @@ void Node3DEditorViewport::_select_clicked(bool p_allow_locked) {
return;
}
Node *edited_scene = EditorNode::get_singleton()->get_edited_scene();
// Prevent selection of nodes not owned by the edited scene.
while (node && node != edited_scene->get_parent()) {
Node *node_owner = node->get_owner();
if (node_owner == edited_scene || node == edited_scene || (node_owner != nullptr && edited_scene->is_editable_instance(node_owner))) {
break;
}
node = node->get_parent();
selected = Object::cast_to<Node3D>(node);
}
if (!p_allow_locked) {
// Replace the node by the group if grouped
while (node && node != EditorNode::get_singleton()->get_edited_scene()->get_parent()) {
while (node && node != edited_scene->get_parent()) {
Node3D *selected_tmp = Object::cast_to<Node3D>(node);
if (selected_tmp && node->has_meta("_edit_group_")) {
selected = selected_tmp;
@ -1044,25 +1056,34 @@ void Node3DEditorViewport::_select_region() {
found_nodes.insert(sp);
Node *item = Object::cast_to<Node>(sp);
if (item != edited_scene) {
item = edited_scene->get_deepest_editable_node(item);
Node *node = Object::cast_to<Node>(sp);
if (node != edited_scene) {
node = edited_scene->get_deepest_editable_node(node);
}
// Prevent selection of nodes not owned by the edited scene.
while (node && node != edited_scene->get_parent()) {
Node *node_owner = node->get_owner();
if (node_owner == edited_scene || node == edited_scene || (node_owner != nullptr && edited_scene->is_editable_instance(node_owner))) {
break;
}
node = node->get_parent();
}
// Replace the node by the group if grouped
if (item->is_class("Node3D")) {
Node3D *sel = Object::cast_to<Node3D>(item);
while (item && item != EditorNode::get_singleton()->get_edited_scene()->get_parent()) {
Node3D *selected_tmp = Object::cast_to<Node3D>(item);
if (selected_tmp && item->has_meta("_edit_group_")) {
if (node->is_class("Node3D")) {
Node3D *sel = Object::cast_to<Node3D>(node);
while (node && node != EditorNode::get_singleton()->get_edited_scene()->get_parent()) {
Node3D *selected_tmp = Object::cast_to<Node3D>(node);
if (selected_tmp && node->has_meta("_edit_group_")) {
sel = selected_tmp;
}
item = item->get_parent();
node = node->get_parent();
}
item = sel;
node = sel;
}
if (_is_node_locked(item)) {
if (_is_node_locked(node)) {
continue;
}
@ -1074,7 +1095,7 @@ void Node3DEditorViewport::_select_region() {
}
if (seg->intersect_frustum(camera, frustum)) {
selected.push_back(item);
selected.push_back(node);
}
}
}
@ -1531,23 +1552,35 @@ bool Node3DEditorViewport ::_is_node_locked(const Node *p_node) {
}
void Node3DEditorViewport::_list_select(Ref<InputEventMouseButton> b) {
_find_items_at_pos(b->get_position(), selection_results, spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_SELECT);
Vector<_RayResult> potential_selection_results;
_find_items_at_pos(b->get_position(), potential_selection_results, spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_SELECT);
Node *scene = EditorNode::get_singleton()->get_edited_scene();
Node *edited_scene = EditorNode::get_singleton()->get_edited_scene();
for (int i = 0; i < selection_results.size(); i++) {
Node3D *item = selection_results[i].item;
if (item != scene && item->get_owner() != scene && item != scene->get_deepest_editable_node(item)) {
//invalid result
selection_results.remove_at(i);
i--;
// Filter to a list of nodes which include either the edited scene or nodes directly owned by the edited scene.
// If a node has an invalid owner, recursively check their parents until a valid node is found.
for (int i = 0; i < potential_selection_results.size(); i++) {
Node3D *node = potential_selection_results[i].item;
while (true) {
if (node == nullptr || node == edited_scene->get_parent()) {
break;
} else {
Node *node_owner = node->get_owner();
if (node == edited_scene || node_owner == edited_scene || (node_owner != nullptr && edited_scene->is_editable_instance(node_owner))) {
if (selection_results.has(node)) {
selection_results.append(node);
}
break;
}
}
node = Object::cast_to<Node3D>(node->get_parent());
}
}
clicked_wants_append = b->is_shift_pressed();
if (selection_results.size() == 1) {
clicked = selection_results[0].item->get_instance_id();
clicked = selection_results[0]->get_instance_id();
selection_results.clear();
if (clicked.is_valid()) {
@ -1558,7 +1591,7 @@ void Node3DEditorViewport::_list_select(Ref<InputEventMouseButton> b) {
StringName root_name = root_path.get_name(root_path.get_name_count() - 1);
for (int i = 0; i < selection_results.size(); i++) {
Node3D *spat = selection_results[i].item;
Node3D *spat = selection_results[i];
Ref<Texture2D> icon = EditorNode::get_singleton()->get_object_icon(spat, "Node");
@ -3754,7 +3787,7 @@ void Node3DEditorViewport::_selection_result_pressed(int p_result) {
return;
}
clicked = selection_results_menu[p_result].item->get_instance_id();
clicked = selection_results_menu[p_result]->get_instance_id();
if (clicked.is_valid()) {
_select_clicked(spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_SELECT);

4
editor/plugins/node_3d_editor_plugin.h
View file

@ -298,8 +298,8 @@ private:
ObjectID clicked;
ObjectID material_target;
Vector<_RayResult> selection_results;
Vector<_RayResult> selection_results_menu;
Vector<Node3D *> selection_results;
Vector<Node3D *> selection_results_menu;
bool clicked_wants_append = false;
bool selection_in_progress = false;