Merge branch 'mrtk_development' into vNEXT-ControllerRendering

Author: StephenHodgson

Assets/MixedRealityToolkit-SDK/Features/Teleportation/MixedRealityTeleportManager.cs

@@ -21,8 +21,6 @@ public class MixedRealityTeleportManager : MixedRealityEventManager, IMixedReali
         private bool isTeleporting = false;
         private bool isProcessingTeleportRequest = false;
 
-        private Vector3 startRotation = Vector3.zero;
-
         private Vector3 targetPosition = Vector3.zero;
         private Vector3 targetRotation = Vector3.zero;
 
@@ -181,17 +179,13 @@ public void RaiseTeleportStarted(IMixedRealityPointer pointer, IMixedRealityTele
                 handler.OnTeleportCompleted(casted);
             };
 
-        /// <inheritdoc />
-        public void RaiseTeleportComplete(IMixedRealityPointer pointer, IMixedRealityTeleportHotSpot hotSpot)
+        /// <summary>
+        /// Raise a teleportation completed event.
+        /// </summary>
+        /// <param name="pointer">The pointer that raised the event.</param>
+        /// <param name="hotSpot">The teleport target</param>
+        private void RaiseTeleportComplete(IMixedRealityPointer pointer, IMixedRealityTeleportHotSpot hotSpot)
         {
-            // Check to make sure no one from outside the Teleport System called this method.
-            // Other implementations may have a different way of processing requests.
-            if (isProcessingTeleportRequest)
-            {
-                Debug.LogError("Calls to this method from outside the Teleport System is not allowed in this implementation.");
-                return;
-            }
-
             if (!isTeleporting)
             {
                 Debug.LogError("No Active Teleportation in progress.");
@@ -232,27 +226,26 @@ private void ProcessTeleportationRequest(TeleportEventData eventData)
 
             var cameraParent = CameraCache.Main.transform.parent;
 
-            startRotation = CameraCache.Main.transform.eulerAngles;
-            startRotation.x = 0f;
-            startRotation.z = 0f;
-
-            cameraParent.eulerAngles = startRotation;
+            targetRotation = Vector3.zero;
+            targetRotation.y = eventData.Pointer.PointerOrientation;
+            targetPosition = eventData.Pointer.Result.Details.Point;
 
             if (eventData.HotSpot != null)
             {
                 targetPosition = eventData.HotSpot.Position;
-                targetRotation.y = eventData.HotSpot.OverrideTargetOrientation
-                    ? eventData.HotSpot.TargetOrientation
-                    : eventData.Pointer.PointerOrientation;
-            }
-            else
-            {
-                targetPosition = eventData.Pointer.Result.Details.Point;
-                targetRotation.y = eventData.Pointer.PointerOrientation;
+
+                if (eventData.HotSpot.OverrideTargetOrientation)
+                {
+                    targetRotation.y = eventData.HotSpot.TargetOrientation;
+                }
             }
 
+            float height = targetPosition.y;
+            targetPosition -= CameraCache.Main.transform.position - cameraParent.position;
+            targetPosition.y = height;
             cameraParent.position = targetPosition;
-            cameraParent.eulerAngles = targetRotation;
+
+            cameraParent.RotateAround(CameraCache.Main.transform.position, Vector3.up, targetRotation.y - CameraCache.Main.transform.eulerAngles.y);
 
             isProcessingTeleportRequest = false;
 

Assets/MixedRealityToolkit-SDK/Features/UX/Prefabs/Pointers/ParabolicPointer.prefab

@@ -259,15 +259,16 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   handedness: 1
-  destroyOnLost: 1
+  disableChildren: 1
+  destroyOnSourceLost: 1
+  cursorPrefab: {fileID: 1554777696564956, guid: 1934d37f8a23e204a8eef74d71cf626b,
+    type: 2}
+  raycastOrigin: {fileID: 0}
   useSourcePoseData: 0
-  poseAction:
+  inputSourceAction:
     id: 4
     description: Pointer Pose
     axisConstraint: 7
-  cursorPrefab: {fileID: 1554777696564956, guid: 1934d37f8a23e204a8eef74d71cf626b,
-    type: 2}
-  raycastOrigin: {fileID: 0}
   activeHoldAction:
     id: 0
     description: None
@@ -435,7 +436,7 @@ MonoBehaviour:
     description: Teleport
     axisConstraint: 4
   activationAngle: 45
-  angleOffset: -90
+  angleOffset: 90
   upDirectionThreshold: 0.2
   LineColorHotSpot:
     serializedVersion: 2

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

@@ -32,11 +32,11 @@ public class TeleportPointer : LinePointer
 
         [SerializeField]
         [Tooltip("Layers that are considered 'valid' for navigation")]
-        protected LayerMask ValidLayers = 1 << 0; // Default
+        protected LayerMask ValidLayers = Physics.DefaultRaycastLayers;
 
         [SerializeField]
         [Tooltip("Layers that are considered 'invalid' for navigation")]
-        protected LayerMask InvalidLayers = 1 << 2; // Ignore raycast
+        protected LayerMask InvalidLayers = Physics.IgnoreRaycastLayer;
 
         [SerializeField]
         private float inputThreshold = 0.5f;
@@ -81,6 +81,7 @@ public override void SetCursor(GameObject newCursor = null)
             base.SetCursor(newCursor);
             BaseCursor?.SetVisibility(false);
         }
+
         #region IMixedRealityPointer Implementation
 
         /// <inheritdoc />
@@ -102,7 +103,7 @@ public override float PointerOrientation
             }
             set
             {
-                base.PointerOrientation = value * -1f;
+                base.PointerOrientation = value;
             }
         }
 
@@ -245,7 +246,7 @@ public override void OnPositionInputChanged(InputEventData<Vector2> eventData)
                 Mathf.Abs(currentInputPosition.x) > inputThreshold)
             {
                 // Get the angle of the pointer input
-                float angle = Mathf.Atan2(currentInputPosition.y, currentInputPosition.x) * Mathf.Rad2Deg;
+                float angle = -Mathf.Atan2(currentInputPosition.y, currentInputPosition.x) * Mathf.Rad2Deg;
 
                 // Offset the angle so it's 'forward' facing
                 angle += angleOffset;
@@ -260,9 +261,6 @@ public override void OnPositionInputChanged(InputEventData<Vector2> eventData)
             }
             else
             {
-                currentInputPosition = Vector2.zero;
-                PointerOrientation = 0f;
-
                 if (canTeleport)
                 {
                     canTeleport = false;

Assets/MixedRealityToolkit/_Core/Interfaces/TeleportSystem/IMixedRealityTeleportSystem.cs

@@ -31,13 +31,6 @@ public interface IMixedRealityTeleportSystem : IMixedRealityEventSystem
         /// <param name="hotSpot">The teleport target</param>
         void RaiseTeleportStarted(IMixedRealityPointer pointer, IMixedRealityTeleportHotSpot hotSpot);
 
-        /// <summary>
-        /// Raise a teleportation completed event.
-        /// </summary>
-        /// <param name="pointer">The pointer that raised the event.</param>
-        /// <param name="hotSpot">The teleport target</param>
-        void RaiseTeleportComplete(IMixedRealityPointer pointer, IMixedRealityTeleportHotSpot hotSpot);
-
         /// <summary>
         /// Raise a teleportation canceled event.
         /// </summary>