Initial work to migrate teleport to motion controllers

Author: keveleigh

Assets/HoloToolkit/Input/Scripts/Cursor/Cursor.cs

@@ -271,8 +271,11 @@ private void TryLoadPointerIfNeeded()
             {
                 // For backward-compatibility, if a pointer wasn't specified, but there's exactly one
                 // pointer currently registered with FocusManager, we use it.
-
-                Pointer = FocusManager.Instance.TryGetSinglePointer();
+                IPointingSource pointingSource;
+                if (FocusManager.Instance.TryGetSinglePointer(out pointingSource))
+                {
+                    Pointer = pointingSource;
+                }
             }
             else
             {

Assets/HoloToolkit/Input/Scripts/Focus/FocusManager.cs

@@ -282,13 +282,18 @@ public GameObject GetFocusedObject(IPointingSource pointingSource)
         /// Checks if exactly one pointer is registered and returns it if so.
         /// </summary>
         /// <returns>The registered pointer if exactly one is registered, null otherwise.</returns>
-        public IPointingSource TryGetSinglePointer()
+        public bool TryGetSinglePointer(out IPointingSource pointingSource)
         {
-            IPointingSource singlePointer = (pointers.Count == 1)
-                ? pointers[0].PointingSource
-                : null;
-
-            return singlePointer;
+            if (pointers.Count == 1)
+            {
+                pointingSource = pointers[0].PointingSource;
+                return true;
+            }
+            else
+            {
+                pointingSource = null;
+                return false;
+            }
         }
 
         public delegate void FocusEnteredMethod(GameObject focusedObject);

Assets/HoloToolkit/Input/Scripts/Gaze/MixedRealityTeleport.cs

@@ -1,19 +1,14 @@
-using UnityEngine;
+using System;
+using UnityEngine;
 using UnityEngine.XR.WSA.Input;
 
 namespace HoloToolkit.Unity.InputModule
 {
     /// <summary>
     /// Script teleports the user to the location being gazed at when Y was pressed on a Gamepad.
     /// </summary>
-    public class MixedRealityTeleport : Singleton<MixedRealityTeleport>
+    public class MixedRealityTeleport : Singleton<MixedRealityTeleport>, IControllerInputHandler
     {
-        [Tooltip("Game pad button to press for teleporting or jump.")]
-        public string TeleportButtonName = "Jump";
-
-        [Tooltip("Game pad button to press for going back to a state.")]
-        public string GoBackButtonName = "Fire2";
-
         [Tooltip("Name of the joystick axis to move along X.")]
         public string LeftJoystickX = "ControllerLeftStickX";
 
@@ -26,7 +21,7 @@ public class MixedRealityTeleport : Singleton<MixedRealityTeleport>
 
         public float SpeedScale { get; set; }
 
-        public float BumperRotationSize = 30.0f;
+        public float BumperRotationSize = 45.0f;
 
         public GameObject TeleportMarker;
         private Animator animationController;
@@ -61,79 +56,13 @@ private void Start()
 
         void Update()
         {
-            HandleTeleport();
-            HandleGoBackPressed();
             HandleJoystickMovement();
             if (InteractionManager.numSourceStates == 0)
             {
                 HandleBumperRotation();
             }
         }
 
-        private void HandleTeleport()
-        {
-            if (EnableTeleport)
-            {
-                if (teleporting)
-                {
-                    if (Input.GetButtonUp(TeleportButtonName))
-                    {
-                        teleporting = false;
-                        if (teleportValid)
-                        {
-                            positionBeforeJump = transform.position;
-                            float verticalOffset;
-                            RaycastHit hitInfo;
-                            if (Physics.Raycast(Camera.main.transform.position, Vector3.down, out hitInfo, 5.0f))
-                            {
-                                verticalOffset = hitInfo.distance;
-                            }
-                            else
-                            {
-                                verticalOffset = 2.6f;
-                            }
-
-                            Vector3 hitPos = teleportMarker.transform.position + Vector3.up * verticalOffset;
-
-                            fadeControl.DoFade(0.25f, 0.5f, () =>
-                            {
-                                SetWorldPosition(hitPos);
-                            }, null);
-                        }
-
-                        DisableMarker();
-                    }
-                    else
-                    {
-                        PositionMarker();
-                    }
-                }
-                else
-                {
-                    if (fadeControl.Busy == false && Input.GetButtonDown(TeleportButtonName))
-                    {
-                        teleporting = true;
-                        EnableMarker();
-                        PositionMarker();
-                    }
-                }
-            }
-        }
-
-        private void HandleGoBackPressed()
-        {
-            if (EnableTeleport && Input.GetButtonDown(GoBackButtonName))
-            {
-                Vector3 oldPositionBeforeJump = positionBeforeJump;
-                positionBeforeJump = transform.position;
-
-                fadeControl.DoFade(0.25f, 0.5f, () =>
-                {
-                    SetWorldPosition(oldPositionBeforeJump);
-                }, null);
-            }
-        }
-
         private void HandleJoystickMovement()
         {
             if (EnableJoystickMovement)
@@ -221,7 +150,12 @@ private void PositionMarker()
             if (Vector3.Dot(hitNormal, Vector3.up) > 0.90f)
             {
                 teleportValid = true;
-                teleportMarker.transform.position = gazeManager.HitPosition;
+
+                IPointingSource pointingSource;
+                if (FocusManager.Instance.TryGetSinglePointer(out pointingSource))
+                {
+                    teleportMarker.transform.position = FocusManager.Instance.GetFocusDetails(pointingSource).Point;
+                }
             }
             else
             {
@@ -234,11 +168,70 @@ private void PositionMarker()
         private Vector3 HitNormal()
         {
             Vector3 retval = Vector3.zero;
-            if (gazeManager.HitObject != null)
+
+            IPointingSource pointingSource;
+            if (FocusManager.Instance.TryGetSinglePointer(out pointingSource))
             {
-                retval = gazeManager.HitNormal;
+                FocusDetails focusDetails = FocusManager.Instance.GetFocusDetails(pointingSource);
+
+                if (focusDetails.Object != null)
+                {
+                    retval = focusDetails.Normal;
+                }
             }
+            
             return retval;
         }
+
+        void IControllerInputHandler.OnSelectPressedAmountChanged(SelectPressedEventData eventData)
+        {
+        }
+
+        void IControllerInputHandler.OnInputPositionChanged(InputPositionEventData eventData)
+        {
+            if(EnableTeleport)
+            {
+                if (fadeControl.Busy == false && teleporting == false && eventData.PressType == InteractionSourcePressType.Thumbstick && Math.Abs(1.0 - eventData.Position.y) < 0.2 && Math.Abs(eventData.Position.x) < 0.1)
+                {
+                    teleporting = true;
+                    EnableMarker();
+                    PositionMarker();
+                }
+                else if (teleporting)
+                {
+                    if (eventData.PressType == InteractionSourcePressType.Thumbstick && eventData.Position.magnitude < 0.1)
+                    {
+                        teleporting = false;
+                        if (teleportValid)
+                        {
+                            positionBeforeJump = transform.position;
+                            float verticalOffset;
+                            RaycastHit hitInfo;
+                            if (Physics.Raycast(Camera.main.transform.position, Vector3.down, out hitInfo, 5.0f))
+                            {
+                                verticalOffset = hitInfo.distance;
+                            }
+                            else
+                            {
+                                verticalOffset = 2.6f;
+                            }
+
+                            Vector3 hitPos = teleportMarker.transform.position + Vector3.up * verticalOffset;
+
+                            fadeControl.DoFade(0.25f, 0.5f, () =>
+                            {
+                                SetWorldPosition(hitPos);
+                            }, null);
+                        }
+
+                        DisableMarker();
+                    }
+                    else
+                    {
+                        PositionMarker();
+                    }
+                }
+            }
+        }
     }
 }

Assets/HoloToolkit/Input/Scripts/InputEvents/IControllerInputHandler.cs

@@ -1,12 +1,14 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
+using UnityEngine.EventSystems;
+
 namespace HoloToolkit.Unity.InputModule
 {
     /// <summary>
     /// Interface to implement to react to controller input changes.
     /// </summary>
-    public interface IControllerInputHandler : IInputHandler
+    public interface IControllerInputHandler : IEventSystemHandler
     {
         void OnSelectPressedAmountChanged(SelectPressedEventData eventData);
         void OnInputPositionChanged(InputPositionEventData eventData);

Assets/HoloToolkit/Input/Scripts/InputSources/InteractionSourceInputSource.cs

@@ -113,6 +113,7 @@ public void ResetUpdatedBooleans()
 
             public uint SourceId { get { return Source.id; } }
             public InteractionSourceKind SourceKind { get { return Source.kind; } }
+            public InteractionSourceHandedness Handedness { get { return Source.handedness; } }
             public readonly InteractionSource Source;
             public SourceCapability<Vector3> PointerPosition;
             public SourceCapability<Quaternion> PointerRotation;