osu-lazer

Fix several issues with incorrect sample playback (#35685 )

* Add failing test coverage for layered hit samples not playing in mania when beatmap is converted

Adding the `osu.Game.Rulesets.Osu` reference to the mania test project
is required so that `HitObjectSampleTest` base logic doesn't die on

https://github.com/ppy/osu/blob/f0aeeeea966f06add12cf2bca3dd48dac8573e82/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs#L88-L91

* Fix layered hit sounds not playing on converted beatmaps in mania

Compare
https://github.com/peppy/osu-stable-reference/blob/f9e58b4864a10f801393199e7652b2192c7342c3/osu!/GameplayElements/HitObjects/HitObject.cs#L476-L477.

In case of converted beatmaps, the last condition there
(`BeatmapManager.Current.PlayMode != PlayModes.OsuMania`) fails,
and thus layered hitsounds are allowed to play.

* Add failing test coverage for mania beatmap conversion assigning wrong samples to spinners

* Fix mania beatmap conversion assigning wrong samples to spinners

A spinner is never `IHasRepeats`. It was a dead condition, leading to
the hitobject generating fallback `NodeSamples`, which in particular
feature a silent tail which stable doesn't do.

Noticeably, stable also appears to force the head of the generated hold
note to have no addition sounds:

https://github.com/peppy/osu-stable-reference/blob/f9e58b4864a10f801393199e7652b2192c7342c3/osu!/GameplayElements/HitObjects/Mania/SpinnerMania.cs#L86-L89

* Add failing test coverage for file hit sample not falling back to plain samples if file missing

* Allow `FileHitSampleInfo` to fall back to standard samples if the file is not found (or not allowed to be looked up)

I'm honestly not 100% as to how closely this matches stable because I
reached the point wherein I'd rather not look at stable code anymore, so
as long as this passes tests I'm fine to wait for someone else to report
new breakage.

* Use alternative workaround for lack of osu! ruleset assembly in mania test project

* Fix encode stability test failures

Bartłomiej Dach · 2025-11-15 16:19:08 +09:00

bd4ed49c06

Adjust gameplay sample models to support custom sample sets

This is a set of model changes which is supposed to facilitate support
for custom sample sets to the beatmap editor that is on par with stable.

It is the minimal set of changes. Because of this, it can probably be
considered "ugly" or however else you want to put it - but before you
say that, I want to try and pre-empt that criticism by explaining where
the problems lie.

Problem #1: duality in sample models
---

There is currently a weird duality of what a `HitObject`'s samples will
be.

- If an object has just been placed in the editor, and not saved /
  decoded yet, it will use `HitSampleInfo`.

- If an object has already been encoded to the beatmap at least once, it
  will use `ConvertHitObjectParser.LegacyHitSampleInfo`.

As long as that state of affairs remains, `HitSampleInfo` must be able
to represent anything that `LegacyHitSampleInfo` can, if feature parity
is to be achieved.

Problem 2: The 0 & 1 sample banks
---

Custom sample banks of 2 and above are a pretty clean affair. They map to
a suffix on the sample filename, and said samples are allowed to be
looked up from the beatmap skin. `Suffix` already exists in
`HitSampleInfo`.

However, the 1 custom sample bank is evil. It uses *non-suffixed*
samples, *allows lookups from the beatmap skins*, contrary to no bank /
bank 0, which *also* uses non-suffixed samples, but *doesn't* allow them
to be looked up from the beatmap skin.

This is why `HitSampleInfo.UseBeatmapSamples` has been called to
existence - without it there is no way to represent the ability of using
or not using the beatmap skin assets.

As has been stated previously in discussions about this feature, it's
both a *mapping* and a *skinning* concern.

There are many things you could do about either of these problems, but I
am pretty sure tackling either one is going to take *many* more lines of
code than this commit does. Which is why this is the starting point of
negotiation.

Bartłomiej Dach · 2025-10-22 14:58:08 +02:00

c361e6d3c2

Merge pull request #32098 from bdach/dont-drop-green-line-sample-bank

Attempt to preserve sample control point bank when encoding beatmap

Dean Herbert · 2025-03-04 18:32:16 +09:00

d9162daac2

Limit beatmap encoder & decoder to at most 8 combo colours

Bartłomiej Dach · 2025-02-26 11:13:57 +01:00

2167c7b8d5

Attempt to preserve sample control point bank when encoding beatmap

This was reported internally in
https://discord.com/channels/90072389919997952/1259818301517725707/1343470899357024286.
The issue described was that sample specifications on control points in
stable disappeared after the beatmap was updated from lazer.

The reason why the sample specifications were getting dropped is that
they got lost in the logic that attempts to translate per-hitobject
samples that lazer has back into stable "green line" type control
points. That process only attempted to preserve volume and custom sample
bank, but did not keep the standard bank - likely because it's kind of
superfluous information *for correct sample playback of the objects*, as
the samples get encoded again for each object individually. However
dropping this information makes for a subpar editing experience.

The choice of which sample to pick the bank from is sort of arbitrary
and I'm not sure if there's a correct one to pick. Intuitively picking
the normal sample's bank (if there is one) seems most correct.

Bartłomiej Dach · 2025-02-25 15:39:35 +01:00

65a62d5440

Move implicit slider path segment handling logic to Bezier converter

The logic in `LegacyBeatmapEncoder` that was supposed to handle
the lazer-exclusive feature of supporting multiple slider segment types
in a single slider was interfering rather badly with the Bezier
converter. Generally it was a bit difficult to follow, too.

The nice thing about `BezierConverter` is that it is *guaranteed* to
only output Bezier control points. In light of this, the same double-up-
-the-control-point logic that was supposed to make multiple slider
segment types backwards-compatible with stable can be placed in
the Bezier conversion logic, and be *much* more understandable, too.

Bartłomiej Dach · 2025-01-30 14:03:51 +01:00

749704344c

Move bookmarks out of BeatmapInfo

Not sure why I didn't do that in https://github.com/ppy/osu/pull/28473...

Bartłomiej Dach · 2024-12-03 14:17:14 +01:00

808934581f

Merge branch 'master' into beatmap-info-purge

Dean Herbert · 2024-11-22 18:47:32 +09:00

086a34f5c0

Fix effect point scroll speeds below 0.1x not being encoded properly

Closes https://github.com/ppy/osu/issues/30472.

Caused by mismatching bounds between

	https://github.com/ppy/osu/blob/2bd12e14dbc7fd6fe29c6db53923c7da1d4b7557/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs#L22-L26

and

	https://github.com/ppy/osu/blob/2bd12e14dbc7fd6fe29c6db53923c7da1d4b7557/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs#L21-L28

Bartłomiej Dach · 2024-11-05 11:56:19 +01:00

23f3890293

Implement auto additions editor-only

OliBomby · 2024-10-01 16:40:48 +09:00

0a78eb9628

Merge branch 'master' into beatmap-info-purge

Dean Herbert · 2024-09-15 04:53:35 +09:00

58fe502af4

fix last anchor converting to implicit segment

OliBomby · 2024-08-16 14:24:03 +02:00

4cc38cea63

Merge branch 'master' into beatmap-info-purge

Dean Herbert · 2024-07-23 12:09:32 +09:00

d707e29ff7

Do not add extra sample control point after end of IHasRepeats objects

Bartłomiej Dach · 2024-07-02 09:13:07 +02:00

d4a8f6c8b0

Fix test failures

Bartłomiej Dach · 2024-06-26 16:56:43 +02:00

847946937e

Fix slider tail volume not saving

Closes https://github.com/ppy/osu/issues/28587.

As outlined in the issue thread, the tail volume wasn't saving because
it wasn't actually attached to a hitobject properly, and as such the
`LegacyBeatmapEncoder` logic, which is based on hitobjects, did not
pick them up on save.

To fix that, switch to using `NodeSamples` for objects that are
`IHasRepeats`. That has one added complication in that having it work
properly requires changes to the decode side too. That is because the
intent is to allow the user to change the sample settings for each node
(which are specified via `NodeSamples`), as well as "the rest of the
object", which generally means ticks or auxiliary samples like
`sliderslide` (which are specified by `Samples`).

However, up until now, `Samples` always queried the control point
which was _active at the end time of the slider_. This obviously can't
work anymore when converting `NodeSamples` to legacy control points,
because the last node's sample is _also_ at the end time of the slider.
To bypass that, add extra sample points after each node (just out of
reach of the 5ms leniency), which are supposed to control volume of
ticks and/or slides.

Upon testing, this *sort of* has the intended effect in stable, with
the exception of `sliderslide`, which seems to either respect or _not_
respect the relevant volume spec dependent on... not sure what, and not
sure I want to be debugging that. It might be frame alignment, or it
might be the phase of the moon.

Bartłomiej Dach · 2024-06-26 15:52:16 +02:00

fff27e619d

Move CountdownOffset out of BeatmapInfo

Bartłomiej Dach · 2024-06-12 14:15:00 +02:00

dd50d6fa6e

Move Countdown out of BeatmapInfo

Bartłomiej Dach · 2024-06-12 14:15:00 +02:00

d373f752d6

Move TimelineZoom out of BeatmapInfo

Bartłomiej Dach · 2024-06-12 14:15:00 +02:00

7f2a6f6f5a

Move GridSize out of BeatmapInfo

Bartłomiej Dach · 2024-06-12 14:15:00 +02:00

6685c5ab74

Move DistanceSpacing out of BeatmapInfo

Bartłomiej Dach · 2024-06-12 14:14:58 +02:00

3634307d7c

Move SamplesMatchPlaybackRate out of BeatmapInfo

Bartłomiej Dach · 2024-06-12 13:32:23 +02:00

c216283bf4

Move EpilepsyWarning out of BeatmapInfo

Bartłomiej Dach · 2024-06-12 13:28:41 +02:00

f64a0624a5

Move WidescreenStoryboard out of BeatmapInfo

Bartłomiej Dach · 2024-06-12 13:23:53 +02:00

1ab86ebd24

Move LetterboxInBreaks out of BeatmapInfo

Bartłomiej Dach · 2024-06-12 13:18:44 +02:00

a6b7600bf2

Move SpecialStyle out of BeatmapInfo

Bartłomiej Dach · 2024-06-12 13:12:30 +02:00

011c2e3651

Move StackLeniency out of BeatmapInfo

Bartłomiej Dach · 2024-06-12 13:04:33 +02:00

0a4560a03e

Move AudioLeadIn out of BeatmapInfo

Bartłomiej Dach · 2024-06-12 13:04:28 +02:00

4339e2dc4a

Preserve storyboard events when saving a beatmap in the editor

Until we have full encoding support for storyboards, this stop-gap
measure ensures that storyboards don't just disappear from existence.

Dean Herbert · 2024-04-30 00:01:56 +08:00

fd3f4a9e7b

Move constant local to taiko

Dean Herbert · 2023-12-06 15:59:34 +09:00

1b50d1011a

Fix incorrect slider velocity being written on export for osu!taiko beatmaps

Dean Herbert · 2023-12-06 15:59:34 +09:00

b5bae566c2

Fix code style/quality issues

cs · 2023-11-13 08:25:27 +01:00

fa976a5aa0

CI Fixup

cs · 2023-11-11 15:02:06 +01:00

54b8244a18

Generalize Bezier curves to BSplines of Nth degree

Thomas Müller-Höhne · 2023-11-11 13:32:53 +01:00

926636cc03

Rename SliderVelocity to SliderVelocityMultiplier to distinguish from Velocity

Dean Herbert · 2023-09-06 19:01:08 +09:00

1a37543d28

Apply NRT to osu.Game.Betamaps.Formats namespace

Dean Herbert · 2023-08-16 19:37:24 +09:00

49fc9655d2

Fix remaining obvious CI inspections

Bartłomiej Dach · 2023-06-24 16:07:01 +02:00

e3a89a6273

Merge branch 'master' into sample-set-controls

Dean Herbert · 2023-05-24 14:03:04 +09:00

298989ffd2

Move struct to bottom of file

Dean Herbert · 2023-05-03 13:33:31 +09:00

f930c4bd0a

remove all redundancies from encoded control points

OliBomby · 2023-05-01 16:53:38 +02:00

8c21fddb5e

dont encode custom sample bank for objects without legacy samples

OliBomby · 2023-05-01 14:56:29 +02:00

8302bb1f37

dont assign custom sample bank and volume to hitobjects in non-mania gamemodes

this makes it easier to edit hitsounds in the stable editor after export because the sample control point effects wont get overwritten by the properties of the hitobject

OliBomby · 2023-05-01 12:31:27 +02:00

cef9f73d34

fix legacy encoder writing sample info while not writing node samples

OliBomby · 2023-04-30 17:46:47 +02:00

139a1d7e6d

remove all regular usage of DifficultyControlPoint

OliBomby · 2023-04-26 17:55:38 +02:00

c44f71a737

fix invalidoperation exception

OliBomby · 2023-04-26 14:28:48 +02:00

5accb05f45

remove hitobject SampleControlPoint usage from LegacyBeatmapEncoder