-
Notifications
You must be signed in to change notification settings - Fork 565
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Get Flat Icon Fixes #4505
Merged
harryob
merged 3 commits into
cmss13-devs:master
from
Drulikar:Drathek_GetFlatIcon_Fixes
Oct 4, 2023
Merged
Get Flat Icon Fixes #4505
harryob
merged 3 commits into
cmss13-devs:master
from
Drulikar:Drathek_GetFlatIcon_Fixes
Oct 4, 2023
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
Drulikar
added
the
Testmerge Candidate
we'll test this while you're asleep and the server has 10 players
label
Sep 25, 2023
This was referenced Sep 25, 2023
3 tasks
3 tasks
This was referenced Sep 29, 2023
3 tasks
morrowwolf
suggested changes
Sep 30, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So I'm not 100% on how the changes are working but would it be possible to put the more expensive stuff that's only needed for some things behind an argument or similar?
3 tasks
3 tasks
harryob
approved these changes
Oct 4, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Fix
Fix one bug, make ten more
Testmerge Candidate
we'll test this while you're asleep and the server has 10 players
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.
About the pull request
This PR fixes two issues with getFlatIcon: It failing to properly resize its template dimensions to whatever icon dimensions it was passed, and it ignoring appearance_flags for RESET_COLOR and RESET_ALPHA. This was done to address issues with #4475 but can be even more performance costly than it already was because now it applies color and alpha blends per overlay/underlay layer rather than once per recursive call if there is a color/alpha to apply.
Explain why it's good for the game
Fixes the broader potential uses for getFlatIcon such as flattening the tacmap.
Testing Photographs and Procedure
Screenshots & Videos
Example of tacmap flattened prior to dimension fixes:
Example of tacmap flatted prior to color fixes:
Example of tacmap properly flattened:
Changelog
🆑 Drathek
fix: Fix getFlatIcon not resizing its template nor respect appearance_flags of RESET_COLOR and RESET_ALPHA
/:cl: