[3.x] Bounds fixes in TextureAtlas import
#77428
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AThousandShips
force-pushed
the
atlas_mesh_fix_3_x
branch
from
831f79b
to
6affb2a
Compare
AThousandShips
commented
May 24, 2023
AThousandShips
commented
May 24, 2023
| @@ -129,7 +130,7 @@ static void _plot_triangle(Vector2 *vertices, const Vector2 &p_offset, bool p_tr | |||
| double dx_low = double(x[2] - x[1]) / (y[2] - y[1] + 1); | |||
| double xf = x[0]; | |||
| double xt = x[0] + dx_upper; // if y[0] == y[1], special case | |||
| int max_y = MIN(y[2], height - p_offset.y - 1); | |||
| int max_y = MIN(y[2], p_transposed ? (width - p_offset.x - 1) : (height - p_offset.y - 1)); | |||
There was a problem hiding this comment.
Required to not clip triangles that are transposed or they will be capped by the wrong dimension
AThousandShips
force-pushed
the
atlas_mesh_fix_3_x
branch
from
6affb2a
to
5f88c4e
Compare
AThousandShips
force-pushed
the
atlas_mesh_fix_3_x
branch
from
5f88c4e
to
e34619a
Compare
lawnjelly
approved these changes
Jun 11, 2023
|
@felaugmar would you mind testing again with the new method? |
Calinou
added
the
cherrypick:3.5
The artifact is already expired, but I think it'll work, the code change makes sense. |
|
Thanks! |
|
Thank you! |
|
Cherry-picked for 3.5.3. |
akien-mga
removed
the
cherrypick:3.5
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Partial backport of #68380, without any new properties, only ensures bounds are fixed, it also does not change the way the alpha threshold is managed, can add that here too if desired
3.x will still suffer from some of the issues in
BitMapsolved by #68732, will see if I can backport them separately