godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 10:11:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #109511 from precup/speedy-editor-deletions

Browse Source 
Speed up deletion via the Scene Tree Dock in large trees
This commit is contained in:
Thaddeus Crews
2025-10-27 10:01:48 -05:00
parent 978f9b84ce 1ad3b9986e
commit ae8c92987e
4 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scene/gui/tree.cpp
View File

@@ -895,7 +895,7 @@ TreeItem *TreeItem::create_child(int p_index) {
} else {
int idx = 0;
if (!children_cache.is_empty()) {
idx = MIN(children_cache.size() - 1, p_index);
idx = MIN(int(children_cache.size()) - 1, p_index);
item_next = children_cache[idx];
item_prev = item_next->prev;
}
@@ -920,7 +920,7 @@ TreeItem *TreeItem::create_child(int p_index) {
if (ti->next) {
children_cache.insert(p_index, ti);
} else {
children_cache.append(ti);
children_cache.push_back(ti);
}
}
} else {
@@ -957,7 +957,7 @@ void TreeItem::add_child(TreeItem *p_item) {
last_child = p_item;
if (!children_cache.is_empty()) {
children_cache.append(p_item);
children_cache.push_back(p_item);
}
validate_cache();
@@ -1111,15 +1111,15 @@ TreeItem *TreeItem::get_child(int p_index) {
if (p_index < 0) {
p_index += children_cache.size();
}
ERR_FAIL_INDEX_V(p_index, children_cache.size(), nullptr);
ERR_FAIL_INDEX_V(p_index, (int)children_cache.size(), nullptr);
return children_cache.get(p_index);
return children_cache[p_index];
}
int TreeItem::get_visible_child_count() {
_create_children_cache();
int visible_count = 0;
for (int i = 0; i < children_cache.size(); i++) {
for (uint32_t i = 0; i < children_cache.size(); i++) {
if (children_cache[i]->is_visible()) {
visible_count += 1;
}
@@ -1175,7 +1175,7 @@ void TreeItem::validate_cache() const {
return;
}
TreeItem *scan = parent->first_child;
int index = 0;
uint32_t index = 0;
while (scan) {
DEV_ASSERT(parent->children_cache[index] == scan);
++index;
@@ -1265,7 +1265,7 @@ void TreeItem::move_after(TreeItem *p_item) {
// If the cache is empty, it has not been built but there
// are items in the tree (note p_item != nullptr,) so we cannot update it.
if (!parent->children_cache.is_empty()) {
parent->children_cache.append(this);
parent->children_cache.push_back(this);
}
}

6
scene/gui/tree.h
View File

@@ -150,7 +150,7 @@ private:
TreeItem *first_child = nullptr;
TreeItem *last_child = nullptr;
Vector<TreeItem *> children_cache;
LocalVector<TreeItem *> children_cache;
bool is_root = false; // For tree root.
Tree *tree = nullptr; // Tree (for reference).
@@ -169,7 +169,7 @@ private:
if (children_cache.is_empty()) {
TreeItem *c = first_child;
while (c) {
children_cache.append(c);
children_cache.push_back(c);
c = c->next;
}
}
@@ -201,7 +201,7 @@ private:
}
if (parent) {
if (!parent->children_cache.is_empty()) {
parent->children_cache.remove_at(get_index());
parent->children_cache.erase(this);
}
if (parent->first_child == this) {
parent->first_child = next;