Merge branch 'HTK-Master' into HTK-SharingIpConfigUx

Author: StephenHodgson

Assets/HoloToolkit-Examples/InteractiveElements/Prefabs/Button.prefab

@@ -461,7 +461,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   InteractiveHost: {fileID: 0}
   ButtonLabels: {fileID: 114374334392891108}
-  ColorThemeTag: buttonLableColor
+  ColorThemeTag: buttonLabelColor
   PositionThemeTag: buttonLabelPosition
   MovePosition: {fileID: 114310027305425480}
 --- !u!114 &114000011132779576

Assets/HoloToolkit-Tests/Input/Scripts/MicStreamDemo.cs

@@ -92,7 +92,7 @@ private void OnEnable()
             IsRunning = true;
         }
 
-        private void Start()
+        private void Awake()
         {
             CheckForErrorOnCall(MicStream.MicInitializeCustomRate((int)StreamType, AudioSettings.outputSampleRate));
             CheckForErrorOnCall(MicStream.MicSetGain(InputGain));
@@ -109,7 +109,7 @@ private void Start()
 
             print("MicStream selector demo");
             print("press Q to start stream to audio source, W will stop that stream");
-            print("It will start a recording and save it to a wav file. S will stop that recording.");
+            print("press A to start a recording and S to stop that recording and save it to a wav file.");
             print("Since this all goes through the AudioSource, you can mute the mic while using it there, or do anything else you would do with an AudioSource");
             print("In this demo, we start the stream automatically, and then change the size of the gameobject based on microphone signal amplitude");
             isRunning = true;

Assets/HoloToolkit/Input/Scripts/Editor/SpeechInputHandlerEditor.cs

@@ -13,16 +13,20 @@ public class SpeechInputHandlerEditor : Editor
     {
         private SerializedProperty keywordsProperty;
         private string[] registeredKeywords;
+        private SerializedProperty isGlobalListenerProperty;
 
         private void OnEnable()
         {
             keywordsProperty = serializedObject.FindProperty("Keywords");
             registeredKeywords = RegisteredKeywords().Distinct().ToArray();
+            isGlobalListenerProperty = serializedObject.FindProperty("IsGlobalListener");
         }
 
         public override void OnInspectorGUI()
         {
             serializedObject.Update();
+            EditorGUILayout.PropertyField(isGlobalListenerProperty);
+
             ShowList(keywordsProperty);
             serializedObject.ApplyModifiedProperties();
 

Assets/HoloToolkit/Input/Scripts/Interactions/TapToPlace.cs

@@ -38,6 +38,9 @@ public class TapToPlace : MonoBehaviour, IInputClickHandler
         [Tooltip("Setting this to true will enable the user to move and place the object in the scene without needing to tap on the object. Useful when you want to place an object immediately.")]
         public bool IsBeingPlaced;
 
+        [Tooltip("Setting this to true will allow this behavior to control the DrawMesh property on the spatial mapping.")]
+        public bool AllowMeshVisualizationControl = true;
+
         /// <summary>
         /// The default ignore raycast layer built into unity.
         /// </summary>
@@ -124,7 +127,10 @@ private void HandlePlacement()
                 InputManager.Instance.AddGlobalListener(gameObject);
 
                 // If the user is in placing mode, display the spatial mapping mesh.
-                SpatialMappingManager.Instance.DrawVisualMeshes = true;
+                if (AllowMeshVisualizationControl)
+                {
+                    SpatialMappingManager.Instance.DrawVisualMeshes = true;
+                }
 #if UNITY_WSA && !UNITY_EDITOR
 
                 //Removes existing world anchor if any exist.
@@ -139,7 +145,10 @@ private void HandlePlacement()
                 InputManager.Instance.RemoveGlobalListener(gameObject);
 
                 // If the user is not in placing mode, hide the spatial mapping mesh.
-                SpatialMappingManager.Instance.DrawVisualMeshes = false;
+                if (AllowMeshVisualizationControl)
+                {
+                    SpatialMappingManager.Instance.DrawVisualMeshes = false;
+                }
 #if UNITY_WSA && !UNITY_EDITOR
 
                 // Add world anchor when object placement is done.

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

@@ -2,21 +2,22 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using System.Runtime.InteropServices;
-using UnityEngine;
 using System.Text;
+using UnityEngine;
 
 namespace HoloToolkit.Unity.InputModule
 {
     public class MicStream
     {
-        // This class replaces Unity's Microphone object
-        // This class is made for HoloLens mic stream selection, but should work well on all windows 10 devices
-        // chooses from one of three possible microphone modes on HoloLens
-        // There is an example of how to use this script in HoloToolkit\Input\Tests\Scripts\MicStreamDemo.cs
-
-        // Streams: LOW_QUALITY_VOICE is optimized for speech analysis, COMMUNICATIONS is higher quality voice and is probably preferred
-        //          ROOM_CAPTURE tries to get the sounds of the room more than the voice of the suer
-        // can only be set on initialization
+        // This class replaces Unity's Microphone object.
+        // This class is made for HoloLens mic stream selection but should work well on all Windows 10 devices.
+        // Choose from one of three possible microphone modes on HoloLens.
+        // There is an example of how to use this script in HoloToolkit-Tests\Input\Scripts\MicStreamDemo.cs.
+
+        // Streams: LOW_QUALITY_VOICE is optimized for speech analysis.
+        //          COMMUNICATIONS is higher quality voice and is probably preferred.
+        //          ROOM_CAPTURE tries to get the sounds of the room more than the voice of the user.
+        // This can only be set on initialization.
         public enum StreamCategory { LOW_QUALITY_VOICE, HIGH_QUALITY_VOICE, ROOM_CAPTURE }
 
         public enum ErrorCodes { ALREADY_RUNNING = -10, NO_AUDIO_DEVICE, NO_INPUT_DEVICE, ALREADY_RECORDING, GRAPH_NOT_EXIST, CHANNEL_COUNT_MISMATCH, FILE_CREATION_PERMISSION_ERROR, NOT_ENOUGH_DATA, NEED_ENABLED_MIC_CAPABILITY };
@@ -192,4 +193,4 @@ public static bool CheckForErrorOnCall(int returnCode)
             return true;
         }
     }
-}
+}

Assets/HoloToolkit/Input/Scripts/SetGlobalListener.cs

@@ -3,7 +3,7 @@
 
 using UnityEngine;
 
-namespace HoloToolkit.Unity.InputModule.Tests
+namespace HoloToolkit.Unity.InputModule
 {
     /// <summary>
     /// Register this game object on the InputManager as a global listener.

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

@@ -22,6 +22,9 @@ public struct KeywordAndResponse
         [Tooltip("The keywords to be recognized and optional keyboard shortcuts.")]
         public KeywordAndResponse[] Keywords;
 
+        [Tooltip("Determines if this handler is a global listener, not connected to a specific gameobject")]
+        public bool IsGlobalListener = false;
+
         [NonSerialized]
         private readonly Dictionary<string, UnityEvent> responses = new Dictionary<string, UnityEvent>();
 
@@ -44,6 +47,10 @@ protected virtual void Start()
                     responses.Add(keyword, keywordAndResponse.Response);
                 }
             }
+            if (IsGlobalListener)
+            {
+                InputManager.Instance.AddGlobalListener(gameObject);
+            }
         }
 
         void ISpeechHandler.OnSpeechKeywordRecognized(SpeechKeywordRecognizedEventData eventData)