mirror of
https://github.com/godotengine/godot
synced 2024-09-05 21:39:38 +00:00
Merge pull request #28200 from bojidar-bg/28115-ysort-breaks-shader
Fix nested YSort breaking "Use parent material"
This commit is contained in:
commit
1120b0b2d3
|
@ -51,7 +51,7 @@ void VisualServerCanvas::_render_canvas_item_tree(Item *p_canvas_item, const Tra
|
|||
}
|
||||
}
|
||||
|
||||
void _collect_ysort_children(VisualServerCanvas::Item *p_canvas_item, Transform2D p_transform, VisualServerCanvas::Item **r_items, int &r_index) {
|
||||
void _collect_ysort_children(VisualServerCanvas::Item *p_canvas_item, Transform2D p_transform, VisualServerCanvas::Item *p_material_owner, VisualServerCanvas::Item **r_items, int &r_index) {
|
||||
int child_item_count = p_canvas_item->child_items.size();
|
||||
VisualServerCanvas::Item **child_items = p_canvas_item->child_items.ptrw();
|
||||
for (int i = 0; i < child_item_count; i++) {
|
||||
|
@ -60,12 +60,13 @@ void _collect_ysort_children(VisualServerCanvas::Item *p_canvas_item, Transform2
|
|||
r_items[r_index] = child_items[i];
|
||||
child_items[i]->ysort_xform = p_transform;
|
||||
child_items[i]->ysort_pos = p_transform.xform(child_items[i]->xform.elements[2]);
|
||||
child_items[i]->material_owner = child_items[i]->use_parent_material ? p_material_owner : NULL;
|
||||
}
|
||||
|
||||
r_index++;
|
||||
|
||||
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, child_items[i]->use_parent_material ? p_material_owner : child_items[i], r_items, r_index);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -126,14 +127,14 @@ void VisualServerCanvas::_render_canvas_item(Item *p_canvas_item, const Transfor
|
|||
|
||||
if (ci->ysort_children_count == -1) {
|
||||
ci->ysort_children_count = 0;
|
||||
_collect_ysort_children(ci, Transform2D(), NULL, ci->ysort_children_count);
|
||||
_collect_ysort_children(ci, Transform2D(), p_material_owner, NULL, ci->ysort_children_count);
|
||||
}
|
||||
|
||||
child_item_count = ci->ysort_children_count;
|
||||
child_items = (Item **)alloca(child_item_count * sizeof(Item *));
|
||||
|
||||
int i = 0;
|
||||
_collect_ysort_children(ci, Transform2D(), child_items, i);
|
||||
_collect_ysort_children(ci, Transform2D(), p_material_owner, child_items, i);
|
||||
|
||||
SortArray<Item *, ItemPtrSort> sorter;
|
||||
sorter.sort(child_items, child_item_count);
|
||||
|
@ -149,7 +150,7 @@ void VisualServerCanvas::_render_canvas_item(Item *p_canvas_item, const Transfor
|
|||
if (!child_items[i]->behind || (ci->sort_y && child_items[i]->sort_y))
|
||||
continue;
|
||||
if (ci->sort_y) {
|
||||
_render_canvas_item(child_items[i], xform * child_items[i]->ysort_xform, p_clip_rect, modulate, p_z, z_list, z_last_list, (Item *)ci->final_clip_owner, p_material_owner);
|
||||
_render_canvas_item(child_items[i], xform * child_items[i]->ysort_xform, p_clip_rect, modulate, p_z, z_list, z_last_list, (Item *)ci->final_clip_owner, (Item *)child_items[i]->material_owner);
|
||||
} else {
|
||||
_render_canvas_item(child_items[i], xform, p_clip_rect, modulate, p_z, z_list, z_last_list, (Item *)ci->final_clip_owner, p_material_owner);
|
||||
}
|
||||
|
@ -191,7 +192,7 @@ void VisualServerCanvas::_render_canvas_item(Item *p_canvas_item, const Transfor
|
|||
if (child_items[i]->behind || (ci->sort_y && child_items[i]->sort_y))
|
||||
continue;
|
||||
if (ci->sort_y) {
|
||||
_render_canvas_item(child_items[i], xform * child_items[i]->ysort_xform, p_clip_rect, modulate, p_z, z_list, z_last_list, (Item *)ci->final_clip_owner, p_material_owner);
|
||||
_render_canvas_item(child_items[i], xform * child_items[i]->ysort_xform, p_clip_rect, modulate, p_z, z_list, z_last_list, (Item *)ci->final_clip_owner, (Item *)child_items[i]->material_owner);
|
||||
} else {
|
||||
_render_canvas_item(child_items[i], xform, p_clip_rect, modulate, p_z, z_list, z_last_list, (Item *)ci->final_clip_owner, p_material_owner);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue