Slight rework of model providers

Author: keveleigh

Assets/MRTK/Providers/OpenXR/Scripts/MicrosoftControllerModelProvider.cs

@@ -29,13 +29,17 @@ public MicrosoftControllerModelProvider(Utilities.Handedness handedness)
         private readonly ControllerModel controllerModelProvider;
 #endif // MSFT_OPENXR_0_9_4_OR_NEWER
 
-#if MSFT_OPENXR_0_9_4_OR_NEWER
+        // Disables "This async method lacks 'await' operators and will run synchronously." when the correct OpenXR package isn't installed
+#pragma warning disable CS1998
         /// <summary>
         /// Attempts to load the glTF controller model from OpenXR.
         /// </summary>
         /// <returns>The controller model as a GameObject or null if it was unobtainable.</returns>
         public async Task<GameObject> TryGenerateControllerModelFromPlatformSDK()
         {
+            GameObject gltfGameObject = null;
+
+#if MSFT_OPENXR_0_9_4_OR_NEWER
             if (!controllerModelProvider.TryGetControllerModelKey(out ulong modelKey))
             {
                 Debug.LogError("Failed to obtain controller model key from platform.");
@@ -57,15 +61,16 @@ public async Task<GameObject> TryGenerateControllerModelFromPlatformSDK()
             }
 
             Utilities.Gltf.Schema.GltfObject gltfObject = GltfUtility.GetGltfObjectFromGlb(modelStream);
-            GameObject gltfGameObject = await gltfObject.ConstructAsync();
+            gltfGameObject = await gltfObject.ConstructAsync();
 
             if (gltfGameObject != null)
             {
                 ControllerModelDictionary.Add(modelKey, gltfGameObject);
             }
+#endif // MSFT_OPENXR_0_9_4_OR_NEWER
 
             return gltfGameObject;
         }
-#endif // MSFT_OPENXR_0_9_4_OR_NEWER
+#pragma warning restore CS1998
     }
 }

Assets/MRTK/Providers/WindowsMixedReality/Shared/WindowsMixedRealityControllerModelProvider.cs

@@ -2,14 +2,14 @@
 // Licensed under the MIT License.
 
 using Microsoft.MixedReality.Toolkit.Utilities;
+using System.Threading.Tasks;
+using UnityEngine;
 
 #if WINDOWS_UWP
 using Microsoft.MixedReality.Toolkit.Input;
 using Microsoft.MixedReality.Toolkit.Utilities.Gltf.Serialization;
 using System;
 using System.Collections.Generic;
-using System.Threading.Tasks;
-using UnityEngine;
 using Windows.Storage.Streams;
 using Windows.UI.Input.Spatial;
 #endif
@@ -32,13 +32,19 @@ public WindowsMixedRealityControllerModelProvider(Handedness handedness)
         private readonly SpatialInteractionSource spatialInteractionSource;
 
         private static readonly Dictionary<string, GameObject> ControllerModelDictionary = new Dictionary<string, GameObject>(2);
+#endif // WINDOWS_UWP
 
+        // Disables "This async method lacks 'await' operators and will run synchronously." for non-UWP
+#pragma warning disable CS1998
         /// <summary>
         /// Attempts to load the glTF controller model from the Windows SDK.
         /// </summary>
         /// <returns>The controller model as a GameObject or null if it was unobtainable.</returns>
         public async Task<GameObject> TryGenerateControllerModelFromPlatformSDK()
         {
+            GameObject gltfGameObject = null;
+
+#if WINDOWS_UWP
             if (spatialInteractionSource == null)
             {
                 return null;
@@ -70,7 +76,6 @@ public async Task<GameObject> TryGenerateControllerModelFromPlatformSDK()
                 }
             }
 
-            GameObject gltfGameObject = null;
             if (fileBytes != null)
             {
                 Utilities.Gltf.Schema.GltfObject gltfObject = GltfUtility.GetGltfObjectFromGlb(fileBytes);
@@ -80,10 +85,13 @@ public async Task<GameObject> TryGenerateControllerModelFromPlatformSDK()
                     ControllerModelDictionary.Add(GenerateKey(spatialInteractionSource), gltfGameObject);
                 }
             }
+#endif // WINDOWS_UWP
 
             return gltfGameObject;
         }
+#pragma warning restore CS1998
 
+#if WINDOWS_UWP
         private string GenerateKey(SpatialInteractionSource spatialInteractionSource)
         {
             return spatialInteractionSource.Controller.VendorId + "/" + spatialInteractionSource.Controller.ProductId + "/" + spatialInteractionSource.Controller.Version + "/" + spatialInteractionSource.Handedness;