Ellpeck/MLEM
1
0
Fork 0
mirror of https://github.com/Ellpeck/MLEM.git synced 2024-11-22 20:58:34 +01:00
Code Issues Projects Releases Wiki Activity

made more buttons configurable in the ui controls

Browse source
This commit is contained in:
Ellpeck 2019-09-11 10:44:23 +02:00
parent 9e5f324652
commit 39be76fbbf
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
MLEM.Ui/UiControls.cs
View file

@ -21,6 +21,11 @@ namespace MLEM.Ui {
public Buttons[] GamepadButtons = {Buttons.A}; public Buttons[] GamepadButtons = {Buttons.A};
public Buttons[] SecondaryGamepadButtons = {Buttons.X}; public Buttons[] SecondaryGamepadButtons = {Buttons.X};
public Keys[] KeyboardButtons = {Keys.Space, Keys.Enter};
public object[] UpButtons = {Buttons.DPadUp, Buttons.LeftThumbstickUp};
public object[] DownButtons = {Buttons.DPadDown, Buttons.LeftThumbstickDown};
public object[] LeftButtons = {Buttons.DPadLeft, Buttons.LeftThumbstickLeft};
public object[] RightButtons = {Buttons.DPadRight, Buttons.LeftThumbstickRight};
public int GamepadIndex = -1; public int GamepadIndex = -1;
public bool IsAutoNavMode { get; private set; } public bool IsAutoNavMode { get; private set; }
@ -63,7 +68,7 @@ namespace MLEM.Ui {
} }
// KEYBOARD INPUT // KEYBOARD INPUT
else if (this.Input.IsKeyPressed(Keys.Enter) || this.Input.IsKeyPressed(Keys.Space)) { else if (this.KeyboardButtons.Any(this.Input.IsKeyPressed)) {
this.IsAutoNavMode = true; this.IsAutoNavMode = true;
if (this.SelectedElement?.Root != null) { if (this.SelectedElement?.Root != null) {
if (this.Input.IsModifierKeyDown(ModifierKey.Shift)) { if (this.Input.IsModifierKeyDown(ModifierKey.Shift)) {
@ -100,21 +105,21 @@ namespace MLEM.Ui {
} }
// GAMEPAD INPUT // GAMEPAD INPUT
else if (this.GamepadButtons.Any(this.IsGamepadPressed)) { else if (this.GamepadButtons.Any(b => this.IsGamepadPressed(b))) {
this.IsAutoNavMode = true; this.IsAutoNavMode = true;
if (this.SelectedElement?.Root != null) if (this.SelectedElement?.Root != null)
this.SelectedElement.OnPressed?.Invoke(this.SelectedElement); this.SelectedElement.OnPressed?.Invoke(this.SelectedElement);
} else if (this.SecondaryGamepadButtons.Any(this.IsGamepadPressed)) { } else if (this.SecondaryGamepadButtons.Any(b => this.IsGamepadPressed(b))) {
this.IsAutoNavMode = true; this.IsAutoNavMode = true;
if (this.SelectedElement?.Root != null) if (this.SelectedElement?.Root != null)
this.SelectedElement.OnSecondaryPressed?.Invoke(this.SelectedElement); this.SelectedElement.OnSecondaryPressed?.Invoke(this.SelectedElement);
} else if (this.IsGamepadPressed(Buttons.DPadDown) || this.IsGamepadPressed(Buttons.LeftThumbstickDown)) { } else if (this.DownButtons.Any(this.IsGamepadPressed)) {
this.HandleGamepadNextElement(Direction2.Down); this.HandleGamepadNextElement(Direction2.Down);
} else if (this.IsGamepadPressed(Buttons.DPadLeft) || this.IsGamepadPressed(Buttons.LeftThumbstickLeft)) { } else if (this.LeftButtons.Any(this.IsGamepadPressed)) {
this.HandleGamepadNextElement(Direction2.Left); this.HandleGamepadNextElement(Direction2.Left);
} else if (this.IsGamepadPressed(Buttons.DPadRight) || this.IsGamepadPressed(Buttons.LeftThumbstickRight)) { } else if (this.RightButtons.Any(this.IsGamepadPressed)) {
this.HandleGamepadNextElement(Direction2.Right); this.HandleGamepadNextElement(Direction2.Right);
} else if (this.IsGamepadPressed(Buttons.DPadUp) || this.IsGamepadPressed(Buttons.LeftThumbstickUp)) { } else if (this.UpButtons.Any(this.IsGamepadPressed)) {
this.HandleGamepadNextElement(Direction2.Up); this.HandleGamepadNextElement(Direction2.Up);
} }
} }
@ -209,8 +214,8 @@ namespace MLEM.Ui {
} }
} }
private bool IsGamepadPressed(Buttons button) { private bool IsGamepadPressed(object button) {
return this.Input.IsGamepadButtonPressed(button, this.GamepadIndex); return this.Input.IsPressed(button, this.GamepadIndex);
} }
} }