Merge branch 'HTK-master' into HTK-local

Stephen Hodgson · Stephen Hodgson · commit bc87b2da93de · 2016-12-16T10:40:23.000-05:00
diff --git a/Assets/HoloToolkit/Input/Animations/Cursor/CursorSimple.controller b/Assets/HoloToolkit/Input/Animations/Cursor/CursorSimple.controller
@@ -81,7 +81,7 @@ AnimatorStateTransition:
   m_ExitTime: 0.33066684
   m_HasExitTime: 0
   m_HasFixedDuration: 1
-  m_InterruptionSource: 0
+  m_InterruptionSource: 2
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
 --- !u!1101 &1101000011538347200
@@ -156,7 +156,7 @@ AnimatorStateTransition:
   m_ExitTime: 0.17148435
   m_HasExitTime: 0
   m_HasFixedDuration: 1
-  m_InterruptionSource: 0
+  m_InterruptionSource: 2
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
 --- !u!1101 &1101000011705696456
diff --git a/Assets/HoloToolkit/Input/Scripts/Voice/KeywordManager.cs b/Assets/HoloToolkit/Input/Scripts/Voice/KeywordManager.cs
@@ -1,8 +1,8 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
+using System;
 using System.Collections.Generic;
-using System.Linq;
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.Windows.Speech;
@@ -44,23 +44,36 @@ public enum RecognizerStartBehavior { AutoStart, ManualStart };
         public KeywordAndResponse[] KeywordsAndResponses;
 
         private KeywordRecognizer keywordRecognizer;
-        private Dictionary<string, UnityEvent> responses;
+        private readonly Dictionary<string, UnityEvent> responses = new Dictionary<string, UnityEvent>();
 
         void Start()
         {
-            if (KeywordsAndResponses.Length > 0)
+            int keywordCount = KeywordsAndResponses.Length;
+            if (keywordCount > 0)
             {
-                // Convert the struct array into a dictionary, with the keywords and the keys and the methods as the values.
-                // This helps easily link the keyword recognized to the UnityEvent to be invoked.
-                responses = KeywordsAndResponses.ToDictionary(keywordAndResponse => keywordAndResponse.Keyword,
-                                                              keywordAndResponse => keywordAndResponse.Response);
-
-                keywordRecognizer = new KeywordRecognizer(responses.Keys.ToArray());
-                keywordRecognizer.OnPhraseRecognized += KeywordRecognizer_OnPhraseRecognized;
-
-                if (RecognizerStart == RecognizerStartBehavior.AutoStart)
+                try
                 {
-                    keywordRecognizer.Start();
+                    string[] keywords = new string[keywordCount];
+                    // Convert the struct array into a dictionary, with the keywords and the keys and the methods as the values.
+                    // This helps easily link the keyword recognized to the UnityEvent to be invoked.
+                    for (int index = 0; index < keywordCount; index++)
+                    {
+                        KeywordAndResponse keywordAndResponse = KeywordsAndResponses[index];
+                        responses[keywordAndResponse.Keyword] = keywordAndResponse.Response;
+                        keywords[index] = keywordAndResponse.Keyword;
+                    }
+
+                    keywordRecognizer = new KeywordRecognizer(keywords);
+                    keywordRecognizer.OnPhraseRecognized += KeywordRecognizer_OnPhraseRecognized;
+
+                    if (RecognizerStart == RecognizerStartBehavior.AutoStart)
+                    {
+                        keywordRecognizer.Start();
+                    }
+                }
+                catch (ArgumentException)
+                {
+                    Debug.LogError("Duplicate keywords specified in the Inspector on " + gameObject.name + ".");
                 }
             }
             else
@@ -71,7 +84,7 @@ void Start()
 
         void Update()
         {
-            if (keywordRecognizer.IsRunning)
+            if (keywordRecognizer != null && keywordRecognizer.IsRunning)
             {
                 ProcessKeyBindings();
             }
@@ -87,6 +100,22 @@ void OnDestroy()
             }
         }
 
