Tweaks

Author: StephanHooft

Runtime/Axis.cs

@@ -68,7 +68,7 @@ public class Axis
         /// Create a new <see cref="Axis"/>.
         /// </summary>
         public Axis()
-        { }
+        {}
 
         /// <summary>
         /// Create a new <see cref="Axis"/> and tie it to an <see cref="InputAction"/>.

Runtime/Button.cs

@@ -19,67 +19,31 @@ public class Button
         /// <returns>
         /// The amount of frames the <see cref="Button"/> has been pressed, and -1 if it is currently released.
         /// </returns>
-        public int PressDurationFrames
-        {
-            get
-            {
-                if (set && Value && pressFrame >= releaseFrame)
-                    return Time.frameCount - pressFrame;
-                else
-                    return -1;
-            }
-        }
+        public int PressDurationFrames => set && Value && pressFrame >= releaseFrame ? Time.frameCount - pressFrame : -1;
 
         /// <summary>
         /// How long the <see cref="Button"/> has been pressed, if it currently is.
         /// </summary>
         /// <returns>
         /// The amount of seconds the <see cref="Button"/> has been pressed, and -1f if it is currently released.
         /// </returns>
-        public float PressDurationTime
-        {
-            get
-            {
-                if (set && Value && pressTime >= releaseTime)
-                    return Time.unscaledTime - pressTime;
-                else
-                    return -1f;
-            }
-        }
+        public float PressDurationTime => set && Value && pressTime >= releaseTime ? Time.unscaledTime - pressTime : -1f;
 
         /// <summary>
         /// How long the <see cref="Button"/> has been released, if it currently is.
         /// </summary>
         /// <returns>
         /// The amount of frames the <see cref="Button"/> has been released, and -1 if it is currently pressed.
         /// </returns>
-        public int ReleasedDurationFrames
-        {
-            get
-            {
-                if (set && !Value && releaseFrame >= pressFrame)
-                    return Time.frameCount - releaseFrame;
-                else
-                    return -1;
-            }
-        }
+        public int ReleasedDurationFrames => set && !Value && releaseFrame >= pressFrame ? Time.frameCount - releaseFrame : -1;
 
         /// <summary>
         /// How long the <see cref="Button"/> has been released, if it currently is.
         /// </summary>
         /// <returns>
         /// The amount of seconds the <see cref="Button"/> has been released, and -1f if it is currently pressed.
         /// </returns>
-        public float ReleasedDurationTime
-        {
-            get
-            {
-                if (set && !Value && releaseTime >= pressTime)
-                    return Time.unscaledTime - releaseTime;
-                else
-                    return -1f;
-            }
-        }
+        public float ReleasedDurationTime => set && !Value && releaseTime >= pressTime ? Time.unscaledTime - releaseTime : -1f;
 
         /// <summary>
         /// Invoked when <see cref="Value"/> is set through either <see cref="Press"/>, <see cref="Release"/>, or <see cref="Toggle"/>.

Runtime/TwinAxes.cs

@@ -11,7 +11,7 @@ public class TwinAxes
         /// <summary>
         /// The value of the <see cref="TwinAxes"/> represented as a <see cref="Vector2"/>.
         /// </summary>
-        public Vector2 Value { get; private set; } = Vector2.zero;
+        public Vector2 Value => new Vector2(AxisX.Value, AxisY.Value);
 
         /// <summary>
         /// The angle of <see cref="Value"/>, as compared to <see cref="Vector2.up"/>.
@@ -30,20 +30,15 @@ public class TwinAxes
 
         /// <summary>
         /// True if the <see cref="Axis.Value"/> of <see cref="AxisX"/> and <see cref="AxisY"/> are both neutral (0f).
-        /// <para>Will always be false if <see cref="SetValue(Vector2)"/> or <see cref="SetNeutral"/> have never been called.</para>
+        /// <para>Will always be false if <see cref="SetValue(Vector2)"/> has never been called.</para>
         /// </summary>
