Skip to content

Commit 6bf7e41

Browse files
De-PantherDe-Panther
authored
Merge pull request #338 from De-Panther/input_profiles_0_6_0
Set minimum WebXR Input Profiles Loader version to 0.6.0
2 parents 135a49a + c7af1b3 commit 6bf7e41

File tree

11 files changed

+46
-56
lines changed

11 files changed

+46
-56
lines changed

‎DebugProjects/Unity2020.3/Packages/manifest.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"dependencies": {
3-
"com.de-panther.webxr-input-profiles-loader": "0.4.0",
3+
"com.de-panther.webxr-input-profiles-loader": "0.6.0",
44
"com.unity.ide.rider": "2.0.7",
55
"com.unity.ide.visualstudio": "2.0.8",
66
"com.unity.ide.vscode": "1.2.5",
@@ -48,8 +48,7 @@
4848
"name": "OpenUPM",
4949
"url": "https://package.openupm.com",
5050
"scopes": [
51-
"com.de-panther",
52-
"com.atteneder"
51+
"com.de-panther"
5352
]
5453
}
5554
]

‎DebugProjects/Unity2020.3/Packages/packages-lock.json

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,5 @@
11
{
22
"dependencies": {
3-
"com.atteneder.gltfast": {
4-
"version": "4.4.8",
5-
"depth": 1,
6-
"source": "registry",
7-
"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",
11-
"com.unity.mathematics": "1.2.1",
12-
"com.unity.burst": "1.4.11"
13-
},
14-
"url": "https://package.openupm.com"
15-
},
163
"com.de-panther.webxr": {
174
"version": "file:webxr",
185
"depth": 0,
@@ -22,12 +9,12 @@
229
}
2310
},
2411
"com.de-panther.webxr-input-profiles-loader": {
25-
"version": "0.4.0",
12+
"version": "0.6.0",
2613
"depth": 0,
2714
"source": "registry",
2815
"dependencies": {
2916
"com.unity.nuget.newtonsoft-json": "2.0.0",
30-
"com.atteneder.gltfast": "4.4.8"
17+
"com.unity.cloud.gltfast": "5.2.0"
3118
},
3219
"url": "https://package.openupm.com"
3320
},
@@ -36,18 +23,30 @@
3623
"depth": 0,
3724
"source": "embedded",
3825
"dependencies": {
39-
"com.de-panther.webxr": "0.19.0"
26+
"com.de-panther.webxr": "0.20.0"
4027
}
4128
},
4229
"com.unity.burst": {
43-
"version": "1.4.11",
30+
"version": "1.6.6",
4431
"depth": 2,
4532
"source": "registry",
4633
"dependencies": {
4734
"com.unity.mathematics": "1.2.1"
4835
},
4936
"url": "https://packages.unity.com"
5037
},
38+
"com.unity.cloud.gltfast": {
39+
"version": "5.2.0",
40+
"depth": 1,
41+
"source": "registry",
42+
"dependencies": {
43+
"com.unity.modules.jsonserialize": "1.0.0",
44+
"com.unity.modules.unitywebrequest": "1.0.0",
45+
"com.unity.mathematics": "1.2.6",
46+
"com.unity.burst": "1.6.6"
47+
},
48+
"url": "https://packages.unity.com"
49+
},
5150
"com.unity.ext.nunit": {
5251
"version": "1.0.6",
5352
"depth": 1,
@@ -81,7 +80,7 @@
8180
"url": "https://packages.unity.com"
8281
},
8382
"com.unity.mathematics": {
84-
"version": "1.2.1",
83+
"version": "1.2.6",
8584
"depth": 2,
8685
"source": "registry",
8786
"dependencies": {},

‎DebugProjects/Unity2020.3/ProjectSettings/PackageManagerSettings.asset

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ MonoBehaviour:
1212
m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
m_EnablePreviewPackages: 0
16-
m_EnablePackageDependencies: 0
15+
m_EnablePreviewPackages: 1
16+
m_EnablePackageDependencies: 1
1717
m_AdvancedSettingsExpanded: 1
1818
m_ScopedRegistriesSettingsExpanded: 1
19-
oneTimeWarningShown: 0
19+
oneTimeWarningShown: 1
2020
m_Registries:
2121
- m_Id: main
2222
m_Name:
@@ -29,7 +29,6 @@ MonoBehaviour:
2929
m_Url: https://package.openupm.com
3030
m_Scopes:
3131
- com.de-panther
32-
- com.atteneder
3332
m_IsDefault: 0
3433
m_Capabilities: 0
3534
m_UserSelectedRegistryName: OpenUPM
@@ -42,13 +41,11 @@ MonoBehaviour:
4241
m_Url: https://package.openupm.com
4342
m_Scopes:
4443
- com.de-panther
45-
- com.atteneder
4644
m_IsDefault: 0
4745
m_Capabilities: 0
4846
m_Modified: 0
4947
m_Name: OpenUPM
5048
m_Url: https://package.openupm.com
5149
m_Scopes:
5250
- com.de-panther
53-
- com.atteneder
5451
m_SelectedScopeIndex: 0

‎Documentation/Using-XR-Interaction-Toolkit.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,8 @@ Simplest way to do it is to set a `Scoped Registry` in `Project Settings > Packa
4141
Name: OpenUPM
4242
URL: https://package.openupm.com
4343
Scope(s): com.de-panther
44-
com.atteneder
4544
```
4645

47-
The `com.atteneder` is needed when using the WebXR Input Profiles Loader package.
48-
4946
![Package Manager Settings](unity-webxr-export-package-manager-settings.png)
5047

5148
Import the packages in the Package Manager window.

‎MainProject/Packages/manifest.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@
44
"name": "OpenUPM",
55
"url": "https://package.openupm.com",
66
"scopes": [
7-
"com.de-panther",
8-
"com.atteneder"
7+
"com.de-panther"
98
]
109
}
1110
],
1211
"dependencies": {
13-
"com.de-panther.webxr-input-profiles-loader": "0.4.0",
12+
"com.de-panther.webxr-input-profiles-loader": "0.6.0",
1413
"com.unity.ide.rider": "3.0.26",
1514
"com.unity.ide.visualstudio": "2.0.18",
1615
"com.unity.ide.vscode": "1.2.5",

‎MainProject/Packages/packages-lock.json

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,5 @@
11
{
22
"dependencies": {
3-
"com.atteneder.gltfast": {
4-
"version": "4.4.8",
5-
"depth": 1,
6-
"source": "registry",
7-
"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",
11-
"com.unity.mathematics": "1.2.1",
12-
"com.unity.burst": "1.4.11"
13-
},
14-
"url": "https://package.openupm.com"
15-
},
163
"com.de-panther.webxr": {
174
"version": "file:webxr",
185
"depth": 0,
@@ -22,12 +9,12 @@
229
}
2310
},
2411
"com.de-panther.webxr-input-profiles-loader": {
25-
"version": "0.4.0",
12+
"version": "0.6.0",
2613
"depth": 0,
2714
"source": "registry",
2815
"dependencies": {
2916
"com.unity.nuget.newtonsoft-json": "2.0.0",
30-
"com.atteneder.gltfast": "4.4.8"
17+
"com.unity.cloud.gltfast": "5.2.0"
3118
},
3219
"url": "https://package.openupm.com"
3320
},
@@ -48,6 +35,18 @@
4835
},
4936
"url": "https://packages.unity.com"
5037
},
38+
"com.unity.cloud.gltfast": {
39+
"version": "5.2.0",
40+
"depth": 1,
41+
"source": "registry",
42+
"dependencies": {
43+
"com.unity.modules.jsonserialize": "1.0.0",
44+
"com.unity.modules.unitywebrequest": "1.0.0",
45+
"com.unity.mathematics": "1.2.6",
46+
"com.unity.burst": "1.6.6"
47+
},
48+
"url": "https://packages.unity.com"
49+
},
5150
"com.unity.ext.nunit": {
5251
"version": "1.0.6",
5352
"depth": 1,

‎MainProject/ProjectSettings/PackageManagerSettings.asset

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ MonoBehaviour:
3131
m_Url: https://package.openupm.com
3232
m_Scopes:
3333
- com.de-panther
34-
- com.atteneder
3534
m_IsDefault: 0
3635
m_Capabilities: 0
3736
m_ConfigSource: 4
@@ -40,6 +39,6 @@ MonoBehaviour:
4039
m_RegistryInfoDraft:
4140
m_Modified: 0
4241
m_ErrorMessage:
43-
m_UserModificationsInstanceId: -836
44-
m_OriginalInstanceId: -840
42+
m_UserModificationsInstanceId: -834
43+
m_OriginalInstanceId: -838
4544
m_LoadAssets: 0

‎Packages/webxr-interactions/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9+
### Changed
10+
- Minimum WebXR Input Profiles Loader version 0.6.0.
11+
912
## [0.20.0] - 2023-12-18
1013
### Added
1114
- An option to set depthStencilFormat in MixedRealityCaptureController.

‎Packages/webxr-interactions/README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ Scope(s): com.de-panther
2424

2525
Then in `Window > Package Manager` selecting `Packages: My Registries` and the WebXR Interactions package would be available for install.
2626

27-
The WebXR Interactions package supports the [WebXR Input Profiles Loader](https://github.com/De-Panther/webxr-input-profiles-loader) package and depends on [glTFast](https://github.com/atteneder/glTFast) for that.
28-
29-
Add `com.atteneder` to the scopes list of the OpenUPM registry for Unity to locate the glTFast package.
27+
The WebXR Interactions package supports the [WebXR Input Profiles Loader](https://github.com/De-Panther/webxr-input-profiles-loader) package and depends on [glTFast](https://docs.unity3d.com/Packages/com.unity.cloud.gltfast@latest) for that.
3028

3129
### Using Git (DON'T! OpenUPM is better)
3230

‎Packages/webxr-interactions/Runtime/InputSystem/WebXR.InputSystem.asmdef

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
},
3131
{
3232
"name": "com.de-panther.webxr-input-profiles-loader",
33-
"expression": "0.4.0",
33+
"expression": "0.6.0",
3434
"define": "WEBXR_INPUT_PROFILES"
3535
},
3636
{

0 commit comments

Comments
 (0)