h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 13:22:55 +08:00
Code Issues Releases Wiki Activity

Make TransformDirection more clear.

Browse Source
This commit is contained in:
Huo Yaoyuan 2016-11-14 04:59:41 +08:00
parent aac968eec8
commit 86a6c7641d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Overlays/MusicController.cs
View File

@ -237,7 +237,7 @@ namespace osu.Game.Overlays
if (beatmapSource.Value == current) return; if (beatmapSource.Value == current) return;
bool audioEquals = current?.BeatmapInfo.AudioEquals(beatmapSource.Value.BeatmapInfo) ?? false; bool audioEquals = current?.BeatmapInfo.AudioEquals(beatmapSource.Value.BeatmapInfo) ?? false;
current = beatmapSource.Value; current = beatmapSource.Value;
updateDisplay(current, audioEquals ? TransformDirection.None : TransformDirection.Left); updateDisplay(current, audioEquals ? TransformDirection.None : TransformDirection.Next);
appendToHistory(current.BeatmapInfo); appendToHistory(current.BeatmapInfo);
} }
@ -298,7 +298,7 @@ namespace osu.Game.Overlays
current.Track.Start(); current.Track.Start();
beatmapSource.Value = current; beatmapSource.Value = current;
}); });
updateDisplay(current, isNext ? TransformDirection.Left : TransformDirection.Right); updateDisplay(current, isNext ? TransformDirection.Next : TransformDirection.Prev);
} }
private void updateDisplay(WorkingBeatmap beatmap, TransformDirection direction) private void updateDisplay(WorkingBeatmap beatmap, TransformDirection direction)
@ -315,13 +315,13 @@ namespace osu.Game.Overlays
Add(newBackground); Add(newBackground);
if (direction == TransformDirection.Left) if (direction == TransformDirection.Next)
{ {
newBackground.Position = new Vector2(400, 0); newBackground.Position = new Vector2(400, 0);
newBackground.MoveToX(0, 500, EasingTypes.OutCubic); newBackground.MoveToX(0, 500, EasingTypes.OutCubic);
backgroundSprite.MoveToX(-400, 500, EasingTypes.OutCubic); backgroundSprite.MoveToX(-400, 500, EasingTypes.OutCubic);
} }
else if (direction == TransformDirection.Right) else if (direction == TransformDirection.Prev)
{ {
newBackground.Position = new Vector2(-400, 0); newBackground.Position = new Vector2(-400, 0);
newBackground.MoveToX(0, 500, EasingTypes.OutCubic); newBackground.MoveToX(0, 500, EasingTypes.OutCubic);
@ -354,7 +354,7 @@ namespace osu.Game.Overlays
protected override void PopOut() => FadeOut(100); protected override void PopOut() => FadeOut(100);
private enum TransformDirection { None, Left, Right } private enum TransformDirection { None, Next, Prev }
private class MusicControllerBackground : BufferedContainer private class MusicControllerBackground : BufferedContainer
{ {