Merge pull request #10370 from keveleigh/improve-raycast-hit

[2.7.3] Improve raycast hit to prevent log spam on Unity 2021 and prevent a crash when using assetbundles

Author: keveleigh

Assets/MRTK/Core/Definitions/InputSystem/MixedRealityRaycastHit.cs

@@ -32,18 +32,56 @@ public MixedRealityRaycastHit(bool raycastValid, RaycastHit hitInfo)
                 barycentricCoordinate = hitInfo.barycentricCoordinate;
                 distance = hitInfo.distance;
                 triangleIndex = hitInfo.triangleIndex;
-                textureCoord = hitInfo.textureCoord;
+
                 MeshCollider meshCollider = hitInfo.collider as MeshCollider;
-                if (meshCollider == null || meshCollider.sharedMesh.isReadable)
+                if (meshCollider == null)
                 {
+                    textureCoord = hitInfo.textureCoord;
                     textureCoord2 = hitInfo.textureCoord2;
+                    lightmapCoord = hitInfo.lightmapCoord;
                 }
                 else
                 {
-                    textureCoord2 = Vector2.zero;
+                    Mesh sharedMesh = meshCollider.sharedMesh;
+                    if (sharedMesh != null && sharedMesh.isReadable)
+                    {
+#if UNITY_2019_4_OR_NEWER
+                        if (sharedMesh.HasVertexAttribute(UnityEngine.Rendering.VertexAttribute.TexCoord0))
+                        {
+                            textureCoord = hitInfo.textureCoord;
+                        }
+                        else
+                        {
+                            textureCoord = Vector2.zero;
+                        }
+
+                        // This checks for TexCoord1, since textureCoord2 and lightmapCoord both query that index
+                        // via CalculateRaycastTexCoord(collider, m_UV, m_Point, m_FaceID, 1); (the last parameter is the index)
+                        if (sharedMesh.HasVertexAttribute(UnityEngine.Rendering.VertexAttribute.TexCoord1))
+                        {
+                            textureCoord2 = hitInfo.textureCoord2;
+                            lightmapCoord = hitInfo.lightmapCoord;
+                        }
+                        else
+                        {
+                            textureCoord2 = Vector2.zero;
+                            lightmapCoord = Vector2.zero;
+                        }
+#else
+                        textureCoord = hitInfo.textureCoord;
+                        textureCoord2 = hitInfo.textureCoord2;
+                        lightmapCoord = hitInfo.lightmapCoord;
+#endif
+                    }
+                    else
+                    {
+                        textureCoord = Vector2.zero;
+                        textureCoord2 = Vector2.zero;
+                        lightmapCoord = Vector2.zero;
+                    }
                 }
+
                 transform = hitInfo.transform;
-                lightmapCoord = hitInfo.lightmapCoord;
                 collider = hitInfo.collider;
             }
             else