Merge pull request #351 from De-Panther/apple_vision_pro_support

Manually detect XR Hand pinch to support Apple Vision Pro

Author: De-Panther

Packages/webxr/CHANGELOG.md

@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+- XR Hand pinch is now detected manually instead of relying on system select event, to support Apple Vision Pro.
+
 ### Fixed
 - Errors of Module._malloc and Module._free are not functions.
 

Packages/webxr/Runtime/Plugins/WebGL/webxr.jspre

@@ -210,6 +210,11 @@ void main()
         this.bufferJointIndex = 0;
         this.handValuesType = 0;
         this.hasRadii = false;
+        this.pinchSelectDistanceStart = 0.014;
+        this.pinchSelectDistanceEnd = 0.015;
+        this.pinchDistance = 1;
+        this.thumbTip = 4 * 16;
+        this.indexTip = 9 * 16;
 
         this.setIndices = function(index) {
           this.frameIndex = index++;
@@ -546,10 +551,8 @@ void main()
           }
 
           if (hand == 0 || hand == 2) {
-            Module.HEAPF32[xrData.handRight.triggerIndex] = Module.HEAPF32[controller.triggerIndex]; // XRHandData.trigger
             Module.HEAPF32[xrData.handRight.squeezeIndex] = Module.HEAPF32[controller.squeezeIndex]; // XRHandData.squeeze
           } else {
-            Module.HEAPF32[xrData.handLeft.triggerIndex] = Module.HEAPF32[controller.triggerIndex]; // XRHandData.trigger
             Module.HEAPF32[xrData.handLeft.squeezeIndex] = Module.HEAPF32[controller.squeezeIndex]; // XRHandData.squeeze
           }
         } else {
@@ -804,6 +807,21 @@ void main()
               Module.HEAPF32[xrHand.pointerRotationZIndex] = orientation.z; // XRHandData.pointerRotationZ
               Module.HEAPF32[xrHand.pointerRotationWIndex] = orientation.w; // XRHandData.pointerRotationW
             }
+            xrHand.pinchDistance = 1;
+            if (!isNaN(xrHand.poses[xrHand.thumbTip])
+                && !isNaN(xrHand.poses[xrHand.indexTip])) {
+              xrHand.pinchDistance = this.vector3Distance(xrHand.poses[xrHand.thumbTip + 12],
+                xrHand.poses[xrHand.thumbTip + 13],
+                xrHand.poses[xrHand.thumbTip + 14],
+                xrHand.poses[xrHand.indexTip + 12],
+                xrHand.poses[xrHand.indexTip + 13],
+                xrHand.poses[xrHand.indexTip + 14]);
+            }
+            if (Module.HEAPF32[xrHand.triggerIndex] === 0) {
+              Module.HEAPF32[xrHand.triggerIndex] = xrHand.pinchDistance <= xrHand.pinchSelectDistanceStart ? 1 : 0;
+            } else {
+              Module.HEAPF32[xrHand.triggerIndex] = xrHand.pinchDistance > xrHand.pinchSelectDistanceEnd ? 0 : 1;
+            }
           } else if (inputSource.gripSpace) {
             var inputRayPose = frame.getPose(inputSource.targetRaySpace, refSpace);
             if (inputRayPose) {