Merge pull request #7111 from keveleigh/null-prop

Fix some Unity object null propagation and other warnings

Author: keveleigh

Assets/MixedRealityToolkit.Services/InputSimulation/SimulatedGestureHand.cs

@@ -32,7 +32,7 @@ public class SimulatedGestureHand : SimulatedHand
         private Vector3 cumulativeDelta = Vector3.zero;
         private MixedRealityPose currentGripPose = MixedRealityPose.ZeroIdentity;
 
-        private Vector3 navigationDelta => new Vector3(
+        private Vector3 NavigationDelta => new Vector3(
             Mathf.Clamp(cumulativeDelta.x, -1.0f, 1.0f) * currentRailsUsed.x,
             Mathf.Clamp(cumulativeDelta.y, -1.0f, 1.0f) * currentRailsUsed.y,
             Mathf.Clamp(cumulativeDelta.z, -1.0f, 1.0f) * currentRailsUsed.z);
@@ -59,7 +59,12 @@ private void EnsureProfileSettings()
             }
             initializedFromProfile = true;
 
-            var gestureProfile = CoreServices.InputSystem?.InputSystemProfile?.GesturesProfile;
+            MixedRealityGesturesProfile gestureProfile = null;
+            MixedRealityInputSystemProfile inputSystemProfile = CoreServices.InputSystem?.InputSystemProfile;
+            if (inputSystemProfile != null)
+            {
+                gestureProfile = inputSystemProfile.GesturesProfile;
+            }
             if (gestureProfile != null)
             {
                 for (int i = 0; i < gestureProfile.Gestures.Length; i++)
@@ -288,15 +293,15 @@ private void UpdateNavigation()
             if (navigationInProgress)
             {
                 UpdateNavigationRails();
-                CoreServices.InputSystem?.RaiseGestureUpdated(this, navigationAction, navigationDelta);
+                CoreServices.InputSystem?.RaiseGestureUpdated(this, navigationAction, NavigationDelta);
             }
         }
 
         private bool TryCompleteNavigation()
         {
             if (navigationInProgress)
             {
-                CoreServices.InputSystem?.RaiseGestureCompleted(this, navigationAction, navigationDelta);
+                CoreServices.InputSystem?.RaiseGestureCompleted(this, navigationAction, NavigationDelta);
                 navigationInProgress = false;
                 return true;
             }

Assets/MixedRealityToolkit.Services/InputSystem/MixedRealityInputSystem.cs

@@ -248,10 +248,10 @@ private void CreateDataProviders()
             MixedRealityInputSystemProfile profile = ConfigurationProfile as MixedRealityInputSystemProfile;
 
             // If the system gets disabled, the gaze provider is destroyed.
-            // Ensure that it gets recreated on when reenabled.
-            if (GazeProvider == null)
+            // Ensure that it gets recreated on when re-enabled.
+            if (GazeProvider == null && profile != null)
             {
-                InstantiateGazeProvider(profile?.PointerProfile);
+                InstantiateGazeProvider(profile.PointerProfile);
             }
 
             if ((GetDataProviders().Count == 0) && (profile != null))
@@ -272,7 +272,7 @@ private void CreateDataProviders()
 
         private void InstantiateGazeProvider(MixedRealityPointerProfile pointerProfile)
         {
-            if (pointerProfile?.GazeProviderType?.Type != null)
+            if (pointerProfile != null && pointerProfile.GazeProviderType?.Type != null)
             {
                 GazeProvider = CameraCache.Main.gameObject.EnsureComponent(pointerProfile.GazeProviderType.Type) as IMixedRealityGazeProvider;
                 GazeProvider.GazeCursorPrefab = pointerProfile.GazeCursorPrefab;
@@ -318,7 +318,7 @@ public override void Disable()
                 GazeProvider = null;
             }
 
-            foreach(var provider in GetDataProviders<IMixedRealityInputDeviceManager>())
+            foreach (var provider in GetDataProviders<IMixedRealityInputDeviceManager>())
             {
                 if (provider != null)
                 {
@@ -991,15 +991,20 @@ public void RaiseFocusExit(IMixedRealityPointer pointer, GameObject unfocusedObj
         public void RaisePointerDown(IMixedRealityPointer pointer, MixedRealityInputAction inputAction, Handedness handedness = Handedness.None, IMixedRealityInputSource inputSource = null)
         {
             // Only lock the object if there is a grabbable above in the hierarchy
-            Transform currentObject = pointer.Result?.Details.Object?.transform;
+            Transform currentObject = null;
+            GameObject currentGameObject = pointer.Result?.Details.Object;
+            if (currentGameObject != null)
+            {
+                currentObject = currentGameObject.transform;
+            }
             IMixedRealityPointerHandler ancestorPointerHandler = null;
-            while(currentObject != null && ancestorPointerHandler == null)
+            while (currentObject != null && ancestorPointerHandler == null)
             {
-                foreach(var component in currentObject.GetComponents<Component>())
+                foreach (var component in currentObject.GetComponents<Component>())
                 {
                     if (component is IMixedRealityPointerHandler)
                     {
-                        ancestorPointerHandler = (IMixedRealityPointerHandler) component;
+                        ancestorPointerHandler = (IMixedRealityPointerHandler)component;
                         break;
                     }
                 }

Assets/MixedRealityToolkit/Providers/UnityInput/MouseController.cs

@@ -92,7 +92,7 @@ public void Update()
                     if (Interactions[i].InputType == DeviceInputType.SpatialPointer)
                     {
                         // Spatial pointer raises Pose events
-                        MixedRealityPose controllerPose = MixedRealityPose.ZeroIdentity;
+                        controllerPose = MixedRealityPose.ZeroIdentity;
                         controllerPose.Rotation = Quaternion.Euler(mouseDelta);
                         Interactions[i].PoseData = controllerPose;