Merge remote-tracking branch 'upstream/master'

Author: Sacristan

Assets/HoloToolkit/Input/README.md

@@ -3,7 +3,7 @@ Input System Diagrams:
 ![alt text](/External/ReadMeImages/InputSystemDiagram.png)
 ![alt text](/External/ReadMeImages/CursorSystemDiagram.PNG)
 
-##Scripts that leverage HoloLens input features namely Gaze, Gesture and Voice.
+## Scripts that leverage HoloLens input features namely Gaze, Gesture and Voice.
 
 This contains a fully-featured **input module**, which allows you to handle various types of input and send them to any game object being currently gazed at, or any fallback object. It also includes a **cursor** similar to the HoloLens shell cursor that fully leverages the Unity's animation system.
 

Assets/HoloToolkit/Input/Scripts/Cursor/Cursor.cs

@@ -180,7 +180,14 @@ private void Update()
         /// <summary>
         /// Override for enable functions
         /// </summary>
-        protected virtual void OnEnable() { }
+        protected virtual void OnEnable()
+        {
+            if (gazeManager)
+            {
+                OnFocusedObjectChanged(null, gazeManager.HitObject);
+            }
+            OnCursorStateChange(CursorStateEnum.None);
+        }
 
         /// <summary>
         /// Override for disable functions
@@ -190,6 +197,8 @@ protected virtual void OnDisable()
             TargetedObject = null;
             TargetedCursorModifier = null;
             visibleHandsCount = 0;
+            IsHandVisible = false;
+            OnCursorStateChange(CursorStateEnum.Contextual);
         }
 
         private void OnDestroy()

Assets/HoloToolkit/SpatialUnderstanding/README.md

@@ -8,11 +8,11 @@ Edit -> Project Settings -> Player -> Settings for Windows Store -> Publishing S
 or in your Visual Studio Package.appxmanifest capabilities.
 
 ### Microsoft HoloLens Documentation
-- [Spatial Mapping In Unity](https://developer.microsoft.com/en-us/windows/holographic/spatial_mapping_in_unity)
-- [Spatial Understanding In Unity](https://developer.microsoft.com/en-us/windows/holographic/spatial_mapping_in_unity#holotoolkit.spatialunderstanding)
+- [Spatial Mapping In Unity](https://developer.microsoft.com/en-us/windows/mixed-reality/spatial_mapping_in_unity)
+- [Spatial Understanding In Unity](https://developer.microsoft.com/en-us/windows/mixed-reality/spatial_mapping_in_unity#holotoolkit.spatialunderstanding)
 
 ### Case studies
-- [Expanding the spatial mapping capabilities of HoloLens](https://developer.microsoft.com/en-us/windows/holographic/case_study_-_expanding_the_spatial_mapping_capabilities_of_hololens)
+- [Expanding the spatial mapping capabilities of HoloLens](https://developer.microsoft.com/en-us/windows/mixed-reality/case_study_-_expanding_the_spatial_mapping_capabilities_of_hololens)
 
 ### [Plugins](Plugins)
 SpatialUnderstanding addon that can be used for topology, object detection, and object placement.

Assets/HoloToolkit/Utilities/README.md

@@ -23,7 +23,7 @@ Utilitiy Scripts.
 Editor Specific Scripts.
 
 ##### AutoConfigureMenu.cs
-Configuration options derived from Microsoft Documentation [Configuring a Unity Project for HoloLens](https://developer.microsoft.com/en-us/windows/holographic/unity_development_overview#Configuring_a_Unity_project_for_HoloLens).
+Configuration options derived from Microsoft Documentation [Configuring a Unity Project for HoloLens](https://developer.microsoft.com/en-us/windows/mixed-reality/unity_development_overview#Configuring_a_Unity_project_for_HoloLens).
 
 ##### AutoConfigureWindow.cs
 Base class for auto configuration build windows.

Assets/HoloToolkit/Utilities/Scripts/FpsDisplay.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using UnityEngine;
+using UnityEngine.UI;
 
 namespace HoloToolkit.Unity
 {
@@ -11,10 +12,14 @@ namespace HoloToolkit.Unity
     [RequireComponent(typeof(TextMesh))]
     public class FpsDisplay : MonoBehaviour
     {
-        [Tooltip("Reference to Text UI control where the FPS should be displayed.")]
+        [Tooltip("Reference to TextMesh component where the FPS should be displayed.")]
         [SerializeField]
         private TextMesh textMesh;
 
+        [Tooltip("Reference to uGUI text component where the FPS should be displayed.")]
+        [SerializeField]
+        private Text uGUIText;
+
         [Tooltip("How many frames should we consider into our average calculation?")]
         [SerializeField]
         private int frameRange = 60;
@@ -53,7 +58,15 @@ private void Update()
 
         private void InitBuffer()
         {
-            textMesh = GetComponent<TextMesh>();
+            if (textMesh == null)
+            {
+                textMesh = GetComponent<TextMesh>();
+            }
+
+            if (uGUIText == null)
+            {
+                uGUIText = GetComponent<Text>();
+            }
 
             if (frameRange <= 0)
             {
@@ -72,6 +85,11 @@ private void UpdateTextDisplay(int fps)
             {
                 textMesh.text = displayString;
             }
+
+            if (uGUIText != null)
+            {
+                uGUIText.text = displayString;
+            }
         }
 
         private void UpdateFrameBuffer()