Update to support UPM packages for glTF

UnityProjects/MRTKDevTemplate/Assets/XR/Settings/OpenXR Package Settings.asset

@@ -172,7 +172,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0c8f1ce8139888c4ab621f6b3c8bb558, type: 3}
   m_Name: MotionControllerFeaturePlugin Android
   m_EditorClassIdentifier: 
-  m_enabled: 0
+  m_enabled: 1
   nameUi: Motion Controller Model
   version: 1.10.0
   featureIdInternal: com.microsoft.openxr.feature.controller
@@ -822,7 +822,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0c8f1ce8139888c4ab621f6b3c8bb558, type: 3}
   m_Name: MotionControllerFeaturePlugin WSA
   m_EditorClassIdentifier: 
-  m_enabled: 0
+  m_enabled: 1
   nameUi: Motion Controller Model
   version: 1.10.0
   featureIdInternal: com.microsoft.openxr.feature.controller
@@ -1116,7 +1116,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0c8f1ce8139888c4ab621f6b3c8bb558, type: 3}
   m_Name: MotionControllerFeaturePlugin Standalone
   m_EditorClassIdentifier: 
-  m_enabled: 0
+  m_enabled: 1
   nameUi: Motion Controller Model
   version: 1.10.0
   featureIdInternal: com.microsoft.openxr.feature.controller

UnityProjects/MRTKDevTemplate/Packages/manifest.json

