WebXR Input Profiles 0.3.5 and PR fixes

De-Panther · De-Panther · commit 62cdf76ffeb2 · 2021-02-13T17:46:00.000+02:00
diff --git a/Build/Build/Build.data.unityweb b/Build/Build/Build.data.unityweb
diff --git a/Build/Build/Build.wasm b/Build/Build/Build.wasm
diff --git a/Build/Build/Build.wasm.framework.unityweb b/Build/Build/Build.wasm.framework.unityweb
diff --git a/MainProject/Packages/manifest.json b/MainProject/Packages/manifest.json
@@ -10,7 +10,7 @@
     }
   ],
   "dependencies": {
-    "com.de-panther.webxr-input-profiles-loader": "0.3.3",
+    "com.de-panther.webxr-input-profiles-loader": "0.3.5",
     "com.unity.ide.rider": "2.0.5",
     "com.unity.ide.vscode": "1.2.3",
     "com.unity.test-framework": "1.1.16",
diff --git a/MainProject/Packages/packages-lock.json b/MainProject/Packages/packages-lock.json
@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "com.atteneder.gltfast": {
-      "version": "3.0.1",
+      "version": "3.0.2",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -21,12 +21,12 @@
       }
     },
     "com.de-panther.webxr-input-profiles-loader": {
-      "version": "0.3.3",
+      "version": "0.3.5",
       "depth": 0,
       "source": "registry",
       "dependencies": {
         "com.unity.nuget.newtonsoft-json": "2.0.0",
-        "com.atteneder.gltfast": "3.0.1"
+        "com.atteneder.gltfast": "3.0.2"
       },
       "url": "https://package.openupm.com"
     },
diff --git a/Packages/webxr-interactions/CHANGELOG.md b/Packages/webxr-interactions/CHANGELOG.md
@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Check for alwaysUseGrip in ControllerInteraction.
 
 ### Changed
-- Minimum WebXR Input Profiles Loader version 0.3.3.
+- Minimum WebXR Input Profiles Loader version 0.3.5.
 
 ## [0.6.0] - 2020-01-23
 ### Added
diff --git a/Packages/webxr-interactions/Runtime/Scripts/WebXR.Interactions.asmdef b/Packages/webxr-interactions/Runtime/Scripts/WebXR.Interactions.asmdef
@@ -14,7 +14,7 @@
     "versionDefines": [
         {
             "name": "com.de-panther.webxr-input-profiles-loader",
-            "expression": "0.3.3",
+            "expression": "0.3.5",
             "define": "WEBXR_INPUT_PROFILES"
         }
     ],
diff --git a/Packages/webxr/CHANGELOG.md b/Packages/webxr/CHANGELOG.md
@@ -12,6 +12,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Use `targetRaySpace` as the default controller pose instead of `gripSpace`.
 - Use generic Input Profile in editor for all controllers types.
 
+### Fixed
+- Hack for Oculus on Chrome Desktop wrong `targetRaySpace` bug.
+
 ## [0.6.0] - 2020-01-23
 ### Added
 - GetLocalRotation and GetLocalPosition to WebXRCamera.
diff --git a/Packages/webxr/Runtime/Scripts/WebXRController.cs b/Packages/webxr/Runtime/Scripts/WebXRController.cs
@@ -63,8 +63,8 @@ public enum Axis2DTypes
     private Quaternion oculusOffsetGrip = Quaternion.Euler(-90f, 0, 0);
 
     [SerializeField] private bool alwaysUseGrip = false;
-    public Vector3 gripPosition { get; private set;} = Vector3.zero;
-    public Quaternion gripRotation { get; private set;} = Quaternion.identity;
+    public Vector3 gripPosition { get; private set; } = Vector3.zero;
+    public Quaternion gripRotation { get; private set; } = Quaternion.identity;
 
     public bool isControllerActive
     {
@@ -321,23 +321,17 @@ private void OnControllerUpdate(WebXRControllerData controllerData)
             transform.localRotation = controllerData.rotation;
             transform.localPosition = controllerData.position;
           }
-          CheckOculusLinkBug();
-        }
-        else
-        { // Oculus on desktop returns wrong rotation for targetRaySpace, this is an ugly hack to fix it
-          gripRotation = controllerData.gripRotation * oculusOffsetGrip;
-          gripPosition = controllerData.gripPosition;
-          if (alwaysUseGrip)
+          // Oculus on desktop returns wrong rotation for targetRaySpace, this is an ugly hack to fix it
+          if (CheckOculusLinkBug())
           {
-            transform.localRotation = controllerData.rotation * controllerData.gripRotation;
-            transform.localPosition = controllerData.rotation * (controllerData.position + controllerData.gripPosition);
-          }
-          else
-          {
-            transform.localRotation = controllerData.rotation * oculusOffsetRay;
-            transform.localPosition = controllerData.position;
+            HandleOculusLinkBug(controllerData);
           }
         }
