Fixed WebXR input profiles loading on SteamVR

Author: De-Panther

Build/Build/Build.data

@@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Spectator Camera.
 - Mixed Reality Capture.
 
+### Fixed
+- WebXR input profiles loading on SteamVR.
+
 ## [0.15.0] - 2022-06-04
 ### Changed
 - Requires WebXR Export 0.15.0.

Build/Build/Build.framework.js

@@ -206,8 +206,11 @@ public bool GetUseInputProfile()
 
     private void SetControllerVisible(bool visible)
     {
-      controllerVisible = visible;
-      Drop();
+      if (controllerVisible != visible)
+      {
+        controllerVisible = visible;
+        Drop();
+      }
 #if WEBXR_INPUT_PROFILES
       // We want to use WebXR Input Profiles
       if (visible && useInputProfile)
@@ -249,8 +252,11 @@ private void SetInputProfileModelPose(bool alwaysUseGrip)
 
     private void SetHandJointsVisible(bool visible)
     {
-      handJointsVisible = visible;
-      Drop();
+      if (handJointsVisible != visible)
+      {
+        handJointsVisible = visible;
+        Drop();
+      }
 #if WEBXR_INPUT_PROFILES
       // We want to use WebXR Input Profiles
       if (visible && useInputProfile)
@@ -357,6 +363,10 @@ private void HandleProfilesList(Dictionary<string, string> profilesList)
 
     private void LoadInputProfile()
     {
+      if (!string.IsNullOrEmpty(loadedProfile))
+      {
+        return;
+      }
       // Start loading possible profiles for the controller
       var profiles = controller.GetProfiles();
       if (hasProfileList && profiles != null && profiles.Length > 0)

Build/Build/Build.wasm

@@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Support for Spectator Camera.
 
+### Fixed
+- WebXR input profiles loading on SteamVR.
+
 ## [0.15.0] - 2022-06-04
 ### Added
 - GetButtonTouched to WebXRController, to support buttons touched values.

Packages/webxr-interactions/CHANGELOG.md

@@ -735,7 +735,7 @@ setTimeout(function () {
               Module.HEAPF32[controller.enabledIndex] = 1; // XRControllerData.enabled
               Module.HEAPF32[controller.handIndex] = hand; // XRControllerData.hand
 
-              if (controller.updatedProfiles == 0) {
+              if (controller.updatedProfiles == 0 && inputSource.profiles.length > 0) {
                 controller.profiles = inputSource.profiles;
                 controller.updatedProfiles = 1;
               }

Packages/webxr-interactions/Runtime/Scripts/ControllerInteraction.cs

@@ -358,7 +358,12 @@ private void OnControllerUpdate(WebXRControllerData controllerData)
           return;
         }
 
-        profiles = controllerData.profiles;
+        bool profilesUpdated = false;
+        if (profiles != controllerData.profiles)
+        {
+          profiles = controllerData.profiles;
+          profilesUpdated = true;
+        }
 
         if (oculusLinkBugTest != 1)
         {
@@ -412,7 +417,7 @@ private void OnControllerUpdate(WebXRControllerData controllerData)
           UpdateAllButtons();
         }
 
-        SetControllerActive(true);
+        SetControllerActive(true, profilesUpdated);
       }
     }
 
@@ -483,10 +488,14 @@ private void OnHandUpdateInternal(WebXRHandData handData)
       }
     }
 
-    private void SetControllerActive(bool active)
+    private void SetControllerActive(bool active, bool forceReport = false)
     {
       if (controllerActive == active)
       {
+        if (forceReport)
+        {
+          OnControllerActive?.Invoke(controllerActive);
+        }
         return;
       }
       if (!active)