Support trigger and squeeze

Author: De-Panther

Assets/WebGLTemplates/WebXR/webxr.js

@@ -45,6 +45,8 @@
     // TODO: set enabled 0 if hand was enable and then disable
     this.enabled = 0;
     this.hand = 0;
+    this.trigger = 0;
+    this.squeeze = 0;
     this.joints = [];
     for (let i = 0; i < 25; i++) {
       this.joints.push(new XRJointData());
@@ -235,8 +237,12 @@
 
       if (hand == 0 || hand == 2) {
         xrData.controllerA = controller;
+        xrData.handRight.trigger = controller.trigger;
+        xrData.handRight.squeeze = controller.squeeze;
       } else {
         xrData.controllerB = controller;
+        xrData.handLeft.trigger = controller.trigger;
+        xrData.handLeft.squeeze = controller.squeeze;
       }
     }
   }

Assets/WebXR/Plugins/WebGL/webxr.jslib

@@ -60,6 +60,8 @@ mergeInto(LibraryManager.library, {
         HandsArray[index++] = data[key].frame;
         HandsArray[index++] = data[key].enabled;
         HandsArray[index++] = data[key].hand;
+        HandsArray[index++] = data[key].trigger;
+        HandsArray[index++] = data[key].squeeze;
         for (var j = 0; j < 25; j++) {
           HandsArray[index++] = data[key].joints[j].enabled;
           HandsArray[index++] = data[key].joints[j].position[0];

Assets/WebXR/Scripts/WebXRController.cs

@@ -41,6 +41,7 @@ public class WebXRController : MonoBehaviour
     private Dictionary<string, WebXRControllerButton> buttonStates = new Dictionary<string, WebXRControllerButton>();
 
     private Dictionary<int, Transform> handJoints = new Dictionary<int, Transform>();
+    private bool handJointsVisible = false;
 
     // Updates button states from Web gamepad API.
     private void UpdateButtons(WebXRControllerButton[] buttons)
@@ -176,9 +177,11 @@ private void OnHandUpdate(WebXRHandData handData)
       {
         if (!handData.enabled)
         {
+          SetHandJointsVisible(false);
           return;
         }
         SetVisible(false);
+        SetHandJointsVisible(true);
 
         transform.localPosition = handData.joints[0].position;
         transform.localRotation = handData.joints[0].rotation;
@@ -212,6 +215,14 @@ private void OnHandUpdate(WebXRHandData handData)
             }
           }
         }
+
+        trigger = handData.trigger;
+        squeeze = handData.squeeze;
+
+        WebXRControllerButton[] buttons = new WebXRControllerButton[2];
+        buttons[0] = new WebXRControllerButton(trigger==1, trigger);
+        buttons[1] = new WebXRControllerButton(squeeze==1, squeeze);
+        UpdateButtons(buttons);
       }
     }
 
@@ -241,6 +252,19 @@ private void SetVisible(bool visible)
       }
     }
 
+    private void SetHandJointsVisible(bool visible)
+    {
+      if (handJointsVisible == visible)
+      {
+        return;
+      }
+      handJointsVisible = visible;
+      foreach (var handJoint in handJoints)
+      {
+        handJoint.Value.gameObject.SetActive(visible);
+      }
+    }
+
     void OnEnable()
     {
       if (inputMap == null)

Assets/WebXR/Scripts/WebXRControllerData.cs

@@ -28,6 +28,8 @@ public class WebXRHandData
     public int frame;
     public bool enabled;
     public int hand;
+    public float trigger;
+    public float squeeze;
     public WebXRJointData[] joints = new WebXRJointData[25];
     public const int WRIST = 0;
     public const int THUMB_METACARPAL = 1;

Assets/WebXR/Scripts/WebXRManager.cs

@@ -69,7 +69,7 @@ private static extern void set_webxr_events(Action<int> on_start_ar,
     float[] controllersArray = new float[2 * 20];
 
     // Shared array for hands data
-    float[] handsArray = new float[2 * (25 * 9 + 3)];
+    float[] handsArray = new float[2 * (25 * 9 + 5)];
 
     private WebXRHandData leftHand = new WebXRHandData();
     private WebXRHandData rightHand = new WebXRHandData();
@@ -212,7 +212,7 @@ bool GetGamepadFromControllersArray(int controllerIndex, ref WebXRControllerData
 
     bool GetHandFromHandsArray(int handIndex, ref WebXRHandData handObject)
     {
-      int arrayPosition = handIndex * 228;
+      int arrayPosition = handIndex * 230;
       int frameNumber = (int)handsArray[arrayPosition++];
       if (handObject.frame == frameNumber)
       {
@@ -221,6 +221,8 @@ bool GetHandFromHandsArray(int handIndex, ref WebXRHandData handObject)
       handObject.frame = frameNumber;
       handObject.enabled = handsArray[arrayPosition++] != 0;
       handObject.hand = (int)handsArray[arrayPosition++];
+      handObject.trigger = handsArray[arrayPosition++];
+      handObject.squeeze = handsArray[arrayPosition++];
       if (!handObject.enabled)
       {
         return true;

Build/Build/Build.data.unityweb

@@ -45,6 +45,8 @@
     // TODO: set enabled 0 if hand was enable and then disable
     this.enabled = 0;
     this.hand = 0;
+    this.trigger = 0;
+    this.squeeze = 0;
     this.joints = [];
     for (let i = 0; i < 25; i++) {
       this.joints.push(new XRJointData());
@@ -235,8 +237,12 @@
 
       if (hand == 0 || hand == 2) {
         xrData.controllerA = controller;
+        xrData.handRight.trigger = controller.trigger;
+        xrData.handRight.squeeze = controller.squeeze;
       } else {
         xrData.controllerB = controller;
+        xrData.handLeft.trigger = controller.trigger;
+        xrData.handLeft.squeeze = controller.squeeze;
       }
     }
   }