tr1/inject: improve texture injection performance #2414
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
This removes texture packing from the injection process. We instead inject the individual pages that come with the injections (which are packed individually anyway). Packing will later be re-introduced for unoptimized page groups only, but this is dependent on a format refactor.
This replaces the full model swap for the first door in Colosseum with a frame rotation fix, which is all that is needed. This reduces the number of texture pages needed.
lahm86
requested review from
rr-,
walkawayy and
aredfan
and removed request for
a team
|
Download the built assets for this pull request: |
aredfan
approved these changes
Jan 29, 2025
rr-
approved these changes
Jan 29, 2025
That's still in the packer module, but unused as TR1 is promoted to 32-bit on read, and we expand the base palette if needed in the injection module (still TR1 only). Once TR2 injections are up to speed we'll certainly use the matching for 8-bit again. |
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.
Checklist
Description
This removes texture packing from the injection process. We instead inject the individual pages that come with the injections (which are packed optimally anyway, albeit with respect to themselves only). Packing will be re-introduced for unoptimized page groups at a later date when we overhaul the injection format.
I've also replaced the Colosseum door fix with a simple frame rotation adjustment, rather than replacing the full model. This in turn means one less texture page is injected here. Ref #1288 and LostArtefacts/TRXInjectionTool#23.