Make sure that Input Profile Model loads

De-Panther · De-Panther · commit 24a8aea18034 · 2020-12-19T07:24:21.000+02:00
diff --git a/Packages/webxr-interactions/Runtime/Scripts/ControllerInteraction.cs b/Packages/webxr-interactions/Runtime/Scripts/ControllerInteraction.cs
@@ -227,6 +227,11 @@ private void HandleProfilesList(Dictionary<string, string> profilesList)
         return;
       }
       hasProfileList = true;
+
+      if (controllerVisible && useInputProfile)
+      {
+        SetControllerVisible(true);
+      }
     }
 
     private void LoadInputProfile()
diff --git a/Packages/webxr-interactions/Samples~/Desert/Prefabs/WebXRCameraSet.prefab b/Packages/webxr-interactions/Samples~/Desert/Prefabs/WebXRCameraSet.prefab
@@ -443,7 +443,7 @@ Camera:
     y: 0
     width: 0.5
     height: 1
-  near clip plane: 0.3
+  near clip plane: 0.1
   far clip plane: 1000
   field of view: 60
   orthographic: 0
@@ -649,7 +649,7 @@ Camera:
     y: 0
     width: 0.5
     height: 1
-  near clip plane: 0.3
+  near clip plane: 0.1
   far clip plane: 1000
   field of view: 60
   orthographic: 0
diff --git a/Packages/webxr/Runtime/Scripts/WebXRController.cs b/Packages/webxr/Runtime/Scripts/WebXRController.cs
@@ -494,7 +494,6 @@ private void HandleInputDevicesConnected(InputDevice device)
             profileName += "-button";
           }
           profiles = new string[]{profileName};
-          Debug.LogError(profileName);
         }
         TryUpdateButtons();
         SetControllerActive(true);

Original file line number	Diff line number	Diff line change
`@@ -227,6 +227,11 @@ private void HandleProfilesList(Dictionary<string, string> profilesList)`
`227`	`227`	`return;`
`228`	`228`	`}`
`229`	`229`	`hasProfileList = true;`
	`230`	`+`
	`231`	`+ if (controllerVisible && useInputProfile)`
	`232`	`+ {`
	`233`	`+ SetControllerVisible(true);`
	`234`	`+ }`
`230`	`235`	`}`
`231`	`236`
`232`	`237`	`private void LoadInputProfile()`
Original file line number	Diff line number	Diff line change
`@@ -494,7 +494,6 @@ private void HandleInputDevicesConnected(InputDevice device)`
`494`	`494`	`profileName += "-button";`
`495`	`495`	`}`
`496`	`496`	`profiles = new string[]{profileName};`
`497`		`- Debug.LogError(profileName);`
`498`	`497`	`}`
`499`	`498`	`TryUpdateButtons();`
`500`	`499`	`SetControllerActive(true);`