sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 15:16:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Update framework and add rudimentary fading to song select screen.

Browse Source
This commit is contained in:
Thomas Müller
2016-11-20 12:16:54 +01:00
parent 0fdd505807
commit 57e7c7097d
7 changed files with 35 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
osu.Game/Screens/Play/PlaySongSelect.cs
View File

@ -103,6 +103,7 @@ namespace osu.Game.Screens.Play
},
wedgedContainer = new Container
{
Alpha = 0,
Position = wedged_container_start_position,
Size = wedged_container_size,
Margin = new MarginPadding { Top = 20, Right = 20, },
@ -179,17 +180,31 @@ namespace osu.Game.Screens.Play
{
base.OnEntering(last);
ensurePlayingSelected();
backgroundWedgesContainer.FadeInFromZero(250);
changeBackground(Beatmap);
Content.FadeInFromZero(250);
}
protected override void OnResuming(GameMode last)
{
changeBackground(Beatmap);
ensurePlayingSelected();
base.OnResuming(last);
Content.FadeIn(250);
}
protected override void OnSuspending(GameMode next)
{
Content.FadeOut(250);
base.OnSuspending(next);
}
protected override bool OnExiting(GameMode next)
{
Content.FadeOut(100);
return base.OnExiting(next);
}
protected override void Dispose(bool isDisposing)
@ -232,6 +247,8 @@ namespace osu.Game.Screens.Play
oldWedgedBeatmapInfo.Expire();
}
wedgedContainer.FadeIn(250);
BeatmapSetInfo beatmapSetInfo = beatmap.BeatmapSetInfo;
BeatmapInfo beatmapInfo = beatmap.BeatmapInfo;
wedgedContainer.Add(wedgedBeatmapInfo = new BufferedContainer
@ -252,7 +269,7 @@ namespace osu.Game.Screens.Play
},
// We use a container, such that we can set the colour gradient to go across the
// vertices of the masked container instead of the vertices of the (larger) sprite.
new Container
beatmap.Background == null ? new Container() : new Container
{
RelativeSizeAxes = Axes.Both,
ColourInfo = ColourInfo.GradientVertical(Color4.White, new Color4(1f, 1f, 1f, 0.3f)),

9
osu.Game/Screens/Play/Player.cs
View File

@ -32,10 +32,7 @@ namespace osu.Game.Screens.Play
public BeatmapInfo BeatmapInfo;
public PlayMode PreferredPlayMode;
protected override IFrameBasedClock Clock => playerClock;
private InterpolatingFramedClock playerClock;
private IAdjustableClock sourceClock;
private Ruleset ruleset;
@ -64,7 +61,7 @@ namespace osu.Game.Screens.Play
}
sourceClock = (IAdjustableClock)track ?? new StopwatchClock();
playerClock = new InterpolatingFramedClock(sourceClock);
Clock = new InterpolatingFramedClock(sourceClock);
Schedule(() =>
{
@ -118,7 +115,7 @@ namespace osu.Game.Screens.Play
protected override void Update()
{
base.Update();
playerClock.ProcessFrame();
Clock.ProcessFrame();
}
class PlayerInputManager : UserInputManager