Merge branch 'vNEXT-Teleportation' into vNEXT-ControllerRenderwithTeleport

Author: StephenHodgson

Assets/MixedRealityToolkit-SDK/Features/Input/MixedRealityInputManager.cs

@@ -91,6 +91,12 @@ public override void Initialize()
 
         private void InitializeInternal()
         {
+            if (CameraCache.Main.transform.parent == null)
+            {
+                var cameraParent = new GameObject("Body");
+                CameraCache.Main.transform.SetParent(cameraParent.transform);
+            }
+
             focusProvider = CameraCache.Main.gameObject.EnsureComponent<FocusProvider>();
             gazeProvider = CameraCache.Main.gameObject.EnsureComponent<GazeProvider>();
 

Assets/MixedRealityToolkit-SDK/Features/UX/Prefabs/Cursors/TeleportCursor.prefab

@@ -267,7 +267,7 @@ Animator:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1466073170848862}
-  m_Enabled: 1
+  m_Enabled: 0
   m_Avatar: {fileID: 9000000, guid: 6e9e603a0869edf45a8a4fea496c6d9b, type: 3}
   m_Controller: {fileID: 9100000, guid: 65931ac36f624f549a6fe2c27af849ab, type: 2}
   m_CullingMode: 0
@@ -341,11 +341,11 @@ MonoBehaviour:
   - name: Valid
     cursorState: 1
     parameter:
-      parameterType: 0
+      parameterType: 4
       defaultInt: 0
       defaultFloat: 0
       defaultBool: 0
-      name: 
+      name: Valid
   inputEnabledParameter:
     parameterType: 0
     defaultInt: 0

Assets/MixedRealityToolkit-SDK/Features/UX/Scripts/Pointers/BaseControllerPointer.cs

@@ -73,7 +73,7 @@ public abstract class BaseControllerPointer : ControllerPoseSynchronizer, IMixed
         /// </summary>
         /// <remarks>This <see cref="GameObject"/> must have a <see cref="IMixedRealityCursor"/> attached to it.</remarks>
         /// <param name="newCursor"></param>
-        public void SetCursor(GameObject newCursor = null)
+        public virtual void SetCursor(GameObject newCursor = null)
         {
             if (cursorInstance != null)
             {

Assets/MixedRealityToolkit-SDK/Features/UX/Scripts/Pointers/TeleportPointer.cs

@@ -75,6 +75,12 @@ protected override void OnEnable()
             BaseCursor?.SetVisibility(false);
         }
 
+        /// <inheritdoc />
+        public override void SetCursor(GameObject newCursor = null)
+        {
+            base.SetCursor(newCursor);
+            BaseCursor?.SetVisibility(false);
+        }
         #region IMixedRealityPointer Implementation
 
         /// <inheritdoc />
@@ -287,22 +293,32 @@ public override void OnPositionInputChanged(InputEventData<Vector2> eventData)
         /// <inheritdoc />
         public override void OnTeleportRequest(TeleportEventData eventData)
         {
+            // Only turn off the pointer if we're not the one sending the request
             if (eventData.Pointer.PointerId == PointerId)
             {
+                IsTeleportRequestActive = false;
                 BaseCursor?.SetVisibility(true);
             }
+            else
+            {
+                IsTeleportRequestActive = true;
+                BaseCursor?.SetVisibility(false);
+            }
         }
 
         /// <inheritdoc />
         public override void OnTeleportStarted(TeleportEventData eventData)
         {
-            base.OnTeleportStarted(eventData);
+            // Turn off all pointers while we teleport.
+            IsTeleportRequestActive = true;
+            BaseCursor?.SetVisibility(false);
         }
 
         /// <inheritdoc />
         public override void OnTeleportCompleted(TeleportEventData eventData)
         {
             IsTeleportRequestActive = false;
+            BaseCursor?.SetVisibility(false);
         }
 
         /// <inheritdoc />