Merge branch 'vNEXT-Teleportation' into vNEXT-ControllerRenderwithTeleport

Author: StephenHodgson

Assets/MixedRealityToolkit-SDK/Features/Input/Handlers/ControllerPoseSynchronizer.cs

@@ -36,6 +36,16 @@ public bool DestroyOnLost
             set { destroyOnLost = value; }
         }
 
+        /// <summary>
+        /// Is the controller this Synchronizer is registered to currently tracked?
+        /// </summary>
+        public bool IsTracked { get; protected set; } = false;
+
+        /// <summary>
+        /// The current tracking state of the assigned <see cref="IMixedRealityController"/>
+        /// </summary>
+        protected TrackingState TrackingState = TrackingState.NotTracked;
+
         private IMixedRealityController controller;
 
         /// <inheritdoc />
@@ -73,16 +83,6 @@ public MixedRealityInputAction PoseAction
 
         #endregion IMixedRealityControllerPoseSynchronizer Implementation
 
-        /// <summary>
-        /// Is the controller this Synchronizer is registered to currently tracked?
-        /// </summary>
-        public bool IsTracked { get; protected set; } = false;
-
-        /// <summary>
-        /// The current tracking state of the assigned <see cref="IMixedRealityController"/>
-        /// </summary>
-        protected TrackingState TrackingState = TrackingState.NotTracked;
-
         #region IMixedRealitySourcePoseHandler Implementation
 
         /// <inheritdoc />
@@ -135,8 +135,8 @@ public virtual void OnSourcePoseChanged(SourcePoseEventData eventData)
 
             if (TrackingState == TrackingState.Tracked)
             {
-                transform.position = eventData.MixedRealityPose.Position;
-                transform.rotation = eventData.MixedRealityPose.Rotation;
+                transform.localPosition = eventData.MixedRealityPose.Position;
+                transform.localRotation = eventData.MixedRealityPose.Rotation;
             }
         }
 
@@ -166,7 +166,7 @@ public virtual void OnPositionChanged(InputEventData<Vector3> eventData)
                 {
                     IsTracked = true;
                     TrackingState = TrackingState.Tracked;
-                    transform.position = eventData.InputData;
+                    transform.localPosition = eventData.InputData;
                 }
             }
         }
@@ -181,7 +181,7 @@ public virtual void OnRotationChanged(InputEventData<Quaternion> eventData)
                 {
                     IsTracked = true;
                     TrackingState = TrackingState.Tracked;
-                    transform.rotation = eventData.InputData;
+                    transform.localRotation = eventData.InputData;
                 }
             }
         }
@@ -196,8 +196,8 @@ public virtual void OnPoseInputChanged(InputEventData<MixedRealityPose> eventDat
                 {
                     IsTracked = true;
                     TrackingState = TrackingState.Tracked;
-                    transform.position = eventData.InputData.Position;
-                    transform.rotation = eventData.InputData.Rotation;
+                    transform.localPosition = eventData.InputData.Position;
+                    transform.localRotation = eventData.InputData.Rotation;
                 }
             }
         }

…atures/Input/Handlers/TeleportHandler.cs …atures/Input/Handlers/TeleportHotSpot.csAssets/MixedRealityToolkit-SDK/Features/Input/Handlers/TeleportHandler.cs renamed to Assets/MixedRealityToolkit-SDK/Features/Input/Handlers/TeleportHotSpot.cs Assets/MixedRealityToolkit-SDK/Features/Input/Handlers/TeleportHandler.cs renamed to Assets/MixedRealityToolkit-SDK/Features/Input/Handlers/TeleportHotSpot.cs