+        void OnDisable()
+        {
+            if (keywordRecognizer != null)
+            {
+                StopKeywordRecognizer();
+            }
+        }
+
+        void OnEnable()
+        {
+            if (keywordRecognizer != null && RecognizerStart == RecognizerStartBehavior.AutoStart)
+            {
+                StartKeywordRecognizer();
+            }
+        }
+
         private void ProcessKeyBindings()
         {
             foreach (var kvp in KeywordsAndResponses)
diff --git a/Assets/HoloToolkit/Input/Tests/Scripts/DehydrationDeactivation.cs b/Assets/HoloToolkit/Input/Tests/Scripts/DehydrationDeactivation.cs
@@ -8,14 +8,14 @@ namespace HoloToolkit.Unity.InputModule.Tests
     public class DehydrationDeactivation : StateMachineBehaviour
     {
         /// <summary>
-        /// OnStateEnter is called when a transition starts and the state machine starts to evaluate this state
+        /// OnStateExit is called when a transition ends and the state machine finishes evaluating this state
         /// </summary>
         /// <param name="animator">Animator that triggered OnStateEnter.</param>
         /// <param name="stateInfo">Animator state info.</param>
         /// <param name="layerIndex">Layer index.</param>
-        public override void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
+        public override void OnStateExit(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
         {
             animator.transform.gameObject.SetActive(false);
         }
     }
-}
+}
diff --git a/Assets/HoloToolkit/Utilities/Prefabs/FPSDisplay.prefab b/Assets/HoloToolkit/Utilities/Prefabs/FPSDisplay.prefab
@@ -16,12 +16,12 @@ GameObject:
   m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 4
+  serializedVersion: 5
   m_Component:
-  - 4: {fileID: 4000012084356042}
-  - 23: {fileID: 23000012140561766}
-  - 102: {fileID: 102000012390400920}
-  - 114: {fileID: 114000014126132184}
+  - component: {fileID: 4000012084356042}
+  - component: {fileID: 23000012140561766}
+  - component: {fileID: 102000012390400920}
+  - component: {fileID: 114000014126132184}
   m_Layer: 0
   m_Name: FPSText
   m_TagString: Untagged
@@ -34,14 +34,14 @@ GameObject:
   m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 4
+  serializedVersion: 5
   m_Component:
-  - 4: {fileID: 4000012520274942}
-  - 65: {fileID: 65000012561365858}
-  - 114: {fileID: 114000013985069792}
-  - 114: {fileID: 114000012205069828}
-  - 114: {fileID: 114000014245746336}
-  - 23: {fileID: 23000011797597042}
+  - component: {fileID: 4000012520274942}
+  - component: {fileID: 65000012561365858}
+  - component: {fileID: 114000013985069792}
+  - component: {fileID: 114000012205069828}
+  - component: {fileID: 114000014245746336}
+  - component: {fileID: 23000011797597042}
   m_Layer: 0
   m_Name: FPSDisplay
   m_TagString: Untagged
@@ -58,10 +58,10 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0.11, z: 0}
   m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_Children: []
   m_Father: {fileID: 4000012520274942}
   m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4000012520274942
 Transform:
   m_ObjectHideFlags: 1
@@ -71,11 +71,11 @@ Transform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0.85}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_Children:
   - {fileID: 4000012084356042}
   m_Father: {fileID: 0}
   m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!23 &23000011797597042
 MeshRenderer:
   m_ObjectHideFlags: 1
@@ -90,15 +90,17 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_Materials:
   - {fileID: 10100, guid: 0000000000000000e000000000000000, type: 0}
-  m_SubsetIndices: 
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
   m_StaticBatchRoot: {fileID: 0}
   m_ProbeAnchor: {fileID: 0}
   m_LightProbeVolumeOverride: {fileID: 0}
   m_ScaleInLightmap: 1
   m_PreserveUVs: 0
   m_IgnoreNormalsForChartDetection: 0
   m_ImportantGI: 0
-  m_SelectedWireframeHidden: 0
+  m_SelectedEditorRenderState: 3
   m_MinimumChartSize: 4
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
@@ -119,15 +121,17 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_Materials:
   - {fileID: 10100, guid: 0000000000000000e000000000000000, type: 0}
-  m_SubsetIndices: 
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
   m_StaticBatchRoot: {fileID: 0}
   m_ProbeAnchor: {fileID: 0}
   m_LightProbeVolumeOverride: {fileID: 0}
   m_ScaleInLightmap: 1
   m_PreserveUVs: 0
   m_IgnoreNormalsForChartDetection: 0
   m_ImportantGI: 0
-  m_SelectedWireframeHidden: 0
+  m_SelectedEditorRenderState: 3
   m_MinimumChartSize: 4
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
@@ -226,4 +230,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ac8d5b128a1d8204fb76c86f47b75912, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  PivotAxis: 2
+  PivotAxis: 1
diff --git a/Assets/HoloToolkit/Utilities/Scripts/FpsDisplay.cs b/Assets/HoloToolkit/Utilities/Scripts/FpsDisplay.cs
@@ -15,10 +15,6 @@ public class FpsDisplay : MonoBehaviour
         [SerializeField]
         private TextMesh textMesh;
 
-        [Tooltip("Reference to 3DText UI control where the FPS should be displayed.")]
-        [SerializeField]
-        private TextMesh text3D;
-
         [Tooltip("How many frames should we consider into our average calculation?")]
         [SerializeField]
         private int frameRange = 60;
