Fix toggle Input Profiles Loader.

Shorter poke cylinder object.

Author: De-Panther

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

@@ -8,7 +8,6 @@
 using UnityEngine.XR.Interaction.Toolkit;
 #endif
 #if WEBXR_INPUT_PROFILES
-using UnityEngine.InputSystem.XR;
 using WebXRInputProfile;
 #endif
 
@@ -137,8 +136,10 @@ public UpdateType updateType
 
     [SerializeField]private XRBaseController xrController;
 
+#if WEBXR_INPUT_PROFILES
     private InputProfileLoader inputProfileLoader;
     private InputProfileModel inputProfileModel;
+#endif
     private bool startedLoading = false;
     private bool hasProfileList = false;
     private string loadedProfile = null;
@@ -160,6 +161,7 @@ public UpdateType updateType
     private bool visualActionsInit;
     bool m_IsFirstUpdate = true;
 
+#if WEBXR_INPUT_PROFILES
     void BindActions()
     {
       BindPosition();
@@ -393,6 +395,7 @@ protected void OnEnable()
           WebXRInputSystem.OnRightControllerProfiles += HandleOnControllerProfiles;
           break;
       }
+      HandleOnControllerProfiles();
     }
 
     /// <summary>
@@ -412,6 +415,10 @@ protected void OnDisable()
           WebXRInputSystem.OnRightControllerProfiles -= HandleOnControllerProfiles;
           break;
       }
+      if (xrController != null && xrController.model != null)
+      {
+        xrController.model.gameObject.SetActive(true);
+      }
     }
 
     /// <summary>
@@ -559,6 +566,10 @@ private void HandleProfilesList(Dictionary<string, string> profilesList)
 
     public void HandleOnControllerProfiles()
     {
+      if (loadedModel)
+      {
+        HandleModelLoaded(loadedModel);
+      }
       if (startedLoading)
       {
         return;
@@ -620,20 +631,17 @@ private void HandleModelLoaded(bool success)
       inputProfileModelTransform.localPosition = Vector3.zero;
       inputProfileModelTransform.localRotation = Quaternion.identity;
       inputProfileModelTransform.localScale = Vector3.one;
-      if (xrController != null)
+      if (xrController != null && xrController.model != null)
       {
-        xrController.modelPrefab = null;
-        if (xrController.model != null)
-        {
-          Destroy(xrController.model.gameObject);
-        }
+        xrController.model.gameObject.SetActive(false);
       }
 
       if (m_CurrentTrackingState == TrackingStates.None)
       {
         inputProfileModel.gameObject.SetActive(false);
       }
     }
+#endif
 #endif
   }
 }

Packages/webxr-interactions/Samples~/XRInteractionToolkit/Prefabs/XR Origin (WebXR Rig).prefab

@@ -788,7 +788,7 @@ MonoBehaviour:
   m_EnableFly: 0
   m_UseGravity: 1
   m_GravityApplicationMode: 0
-  m_ForwardSource: {fileID: 0}
+  m_ForwardSource: {fileID: 5280121735958530868}
   m_LeftHandMoveAction:
     m_UseReference: 1
     m_Action:
@@ -2731,6 +2731,16 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3652727254930583670, guid: 27024f5809f4a4347b9cd7f26a1bdf93,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1.8
+      objectReference: {fileID: 0}
+    - target: {fileID: 3652727254930583670, guid: 27024f5809f4a4347b9cd7f26a1bdf93,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -2
+      objectReference: {fileID: 0}
     - target: {fileID: 4125421792874400280, guid: 27024f5809f4a4347b9cd7f26a1bdf93,
         type: 3}
       propertyPath: m_Name
@@ -3312,6 +3322,16 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3652727254930583670, guid: 27024f5809f4a4347b9cd7f26a1bdf93,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1.8
+      objectReference: {fileID: 0}
+    - target: {fileID: 3652727254930583670, guid: 27024f5809f4a4347b9cd7f26a1bdf93,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -2
+      objectReference: {fileID: 0}
     - target: {fileID: 4125421792874400280, guid: 27024f5809f4a4347b9cd7f26a1bdf93,
         type: 3}
       propertyPath: m_Name

Packages/webxr-interactions/Samples~/XRInteractionToolkit/Scenes/WebXRInteractionToolkit.unity

@@ -6912,6 +6912,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: XR Interaction WebXR Setup
       objectReference: {fileID: 0}
+    - target: {fileID: 1478900902061109886, guid: 1644f8f6d950f87408375866a875e80d,
+        type: 3}
+      propertyPath: m_UseGravity
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 5773256366622995465, guid: 1644f8f6d950f87408375866a875e80d,
         type: 3}
       propertyPath: m_LocalPosition.x