Skip to content

Commit

Permalink
Merge pull request #49826 from groud/fix_mesh_transform
Browse files Browse the repository at this point in the history
Keep the drawing transform when drawing meshing in CanvasItem
  • Loading branch information
akien-mga authored Jun 24, 2021
2 parents d8f2845 + e8476c9 commit a01ea50
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,7 @@ void RendererCanvasRenderRD::_render_item(RD::DrawListID p_draw_list, RID p_rend

PushConstant push_constant;
Transform2D base_transform = p_canvas_transform_inverse * p_item->final_transform;
Transform2D draw_transform;
_update_transform_2d_to_mat2x3(base_transform, push_constant.world);

Color base_color = p_item->final_modulate;
Expand Down Expand Up @@ -731,7 +732,7 @@ void RendererCanvasRenderRD::_render_item(RD::DrawListID p_draw_list, RID p_rend
mesh_instance = m->mesh_instance;
texture = m->texture;
modulate = m->modulate;
_update_transform_2d_to_mat2x3(base_transform * m->transform, push_constant.world);
_update_transform_2d_to_mat2x3(base_transform * draw_transform * m->transform, push_constant.world);
} else if (c->type == Item::Command::TYPE_MULTIMESH) {
const Item::CommandMultiMesh *mm = static_cast<const Item::CommandMultiMesh *>(c);
RID multimesh = mm->multimesh;
Expand Down Expand Up @@ -864,10 +865,10 @@ void RendererCanvasRenderRD::_render_item(RD::DrawListID p_draw_list, RID p_rend
for (int j = 0; j < 6; j++) {
push_constant.world[j] = world_backup[j];
}

} break;
case Item::Command::TYPE_TRANSFORM: {
const Item::CommandTransform *transform = static_cast<const Item::CommandTransform *>(c);
draw_transform = transform->xform;
_update_transform_2d_to_mat2x3(base_transform * transform->xform, push_constant.world);

} break;
Expand Down

0 comments on commit a01ea50

Please sign in to comment.