Skip to content

Commit 7fafb07

Browse files
authored
Merge pull request #6838 from Troy-Ferrell/users/trferrel/optimize-window-update
Optimize Window Update
2 parents 4032e46 + 28038e7 commit 7fafb07

File tree

5 files changed

+357
-241
lines changed

5 files changed

+357
-241
lines changed

Assets/MixedRealityToolkit.Services/InputSystem/FocusProvider.cs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1216,18 +1216,12 @@ private void RaycastGraphics(IMixedRealityPointer pointer, PointerEventData grap
12161216

12171217
RaycastResult raycastResult = default(RaycastResult);
12181218

1219-
if (pointer.Rays == null)
1219+
if (pointer.Rays == null || pointer.Rays.Length <= 0)
12201220
{
12211221
Debug.LogError($"No valid rays for {pointer.PointerName} pointer.");
12221222
return;
12231223
}
12241224

1225-
if (pointer.Rays.Length <= 0)
1226-
{
1227-
Debug.LogError($"No valid rays for {pointer.PointerName} pointer");
1228-
return;
1229-
}
1230-
12311225
// Cast rays for every step until we score a hit
12321226
float totalDistance = 0.0f;
12331227
for (int i = 0; i < pointer.Rays.Length; i++)

Assets/MixedRealityToolkit.Tools/Microsoft.MixedReality.Toolkit.Tools.asmdef

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"Microsoft.MixedReality.Toolkit",
55
"Microsoft.MixedReality.Toolkit.Editor.Inspectors",
66
"Microsoft.MixedReality.Toolkit.Editor.Utilities",
7-
"Microsoft.MixedReality.Toolkit.Tools.Runtime"
7+
"Microsoft.MixedReality.Toolkit.Tools.Runtime",
8+
"Unity.TextMeshPro"
89
],
910
"optionalUnityReferences": [],
1011
"includePlatforms": [

0 commit comments

Comments
 (0)