Merge pull request #9897 from keveleigh/fix-android-build

David Kline · web-flow · commit f49902bad4cd · 2021-05-26T18:40:38.000-07:00
Fix building OpenXR for Android
diff --git a/Assets/MRTK/Providers/OpenXR/Scripts/MicrosoftArticulatedHand.cs b/Assets/MRTK/Providers/OpenXR/Scripts/MicrosoftArticulatedHand.cs
@@ -10,7 +10,7 @@
 using UnityEngine;
 using UnityEngine.XR;
 
-#if MSFT_OPENXR
+#if MSFT_OPENXR && (UNITY_STANDALONE_WIN || UNITY_WSA)
 #if MSFT_OPENXR_0_1_3_OR_NEWER
 using FrameTime = Microsoft.MixedReality.OpenXR.FrameTime;
 #else
@@ -27,7 +27,7 @@
 using HandTracker = Microsoft.MixedReality.OpenXR.Preview.HandTracker;
 using Preview = Microsoft.MixedReality.OpenXR.Preview;
 #endif // MSFT_OPENXR_0_2_0_OR_NEWER
-#endif // MSFT_OPENXR
+#endif // MSFT_OPENXR && (UNITY_STANDALONE_WIN || UNITY_WSA)
 
 namespace Microsoft.MixedReality.Toolkit.XRSDK.OpenXR
 {
@@ -51,13 +51,13 @@ public MicrosoftArticulatedHand(TrackingState trackingState, Handedness controll
             handMeshProvider = controllerHandedness == Handedness.Left ? OpenXRHandMeshProvider.Left : OpenXRHandMeshProvider.Right;
             handMeshProvider?.SetInputSource(inputSource);
 
-#if MSFT_OPENXR
+#if MSFT_OPENXR && (UNITY_STANDALONE_WIN || UNITY_WSA)
 #if MSFT_OPENXR_0_2_0_OR_NEWER
             handTracker = controllerHandedness == Handedness.Left ? HandTracker.Left : HandTracker.Right;
 #else
             handTracker = new HandTracker(controllerHandedness == Handedness.Left ? Preview.Handedness.Left : Preview.Handedness.Right, Preview.HandPoseType.Tracked);
 #endif
-#endif // MSFT_OPENXR
+#endif // MSFT_OPENXR && (UNITY_STANDALONE_WIN || UNITY_WSA)
         }
 
         private readonly ArticulatedHandDefinition handDefinition;
@@ -69,14 +69,14 @@ public MicrosoftArticulatedHand(TrackingState trackingState, Handedness controll
         private Quaternion currentPointerRotation = Quaternion.identity;
         private MixedRealityPose currentPointerPose = MixedRealityPose.ZeroIdentity;
 
-#if MSFT_OPENXR
+#if MSFT_OPENXR && (UNITY_STANDALONE_WIN || UNITY_WSA)
         private static readonly HandJoint[] HandJoints = Enum.GetValues(typeof(HandJoint)) as HandJoint[];
         private readonly HandTracker handTracker = null;
         private readonly HandJointLocation[] locations = new HandJointLocation[HandTracker.JointCount];
 #else
         private static readonly HandFinger[] handFingers = Enum.GetValues(typeof(HandFinger)) as HandFinger[];
         private readonly List<Bone> fingerBones = new List<Bone>();
-#endif // MSFT_OPENXR
+#endif // MSFT_OPENXR && (UNITY_STANDALONE_WIN || UNITY_WSA)
 
         #region IMixedRealityHand Implementation
 
@@ -257,7 +257,7 @@ private void UpdateHandData(InputDevice inputDevice)
             {
                 handMeshProvider?.UpdateHandMesh();
 
-#if MSFT_OPENXR
+#if MSFT_OPENXR && (UNITY_STANDALONE_WIN || UNITY_WSA)
                 if (handTracker != null && handTracker.TryLocateHandJoints(FrameTime.OnUpdate, locations))
                 {
                     foreach (HandJoint handJoint in HandJoints)
@@ -295,14 +295,14 @@ private void UpdateHandData(InputDevice inputDevice)
                             }
                         }
                     }
-#endif // MSFT_OPENXR
+#endif // MSFT_OPENXR && (UNITY_STANDALONE_WIN || UNITY_WSA)
 
                     handDefinition?.UpdateHandJoints(unityJointPoses);
                 }
             }
         }
 
