fix for day/night textures#2853
Merged
leggettc18 merged 13 commits intoHarbourMasters:develop-spockfrom May 10, 2023
Merged
Conversation
added 2 commits
May 7, 2023 21:42
Contributor
Author
|
turns out the fix isn't working, i think the super hacky first fix for lon lon windows and deku tree entrance was |
Contributor
Author
|
went back to the hacky fix that works, if someone can come up with a better fix that'd be cool, but if not i'd rather have the hacky fix in than no fix |
Archez
approved these changes
May 10, 2023
Contributor
Archez
left a comment
There was a problem hiding this comment.
Hacky solution works for me (knowing that we will revisit MQ texture handling as a whole later on).
Only other suggestion I can give is maybe using a macro/helper func to handle the multiple if mq mqTex else vanillaTex
leggettc18
approved these changes
May 10, 2023
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
#2764 and #2803 were causing corruption when using hd textures.
this updates all of the places where
gSPSegmentwas switched to usegSPSegmentLoadResin those PRs to instead manually check for MQ, and then callgSPSegmentwith the MQ version of the path.this is not accomplished in a clean way, the hackiness of the solution exists in
mq_asset_hacks.hi tried to find a clean solution but couldn't find one that would work with both:
i found the best way to verify both work is by having an hd textures otr generated using a
manifest.jsonfile made using only an mq otr.Build Artifacts