Merge pull request #841 from StephenHodgson/HTK-Refactor

fixed cross platform support from last refactor PR

Author: StephenHodgson

Assets/HoloToolkit/Input/Scripts/HandGuidance.cs

@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-using UnityEngine;
 
 #if UNITY_WSA
+using UnityEngine;
 using UnityEngine.VR.WSA.Input;
 #endif
 
@@ -14,6 +14,7 @@ namespace HoloToolkit.Unity.InputModule
     /// </summary>
     public class HandGuidance : Singleton<HandGuidance>
     {
+#if UNITY_WSA
         [Tooltip("The Cursor object the HandGuidanceIndicator will be positioned around.")]
         public GameObject Cursor;
 
@@ -31,7 +32,6 @@ public class HandGuidance : Singleton<HandGuidance>
 
         private uint? currentlyTrackedHand = null;
 
-#if UNITY_WSA
         protected override void Awake()
         {
             base.Awake();

Assets/HoloToolkit/Input/Scripts/InputManager.cs

@@ -45,8 +45,11 @@ public class InputManager : Singleton<InputManager>
         private ManipulationEventData manipulationEventData;
         private HoldEventData holdEventData;
         private NavigationEventData navigationEventData;
+
+#if UNITY_WSA || UNITY_STANDALONE_WIN
         private SpeechKeywordRecognizedEventData speechKeywordRecognizedEventData;
         private DictationEventData dictationEventData;
+#endif
 
         /// <summary>
         /// Indicates if input is currently enabled or not.
@@ -184,8 +187,10 @@ private void InitializeEventDatas()
             manipulationEventData = new ManipulationEventData(EventSystem.current);
             navigationEventData = new NavigationEventData(EventSystem.current);
             holdEventData = new HoldEventData(EventSystem.current);
+#if UNITY_WSA || UNITY_STANDALONE_WIN
             speechKeywordRecognizedEventData = new SpeechKeywordRecognizedEventData(EventSystem.current);
             dictationEventData = new DictationEventData(EventSystem.current);
+#endif
         }
 
         #region Unity Methods

Assets/HoloToolkit/Input/Scripts/Microphone/DictationInputManager.cs

@@ -2,10 +2,10 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using System.Collections;
-using System.Text;
 using UnityEngine;
 
 #if UNITY_WSA || UNITY_STANDALONE_WIN
+using System.Text;
 using UnityEngine.Windows.Speech;
 #endif
 
@@ -17,6 +17,7 @@ namespace HoloToolkit.Unity.InputModule
     /// </summary>
     public class DictationInputManager : Singleton<DictationInputManager>, IInputSource
     {
+#if UNITY_WSA || UNITY_STANDALONE_WIN
         /// <summary>
         /// Caches the text currently being displayed in dictation display text.
         /// </summary>
@@ -47,12 +48,12 @@ public class DictationInputManager : Singleton<DictationInputManager>, IInputSou
         /// Audio clip of the last dictation session.
         /// </summary>
         private static AudioClip dictationAudioClip;
-#if UNITY_WSA || UNITY_STANDALONE_WIN
+
         private static DictationRecognizer dictationRecognizer;
-#endif
+        
         private static bool isTransitioning;
-
         private static bool hasFailed;
+#endif
 
         #region Unity Methods
 
@@ -187,6 +188,7 @@ public static IEnumerator StopRecording()
         }
 
         #region Dictation Recognizer Callbacks
+#if UNITY_WSA || UNITY_STANDALONE_WIN
 
         /// <summary>
         /// This event is fired while the user is talking. As the recognizer listens, it provides text of what it's heard so far.
@@ -200,7 +202,6 @@ private static void DictationRecognizer_DictationHypothesis(string text)
             InputManager.Instance.RaiseDictationHypothesis(Instance, 0, dictationResult);
         }
 
-#if UNITY_WSA || UNITY_STANDALONE_WIN
         /// <summary>
         /// This event is fired after the user pauses, typically at the end of a sentence. The full recognized string is returned here.
         /// </summary>
@@ -234,7 +235,6 @@ private static void DictationRecognizer_DictationComplete(DictationCompletionCau
             textSoFar = null;
             dictationResult = string.Empty;
         }
-#endif
 
         /// <summary>
         /// This event is fired when an error occurs.
@@ -249,7 +249,7 @@ private static void DictationRecognizer_DictationError(string error, int hresult
             textSoFar = null;
             dictationResult = string.Empty;
         }
-
+#endif
         #endregion // Dictation Recognizer Callbacks
 
         #region IInputSource Implementation

Assets/HoloToolkit/Input/Scripts/Voice/KeywordManager.cs

@@ -47,8 +47,8 @@ public enum RecognizerStartBehavior { AutoStart, ManualStart };
         [Tooltip("An array of string keywords and UnityEvents, to be set in the Inspector.")]
         public KeywordAndResponse[] KeywordsAndResponses;
 
-        private readonly Dictionary<string, UnityEvent> responses = new Dictionary<string, UnityEvent>();
 #if UNITY_WSA || UNITY_STANDALONE_WIN
+        private readonly Dictionary<string, UnityEvent> responses = new Dictionary<string, UnityEvent>();
         private KeywordRecognizer keywordRecognizer;
 
         void Start()

Assets/HoloToolkit/SpatialMapping/Scripts/RemoteMapping/RemoteMappingManager.cs

@@ -32,20 +32,20 @@ public partial class RemoteMappingManager : Singleton<RemoteMappingManager>
         /// Used for voice commands.
         /// </summary>
         private KeywordRecognizer keywordRecognizer;
-#endif
 
         /// <summary>
         /// Collection of supported keywords and their associated actions.
         /// </summary>
         private Dictionary<string, System.Action> keywordCollection;
+#endif
 
         // Use this for initialization.
         private void Start()
         {
+#if UNITY_WSA || UNITY_STANDALONE_WIN
             // Create our keyword collection.
             keywordCollection = new Dictionary<string, System.Action> { { SendMeshesKeyword, SendMeshes } };
 
-#if UNITY_WSA || UNITY_STANDALONE_WIN
             // Tell the KeywordRecognizer about our keywords.
             keywordRecognizer = new KeywordRecognizer(keywordCollection.Keys.ToArray());
             // Register a callback for the KeywordRecognizer and start recognizing.