camera: move cinematic frame data to TRX #2429
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 moves CINE_FRAME to TRX from TR2 and updates TR1 to use this struct (identical to CINE_CAMERA previously).
This moves CINE_POSITION to TRX from TR1 and updates TR2 to use this struct. It now has a full XYZ_16 for rotations, although arguably only Y is used.
This moves g_CineTargetAngle into CINE_POSITION for TR2 only.
This introduces a common cine data container for frames. This will later be made local to the camera.
This replaces the global g_CinePos with positional data within CINE_DATA itself, reducing the need for an extra struct definition and variable.
This moves cinematic frames into a new common camera cinematic module; they should only be changed on level reading. This also adds checks to TR2 in case there are no frames and a cinematic is loaded. Resolves LostArtefacts#2413.
This shifts cine frame reading to TRX.
This replaces the global cine data with an accessor.
This introduces a utility function for invoking an in-game cinematic to reduce some code repetition.
lahm86
requested review from
rr-,
walkawayy,
aredfan and
a team
and removed request for
a team
|
Download the built assets for this pull request: |
aredfan
approved these changes
Feb 2, 2025
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.
Resolves #2413.
Checklist
Description
This moves cinematic frame and cutscene globals to TRX. It also extends the fix for #2413 into TR2, which I've tested by removing the frames in the OG levels.
For testing, we can check the cutscenes and all in-game cinematics are working (scion, Midas hand, Rig start, dragon dagger, HSH start/end).