output: handle common lighting in TRX #2358
Conversation
lahm86
requested review from
rr-,
walkawayy and
aredfan
and removed request for
a team
|
Download the built assets for this pull request: |
lahm86
force-pushed
the
refactor-lights
branch
from
364d07b to
be73e11
Compare
|
^ Fixed a stale include |
|
I found an issue - I think Lara's lighting in one of the dark rooms in TRUB looks incorrect: PR build: Recent dev snapshot: |
lahm86
force-pushed
the
refactor-lights
branch
from
be73e11 to
10208f3
Compare
|
Thank you @aredfan. I'm hoping that should be fixed now. I'll do some further extensive tests myself as well, but pushed the build for you to check. |
|
She looks almost better in the second screen to me? |
There was a problem hiding this comment.
Thank you @aredfan. I'm hoping that should be fixed now. I'll do some further extensive tests myself as well, but pushed the build for you to check.
Anytime, and thank you for pushing a new build. I can confirm the issue is fixed. 👍
The flat lighting on Lara can also happen in certain rooms in OG - namely rooms 21/42. It seems your fix also fixed those rooms as well.
This changes the signature for adding dynamic light to accept XYZ_32 rather than separator coordinates.
This removes the global dynamic light count and moves it to output module scope, introducing a function instead to reset it as needed.
This changes the signature for calculating light to accept XYZ_32 rather than separator coordinates.
This changes the signatures for calculating light to accept XYZ_32 rather than separator coordinates.
This names the various room light modes that exist in TR2.
This removes the unused second ambient on TR2 rooms, renames the first ambient to match TR1, and adds the light mode property to TR1, defaulting to normal.
This introduces a SHADE struct for items and static meshes, and a FALLOF struct for lights to allow easier handling in common logic between TR1 and TR2.
This makes TR1 room vertices more in line with TR2.
lahm86
force-pushed
the
refactor-lights
branch
from
612d8d6 to
19095e3
Compare
This moves common lighting functions to TRX. This temporarily introduces some helper functions to access TR2 specifics, like shade tables, while the module remains split. These can later be eliminated.
lahm86
force-pushed
the
refactor-lights
branch
from
19095e3 to
be1edd9
Compare
|
This should be resolved now. I've split some of the logic out into their own functions to make reading @aredfan Sorry to be a pain, but would you mind checking TR1 and TR2 again? |
Checklist
Description
This shifts (most) lighting output handling to TRX. Dynamic lighting is technically now supported in TR1, but we don't call it anywhere yet: I thought it would be best to check over this change first. Dynamic lights are handled in three slightly different ways, hence the move now to standardize the shared logic.
There are a couple of temporary public functions while the modules remain split - fog calculation and accessing the TR2 shade tables. Otherwise, I've standardized most struct properties, such as shades, vertex info etc to make things easier to manage. TR1 will default where applicable.
I carried out some logging of generated output values while a demo runs between develop and this branch, and values are identical. For testing, room lighting, game object lighting (Lara, enemies, pickups, doors etc) and static mesh lighting should be as it currently is in both games.