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

Improved the way InputHandler down time calculation works

Browse source
This commit is contained in:
Ell 2022-11-08 17:12:37 +01:00
parent 8469185297
commit 797a3b2617
3 changed files with 28 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -26,6 +26,7 @@ Improvements
- Allow retrieving the cost of a calculated path when using AStar - Allow retrieving the cost of a calculated path when using AStar
- Added trimming and AOT annotations and made MLEM trimmable - Added trimming and AOT annotations and made MLEM trimmable
- Allow specifying percentage-based padding for a NinePatch - Allow specifying percentage-based padding for a NinePatch
- Improved the way InputHandler down time calculation works
- **Drastically improved StaticSpriteBatch batching performance** - **Drastically improved StaticSpriteBatch batching performance**
- **Made GenericFont and TokenizedString support UTF-32 characters like emoji** - **Made GenericFont and TokenizedString support UTF-32 characters like emoji**

39
MLEM/Input/InputHandler.cs
View file

@ -20,7 +20,7 @@ namespace MLEM.Input {
public static readonly Buttons[] AllButtons = public static readonly Buttons[] AllButtons =
#if NET6_0_OR_GREATER #if NET6_0_OR_GREATER
Enum.GetValues<Buttons>(); Enum.GetValues<Buttons>();
#else #else
(Buttons[]) Enum.GetValues(typeof(Buttons)); (Buttons[]) Enum.GetValues(typeof(Buttons));
#endif #endif
/// <summary> /// <summary>
@ -29,7 +29,7 @@ namespace MLEM.Input {
public static readonly Keys[] AllKeys = public static readonly Keys[] AllKeys =
#if NET6_0_OR_GREATER #if NET6_0_OR_GREATER
Enum.GetValues<Keys>(); Enum.GetValues<Keys>();
#else #else
(Keys[]) Enum.GetValues(typeof(Keys)); (Keys[]) Enum.GetValues(typeof(Keys));
#endif #endif
@ -179,6 +179,7 @@ namespace MLEM.Input {
private readonly List<GestureSample> gestures = new List<GestureSample>(); private readonly List<GestureSample> gestures = new List<GestureSample>();
private readonly HashSet<(GenericInput, int)> consumedPresses = new HashSet<(GenericInput, int)>(); private readonly HashSet<(GenericInput, int)> consumedPresses = new HashSet<(GenericInput, int)>();
private readonly Dictionary<(GenericInput, int), DateTime> inputUpTimes = new Dictionary<(GenericInput, int), DateTime>(); private readonly Dictionary<(GenericInput, int), DateTime> inputUpTimes = new Dictionary<(GenericInput, int), DateTime>();
private readonly Dictionary<(GenericInput, int), DateTime> inputDownTimes = new Dictionary<(GenericInput, int), DateTime>();
private readonly Dictionary<(GenericInput, int), DateTime> inputPressedTimes = new Dictionary<(GenericInput, int), DateTime>(); private readonly Dictionary<(GenericInput, int), DateTime> inputPressedTimes = new Dictionary<(GenericInput, int), DateTime>();
private Point ViewportOffset => new Point(-this.Game.GraphicsDevice.Viewport.X, -this.Game.GraphicsDevice.Viewport.Y); private Point ViewportOffset => new Point(-this.Game.GraphicsDevice.Viewport.X, -this.Game.GraphicsDevice.Viewport.Y);
@ -356,13 +357,15 @@ namespace MLEM.Input {
} }
this.InputsPressed = pressed.ToArray(); this.InputsPressed = pressed.ToArray();
// handle inputs that changed to up // handle inputs that changed between down and up
foreach (var key in this.inputsDownAccum.Keys)
this.inputUpTimes.Remove(key);
foreach (var key in this.inputsDown.Keys) { foreach (var key in this.inputsDown.Keys) {
if (!this.inputsDownAccum.ContainsKey(key)) if (!this.inputsDownAccum.ContainsKey(key))
this.inputUpTimes[key] = DateTime.UtcNow; this.inputUpTimes[key] = DateTime.UtcNow;
} }
foreach (var key in this.inputsDownAccum.Keys) {
if (!this.inputsDown.ContainsKey(key))
this.inputDownTimes[key] = DateTime.UtcNow;
}
// handle inputs that are currently down // handle inputs that are currently down
this.InputsDown = this.inputsDownAccum.Keys.Select(key => key.Item1).ToArray(); this.InputsDown = this.inputsDownAccum.Keys.Select(key => key.Item1).ToArray();
@ -852,15 +855,17 @@ namespace MLEM.Input {
/// <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 or has been down previously, this method returns true and the amount of time that it has currently or last been down for is stored in <paramref name="downTime"/>.
/// </summary> /// </summary>
/// <param name="input">The input whose down time to query.</param> /// <param name="input">The input whose down time to query.</param>
/// <param name="downTime">The resulting down time, or <see cref="TimeSpan.Zero"/> if the input is not being held.</param> /// <param name="downTime">The resulting down time, or <see cref="TimeSpan.Zero"/> if the input is not being held.</param>
/// <param name="index">The index of the gamepad to query (if applicable), or -1 for any gamepad.</param> /// <param name="index">The index of the gamepad to query (if applicable), or -1 for any gamepad.</param>
/// <returns>Whether the input is currently being held.</returns> /// <returns>Whether the input is currently being held.</returns>
public bool TryGetDownTime(GenericInput input, out TimeSpan downTime, int index = -1) { public bool TryGetDownTime(GenericInput input, out TimeSpan downTime, int index = -1) {
if (this.inputsDown.TryGetValue((input, index), out var start)) { if (this.inputDownTimes.TryGetValue((input, index), out var wentDown)) {
downTime = DateTime.UtcNow - start; // if we're currently down, we return the amount of time we've been down for so far
// if we're not currently down, we return the last amount of time we were down for
downTime = (this.IsDown(input) || !this.inputUpTimes.TryGetValue((input, index), out var wentUp) ? DateTime.UtcNow : wentUp) - wentDown;
return true; return true;
} }
downTime = default; downTime = default;
@ -868,8 +873,8 @@ namespace MLEM.Input {
} }
/// <summary> /// <summary>
/// Returns the amount of time that a given <see cref="GenericInput"/> has been held down for. /// Returns the current or last amount of time that a given <see cref="GenericInput"/> has been held down for.
/// If this input isn't currently down, this method returns <see cref="TimeSpan.Zero"/>. /// If this input isn't currently down and has not been down previously, this method returns <see cref="TimeSpan.Zero"/>.
/// </summary> /// </summary>
/// <param name="input">The input whose down time to query.</param> /// <param name="input">The input whose down time to query.</param>
/// <param name="index">The index of the gamepad to query (if applicable), or -1 for any gamepad.</param> /// <param name="index">The index of the gamepad to query (if applicable), or -1 for any gamepad.</param>
@ -881,15 +886,17 @@ namespace MLEM.Input {
/// <summary> /// <summary>
/// Tries to retrieve the amount of time that a given <see cref="GenericInput"/> has been up for since the last time it was down. /// Tries to retrieve the amount of time that a given <see cref="GenericInput"/> has been up for since the last time it was down.
/// If the input is currently up, this method returns true and the amount of time that it has been up for is stored in <paramref name="upTime"/>. /// If the input has previously been down, this method returns true and the amount of time that it has been up for is stored in <paramref name="upTime"/>.
/// </summary> /// </summary>
/// <param name="input">The input whose up time to query.</param> /// <param name="input">The input whose up time to query.</param>
/// <param name="upTime">The resulting up time, or <see cref="TimeSpan.Zero"/> if the input is being held.</param> /// <param name="upTime">The resulting up time, or <see cref="TimeSpan.Zero"/> if the input is being held.</param>
/// <param name="index">The index of the gamepad to query (if applicable), or -1 for any gamepad.</param> /// <param name="index">The index of the gamepad to query (if applicable), or -1 for any gamepad.</param>
/// <returns>Whether the input is currently up.</returns> /// <returns>Whether the input is currently up.</returns>
public bool TryGetUpTime(GenericInput input, out TimeSpan upTime, int index = -1) { public bool TryGetUpTime(GenericInput input, out TimeSpan upTime, int index = -1) {
if (this.inputUpTimes.TryGetValue((input, index), out var start)) { if (this.inputUpTimes.TryGetValue((input, index), out var wentUp)) {
upTime = DateTime.UtcNow - start; // if we're currently up, we return the amount of time we've been up for so far
// if we're not currently up, we return the last amount of time we were up for
upTime = (this.IsUp(input) || !this.inputDownTimes.TryGetValue((input, index), out var wentDown) ? DateTime.UtcNow : wentDown) - wentUp;
return true; return true;
} }
upTime = default; upTime = default;
@ -897,8 +904,8 @@ namespace MLEM.Input {
} }
/// <summary> /// <summary>
/// Returns the amount of time that a given <see cref="GenericInput"/> has been up for since the last time it was down. /// Returns the amount of time that a given <see cref="GenericInput"/> has last been up for since the last time it was down.
/// If this input isn't currently up, this method returns <see cref="TimeSpan.Zero"/>. /// If this input hasn't been down previously, this method returns <see cref="TimeSpan.Zero"/>.
/// </summary> /// </summary>
/// <param name="input">The input whose up time to query.</param> /// <param name="input">The input whose up time to query.</param>
/// <param name="index">The index of the gamepad to query (if applicable), or -1 for any gamepad.</param> /// <param name="index">The index of the gamepad to query (if applicable), or -1 for any gamepad.</param>
@ -927,7 +934,7 @@ namespace MLEM.Input {
/// <summary> /// <summary>
/// Returns the amount of time that has passed since a given <see cref="GenericInput"/> last counted as pressed. /// Returns the amount of time that has passed since a given <see cref="GenericInput"/> last counted as pressed.
/// If this input hasn't been pressed previously, or is currently pressed, this method returns <see cref="TimeSpan.Zero"/>. /// If this input hasn't been pressed previously, this method returns <see cref="TimeSpan.Zero"/>.
/// </summary> /// </summary>
/// <param name="input">The input whose up time to query.</param> /// <param name="input">The input whose up time to query.</param>
/// <param name="index">The index of the gamepad to query (if applicable), or -1 for any gamepad.</param> /// <param name="index">The index of the gamepad to query (if applicable), or -1 for any gamepad.</param>

8
Sandbox/GameImpl.cs
View file

@ -397,12 +397,12 @@ public class GameImpl : MlemGame {
/*if (Input.InputsDown.Length > 0) /*if (Input.InputsDown.Length > 0)
Console.WriteLine("Down: " + string.Join(", ", Input.InputsDown));*/ Console.WriteLine("Down: " + string.Join(", ", Input.InputsDown));*/
/*if (MlemGame.Input.InputsPressed.Length > 0) if (MlemGame.Input.InputsPressed.Length > 0)
Console.WriteLine("Pressed: " + string.Join(", ", MlemGame.Input.InputsPressed)); Console.WriteLine("Pressed: " + string.Join(", ", MlemGame.Input.InputsPressed));
MlemGame.Input.HandleKeyboardRepeats = false; MlemGame.Input.HandleKeyboardRepeats = false;/*
Console.WriteLine("Down time: " + MlemGame.Input.GetDownTime(Keys.A)); Console.WriteLine("Down time: " + MlemGame.Input.GetDownTime(Keys.A));
Console.WriteLine("Time since press: " + MlemGame.Input.GetTimeSincePress(Keys.A)); Console.WriteLine("Time since press: " + MlemGame.Input.GetTimeSincePress(Keys.A));*/
Console.WriteLine("Up time: " + MlemGame.Input.GetUpTime(Keys.A));*/ Console.WriteLine("Up time: " + MlemGame.Input.GetUpTime(Keys.A));
} }
protected override void DoDraw(GameTime gameTime) { protected override void DoDraw(GameTime gameTime) {