RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-18 20:10:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-loading-animation' into follow-point-performance

Browse Source
This commit is contained in:
Dean Herbert 2020-02-23 05:14:18 +09:00
commit 187770ee7d
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Graphics/UserInterface/LoadingLayer.cs
View File

@ -64,7 +64,7 @@ namespace osu.Game.Graphics.UserInterface
protected override void Update()
{
base.Update();
MainContents.Size = new Vector2(Math.Min(100, Math.Min(DrawWidth, DrawHeight) * 0.25f));
MainContents.Size = new Vector2(Math.Clamp(Math.Min(DrawWidth, DrawHeight) * 0.25f, 30, 100));
}
protected override void Dispose(bool isDisposing)

2
osu.Game/Graphics/UserInterface/LoadingSpinner.cs
View File

@ -93,7 +93,7 @@ namespace osu.Game.Graphics.UserInterface
private void rotate()
{
spinner.Spin(spin_duration * 4, RotationDirection.Clockwise);
spinner.Spin(spin_duration * 3.5f, RotationDirection.Clockwise);
MainContents.RotateTo(0).Then()
.RotateTo(90, spin_duration, Easing.InOutQuart).Then()

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

@ -15,7 +15,6 @@ using osu.Game.Graphics.UserInterface;
using osu.Game.Rulesets.Mods;
using osu.Game.Screens.Play.HUD;
using osuTK;
using osuTK.Graphics;
namespace osu.Game.Screens.Play
{
@ -63,15 +62,9 @@ namespace osu.Game.Screens.Play
set
{
if (value)
{
loading.Show();
backgroundSprite.FadeColour(OsuColour.Gray(0.5f), 400, Easing.OutQuint);
}
else
{
loading.Hide();
backgroundSprite.FadeColour(Color4.White, 400, Easing.OutQuint);
}
}
}
@ -138,7 +131,7 @@ namespace osu.Game.Screens.Play
Anchor = Anchor.Centre,
FillMode = FillMode.Fill,
},
loading = new LoadingSpinner { Scale = new Vector2(1.3f) }
loading = new LoadingLayer(backgroundSprite)
}
},
new OsuSpriteText