Merge pull request #338 from De-Panther/input_profiles_0_6_0

Set minimum WebXR Input Profiles Loader version to 0.6.0
De-Panther · Jan 15, 2024 · 6bf7e41 · 6bf7e41
2 parents 135a49a + c7af1b3
commit 6bf7e41
Show file tree

Hide file tree

Showing 11 changed files with 46 additions and 56 deletions.
diff --git a/DebugProjects/Unity2020.3/Packages/manifest.json b/DebugProjects/Unity2020.3/Packages/manifest.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "com.de-panther.webxr-input-profiles-loader": "0.4.0",
+    "com.de-panther.webxr-input-profiles-loader": "0.6.0",
     "com.unity.ide.rider": "2.0.7",
     "com.unity.ide.visualstudio": "2.0.8",
     "com.unity.ide.vscode": "1.2.5",
@@ -48,8 +48,7 @@
       "name": "OpenUPM",
       "url": "https://package.openupm.com",
       "scopes": [
-        "com.de-panther",
-        "com.atteneder"
+        "com.de-panther"
       ]
     }
   ]

diff --git a/DebugProjects/Unity2020.3/Packages/packages-lock.json b/DebugProjects/Unity2020.3/Packages/packages-lock.json
@@ -1,18 +1,5 @@
 {
   "dependencies": {
-    "com.atteneder.gltfast": {
-      "version": "4.4.8",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.modules.jsonserialize": "1.0.0",
-        "com.unity.modules.unitywebrequest": "1.0.0",
-        "com.unity.modules.unitywebrequesttexture": "1.0.0",
-        "com.unity.mathematics": "1.2.1",
-        "com.unity.burst": "1.4.11"
-      },
-      "url": "https://package.openupm.com"
-    },
     "com.de-panther.webxr": {
       "version": "file:webxr",
       "depth": 0,
@@ -22,12 +9,12 @@
       }
     },
     "com.de-panther.webxr-input-profiles-loader": {
-      "version": "0.4.0",
+      "version": "0.6.0",
       "depth": 0,
       "source": "registry",
       "dependencies": {
         "com.unity.nuget.newtonsoft-json": "2.0.0",
-        "com.atteneder.gltfast": "4.4.8"
+        "com.unity.cloud.gltfast": "5.2.0"
       },
       "url": "https://package.openupm.com"
     },
@@ -36,18 +23,30 @@
       "depth": 0,
       "source": "embedded",
       "dependencies": {
-        "com.de-panther.webxr": "0.19.0"
+        "com.de-panther.webxr": "0.20.0"
       }
     },
     "com.unity.burst": {
-      "version": "1.4.11",
+      "version": "1.6.6",
       "depth": 2,
       "source": "registry",
       "dependencies": {
         "com.unity.mathematics": "1.2.1"
       },
       "url": "https://packages.unity.com"
     },
+    "com.unity.cloud.gltfast": {
+      "version": "5.2.0",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.modules.jsonserialize": "1.0.0",
+        "com.unity.modules.unitywebrequest": "1.0.0",
+        "com.unity.mathematics": "1.2.6",
+        "com.unity.burst": "1.6.6"
+      },
+      "url": "https://packages.unity.com"
+    },
     "com.unity.ext.nunit": {
       "version": "1.0.6",
       "depth": 1,
@@ -81,7 +80,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.mathematics": {
-      "version": "1.2.1",
+      "version": "1.2.6",
       "depth": 2,
       "source": "registry",
       "dependencies": {},

diff --git a/DebugProjects/Unity2020.3/ProjectSettings/PackageManagerSettings.asset b/DebugProjects/Unity2020.3/ProjectSettings/PackageManagerSettings.asset
@@ -12,11 +12,11 @@ MonoBehaviour:
   m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_EnablePreviewPackages: 0
-  m_EnablePackageDependencies: 0
+  m_EnablePreviewPackages: 1
+  m_EnablePackageDependencies: 1
   m_AdvancedSettingsExpanded: 1
   m_ScopedRegistriesSettingsExpanded: 1
-  oneTimeWarningShown: 0
+  oneTimeWarningShown: 1
   m_Registries:
   - m_Id: main
     m_Name: 
@@ -29,7 +29,6 @@ MonoBehaviour:
     m_Url: https://package.openupm.com
     m_Scopes:
     - com.de-panther
-    - com.atteneder
     m_IsDefault: 0
     m_Capabilities: 0
   m_UserSelectedRegistryName: OpenUPM
@@ -42,13 +41,11 @@ MonoBehaviour:
       m_Url: https://package.openupm.com
       m_Scopes:
       - com.de-panther
-      - com.atteneder
       m_IsDefault: 0
       m_Capabilities: 0
     m_Modified: 0
     m_Name: OpenUPM
     m_Url: https://package.openupm.com
     m_Scopes:
     - com.de-panther
-    - com.atteneder
     m_SelectedScopeIndex: 0
diff --git a/Documentation/Using-XR-Interaction-Toolkit.md b/Documentation/Using-XR-Interaction-Toolkit.md
@@ -41,11 +41,8 @@ Simplest way to do it is to set a `Scoped Registry` in `Project Settings > Packa
 Name: OpenUPM
 URL: https://package.openupm.com
 Scope(s): com.de-panther
-          com.atteneder
 ```
 
-The `com.atteneder` is needed when using the WebXR Input Profiles Loader package.
-
 ![Package Manager Settings](unity-webxr-export-package-manager-settings.png)
 
 Import the packages in the Package Manager window.

diff --git a/MainProject/Packages/manifest.json b/MainProject/Packages/manifest.json
@@ -4,13 +4,12 @@
       "name": "OpenUPM",
       "url": "https://package.openupm.com",
       "scopes": [
-        "com.de-panther",
-        "com.atteneder"
+        "com.de-panther"
       ]
     }
   ],
   "dependencies": {
-    "com.de-panther.webxr-input-profiles-loader": "0.4.0",
+    "com.de-panther.webxr-input-profiles-loader": "0.6.0",
     "com.unity.ide.rider": "3.0.26",
     "com.unity.ide.visualstudio": "2.0.18",
     "com.unity.ide.vscode": "1.2.5",

diff --git a/MainProject/Packages/packages-lock.json b/MainProject/Packages/packages-lock.json
@@ -1,18 +1,5 @@
 {
   "dependencies": {
-    "com.atteneder.gltfast": {
-      "version": "4.4.8",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.modules.jsonserialize": "1.0.0",
-        "com.unity.modules.unitywebrequest": "1.0.0",
-        "com.unity.modules.unitywebrequesttexture": "1.0.0",
-        "com.unity.mathematics": "1.2.1",
-        "com.unity.burst": "1.4.11"
-      },
-      "url": "https://package.openupm.com"
-    },
     "com.de-panther.webxr": {
       "version": "file:webxr",
       "depth": 0,
@@ -22,12 +9,12 @@
       }
     },
     "com.de-panther.webxr-input-profiles-loader": {
-      "version": "0.4.0",
+      "version": "0.6.0",
       "depth": 0,
       "source": "registry",
       "dependencies": {
         "com.unity.nuget.newtonsoft-json": "2.0.0",
-        "com.atteneder.gltfast": "4.4.8"
+        "com.unity.cloud.gltfast": "5.2.0"
       },
       "url": "https://package.openupm.com"
     },
@@ -48,6 +35,18 @@
       },
       "url": "https://packages.unity.com"
     },