-#if MSFT_OPENXR
+#if MSFT_OPENXR && (UNITY_STANDALONE_WIN || UNITY_WSA)
         private TrackedHandJoint ConvertToTrackedHandJoint(HandJoint handJoint)
         {
             switch (handJoint)
@@ -381,6 +381,6 @@ private TrackedHandJoint ConvertToTrackedHandJoint(HandFinger finger, int index)
                 default: return TrackedHandJoint.None;
             }
         }
-#endif // MSFT_OPENXR
+#endif // MSFT_OPENXR && (UNITY_STANDALONE_WIN || UNITY_WSA)
     }
 }
diff --git a/Assets/MRTK/Providers/OpenXR/Scripts/MicrosoftControllerModelProvider.cs b/Assets/MRTK/Providers/OpenXR/Scripts/MicrosoftControllerModelProvider.cs
@@ -4,11 +4,11 @@
 using System.Threading.Tasks;
 using UnityEngine;
 
-#if MSFT_OPENXR_0_9_4_OR_NEWER
+#if MSFT_OPENXR_0_9_4_OR_NEWER && (UNITY_STANDALONE_WIN || UNITY_WSA)
 using Microsoft.MixedReality.OpenXR;
 using Microsoft.MixedReality.Toolkit.Utilities.Gltf.Serialization;
 using System.Collections.Generic;
