Merge pull request #9060 from keveleigh/openxr

Add OpenXR input data providers

Author: keveleigh

Assets/MRTK/Core/Inspectors/Setup/MixedRealityProjectConfiguratorWindow.cs

@@ -29,6 +29,10 @@ public class MixedRealityProjectConfiguratorWindow : EditorWindow
             { MRConfig.EyeTrackingCapability, true },
 #endif // UNITY_2019_3_OR_NEWER
 
+#if UNITY_2019_3_OR_NEWER
+            { MRConfig.NewInputSystem, true },
+#endif // UNITY_2019_3_OR_NEWER
+
             // Android Settings
             { MRConfig.AndroidMultiThreadedRendering, true },
             { MRConfig.AndroidMinSdkVersion, true },
@@ -186,6 +190,11 @@ private void RenderConfigurations()
 #endif
 #endif // UNITY_2019_3_OR_NEWER
                 RenderToggle(MRConfig.SpatialAwarenessLayer, "Set default Spatial Awareness layer");
+
+#if UNITY_2019_3_OR_NEWER
+                RenderToggle(MRConfig.NewInputSystem, "Enable old input system for input simulation (won't disable new input system)");
+#endif // UNITY_2019_3_OR_NEWER
+
                 PromptForAudioSpatializer();
                 EditorGUILayout.Space();
 

Assets/MRTK/Core/Utilities/Editor/Setup/MixedRealityProjectConfigurator.cs

@@ -53,6 +53,8 @@ public enum Configurations
             InternetClientCapability,
 #if UNITY_2019_3_OR_NEWER
             EyeTrackingCapability,
+
+            NewInputSystem,
 #endif // UNITY_2019_3_OR_NEWER
 
             // Android Settings
@@ -131,6 +133,14 @@ public bool IsActiveBuildTargetValid()
 #if UNITY_2019_3_OR_NEWER
             { Configurations.EyeTrackingCapability, new ConfigGetter(() => GetCapability(PlayerSettings.WSACapability.GazeInput), BuildTarget.WSAPlayer) },
 #endif // UNITY_2019_3_OR_NEWER
+ 
+#if UNITY_2019_3_OR_NEWER
+            { Configurations.NewInputSystem, new ConfigGetter(() => {
+                SerializedObject settings = new SerializedObject(Unsupported.GetSerializedAssetInterfaceSingleton(nameof(PlayerSettings)));
+                SerializedProperty newInputEnabledProp = settings?.FindProperty("activeInputHandler");
+                return newInputEnabledProp?.intValue != 1; })
+            },
+#endif // UNITY_2019_3_OR_NEWER
 
             // Android Settings
             { Configurations.AndroidMultiThreadedRendering, new ConfigGetter(() => !PlayerSettings.GetMobileMTRendering(BuildTargetGroup.Android), BuildTarget.Android) },
@@ -168,6 +178,27 @@ public bool IsActiveBuildTargetValid()
             { Configurations.EyeTrackingCapability,  () => PlayerSettings.WSA.SetCapability(PlayerSettings.WSACapability.GazeInput, true) },
 #endif // UNITY_2019_3_OR_NEWER
 
+#if UNITY_2019_3_OR_NEWER
+            { Configurations.NewInputSystem,  () => {
+                if (EditorUtility.DisplayDialog("Unity editor restart required", "The Unity editor must be restarted for the input system change to take effect. Cancel or apply.", "Apply", "Cancel"))
+                {
+                    SerializedObject settings = new SerializedObject(Unsupported.GetSerializedAssetInterfaceSingleton(nameof(PlayerSettings)));
+
+                    if (settings != null)
+                    {
+                        settings.Update();
+                        SerializedProperty activeInputHandlerProperty = settings.FindProperty("activeInputHandler");
+                        if (activeInputHandlerProperty != null)
+                        {
+                            activeInputHandlerProperty.intValue = 2;
+                            settings.ApplyModifiedProperties();
+                            typeof(EditorApplication).GetMethod("RestartEditorAndRecompileScripts", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Static)?.Invoke(null, null);
+                        }
+                    }
+                }}
+            },
+#endif // UNITY_2019_3_OR_NEWER
+
             // Android Settings
             { Configurations.AndroidMultiThreadedRendering, () => PlayerSettings.SetMobileMTRendering(BuildTargetGroup.Android, false) },
             { Configurations.AndroidMinSdkVersion, () => PlayerSettings.Android.minSdkVersion = MinAndroidSdk },

Assets/MRTK/Providers/OpenXR.meta

