Fix Teleportable not working in some condition

1. Pointer3DInputModule doesn't clean up raycaster correctly when raycaster disabled if OnDisable happened earlier then InputModule update process.
2. The clean up process should not reset raycast result before event handling. This causes PointerExit handler getting empty raycast result.

Author: lawwong

Assets/HTC.UnityPlugin/Pointer3D/Pointer3DInputModule.cs

@@ -14,7 +14,7 @@ public class Pointer3DInputModule : BaseInputModule
         private static bool isApplicationQuitting = false;
 
         private static readonly IndexedSet<Pointer3DRaycaster> raycasters = new IndexedSet<Pointer3DRaycaster>();
-        private static readonly List<Pointer3DRaycaster> processingRaycasters = new List<Pointer3DRaycaster>();
+        private static IndexedSet<Pointer3DRaycaster> processingRaycasters = new IndexedSet<Pointer3DRaycaster>();
         private static int validEventDataId = PointerInputModule.kFakeTouchesId - 1;
 
 #if UNITY_5_5_OR_NEWER
@@ -138,7 +138,7 @@ protected override void OnDisable()
         {
             base.OnDisable();
 
-            if (Active)
+            if (Active && processingRaycasters.Count == 0)
             {
                 for (var i = raycasters.Count - 1; i >= 0; --i)
                 {
@@ -210,22 +210,28 @@ public static void AddRaycaster(Pointer3DRaycaster raycaster)
             raycasters.AddUnique(raycaster);
         }
 
-        public static void RemoveRaycasters(Pointer3DRaycaster raycaster)
+        public static void RemoveRaycaster(Pointer3DRaycaster raycaster)
         {
-            raycasters.Remove(raycaster);
+            if (!raycasters.Remove(raycaster)) { return; }
+
+            if (!processingRaycasters.Contains(raycaster) && Active)
+            {
+                Instance.CleanUpRaycaster(raycaster);
+            }
         }
 
+        [Obsolete("Use RemoveRaycaster instead")]
+        public static void RemoveRaycasters(Pointer3DRaycaster raycaster) { RemoveRaycaster(raycaster); }
+
         protected void CleanUpRaycaster(Pointer3DRaycaster raycaster)
         {
-            raycaster.CleanUpRaycast();
-
             var hoverEventData = raycaster.HoverEventData;
 
-            // hover event
-            hoverEventData.pointerCurrentRaycast = default(RaycastResult);
+            hoverEventData.Reset();
 
             if (hoverEventData.pointerEnter != null)
             {
+                hoverEventData.pointerEnter = null;
                 HandlePointerExitAndEnter(hoverEventData, null);
             }
 
@@ -236,15 +242,26 @@ protected void CleanUpRaycaster(Pointer3DRaycaster raycaster)
                 if (buttonEventData == null) { continue; }
 
                 buttonEventData.Reset();
-                buttonEventData.pointerCurrentRaycast = default(RaycastResult);
 
                 ProcessPressUp(buttonEventData);
 
                 if (buttonEventData.pointerEnter != null)
                 {
+                    hoverEventData.pointerEnter = null;
                     HandlePointerExitAndEnter(buttonEventData, null);
                 }
             }
+
+            raycaster.CleanUpRaycast();
+
+            for (int i = 0, imax = raycaster.ButtonEventDataList.Count; i < imax; ++i)
+            {
+                raycaster.ButtonEventDataList[i].pointerPressRaycast = default(RaycastResult);
+                raycaster.ButtonEventDataList[i].pointerCurrentRaycast = default(RaycastResult);
+            }
+
+            hoverEventData.pointerPressRaycast = default(RaycastResult);
+            hoverEventData.pointerCurrentRaycast = default(RaycastResult);
         }
 
         protected virtual void ProcessRaycast()
@@ -254,13 +271,20 @@ protected virtual void ProcessRaycast()
 
             // use another list to iterate raycasters
             // incase that raycasters may changed during this process cycle
-            processingRaycasters.AddRange(raycasters);
+            for (int i = 0, imax = raycasters.Count; i < imax; ++i)
+            {
+                var r = raycasters[i];
+
+                if (r != null)
+                {
+                    processingRaycasters.Add(r);
+                }
+            }
+
             for (var i = processingRaycasters.Count - 1; i >= 0; --i)
             {
                 var raycaster = processingRaycasters[i];
 
-                if (raycaster == null || !raycaster.isActiveAndEnabled) { continue; }
-
                 raycaster.Raycast();
                 var result = raycaster.FirstRaycastResult();
 
@@ -321,10 +345,24 @@ protected virtual void ProcessRaycast()
                     var scrollHandler = ExecuteEvents.GetEventHandler<IScrollHandler>(result.gameObject);
                     ExecuteEvents.ExecuteHierarchy(scrollHandler, hoverEventData, ExecuteEvents.scrollHandler);
                 }
+            }
 
-                if (!raycaster.isActiveAndEnabled)
+            if (isActiveAndEnabled)
+            {
+                for (var i = processingRaycasters.Count - 1; i >= 0; --i)
+                {
+                    var r = processingRaycasters[i];
+                    if (!raycasters.Contains(r))
+                    {
+                        CleanUpRaycaster(r);
+                    }
+                }
+            }
+            else
+            {
+                for (var i = processingRaycasters.Count - 1; i >= 0; --i)
                 {
-                    CleanUpRaycaster(raycaster);
+                    CleanUpRaycaster(processingRaycasters[i]);
                 }
             }
 

Assets/HTC.UnityPlugin/Pointer3D/Raycaster/Pointer3DRaycaster.cs

@@ -100,25 +100,19 @@ protected override void Start()
                 SetLagacyRaycastMode(m_raycastMode);
                 m_raycastMode = RaycastMode.DefaultRaycast;
             }
-
-            Pointer3DInputModule.AddRaycaster(this);
         }
 
         // override OnEnable & OnDisable on purpose so that this BaseRaycaster won't be registered into RaycasterManager
         protected override void OnEnable()
         {
             //base.OnEnable();
+            Pointer3DInputModule.AddRaycaster(this);
         }
 
         protected override void OnDisable()
         {
             //base.OnDisable();
-        }
-
-        protected override void OnDestroy()
-        {
-            base.OnDestroy();
-            Pointer3DInputModule.RemoveRaycasters(this);
+            Pointer3DInputModule.RemoveRaycaster(this);
         }
 
         public virtual void CleanUpRaycast()

Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Misc/Teleportable.cs

@@ -66,12 +66,12 @@ public void OnPointerExit(PointerEventData eventData)
         // skip if it was teleporting
         if (teleportCoroutine != null) { return; }
 
+        // don't teleport if it was not releasing the button
+        if (eventData.eligibleForClick) { return; }
+
         VivePointerEventData viveEventData;
         if (!eventData.TryGetViveButtonEventData(out viveEventData)) { return; }
 
-        // don't teleport if it was not releasing the button
-        if (viveEventData.eligibleForClick) { return; }
-
         if (viveEventData.viveButton != teleportViveButton) { return; }
 
         var hitResult = eventData.pointerCurrentRaycast;