+        else
+        { 
+          // Oculus on desktop returns wrong rotation for targetRaySpace, this is an ugly hack to fix it
+          HandleOculusLinkBug(controllerData);
+        }
 
         trigger = controllerData.trigger;
         squeeze = controllerData.squeeze;
@@ -364,20 +358,39 @@ private void OnControllerUpdate(WebXRControllerData controllerData)
     }
 
     // Oculus on desktop returns wrong rotation for targetRaySpace, this is an ugly hack to fix it
-    private void CheckOculusLinkBug()
+    private void HandleOculusLinkBug(WebXRControllerData controllerData)
+    {
+      gripRotation = controllerData.gripRotation * oculusOffsetGrip;
+      gripPosition = controllerData.gripPosition;
+      if (alwaysUseGrip)
+      {
+        transform.localRotation = controllerData.rotation * controllerData.gripRotation;
+        transform.localPosition = controllerData.rotation * (controllerData.position + controllerData.gripPosition);
+      }
+      else
+      {
+        transform.localRotation = controllerData.rotation * oculusOffsetRay;
+        transform.localPosition = controllerData.position;
+      }
+    }
+
+    // Oculus on desktop returns wrong rotation for targetRaySpace, this is an ugly hack to fix it
+    private bool CheckOculusLinkBug()
     {
       if (oculusLinkBugTest == 0
           && profiles != null && profiles.Length > 0)
       {
         if (profiles[0] == "oculus-touch" && gripRotation.x > 0)
         {
           oculusLinkBugTest = 1;
+          return true;
         }
         else
         {
           oculusLinkBugTest = 2;
         }
       }
+      return false;
     }
 
     private void OnHandUpdateInternal(WebXRHandData handData)
@@ -528,7 +541,7 @@ private void HandleInputDevicesConnected(InputDevice device)
         {
           profileName += "-button";
         }
-        profiles = new string[]{profileName};
+        profiles = new string[] { profileName };
         TryUpdateButtons();
         SetControllerActive(true);
       }