@@ -0,0 +1,37 @@
+{
+    "name": "Microsoft.MixedReality.Toolkit.Providers.OpenXR",
+    "rootNamespace": "",
+    "references": [
+        "Microsoft.MixedReality.OpenXR",
+        "Microsoft.MixedReality.Toolkit",
+        "Microsoft.MixedReality.Toolkit.Providers.XRSDK",
+        "Unity.XR.OpenXR"
+    ],
+    "includePlatforms": [
+        "Editor",
+        "WSA",
+        "WindowsStandalone32",
+        "WindowsStandalone64"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [
+        "UNITY_2020_2_OR_NEWER"
+    ],
+    "versionDefines": [
+        {
+            "name": "com.microsoft.mixedreality.openxr",
+            "expression": "",
+            "define": "MSFT_OPENXR"
+        },
+        {
+            "name": "com.unity.xr.openxr",
+            "expression": "",
+            "define": "UNITY_OPENXR"
+        }
+    ],
+    "noEngineReferences": false
+}

Assets/MRTK/Providers/OpenXR/MRTK.OpenXR.asmdef

@@ -0,0 +1,33 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a4a1c93114e9437cb75d8b3ee4e0e1ba, type: 3}
+  m_Name: DefaultOpenXRCameraProfile
+  m_EditorClassIdentifier: 
+  isCustomProfile: 0
+  settingsConfigurations:
+  - componentType:
+      reference: Microsoft.MixedReality.Toolkit.XRSDK.GenericXRSDKCameraSettings,
+        Microsoft.MixedReality.Toolkit.Providers.XRSDK
+    componentName: XR SDK Camera Settings
+    priority: 0
+    runtimePlatform: -1
+    settingsProfile: {fileID: 0}
+  nearClipPlaneOpaqueDisplay: 0.1
+  farClipPlaneOpaqueDisplay: 1000
+  cameraClearFlagsOpaqueDisplay: 1
+  backgroundColorOpaqueDisplay: {r: 0, g: 0, b: 0, a: 1}
+  opaqueQualityLevel: 5
+  nearClipPlaneTransparentDisplay: 0.1
+  farClipPlaneTransparentDisplay: 50
+  cameraClearFlagsTransparentDisplay: 2
+  backgroundColorTransparentDisplay: {r: 0, g: 0, b: 0, a: 0}
+  transparentQualityLevel: 0

Assets/MRTK/Providers/OpenXR/MRTK.OpenXR.asmdef.meta

@@ -0,0 +1,56 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7612acbc1a4a4ed0afa5f4ccbe42bee4, type: 3}
+  m_Name: DefaultOpenXRConfigurationProfile
+  m_EditorClassIdentifier: 
+  isCustomProfile: 0
+  targetExperienceScale: 3
+  enableCameraSystem: 1
+  cameraProfile: {fileID: 11400000, guid: 6d8face473a227c43b8c2b4bba9c9204, type: 2}
+  cameraSystemType:
+    reference: Microsoft.MixedReality.Toolkit.CameraSystem.MixedRealityCameraSystem,
+      Microsoft.MixedReality.Toolkit.Services.CameraSystem
+  enableInputSystem: 1
+  inputSystemProfile: {fileID: 11400000, guid: b11f151f3f7f6c94bae2b732652af41c, type: 2}
+  inputSystemType:
+    reference: Microsoft.MixedReality.Toolkit.Input.MixedRealityInputSystem, Microsoft.MixedReality.Toolkit.Services.InputSystem
+  enableBoundarySystem: 1
+  boundarySystemType:
+    reference: Microsoft.MixedReality.Toolkit.XRSDK.XRSDKBoundarySystem, Microsoft.MixedReality.Toolkit.Providers.XRSDK
+  boundaryVisualizationProfile: {fileID: 11400000, guid: 6d28cce596b44bd3897ca86f8b24e076,
+    type: 2}
+  enableTeleportSystem: 1
+  teleportSystemType:
+    reference: Microsoft.MixedReality.Toolkit.Teleport.MixedRealityTeleportSystem,
+      Microsoft.MixedReality.Toolkit.Services.TeleportSystem
+  enableSpatialAwarenessSystem: 1
+  spatialAwarenessSystemType:
+    reference: Microsoft.MixedReality.Toolkit.SpatialAwareness.MixedRealitySpatialAwarenessSystem,
+      Microsoft.MixedReality.Toolkit.Services.SpatialAwarenessSystem
+  spatialAwarenessSystemProfile: {fileID: 11400000, guid: bacc3ee1fe0019e488dcc47839b347a6,
+    type: 2}
+  diagnosticsSystemProfile: {fileID: 11400000, guid: 478436bd1083882479a52d067e98e537,
+    type: 2}
+  enableDiagnosticsSystem: 0
+  diagnosticsSystemType:
+    reference: Microsoft.MixedReality.Toolkit.Diagnostics.MixedRealityDiagnosticsSystem,
+      Microsoft.MixedReality.Toolkit.Services.DiagnosticsSystem
+  sceneSystemProfile: {fileID: 11400000, guid: 069efa41032a317409790a6a08435311, type: 2}
+  enableSceneSystem: 0
+  sceneSystemType:
+    reference: Microsoft.MixedReality.Toolkit.SceneSystem.MixedRealitySceneSystem,
+      Microsoft.MixedReality.Toolkit.Services.SceneSystem
+  registeredServiceProvidersProfile: {fileID: 11400000, guid: efbaf6ea540c69f4fb75415a5d145a53,
+    type: 2}
+  useServiceInspectors: 0
+  renderDepthBuffer: 0
+  enableVerboseLogging: 0