Merge pull request #85 from De-Panther/general_interactions_improvement

General interactions improvement

Author: De-Panther

Build/Build/Build.data.unityweb

@@ -27,13 +27,24 @@ void Update()
     {
       controller.TryUpdateButtons();
 
-      float normalizedTime = controller.GetButton("Trigger") ? 1 : controller.GetAxis("Grip");
-
-      if (controller.GetButtonDown("Trigger") || controller.GetButtonDown("Grip"))
+      // Get button A(0 or 1), or Axis Trigger/Grip (0 to 1), the larger between them all, by that order
+      float normalizedTime = controller.GetButton(WebXRController.ButtonTypes.ButtonA) ? 1 :
+                              Mathf.Max(controller.GetAxis(WebXRController.AxisTypes.Trigger),
+                              controller.GetAxis(WebXRController.AxisTypes.Grip));
+
+      if (controller.GetButtonDown(WebXRController.ButtonTypes.Trigger)
+          || controller.GetButtonDown(WebXRController.ButtonTypes.Grip)
+          || controller.GetButtonDown(WebXRController.ButtonTypes.ButtonA))
+      {
         Pickup();
+      }
 
-      if (controller.GetButtonUp("Trigger") || controller.GetButtonUp("Grip"))
+      if (controller.GetButtonUp(WebXRController.ButtonTypes.Trigger)
+          || controller.GetButtonUp(WebXRController.ButtonTypes.Grip)
+          || controller.GetButtonUp(WebXRController.ButtonTypes.ButtonA))
+      {
         Drop();
+      }
 
       // Use the controller button or axis position to manipulate the playback time for hand model.
       anim.Play("Take", -1, normalizedTime);

Build/Build/Build.wasm

@@ -1373,7 +1373,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   hand: 1
-  inputMap: {fileID: 11400000, guid: f2b0e62590098b246823680b10d75b46, type: 2}
   simulate3dof: 0
   eyesToElbow: {x: 0.1, y: -0.4, z: 0.15}
   elbowHand: {x: 0, y: 0, z: 0.25}
@@ -1864,7 +1863,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   hand: 2
-  inputMap: {fileID: 11400000, guid: a37529c06e00da94091bc81a0193c815, type: 2}
   simulate3dof: 0
   eyesToElbow: {x: 0.1, y: -0.4, z: 0.15}
   elbowHand: {x: 0, y: 0, z: 0.25}