Bug fixes

Author: De-Panther

Packages/webxr-interactions/Samples~/Desert/Prefabs/WebXRCameraSet.prefab

@@ -288,14 +288,14 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1136128897566686}
-  m_LocalRotation: {x: 0.52522314, y: -0.47343507, z: -0.47343513, w: 0.52522284}
+  m_LocalRotation: {x: 0.6298602, y: -0.32136607, z: -0.5932414, w: 0.3847918}
   m_LocalPosition: {x: -0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4099324660282070}
   m_Father: {fileID: 4427160273819458}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 5.9370003, y: -90.00001, z: -120}
 --- !u!1 &1156281662418980
 GameObject:
   m_ObjectHideFlags: 0
@@ -1044,14 +1044,14 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1644997114004198}
-  m_LocalRotation: {x: 0.5000001, y: 0.49999994, z: 0.49999994, w: 0.5000001}
+  m_LocalRotation: {x: 0.6123725, y: 0.35355338, z: 0.61237246, w: 0.35355335}
   m_LocalPosition: {x: -0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4761071769301884}
   m_Father: {fileID: 4446684710817404}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90.00001, z: 120}
 --- !u!1 &1647411076831720
 GameObject:
   m_ObjectHideFlags: 0
@@ -1388,9 +1388,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   hand: 1
-  simulate3dof: 0
-  eyesToElbow: {x: 0.1, y: -0.4, z: 0.15}
-  elbowHand: {x: 0, y: 0, z: 0.25}
+  alwaysUseGrip: 0
 --- !u!114 &114589835210473740
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1870,9 +1868,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   hand: 2
-  simulate3dof: 0
-  eyesToElbow: {x: 0.1, y: -0.4, z: 0.15}
-  elbowHand: {x: 0, y: 0, z: 0.25}
+  alwaysUseGrip: 0
 --- !u!114 &114372649503696970
 MonoBehaviour:
   m_ObjectHideFlags: 0

Packages/webxr/Runtime/Plugins/WebGL/webxr.jslib

@@ -82,8 +82,8 @@ mergeInto(LibraryManager.library, {
         Module.ControllersArray[index++] = data[key].touchpadY;
         Module.ControllersArray[index++] = data[key].buttonA;
         Module.ControllersArray[index++] = data[key].buttonB;
-        Module.ControllersArray[index++] = data[key].updateGrip;
-        if (data[key].updateGrip == 1) {
+        Module.ControllersArray[index++] = data[key].updatedGrip;
+        if (data[key].updatedGrip == 1) {
           Module.ControllersArray[index++] = data[key].gripPositionX;
           Module.ControllersArray[index++] = data[key].gripPositionY;
           Module.ControllersArray[index++] = data[key].gripPositionZ;

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

@@ -692,6 +692,8 @@ setTimeout(function () {
 
                   controller.updatedGrip = 1;
                 }
+              } else if (controller.updatedGrip == 1) {
+                controller.updatedGrip = 2;
               }
 
               // if there's gamepad, use the xr-standard mapping
@@ -803,6 +805,8 @@ setTimeout(function () {
           this.xrData.controllerB.updatedProfiles = 0;
           this.xrData.controllerA.profiles = [];
           this.xrData.controllerB.profiles = [];
+          this.xrData.controllerA.updatedGrip = 0;
+          this.xrData.controllerB.updatedGrip = 0;
         }
         var thisXRMananger = this;
         session.requestReferenceSpace(refSpaceType).then(function (refSpace) {
@@ -925,12 +929,6 @@ setTimeout(function () {
           controllerA: xrData.controllerA,
           controllerB: xrData.controllerB
         }}));
-        if (xrData.controllerA.updatedGrip == 1) {
-          xrData.controllerA.updatedGrip = 2;
-        }
-        if (xrData.controllerB.updatedGrip == 1) {
-          xrData.controllerB.updatedGrip = 2;
-        }
 
         document.dispatchEvent(new CustomEvent('XRHandsData', { detail: {
           handLeft: xrData.handLeft,

Packages/webxr/Runtime/XRPlugin/WebXRSubsystem.cs

@@ -384,6 +384,7 @@ bool GetGamepadFromControllersArray(int controllerIndex, ref WebXRControllerData
       }
 
       newControllerData.frame = frameNumber;
+      bool wasDisabled = !newControllerData.enabled;
       newControllerData.enabled = controllersArray[arrayPosition++] != 0;
       newControllerData.hand = (int)controllersArray[arrayPosition++];
       if (!newControllerData.enabled)
@@ -404,14 +405,14 @@ bool GetGamepadFromControllersArray(int controllerIndex, ref WebXRControllerData
       newControllerData.touchpadY = controllersArray[arrayPosition++];
       newControllerData.buttonA = controllersArray[arrayPosition++];
       newControllerData.buttonB = controllersArray[arrayPosition++];
-      if (controllersArray[arrayPosition++] == 1)
+      if (controllersArray[arrayPosition++] == 1 || wasDisabled)
       {
         newControllerData.gripPosition = new Vector3(controllersArray[arrayPosition++], controllersArray[arrayPosition++], controllersArray[arrayPosition++]);
         newControllerData.gripRotation = new Quaternion(controllersArray[arrayPosition++], controllersArray[arrayPosition++], controllersArray[arrayPosition++],
             controllersArray[arrayPosition++]);
         Quaternion rotationOffset = Quaternion.Inverse(newControllerData.rotation);
-        newControllerData.gripRotation = rotationOffset * newControllerData.gripRotation;
         newControllerData.gripPosition = rotationOffset * (newControllerData.gripPosition - newControllerData.position);
+        newControllerData.gripRotation = rotationOffset * newControllerData.gripRotation;
       }
       return true;
     }