h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-14 02:22:56 +08:00
Code Issues Releases Wiki Activity

Merge pull request #21112 from peppy/song-select-transition-improvement

Browse Source 
Improve song select transition to gameplay
This commit is contained in:
Salman Ahmed 2022-11-08 04:15:43 +03:00 committed by GitHub
commit 5566512f0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 53 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
osu.Game/Screens/Select/BeatmapCarousel.cs
View File

@ -770,6 +770,26 @@ namespace osu.Game.Screens.Select
{ {
updateItem(item); updateItem(item);
if (!item.Item.Filtered.Value)
{
bool isSelected = item.Item.State.Value == CarouselItemState.Selected;
// Cheap way of doing animations when entering / exiting song select.
const double half_time = 50;
const float panel_x_offset_when_inactive = 200;
if (isSelected || AllowSelection)
{
item.Alpha = (float)Interpolation.DampContinuously(item.Alpha, 1, half_time, Clock.ElapsedFrameTime);
item.X = (float)Interpolation.DampContinuously(item.X, 0, half_time, Clock.ElapsedFrameTime);
}
else
{
item.Alpha = (float)Interpolation.DampContinuously(item.Alpha, 0, half_time, Clock.ElapsedFrameTime);
item.X = (float)Interpolation.DampContinuously(item.X, panel_x_offset_when_inactive, half_time, Clock.ElapsedFrameTime);
}
}
if (item is DrawableCarouselBeatmapSet set) if (item is DrawableCarouselBeatmapSet set)
{ {
foreach (var diff in set.DrawableBeatmaps) foreach (var diff in set.DrawableBeatmaps)

50
osu.Game/Screens/Select/SongSelect.cs
View File

@ -89,6 +89,8 @@ namespace osu.Game.Screens.Select
protected BeatmapCarousel Carousel { get; private set; } protected BeatmapCarousel Carousel { get; private set; }
private ParallaxContainer wedgeBackground;
protected Container LeftArea { get; private set; } protected Container LeftArea { get; private set; }
private BeatmapInfoWedge beatmapInfoWedge; private BeatmapInfoWedge beatmapInfoWedge;
@ -165,10 +167,12 @@ namespace osu.Game.Screens.Select
{ {
new Drawable[] new Drawable[]
{ {
new ParallaxContainer wedgeBackground = new ParallaxContainer
{ {
ParallaxAmount = 0.005f, ParallaxAmount = 0.005f,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Child = new WedgeBackground Child = new WedgeBackground
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
@ -609,9 +613,15 @@ namespace osu.Game.Screens.Select
} }
} }
this.FadeIn(250); LeftArea.MoveToX(0, 400, Easing.OutQuint);
LeftArea.FadeIn(100, Easing.OutQuint);
this.ScaleTo(1, 250, Easing.OutSine); FilterControl.MoveToY(0, 400, Easing.OutQuint);
FilterControl.FadeIn(100, Easing.OutQuint);
this.FadeIn(250, Easing.OutQuint);
wedgeBackground.ScaleTo(1, 500, Easing.OutQuint);
FilterControl.Activate(); FilterControl.Activate();
} }
@ -623,17 +633,8 @@ namespace osu.Game.Screens.Select
transferRulesetValue(); transferRulesetValue();
ModSelect.SelectedMods.UnbindFrom(selectedMods); ModSelect.SelectedMods.UnbindFrom(selectedMods);
ModSelect.Hide();
BeatmapOptions.Hide(); playExitingTransition();
endLooping();
this.ScaleTo(1.1f, 250, Easing.InSine);
this.FadeOut(250);
FilterControl.Deactivate();
base.OnSuspending(e); base.OnSuspending(e);
} }
@ -642,16 +643,31 @@ namespace osu.Game.Screens.Select
if (base.OnExiting(e)) if (base.OnExiting(e))
return true; return true;
beatmapInfoWedge.Hide(); playExitingTransition();
return false;
}
private void playExitingTransition()
{
ModSelect.Hide(); ModSelect.Hide();
this.FadeOut(100); BeatmapOptions.Hide();
FilterControl.Deactivate(); Carousel.AllowSelection = false;
endLooping(); endLooping();
return false; FilterControl.MoveToY(-120, 500, Easing.OutQuint);
FilterControl.FadeOut(200, Easing.OutQuint);
LeftArea.MoveToX(-150, 1800, Easing.OutQuint);
LeftArea.FadeOut(200, Easing.OutQuint);
wedgeBackground.ScaleTo(2.4f, 400, Easing.OutQuint);
this.FadeOut(400, Easing.OutQuint);
FilterControl.Deactivate();
} }
private bool isHandlingLooping; private bool isHandlingLooping;