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

Update framework with positional/non-positional changes

Browse Source
This commit is contained in:
smoogipoo
2018-09-26 14:01:15 +09:00
parent 5e51a50658
commit a8f156584b
56 changed files with 86 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Screens/Menu/Button.cs
View File

@ -47,7 +47,7 @@ namespace osu.Game.Screens.Menu
private SampleChannel sampleClick;
private SampleChannel sampleHover;
public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => box.ReceiveMouseInputAt(screenSpacePos);
public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => box.ReceivePositionalInputAt(screenSpacePos);
public Button(string text, string sampleName, FontAwesome symbol, Color4 colour, Action clickAction = null, float extraWidth = 0, Key triggerKey = Key.Unknown)
{
@ -229,8 +229,8 @@ namespace osu.Game.Screens.Menu
boxHoverLayer.FadeOut(800, Easing.OutExpo);
}
public override bool HandleKeyboardInput => state == ButtonState.Expanded;
public override bool HandleMouseInput => state != ButtonState.Exploded && box.Scale.X >= 0.8f;
public override bool HandleNonPositionalInput => state == ButtonState.Expanded;
public override bool HandlePositionalInput => state != ButtonState.Exploded && box.Scale.X >= 0.8f;
protected override void Update()
{

4
osu.Game/Screens/Menu/ButtonSystem.cs
View File

@ -160,8 +160,8 @@ namespace osu.Game.Screens.Menu
private ButtonSystemState state = ButtonSystemState.Initial;
public override bool HandleKeyboardInput => state != ButtonSystemState.Exit;
public override bool HandleMouseInput => state != ButtonSystemState.Exit;
public override bool HandleNonPositionalInput => state != ButtonSystemState.Exit;
public override bool HandlePositionalInput => state != ButtonSystemState.Exit;
public ButtonSystemState State
{

4
osu.Game/Screens/Menu/LogoVisualisation.cs
View File

@ -64,8 +64,8 @@ namespace osu.Game.Screens.Menu
private readonly float[] frequencyAmplitudes = new float[256];
public override bool HandleKeyboardInput => false;
public override bool HandleMouseInput => false;
public override bool HandleNonPositionalInput => false;
public override bool HandlePositionalInput => false;
private Shader shader;
private readonly Texture texture;

4
osu.Game/Screens/Menu/MenuSideFlashes.cs
View File

@ -19,8 +19,8 @@ namespace osu.Game.Screens.Menu
{
public class MenuSideFlashes : BeatSyncedContainer
{
public override bool HandleKeyboardInput => false;
public override bool HandleMouseInput => false;
public override bool HandleNonPositionalInput => false;
public override bool HandlePositionalInput => false;
private readonly IBindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();

4
osu.Game/Screens/Menu/OsuLogo.cs
View File

@ -68,7 +68,7 @@ namespace osu.Game.Screens.Menu
public bool BeatMatching = true;
public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => logoContainer.ReceiveMouseInputAt(screenSpacePos);
public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => logoContainer.ReceivePositionalInputAt(screenSpacePos);
public bool Ripple
{
@ -342,7 +342,7 @@ namespace osu.Game.Screens.Menu
}
}
public override bool HandleMouseInput => base.HandleMouseInput && Action != null && Alpha > 0.2f;
public override bool HandlePositionalInput => base.HandlePositionalInput && Action != null && Alpha > 0.2f;
protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
{