noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Use ObjectID to store nodes in the editor selection.

Browse Source
This commit is contained in:
Pāvels Nadtočajevs
2025-10-20 08:56:07 +03:00
parent 79603b2f28
commit 338cfba60a
8 changed files with 127 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
editor/editor_data.cpp
View File

@@ -1214,15 +1214,15 @@ EditorData::~EditorData() {
///////////////////////////////////////////////////////////////////////////////
void EditorSelection::_node_removed(Node *p_node) {
if (!selection.has(p_node)) {
ERR_FAIL_NULL(p_node);
ObjectID nid = p_node->get_instance_id();
if (!selection.has(nid)) {
return;
}
Object *meta = selection[p_node];
if (meta) {
memdelete(meta);
}
selection.erase(p_node);
Object *meta = selection[nid];
memdelete_notnull(meta);
selection.erase(nid);
changed = true;
node_list_changed = true;
}
@@ -1230,7 +1230,8 @@ void EditorSelection::_node_removed(Node *p_node) {
void EditorSelection::add_node(Node *p_node) {
ERR_FAIL_NULL(p_node);
ERR_FAIL_COND(!p_node->is_inside_tree());
if (selection.has(p_node)) {
ObjectID nid = p_node->get_instance_id();
if (selection.has(nid)) {
return;
}
@@ -1243,30 +1244,32 @@ void EditorSelection::add_node(Node *p_node) {
break;
}
}
selection[p_node] = meta;
selection[nid] = meta;
p_node->connect(SceneStringName(tree_exiting), callable_mp(this, &EditorSelection::_node_removed).bind(p_node), CONNECT_ONE_SHOT);
}
void EditorSelection::remove_node(Node *p_node) {
ERR_FAIL_NULL(p_node);
if (!selection.has(p_node)) {
ObjectID nid = p_node->get_instance_id();
if (!selection.has(nid)) {
return;
}
changed = true;
node_list_changed = true;
Object *meta = selection[p_node];
if (meta) {
memdelete(meta);
}
selection.erase(p_node);
Object *meta = selection[nid];
memdelete_notnull(meta);
selection.erase(nid);
p_node->disconnect(SceneStringName(tree_exiting), callable_mp(this, &EditorSelection::_node_removed));
}
bool EditorSelection::is_selected(Node *p_node) const {
return selection.has(p_node);
if (!p_node) {
return false;
}
return selection.has(p_node->get_instance_id());
}
void EditorSelection::_bind_methods() {
@@ -1295,12 +1298,15 @@ void EditorSelection::_update_node_list() {
// If the selection does not have the parent of the selected node, then add the node to the node list.
// However, if the parent is already selected, then adding this node is redundant as
// it is included with the parent, so skip it.
for (const KeyValue<Node *, Object *> &E : selection) {
Node *parent = E.key;
for (const KeyValue<ObjectID, Object *> &E : selection) {
Node *parent = ObjectDB::get_instance<Node>(E.key);
if (!parent) {
continue;
}
parent = parent->get_parent();
bool skip = false;
while (parent) {
if (selection.has(parent)) {
if (selection.has(parent->get_instance_id())) {
skip = true;
break;
}
@@ -1337,8 +1343,11 @@ void EditorSelection::_emit_change() {
TypedArray<Node> EditorSelection::get_top_selected_nodes() {
TypedArray<Node> ret;
for (const Node *E : top_selected_node_list) {
ret.push_back(E);
for (const ObjectID &nid : top_selected_node_list) {
Node *node = ObjectDB::get_instance<Node>(nid);
if (node) {
ret.push_back(node);
}
}
return ret;
@@ -1347,26 +1356,39 @@ TypedArray<Node> EditorSelection::get_top_selected_nodes() {
TypedArray<Node> EditorSelection::get_selected_nodes() {
TypedArray<Node> ret;
for (const KeyValue<Node *, Object *> &E : selection) {
ret.push_back(E.key);
for (const KeyValue<ObjectID, Object *> &E : selection) {
Node *node = ObjectDB::get_instance<Node>(E.key);
if (node) {
ret.push_back(node);
}
}
return ret;
}
const List<Node *> &EditorSelection::get_top_selected_node_list() {
List<Node *> EditorSelection::get_top_selected_node_list() {
if (changed) {
update();
} else {
_update_node_list();
}
return top_selected_node_list;
List<Node *> node_list;
for (const ObjectID &nid : top_selected_node_list) {
Node *node = ObjectDB::get_instance<Node>(nid);
if (node) {
node_list.push_back(node);
}
}
return node_list;
}
List<Node *> EditorSelection::get_full_selected_node_list() {
List<Node *> node_list;
for (const KeyValue<Node *, Object *> &E : selection) {
node_list.push_back(E.key);
for (const KeyValue<ObjectID, Object *> &E : selection) {
Node *node = ObjectDB::get_instance<Node>(E.key);
if (node) {
node_list.push_back(node);
}
}
return node_list;
@@ -1374,7 +1396,10 @@ List<Node *> EditorSelection::get_full_selected_node_list() {
void EditorSelection::clear() {
while (!selection.is_empty()) {
remove_node(selection.begin()->key);
Node *node = ObjectDB::get_instance<Node>(selection.begin()->key);
if (node) {
remove_node(node);
}
}
changed = true;