added some error checking

BasisVR · Feb 8, 2025 · 88ba139 · 88ba139
1 parent 99a34ad
commit 88ba139
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/Basis/Packages/com.basis.framework/Device Management/Devices/OpenXR/BasisOpenXRInput.cs b/Basis/Packages/com.basis.framework/Device Management/Devices/OpenXR/BasisOpenXRInput.cs
@@ -27,7 +27,10 @@ public void Initialize(UnityEngine.XR.InputDevice device, string UniqueID, strin
         public new void OnDestroy()
         {
             BasisVirtualSpine.DeInitialize();
-            BasisOpenXRInputEye.Shutdown();
+            if (BasisOpenXRInputEye != null)
+            {
+                BasisOpenXRInputEye.Shutdown();
+            }
             base.OnDestroy();
         }
         public override void DoPollData()

diff --git a/Basis/Packages/com.basis.tests/Interactable/PlayerInteract.cs b/Basis/Packages/com.basis.tests/Interactable/PlayerInteract.cs
@@ -124,14 +124,21 @@ private void PollSystem()
             InteractInput interactInput = InteractInputs[Index];
             if (interactInput.input == null)
             {
-                Debug.LogWarning("Pickup input device unexpectedly null, input devices likely changed");
+                BasisDebug.LogWarning("Pickup input device unexpectedly null, input devices likely changed");
                 continue;
             }
 
             HoverInteractSphere hoverSphere = interactInput.hoverInteract;
 
             RaycastHit rayHit;
             InteractableObject hitInteractable = null;
+
+            if(interactInput.input.BasisPointRaycaster == null)
+            {
+                BasisDebug.LogWarning("Missing Point Raycaster!");
+                continue;
+            }
+
             bool isValidRayHit = interactInput.input.BasisPointRaycaster.FirstHit(out rayHit, raycastDistance) &&
                 ((1 << rayHit.collider.gameObject.layer) & InteractableLayerMask) != 0 &&
                 rayHit.collider.TryGetComponent(out hitInteractable);