@@ -1,27 +1,13 @@
 {
   "dependencies": {
-    "com.atteneder.gltfast": "https://github.com/atteneder/glTFast.git#v4.8.3",
-    "com.atteneder.ktx": "https://github.com/atteneder/KtxUnity.git#v2.1.2",
     "com.microsoft.mixedreality.openxr": "file:../../../ExternalDependencies/com.microsoft.mixedreality.openxr-1.10.0.tgz",
     "com.microsoft.mixedreality.visualprofiler": "https://github.com/microsoft/VisualProfiler-Unity.git#v2.2.0",
     "com.microsoft.mrtk.graphicstools.unity": "https://github.com/microsoft/MixedReality-GraphicsTools-Unity.git?path=/com.microsoft.mrtk.graphicstools.unity#v0.6.6",
     "com.microsoft.mrtk.tts.windows": "file:../../../ExternalDependencies/com.microsoft.mrtk.tts.windows-1.0.4.tgz",
     "com.microsoft.spatialaudio.spatializer.unity": "file:../../../ExternalDependencies/com.microsoft.spatialaudio.spatializer.unity-2.0.55.tgz",
-    "org.mixedrealitytoolkit.accessibility": "file:../../../org.mixedrealitytoolkit.accessibility",
-    "org.mixedrealitytoolkit.audio": "file:../../../org.mixedrealitytoolkit.audio",
-    "org.mixedrealitytoolkit.core": "file:../../../org.mixedrealitytoolkit.core",
-    "org.mixedrealitytoolkit.data": "file:../../../org.mixedrealitytoolkit.data",
-    "org.mixedrealitytoolkit.diagnostics": "file:../../../org.mixedrealitytoolkit.diagnostics",
-    "org.mixedrealitytoolkit.extendedassets": "file:../../../org.mixedrealitytoolkit.extendedassets",
-    "org.mixedrealitytoolkit.input": "file:../../../org.mixedrealitytoolkit.input",
-    "org.mixedrealitytoolkit.spatialmanipulation": "file:../../../org.mixedrealitytoolkit.spatialmanipulation",
-    "org.mixedrealitytoolkit.standardassets": "file:../../../org.mixedrealitytoolkit.standardassets",
-    "org.mixedrealitytoolkit.tools": "file:../../../org.mixedrealitytoolkit.tools",
-    "org.mixedrealitytoolkit.uxcomponents": "file:../../../org.mixedrealitytoolkit.uxcomponents",
-    "org.mixedrealitytoolkit.uxcomponents.noncanvas": "file:../../../org.mixedrealitytoolkit.uxcomponents.noncanvas",
-    "org.mixedrealitytoolkit.uxcore": "file:../../../org.mixedrealitytoolkit.uxcore",
-    "org.mixedrealitytoolkit.windowsspeech": "file:../../../org.mixedrealitytoolkit.windowsspeech",
     "com.unity.asset-store-validation": "0.5.1",
+    "com.unity.cloud.gltfast": "6.10.1",
+    "com.unity.cloud.ktx": "3.4.5",
     "com.unity.collab-proxy": "2.0.1",
     "com.unity.ide.rider": "3.0.18",
     "com.unity.ide.visualstudio": "2.0.17",
@@ -38,6 +24,20 @@
     "com.unity.xr.interaction.toolkit": "2.3.0",
     "com.unity.xr.management": "4.2.1",
     "com.unity.xr.openxr": "1.7.0",
+    "org.mixedrealitytoolkit.accessibility": "file:../../../org.mixedrealitytoolkit.accessibility",
+    "org.mixedrealitytoolkit.audio": "file:../../../org.mixedrealitytoolkit.audio",
+    "org.mixedrealitytoolkit.core": "file:../../../org.mixedrealitytoolkit.core",
+    "org.mixedrealitytoolkit.data": "file:../../../org.mixedrealitytoolkit.data",
+    "org.mixedrealitytoolkit.diagnostics": "file:../../../org.mixedrealitytoolkit.diagnostics",
+    "org.mixedrealitytoolkit.extendedassets": "file:../../../org.mixedrealitytoolkit.extendedassets",
+    "org.mixedrealitytoolkit.input": "file:../../../org.mixedrealitytoolkit.input",
+    "org.mixedrealitytoolkit.spatialmanipulation": "file:../../../org.mixedrealitytoolkit.spatialmanipulation",
+    "org.mixedrealitytoolkit.standardassets": "file:../../../org.mixedrealitytoolkit.standardassets",
+    "org.mixedrealitytoolkit.tools": "file:../../../org.mixedrealitytoolkit.tools",
+    "org.mixedrealitytoolkit.uxcomponents": "file:../../../org.mixedrealitytoolkit.uxcomponents",
+    "org.mixedrealitytoolkit.uxcomponents.noncanvas": "file:../../../org.mixedrealitytoolkit.uxcomponents.noncanvas",
+    "org.mixedrealitytoolkit.uxcore": "file:../../../org.mixedrealitytoolkit.uxcore",
+    "org.mixedrealitytoolkit.windowsspeech": "file:../../../org.mixedrealitytoolkit.windowsspeech",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",

UnityProjects/MRTKDevTemplate/Packages/packages-lock.json

@@ -1,27 +1,5 @@
 {
   "dependencies": {
-    "com.atteneder.gltfast": {
-      "version": "https://github.com/atteneder/glTFast.git#v4.8.3",
-      "depth": 0,
-      "source": "git",
-      "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.6",
-        "com.unity.burst": "1.6.6"
-      },
-      "hash": "04962b47618cdab46943217d30c6c6de33d3c3f7"
-    },
-    "com.atteneder.ktx": {
-      "version": "https://github.com/atteneder/KtxUnity.git#v2.1.2",
-      "depth": 0,
-      "source": "git",
-      "dependencies": {
-        "com.unity.modules.unitywebrequest": "1.0.0"
-      },
-      "hash": "7747a48d5e994db800b4c60a0a8b95a5ae2ce39f"
-    },
     "com.microsoft.mixedreality.openxr": {
       "version": "file:../../../ExternalDependencies/com.microsoft.mixedreality.openxr-1.10.0.tgz",
       "depth": 0,
@@ -69,21 +47,53 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.burst": {
-      "version": "1.6.6",
+      "version": "1.8.4",
       "depth": 1,
       "source": "registry",
       "dependencies": {
         "com.unity.mathematics": "1.2.1"
       },
       "url": "https://packages.unity.com"
     },
+    "com.unity.cloud.gltfast": {
+      "version": "6.10.1",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.burst": "1.8.4",
+        "com.unity.collections": "1.2.4",
+        "com.unity.mathematics": "1.2.6",
+        "com.unity.modules.jsonserialize": "1.0.0",
+        "com.unity.modules.unitywebrequest": "1.0.0"
+      },
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.cloud.ktx": {
+      "version": "3.4.5",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.modules.unitywebrequest": "1.0.0"
+      },
+      "url": "https://packages.unity.com"
+    },
     "com.unity.collab-proxy": {
       "version": "2.0.1",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
+    "com.unity.collections": {
+      "version": "1.2.4",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.burst": "1.6.6",
+        "com.unity.test-framework": "1.1.31"
+      },
+      "url": "https://packages.unity.com"
+    },
     "com.unity.ext.nunit": {
       "version": "1.0.6",
       "depth": 1,
@@ -187,9 +197,9 @@
       "depth": 0,
       "source": "registry",
       "dependencies": {
+        "com.unity.modules.audio": "1.0.0",
         "com.unity.modules.director": "1.0.0",
         "com.unity.modules.animation": "1.0.0",
-        "com.unity.modules.audio": "1.0.0",
         "com.unity.modules.particlesystem": "1.0.0"
       },
       "url": "https://packages.unity.com"
@@ -208,9 +218,9 @@
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.xr.arfoundation": "5.0.5",
         "com.unity.xr.core-utils": "2.1.0",
         "com.unity.xr.management": "4.0.1",
+        "com.unity.xr.arfoundation": "5.0.5",
         "com.unity.modules.androidjni": "1.0.0",
         "com.unity.modules.unitywebrequest": "1.0.0"
       },
@@ -221,13 +231,13 @@
       "depth": 0,
       "source": "registry",
       "dependencies": {
+        "com.unity.ugui": "1.0.0",
+        "com.unity.modules.ui": "1.0.0",
         "com.unity.inputsystem": "1.3.0",
+        "com.unity.mathematics": "1.2.5",
         "com.unity.xr.core-utils": "2.1.0",
         "com.unity.xr.management": "4.0.1",
-        "com.unity.ugui": "1.0.0",
-        "com.unity.mathematics": "1.2.5",
         "com.unity.modules.particlesystem": "1.0.0",
-        "com.unity.modules.ui": "1.0.0",
         "com.unity.modules.unityanalytics": "1.0.0",
         "com.unity.modules.unitywebrequest": "1.0.0"
       },
@@ -247,8 +257,8 @@
       "depth": 1,
       "source": "registry",
       "dependencies": {
-        "com.unity.inputsystem": "1.3.0",
         "com.unity.modules.xr": "1.0.0",
+        "com.unity.inputsystem": "1.3.0",
         "com.unity.xr.core-utils": "2.2.0",
         "com.unity.xr.management": "4.0.1"
       },
@@ -259,14 +269,14 @@
       "depth": 0,
       "source": "registry",
       "dependencies": {
+        "com.unity.ugui": "1.0.0",
         "com.unity.inputsystem": "1.4.4",
         "com.unity.mathematics": "1.2.6",
-        "com.unity.ugui": "1.0.0",
-        "com.unity.xr.core-utils": "2.2.0",
-        "com.unity.xr.legacyinputhelpers": "2.1.10",
         "com.unity.modules.audio": "1.0.0",
         "com.unity.modules.imgui": "1.0.0",
-        "com.unity.modules.physics": "1.0.0"
+        "com.unity.xr.core-utils": "2.2.0",
+        "com.unity.modules.physics": "1.0.0",
+        "com.unity.xr.legacyinputhelpers": "2.1.10"
       },
       "url": "https://packages.unity.com"
     },
