Change GGVPointer to use registered raycast provider (#11147)

keith-phillips · keith-phillips-work · web-flow · commit d44e5c1d7696 · 2022-10-27T15:19:21.000-07:00
Co-authored-by: Keith Phillips &lt;keith.phillips@au.saabgroup.com&gt;
diff --git a/Assets/MRTK/SDK/Features/UX/Scripts/Pointers/GGVPointer.cs b/Assets/MRTK/SDK/Features/UX/Scripts/Pointers/GGVPointer.cs
@@ -196,8 +196,8 @@ public bool OnSceneQuery(LayerMask[] prioritizedLayerMasks, bool focusIndividual
             }
             else
             {
-                bool didHit = MixedRealityRaycaster.RaycastSimplePhysicsStep(Rays[0], Rays[0].Length, prioritizedLayerMasks, focusIndividualCompoundCollider, out RaycastHit physicsHit);
-                hitInfo = new MixedRealityRaycastHit(didHit, physicsHit);
+				var raycastProvider = CoreServices.InputSystem.RaycastProvider;
+				bool didHit = raycastProvider.Raycast(Rays[0], prioritizedLayerMasks, focusIndividualCompoundCollider, out hitInfo);
                 Ray = Rays[0];
                 rayStepIndex = 0;
                 return didHit;
@@ -212,7 +212,8 @@ public bool OnSceneQuery(LayerMask[] prioritizedLayerMasks, bool focusIndividual
             }
             else
             {
-                bool didHit = MixedRealityRaycaster.RaycastSimplePhysicsStep(Rays[0], Rays[0].Length, prioritizedLayerMasks, focusIndividualCompoundCollider, out RaycastHit physicsHit);
+				var raycastProvider = CoreServices.InputSystem.RaycastProvider;
+				bool didHit = raycastProvider.Raycast(Rays[0], prioritizedLayerMasks, focusIndividualCompoundCollider, out MixedRealityRaycastHit physicsHit);
                 if (didHit)
                 {
                     hitObject = physicsHit.collider.gameObject;

Original file line number	Diff line number	Diff line change
`@@ -196,8 +196,8 @@ public bool OnSceneQuery(LayerMask[] prioritizedLayerMasks, bool focusIndividual`
`196`	`196`	`}`
`197`	`197`	`else`
`198`	`198`	`{`
`199`		`- bool didHit = MixedRealityRaycaster.RaycastSimplePhysicsStep(Rays[0], Rays[0].Length, prioritizedLayerMasks, focusIndividualCompoundCollider, out RaycastHit physicsHit);`
`200`		`- hitInfo = new MixedRealityRaycastHit(didHit, physicsHit);`
	`199`	`+ var raycastProvider = CoreServices.InputSystem.RaycastProvider;`
	`200`	`+ bool didHit = raycastProvider.Raycast(Rays[0], prioritizedLayerMasks, focusIndividualCompoundCollider, out hitInfo);`
`201`	`201`	`Ray = Rays[0];`
`202`	`202`	`rayStepIndex = 0;`
`203`	`203`	`return didHit;`
`@@ -212,7 +212,8 @@ public bool OnSceneQuery(LayerMask[] prioritizedLayerMasks, bool focusIndividual`
`212`	`212`	`}`
`213`	`213`	`else`
`214`	`214`	`{`
`215`		`- bool didHit = MixedRealityRaycaster.RaycastSimplePhysicsStep(Rays[0], Rays[0].Length, prioritizedLayerMasks, focusIndividualCompoundCollider, out RaycastHit physicsHit);`
	`215`	`+ var raycastProvider = CoreServices.InputSystem.RaycastProvider;`
	`216`	`+ bool didHit = raycastProvider.Raycast(Rays[0], prioritizedLayerMasks, focusIndividualCompoundCollider, out MixedRealityRaycastHit physicsHit);`
`216`	`217`	`if (didHit)`
`217`	`218`	`{`
`218`	`219`	`hitObject = physicsHit.collider.gameObject;`