h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 06:17:23 +08:00
Code Issues Releases Wiki Activity

Add (temporary) transitions to songselect and player.

Browse Source
This commit is contained in:
Dean Herbert 2016-12-07 20:47:28 +09:00
parent bc6c57c619
commit bbc11c77ca
8 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 8dbc789266c1bc3e46e364be824d69bcfac74e83
Subproject commit 797576111a7ba4c469cd1a7d74708014264155ec

6
osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs
View File

@ -85,11 +85,5 @@ namespace osu.Desktop.VisualTests.Tests
}
});
}
protected override void Update()
{
base.Update();
Clock.ProcessFrame();
}
}
}

6
osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs
View File

@ -58,11 +58,5 @@ namespace osu.Desktop.VisualTests.Tests
Add(d);
}
}
protected override void Update()
{
base.Update();
Clock.ProcessFrame();
}
}
}

6
osu.Desktop.VisualTests/Tests/TestCaseMusicController.cs
View File

@ -32,11 +32,5 @@ namespace osu.Desktop.VisualTests.Tests
Add(mc);
AddToggle(@"Show", mc.ToggleVisibility);
}
protected override void Update()
{
base.Update();
Clock.ProcessFrame();
}
}
}

6
osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
View File

@ -82,11 +82,5 @@ namespace osu.Desktop.VisualTests.Tests
Beatmap = beatmap
});
}
protected override void Update()
{
base.Update();
Clock.ProcessFrame();
}
}
}

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

@ -67,12 +67,10 @@ namespace osu.Game.Screens.Play
}
sourceClock = (IAdjustableClock)track ?? new StopwatchClock();
Clock = new InterpolatingFramedClock(sourceClock);
Schedule(() =>
{
sourceClock.Reset();
sourceClock.Start();
});
var beatmap = Beatmap.Beatmap;
@ -103,6 +101,7 @@ namespace osu.Game.Screens.Play
{
new PlayerInputManager(game.Host)
{
Clock = new InterpolatingFramedClock(sourceClock),
PassThrough = false,
Children = new Drawable[]
{
@ -113,6 +112,21 @@ namespace osu.Game.Screens.Play
};
}
protected override void LoadComplete()
{
base.LoadComplete();
Delay(250, true);
Content.FadeIn(250);
Delay(500, true);
Schedule(() =>
{
sourceClock.Start();
});
}
private void hitRenderer_OnAllJudged()
{
Delay(1000);
@ -130,12 +144,8 @@ namespace osu.Game.Screens.Play
base.OnEntering(last);
(Background as BackgroundModeBeatmap)?.BlurTo(Vector2.Zero, 1000);
}
protected override void Update()
{
base.Update();
Clock.ProcessFrame();
Content.Alpha = 0;
}
class PlayerInputManager : UserInputManager

1
osu.Game/Screens/Select/BeatmapInfoWedge.cs
View File

@ -61,7 +61,6 @@ namespace osu.Game.Screens.Select
(beatmapInfoContainer = new BufferedContainer
{
Depth = newDepth,
PixelSnapping = true,
CacheDrawnFrameBuffer = true,
Shear = -Shear,
RelativeSizeAxes = Axes.Both,

14
osu.Game/Screens/Select/PlaySongSelect.cs
View File

@ -25,6 +25,7 @@ using OpenTK.Graphics;
using osu.Game.Screens.Play;
using osu.Framework;
using osu.Framework.Audio.Sample;
using osu.Framework.Graphics.Transformations;
using osu.Game.Beatmaps.Drawables;
using osu.Game.Graphics.Containers;
@ -188,6 +189,12 @@ namespace osu.Game.Screens.Select
changeBackground(Beatmap);
Content.FadeInFromZero(250);
beatmapInfoWedge.MoveTo(wedged_container_start_position + new Vector2(-100, 50));
beatmapInfoWedge.RotateTo(10);
beatmapInfoWedge.MoveTo(wedged_container_start_position, 800, EasingTypes.OutQuint);
beatmapInfoWedge.RotateTo(0, 800, EasingTypes.OutQuint);
}
protected override void OnResuming(GameMode last)
@ -197,16 +204,23 @@ namespace osu.Game.Screens.Select
base.OnResuming(last);
Content.FadeIn(250);
Content.ScaleTo(1, 250, EasingTypes.OutSine);
}
protected override void OnSuspending(GameMode next)
{
Content.ScaleTo(1.1f, 250, EasingTypes.InSine);
Content.FadeOut(250);
base.OnSuspending(next);
}
protected override bool OnExiting(GameMode next)
{
beatmapInfoWedge.MoveTo(wedged_container_start_position + new Vector2(-100, 50), 800, EasingTypes.InQuint);
beatmapInfoWedge.RotateTo(10, 800, EasingTypes.InQuint);
Content.FadeOut(100);
return base.OnExiting(next);
}