-#endif // MSFT_OPENXR_0_9_4_OR_NEWER
+#endif // MSFT_OPENXR_0_9_4_OR_NEWER && (UNITY_STANDALONE_WIN || UNITY_WSA)
 
 namespace Microsoft.MixedReality.Toolkit.XRSDK.OpenXR
 {
@@ -19,15 +19,15 @@ internal class MicrosoftControllerModelProvider
     {
         public MicrosoftControllerModelProvider(Utilities.Handedness handedness)
         {
-#if MSFT_OPENXR_0_9_4_OR_NEWER
+#if MSFT_OPENXR_0_9_4_OR_NEWER && (UNITY_STANDALONE_WIN || UNITY_WSA)
             controllerModelProvider = handedness == Utilities.Handedness.Left ? ControllerModel.Left : ControllerModel.Right;
-#endif // MSFT_OPENXR_0_9_4_OR_NEWER
+#endif // MSFT_OPENXR_0_9_4_OR_NEWER && (UNITY_STANDALONE_WIN || UNITY_WSA)
         }
 
-#if MSFT_OPENXR_0_9_4_OR_NEWER
+#if MSFT_OPENXR_0_9_4_OR_NEWER && (UNITY_STANDALONE_WIN || UNITY_WSA)
         private static readonly Dictionary<ulong, GameObject> ControllerModelDictionary = new Dictionary<ulong, GameObject>(2);
         private readonly ControllerModel controllerModelProvider;
-#endif // MSFT_OPENXR_0_9_4_OR_NEWER
+#endif // MSFT_OPENXR_0_9_4_OR_NEWER && (UNITY_STANDALONE_WIN || UNITY_WSA)
 
         // Disables "This async method lacks 'await' operators and will run synchronously." when the correct OpenXR package isn't installed
 #pragma warning disable CS1998
@@ -39,7 +39,7 @@ public async Task<GameObject> TryGenerateControllerModelFromPlatformSDK()
         {
             GameObject gltfGameObject = null;
 
-#if MSFT_OPENXR_0_9_4_OR_NEWER
+#if MSFT_OPENXR_0_9_4_OR_NEWER && (UNITY_STANDALONE_WIN || UNITY_WSA)
             if (!controllerModelProvider.TryGetControllerModelKey(out ulong modelKey))
             {
                 Debug.LogError("Failed to obtain controller model key from platform.");
@@ -76,7 +76,7 @@ public async Task<GameObject> TryGenerateControllerModelFromPlatformSDK()
                     ControllerModelDictionary.Add(modelKey, gltfGameObject);
                 }
             }
-#endif // MSFT_OPENXR_0_9_4_OR_NEWER
+#endif // MSFT_OPENXR_0_9_4_OR_NEWER && (UNITY_STANDALONE_WIN || UNITY_WSA)
 
             return gltfGameObject;
         }
diff --git a/Assets/MRTK/Providers/OpenXR/Scripts/OpenXRHandMeshProvider.cs b/Assets/MRTK/Providers/OpenXR/Scripts/OpenXRHandMeshProvider.cs
@@ -1,11 +1,11 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#if MSFT_OPENXR_0_2_0_OR_NEWER
+#if MSFT_OPENXR_0_2_0_OR_NEWER && (UNITY_STANDALONE_WIN || UNITY_WSA)
 using Microsoft.MixedReality.OpenXR;
 using System.Collections.Generic;
 using UnityEngine;
-#endif // MSFT_OPENXR_0_2_0_OR_NEWER
+#endif // MSFT_OPENXR_0_2_0_OR_NEWER && (UNITY_STANDALONE_WIN || UNITY_WSA)
 
 using Microsoft.MixedReality.Toolkit.Input;
 using Unity.Profiling;
@@ -21,23 +21,23 @@ internal class OpenXRHandMeshProvider
         /// The user's left hand.
         /// </summary>
         public static OpenXRHandMeshProvider Left { get; } =
-#if MSFT_OPENXR_0_2_0_OR_NEWER
+#if MSFT_OPENXR_0_2_0_OR_NEWER && (UNITY_STANDALONE_WIN || UNITY_WSA)
             new OpenXRHandMeshProvider(HandMeshTracker.Left, Utilities.Handedness.Left);
 #else
             null;
-#endif // MSFT_OPENXR_0_2_0_OR_NEWER
+#endif // MSFT_OPENXR_0_2_0_OR_NEWER && (UNITY_STANDALONE_WIN || UNITY_WSA)
 
         /// <summary>
         /// The user's right hand.
         /// </summary>
         public static OpenXRHandMeshProvider Right { get; } =
-#if MSFT_OPENXR_0_2_0_OR_NEWER
+#if MSFT_OPENXR_0_2_0_OR_NEWER && (UNITY_STANDALONE_WIN || UNITY_WSA)
             new OpenXRHandMeshProvider(HandMeshTracker.Right, Utilities.Handedness.Right);
 #else
             null;
-#endif // MSFT_OPENXR_0_2_0_OR_NEWER
+#endif // MSFT_OPENXR_0_2_0_OR_NEWER && (UNITY_STANDALONE_WIN || UNITY_WSA)
 
-#if MSFT_OPENXR_0_2_0_OR_NEWER
+#if MSFT_OPENXR_0_2_0_OR_NEWER && (UNITY_STANDALONE_WIN || UNITY_WSA)
         private OpenXRHandMeshProvider(HandMeshTracker handMeshTracker, Utilities.Handedness handedness)
         {
             this.handMeshTracker = handMeshTracker;
@@ -57,7 +57,7 @@ private OpenXRHandMeshProvider(HandMeshTracker handMeshTracker, Utilities.Handed
         private readonly List<int> triangles = new List<int>();
 
         private Vector2[] handMeshUVs = null;
-#endif // MSFT_OPENXR_0_2_0_OR_NEWER
+#endif // MSFT_OPENXR_0_2_0_OR_NEWER && (UNITY_STANDALONE_WIN || UNITY_WSA)
 
         private IMixedRealityInputSource inputSource = null;
 
@@ -74,7 +74,7 @@ private OpenXRHandMeshProvider(HandMeshTracker handMeshTracker, Utilities.Handed
         /// </summary>
         public void UpdateHandMesh()
         {
-#if MSFT_OPENXR_0_2_0_OR_NEWER
+#if MSFT_OPENXR_0_2_0_OR_NEWER && (UNITY_STANDALONE_WIN || UNITY_WSA)
             using (UpdateHandMeshPerfMarker.Auto())
             {
                 MixedRealityInputSystemProfile inputSystemProfile = CoreServices.InputSystem?.InputSystemProfile;
@@ -154,7 +154,7 @@ private Vector2[] InitializeUVs(Vector3[] neutralPoseVertices)
             }
 
             return uvs;
-#endif // MSFT_OPENXR_0_2_0_OR_NEWER
+#endif // MSFT_OPENXR_0_2_0_OR_NEWER && (UNITY_STANDALONE_WIN || UNITY_WSA)
         }
     }
 }
diff --git a/Assets/MRTK/Providers/OpenXR/Scripts/OpenXRReprojectionUpdater.cs b/Assets/MRTK/Providers/OpenXR/Scripts/OpenXRReprojectionUpdater.cs
@@ -3,10 +3,10 @@
 
 using UnityEngine;
 
-#if MSFT_OPENXR_0_9_4_OR_NEWER
+#if MSFT_OPENXR_0_9_4_OR_NEWER && (UNITY_STANDALONE_WIN || UNITY_WSA)
 using Microsoft.MixedReality.OpenXR;
 using System.Linq;
-#endif // MSFT_OPENXR_0_9_4_OR_NEWER
+#endif // MSFT_OPENXR_0_9_4_OR_NEWER && (UNITY_STANDALONE_WIN || UNITY_WSA)
 
 namespace Microsoft.MixedReality.Toolkit.XRSDK.OpenXR
 {
@@ -17,7 +17,7 @@ public class OpenXRReprojectionUpdater : MonoBehaviour
         /// </summary>
         public HolographicReprojectionMethod ReprojectionMethod { get; set; }
 
-#if MSFT_OPENXR_0_9_4_OR_NEWER
+#if MSFT_OPENXR_0_9_4_OR_NEWER && (UNITY_STANDALONE_WIN || UNITY_WSA)
         private ReprojectionSettings reprojectionSettings = default;
 
         private void OnPostRender()
@@ -54,6 +54,6 @@ private ReprojectionMode MapMRTKReprojectionMethodToOpenXR(HolographicReprojecti
                     return ReprojectionMode.NoReprojection;
             }
         }
-#endif // MSFT_OPENXR_0_9_4_OR_NEWER
+#endif // MSFT_OPENXR_0_9_4_OR_NEWER && (UNITY_STANDALONE_WIN || UNITY_WSA)
     }
 }
