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

Changed the roles of PauseOverlay and player in pausing, PauseOverlay is now only the UI portion and doesn't do things like actually pause the game, and only calls actions and hides itself, whereas Player actually pauses the game and brings up the pause overlay in the first place

Browse Source
This commit is contained in:
DrabWeb
2017-01-27 15:28:39 -04:00
parent 601a5ed39c
commit feba3f35ba
3 changed files with 89 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
osu.Game/Overlays/Pause/PauseOverlay.cs
View File

@ -3,30 +3,24 @@ using OpenTK;
using OpenTK.Input;
using OpenTK.Graphics;
using osu.Game.Graphics;
using osu.Framework.Audio;
using osu.Game.Screens.Menu;
using osu.Game.Screens.Play;
using osu.Framework.Input;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Transformations;
using osu.Game.Graphics.Backgrounds;
using osu.Game.Screens.Menu;
namespace osu.Game.Overlays.Pause
{
public class PauseOverlay : OverlayContainer
{
public event Action OnPause;
public event Action OnResume;
public event Action OnRetry;
public event Action OnQuit;
public bool isPaused = false;
private int fadeDuration = 100;
private double pauseCooldown = 1000;
private double lastActionTime = 0;
public Action OnResume;
public Action OnRetry;
public Action OnQuit;
[BackgroundDependencyLoader]
private void load(OsuColour colours)
@ -96,23 +90,34 @@ namespace osu.Game.Overlays.Pause
Type = PauseButtonType.Resume,
Origin = Anchor.TopCentre,
Anchor = Anchor.TopCentre,
Action = Resume,
Action = (delegate
{
Hide();
OnResume?.Invoke();
}),
},
new PauseButton
{
Type = PauseButtonType.Retry,
Origin = Anchor.TopCentre,
Anchor = Anchor.TopCentre,
Action = Retry,
Action = (delegate
{
Hide();
OnRetry?.Invoke();
}),
},
new PauseButton
{
Type = PauseButtonType.Quit,
Origin = Anchor.TopCentre,
Anchor = Anchor.TopCentre,
Action = Quit,
},
new Button(@"solo", @"freeplay", FontAwesome.fa_user, new Color4(102, 68, 204, 255), () => OnPause?.Invoke(), 300, Key.P),
Action = (delegate
{
Hide();
OnQuit?.Invoke();
}),
},
}
},
};
@ -121,65 +126,25 @@ namespace osu.Game.Overlays.Pause
protected override void PopIn()
{
FadeTo(1, fadeDuration, EasingTypes.In);
isPaused = true;
}
protected override void PopOut()
{
FadeTo(0, fadeDuration, EasingTypes.In);
isPaused = false;
}
protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
{
switch (args.Key)
{
case Key.Escape:
TogglePaused();
case Key.Escape:
Hide();
OnResume?.Invoke();
return true;
}
return base.OnKeyDown(state, args);
}
public void Pause()
{
if (Time.Current >= (lastActionTime + pauseCooldown))
{
lastActionTime = Time.Current;
Show();
OnPause?.Invoke();
}
else
{
isPaused = false;
}
}
public void Resume()
{
lastActionTime = Time.Current;
Hide();
OnResume?.Invoke();
}
public void TogglePaused()
{
isPaused = !isPaused;
(isPaused ? (Action)Pause : Resume)?.Invoke();
}
private void Retry()
{
Hide();
OnRetry?.Invoke();
}
private void Quit()
{
Hide();
OnQuit?.Invoke();
}
public PauseOverlay()
{
RelativeSizeAxes = Axes.Both;