Merge pull request #2873 from davidkline-ms/feature/mrtk_spatialAwareness

David Kline · web-flow · commit 7c3bafb516fb · 2018-10-02T15:24:01.000-07:00
merge mrtk_development -&gt; feature/mrtk_spatialAwareness
diff --git a/Assets/MixedRealityToolkit-SDK/Features/Diagnostics/DiagnosticsHandler.cs b/Assets/MixedRealityToolkit-SDK/Features/Diagnostics/DiagnosticsHandler.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-using Microsoft.MixedReality.Toolkit.Core.EventDatum.Boundary;
+using Microsoft.MixedReality.Toolkit.Core.EventDatum.Diagnostics;
 using Microsoft.MixedReality.Toolkit.Core.Interfaces.Diagnostics;
 using System;
 using System.Text;
diff --git a/Assets/MixedRealityToolkit-SDK/Features/Diagnostics/MixedRealityDiagnosticsManager.cs b/Assets/MixedRealityToolkit-SDK/Features/Diagnostics/MixedRealityDiagnosticsManager.cs
@@ -1,5 +1,5 @@
 ﻿using Microsoft.MixedReality.Toolkit.Core.Definitions.Diagnostics;
-using Microsoft.MixedReality.Toolkit.Core.EventDatum.Boundary;
+using Microsoft.MixedReality.Toolkit.Core.EventDatum.Diagnostics;
 using Microsoft.MixedReality.Toolkit.Core.Interfaces.Diagnostics;
 using Microsoft.MixedReality.Toolkit.Core.Managers;
 using Microsoft.MixedReality.Toolkit.Core.Utilities;
@@ -8,7 +8,7 @@
 
 namespace Microsoft.MixedReality.Toolkit.SDK.DiagnosticsSystem
 {
-    public class MixedRealityDiagnosticsManager : MixedRealityEventManager, IMixedRealityDiagnosticsManager
+    public class MixedRealityDiagnosticsManager : MixedRealityEventManager, IMixedRealityDiagnosticsSystem
     {
         #region IMixedRealityManager
         private DiagnosticsEventData eventData;
@@ -83,7 +83,7 @@ private void RaiseDiagnosticsChanged()
         }
 
         /// <summary>
-        /// Event sent whenever the boundary visualization changes.
+        /// Event sent whenever the diagnostics visualization changes.
         /// </summary>
         private static readonly ExecuteEvents.EventFunction<IMixedRealityDiagnosticsHandler> OnDiagnosticsChanged =
             delegate (IMixedRealityDiagnosticsHandler handler, BaseEventData eventData)
diff --git a/Assets/MixedRealityToolkit-SDK/Features/UX/Scripts/Pointers/BaseControllerPointer.cs b/Assets/MixedRealityToolkit-SDK/Features/UX/Scripts/Pointers/BaseControllerPointer.cs
@@ -144,11 +144,8 @@ protected override async void Start()
                 MixedRealityManager.TeleportSystem.Register(gameObject);
             }
 
-            if (MixedRealityManager.InputSystem == null)
-            {
-                await WaitUntilInputSystemValid;
-                SetCursor();
-            }
+            await WaitUntilInputSystemValid;
+            SetCursor();
         }
 
         protected override void OnDisable()
@@ -311,10 +308,14 @@ public virtual bool TryGetPointingRay(out Ray pointingRay)
         {
             Vector3 pointerPosition;
             TryGetPointerPosition(out pointerPosition);
-            pointingRay = new Ray(pointerPosition, PointerDirection);
+            pointingRay = pointerRay;
+            pointingRay.origin = pointerPosition;
+            pointingRay.direction = PointerDirection;
             return true;
         }
 
