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

Merge pull request #93857 from kleonc/atlas-texture-fix-draw-rect-flipping-3x

Browse Source 
[3.x] Fix `AtlasTexture::draw_rect` flipping for non-zero margin
This commit is contained in:
lawnjelly
2024-07-02 11:58:39 +01:00
committed by GitHub
parent c2a43cb8bd 66d1ab0459
commit d500046684
2 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
scene/gui/texture_rect.cpp
View File

@ -93,15 +93,6 @@ void TextureRect::_notification(int p_what) {
} break; } break;
} }
Ref<AtlasTexture> p_atlas = texture;
if (p_atlas.is_valid() && region.has_no_area()) {
Size2 scale_size(size.width / texture->get_width(), size.height / texture->get_height());
offset.width += hflip ? p_atlas->get_margin().get_position().width * scale_size.width * 2 : 0;
offset.height += vflip ? p_atlas->get_margin().get_position().height * scale_size.height * 2 : 0;
}
size.width *= hflip ? -1.0f : 1.0f; size.width *= hflip ? -1.0f : 1.0f;
size.height *= vflip ? -1.0f : 1.0f; size.height *= vflip ? -1.0f : 1.0f;

17
scene/resources/texture.cpp
View File

@ -1013,20 +1013,13 @@ void AtlasTexture::draw_rect(RID p_canvas_item, const Rect2 &p_rect, bool p_tile
return; return;
} }
Rect2 rc = region; Rect2 src_rect = Rect2(0, 0, get_width(), get_height());
if (rc.size.width == 0) { Rect2 dst;
rc.size.width = atlas->get_width(); Rect2 src;
if (get_rect_region(p_rect, src_rect, dst, src)) {
atlas->draw_rect_region(p_canvas_item, dst, src, p_modulate, p_transpose, p_normal_map);
} }
if (rc.size.height == 0) {
rc.size.height = atlas->get_height();
}
Vector2 scale = p_rect.size / (region.size + margin.size);
Rect2 dr(p_rect.position + margin.position * scale, rc.size * scale);
atlas->draw_rect_region(p_canvas_item, dr, rc, p_modulate, p_transpose, p_normal_map);
} }
Texture::RefineRectResult AtlasTexture::refine_rect_region(Rect2 &r_dst_rect, Rect2 &r_src_rect) const { Texture::RefineRectResult AtlasTexture::refine_rect_region(Rect2 &r_dst_rect, Rect2 &r_src_rect) const {