Additional work on on screen controls including UI visualisation

Author: ekcoh

Assets/Samples/RebindingUI/InputActionIndicator.cs

@@ -34,7 +34,9 @@ public class InputActionIndicator : MonoBehaviour
         private void OnEnable()
         {
             if (action != null && action.action != null)
+            {
                 action.action.performed += OnPerformed; // TODO Problem here after domain reload, InputAction.addperformed(), CallbackArray.AddCallback,. InputArrayExtensions.Contains
+            }
         }
 
         private void OnDisable()

Assets/Samples/RebindingUI/OnScreen/ActiveDetector.cs

@@ -2,13 +2,13 @@
 
 namespace UnityEngine.InputSystem.Samples.RebindUI
 {
-    class ActiveDetector : ITouchProcessor
+    internal class ActiveDetector : ITouchProcessor
     {
         private Vector2 m_InitialPosition = Vector2.zero;
         private double m_InitialTime = 0;
         private bool m_Valid = true;
 
-        public void OnTouchBegin(ChangeMonitor context, in TouchState[] touches, int count, int index)
+        public void OnTouchBegin(Detector context, in TouchState[] touches, int count, int index)
         {
             if (count == 1)
             {
@@ -19,7 +19,7 @@ public void OnTouchBegin(ChangeMonitor context, in TouchState[] touches, int cou
                 GestureEvent @event = new GestureEvent(
                     delta: Vector2.zero,
                     duration: 0.0,
-                    flags: GestureFlags.Active | GestureFlags.PhaseStart,
+                    flags: GestureEvent.Flags.Active | GestureEvent.Flags.PhaseStart,
                     start: m_InitialPosition
                 );
                 context.FireEvent(in @event);
@@ -30,33 +30,33 @@ public void OnTouchBegin(ChangeMonitor context, in TouchState[] touches, int cou
             }
         }
 
-        public void OnTouchEnd(ChangeMonitor context, in TouchState[] touches, int count, int index)
+        public void OnTouchEnd(Detector context, in TouchState[] touches, int count, int index)
         {
             if (m_Valid)
             {
                 GestureEvent @event = new GestureEvent(
                     delta: touches[index].position - m_InitialPosition,
                     duration: Time.realtimeSinceStartupAsDouble - m_InitialTime,
-                    flags: GestureFlags.Active | GestureFlags.PhaseEnd, start: m_InitialPosition);
+                    flags: GestureEvent.Flags.Active | GestureEvent.Flags.PhaseEnd, start: m_InitialPosition);
                 context.FireEvent(in @event);
             }
         }
 
-        public void OnTouchMoved(ChangeMonitor context, in TouchState[] touches, int count, int index)
+        public void OnTouchMoved(Detector context, in TouchState[] touches, int count, int index)
         {
             // Ignored
         }
 
-        public void OnTouchCanceled(ChangeMonitor context, in TouchState[] touches, int count, int index)
+        public void OnTouchCanceled(Detector context, in TouchState[] touches, int count, int index)
         {
             if (m_Valid)
             {
                 m_Valid = false;
 
-                GestureEvent @event = new GestureEvent(
+                var @event = new GestureEvent(
                     delta: touches[index].position - m_InitialPosition,
                     duration: Time.realtimeSinceStartupAsDouble - m_InitialTime,
-                    flags: GestureFlags.Active | GestureFlags.PhaseCancel,
+                    flags: GestureEvent.Flags.Active | GestureEvent.Flags.PhaseCancel,
                     start: m_InitialPosition);
                 context.FireEvent(in @event);
             }

Assets/Samples/RebindingUI/OnScreen/Curve.cs

@@ -2,32 +2,49 @@
 
 namespace UnityEngine.InputSystem.Samples.RebindUI
 {
-    public enum PredefinedCurve
+    /// <summary>
+    /// Represents a response curve for mapping normalized values onto the normalized value axis.
+    /// </summary>
+    public enum Curve
     {
+        /// <summary>
+        /// Linear curve f(x) = x.
+        /// </summary>
         Linear,
-        Quatratic,
+
+        /// <summary>
+        /// Quadratic curve f(x) = x^2.
+        /// </summary>
+        Quadratic,
+
+        /// <summary>
+        /// Cubic curve f(x) = x^3.
+        /// </summary>
         Cubic,
     }
 
-    public static class CurveExtensions
+    /// <summary>
+    /// Extension methods for <see cref="Curve"/>.
+    /// </summary>
+    internal static class CurveExtensions
     {
         /// <summary>
         /// Apply response curve shaping to vlaue <paramref name="v"/>.
         /// </summary>
-        /// <param name="v">The normalized value to be transformed.</param>
         /// <param name="curve">The response curve.</param>
+        /// <param name="v">The normalized value to be transformed.</param>
         /// <returns>Transformed normalized value.</returns>
         /// <exception cref="ArgumentOutOfRangeException">If <paramref name="curve"/> is outside valid range.</exception>
-        public static float Transform(float x, PredefinedCurve curve)
+        public static float Transform(this Curve curve, float v)
         {
             switch (curve)
             {
-                case PredefinedCurve.Linear:
-                    return x;
-                case PredefinedCurve.Quatratic:
-                    return x * x;
-                case PredefinedCurve.Cubic:
-                    return x * x * x;
+                case Curve.Linear:
+                    return v;
+                case Curve.Quadratic:
+                    return v * v;
+                case Curve.Cubic:
+                    return v * v * v;
                 default:
                     throw new ArgumentOutOfRangeException(nameof(curve));
             }
@@ -38,12 +55,12 @@ public static float Transform(float x, PredefinedCurve curve)
         /// </summary>
         /// <remarks>The provided vector is first transformed to polar form, then the vector length is scaled
         /// before it is finally converted back to euclidean space.</remarks>
-        /// <param name="v">A normalized Euclidean vector to be transformed.</param>
         /// <param name="curve">The response curve.</param>
+        /// <param name="v">A normalized Euclidean vector to be transformed.</param>
         /// <returns>Transformed normalized Euclidean vector.</returns>
-        public static Vector2 Transform(Vector2 v, PredefinedCurve curve)
+        public static Vector2 Transform(this Curve curve, Vector2 v)
         {
-            var r = Transform(v.magnitude, curve);
+            var r = curve.Transform(v.magnitude);
             var theta = Mathf.Atan2(v.y, v.x);
             return new Vector2(r * Mathf.Cos(theta), r * Mathf.Sin(theta));
         }