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

Move shared logic to LatencySampleComponent and implement key support for circle gameplay

Browse Source
This commit is contained in:
Dean Herbert
2022-06-10 19:33:01 +09:00
parent 7f4a54096f
commit 2f1c331f65
5 changed files with 101 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
osu.Game/Screens/Utility/SampleComponents/LatencyMovableBox.cs
View File

@ -2,47 +2,31 @@
// See the LICENCE file in the repository root for full licence text.
#nullable enable
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Input;
using osu.Framework.Input.Events;
using osu.Game.Overlays;
using osu.Framework.Input.States;
using osuTK;
using osuTK.Input;
namespace osu.Game.Screens.Utility.SampleComponents
{
public class LatencyMovableBox : CompositeDrawable
public class LatencyMovableBox : LatencySampleComponent
{
private Box box = null!;
private InputManager inputManager = null!;
private readonly BindableBool isActive;
[Resolved]
private OverlayColourProvider overlayColourProvider { get; set; } = null!;
public LatencyMovableBox(BindableBool isActive)
{
this.isActive = isActive;
}
protected override void LoadComplete()
{
base.LoadComplete();
inputManager = GetContainingInputManager();
InternalChild = box = new Box
{
Size = new Vector2(40),
RelativePositionAxes = Axes.Both,
Position = new Vector2(0.5f),
Origin = Anchor.Centre,
Colour = overlayColourProvider.Colour1,
Colour = OverlayColourProvider.Colour1,
};
}
@ -50,14 +34,12 @@ namespace osu.Game.Screens.Utility.SampleComponents
private double? lastFrameTime;
protected override void Update()
protected override void UpdateAtLimitedRate(InputState inputState)
{
base.Update();
if (!isActive.Value)
if (!IsActive.Value)
{
lastFrameTime = null;
box.Colour = overlayColourProvider.Colour1;
box.Colour = OverlayColourProvider.Colour1;
return;
}
@ -65,9 +47,9 @@ namespace osu.Game.Screens.Utility.SampleComponents
{
float movementAmount = (float)(Clock.CurrentTime - lastFrameTime) / 400;
var buttons = inputManager.CurrentState.Keyboard.Keys;
var buttons = inputState.Keyboard.Keys;
box.Colour = buttons.HasAnyButtonPressed ? overlayColourProvider.Content1 : overlayColourProvider.Colour1;
box.Colour = buttons.HasAnyButtonPressed ? OverlayColourProvider.Content1 : OverlayColourProvider.Colour1;
foreach (var key in buttons)
{