Merge pull request #450 from Unity-Technologies/bugfixes/schoen/player-head-ui

Fix a bug where the player head was blocking UI raycasts

Author: mtschoen-unity

Scripts/Core/EditorVR.Rays.cs

@@ -18,7 +18,7 @@ partial class EditorVR
         [SerializeField]
         ProxyExtras m_ProxyExtras;
 
-        class Rays : Nested, IInterfaceConnector, IForEachRayOrigin, IConnectInterfaces
+        class Rays : Nested, IInterfaceConnector, IForEachRayOrigin, IConnectInterfaces, IStandardIgnoreList
         {
             internal delegate void ForEachProxyDeviceCallback(DeviceData deviceData);
 
@@ -35,6 +35,8 @@ class Rays : Nested, IInterfaceConnector, IForEachRayOrigin, IConnectInterfaces
 
             internal Transform lastSelectionRayOrigin { get; private set; }
 
+            public List<GameObject> ignoreList { private get; set; }
+
             public Rays()
             {
                 ISetDefaultRayColorMethods.setDefaultRayColor = SetDefaultRayColor;
@@ -204,7 +206,7 @@ void OnProxyActiveChanged(IProxy proxy)
                                             var uiDistance = source.eventData.pointerCurrentRaycast.distance;
 
                                             // If the distance to a scene object is less than the distance to the hovered UI, invalidate the UI raycast
-                                            if (!isManipulator && raycastObject && sceneObjectDistance < uiDistance)
+                                            if (!isManipulator && raycastObject && sceneObjectDistance < uiDistance && !ignoreList.Contains(raycastObject))
                                                 return false;
                                         }
 

Scripts/Core/EditorVR.cs

@@ -194,6 +194,8 @@ void Awake()
             var intersectionModule = AddModule<IntersectionModule>();
             this.ConnectInterfaces(intersectionModule);
             intersectionModule.Setup(spatialHashModule.spatialHash);
+            // TODO: Support module dependencies via ConnectInterfaces
+            GetNestedModule<Rays>().ignoreList = intersectionModule.standardIgnoreList;
 
             AddModule<SnappingModule>();