Skip to content

Commit c4ee2d2

Browse files
added another test case and cleaned up
1 parent baa683c commit c4ee2d2

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

Assets/MixedRealityToolkit.Services/InputSystem/FocusProvider.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -559,22 +559,22 @@ private void UpdateGazeProvider()
559559
// another raycast if it's not populated
560560
if (gazeHitResult == null)
561561
{
562+
// get 3d hit
562563
hitResult3d.Clear();
563564
var raycastProvider = CoreServices.InputSystem.RaycastProvider;
564565
LayerMask[] prioritizedLayerMasks = (gazeProviderPointingData.Pointer.PrioritizedLayerMasksOverride ?? FocusLayerMasks);
565566
QueryScene(gazeProviderPointingData.Pointer, raycastProvider, prioritizedLayerMasks,
566567
hitResult3d, maxQuerySceneResults, focusIndividualCompoundCollider);
567-
//gazeHitResult = hitResult3d;
568568

569+
// get ui hit
569570
hitResultUi.Clear();
570571
RaycastGraphics(gazeProviderPointingData.Pointer, gazeProviderPointingData.GraphicEventData, prioritizedLayerMasks, hitResultUi);
571572

573+
// set gaze hit according to distance and priorization layer mask
572574
gazeHitResult = GetPrioritizedHitResult(hitResult3d, hitResultUi, prioritizedLayerMasks);
573-
TruncatePointerRayToHit(gazeProviderPointingData.Pointer, gazeHitResult);
574575
}
575576

576577
CoreServices.InputSystem.GazeProvider.UpdateGazeInfoFromHit(gazeHitResult.raycastHit);
577-
Debug.LogWarning((gazeHitResult.raycastHit.transform != null) ? gazeHitResult.raycastHit.transform.name : "nothing");
578578

579579
// Zero out value after every use to ensure the hit result is updated every frame.
580580
gazeHitResult = null;

Assets/MixedRealityToolkit.Tests/PlayModeTests/FocusProviderTests.cs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -103,28 +103,27 @@ public IEnumerator TestGazeProviderTargetUnityUi()
103103
cube.transform.position = Vector3.forward;
104104
cube.transform.localScale = Vector3.one * 0.5f;
105105
yield return null;
106-
yield return null;
107106

108107
// make sure we get the 3d object as a gaze target
109108
Assert.AreEqual(CoreServices.InputSystem.GazeProvider.GazeTarget, cube, "GazeProvider target is not set to 3d object (cube)");
110109

111-
// yield return PlayModeTestUtilities.WaitForEnterKey();
112-
113110
// spawn 2d unity ui
114111
var canvas = UnityUiUtilities.CreateCanvas(0.002f);
115112
var toggle = UnityUiUtilities.CreateToggle(Color.gray, Color.blue, Color.green);
116113
toggle.transform.SetParent(canvas.transform, false);
117114
canvas.transform.position = Vector3.forward * 0.5f;
118-
119115
yield return null;
120-
yield return null;
121-
122-
123-
//yield return PlayModeTestUtilities.WaitForEnterKey();
124116

125117
// check if gaze target has changed to unity ui
126118
Assert.AreEqual(CoreServices.InputSystem.GazeProvider.GazeTarget, toggle.gameObject, "GazeProvider target is not set to toggle unity ui");
127119

120+
// destroy unity ui
121+
Object.DestroyImmediate(canvas.gameObject);
122+
yield return null;
123+
124+
// make sure gaze is back at 3d object
125+
Assert.AreEqual(CoreServices.InputSystem.GazeProvider.GazeTarget, cube, "GazeProvider target is not set to 3d object (cube)");
126+
128127
yield return null;
129128
}
130129

0 commit comments

Comments
 (0)