[3.x] Sprite3D/AnimatedSprite3D Fix drawing AtlasTextures with vertical margins differently than in 2D
#66063
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
kleonc
added
the
cherrypick:3.5
|
Marking for cherry-pick as it's a bugfix but note it's possible that some users use these only in 3D and thus they could have setup things according to the previous buggy behavior. Meaning if someone uses AtlasTextures with vertical margins (so I'd guess not so common case) and has tweaked some settings (like |
akien-mga
approved these changes
Sep 20, 2022
|
Thanks! |
|
Cherry-picked for 3.5.2 |
timothyqiu
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.
Fixes #63520.
The actual fix is a single line of code added in the second commit, I've explained it in the comments. Exactly what I suggested in #63520 (comment) (took me that long as I somehow forgot about it).
The first commit is moving common/duplicated drawing code from
Sprite3D/AnimatedSprite3DtoSpriteBase3D. DrawingSprite3D/AnimatedSprite3Dis the same besides the part determining what texture and rects to use.If doing so is not desired I guess I can instead just add the exact same changes from the second commit to the
Sprite3D/AnimatedSprite3Dseparately (making the duplicated code even longer). Or if separate PRs are desired I could split that too.BTW currently drawing nested AtlasTextures (an
AtlasTexturehaving itsatlasset to anotherAtlasTexture) doesn't work forSprite3D/AnimatedSprite3D(works for 2D counterparts) so the fix was obviously not tested for such cases. Supporting such nesting is for potential future PRs.Some examples for animated sprites 2D/3D (didn't bother about texture import settings):
SpriteBase3DVerticalMarginBug.zip
(3.5.stable)
(this PR)
MRP from #63520.zip
(3.5.stable)
(this PR)
offset = (30, 150)(debug border drawn in script)
offset = (30, 150)(debug border drawn in script)
offset = (30, 100)(changed by the user to visually match 2D case)
offset = (30, 150)offset = (30, 150)