sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-30 09:57:21 +09:00
Code Issues Packages Projects Releases Wiki Activity

Strongly typed TransformDirection for music controller.

Browse Source
This commit is contained in:
Huo Yaoyuan 2016-11-14 03:21:07 +08:00
parent be319707cf
commit afab938794
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -229,7 +229,7 @@ namespace osu.Game.Overlays
void preferUnicode_changed(object sender, EventArgs e) void preferUnicode_changed(object sender, EventArgs e)
{ {
updateDisplay(current, false); updateDisplay(current, TransformDirection.None);
} }
private void workingChanged(object sender = null, EventArgs e = null) private void workingChanged(object sender = null, EventArgs e = null)
@ -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 ? null : (bool?)true); updateDisplay(current, audioEquals ? TransformDirection.None : TransformDirection.Left);
appendToHistory(current.BeatmapInfo); appendToHistory(current.BeatmapInfo);
} }
@ -298,10 +298,10 @@ namespace osu.Game.Overlays
current.Track.Start(); current.Track.Start();
beatmapSource.Value = current; beatmapSource.Value = current;
}); });
updateDisplay(current, isNext); updateDisplay(current, isNext ? TransformDirection.Left : TransformDirection.Right);
} }
private void updateDisplay(WorkingBeatmap beatmap, bool? isNext) private void updateDisplay(WorkingBeatmap beatmap, TransformDirection direction)
{ {
if (beatmap.Beatmap == null) if (beatmap.Beatmap == null)
//todo: we may need to display some default text here (currently in the constructor). //todo: we may need to display some default text here (currently in the constructor).
@ -315,13 +315,13 @@ namespace osu.Game.Overlays
Add(newBackground); Add(newBackground);
if (isNext == true) if (direction == TransformDirection.Left)
{ {
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 (isNext == false) else if (direction == TransformDirection.Right)
{ {
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,6 +354,8 @@ namespace osu.Game.Overlays
protected override void PopOut() => FadeOut(100); protected override void PopOut() => FadeOut(100);
private enum TransformDirection { None, Left, Right }
private class MusicControllerBackground : BufferedContainer private class MusicControllerBackground : BufferedContainer
{ {
private Sprite sprite; private Sprite sprite;