Skip to content

Add sample set displays & selection controls to editor#35430

Merged
peppy merged 10 commits intoppy:masterfrom
bdach:custom-sample-set-selection
Dec 18, 2025
Merged

Add sample set displays & selection controls to editor#35430
peppy merged 10 commits intoppy:masterfrom
bdach:custom-sample-set-selection

Conversation

@bdach
Copy link
Copy Markdown
Collaborator

@bdach bdach commented Oct 24, 2025

Below 20 custom sample sets, they are shown as ternary buttons.

2025-10-24.12-13-08.mov

Above 20 custom sample sets, they are shown in a dropdown (yes there are actual cases of this as I've been informed by the NAT; one example being this mapset, among other keysounded mapsets)

2025-10-24.12-14-05.mov

As a bonus, to make determining what the heck is actually changing when adjusting these controls, the full set of applicable sounds now plays on adding/removing additions, changing their banks, as well as changing the custom set (if any).

For now there are no user-facing controls to add the samples to the map yourself, you have to know how to name the files and edit-externally them in yourself. For now.


RFC. Further progress towards #35370.

bdach added 5 commits October 24, 2025 11:52
Longstanding complaint. Text boxes make no sense if anything that isn't
the three legacy values gets deleted on save anyway.
- Below 20 custom sample sets, they are shown as ternary buttons.
- Above 20 custom sample sets, they are shown in a dropdown (yes there
  are actual cases of this as I've been informed by the NAT; one example
  being https://osu.ppy.sh/beatmapsets/1018061#osu/2197383)

As a bonus, to make determining what the heck is actually changing when
adjusting these controls, the full set of applicable sounds now plays on
adding/removing additions, changing their banks, as well as changing the
custom set (if any).

For now there are no user-facing controls to add the samples to the map
yourself, you have to know how to name the `.wav`s and edit-externally
them in yourself. *For now.*
@bdach bdach self-assigned this Oct 24, 2025
@bdach bdach moved this from Next up to Pending Review in osu! team task tracker Oct 24, 2025
God does `dotnet format` make the `..` spread syntax just absolutely
unusable with its stupid inspections.
@ziv-vy
Copy link
Copy Markdown
Contributor

ziv-vy commented Oct 26, 2025

I know that this shouldn't be the place this is discussed, but there is no linked issue or discussions thread (edit: that would propose a design).

I have no clue what is going on here. I think there may be too many toggles and it would seriously hurt the accessibility of the editor. Could the team reconsider and put this behind some kind of advanced mode, or redesign this altogether?

@bdach
Copy link
Copy Markdown
Collaborator Author

bdach commented Oct 26, 2025

@ziv-vy there is a linked issue actually just at the end of my opening post

anyway read #29280

I'm not even done with this feature and you're free to not even use the sample set feature, none of those new toggles or dropdowns appear if you don't have custom samples in the beatmap

@minetoblend
Copy link
Copy Markdown
Contributor

minetoblend commented Oct 30, 2025

I gave this a little test drive and UI wise I really like it.

Only thing I noticed is that I think the preview samples are going off multiple times per button click.
When you click one of the sample buttons multiple times it sounds slightly different on the first click, likely as a result of this.

I recorded a video of it with all other ui sounds muted & log statements for each sample playback. I'm pretty sure only SampleEditPopover.playDemoSample actually produces a sound though, as SampleSetTernaryButton.DemoSamples appears to never be assigned.

2025-10-30.23-26-27.mp4

Beatmap I noticed this on (first couple notes of top diff): https://osu.ppy.sh/beatmapsets/2412260#osu/5238579
It's a lot less (or even not at all) audible on other maps I've tried to replicate it with.

@bdach
Copy link
Copy Markdown
Collaborator Author

bdach commented Oct 31, 2025

Only thing I noticed is that I think the preview samples are going off multiple times per button click. When you click one of the sample buttons multiple times it sounds slightly different on the first click, likely as a result of this.

Probably fixed in 8755a01?

SampleSetTernaryButton.DemoSamples appears to never be assigned.

That shouldn't even exist, I forgot to remove it. Removed in 901044d.

@minetoblend
Copy link
Copy Markdown
Contributor

minetoblend commented Oct 31, 2025

The demo sample plays normally for me now. One more small thing I just noticed is that the default button click sounds are muted on the sample index buttons but the addition toggles still play them, which is far louder than most beatmap samples.

@peppy peppy self-requested a review December 18, 2025 07:39
The new ones added in this change don't play the UI sounds, likely
because they make it nigh impossible to actually hear what the gameplay
samples will sound like.

This removes the same sounds from the existing buttons to match.
@peppy peppy enabled auto-merge December 18, 2025 11:21
@peppy
Copy link
Copy Markdown
Member

peppy commented Dec 18, 2025

The demo sample plays normally for me now. One more small thing I just noticed is that the default button click sounds are muted on the sample index buttons but the addition toggles still play them, which is far louder than most beatmap samples.

Fixed this before I noticed your comment 🙃 13aeed1

@peppy peppy disabled auto-merge December 18, 2025 12:01
@peppy peppy merged commit 897cb2c into ppy:master Dec 18, 2025
7 of 8 checks passed
@github-project-automation github-project-automation bot moved this from Pending Review to Done in osu! team task tracker Dec 18, 2025
@bdach bdach deleted the custom-sample-set-selection branch December 18, 2025 12:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

4 participants