+    "com.unity.cloud.gltfast": {
+      "version": "5.2.0",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.modules.jsonserialize": "1.0.0",
+        "com.unity.modules.unitywebrequest": "1.0.0",
+        "com.unity.mathematics": "1.2.6",
+        "com.unity.burst": "1.6.6"
+      },
+      "url": "https://packages.unity.com"
+    },
     "com.unity.ext.nunit": {
       "version": "1.0.6",
       "depth": 1,

diff --git a/MainProject/ProjectSettings/PackageManagerSettings.asset b/MainProject/ProjectSettings/PackageManagerSettings.asset
@@ -31,7 +31,6 @@ MonoBehaviour:
     m_Url: https://package.openupm.com
     m_Scopes:
     - com.de-panther
-    - com.atteneder
     m_IsDefault: 0
     m_Capabilities: 0
     m_ConfigSource: 4
@@ -40,6 +39,6 @@ MonoBehaviour:
   m_RegistryInfoDraft:
     m_Modified: 0
     m_ErrorMessage: 
-    m_UserModificationsInstanceId: -836
-    m_OriginalInstanceId: -840
+    m_UserModificationsInstanceId: -834
+    m_OriginalInstanceId: -838
   m_LoadAssets: 0
diff --git a/Packages/webxr-interactions/CHANGELOG.md b/Packages/webxr-interactions/CHANGELOG.md
@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+- Minimum WebXR Input Profiles Loader version 0.6.0.
+
 ## [0.20.0] - 2023-12-18
 ### Added
 - An option to set depthStencilFormat in MixedRealityCaptureController.

diff --git a/Packages/webxr-interactions/README.md b/Packages/webxr-interactions/README.md
@@ -24,9 +24,7 @@ Scope(s): com.de-panther
 
 Then in `Window > Package Manager` selecting `Packages: My Registries` and the WebXR Interactions package would be available for install.
 
-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.
-
-Add `com.atteneder` to the scopes list of the OpenUPM registry for Unity to locate the glTFast package.
+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.
 
 ### Using Git (DON'T! OpenUPM is better)
 

diff --git a/Packages/webxr-interactions/Runtime/InputSystem/WebXR.InputSystem.asmdef b/Packages/webxr-interactions/Runtime/InputSystem/WebXR.InputSystem.asmdef
@@ -30,7 +30,7 @@
         },
         {
             "name": "com.de-panther.webxr-input-profiles-loader",
-            "expression": "0.4.0",
+            "expression": "0.6.0",
             "define": "WEBXR_INPUT_PROFILES"
         },
         {

diff --git a/Packages/webxr-interactions/Runtime/Scripts/WebXR.Interactions.asmdef b/Packages/webxr-interactions/Runtime/Scripts/WebXR.Interactions.asmdef
@@ -16,7 +16,7 @@
     "versionDefines": [
         {
             "name": "com.de-panther.webxr-input-profiles-loader",
-            "expression": "0.4.0",
+            "expression": "0.6.0",
             "define": "WEBXR_INPUT_PROFILES"
         },
         {