Support Input Actions in MixedRealityCaptureController

Author: De-Panther

Packages/webxr-interactions/CHANGELOG.md

@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - WebXRControllerModel to load WebXR Input Profiles model when using Unity Input System.
 - HandMenu to override XR Interaction Toolkit one, as it's missing an option to set camera transform.
 - WebXR + XR Interaction Toolkit Sample.
+- Support Input Actions in MixedRealityCaptureController.
 
 ## [0.18.0] - 2023-08-29
 ### Changed

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

@@ -106,6 +106,18 @@ private enum ControllerState
     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 rightPosition;
+    [SerializeField]
+    private UnityEngine.InputSystem.InputActionProperty leftTrigger;
+    [SerializeField]
+    private UnityEngine.InputSystem.InputActionProperty rightTrigger;
+#endif
     [SerializeField]
     private int webcamFramesDelaySize = 0;
 
@@ -306,7 +318,14 @@ private void Ended()
 
     private void SetPoint(Transform point, GameObject hint, ControllerState nextState, GameObject nextHint, Transform nextPoint)
     {
-      point.position = rightController.transform.position;
+      if (useInputSystem)
+      {
+        point.position = rightPosition.action.ReadValue<Vector3>();
+      }
+      else
+      {
+        point.position = rightController.transform.position;
+      }
       if (GetControllersButtonDown())
       {
         hint.SetActive(false);
@@ -319,7 +338,9 @@ private void SetPoint(Transform point, GameObject hint, ControllerState nextStat
     private void SetBottomPoint()
     {
       float cameraToTopDistance = Vector3.Distance(calibrationPointCamera.position, calibrationPointTop.position);
-      Vector3 cameraToBottomDirection = (rightController.transform.position - calibrationPointCamera.position).normalized;
+      Vector3 cameraToBottomDirection = useInputSystem ?
+        (rightPosition.action.ReadValue<Vector3>() - calibrationPointCamera.position).normalized
+        : (rightController.transform.position - calibrationPointCamera.position).normalized;
       calibrationPointBottom.position = calibrationPointCamera.position + cameraToBottomDirection * cameraToTopDistance;
       if (GetControllersButtonDown())
       {
@@ -385,6 +406,14 @@ private void SetCameraPositionRotation()
 
     private bool GetControllersButtonDown()
     {
+      if (useInputSystem)
+      {
+        if (leftTrigger.action.ReadValue<bool>())
+        {
+          return true;
+        }
+        return rightTrigger.action.ReadValue<bool>();
+      }
       bool leftDown = (leftController.isHandActive || leftController.isControllerActive)
                       && leftController.GetButtonDown(WebXRController.ButtonTypes.Trigger);
       if (leftDown)

Packages/webxr-interactions/Runtime/Scripts/WebXR.Interactions.asmdef

@@ -3,7 +3,8 @@
     "rootNamespace": "",
     "references": [
         "GUID:fd4abe4ffe74ef1448afe15c6cb36bb7",
-        "GUID:84a2d09f0bb073f40922f5ea5362abe7"
+        "GUID:84a2d09f0bb073f40922f5ea5362abe7",
+        "GUID:75469ad4d38634e559750d17036d5f7c"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
@@ -27,6 +28,11 @@
             "name": "Unity",
             "expression": "2022.3",
             "define": "HAS_POSITION_AND_ROTATION"
+        },
+        {
+            "name": "com.unity.inputsystem",
+            "expression": "1.4.4",
+            "define": "UNITY_INPUT_SYSTEM_1_4_4_OR_NEWER"
         }
     ],
     "noEngineReferences": false