Merge pull request #2833 from StephenHodgson/vNEXT-MouseNotifications

Mouse Pointer Updates

Author: keveleigh

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)
         {

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 &&

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");

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;