Update Code and Fixed Some Warning ⚠ (#10526)

* Update Code And Fixed Some Warning ⚠ * Revert switch target result. * Update Tracking Object * Revert SetCursor() Method to avoid breaking API * Revert private/protected fields to public * Fix SetCursor() * Update Assets/MRTK/SDK/Features/UX/Scripts/Pointers/ShellHandRayPointer.cs Co-authored-by: Kurtis <kurtie@microsoft.com> * Update TeleportPointer.cs * Update LoaderController.cs Co-authored-by: Kurtis <kurtie@microsoft.com>
microsoft · Jun 21, 2022 · ec6cbf1 · ec6cbf1
1 parent 72e283d
commit ec6cbf1
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/Assets/MRTK/Providers/WindowsMixedReality/XRSDK/WindowsMixedRealityEyeGazeDataProvider.cs b/Assets/MRTK/Providers/WindowsMixedReality/XRSDK/WindowsMixedRealityEyeGazeDataProvider.cs
@@ -84,7 +84,8 @@ public override void Enable()
                 EnableIfLoaderBecomesActive();
                 return;
             }
-            else if (!IsActiveLoader.Value)
+
+            if (!IsActiveLoader.Value)
             {
                 IsEnabled = false;
                 return;
@@ -96,7 +97,7 @@ public override void Enable()
         private async void EnableIfLoaderBecomesActive()
         {
             await new WaitUntil(() => IsActiveLoader.HasValue);
-            if (IsActiveLoader.Value)
+            if (IsActiveLoader != null && IsActiveLoader.Value)
             {
                 Enable();
             }

diff --git a/Assets/MRTK/SDK/Features/UX/Scripts/HandCoach/RotateAroundPoint.cs b/Assets/MRTK/SDK/Features/UX/Scripts/HandCoach/RotateAroundPoint.cs
@@ -201,4 +201,4 @@ private IEnumerator RotateHintSequence()
             }
         }
     }
-}
+}
diff --git a/Assets/MRTK/SDK/Features/UX/Scripts/Loader/LoaderController.cs b/Assets/MRTK/SDK/Features/UX/Scripts/Loader/LoaderController.cs
@@ -209,13 +209,9 @@ private float Cycles
 
         private Transform dot01;
         private Vector3 dot01NewPos = Vector3.zero;
-        private Vector3 dot01NewScale = Vector3.zero;
-        private Vector3 dot01NewRot = Vector3.zero;
 
         private Transform dot02;
         private Vector3 dot02NewPos = Vector3.zero;
-        private Vector3 dot02NewScale = Vector3.zero;
-        private Vector3 dot02NewRot = Vector3.zero;
 
         private const float tau = Mathf.PI * 2.0f;
 
@@ -295,4 +291,4 @@ private void AnimateDotTransforms()
             dot02.transform.localPosition = dot02NewPos;
         }
     }
-}
+}
diff --git a/Assets/MRTK/SDK/Features/UX/Scripts/Pointers/ShellHandRayPointer.cs b/Assets/MRTK/SDK/Features/UX/Scripts/Pointers/ShellHandRayPointer.cs
@@ -107,11 +107,14 @@ public override void OnPostSceneQuery()
                     wasGrabPressed = IsGrabPressed;
 
                     var currentMaterial = IsSelectPressed || IsGrabPressed ? lineMaterialSelected : lineMaterialNoTarget;
-
-                    for (int i = 0; i < LineRenderers.Length; i++)
+                    foreach (var lr in LineRenderers)
                     {
-                        var lineRenderer = LineRenderers[i] as MixedRealityLineRenderer;
-                        lineRenderer.LineMaterial = currentMaterial;
+                        var lineRenderer = lr as MixedRealityLineRenderer;
+
+                        if (lineRenderer != null)
+                        {
+                            lineRenderer.LineMaterial = currentMaterial;
+                        }
                     }
                 }
             }

diff --git a/Assets/MRTK/SDK/Features/UX/Scripts/Pointers/TeleportPointer.cs b/Assets/MRTK/SDK/Features/UX/Scripts/Pointers/TeleportPointer.cs
@@ -131,7 +131,7 @@ public override LayerMask[] PrioritizedLayerMasksOverride
 
         protected LayerMask InvalidTeleportationLayers
         {
-            get 
+            get
             {
                 LayerMask raycastedLayerMasks = new LayerMask();
                 for (int i = 0; i < PrioritizedLayerMasksOverride.Length; i++)
@@ -140,7 +140,7 @@ protected LayerMask InvalidTeleportationLayers
                 }
                 return ~ValidTeleportationLayers & raycastedLayerMasks;
             }
-        }            
+        }
 
         [SerializeField]
         private DistorterGravity gravityDistorter = null;
@@ -232,7 +232,7 @@ protected override async void Start()
                     }
                 }
                 lateRegisterTeleport = false;
-                CoreServices.TeleportSystem.RegisterHandler<IMixedRealityTeleportHandler>(this);
+                CoreServices.TeleportSystem?.RegisterHandler<IMixedRealityTeleportHandler>(this);
             }
         }