diff --git a/Assets/MRTK/Providers/OpenXR/Scripts/OpenXRSpatialAwarenessMeshObserver.cs b/Assets/MRTK/Providers/OpenXR/Scripts/OpenXRSpatialAwarenessMeshObserver.cs
@@ -5,11 +5,11 @@
 using Microsoft.MixedReality.Toolkit.Utilities;
 using UnityEngine;
 
-#if MSFT_OPENXR_0_9_4_OR_NEWER
+#if MSFT_OPENXR_0_9_4_OR_NEWER && (UNITY_STANDALONE_WIN || UNITY_WSA)
 using Microsoft.MixedReality.OpenXR;
 using Unity.Profiling;
 using UnityEngine.XR.OpenXR;
-#endif // MSFT_OPENXR_0_9_4_OR_NEWER
+#endif // MSFT_OPENXR_0_9_4_OR_NEWER && (UNITY_STANDALONE_WIN || UNITY_WSA)
 
 namespace Microsoft.MixedReality.Toolkit.XRSDK.OpenXR
 {
@@ -40,13 +40,13 @@ public OpenXRSpatialAwarenessMeshObserver(
         { }
 
         protected override bool? IsActiveLoader =>
-#if MSFT_OPENXR_0_9_4_OR_NEWER
+#if MSFT_OPENXR_0_9_4_OR_NEWER && (UNITY_STANDALONE_WIN || UNITY_WSA)
             LoaderHelpers.IsLoaderActive<OpenXRLoaderBase>();
 #else
             false;
-#endif // MSFT_OPENXR_0_9_4_OR_NEWER
+#endif // MSFT_OPENXR_0_9_4_OR_NEWER && (UNITY_STANDALONE_WIN || UNITY_WSA)
 
-#if MSFT_OPENXR_0_9_4_OR_NEWER
+#if MSFT_OPENXR_0_9_4_OR_NEWER && (UNITY_STANDALONE_WIN || UNITY_WSA)
         private static readonly ProfilerMarker ApplyUpdatedMeshDisplayOptionPerfMarker = new ProfilerMarker($"[MRTK] {nameof(OpenXRSpatialAwarenessMeshObserver)}.ApplyUpdatedMeshDisplayOption");
 
         /// <inheritdoc/>
@@ -107,6 +107,6 @@ private VisualMeshLevelOfDetail MapMRTKLevelOfDetailToOpenXR(SpatialAwarenessMes
                     return VisualMeshLevelOfDetail.Coarse;
             }
         }
-#endif // MSFT_OPENXR_0_9_4_OR_NEWER
+#endif // MSFT_OPENXR_0_9_4_OR_NEWER && (UNITY_STANDALONE_WIN || UNITY_WSA)
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`using UnityEngine;`
`11`	`11`	`using UnityEngine.XR;`
`12`	`12`
`13`		`-#if MSFT_OPENXR`
	`13`	`+#if MSFT_OPENXR && (UNITY_STANDALONE_WIN \|\| UNITY_WSA)`
`14`	`14`	`#if MSFT_OPENXR_0_1_3_OR_NEWER`
`15`	`15`	`using FrameTime = Microsoft.MixedReality.OpenXR.FrameTime;`
`16`	`16`	`#else`
`@@ -27,7 +27,7 @@`
`27`	`27`	`using HandTracker = Microsoft.MixedReality.OpenXR.Preview.HandTracker;`
`28`	`28`	`using Preview = Microsoft.MixedReality.OpenXR.Preview;`
`29`	`29`	`#endif // MSFT_OPENXR_0_2_0_OR_NEWER`
`30`		`-#endif // MSFT_OPENXR`
	`30`	`+#endif // MSFT_OPENXR && (UNITY_STANDALONE_WIN \|\| UNITY_WSA)`
`31`	`31`
`32`	`32`	`namespace Microsoft.MixedReality.Toolkit.XRSDK.OpenXR`
`33`	`33`	`{`
`@@ -51,13 +51,13 @@ public MicrosoftArticulatedHand(TrackingState trackingState, Handedness controll`
`51`	`51`	`handMeshProvider = controllerHandedness == Handedness.Left ? OpenXRHandMeshProvider.Left : OpenXRHandMeshProvider.Right;`
`52`	`52`	`handMeshProvider?.SetInputSource(inputSource);`
`53`	`53`
`54`		`-#if MSFT_OPENXR`
	`54`	`+#if MSFT_OPENXR && (UNITY_STANDALONE_WIN \|\| UNITY_WSA)`
`55`	`55`	`#if MSFT_OPENXR_0_2_0_OR_NEWER`
`56`	`56`	`handTracker = controllerHandedness == Handedness.Left ? HandTracker.Left : HandTracker.Right;`
`57`	`57`	`#else`
`58`	`58`	`handTracker = new HandTracker(controllerHandedness == Handedness.Left ? Preview.Handedness.Left : Preview.Handedness.Right, Preview.HandPoseType.Tracked);`
`59`	`59`	`#endif`
`60`		`-#endif // MSFT_OPENXR`
	`60`	`+#endif // MSFT_OPENXR && (UNITY_STANDALONE_WIN \|\| UNITY_WSA)`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`private readonly ArticulatedHandDefinition handDefinition;`
`@@ -69,14 +69,14 @@ public MicrosoftArticulatedHand(TrackingState trackingState, Handedness controll`
`69`	`69`	`private Quaternion currentPointerRotation = Quaternion.identity;`
`70`	`70`	`private MixedRealityPose currentPointerPose = MixedRealityPose.ZeroIdentity;`
`71`	`71`
`72`		`-#if MSFT_OPENXR`
	`72`	`+#if MSFT_OPENXR && (UNITY_STANDALONE_WIN \|\| UNITY_WSA)`
`73`	`73`	`private static readonly HandJoint[] HandJoints = Enum.GetValues(typeof(HandJoint)) as HandJoint[];`
`74`	`74`	`private readonly HandTracker handTracker = null;`
`75`	`75`	`private readonly HandJointLocation[] locations = new HandJointLocation[HandTracker.JointCount];`
`76`	`76`	`#else`
`77`	`77`	`private static readonly HandFinger[] handFingers = Enum.GetValues(typeof(HandFinger)) as HandFinger[];`
`78`	`78`	`private readonly List<Bone> fingerBones = new List<Bone>();`
`79`		`-#endif // MSFT_OPENXR`
	`79`	`+#endif // MSFT_OPENXR && (UNITY_STANDALONE_WIN \|\| UNITY_WSA)`
`80`	`80`
`81`	`81`	`#region IMixedRealityHand Implementation`
`82`	`82`
`@@ -257,7 +257,7 @@ private void UpdateHandData(InputDevice inputDevice)`
`257`	`257`	`{`
`258`	`258`	`handMeshProvider?.UpdateHandMesh();`
`259`	`259`
`260`		`-#if MSFT_OPENXR`
	`260`	`+#if MSFT_OPENXR && (UNITY_STANDALONE_WIN \|\| UNITY_WSA)`
`261`	`261`	`if (handTracker != null && handTracker.TryLocateHandJoints(FrameTime.OnUpdate, locations))`
`262`	`262`	`{`
`263`	`263`	`foreach (HandJoint handJoint in HandJoints)`
`@@ -295,14 +295,14 @@ private void UpdateHandData(InputDevice inputDevice)`
`295`	`295`	`}`
`296`	`296`	`}`
`297`	`297`	`}`
`298`		`-#endif // MSFT_OPENXR`
	`298`	`+#endif // MSFT_OPENXR && (UNITY_STANDALONE_WIN \|\| UNITY_WSA)`
`299`	`299`
`300`	`300`	`handDefinition?.UpdateHandJoints(unityJointPoses);`
`301`	`301`	`}`
`302`	`302`	`}`
`303`	`303`	`}`
`304`	`304`
`305`		`-#if MSFT_OPENXR`
	`305`	`+#if MSFT_OPENXR && (UNITY_STANDALONE_WIN \|\| UNITY_WSA)`
`306`	`306`	`private TrackedHandJoint ConvertToTrackedHandJoint(HandJoint handJoint)`
`307`	`307`	`{`
`308`	`308`	`switch (handJoint)`
`@@ -381,6 +381,6 @@ private TrackedHandJoint ConvertToTrackedHandJoint(HandFinger finger, int index)`
`381`	`381`	`default: return TrackedHandJoint.None;`
`382`	`382`	`}`
`383`	`383`	`}`
`384`		`-#endif // MSFT_OPENXR`
	`384`	`+#endif // MSFT_OPENXR && (UNITY_STANDALONE_WIN \|\| UNITY_WSA)`
`385`	`385`	`}`
`386`	`386`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,11 @@`
`4`	`4`	`using System.Threading.Tasks;`
`5`	`5`	`using UnityEngine;`
`6`	`6`
`7`		`-#if MSFT_OPENXR_0_9_4_OR_NEWER`
	`7`	`+#if MSFT_OPENXR_0_9_4_OR_NEWER && (UNITY_STANDALONE_WIN \|\| UNITY_WSA)`
`8`	`8`	`using Microsoft.MixedReality.OpenXR;`
`9`	`9`	`using Microsoft.MixedReality.Toolkit.Utilities.Gltf.Serialization;`
`10`	`10`	`using System.Collections.Generic;`
`11`		`-#endif // MSFT_OPENXR_0_9_4_OR_NEWER`
	`11`	`+#endif // MSFT_OPENXR_0_9_4_OR_NEWER && (UNITY_STANDALONE_WIN \|\| UNITY_WSA)`
`12`	`12`
`13`	`13`	`namespace Microsoft.MixedReality.Toolkit.XRSDK.OpenXR`
`14`	`14`	`{`
`@@ -19,15 +19,15 @@ internal class MicrosoftControllerModelProvider`
`19`	`19`	`{`
`20`	`20`	`public MicrosoftControllerModelProvider(Utilities.Handedness handedness)`
`21`	`21`	`{`
`22`		`-#if MSFT_OPENXR_0_9_4_OR_NEWER`
	`22`	`+#if MSFT_OPENXR_0_9_4_OR_NEWER && (UNITY_STANDALONE_WIN \|\| UNITY_WSA)`
`23`	`23`	`controllerModelProvider = handedness == Utilities.Handedness.Left ? ControllerModel.Left : ControllerModel.Right;`
`24`		`-#endif // MSFT_OPENXR_0_9_4_OR_NEWER`
	`24`	`+#endif // MSFT_OPENXR_0_9_4_OR_NEWER && (UNITY_STANDALONE_WIN \|\| UNITY_WSA)`
`25`	`25`	`}`
`26`	`26`
`27`		`-#if MSFT_OPENXR_0_9_4_OR_NEWER`
	`27`	`+#if MSFT_OPENXR_0_9_4_OR_NEWER && (UNITY_STANDALONE_WIN \|\| UNITY_WSA)`
`28`	`28`	`private static readonly Dictionary<ulong, GameObject> ControllerModelDictionary = new Dictionary<ulong, GameObject>(2);`
`29`	`29`	`private readonly ControllerModel controllerModelProvider;`
`30`		`-#endif // MSFT_OPENXR_0_9_4_OR_NEWER`
	`30`	`+#endif // MSFT_OPENXR_0_9_4_OR_NEWER && (UNITY_STANDALONE_WIN \|\| UNITY_WSA)`
`31`	`31`
`32`	`32`	`// Disables "This async method lacks 'await' operators and will run synchronously." when the correct OpenXR package isn't installed`
`33`	`33`	`#pragma warning disable CS1998`
`@@ -39,7 +39,7 @@ public async Task<GameObject> TryGenerateControllerModelFromPlatformSDK()`
`39`	`39`	`{`
`40`	`40`	`GameObject gltfGameObject = null;`
`41`	`41`
`42`		`-#if MSFT_OPENXR_0_9_4_OR_NEWER`
	`42`	`+#if MSFT_OPENXR_0_9_4_OR_NEWER && (UNITY_STANDALONE_WIN \|\| UNITY_WSA)`
`43`	`43`	`if (!controllerModelProvider.TryGetControllerModelKey(out ulong modelKey))`
`44`	`44`	`{`
`45`	`45`	`Debug.LogError("Failed to obtain controller model key from platform.");`
`@@ -76,7 +76,7 @@ public async Task<GameObject> TryGenerateControllerModelFromPlatformSDK()`
`76`	`76`	`ControllerModelDictionary.Add(modelKey, gltfGameObject);`
`77`	`77`	`}`
`78`	`78`	`}`
`79`		`-#endif // MSFT_OPENXR_0_9_4_OR_NEWER`
	`79`	`+#endif // MSFT_OPENXR_0_9_4_OR_NEWER && (UNITY_STANDALONE_WIN \|\| UNITY_WSA)`
`80`	`80`
`81`	`81`	`return gltfGameObject;`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,10 +3,10 @@`
`3`	`3`
`4`	`4`	`using UnityEngine;`
`5`	`5`
`6`		`-#if MSFT_OPENXR_0_9_4_OR_NEWER`
	`6`	`+#if MSFT_OPENXR_0_9_4_OR_NEWER && (UNITY_STANDALONE_WIN \|\| UNITY_WSA)`
`7`	`7`	`using Microsoft.MixedReality.OpenXR;`
`8`	`8`	`using System.Linq;`
`9`		`-#endif // MSFT_OPENXR_0_9_4_OR_NEWER`
	`9`	`+#endif // MSFT_OPENXR_0_9_4_OR_NEWER && (UNITY_STANDALONE_WIN \|\| UNITY_WSA)`
`10`	`10`
`11`	`11`	`namespace Microsoft.MixedReality.Toolkit.XRSDK.OpenXR`
`12`	`12`	`{`
`@@ -17,7 +17,7 @@ public class OpenXRReprojectionUpdater : MonoBehaviour`
`17`	`17`	`/// </summary>`
`18`	`18`	`public HolographicReprojectionMethod ReprojectionMethod { get; set; }`
`19`	`19`
`20`		`-#if MSFT_OPENXR_0_9_4_OR_NEWER`
	`20`	`+#if MSFT_OPENXR_0_9_4_OR_NEWER && (UNITY_STANDALONE_WIN \|\| UNITY_WSA)`
`21`	`21`	`private ReprojectionSettings reprojectionSettings = default;`
`22`	`22`
`23`	`23`	`private void OnPostRender()`
`@@ -54,6 +54,6 @@ private ReprojectionMode MapMRTKReprojectionMethodToOpenXR(HolographicReprojecti`
`54`	`54`	`return ReprojectionMode.NoReprojection;`
`55`	`55`	`}`
`56`	`56`	`}`
`57`		`-#endif // MSFT_OPENXR_0_9_4_OR_NEWER`
	`57`	`+#endif // MSFT_OPENXR_0_9_4_OR_NEWER && (UNITY_STANDALONE_WIN \|\| UNITY_WSA)`
`58`	`58`	`}`
`59`	`59`	`}`