sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-02 14:17:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

Make the osu! logo shared game-wide

Browse Source 
There should only ever be one osu! logo. It is now passed around between screens in a superfluous manner.
This commit is contained in:
Dean Herbert
2017-11-01 20:54:58 +09:00
parent 7fa3ac8cf2
commit b8b05fe8d2
9 changed files with 289 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
osu.Game/Screens/OsuScreen.cs
View File

@ -10,7 +10,9 @@ using osu.Game.Graphics.Containers;
using OpenTK;
using osu.Framework.Audio.Sample;
using osu.Framework.Audio;
using osu.Framework.Graphics;
using osu.Game.Rulesets;
using osu.Game.Screens.Menu;
namespace osu.Game.Screens
{
@ -30,6 +32,8 @@ namespace osu.Game.Screens
public virtual bool HasLocalCursorDisplayed => false;
private OsuLogo logo;
/// <summary>
/// Whether the beatmap or ruleset should be allowed to be changed by the user or game.
/// Used to mark exclusive areas where this is strongly prohibited, like gameplay.
@ -72,9 +76,16 @@ namespace osu.Game.Screens
protected override void OnResuming(Screen last)
{
base.OnResuming(last);
logo.WaitForTransforms().Schedule(() => logoSetup(true));
sampleExit?.Play();
}
protected override void OnSuspending(Screen next)
{
base.OnSuspending(next);
logoOnSuspending();
}
protected override void OnEntering(Screen last)
{
OsuScreen lastOsu = last as OsuScreen;
@ -106,11 +117,19 @@ namespace osu.Game.Screens
});
}
if ((logo = lastOsu?.logo) == null)
AddInternal(logo = new OsuLogo());
base.OnEntering(last);
logo.WaitForTransforms().Schedule(() => logoSetup(false));
}
protected override bool OnExiting(Screen next)
{
if (ValidForResume && logo != null)
logoOnExiting();
OsuScreen nextOsu = next as OsuScreen;
if (Background != null && !Background.Equals(nextOsu?.Background))
@ -128,5 +147,33 @@ namespace osu.Game.Screens
Beatmap.UnbindAll();
return false;
}
private void logoSetup(bool resuming) => LogoSetup(logo, resuming);
protected virtual void LogoSetup(OsuLogo logo, bool resuming)
{
logo.Action = null;
logo.FadeOut(300, Easing.OutQuint);
}
private void logoOnExiting()
{
logo.ClearTransforms();
LogoOnExiting(logo);
}
protected virtual void LogoOnExiting(OsuLogo logo)
{
}
private void logoOnSuspending()
{
logo.ClearTransforms();
LogoOnSuspending(logo);
}
protected virtual void LogoOnSuspending(OsuLogo logo)
{
}
}
}