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/output: fix clipping near objects #2004

Merged
merged 1 commit into from
Dec 12, 2024

Conversation

rr-
Copy link
Collaborator

@rr- rr- commented Dec 11, 2024

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

Resolves #2003.
Above: develop
Below: this PR
The disappearing doors issue is #2005.

output2.webm

@rr- rr- self-assigned this Dec 11, 2024
@rr- rr- requested review from a team as code owners December 11, 2024 18:49
@rr- rr- requested review from lahm86, walkawayy and aredfan and removed request for a team December 11, 2024 18:49
Copy link

github-actions bot commented Dec 11, 2024

@aredfan
Copy link
Collaborator

aredfan commented Dec 11, 2024

LGTM. This PR also fixes all the issues reported in #819 as well. 👍

There's a new issue with the Obelisk keys being partially buried in the drawbridges.

Edit: The sprites are also partially buried in the DOS version - which doesn't suffer from the clipping issue. It's an OG bug.

Sprite pickups

Dev snapshot
1 1 Dev
PR build
1 2 PR

3D pickups

Dev snapshot
2 1 PR
PR build
2 2 PR

@aredfan aredfan linked an issue Dec 11, 2024 that may be closed by this pull request
@rr- rr- added OG bug A bug in original game TR1 labels Dec 11, 2024
@rr- rr- force-pushed the issue-2003-depth-buffer-transforms branch from 09e5372 to a488833 Compare December 11, 2024 21:38
@rr-
Copy link
Collaborator Author

rr- commented Dec 11, 2024

@aredfan I've fixed an issue with the shadows reported on Discord. Let's tackle the Obelisk pickup positions separately.

@rr- rr- force-pushed the issue-2003-depth-buffer-transforms branch from a488833 to 339d433 Compare December 11, 2024 22:02
@aredfan
Copy link
Collaborator

aredfan commented Dec 11, 2024

Only found one new issue - Lara's shadow doesn't draw on drawbridges.

PR build
20241211_215558_Obelisk_of_Khamoon

Latest dev
20241211_215715_Obelisk_of_Khamoon

@lahm86
Copy link
Collaborator

lahm86 commented Dec 11, 2024

What a great improvement! 👍

There are a few z issues as below. I thought initially that the air and health bars were not showing at all, but you can see them when there is no geometry/texturing like against the sky in Valley.

image
image
image

image

@rr- rr- force-pushed the issue-2003-depth-buffer-transforms branch from 339d433 to 19f3afa Compare December 11, 2024 22:28
@rr-
Copy link
Collaborator Author

rr- commented Dec 11, 2024

@lahm86 fixed.

@aredfan The drawbridge in Obelisk is the only trapdoor/drawbridge in the game that has this issue.
I think it's because it has its origin point placed off-center – because Lara is forced to be placed on a multiple of click height due to the drawbridge floor function, the ever so slightly raised object is bound to occlude her shadow. Because of this let's tackle this problem in #2006 as it'll require injections anyway.
out

@rr- rr- merged commit 544faeb into develop Dec 12, 2024
7 checks passed
@rr- rr- deleted the issue-2003-depth-buffer-transforms branch December 12, 2024 11:12
@Richard-L
Copy link
Collaborator

Wow a good improvement!

@rr- just curious why the door in your comparison clip will eventually disappear still? Shouldn't it keep showing?

@aredfan
Copy link
Collaborator

aredfan commented Dec 12, 2024

@Richard-L The disappearing objects issue is currently captured in #2005, thus not fixed yet.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
OG bug A bug in original game TR1
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

Wrong depth buffer clipping Rendering issue with some statics and pushable blocks
4 participants