diff options
author | RĂ©mi Verschelde <remi@verschelde.fr> | 2021-11-18 17:40:19 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-18 17:40:19 +0100 |
commit | 84f59c60b07308a562b9c4bf79ca2d4d1fddb7a6 (patch) | |
tree | ba63ebbaf5684fa59cdf5ca3ed14dd33311eda80 | |
parent | fa11b459619cff391a38cbe3f21158f387a22556 (diff) | |
parent | 9432efb7d0605e74ee04e34830dba17ddfa6715b (diff) |
Merge pull request #55095 from Giwayume/bugfix/atlas_cutoff_master
Fix texture atlas generation when source sprite is larger than generated atlas
-rw-r--r-- | editor/import/resource_importer_texture_atlas.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/editor/import/resource_importer_texture_atlas.cpp b/editor/import/resource_importer_texture_atlas.cpp index 1d59c3627d..3fdf5dd9db 100644 --- a/editor/import/resource_importer_texture_atlas.cpp +++ b/editor/import/resource_importer_texture_atlas.cpp @@ -134,7 +134,7 @@ static void _plot_triangle(Vector2i *vertices, const Vector2i &p_offset, bool p_ int max_y = MIN(y[2], height - p_offset.y - 1); for (int yi = y[0]; yi < max_y; yi++) { if (yi >= 0) { - for (int xi = (xf > 0 ? int(xf) : 0); xi < (xt < width ? xt : width - 1); xi++) { + for (int xi = (xf > 0 ? int(xf) : 0); xi < (xt < src_width ? xt : src_width - 1); xi++) { int px = xi, py = yi; int sx = px, sy = py; sx = CLAMP(sx, 0, src_width - 1); @@ -156,7 +156,7 @@ static void _plot_triangle(Vector2i *vertices, const Vector2i &p_offset, bool p_ p_image->set_pixel(px, py, color); } - for (int xi = (xf < width ? int(xf) : width - 1); xi >= (xt > 0 ? xt : 0); xi--) { + for (int xi = (xf < src_width ? int(xf) : src_width - 1); xi >= (xt > 0 ? xt : 0); xi--) { int px = xi, py = yi; int sx = px, sy = py; sx = CLAMP(sx, 0, src_width - 1); |