@@ -285,11 +295,11 @@
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.modules.subsystems": "1.0.0",
         "com.unity.modules.vr": "1.0.0",
         "com.unity.modules.xr": "1.0.0",
-        "com.unity.xr.legacyinputhelpers": "2.1.7",
-        "com.unity.subsystemregistration": "1.0.6"
+        "com.unity.modules.subsystems": "1.0.0",
+        "com.unity.subsystemregistration": "1.0.6",
+        "com.unity.xr.legacyinputhelpers": "2.1.7"
       },
       "url": "https://packages.unity.com"
     },
@@ -298,9 +308,9 @@
       "depth": 0,
       "source": "registry",
       "dependencies": {
+        "com.unity.inputsystem": "1.4.4",
         "com.unity.xr.management": "4.0.1",
-        "com.unity.xr.legacyinputhelpers": "2.1.2",
-        "com.unity.inputsystem": "1.4.4"
+        "com.unity.xr.legacyinputhelpers": "2.1.2"
       },
       "url": "https://packages.unity.com"
     },

cgmanifest.json

@@ -1,15 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/component-detection-manifest.json",
   "registrations": [
-    {
-      "component": {
-        "type": "git",
-          "git": {
-            "repositoryUrl": "https://github.com/atteneder/glTFast",
-            "commitHash": "04962b47618cdab46943217d30c6c6de33d3c3f7"
-          }
-      }
-    },
     {
       "component": {
         "type": "git",
@@ -19,6 +10,5 @@
           }
       }
     }