@@ -59,7 +55,7 @@ private void InitBuffer()
         {
             textMesh = GetComponent<TextMesh>();
 
-            if(frameRange <= 0)
+            if (frameRange <= 0)
             {
                 frameRange = 1;
             }
@@ -76,17 +72,13 @@ private void UpdateTextDisplay(int fps)
             {
                 textMesh.text = displayString;
             }
-            if (text3D != null)
-            {
-                text3D.text = displayString;
-            }
         }
 
         private void UpdateFrameBuffer()
         {
-            fpsBuffer[fpsBufferIndex++] = (int)(1f/Time.unscaledDeltaTime);
+            fpsBuffer[fpsBufferIndex++] = (int)(1f / Time.unscaledDeltaTime);
 
-            if(fpsBufferIndex >= frameRange)
+            if (fpsBufferIndex >= frameRange)
             {
                 fpsBufferIndex = 0;
             }
@@ -96,7 +88,7 @@ private void CalculateFps()
         {
             int sum = 0;
 
-            for(int i = 0; i < frameRange; i++)
+            for (int i = 0; i < frameRange; i++)
             {
                 int fps = fpsBuffer[i];
                 sum += fps;

Original file line number	Diff line number	Diff line change
`@@ -8,14 +8,14 @@ namespace HoloToolkit.Unity.InputModule.Tests`
`8`	`8`	`public class DehydrationDeactivation : StateMachineBehaviour`
`9`	`9`	`{`
`10`	`10`	`/// <summary>`
`11`		`- /// OnStateEnter is called when a transition starts and the state machine starts to evaluate this state`
	`11`	`+ /// OnStateExit is called when a transition ends and the state machine finishes evaluating this state`
`12`	`12`	`/// </summary>`
`13`	`13`	`/// <param name="animator">Animator that triggered OnStateEnter.</param>`
`14`	`14`	`/// <param name="stateInfo">Animator state info.</param>`
`15`	`15`	`/// <param name="layerIndex">Layer index.</param>`
`16`		`- public override void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)`
	`16`	`+ public override void OnStateExit(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)`
`17`	`17`	`{`
`18`	`18`	`animator.transform.gameObject.SetActive(false);`
`19`	`19`	`}`
`20`	`20`	`}`
`21`		`-}`
	`21`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,6 @@ public class FpsDisplay : MonoBehaviour`
`15`	`15`	`[SerializeField]`
`16`	`16`	`private TextMesh textMesh;`
`17`	`17`
`18`		`- [Tooltip("Reference to 3DText UI control where the FPS should be displayed.")]`
`19`		`- [SerializeField]`
`20`		`- private TextMesh text3D;`
`21`		`-`
`22`	`18`	`[Tooltip("How many frames should we consider into our average calculation?")]`
`23`	`19`	`[SerializeField]`
`24`	`20`	`private int frameRange = 60;`
`@@ -59,7 +55,7 @@ private void InitBuffer()`
`59`	`55`	`{`
`60`	`56`	`textMesh = GetComponent<TextMesh>();`
`61`	`57`
`62`		`- if(frameRange <= 0)`
	`58`	`+ if (frameRange <= 0)`
`63`	`59`	`{`
`64`	`60`	`frameRange = 1;`
`65`	`61`	`}`
`@@ -76,17 +72,13 @@ private void UpdateTextDisplay(int fps)`
`76`	`72`	`{`
`77`	`73`	`textMesh.text = displayString;`
`78`	`74`	`}`
`79`		`- if (text3D != null)`
`80`		`- {`
`81`		`- text3D.text = displayString;`
`82`		`- }`
`83`	`75`	`}`
`84`	`76`
`85`	`77`	`private void UpdateFrameBuffer()`
`86`	`78`	`{`
`87`		`- fpsBuffer[fpsBufferIndex++] = (int)(1f/Time.unscaledDeltaTime);`
	`79`	`+ fpsBuffer[fpsBufferIndex++] = (int)(1f / Time.unscaledDeltaTime);`
`88`	`80`
`89`		`- if(fpsBufferIndex >= frameRange)`
	`81`	`+ if (fpsBufferIndex >= frameRange)`
`90`	`82`	`{`
`91`	`83`	`fpsBufferIndex = 0;`
`92`	`84`	`}`
`@@ -96,7 +88,7 @@ private void CalculateFps()`
`96`	`88`	`{`
`97`	`89`	`int sum = 0;`
`98`	`90`
`99`		`- for(int i = 0; i < frameRange; i++)`
	`91`	`+ for (int i = 0; i < frameRange; i++)`
`100`	`92`	`{`
`101`	`93`	`int fps = fpsBuffer[i];`
`102`	`94`	`sum += fps;`