More bug fixes, adapt SceneHitTest to the Input System

Author: De-Panther

Packages/webxr-interactions/Runtime/InputSystem/WebXRControllerModel.cs

@@ -161,6 +161,8 @@ public UpdateType updateType
     private bool visualActionsInit;
     bool m_IsFirstUpdate = true;
 
+    private Transform xrControllerOldModel;
+
 #if WEBXR_INPUT_PROFILES
     void BindActions()
     {
@@ -415,9 +417,10 @@ protected void OnDisable()
           WebXRInputSystem.OnRightControllerProfiles -= HandleOnControllerProfiles;
           break;
       }
-      if (xrController != null && xrController.model != null)
+      if (xrController != null && xrControllerOldModel != null)
       {
-        xrController.model.gameObject.SetActive(true);
+        xrController.model = xrControllerOldModel;
+        xrController.hideControllerModel = false;
       }
     }
 
@@ -633,7 +636,9 @@ private void HandleModelLoaded(bool success)
       inputProfileModelTransform.localScale = Vector3.one;
       if (xrController != null && xrController.model != null)
       {
-        xrController.model.gameObject.SetActive(false);
+        xrControllerOldModel = xrController.model;
+        xrController.hideControllerModel = true;
+        xrController.model = null;
       }
 
       if (m_CurrentTrackingState == TrackingStates.None)

Packages/webxr-interactions/Runtime/Scripts/MixedRealityCaptureController.cs

@@ -338,9 +338,13 @@ private void SetPoint(Transform point, GameObject hint, ControllerState nextStat
     private void SetBottomPoint()
     {
       float cameraToTopDistance = Vector3.Distance(calibrationPointCamera.position, calibrationPointTop.position);
+#if UNITY_INPUT_SYSTEM_1_4_4_OR_NEWER
       Vector3 cameraToBottomDirection = useInputSystem ?
         (rightPosition.action.ReadValue<Vector3>() - calibrationPointCamera.position).normalized
         : (rightController.transform.position - calibrationPointCamera.position).normalized;
+#else
+      Vector3 cameraToBottomDirection = (rightController.transform.position - calibrationPointCamera.position).normalized;
+#endif
       calibrationPointBottom.position = calibrationPointCamera.position + cameraToBottomDirection * cameraToTopDistance;
       if (GetControllersButtonDown())
       {
@@ -406,14 +410,13 @@ private void SetCameraPositionRotation()
 
     private bool GetControllersButtonDown()
     {
+#if UNITY_INPUT_SYSTEM_1_4_4_OR_NEWER
       if (useInputSystem)
       {
-        if (leftTrigger.action.ReadValue<bool>())
-        {
-          return true;
-        }
-        return rightTrigger.action.ReadValue<bool>();
+        return leftTrigger.action.ReadValue<bool>()
+               || rightTrigger.action.ReadValue<bool>();
       }
+#endif
       bool leftDown = (leftController.isHandActive || leftController.isControllerActive)
                       && leftController.GetButtonDown(WebXRController.ButtonTypes.Trigger);
       if (leftDown)

Packages/webxr-interactions/Runtime/Scripts/SceneHitTest.cs

@@ -10,6 +10,16 @@ public class SceneHitTest : MonoBehaviour
     private WebXRController leftController;
     [SerializeField]
     private WebXRController rightController;
+#if UNITY_INPUT_SYSTEM_1_4_4_OR_NEWER
+    [SerializeField]
+#endif
+    private bool useInputSystem = false;
+#if UNITY_INPUT_SYSTEM_1_4_4_OR_NEWER
+    [SerializeField]
+    private UnityEngine.InputSystem.InputActionProperty leftTrigger;
+    [SerializeField]
+    private UnityEngine.InputSystem.InputActionProperty rightTrigger;
+#endif
 
     private bool isFollowing = false;
 
@@ -20,6 +30,10 @@ public class SceneHitTest : MonoBehaviour
 
     void Start()
     {
+      if (useInputSystem)
+      {
+        return;
+      }
       if (leftController == null || rightController == null)
       {
         var controllers = FindObjectsOfType<WebXRController>();
@@ -59,6 +73,13 @@ void OnDisable()
 
     bool GetControllersButtonDown()
     {
+#if UNITY_INPUT_SYSTEM_1_4_4_OR_NEWER
+      if (useInputSystem)
+      {
+        return leftTrigger.action.ReadValue<bool>()
+          || rightTrigger.action.ReadValue<bool>();
+      }
+#endif
       bool leftDown = (leftController.isHandActive || leftController.isControllerActive) && leftController.GetButtonDown(WebXRController.ButtonTypes.Trigger);
       bool rightDown = (rightController.isHandActive || rightController.isControllerActive) && rightController.GetButtonDown(WebXRController.ButtonTypes.Trigger);
       return leftDown || rightDown;