Skip to content

Commit 91ca005

Browse files
committed
Update to WebXR Input Profiles Loader 0.3.1
1 parent 24a8aea commit 91ca005

File tree

7 files changed

+20
-46
lines changed

7 files changed

+20
-46
lines changed

MainProject/Assets/WebXR/Samples/ShaderVariants.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

MainProject/Assets/WebXR/Samples/ShaderVariants/GLTFShaderVariants.shadervariants

Lines changed: 0 additions & 22 deletions
This file was deleted.

MainProject/Assets/WebXR/Samples/ShaderVariants/GLTFShaderVariants.shadervariants.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

MainProject/Packages/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
}
1111
],
1212
"dependencies": {
13-
"com.de-panther.webxr-input-profiles-loader": "0.2.0",
13+
"com.de-panther.webxr-input-profiles-loader": "0.3.1",
1414
"com.unity.ide.rider": "2.0.5",
1515
"com.unity.ide.vscode": "1.2.3",
1616
"com.unity.test-framework": "1.1.16",

MainProject/Packages/packages-lock.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
{
22
"dependencies": {
33
"com.atteneder.gltfast": {
4-
"version": "2.2.0",
4+
"version": "2.5.0",
55
"depth": 1,
66
"source": "registry",
77
"dependencies": {
8+
"com.unity.modules.jsonserialize": "1.0.0",
9+
"com.unity.modules.unitywebrequest": "1.0.0",
10+
"com.unity.modules.unitywebrequesttexture": "1.0.0",
811
"com.unity.mathematics": "1.2.1"
912
},
1013
"url": "https://package.openupm.com"
@@ -18,12 +21,12 @@
1821
}
1922
},
2023
"com.de-panther.webxr-input-profiles-loader": {
21-
"version": "0.2.0",
24+
"version": "0.3.1",
2225
"depth": 0,
2326
"source": "registry",
2427
"dependencies": {
2528
"com.unity.nuget.newtonsoft-json": "2.0.0",
26-
"com.atteneder.gltfast": "2.2.0"
29+
"com.atteneder.gltfast": "2.5.0"
2730
},
2831
"url": "https://package.openupm.com"
2932
},

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

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ private void Awake()
5252
{
5353
inputProfileLoader = inputProfileObject.AddComponent<InputProfileLoader>();
5454
}
55-
if (InputProfileLoader.ProfilesPaths == null || InputProfileLoader.ProfilesPaths.Count == 0)
55+
var profilesPaths = inputProfileLoader.GetProfilesPaths();
56+
if (profilesPaths == null || profilesPaths.Count == 0)
5657
{
57-
5858
inputProfileLoader.LoadProfilesList(HandleProfilesList);
5959
}
6060
else
6161
{
62-
HandleProfilesList(InputProfileLoader.ProfilesPaths);
62+
HandleProfilesList(profilesPaths);
6363
}
6464
}
6565
#endif
@@ -169,6 +169,10 @@ private void SetControllerVisible(bool visible)
169169
{
170170
visual.SetActive(visible);
171171
}
172+
if (!visible)
173+
{
174+
contactRigidBodies.Clear();
175+
}
172176
}
173177

174178
private void SetHandJointsVisible(bool visible)
@@ -179,6 +183,10 @@ private void SetHandJointsVisible(bool visible)
179183
{
180184
visual?.SetActive(visible);
181185
}
186+
if (!visible)
187+
{
188+
contactRigidBodies.Clear();
189+
}
182190
}
183191

184192
private void OnHandUpdate(WebXRHandData handData)
@@ -280,6 +288,7 @@ private void HandleModelLoaded(bool success)
280288
inputProfileModelTransform.localScale = Vector3.one;
281289
if (controllerVisible)
282290
{
291+
contactRigidBodies.Clear();
283292
inputProfileModelParent.SetActive(true);
284293
foreach (var visual in controllerVisuals)
285294
{

Packages/webxr-interactions/Runtime/Scripts/WebXR.Interactions.asmdef

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"versionDefines": [
1515
{
1616
"name": "com.de-panther.webxr-input-profiles-loader",
17-
"expression": "[0.2.0]",
17+
"expression": "0.3.1",
1818
"define": "WEBXR_INPUT_PROFILES"
1919
}
2020
],

0 commit comments

Comments
 (0)