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

Added IsPressConsumed and IsAnyPressedAvailable to InputHandler

Browse source
This commit is contained in:
Ell 2022-05-17 18:20:31 +02:00
parent 03accff6ae
commit 8968e6025d
1 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
MLEM/Input/InputHandler.cs
View file

@ -371,7 +371,7 @@ namespace MLEM.Input {
/// <param name="key">The key to query.</param> /// <param name="key">The key to query.</param>
/// <returns>If the key is pressed and the press is not consumed yet.</returns> /// <returns>If the key is pressed and the press is not consumed yet.</returns>
public bool IsKeyPressedAvailable(Keys key) { public bool IsKeyPressedAvailable(Keys key) {
return this.IsKeyPressed(key) && !this.consumedPresses.Contains((key, -1)); return this.IsKeyPressed(key) && !this.IsPressConsumed(key);
} }
/// <summary> /// <summary>
@ -457,7 +457,7 @@ namespace MLEM.Input {
/// <param name="button">The button to query.</param> /// <param name="button">The button to query.</param>
/// <returns>If the button is pressed and the press is not consumed yet.</returns> /// <returns>If the button is pressed and the press is not consumed yet.</returns>
public bool IsMouseButtonPressedAvailable(MouseButton button) { public bool IsMouseButtonPressedAvailable(MouseButton button) {
return this.IsMouseButtonPressed(button) && !this.consumedPresses.Contains((button, -1)); return this.IsMouseButtonPressed(button) && !this.IsPressConsumed(button);
} }
/// <summary> /// <summary>
@ -567,7 +567,7 @@ namespace MLEM.Input {
/// <param name="index">The zero-based index of the gamepad, or -1 for any gamepad.</param> /// <param name="index">The zero-based index of the gamepad, or -1 for any gamepad.</param>
/// <returns>Whether the given button is pressed and the press is not consumed yet.</returns> /// <returns>Whether the given button is pressed and the press is not consumed yet.</returns>
public bool IsGamepadButtonPressedAvailable(Buttons button, int index = -1) { public bool IsGamepadButtonPressedAvailable(Buttons button, int index = -1) {
return this.IsGamepadButtonPressed(button) && !this.consumedPresses.Contains((button, index)) && (index < 0 || !this.consumedPresses.Contains((button, -1))); return this.IsGamepadButtonPressed(button) && !this.IsPressConsumed(button, index) && (index < 0 || !this.IsPressConsumed(button));
} }
/// <summary> /// <summary>
@ -749,6 +749,15 @@ namespace MLEM.Input {
return false; return false;
} }
/// <inheritdoc cref="IsPressedAvailable"/>
public bool IsAnyPressedAvailable(params GenericInput[] controls) {
foreach (var control in controls) {
if (this.IsPressedAvailable(control))
return true;
}
return false;
}
/// <summary> /// <summary>
/// Tries to retrieve the amount of time that a given <see cref="GenericInput"/> has been held down for. /// Tries to retrieve the amount of time that a given <see cref="GenericInput"/> has been held down for.
/// If the input is currently down, this method returns true and the amount of time that it has been down for is stored in <paramref name="downTime"/>. /// If the input is currently down, this method returns true and the amount of time that it has been down for is stored in <paramref name="downTime"/>.
@ -777,6 +786,17 @@ namespace MLEM.Input {
return time; return time;
} }
/// <summary>
/// Returns whether the given <see cref="GenericInput"/>'s press state has been consumed using <see cref="TryConsumePressed"/>.
/// If an input has been consumed, <see cref="IsPressedAvailable"/> and <see cref="TryConsumePressed"/> will always return false for that input.
/// </summary>
/// <param name="input">The input to query.</param>
/// <param name="index">The index of the gamepad to query (if applicable), or -1 for any gamepad.</param>
/// <returns>Whether a press has been consumed for the given input.</returns>
public bool IsPressConsumed(GenericInput input, int index = -1) {
return this.consumedPresses.Contains((input, index));
}
private void AccumulateDown(GenericInput input, int index) { private void AccumulateDown(GenericInput input, int index) {
this.inputsDownAccum.Add((input, index), this.inputsDown.TryGetValue((input, index), out var start) ? start : DateTime.UtcNow); this.inputsDownAccum.Add((input, index), this.inputsDown.TryGetValue((input, index), out var start) ? start : DateTime.UtcNow);
} }