Merge pull request #3742 from keveleigh/wsa-capabilities

Update services to manage their WSA capabilities

Author: David Kline

Assets/MixedRealityToolkit.Providers/WindowsVoiceInput/WindowsDictationInputProvider.cs

@@ -79,6 +79,22 @@ public WindowsDictationInputProvider(
         private readonly WaitUntil waitUntilDictationRecognizerHasStarted = new WaitUntil(() => dictationRecognizer.Status != SpeechSystemStatus.Stopped);
         private readonly WaitUntil waitUntilDictationRecognizerHasStopped = new WaitUntil(() => dictationRecognizer.Status != SpeechSystemStatus.Running);
 
+#if UNITY_EDITOR
+        /// <inheritdoc />
+        public override void Initialize()
+        {
+            if (!UnityEditor.PlayerSettings.WSA.GetCapability(UnityEditor.PlayerSettings.WSACapability.Microphone))
+            {
+                UnityEditor.PlayerSettings.WSA.SetCapability(UnityEditor.PlayerSettings.WSACapability.Microphone, true);
+            }
+
+            if (!UnityEditor.PlayerSettings.WSA.GetCapability(UnityEditor.PlayerSettings.WSACapability.InternetClient))
+            {
+                UnityEditor.PlayerSettings.WSA.SetCapability(UnityEditor.PlayerSettings.WSACapability.InternetClient, true);
+            }
+        }
+#endif // UNITY_EDITOR
+
         /// <inheritdoc />
         public override void Enable()
         {
@@ -151,6 +167,18 @@ public override async void Disable()
         /// <inheritdoc />
         public override void Destroy()
         {
+#if UNITY_EDITOR
+            if (UnityEditor.PlayerSettings.WSA.GetCapability(UnityEditor.PlayerSettings.WSACapability.Microphone))
+            {
+                UnityEditor.PlayerSettings.WSA.SetCapability(UnityEditor.PlayerSettings.WSACapability.Microphone, false);
+            }
+
+            if (UnityEditor.PlayerSettings.WSA.GetCapability(UnityEditor.PlayerSettings.WSACapability.InternetClient))
+            {
+                UnityEditor.PlayerSettings.WSA.SetCapability(UnityEditor.PlayerSettings.WSACapability.InternetClient, false);
+            }
+#endif // UNITY_EDITOR
+
             if (Application.isPlaying)
             {
                 dictationRecognizer?.Dispose();

Assets/MixedRealityToolkit.Providers/WindowsVoiceInput/WindowsSpeechInputProvider.cs

@@ -59,6 +59,17 @@ public bool IsRecognitionActive
             get { return keywordRecognizer != null && keywordRecognizer.IsRunning; }
         }
 
+#if UNITY_EDITOR
+        /// <inheritdoc />
+        public override void Initialize()
+        {
+            if (!UnityEditor.PlayerSettings.WSA.GetCapability(UnityEditor.PlayerSettings.WSACapability.Microphone))
+            {
+                UnityEditor.PlayerSettings.WSA.SetCapability(UnityEditor.PlayerSettings.WSACapability.Microphone, true);
+            }
+        }
+#endif // UNITY_EDITOR
+
         /// <inheritdoc />
         public override void Enable()
         {
@@ -117,6 +128,17 @@ public override void Disable()
             }
         }
 
+#if UNITY_EDITOR
+        /// <inheritdoc />
+        public override void Destroy()
+        {
+            if (UnityEditor.PlayerSettings.WSA.GetCapability(UnityEditor.PlayerSettings.WSACapability.Microphone))
+            {
+                UnityEditor.PlayerSettings.WSA.SetCapability(UnityEditor.PlayerSettings.WSACapability.Microphone, false);
+            }
+        }
+#endif // UNITY_EDITOR
+
         /// <inheritdoc />
         public void StartRecognition()
         {

Assets/MixedRealityToolkit.Services/SpatialAwarenessSystem/MixedRealitySpatialAwarenessSystem.cs

@@ -39,6 +39,13 @@ public override void Initialize()
         private void InitializeInternal()
         {
             meshEventData = new MixedRealitySpatialAwarenessEventData<SpatialAwarenessMeshObject>(EventSystem.current);
+
+#if UNITY_EDITOR
+            if (!UnityEditor.PlayerSettings.WSA.GetCapability(UnityEditor.PlayerSettings.WSACapability.SpatialPerception))
+            {
+                UnityEditor.PlayerSettings.WSA.SetCapability(UnityEditor.PlayerSettings.WSACapability.SpatialPerception, true);
+            }
+#endif // UNITY_EDITOR
         }
 
         /// <inheritdoc/>
@@ -97,6 +104,13 @@ public override void Reset()
         /// <inheritdoc/>
         public override void Destroy()
         {
+#if UNITY_EDITOR
+            if (UnityEditor.PlayerSettings.WSA.GetCapability(UnityEditor.PlayerSettings.WSACapability.SpatialPerception))
+            {
+                UnityEditor.PlayerSettings.WSA.SetCapability(UnityEditor.PlayerSettings.WSACapability.SpatialPerception, false);
+            }
+#endif // UNITY_EDITOR
+
             // Cleanup game objects created during execution.
             if (Application.isPlaying)
             {