-
   ]
 }

org.mixedrealitytoolkit.input/CHANGELOG.md

@@ -2,14 +2,20 @@
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
-## [3.2.2-development] - 2024-06-24
+## Unreleased
+
+### Added
+
+* Added support for Unity's com.unity.cloud.gltfast and com.unity.cloud.ktx packages when loading controller models.
+
+## [3.2.2] - 2024-09-18
 
 ### Fixed
 
 * InputSimulator execution order so that it executes before InteractionManager.
 * Ensure all relevant interactor types show up in InteractionModeManager's dropdowns. [PR #872](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/872)
 
-## [3.2.1] - 2024-04-23
+## [3.2.1] - 2024-06-12
 
 ### Fixed
 
@@ -18,7 +24,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 * Reduced package description to support for UPM package publishing in the Unity Asset Store.
 * Ensures the simulated input sources hold their state (including gestures) when their toggle state is locked on. [PR #705](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/705)
 
-## [3.2.0] - 2024-03-20
+## [3.2.0] - 2024-03-27
 
 ### Added
 

org.mixedrealitytoolkit.input/Editor/InputValidation.cs

@@ -6,6 +6,7 @@
 using System.Linq;
 using Unity.XR.CoreUtils.Editor;
 using UnityEditor;
+using UnityEditor.PackageManager;
 using UnityEngine;
 
 namespace MixedReality.Toolkit.Input.Editor
@@ -74,9 +75,9 @@ private static BuildValidationRule GenerateGLTFastRule()
                     return false;
 #endif
                 },
-                FixIt = () => Application.OpenURL("https://github.com/atteneder/glTFast"),
-                FixItMessage = "Open the GitHub repo for glTFast. Please refer to the installing section for instructions.",
-                FixItAutomatic = false,
+                FixIt = () => Client.Add("com.unity.cloud.gltfast"),
+                FixItMessage = "Add com.unity.cloud.gltfast to this project.",
+                FixItAutomatic = true,
                 Error = false
             };
         }
@@ -97,9 +98,9 @@ private static BuildValidationRule GenerateKTXRule()
                     return false;
 #endif
                 },
-                FixIt = () => Application.OpenURL("https://github.com/atteneder/KtxUnity"),
-                FixItMessage = "Open the GitHub repo for KTX Unity. Please refer to the installing section for instructions.",
-                FixItAutomatic = false,
+                FixIt = () => Client.Add("com.unity.cloud.ktx"),
+                FixItMessage = "Add com.unity.cloud.ktx to this project.",
+                FixItAutomatic = true,
                 Error = false
             };
         }

org.mixedrealitytoolkit.input/Editor/MRTK.Input.Editor.asmdef

@@ -4,7 +4,7 @@
     "references": [
         "MixedReality.Toolkit.Core",
         "MixedReality.Toolkit.Core.Editor",
-        "MixedReality.Toolkit.Input",        
+        "MixedReality.Toolkit.Input",
         "Unity.XR.CoreUtils",
         "Unity.XR.CoreUtils.Editor",
         "Unity.XR.Interaction.Toolkit",
@@ -21,11 +21,21 @@
     "autoReferenced": true,
     "defineConstraints": [],
     "versionDefines": [
+        {
+            "name": "com.unity.cloud.gltfast",
+            "expression": "",
+            "define": "GLTFAST_PRESENT"
+        },
         {
             "name": "com.atteneder.gltfast",
             "expression": "",
             "define": "GLTFAST_PRESENT"
         },
+        {
+            "name": "com.unity.cloud.ktx",
+            "expression": "",
+            "define": "KTX_PRESENT"
+        },
         {
             "name": "com.atteneder.ktx",
             "expression": "",

org.mixedrealitytoolkit.input/MRTK.Input.asmdef

@@ -30,14 +30,14 @@
             "define": "MROPENXR_ANIM_PRESENT"
         },
         {
-            "name": "com.atteneder.gltfast",
+            "name": "com.unity.cloud.gltfast",
             "expression": "",
             "define": "GLTFAST_PRESENT"
         },
         {
-            "name": "com.atteneder.ktx",
+            "name": "com.atteneder.gltfast",
             "expression": "",
-            "define": "KTX_PRESENT"
+            "define": "GLTFAST_PRESENT"
         },
         {
             "name": "com.unity.xr.management",