-        public bool Neutral { get { if (AxisX.Neutral && AxisY.Neutral) return true; else return false; } }
+        public bool Neutral => AxisX.Neutral && AxisY.Neutral;
 
         /// <summary>
-        /// Invoked when <see cref="Value"/> is set through <see cref="SetValue(Vector2)"/> or <see cref="SetNeutral"/>.
+        /// Invoked when <see cref="Value"/> is set through <see cref="SetValue(Vector2)"/>.
         /// </summary>
         public event System.Action<Vector2> OnValueChanged;
 
-        /// <summary>
-        /// Invoked when the <see cref="Axis.Value"/> of <see cref="AxisX"/> or <see cref="AxisY"/> is set by something other than the <see cref="TwinAxes"/>.
-        /// </summary>
-        public event System.Action<Vector2> OnValueTampered;
-
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
         private InputAction action;
@@ -54,10 +49,7 @@ public class TwinAxes
         /// Create a new <see cref="TwinAxes"/>.
         /// </summary>
         public TwinAxes()
-        {
-            AxisX.OnValueChanged += DirtyAxisUpdateX;
-            AxisY.OnValueChanged += DirtyAxisUpdateY;
-        }
+        {}
 
         /// <summary>
         /// Create a new <see cref="TwinAxes"/> and tie it to an <see cref="InputAction"/>.
@@ -69,8 +61,6 @@ public TwinAxes(InputAction action)
                 throw new System.ArgumentNullException("action");
             if (action.expectedControlType != "Vector2")
                 throw new System.ArgumentException("InputAction " + action.name + " does not have an expected Vector2 control type.");
-            AxisX.OnValueChanged += DirtyAxisUpdateX;
-            AxisY.OnValueChanged += DirtyAxisUpdateY;
             SetInputAction(action);
         }
 
@@ -93,23 +83,12 @@ public TwinAxes(InputAction action)
         /// <param name="value">The value to set <see cref="Value"/> to.</param>
         public void SetValue(Vector2 value)
         {
-            Value = value;
             // The Axes' update events are not invoked, because TwinAxes is the one setting their value.
-            AxisX.SetValue(Value.x, false);
-            AxisY.SetValue(Value.y, false);
+            AxisX.SetValue(value.x, false);
+            AxisY.SetValue(value.y, false);
             OnValueChanged?.Invoke(Value);
         }
 
-        /// <summary>
-        /// Sets <see cref="Value"/> to <see cref="Vector2.zero"/>.
-        /// <para>Both <see cref="Axis"/> of the <see cref="TwinAxes"/> log the <see cref="Time.frameCount"/> and <see cref="Time.unscaledTime"/> 
-        /// whenever <see cref="Value"/> is set.</para>
-        /// </summary>
-        public void SetNeutral()
-        {
-            SetValue(Vector2.zero);
-        }
-
         /// <summary>
         /// Tie the <see cref="TwinAxes"/> to an <see cref="InputAction"/>.
         /// </summary>
@@ -125,18 +104,6 @@ public void RegisterInputAction(InputAction action)
 
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-        private void DirtyAxisUpdateX(float xValue)
-        {
-            Value = new Vector2(xValue, AxisY.Value);
-            OnValueTampered?.Invoke(Value);
-        }
-
-        private void DirtyAxisUpdateY(float yValue)
-        {
-            Value = new Vector2(AxisX.Value, yValue);
-            OnValueTampered?.Invoke(Value);
-        }
-
         private void SetInputAction(InputAction action)
         {
             if (this.action != null)
@@ -156,7 +123,7 @@ private void ActionPerformed(InputAction.CallbackContext context)
 
         private void ActionCanceled(InputAction.CallbackContext context)
         {
-            SetNeutral();
+            SetValue(Vector2.zero);
         }
     }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.stephanhooft.input-processing",
-  "version": "1.2.3",
+  "version": "1.3.0",
   "displayName": "Input Processing",
   "description": "A package that contains helper classes to store and evaluate user input.",
   "unity": "2020.3",