@@ -2,21 +2,55 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using Microsoft.MixedReality.Toolkit.Internal.EventDatum.Input;
-using Microsoft.MixedReality.Toolkit.Internal.Interfaces.InputSystem;
+using Microsoft.MixedReality.Toolkit.Internal.Interfaces.TeleportSystem;
+using Microsoft.MixedReality.Toolkit.Internal.Managers;
+using Microsoft.MixedReality.Toolkit.SDK.UX.Pointers;
 using UnityEngine;
 
 namespace Microsoft.MixedReality.Toolkit.SDK.Input.Handlers
 {
     /// <summary>
-    /// SDK component handling teleportation when a user focuses this <see cref="GameObject"/> and triggers the teleport action.
+    /// SDK component handling teleportation to a specific position &amp; orientation when a user focuses
+    /// this <see cref="GameObject"/> and triggers the teleport action.
     /// </summary>
-    public class TeleportHandler : BaseFocusHandler, ITeleportTarget
+    public class TeleportHotSpot : BaseFocusHandler, IMixedRealityTeleportHotSpot
     {
-        [SerializeField]
-        [Tooltip("Should the destination orientation be overridden? " +
-                 "Useful when you want to orient the user in a specific direction when they teleport to this position. " +
-                 "Override orientation is the transform forward of the GameObject this component is attached to.")]
-        private bool overrideOrientation = false;
+        private static IMixedRealityTeleportSystem teleportSystem = null;
+        protected static IMixedRealityTeleportSystem TeleportSystem => teleportSystem ?? (teleportSystem = MixedRealityManager.Instance.GetManager<IMixedRealityTeleportSystem>());
+
+        #region IMixedRealityFocusHandler Implementation
+
+        /// <inheritdoc />
+        public override void OnBeforeFocusChange(FocusEventData eventData)
+        {
+            base.OnBeforeFocusChange(eventData);
+
+            if (!(eventData.Pointer is TeleportPointer)) { return; }
+
+            if (eventData.NewFocusedObject == gameObject)
+            {
+                eventData.Pointer.TeleportHotSpot = this;
+
+                if (eventData.Pointer.IsInteractionEnabled)
+                {
+                    TeleportSystem.RaiseTeleportCanceled(eventData.Pointer, this);
+                    TeleportSystem.RaiseTeleportRequest(eventData.Pointer, this);
+                }
+            }
+            else if (eventData.OldFocusedObject == gameObject)
+            {
+                eventData.Pointer.TeleportHotSpot = null;
+
+                if (eventData.Pointer.IsInteractionEnabled)
+                {
+                    TeleportSystem.RaiseTeleportCanceled(eventData.Pointer, this);
+                }
+            }
+        }
+
+        #endregion IMixedRealityFocusHandler Implementation
+
+        #region IMixedRealityTeleportTarget Implementation
 
         /// <inheritdoc />
         public Vector3 Position => transform.position;
@@ -27,27 +61,22 @@ public class TeleportHandler : BaseFocusHandler, ITeleportTarget
         /// <inheritdoc />
         public bool IsActive => isActiveAndEnabled;
 
+        [SerializeField]
+        [Tooltip("Should the destination orientation be overridden? " +
+                 "Useful when you want to orient the user in a specific direction when they teleport to this position. " +
+                 "Override orientation is the transform forward of the GameObject this component is attached to.")]
+        private bool overrideOrientation = false;
+
         /// <inheritdoc />
         public bool OverrideTargetOrientation => overrideOrientation;
 
         /// <inheritdoc />
         public float TargetOrientation => transform.eulerAngles.y;
 
         /// <inheritdoc />
-        public override void OnBeforeFocusChange(FocusEventData eventData)
-        {
-            base.OnBeforeFocusChange(eventData);
+        public GameObject GameObjectReference => gameObject;
 
-            if (eventData.NewFocusedObject == gameObject)
-            {
-                eventData.Pointer.TeleportTarget = this;
-            }
-
-            if (eventData.OldFocusedObject == gameObject)
-            {
-                eventData.Pointer.TeleportTarget = null;
-            }
-        }
+        #endregion IMixedRealityTeleportTarget Implementation
 
         private void OnDrawGizmos()
         {