Small fixes and handle input Profile Loader in editor

Author: De-Panther

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

@@ -39,7 +39,7 @@ public class ControllerInteraction : MonoBehaviour
     private string loadedProfile = null;
 #endif
 
-    void Awake()
+    private void Awake()
     {
       attachJoint = GetComponent<FixedJoint>();
       hasAnimator = animator != null;
@@ -67,21 +67,21 @@ void Awake()
       SetHandJointsVisible(false);
     }
 
-    void OnEnable()
+    private void OnEnable()
     {
       controller.OnControllerActive += SetControllerVisible;
       controller.OnHandActive += SetHandJointsVisible;
       controller.OnHandUpdate += OnHandUpdate;
     }
 
-    void OnDisabled()
+    private void OnDisabled()
     {
       controller.OnControllerActive -= SetControllerVisible;
       controller.OnHandActive -= SetHandJointsVisible;
       controller.OnHandUpdate -= OnHandUpdate;
     }
 
-    void Update()
+    private void Update()
     {
       if (!controllerVisible && !handJointsVisible)
       {
@@ -122,7 +122,7 @@ void Update()
       }
     }
 
-    void OnTriggerEnter(Collider other)
+    private void OnTriggerEnter(Collider other)
     {
       if (other.gameObject.tag != "Interactable")
         return;
@@ -131,28 +131,34 @@ void OnTriggerEnter(Collider other)
       controller.Pulse(0.5f, 250);
     }
 
-    void OnTriggerExit(Collider other)
+    private void OnTriggerExit(Collider other)
     {
       if (other.gameObject.tag != "Interactable")
         return;
 
       contactRigidBodies.Remove(other.gameObject.GetComponent<Rigidbody>());
     }
 
-    void SetControllerVisible(bool visible)
+    private void SetControllerVisible(bool visible)
     {
       controllerVisible = visible;
       Drop();
 #if WEBXR_INPUT_PROFILES
+      // We want to use WebXR Input Profiles
       if (visible && useInputProfile)
       {
-        if (inputProfileModel != null)
+        if (inputProfileModel != null && loadedModel)
         {
+          // There's a loaded Input Profile Model
           inputProfileModelParent.SetActive(true);
-          loadedModel = true;
+          UpdateModelInput();
           return;
         }
-        LoadInputProfile();
+        else if (inputProfileModel == null)
+        {
+          // There's no loaded Input Profile Model and it's not in loading process
+          LoadInputProfile();
+        }
       }
       else
       {
@@ -165,7 +171,7 @@ void SetControllerVisible(bool visible)
       }
     }
 
-    void SetHandJointsVisible(bool visible)
+    private void SetHandJointsVisible(bool visible)
     {
       handJointsVisible = visible;
       Drop();
@@ -214,7 +220,7 @@ private void OnHandUpdate(WebXRHandData handData)
     }
 
 #if WEBXR_INPUT_PROFILES
-    void HandleProfilesList(Dictionary<string, string> profilesList)
+    private void HandleProfilesList(Dictionary<string, string> profilesList)
     {
       if (profilesList == null || profilesList.Count == 0)
       {
@@ -223,8 +229,9 @@ void HandleProfilesList(Dictionary<string, string> profilesList)
       hasProfileList = true;
     }
 
-    void LoadInputProfile()
+    private void LoadInputProfile()
     {
+      // Start loading possible profiles for the controller
       var profiles = controller.GetProfiles();
       if (hasProfileList && profiles != null && profiles.Length > 0)
       {
@@ -239,22 +246,28 @@ private void OnProfileLoaded(bool success)
       {
         LoadInputModel();
       }
+      // Nothing to do if profile didn't load
     }
 
-    void LoadInputModel()
+    private void LoadInputModel()
     {
-      inputProfileModel = inputProfileLoader.LoadModelForHand(loadedProfile, (InputProfileLoader.Handedness)controller.hand, HandleModelLoaded);
+      inputProfileModel = inputProfileLoader.LoadModelForHand(
+                          loadedProfile,
+                          (InputProfileLoader.Handedness)controller.hand,
+                          HandleModelLoaded);
       if (inputProfileModel != null)
       {
+        // Update input state while still loading the model
         UpdateModelInput();
       }
     }
 
-    void HandleModelLoaded(bool success)
+    private void HandleModelLoaded(bool success)
     {
       loadedModel = success;
       if (loadedModel)
       {
+        // Set parent only after successful loading, to not interupt loading in case of disabled object
         var inputProfileModelTransform = inputProfileModel.transform;
         inputProfileModelTransform.SetParent(inputProfileModelParent.transform);
         inputProfileModelTransform.localPosition = Vector3.zero;
@@ -275,7 +288,7 @@ void HandleModelLoaded(bool success)
       }
     }
 
-    void UpdateModelInput()
+    private void UpdateModelInput()
     {
       for (int i = 0; i < 6; i++)
       {
@@ -287,12 +300,12 @@ void UpdateModelInput()
       }
     }
 
-    void SetButtonValue(int index)
+    private void SetButtonValue(int index)
     {
       inputProfileModel.SetButtonValue(index, controller.GetButtonIndexValue(index));
     }
 
-    public void SetAxisValue(int index)
+    private void SetAxisValue(int index)
     {
       inputProfileModel.SetAxisValue(index, controller.GetAxisIndexValue(index));
     }

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

@@ -1885,7 +1885,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 580e3dd931df2bd42b042a7e8fde2aa8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  animator: {fileID: 95292425453911886}
+  animator: {fileID: 95219300520550374}
   animationStateName: Take
   controllerVisuals:
   - {fileID: 1644997114004198}

Packages/webxr/Runtime/Scripts/WebXRController.cs

@@ -457,6 +457,46 @@ private void HandleInputDevicesConnected(InputDevice device)
         {
           hapticCapabilities = capabilities;
         }
+        profiles = null;
+        // TODO: Find a better way to get device profile
+        if (device.manufacturer == "Oculus")
+        {
+          profiles = new string[]{"oculus-touch-v2"};
+        }
+        else
+        {
+          string profileName = "generic";
+          bool addedFeatures = false;
+          float tempFloat = 0;
+          Vector2 tempVec2 = Vector2.zero;
+          if (device.TryGetFeatureValue(CommonUsages.trigger, out tempFloat))
+          {
+            profileName += "-trigger";
+            addedFeatures = true;
+          }
+          if (device.TryGetFeatureValue(CommonUsages.grip, out tempFloat))
+          {
+            profileName += "-squeeze";
+            addedFeatures = true;
+          }
+          if (device.TryGetFeatureValue(CommonUsages.secondary2DAxis, out tempVec2))
+          {
+            profileName += "-touchpad";
+            addedFeatures = true;
+          }
+          if (device.TryGetFeatureValue(CommonUsages.primary2DAxis, out tempVec2))
+          {
+            profileName += "-thumbstick";
+            addedFeatures = true;
+          }
+          if (!addedFeatures)
+          {
+            profileName += "-button";
+          }
+          profiles = new string[]{profileName};
+          Debug.LogError(profileName);
+        }
+        TryUpdateButtons();
         SetControllerActive(true);
       }
     }

Packages/webxr/Runtime/Scripts/WebXRControllerData.cs

@@ -84,7 +84,11 @@ public class WebXRHitPoseData
     public Quaternion rotation;
   }
 
-  public enum WebXRControllerHand { NONE, LEFT, RIGHT };
+  public enum WebXRControllerHand {
+    NONE = 0,
+    LEFT = 1,
+    RIGHT = 2
+  }
 
   [System.Serializable]
   public class WebXRControllerButton