Merge pull request #2687 from StephenHodgson/vNEXT-TouchScreenInputSourceUpdate

Refactored Touch Screen Input Source to Device Manager

Author: David Kline

Assets/MixedRealityToolkit-SDK/Features/Input/MixedRealityInputManager.cs

@@ -70,11 +70,6 @@ public class MixedRealityInputManager : MixedRealityEventManager, IMixedRealityI
         private SpeechEventData speechEventData;
         private DictationEventData dictationEventData;
 
-        /// <summary>
-        /// Current Touch Screen Input Source.
-        /// </summary>
-        public TouchscreenInputSource TouchscreenInputSource { get; private set; }
-
         #region IMixedRealityManager Implementation
 
         /// <summary>
@@ -194,11 +189,6 @@ private void InitializeInternal()
 
             speechEventData = new SpeechEventData(EventSystem.current);
             dictationEventData = new DictationEventData(EventSystem.current);
-
-            if (MixedRealityManager.Instance.ActiveProfile.InputSystemProfile.IsTouchScreenInputEnabled)
-            {
-                TouchscreenInputSource = new TouchscreenInputSource();
-            }
         }
 
         /// <inheritdoc />
@@ -257,7 +247,6 @@ public override void Destroy()
                 UnityEngine.Object.Destroy(gazeProvider);
             }
 
-            TouchscreenInputSource?.Dispose();
             base.Destroy();
         }
 
@@ -1168,6 +1157,20 @@ public void RaiseGestureUpdated(IMixedRealityController controller, MixedReality
             HandleEvent(inputEventData, OnGestureUpdated);
         }
 
+        private static readonly ExecuteEvents.EventFunction<IMixedRealityGestureHandler<Vector2>> OnGestureVector2PositionUpdated =
+                delegate (IMixedRealityGestureHandler<Vector2> handler, BaseEventData eventData)
+                {
+                    var casted = ExecuteEvents.ValidateEventData<InputEventData<Vector2>>(eventData);
+                    handler.OnGestureUpdated(casted);
+                };
+
+        /// <inheritdoc />
+        public void RaiseGestureUpdated(IMixedRealityController controller, MixedRealityInputAction action, Vector2 inputData)
+        {
+            vector2InputEventData.Initialize(controller.InputSource, controller.ControllerHandedness, action, inputData);
+            HandleEvent(vector2InputEventData, OnGestureVector2PositionUpdated);
+        }
+
         private static readonly ExecuteEvents.EventFunction<IMixedRealityGestureHandler<Vector3>> OnGesturePositionUpdated =
             delegate (IMixedRealityGestureHandler<Vector3> handler, BaseEventData eventData)
             {
@@ -1224,6 +1227,20 @@ public void RaiseGestureCompleted(IMixedRealityController controller, MixedReali
             HandleEvent(inputEventData, OnGestureCompleted);
         }
 
+        private static readonly ExecuteEvents.EventFunction<IMixedRealityGestureHandler<Vector2>> OnGestureVector2PositionCompleted =
+                delegate (IMixedRealityGestureHandler<Vector2> handler, BaseEventData eventData)
+                {
+                    var casted = ExecuteEvents.ValidateEventData<InputEventData<Vector2>>(eventData);
+                    handler.OnGestureCompleted(casted);
+                };
+
+        /// <inheritdoc />
+        public void RaiseGestureCompleted(IMixedRealityController controller, MixedRealityInputAction action, Vector2 inputData)
+        {
+            vector2InputEventData.Initialize(controller.InputSource, controller.ControllerHandedness, action, inputData);
+            HandleEvent(vector2InputEventData, OnGestureVector2PositionCompleted);
+        }
+
         private static readonly ExecuteEvents.EventFunction<IMixedRealityGestureHandler<Vector3>> OnGesturePositionCompleted =
             delegate (IMixedRealityGestureHandler<Vector3> handler, BaseEventData eventData)
             {
@@ -1266,11 +1283,18 @@ public void RaiseGestureCompleted(IMixedRealityController controller, MixedReali
             HandleEvent(inputEventData, OnGesturePoseCompleted);
         }
 
+        private static readonly ExecuteEvents.EventFunction<IMixedRealityGestureHandler> OnGestureCanceled =
+                delegate (IMixedRealityGestureHandler handler, BaseEventData eventData)
+                {
+                    var casted = ExecuteEvents.ValidateEventData<InputEventData>(eventData);
+                    handler.OnGestureCanceled(casted);
+                };
+
         /// <inheritdoc />
         public void RaiseGestureCanceled(IMixedRealityController controller, MixedRealityInputAction action)
         {
             inputEventData.Initialize(controller.InputSource, controller.ControllerHandedness, action);
-            HandleEvent(inputEventData, OnGesturePositionUpdated);
+            HandleEvent(inputEventData, OnGestureCanceled);
         }
 
         #endregion Gesture Events