diff --git a/Packages/webxr/Runtime/XRPlugin/WebXRSubsystem.cs b/Packages/webxr/Runtime/XRPlugin/WebXRSubsystem.cs
@@ -384,7 +384,6 @@ 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)
@@ -405,7 +404,7 @@ bool GetGamepadFromControllersArray(int controllerIndex, ref WebXRControllerData
       newControllerData.touchpadY = controllersArray[arrayPosition++];
       newControllerData.buttonA = controllersArray[arrayPosition++];
       newControllerData.buttonB = controllersArray[arrayPosition++];
-      if (controllersArray[arrayPosition++] == 1 || wasDisabled)
+      if (controllersArray[arrayPosition++] == 1)
       {
         newControllerData.gripPosition = new Vector3(controllersArray[arrayPosition++], controllersArray[arrayPosition++], controllersArray[arrayPosition++]);
         newControllerData.gripRotation = new Quaternion(controllersArray[arrayPosition++], controllersArray[arrayPosition++], controllersArray[arrayPosition++],

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`}`
`11`	`11`	`],`
`12`	`12`	`"dependencies": {`
`13`		`- "com.de-panther.webxr-input-profiles-loader": "0.3.3",`
	`13`	`+ "com.de-panther.webxr-input-profiles-loader": "0.3.5",`
`14`	`14`	`"com.unity.ide.rider": "2.0.5",`
`15`	`15`	`"com.unity.ide.vscode": "1.2.3",`
`16`	`16`	`"com.unity.test-framework": "1.1.16",`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`"versionDefines": [`
`15`	`15`	`{`
`16`	`16`	`"name": "com.de-panther.webxr-input-profiles-loader",`
`17`		`- "expression": "0.3.3",`
	`17`	`+ "expression": "0.3.5",`
`18`	`18`	`"define": "WEBXR_INPUT_PROFILES"`
`19`	`19`	`}`
`20`	`20`	`],`
Original file line number	Diff line number	Diff line change
`@@ -63,8 +63,8 @@ public enum Axis2DTypes`
`63`	`63`	`private Quaternion oculusOffsetGrip = Quaternion.Euler(-90f, 0, 0);`
`64`	`64`
`65`	`65`	`[SerializeField] private bool alwaysUseGrip = false;`
`66`		`- public Vector3 gripPosition { get; private set;} = Vector3.zero;`
`67`		`- public Quaternion gripRotation { get; private set;} = Quaternion.identity;`
	`66`	`+ public Vector3 gripPosition { get; private set; } = Vector3.zero;`
	`67`	`+ public Quaternion gripRotation { get; private set; } = Quaternion.identity;`
`68`	`68`
`69`	`69`	`public bool isControllerActive`
`70`	`70`	`{`
`@@ -321,23 +321,17 @@ private void OnControllerUpdate(WebXRControllerData controllerData)`
`321`	`321`	`transform.localRotation = controllerData.rotation;`
`322`	`322`	`transform.localPosition = controllerData.position;`
`323`	`323`	`}`
`324`		`- CheckOculusLinkBug();`
`325`		`- }`
`326`		`- else`
`327`		`- { // Oculus on desktop returns wrong rotation for targetRaySpace, this is an ugly hack to fix it`
`328`		`- gripRotation = controllerData.gripRotation * oculusOffsetGrip;`
`329`		`- gripPosition = controllerData.gripPosition;`
`330`		`- if (alwaysUseGrip)`
	`324`	`+ // Oculus on desktop returns wrong rotation for targetRaySpace, this is an ugly hack to fix it`
	`325`	`+ if (CheckOculusLinkBug())`
`331`	`326`	`{`
`332`		`- transform.localRotation = controllerData.rotation * controllerData.gripRotation;`
`333`		`- transform.localPosition = controllerData.rotation * (controllerData.position + controllerData.gripPosition);`
`334`		`- }`
`335`		`- else`
`336`		`- {`
`337`		`- transform.localRotation = controllerData.rotation * oculusOffsetRay;`
`338`		`- transform.localPosition = controllerData.position;`
	`327`	`+ HandleOculusLinkBug(controllerData);`
`339`	`328`	`}`
`340`	`329`	`}`
	`330`	`+ else`
	`331`	`+ {`
	`332`	`+ // Oculus on desktop returns wrong rotation for targetRaySpace, this is an ugly hack to fix it`
	`333`	`+ HandleOculusLinkBug(controllerData);`
	`334`	`+ }`
`341`	`335`
`342`	`336`	`trigger = controllerData.trigger;`
`343`	`337`	`squeeze = controllerData.squeeze;`
`@@ -364,20 +358,39 @@ private void OnControllerUpdate(WebXRControllerData controllerData)`
`364`	`358`	`}`
`365`	`359`
`366`	`360`	`// Oculus on desktop returns wrong rotation for targetRaySpace, this is an ugly hack to fix it`
`367`		`- private void CheckOculusLinkBug()`
	`361`	`+ private void HandleOculusLinkBug(WebXRControllerData controllerData)`
	`362`	`+ {`
	`363`	`+ gripRotation = controllerData.gripRotation * oculusOffsetGrip;`
	`364`	`+ gripPosition = controllerData.gripPosition;`
	`365`	`+ if (alwaysUseGrip)`
	`366`	`+ {`
	`367`	`+ transform.localRotation = controllerData.rotation * controllerData.gripRotation;`
	`368`	`+ transform.localPosition = controllerData.rotation * (controllerData.position + controllerData.gripPosition);`
	`369`	`+ }`
	`370`	`+ else`
	`371`	`+ {`
	`372`	`+ transform.localRotation = controllerData.rotation * oculusOffsetRay;`
	`373`	`+ transform.localPosition = controllerData.position;`
	`374`	`+ }`
	`375`	`+ }`
	`376`	`+`
	`377`	`+ // Oculus on desktop returns wrong rotation for targetRaySpace, this is an ugly hack to fix it`
	`378`	`+ private bool CheckOculusLinkBug()`
`368`	`379`	`{`
`369`	`380`	`if (oculusLinkBugTest == 0`
`370`	`381`	`&& profiles != null && profiles.Length > 0)`
`371`	`382`	`{`
`372`	`383`	`if (profiles[0] == "oculus-touch" && gripRotation.x > 0)`
`373`	`384`	`{`
`374`	`385`	`oculusLinkBugTest = 1;`
	`386`	`+ return true;`
`375`	`387`	`}`
`376`	`388`	`else`
`377`	`389`	`{`
`378`	`390`	`oculusLinkBugTest = 2;`
`379`	`391`	`}`
`380`	`392`	`}`
	`393`	`+ return false;`
`381`	`394`	`}`
`382`	`395`
`383`	`396`	`private void OnHandUpdateInternal(WebXRHandData handData)`
`@@ -528,7 +541,7 @@ private void HandleInputDevicesConnected(InputDevice device)`
`528`	`541`	`{`
`529`	`542`	`profileName += "-button";`
`530`	`543`	`}`
`531`		`- profiles = new string[]{profileName};`
	`544`	`+ profiles = new string[] { profileName };`
`532`	`545`	`TryUpdateButtons();`
`533`	`546`	`SetControllerActive(true);`
`534`	`547`	`}`