Merge pull request #9472 from darax/patch-1

keveleigh · web-flow · commit b6c5be20b2f5 · 2021-03-09T11:37:54.000-08:00
Avoid calling Physics.ClosestPoint on non-convex collider
diff --git a/Assets/MRTK/SDK/Features/UX/Scripts/Pointers/SpherePointer.cs b/Assets/MRTK/SDK/Features/UX/Scripts/Pointers/SpherePointer.cs
@@ -449,6 +449,13 @@ public bool TryUpdateQueryBufferForLayerMask(LayerMask layerMask, Vector3 pointe
                     for (int i = 0; i < numColliders; i++)
                     {
                         Collider collider = queryBuffer[i];
+                        MeshCollider meshCollider = collider as MeshCollider;
+                        if (meshCollider != null && meshCollider.convex == false)
+                        {
+                            // Physics.ClosestPoint is only allowed on a convex collider.
+                            continue;
+                        }
+                        
                         grabbable = collider.GetComponent<NearInteractionGrabbable>();
                         if (grabbable != null)
                         {

Original file line number	Diff line number	Diff line change
`@@ -449,6 +449,13 @@ public bool TryUpdateQueryBufferForLayerMask(LayerMask layerMask, Vector3 pointe`
`449`	`449`	`for (int i = 0; i < numColliders; i++)`
`450`	`450`	`{`
`451`	`451`	`Collider collider = queryBuffer[i];`
	`452`	`+ MeshCollider meshCollider = collider as MeshCollider;`
	`453`	`+ if (meshCollider != null && meshCollider.convex == false)`
	`454`	`+ {`
	`455`	`+ // Physics.ClosestPoint is only allowed on a convex collider.`
	`456`	`+ continue;`
	`457`	`+ }`
	`458`	`+`
`452`	`459`	`grabbable = collider.GetComponent<NearInteractionGrabbable>();`
`453`	`460`	`if (grabbable != null)`
`454`	`461`	`{`