h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-28 20:40:46 +08:00
Code Issues Releases Wiki Activity

Refactor distance-between-panels implementation

Browse Source 
The new version wasn't really working as expected, because the Y
position measurement only considered visible panels, while it was being
divided over all panels (including non-expanded groups or sets).

Rather than trying to divide across all panels, just choose a sane
number for the "highest pitch" sound and work with that as a constant.
This commit is contained in:
Dean Herbert
2025-06-30 16:21:41 +09:00
Unverified
parent bf8b6754dc
commit d7b7640055
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Screens/SelectV2/BeatmapCarousel.cs
+6 -6
View File
@@ -672,7 +672,7 @@ namespace osu.Game.Screens.SelectV2
ScheduleAfterChildren(() =>
{
if (selectionBefore != null && CurrentSelectionItem != null)
playSpinSample(distanceBetween(selectionBefore, CurrentSelectionItem), carouselItems.Count);
playSpinSample(visiblePanelCountBetweenItems(selectionBefore, CurrentSelectionItem));
});
return true;
@@ -794,9 +794,9 @@ namespace osu.Game.Screens.SelectV2
previouslyVisitedRandomBeatmaps.Remove(beatmapInfo);
if (CurrentSelectionItem == null)
playSpinSample(0, carouselItems.Count);
playSpinSample(0);
else
playSpinSample(distanceBetween(previousBeatmapItem, CurrentSelectionItem), carouselItems.Count);
playSpinSample(visiblePanelCountBetweenItems(previousBeatmapItem, CurrentSelectionItem));
}
RequestSelection(previousBeatmap);
@@ -806,15 +806,15 @@ namespace osu.Game.Screens.SelectV2
return false;
}
private double distanceBetween(CarouselItem item1, CarouselItem item2) => Math.Ceiling(Math.Abs(item1.CarouselYPosition - item2.CarouselYPosition) / PanelBeatmapSet.HEIGHT);
private double visiblePanelCountBetweenItems(CarouselItem item1, CarouselItem item2) => Math.Ceiling(Math.Abs(item1.CarouselYPosition - item2.CarouselYPosition) / PanelBeatmapSet.HEIGHT);
private void playSpinSample(double distance, int count)
private void playSpinSample(double distance)
{
var chan = spinSample?.GetChannel();
if (chan != null)
{
chan.Frequency.Value = 1f + Math.Min(1f, distance / count);
chan.Frequency.Value = 1f + Math.Clamp(distance / 200, 0, 1);
chan.Play();
}