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

Show sound sources #1277

Merged
merged 29 commits into from
Aug 24, 2024
Merged

Show sound sources #1277

merged 29 commits into from
Aug 24, 2024

Conversation

chreden
Copy link
Owner

@chreden chreden commented Aug 17, 2024

Add sound sources to the viewer.
Add a sound sources window. Window also shows the sounds in the level (sound board) and allows user to play either a specific sound source sample or a sound from the board.
Attempts to load from MAIN.SFX if present in the same folder for TR2 and TR3.
Closes #1270

@chreden chreden changed the title Issue/1270 Show sound sources Aug 21, 2024
@chreden chreden self-assigned this Aug 21, 2024
@chreden chreden added this to the Next milestone Aug 21, 2024
@chreden chreden marked this pull request as ready for review August 22, 2024 22:38
Copy link
Collaborator

@lahm86 lahm86 left a comment

Choose a reason for hiding this comment

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

TR1, TR4 and TR5 look good to me. Classic TR2/3 both unfortunately crash as follows (but are fine when opening from a folder that doesn't have MAIN.SFX).

image

image

This doesn't happen if I open remastered files, so I assume it's a slight difference in the MAIN.SFX layout. I remember looking at this and put the hack below in place, but I promptly forgot about it as it's a rarely used utility.

https://github.com/LostArtefacts/TR-Rando/blob/master/SFXExport/Program.cs#L54

trlevel/Level.cpp Outdated Show resolved Hide resolved
@lahm86
Copy link
Collaborator

lahm86 commented Aug 23, 2024

Maybe a slight improvement (possibly a future task) would be to show when the sound data is not present in the level file. ID 304 isn't in the sound map in this level, but with the sample showing 0 it's sort of implied that it should be Lara's footsteps. Maybe some sort of indicator would be good here.

Screenshot 2024-08-23 104045

@chreden
Copy link
Owner Author

chreden commented Aug 23, 2024

TR1, TR4 and TR5 look good to me. Classic TR2/3 both unfortunately crash as follows (but are fine when opening from a folder that doesn't have MAIN.SFX).

image

image

This doesn't happen if I open remastered files, so I assume it's a slight difference in the MAIN.SFX layout. I remember looking at this and put the hack below in place, but I promptly forgot about it as it's a rarely used utility.

https://github.com/LostArtefacts/TR-Rando/blob/master/SFXExport/Program.cs#L54

Ah thanks. Might be a bit of an issue emulating that if (remaster) part...

If sample not present, indicate that.
Load classic main.sfx correctly.
Load psx sound details (not samples, can't find)
#1270
@chreden chreden merged commit fb8fdc1 into master Aug 24, 2024
1 check passed
@chreden chreden deleted the issue/1270 branch August 24, 2024 15:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Show sound sources
2 participants