Add targetRaySpace for hands

Author: De-Panther

Packages/webxr-interactions/Runtime/InputSystem/WebXRInputSystem.cs

@@ -274,7 +274,7 @@ private void OnHandUpdate(WebXRHandData handData)
           MetaAimHand.left.UpdateHand(
             true,
             aimFlags,
-            new Pose(handData.joints[10].position, handData.joints[10].rotation),
+            new Pose(handData.pointerPosition, handData.pointerRotation),
             handData.trigger,
             0,
             0,
@@ -286,7 +286,7 @@ private void OnHandUpdate(WebXRHandData handData)
           MetaAimHand.right.UpdateHand(
             true,
             aimFlags,
-            new Pose(handData.joints[10].position, handData.joints[10].rotation),
+            new Pose(handData.pointerPosition, handData.pointerRotation),
             handData.trigger,
             0,
             0,

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

@@ -142,6 +142,13 @@ setTimeout(function () {
         this.handIndex = 0;
         this.triggerIndex = 0;
         this.squeezeIndex = 0;
+        this.pointerPositionXIndex = 0;
+        this.pointerPositionYIndex = 0;
+        this.pointerPositionZIndex = 0;
+        this.pointerRotationXIndex = 0;
+        this.pointerRotationYIndex = 0;
+        this.pointerRotationZIndex = 0;
+        this.pointerRotationWIndex = 0;
         this.jointsStartIndex = 0;
         this.poses = new Float32Array(16 * 25);
         this.radii = new Float32Array(25);
@@ -157,6 +164,13 @@ setTimeout(function () {
           this.handIndex = index++;
           this.triggerIndex = index++;
           this.squeezeIndex = index++;
+          this.pointerPositionXIndex = index++;
+          this.pointerPositionYIndex = index++;
+          this.pointerPositionZIndex = index++;
+          this.pointerRotationXIndex = index++;
+          this.pointerRotationYIndex = index++;
+          this.pointerRotationZIndex = index++;
+          this.pointerRotationWIndex = index++;
           this.jointsStartIndex = index;
         }
       }
@@ -718,6 +732,19 @@ setTimeout(function () {
                 xrHand.bufferJointIndex++;
               }
             }
+            // Get pointer pose for hand
+            var inputRayPose = frame.getPose(inputSource.targetRaySpace, refSpace);
+            if (inputRayPose) {
+              var position = inputRayPose.transform.position;
+              var orientation = inputRayPose.transform.orientation;
+              Module.HEAPF32[xrHand.pointerPositionXIndex] = position.x; // XRHandData.pointerPositionX
+              Module.HEAPF32[xrHand.pointerPositionYIndex] = position.y; // XRHandData.pointerPositionY
+              Module.HEAPF32[xrHand.pointerPositionZIndex] = -position.z; // XRHandData.pointerPositionZ
+              Module.HEAPF32[xrHand.pointerRotationXIndex] = -orientation.x; // XRHandData.pointerRotationX
+              Module.HEAPF32[xrHand.pointerRotationYIndex] = -orientation.y; // XRHandData.pointerRotationY
+              Module.HEAPF32[xrHand.pointerRotationZIndex] = orientation.z; // XRHandData.pointerRotationZ
+              Module.HEAPF32[xrHand.pointerRotationWIndex] = orientation.w; // XRHandData.pointerRotationW
+            }
           } else if (inputSource.gripSpace) {
             var inputRayPose = frame.getPose(inputSource.targetRaySpace, refSpace);
             if (inputRayPose) {
@@ -890,7 +917,7 @@ setTimeout(function () {
           this.xrData.controllerA.setIndices(Module.ControllersArrayOffset);
           this.xrData.controllerB.setIndices(Module.ControllersArrayOffset + 34);
           this.xrData.handLeft.setIndices(Module.HandsArrayOffset);
-          this.xrData.handRight.setIndices(Module.HandsArrayOffset + 205);
+          this.xrData.handRight.setIndices(Module.HandsArrayOffset + 212);
           this.xrData.viewerHitTestPose.setIndices(Module.ViewerHitTestPoseArrayOffset);
           this.xrData.controllerA.updatedProfiles = 0;
           this.xrData.controllerB.updatedProfiles = 0;

Packages/webxr/Runtime/Scripts/WebXRControllerData.cs

@@ -75,6 +75,8 @@ public class WebXRHandData
     public int hand;
     public float trigger;
     public float squeeze;
+    public Vector3 pointerPosition;
+    public Quaternion pointerRotation;
     public WebXRJointData[] joints = new WebXRJointData[25];
   }
 

Packages/webxr/Runtime/XRPlugin/WebXRSubsystem.cs

@@ -358,7 +358,7 @@ internal delegate void StartXREvent(int viewsCount,
     float[] controllersArray = new float[2 * 34];
 
     // Shared array for hands data
-    float[] handsArray = new float[2 * (25 * 8 + 5)];
+    float[] handsArray = new float[2 * (25 * 8 + 5 + 7)]; // 2 hands, 25 joints
 
     // Shared array for hit-test pose data
     float[] viewerHitTestPoseArray = new float[9];
@@ -587,7 +587,7 @@ bool GetGamepadFromControllersArray(int controllerIndex, ref WebXRControllerData
 
     bool GetHandFromHandsArray(int handIndex, ref WebXRHandData handObject)
     {
-      int arrayPosition = handIndex * 205;
+      int arrayPosition = handIndex * 212;
       int frameNumber = (int)handsArray[arrayPosition++];
       if (handObject.frame == frameNumber)
       {
@@ -604,6 +604,9 @@ bool GetHandFromHandsArray(int handIndex, ref WebXRHandData handObject)
         return true;
       }
 
+      handObject.pointerPosition = new Vector3(handsArray[arrayPosition++], handsArray[arrayPosition++], handsArray[arrayPosition++]);
+      handObject.pointerRotation = new Quaternion(handsArray[arrayPosition++], handsArray[arrayPosition++], handsArray[arrayPosition++],
+        handsArray[arrayPosition++]);
       for (int i = 0; i <= (int)WebXRHandJoint.pinky_finger_tip; i++)
       {
         handObject.joints[i].position = new Vector3(handsArray[arrayPosition++], handsArray[arrayPosition++], handsArray[arrayPosition++]);