Merge pull request #113 from De-Panther/new_xrhand_api_support

Support the new/updated WebXR Hands API

Author: De-Panther

Build/webxr.js

@@ -594,8 +594,13 @@
           xrHand.hand = 2;
         }
         xrHand.enabled = 1;
-        frame.fillPoses(inputSource.hand, refSpace, xrHand.poses);
-        frame.fillJointRadii(inputSource.hand, xrHand.radii);
+        if (inputSource.hand.values) {
+          frame.fillPoses(inputSource.hand.values(), refSpace, xrHand.poses);
+          frame.fillJointRadii(inputSource.hand.values(), xrHand.radii);
+        } else {
+          frame.fillPoses(inputSource.hand, refSpace, xrHand.poses);
+          frame.fillJointRadii(inputSource.hand, xrHand.radii);
+        }
         for (let j = 0; j < 25; j++) {
           xrHand.jointIndex = j*16;
           if (!isNaN(xrHand.poses[xrHand.jointIndex])) {

Packages/webxr/CHANGELOG.md

@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 ### Added
 - GetLocalRotation and GetLocalPosition to WebXRCamera.
+- Support for the new/updated WebXR Hands API.
 
 ### Changed
 - Using `frame.fillPoses` and `frame.fillJointRadii` instead of `frame.getJointPose` for XRHand.

Packages/webxr/Hidden~/WebGLTemplates/WebXR/webxr.js

@@ -594,8 +594,13 @@
           xrHand.hand = 2;
         }
         xrHand.enabled = 1;
-        frame.fillPoses(inputSource.hand, refSpace, xrHand.poses);
-        frame.fillJointRadii(inputSource.hand, xrHand.radii);
+        if (inputSource.hand.values) {
+          frame.fillPoses(inputSource.hand.values(), refSpace, xrHand.poses);
+          frame.fillJointRadii(inputSource.hand.values(), xrHand.radii);
+        } else {
+          frame.fillPoses(inputSource.hand, refSpace, xrHand.poses);
+          frame.fillJointRadii(inputSource.hand, xrHand.radii);
+        }
         for (let j = 0; j < 25; j++) {
           xrHand.jointIndex = j*16;
           if (!isNaN(xrHand.poses[xrHand.jointIndex])) {

Packages/webxr/Hidden~/WebGLTemplates/WebXR2020/webxr.js

@@ -594,8 +594,13 @@
           xrHand.hand = 2;
         }
         xrHand.enabled = 1;
-        frame.fillPoses(inputSource.hand, refSpace, xrHand.poses);
-        frame.fillJointRadii(inputSource.hand, xrHand.radii);
+        if (inputSource.hand.values) {
+          frame.fillPoses(inputSource.hand.values(), refSpace, xrHand.poses);
+          frame.fillJointRadii(inputSource.hand.values(), xrHand.radii);
+        } else {
+          frame.fillPoses(inputSource.hand, refSpace, xrHand.poses);
+          frame.fillJointRadii(inputSource.hand, xrHand.radii);
+        }
         for (let j = 0; j < 25; j++) {
           xrHand.jointIndex = j*16;
           if (!isNaN(xrHand.poses[xrHand.jointIndex])) {

Packages/webxr/Hidden~/WebGLTemplates/WebXRFullView/webxr.js

@@ -594,8 +594,13 @@
           xrHand.hand = 2;
         }
         xrHand.enabled = 1;
-        frame.fillPoses(inputSource.hand, refSpace, xrHand.poses);
-        frame.fillJointRadii(inputSource.hand, xrHand.radii);
+        if (inputSource.hand.values) {
+          frame.fillPoses(inputSource.hand.values(), refSpace, xrHand.poses);
+          frame.fillJointRadii(inputSource.hand.values(), xrHand.radii);
+        } else {
+          frame.fillPoses(inputSource.hand, refSpace, xrHand.poses);
+          frame.fillJointRadii(inputSource.hand, xrHand.radii);
+        }
         for (let j = 0; j < 25; j++) {
           xrHand.jointIndex = j*16;
           if (!isNaN(xrHand.poses[xrHand.jointIndex])) {

Packages/webxr/Hidden~/WebGLTemplates/WebXRFullView2020/webxr.js

@@ -594,8 +594,13 @@
           xrHand.hand = 2;
         }
         xrHand.enabled = 1;
-        frame.fillPoses(inputSource.hand, refSpace, xrHand.poses);
-        frame.fillJointRadii(inputSource.hand, xrHand.radii);
+        if (inputSource.hand.values) {
+          frame.fillPoses(inputSource.hand.values(), refSpace, xrHand.poses);
+          frame.fillJointRadii(inputSource.hand.values(), xrHand.radii);
+        } else {
+          frame.fillPoses(inputSource.hand, refSpace, xrHand.poses);
+          frame.fillJointRadii(inputSource.hand, xrHand.radii);
+        }
         for (let j = 0; j < 25; j++) {
           xrHand.jointIndex = j*16;
           if (!isNaN(xrHand.poses[xrHand.jointIndex])) {