reverted touch input removal

Author: StephenHodgson

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

@@ -194,6 +194,11 @@ private void InitializeInternal()
 
             speechEventData = new SpeechEventData(EventSystem.current);
             dictationEventData = new DictationEventData(EventSystem.current);
+
+            if (MixedRealityManager.Instance.ActiveProfile.InputSystemProfile.IsTouchScreenInputEnabled)
+            {
+                TouchscreenInputSource = new TouchscreenInputSource();
+            }
         }
 
         /// <inheritdoc />

Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityInputSystemProfile.asset

@@ -17,6 +17,9 @@ MonoBehaviour:
   pointerProfile: {fileID: 11400000, guid: 48aa63a9725047b28d4137fd0834bc31, type: 2}
   speechCommandsProfile: {fileID: 11400000, guid: e8d0393e66374dae9646851a57dc6bc1,
     type: 2}
+  enableTouchScreenInput: 1
+  touchScreenInputProfile: {fileID: 11400000, guid: efe3718cb67cffa46a5f6361a522baba,
+    type: 2}
   enableControllerMapping: 1
   controllerMappingProfile: {fileID: 11400000, guid: 39ded1fd0711a0c448413d0e1ec4f7f3,
     type: 2}

Assets/MixedRealityToolkit/_Core/Definitions/InputSystem/MixedRealityInputSystemProfile.cs

@@ -53,6 +53,7 @@ public MixedRealityPointerProfile PointerProfile
             get { return pointerProfile; }
             private set { pointerProfile = value; }
         }
+
         private IMixedRealitySpeechSystem speechSystem;
 
         /// <summary>
@@ -90,6 +91,32 @@ public MixedRealitySpeechCommandsProfile SpeechCommandsProfile
         /// </summary>
         public bool IsDictationEnabled => MixedRealityManager.Instance.ActiveProfile.IsInputSystemEnabled && DictationManager != null;
 
+        [SerializeField]
+        [Tooltip("Enable Touch Screen Input for your application.")]
+        private bool enableTouchScreenInput = false;
+
+        /// <summary>
+        /// Enable Touch Screen Input for your application.
+        /// </summary>
+        public bool IsTouchScreenInputEnabled
+        {
+            get { return touchScreenInputProfile != null && enableTouchScreenInput && MixedRealityManager.Instance.ActiveProfile.IsInputSystemEnabled; }
+            private set { enableTouchScreenInput = value; }
+        }
+
+        [SerializeField]
+        [Tooltip("Touch Screen Input Source profile for wiring up Actions.")]
+        private MixedRealityTouchInputProfile touchScreenInputProfile;
+
+        /// <summary>
+        /// Touch Screen Input Source profile for wiring up Actions.
+        /// </summary>
+        public MixedRealityTouchInputProfile TouchScreenInputProfile
+        {
+            get { return touchScreenInputProfile; }
+            private set { touchScreenInputProfile = value; }
+        }
+
         [SerializeField]
         [Tooltip("Enable and configure the devices for your application.")]
         private bool enableControllerMapping = false;

Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityInputSystemProfileInspector.cs

@@ -15,6 +15,8 @@ public class MixedRealityInputSystemProfileInspector : MixedRealityBaseConfigura
         private SerializedProperty gesturesProfile;
         private SerializedProperty pointerProfile;
         private SerializedProperty speechCommandsProfile;
+        private SerializedProperty enableTouchScreenInput;
+        private SerializedProperty touchScreenInputProfile;
         private SerializedProperty enableControllerMapping;
         private SerializedProperty controllerMappingProfile;
 
@@ -34,6 +36,8 @@ private void OnEnable()
             gesturesProfile = serializedObject.FindProperty("gesturesProfile");
             pointerProfile = serializedObject.FindProperty("pointerProfile");
             speechCommandsProfile = serializedObject.FindProperty("speechCommandsProfile");
+            enableTouchScreenInput = serializedObject.FindProperty("enableTouchScreenInput");
+            touchScreenInputProfile = serializedObject.FindProperty("touchScreenInputProfile");
             enableControllerMapping = serializedObject.FindProperty("enableControllerMapping");
             controllerMappingProfile = serializedObject.FindProperty("controllerMappingProfile");
         }
@@ -67,6 +71,9 @@ public override void OnInspectorGUI()
             changed |= RenderProfile(pointerProfile);
             changed |= RenderProfile(speechCommandsProfile);
 
+            EditorGUILayout.PropertyField(enableTouchScreenInput);
+            changed |= RenderProfile(touchScreenInputProfile);
+
             EditorGUILayout.PropertyField(enableControllerMapping);
             changed |= RenderProfile(controllerMappingProfile);