+        private readonly Ray pointerRay = new Ray();
+
         /// <inheritdoc />
         public virtual bool TryGetPointerRotation(out Quaternion rotation)
         {
diff --git a/Assets/MixedRealityToolkit-SDK/Features/UX/Scripts/Pointers/MousePointer.cs b/Assets/MixedRealityToolkit-SDK/Features/UX/Scripts/Pointers/MousePointer.cs
@@ -78,7 +78,6 @@ public override void OnSourcePoseChanged(SourcePoseEventData<Vector2> eventData)
         /// <inheritdoc />
         public override void OnPositionInputChanged(InputEventData<Vector2> eventData)
         {
-
             if (eventData.SourceId == Controller?.InputSource.SourceId)
             {
                 if (!UseSourcePoseData &&
diff --git a/Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityDiagnosticsProfile.asset b/Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityDiagnosticsProfile.asset
@@ -11,6 +11,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8c2d00f2d26cc124caed106ffbfe3f06, type: 3}
   m_Name: DefaultMixedRealityDiagnosticsProfile
   m_EditorClassIdentifier: 
+  isCustomProfile: 0
   showFps: 1
   showCpu: 1
   showMemory: 1
diff --git a/Assets/MixedRealityToolkit/_Core/Definitions/Diagnostics/MixedRealityDiagnosticsProfile.cs b/Assets/MixedRealityToolkit/_Core/Definitions/Diagnostics/MixedRealityDiagnosticsProfile.cs
@@ -10,7 +10,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Definitions.Diagnostics
     /// Configuration profile settings for setting up diagnostics.
     /// </summary>
     [CreateAssetMenu(menuName = "Mixed Reality Toolkit/Mixed Reality Diagnostics Profile", fileName = "MixedRealityDiagnosticsProfile", order = (int)CreateProfileMenuItemIndices.Diagnostics)]
-    public class MixedRealityDiagnosticsProfile : ScriptableObject
+    public class MixedRealityDiagnosticsProfile : BaseMixedRealityProfile
     {
         [SerializeField]
         [Tooltip("Should show fps?")]
diff --git a/Assets/MixedRealityToolkit/_Core/Definitions/MixedRealityConfigurationProfile.cs b/Assets/MixedRealityToolkit/_Core/Definitions/MixedRealityConfigurationProfile.cs
@@ -259,7 +259,7 @@ public bool IsDiagnosticsSystemEnabled
 
         [SerializeField]
         [Tooltip("Diagnostics System Class to instantiate at runtime.")]
-        [Implements(typeof(IMixedRealityDiagnosticsManager), TypeGrouping.ByNamespaceFlat)]
+        [Implements(typeof(IMixedRealityDiagnosticsSystem), TypeGrouping.ByNamespaceFlat)]
         private SystemType diagnosticsSystemType;
 
         /// <summary>
diff --git a/Assets/MixedRealityToolkit/_Core/Devices/UnityInput/MouseController.cs b/Assets/MixedRealityToolkit/_Core/Devices/UnityInput/MouseController.cs
@@ -67,8 +67,11 @@ public void Update()
                 return;
             }
 
-            controllerPose.Position = InputSource.Pointers[0].BaseCursor.Position;
-            controllerPose.Rotation = InputSource.Pointers[0].BaseCursor.Rotation;
+            if (InputSource.Pointers[0].BaseCursor != null)
+            {
+                controllerPose.Position = InputSource.Pointers[0].BaseCursor.Position;
+                controllerPose.Rotation = InputSource.Pointers[0].BaseCursor.Rotation;
+            }
 
             // Don't ask me why it's mapped weird. Bc Unity...
             mouseDelta.x = Input.GetAxis("Mouse X");
diff --git a/Assets/MixedRealityToolkit/_Core/Devices/UnityInput/MouseDeviceManager.cs b/Assets/MixedRealityToolkit/_Core/Devices/UnityInput/MouseDeviceManager.cs
@@ -29,6 +29,10 @@ public override void Enable()
                 return;
             }
 
+#if UNITY_EDITOR
+            UnityEditor.EditorWindow.focusedWindow.ShowNotification(new GUIContent("Press \"ESC\" to regain mouse control"));
+#endif
+
             Cursor.visible = false;
             Cursor.lockState = CursorLockMode.Locked;
 
diff --git a/Assets/MixedRealityToolkit/_Core/EventDatum/Diagnostics/DiagnosticsEventData.cs b/Assets/MixedRealityToolkit/_Core/EventDatum/Diagnostics/DiagnosticsEventData.cs
@@ -5,7 +5,7 @@
 using Microsoft.MixedReality.Toolkit.Core.Interfaces.Diagnostics;
 using UnityEngine.EventSystems;
 
-namespace Microsoft.MixedReality.Toolkit.Core.EventDatum.Boundary
+namespace Microsoft.MixedReality.Toolkit.Core.EventDatum.Diagnostics
 {
     public class DiagnosticsEventData : GenericBaseEventData
     {
@@ -17,7 +17,7 @@ public class DiagnosticsEventData : GenericBaseEventData
         public DiagnosticsEventData(EventSystem eventSystem) : base(eventSystem) { }
 
         public void Initialize(
-            IMixedRealityDiagnosticsManager diagnosticsSystem,
+            IMixedRealityDiagnosticsSystem diagnosticsSystem,
             bool visible,
             bool showCpu,
             bool showFps,
diff --git a/Assets/MixedRealityToolkit/_Core/EventDatum/Diagnostics/DiagnosticsEventData.cs.meta b/Assets/MixedRealityToolkit/_Core/EventDatum/Diagnostics/DiagnosticsEventData.cs.meta
diff --git a/Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityDiagnosticsSystemProfileInspector.cs b/Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityDiagnosticsSystemProfileInspector.cs
@@ -1,6 +1,7 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.﻿
 
+using Microsoft.MixedReality.Toolkit.Core.Definitions;
 using Microsoft.MixedReality.Toolkit.Core.Definitions.Diagnostics;
 using Microsoft.MixedReality.Toolkit.Core.Managers;
 using UnityEditor;
@@ -42,9 +43,14 @@ public override void OnInspectorGUI()
                 Selection.activeObject = MixedRealityManager.Instance.ActiveProfile;
             }
 
+            if (MixedRealityPreferences.LockProfiles && !((BaseMixedRealityProfile)target).IsCustomProfile)
+            {
+                GUI.enabled = false;
+            }
+
             EditorGUILayout.Space();
-            EditorGUILayout.LabelField("Boundary Visualization Options", EditorStyles.boldLabel);
-            EditorGUILayout.HelpBox("Boundary visualizations can help users stay oriented and comfortable in the experience.", MessageType.Info);
+            EditorGUILayout.LabelField("Diagnostic Visualization Options", EditorStyles.boldLabel);
+            EditorGUILayout.HelpBox("Diagnostic visualizations can help monitor system resources and performance inside an application.", MessageType.Info);
             EditorGUILayout.Space();
 
             EditorGUILayout.PropertyField(visible);
diff --git a/Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityDiagnosticsSystemProfileInspector.cs.meta b/Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityDiagnosticsSystemProfileInspector.cs.meta
diff --git a/Assets/MixedRealityToolkit/_Core/Interfaces/Diagnostics/IMixedRealityDiagnosticsHandler.cs b/Assets/MixedRealityToolkit/_Core/Interfaces/Diagnostics/IMixedRealityDiagnosticsHandler.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-using Microsoft.MixedReality.Toolkit.Core.EventDatum.Boundary;
+using Microsoft.MixedReality.Toolkit.Core.EventDatum.Diagnostics;
 using UnityEngine.EventSystems;
 
 namespace Microsoft.MixedReality.Toolkit.Core.Interfaces.Diagnostics
diff --git a/Assets/MixedRealityToolkit/_Core/Interfaces/Diagnostics/IMixedRealityDiagnosticsSystem.cs b/Assets/MixedRealityToolkit/_Core/Interfaces/Diagnostics/IMixedRealityDiagnosticsSystem.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-using Microsoft.MixedReality.Toolkit.Core.Definitions.Diagnostics;
 using Microsoft.MixedReality.Toolkit.Core.Interfaces.Events;
 using UnityEngine;
 
@@ -10,7 +9,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Interfaces.Diagnostics
     /// <summary>
     /// 
     /// </summary>
-    public interface IMixedRealityDiagnosticsManager : IMixedRealityEventSystem, IMixedRealityEventSource
+    public interface IMixedRealityDiagnosticsSystem : IMixedRealityEventSystem, IMixedRealityEventSource
     {
         /// <summary>
         /// Enable / disable the diagnostic display
@@ -25,7 +24,7 @@ public interface IMixedRealityDiagnosticsManager : IMixedRealityEventSystem, IMi
         /// <summary>
         /// Enable / disable fps profiling when the diagnostic panel is visible. 
         /// </summary>
-        bool ShowFps { get; } 
+        bool ShowFps { get; }
 
         /// <summary>
         /// Enable / disable memory profiling when the diagnostic panel is visible. 
diff --git a/Assets/MixedRealityToolkit/_Core/Interfaces/Diagnostics/IMixedRealityDiagnosticsSystem.cs.meta b/Assets/MixedRealityToolkit/_Core/Interfaces/Diagnostics/IMixedRealityDiagnosticsSystem.cs.meta
diff --git a/Assets/MixedRealityToolkit/_Core/Managers/MixedRealityManager.cs b/Assets/MixedRealityToolkit/_Core/Managers/MixedRealityManager.cs
@@ -214,7 +214,7 @@ private void Initialize()
 
             if (ActiveProfile.IsDiagnosticsSystemEnabled)
             {
-                AddManager(typeof(IMixedRealityDiagnosticsManager), Activator.CreateInstance(ActiveProfile.DiagnosticsSystemSystemType) as IMixedRealityDiagnosticsManager);
+                AddManager(typeof(IMixedRealityDiagnosticsSystem), Activator.CreateInstance(ActiveProfile.DiagnosticsSystemSystemType) as IMixedRealityDiagnosticsSystem);
 
                 if (DiagnosticsSystem == null)
                 {
@@ -920,7 +920,7 @@ private bool IsCoreManagerType(Type type)
             return type == typeof(IMixedRealityInputSystem) ||
                    type == typeof(IMixedRealityTeleportSystem) ||
                    type == typeof(IMixedRealityBoundarySystem) ||
-                   type == typeof(IMixedRealityDiagnosticsManager);
+                   type == typeof(IMixedRealityDiagnosticsSystem);
         }
 
         /// <summary>
@@ -1037,12 +1037,12 @@ private static bool CheckComponentMatch(Type type, string managerName, Tuple<Typ
         /// </summary>
         public static IMixedRealityTeleportSystem TeleportSystem => teleportSystem ?? (teleportSystem = Instance.GetManager<IMixedRealityTeleportSystem>());
 
-        private static IMixedRealityDiagnosticsManager diagnosticsSystem = null;
+        private static IMixedRealityDiagnosticsSystem diagnosticsSystem = null;
 
         /// <summary>
         /// The current Diagnostics System registered with the Mixed Reality Manager.
         /// </summary>
-        public static IMixedRealityDiagnosticsManager DiagnosticsSystem => diagnosticsSystem ?? (diagnosticsSystem = Instance.GetManager<IMixedRealityDiagnosticsManager>());
+        public static IMixedRealityDiagnosticsSystem DiagnosticsSystem => diagnosticsSystem ?? (diagnosticsSystem = Instance.GetManager<IMixedRealityDiagnosticsSystem>());
 
         #endregion Manager Accessors
     }

Original file line number	Diff line number	Diff line change
`@@ -144,11 +144,8 @@ protected override async void Start()`
`144`	`144`	`MixedRealityManager.TeleportSystem.Register(gameObject);`
`145`	`145`	`}`
`146`	`146`
`147`		`- if (MixedRealityManager.InputSystem == null)`
`148`		`- {`
`149`		`- await WaitUntilInputSystemValid;`
`150`		`- SetCursor();`
`151`		`- }`
	`147`	`+ await WaitUntilInputSystemValid;`
	`148`	`+ SetCursor();`
`152`	`149`	`}`
`153`	`150`
`154`	`151`	`protected override void OnDisable()`
`@@ -311,10 +308,14 @@ public virtual bool TryGetPointingRay(out Ray pointingRay)`
`311`	`308`	`{`
`312`	`309`	`Vector3 pointerPosition;`
`313`	`310`	`TryGetPointerPosition(out pointerPosition);`
`314`		`- pointingRay = new Ray(pointerPosition, PointerDirection);`
	`311`	`+ pointingRay = pointerRay;`
	`312`	`+ pointingRay.origin = pointerPosition;`
	`313`	`+ pointingRay.direction = PointerDirection;`
`315`	`314`	`return true;`
`316`	`315`	`}`
`317`	`316`
	`317`	`+ private readonly Ray pointerRay = new Ray();`
	`318`	`+`
`318`	`319`	`/// <inheritdoc />`
`319`	`320`	`public virtual bool TryGetPointerRotation(out Quaternion rotation)`
`320`	`321`	`{`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,6 @@ public override void OnSourcePoseChanged(SourcePoseEventData<Vector2> eventData)`
`78`	`78`	`/// <inheritdoc />`
`79`	`79`	`public override void OnPositionInputChanged(InputEventData<Vector2> eventData)`
`80`	`80`	`{`
`81`		`-`
`82`	`81`	`if (eventData.SourceId == Controller?.InputSource.SourceId)`
`83`	`82`	`{`
`84`	`83`	`if (!UseSourcePoseData &&`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Definitions.Diagnostics`
`10`	`10`	`/// Configuration profile settings for setting up diagnostics.`
`11`	`11`	`/// </summary>`
`12`	`12`	`[CreateAssetMenu(menuName = "Mixed Reality Toolkit/Mixed Reality Diagnostics Profile", fileName = "MixedRealityDiagnosticsProfile", order = (int)CreateProfileMenuItemIndices.Diagnostics)]`
`13`		`- public class MixedRealityDiagnosticsProfile : ScriptableObject`
	`13`	`+ public class MixedRealityDiagnosticsProfile : BaseMixedRealityProfile`
`14`	`14`	`{`
`15`	`15`	`[SerializeField]`
`16`	`16`	`[Tooltip("Should show fps?")]`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,10 @@ public override void Enable()`
`29`	`29`	`return;`
`30`	`30`	`}`
`31`	`31`
	`32`	`+#if UNITY_EDITOR`
	`33`	`+ UnityEditor.EditorWindow.focusedWindow.ShowNotification(new GUIContent("Press \"ESC\" to regain mouse control"));`
	`34`	`+#endif`
	`35`	`+`
`32`	`36`	`Cursor.visible = false;`
`33`	`37`	`Cursor.lockState = CursorLockMode.Locked;`
`34`	`38`