godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #27843 from bojidar-bg/27678-ysort-visibility 

Do not YSort canvas items that are not visible
This commit is contained in:
Rémi Verschelde 2019-04-09 17:15:27 +02:00 committed by GitHub
parent c8994b56f9 11e62cdc79
commit 5772f60f96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
servers/visual/visual_server_canvas.cpp
View File

@ -55,6 +55,7 @@ void _collect_ysort_children(VisualServerCanvas::Item *p_canvas_item, Transform2
int child_item_count = p_canvas_item->child_items.size(); int child_item_count = p_canvas_item->child_items.size();
VisualServerCanvas::Item **child_items = p_canvas_item->child_items.ptrw(); VisualServerCanvas::Item **child_items = p_canvas_item->child_items.ptrw();
for (int i = 0; i < child_item_count; i++) { for (int i = 0; i < child_item_count; i++) {
if (child_items[i]->visible) {
if (r_items) { if (r_items) {
r_items[r_index] = child_items[i]; r_items[r_index] = child_items[i];
child_items[i]->ysort_xform = p_transform; child_items[i]->ysort_xform = p_transform;
@ -66,6 +67,7 @@ void _collect_ysort_children(VisualServerCanvas::Item *p_canvas_item, Transform2
if (child_items[i]->sort_y) if (child_items[i]->sort_y)
_collect_ysort_children(child_items[i], p_transform * child_items[i]->xform, r_items, r_index); _collect_ysort_children(child_items[i], p_transform * child_items[i]->xform, r_items, r_index);
} }
}
} }
void _mark_ysort_dirty(VisualServerCanvas::Item *ysort_owner, RID_Owner<VisualServerCanvas::Item> &canvas_item_owner) { void _mark_ysort_dirty(VisualServerCanvas::Item *ysort_owner, RID_Owner<VisualServerCanvas::Item> &canvas_item_owner) {
@ -393,6 +395,10 @@ void VisualServerCanvas::canvas_item_set_visible(RID p_item, bool p_visible) {
ERR_FAIL_COND(!canvas_item); ERR_FAIL_COND(!canvas_item);
canvas_item->visible = p_visible; canvas_item->visible = p_visible;
if (canvas_item->parent.is_valid() && canvas_item_owner.owns(canvas_item->parent)) {
_mark_ysort_dirty(canvas_item_owner.get(canvas_item->parent), canvas_item_owner);
}
} }
void VisualServerCanvas::canvas_item_set_light_mask(RID p_item, int p_mask) { void VisualServerCanvas::canvas_item_set_light_mask(RID p_item, int p_mask) {