added a default constructor to Combination

CHANGELOG.md

@@ -15,6 +15,8 @@ Jump to version:
 ### MLEM
 Additions
 - Added a simple outline formatting code
+- Added the ability to add inverse modifiers to a Keybind
+- Added GenericInput collections AllKeys, AllMouseButtons, AllButtons and AllInputs
 
 Fixes
 - Fixed control characters being included in TextInput

MLEM/Input/GenericInput.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Runtime.Serialization;
 using Microsoft.Xna.Framework.Input;
 
@@ -12,6 +13,24 @@ namespace MLEM.Input {
     [DataContract]
     public readonly struct GenericInput : IEquatable<GenericInput> {
 
+        /// <summary>
+        /// All <see cref="GenericInput"/> values created from all values of the <see cref="Keys"/> enum.
+        /// </summary>
+        public static readonly GenericInput[] AllKeys = InputHandler.AllKeys.Select(k => (GenericInput) k).ToArray();
+        /// <summary>
+        /// All <see cref="GenericInput"/> values created from all values of the <see cref="Input.MouseButton"/> enum.
+        /// </summary>
+        public static readonly GenericInput[] AllMouseButtons = MouseExtensions.MouseButtons.Select(k => (GenericInput) k).ToArray();
+        /// <summary>
+        /// All <see cref="GenericInput"/> values created from all values of the <see cref="Buttons"/> enum.
+        /// </summary>
+        public static readonly GenericInput[] AllButtons = InputHandler.AllButtons.Select(k => (GenericInput) k).ToArray();
+        /// <summary>
+        /// All <see cref="GenericInput"/> values created from all values of the <see cref="Keys"/>, <see cref="Input.MouseButton"/> and <see cref="Buttons"/> enums.
+        /// This collection represents all possible valid, non-default <see cref="GenericInput"/> values.
+        /// </summary>
+        public static readonly GenericInput[] AllInputs = GenericInput.AllKeys.Concat(GenericInput.AllMouseButtons).Concat(GenericInput.AllButtons).ToArray();
+
         /// <summary>
         /// The <see cref="InputType"/> of this generic input's current <see cref="value"/>.
         /// </summary>

MLEM/Input/Keybind.cs

@@ -18,6 +18,7 @@ namespace MLEM.Input {
     public class Keybind : IComparable<Keybind>, IComparable {
 
         private static readonly Combination[] EmptyCombinations = new Combination[0];
+        private static readonly GenericInput[] EmptyInputs = new GenericInput[0];
 
         [DataMember]
         private Combination[] combinations = Keybind.EmptyCombinations;
@@ -48,7 +49,16 @@ namespace MLEM.Input {
         /// <param name="modifiers">The modifier keys that have to be held down.</param>
         /// <returns>This keybind, for chaining</returns>
         public Keybind Add(GenericInput key, params GenericInput[] modifiers) {
-            this.combinations = this.combinations.Append(new Combination(key, modifiers)).ToArray();
+            return this.Add(new Combination(key, modifiers));
+        }
+
+        /// <summary>
+        /// Adds the given <see cref="Combination"/> to this keybind that can optionally be pressed for the keybind to trigger.
+        /// </summary>
+        /// <param name="combination">The combination to add.</param>
+        /// <returns>This keybind, for chaining</returns>
+        public Keybind Add(Combination combination) {
+            this.combinations = this.combinations.Append(combination).ToArray();
             return this;
         }
 
@@ -67,7 +77,17 @@ namespace MLEM.Input {
         /// <param name="modifiers">The modifier keys that have to be held down.</param>
         /// <returns>This keybind, for chaining.</returns>
         public Keybind Insert(int index, GenericInput key, params GenericInput[] modifiers) {
-            this.combinations = this.combinations.Take(index).Append(new Combination(key, modifiers)).Concat(this.combinations.Skip(index)).ToArray();
+            return this.Insert(index, new Combination(key, modifiers));
+        }
+
+        /// <summary>
+        /// Inserts the given <see cref="Combination"/> into the given <paramref name="index"/> of this keybind's combinations that can optionally be pressed for the keybind to trigger.
+        /// </summary>
+        /// <param name="index">The index to insert this combination into.</param>
+        /// <param name="combination">The combination to insert.</param>
+        /// <returns>This keybind, for chaining.</returns>
+        public Keybind Insert(int index, Combination combination) {
+            this.combinations = this.combinations.Take(index).Append(combination).Concat(this.combinations.Skip(index)).ToArray();
             return this;
         }
 
@@ -326,12 +346,18 @@ namespace MLEM.Input {
         public class Combination : IComparable<Combination>, IComparable {
 
             /// <summary>
-            /// The inputs that have to be held down for this combination to be valid.
+            /// The inputs that have to be held down for this combination to be valid, which is queried in <see cref="IsModifierDown"/> and <see cref="WasModifierDown"/>.
-            /// If this collection is empty, there are no required modifier keys.
+            /// If this collection is empty, there are no required modifiers.
             /// </summary>
             [DataMember]
             public readonly GenericInput[] Modifiers;
             /// <summary>
+            /// The inputs that have to be up for this combination to be valid, which is queried in <see cref="IsModifierDown"/> and <see cref="WasModifierDown"/>.
+            /// If this collection is empty, there are no required inverse modifiers.
+            /// </summary>
+            [DataMember]
+            public readonly GenericInput[] InverseModifiers;
+            /// <summary>
             /// The input that has to be down (or pressed) for this combination to be considered down (or pressed).
             /// Note that <see cref="Modifiers"/> needs to be empty, or all of its values need to be down, as well.
             /// </summary>
@@ -342,13 +368,33 @@ namespace MLEM.Input {
             /// Creates a new combination with the given settings.
             /// To add a combination to a <see cref="Keybind"/>, use <see cref="Keybind.Add(MLEM.Input.GenericInput,MLEM.Input.GenericInput[])"/> instead.
             /// </summary>
-            /// <param name="key">The key</param>
+            /// <param name="key">The key.</param>
-            /// <param name="modifiers">The modifiers</param>
+            /// <param name="modifiers">The modifiers.</param>
-            public Combination(GenericInput key, params GenericInput[] modifiers) {
+            public Combination(GenericInput key, params GenericInput[] modifiers) : this(key, modifiers, null) {}
-                this.Modifiers = modifiers;
+
+            /// <summary>
+            /// Creates a new combination with the given settings.
+            /// To add a combination to a <see cref="Keybind"/>, use <see cref="Keybind.Add(MLEM.Input.GenericInput,MLEM.Input.GenericInput[])"/> instead.
+            /// Note that inputs are automatically removed from <paramref name="inverseModifiers"/> if they are also present in <paramref name="modifiers"/>, or if they are the main <paramref name="key"/>.
+            /// </summary>
+            /// <param name="key">The key.</param>
+            /// <param name="modifiers">The modifiers, or <see langword="null"/> to use no modifiers.</param>
+            /// <param name="inverseModifiers">The inverse modifiers, or <see langword="null"/> to use no modifiers.</param>
+            public Combination(GenericInput key, GenericInput[] modifiers, GenericInput[] inverseModifiers) {
                 this.Key = key;
+                this.Modifiers = modifiers ?? Keybind.EmptyInputs;
+                this.InverseModifiers = inverseModifiers ?? Keybind.EmptyInputs;
+
+                // make sure that inverse modifiers don't contain any modifiers or the key
+                if (this.InverseModifiers.Length > 0)
+                    this.InverseModifiers = this.InverseModifiers.Where(k => k != this.Key).Except(this.Modifiers).ToArray();
             }
 
+            /// <summary>
+            /// Creates a new empty combination using the default <see cref="GenericInput"/> with the <see cref="GenericInput.InputType.None"/> input type and no <see cref="Modifiers"/> or <see cref="InverseModifiers"/>.
+            /// </summary>
+            public Combination() : this(default, null, null) {}
+
             /// <summary>
             /// Returns whether this combination is currently down.
             /// See <see cref="InputHandler.IsDown"/> for more information.
@@ -406,7 +452,7 @@ namespace MLEM.Input {
             }
 
             /// <summary>
-            /// Returns whether all of this combination's modifier keys are currently down.
+            /// Returns whether all of this combination's <see cref="Modifiers"/> are currently down and <see cref="InverseModifiers"/> are currently up.
             /// </summary>
             /// <param name="handler">The input handler to query the keys with</param>
             /// <param name="gamepadIndex">The index of the gamepad to query, or -1 to query all gamepads</param>
@@ -416,11 +462,15 @@ namespace MLEM.Input {
                     if (!handler.IsDown(modifier, gamepadIndex))
                         return false;
                 }
+                foreach (var invModifier in this.InverseModifiers) {
+                    if (handler.IsDown(invModifier, gamepadIndex))
+                        return false;
+                }
                 return true;
             }
 
             /// <summary>
-            /// Returns whether all of this combination's modifier keys were down in the last update call.
+            /// Returns whether all of this combination's <see cref="Modifiers"/> were down and <see cref="InverseModifiers"/> were up in the last update call.
             /// </summary>
             /// <param name="handler">The input handler to query the keys with</param>
             /// <param name="gamepadIndex">The index of the gamepad to query, or -1 to query all gamepads</param>
@@ -430,6 +480,10 @@ namespace MLEM.Input {
                     if (!handler.WasDown(modifier, gamepadIndex))
                         return false;
                 }
+                foreach (var invModifier in this.InverseModifiers) {
+                    if (handler.WasDown(invModifier, gamepadIndex))
+                        return false;
+                }
                 return true;
             }
 

Sandbox/GameImpl.cs

@@ -14,6 +14,7 @@ using MLEM.Extensions;
 using MLEM.Formatting;
 using MLEM.Formatting.Codes;
 using MLEM.Graphics;
+using MLEM.Input;
 using MLEM.Misc;
 using MLEM.Startup;
 using MLEM.Textures;
@@ -383,6 +384,11 @@ public class GameImpl : MlemGame {
             }
         };
         this.OnDraw += (_, _) => batch.Draw(null, SamplerState.PointClamp, null, null, null, Matrix.CreateScale(3));
+
+        Console.WriteLine("Keys: " + string.Join(", ", GenericInput.AllKeys));
+        Console.WriteLine("MouseButtons: " + string.Join(", ", GenericInput.AllMouseButtons));
+        Console.WriteLine("Buttons: " + string.Join(", ", GenericInput.AllButtons));
+        Console.WriteLine("Inputs: " + string.Join(", ", GenericInput.AllInputs));
     }
 
     protected override void DoUpdate(GameTime gameTime) {
@@ -397,12 +403,15 @@ public class GameImpl : MlemGame {
 
         /*if (Input.InputsDown.Length > 0)
             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));
         MlemGame.Input.HandleKeyboardRepeats = false; /*
         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));#1#
-        Console.WriteLine("Up time: " + MlemGame.Input.GetUpTime(Keys.A));
+        Console.WriteLine("Up time: " + MlemGame.Input.GetUpTime(Keys.A));*/
+
+        var combination = new Keybind.Combination(Keys.K, new GenericInput[] {Keys.LeftShift}, GenericInput.AllKeys);
+        Console.WriteLine($"Mod: {combination.IsModifierDown(this.InputHandler)} Down: {combination.IsDown(this.InputHandler)}");
     }
 
     protected override void DoDraw(GameTime gameTime) {

Tests/KeybindTests.cs

@@ -36,4 +36,11 @@ public class KeybindTests {
         Assert.AreEqual(-1, new Keybind(Keys.A, Keys.LeftAlt).CompareTo(new Keybind(Keys.B, Keys.LeftShift, Keys.RightShift).Add(Keys.B, Keys.RightShift).Add(Keys.C, Keys.RightControl)));
     }
 
+    [Test]
+    public void TestModifierOverlap() {
+        var combination = new Keybind.Combination(Keys.A, new GenericInput[] {Keys.Left, Keys.Right}, new GenericInput[] {Keys.Up, Keys.Right});
+        Assert.AreEqual(combination.Modifiers, new GenericInput[] {Keys.Left, Keys.Right});
+        Assert.AreEqual(combination.InverseModifiers, new GenericInput[] {Keys.Up});
+    }
+
 }