Skip to content
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

tr1/data: fix mesh positions in Obelisk of Khamoon #2008

Merged
merged 1 commit into from
Dec 12, 2024

Conversation

lahm86
Copy link
Collaborator

@lahm86 lahm86 commented Dec 12, 2024

Resolves #2006.

Checklist

  • I have read the coding conventions
  • I have added a changelog entry about what my pull request accomplishes, or it is an internal change

Description

This fixes the angle of the drawbridge when open so that Lara's shadow isn't occluded and the artefacts aren't embedded. The open door will also extend fully to the wall. The artefact holder mesh is also shifted down slightly to avoid its texture clashing with the bridge, and it's also pushed against the wall. The caveat is that pickups are slightly above the holder mesh, but should be exactly on the open bridge. I can't see a workaround for this as with the mesh in its original position, the texture pushes through the open bridge.

In room 57, the senet table is also lifted and the toppled chair is lowered.

The "frame edit" addition to the injector is a temporary measure, once we have a new file structure in place (and the changes to the engine in line with this) this will become neater and more general purpose. Currently you could only edit the first rotation of the first frame of an animation.

Ref: LostArtefacts/TRXInjectionTool#17

@lahm86 lahm86 added OG bug A bug in original game Data Requires injecting content / files that are not a part of the original game TR1 labels Dec 12, 2024
@lahm86 lahm86 self-assigned this Dec 12, 2024
@lahm86 lahm86 requested review from a team as code owners December 12, 2024 14:38
@lahm86 lahm86 requested review from rr-, walkawayy and aredfan and removed request for a team December 12, 2024 14:38
Copy link

github-actions bot commented Dec 12, 2024

This fixes the angle of the drawbridge in Obelisk of Khamoon when open
so that Lara's shadow isn't occluded and the artefacts aren't
embedded. It also lifts the senet table and lowers the toppled chair in
room 57. The toppled chair is also fixed in Return to Egypt and Temple
of the Cat.

Resolves LostArtefacts#2006.
@lahm86 lahm86 force-pushed the issue-2006-obelisk-mesh-fixes branch from 54b9ddc to 7e7dac5 Compare December 12, 2024 15:12
@lahm86
Copy link
Collaborator Author

lahm86 commented Dec 12, 2024

Updated to fix the chair in Return to Egypt and Temple of the Cat.

Copy link
Collaborator

@aredfan aredfan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, and thank you for going the extra mile to fix the TRUB issues. 👍

Copy link
Collaborator

@rr- rr- left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great! Thank you.

@lahm86 lahm86 merged commit f1a6d10 into LostArtefacts:develop Dec 12, 2024
6 checks passed
@lahm86 lahm86 deleted the issue-2006-obelisk-mesh-fixes branch December 12, 2024 18:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Data Requires injecting content / files that are not a part of the original game OG bug A bug in original game TR1
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

OG bug: Obelisk keys are positioned slightly too low
4 participants