diff --git a/UnityProjects/MRTKDevTemplate/Assets/XR/Settings/OpenXR Package Settings.asset b/UnityProjects/MRTKDevTemplate/Assets/XR/Settings/OpenXR Package Settings.asset
index 817f396d4..22d8d6d4b 100644
--- a/UnityProjects/MRTKDevTemplate/Assets/XR/Settings/OpenXR Package Settings.asset
+++ b/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
diff --git a/UnityProjects/MRTKDevTemplate/Packages/manifest.json b/UnityProjects/MRTKDevTemplate/Packages/manifest.json
index 7dded48d4..c603c6d80 100644
--- a/UnityProjects/MRTKDevTemplate/Packages/manifest.json
+++ b/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",
diff --git a/UnityProjects/MRTKDevTemplate/Packages/packages-lock.json b/UnityProjects/MRTKDevTemplate/Packages/packages-lock.json
index 7e7616c8c..ea7e5f1ec 100644
--- a/UnityProjects/MRTKDevTemplate/Packages/packages-lock.json
+++ b/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,7 +47,7 @@
"url": "https://packages.unity.com"
},
"com.unity.burst": {
- "version": "1.6.6",
+ "version": "1.8.4",
"depth": 1,
"source": "registry",
"dependencies": {
@@ -77,6 +55,28 @@
},
"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,
@@ -84,6 +84,16 @@
"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"
},
diff --git a/cgmanifest.json b/cgmanifest.json
index 888ab5565..738aff90d 100644
--- a/cgmanifest.json
+++ b/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 @@
}
}
}
-
]
}
diff --git a/org.mixedrealitytoolkit.input/CHANGELOG.md b/org.mixedrealitytoolkit.input/CHANGELOG.md
index b548dd814..25372b740 100644
--- a/org.mixedrealitytoolkit.input/CHANGELOG.md
+++ b/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
diff --git a/org.mixedrealitytoolkit.input/Editor/InputValidation.cs b/org.mixedrealitytoolkit.input/Editor/InputValidation.cs
index d4d71110c..f6e9d0886 100644
--- a/org.mixedrealitytoolkit.input/Editor/InputValidation.cs
+++ b/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
};
}
diff --git a/org.mixedrealitytoolkit.input/Editor/MRTK.Input.Editor.asmdef b/org.mixedrealitytoolkit.input/Editor/MRTK.Input.Editor.asmdef
index e92fa034b..bf7c6ed7d 100644
--- a/org.mixedrealitytoolkit.input/Editor/MRTK.Input.Editor.asmdef
+++ b/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": "",
diff --git a/org.mixedrealitytoolkit.input/MRTK.Input.asmdef b/org.mixedrealitytoolkit.input/MRTK.Input.asmdef
index e4457d9db..022475a5a 100644
--- a/org.mixedrealitytoolkit.input/MRTK.Input.asmdef
+++ b/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",
diff --git a/org.mixedrealitytoolkit.input/Visualizers/ControllerVisualizer/ControllerModelLoader.cs b/org.mixedrealitytoolkit.input/Visualizers/ControllerVisualizer/ControllerModelLoader.cs
index ed03b2456..8786a502c 100644
--- a/org.mixedrealitytoolkit.input/Visualizers/ControllerVisualizer/ControllerModelLoader.cs
+++ b/org.mixedrealitytoolkit.input/Visualizers/ControllerVisualizer/ControllerModelLoader.cs
@@ -8,10 +8,10 @@
using UnityEngine.InputSystem;
using UnityEngine.InputSystem.Utilities;
-#if MROPENXR_PRESENT && (UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_ANDROID) && GLTFAST_PRESENT && KTX_PRESENT
+#if MROPENXR_PRESENT && (UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_ANDROID) && GLTFAST_PRESENT
using Microsoft.MixedReality.OpenXR;
using GLTFast;
-#endif // MROPENXR_PRESENT && (UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_ANDROID) && GLTFAST_PRESENT && KTX_PRESENT
+#endif // MROPENXR_PRESENT && (UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_ANDROID) && GLTFAST_PRESENT
namespace MixedReality.Toolkit.Input
{
@@ -41,7 +41,7 @@ public static class ControllerModelLoader
///
/// The input device we are trying to get the controller model of
/// The handedness of the input device requesting the controller model
- /// A gameobject representing the generated controller model in the scene
+ /// A GameObject representing the generated controller model in the scene
public async static Task TryGenerateControllerModelFromPlatformSDK(InputDevice inputDevice, Handedness handedness)
{
// Sanity check to ensure that the xrInputDevice's usages matches the provided handedness
@@ -51,7 +51,7 @@ public async static Task TryGenerateControllerModelFromPlatformSDK(I
// Proceed with trying to load the model from the platform
GameObject gltfGameObject = null;
-#if MROPENXR_PRESENT && (UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_ANDROID) && GLTFAST_PRESENT && KTX_PRESENT
+#if MROPENXR_PRESENT && (UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_ANDROID) && GLTFAST_PRESENT
ControllerModel controllerModelProvider = handedness == Handedness.Left ? ControllerModel.Left :
handedness == Handedness.Right ? ControllerModel.Right :
null;
@@ -78,7 +78,7 @@ public async static Task TryGenerateControllerModelFromPlatformSDK(I
// Make sure we record in our cache that we've succeeded in loading this model without warnings
warningCache[inputDevice] = false;
- // Check if a gameobject already exists for this modelkey. If so, set it active and return it
+ // Check if a GameObject already exists for this modelkey. If so, set it active and return it
if (controllerModelDictionary.TryGetValue(modelKey, out gltfGameObject) && gltfGameObject != null)
{
gltfGameObject.SetActive(true);
@@ -102,11 +102,11 @@ public async static Task TryGenerateControllerModelFromPlatformSDK(I
// Make sure we record in our cache that we've succeeded in loading this model without warnings
errorCache[modelKey] = false;
- // Finally try to create a gameobject from the model data
+ // Finally try to create a GameObject from the model data
GltfImport gltf = new GltfImport();
bool success = await gltf.LoadGltfBinary(modelStream);
gltfGameObject = new GameObject(modelKey.ToString());
- if (success && gltf.InstantiateMainScene(gltfGameObject.transform))
+ if (success && await gltf.InstantiateMainSceneAsync(gltfGameObject.transform))
{
// After all the awaits, double check that another task didn't finish earlier
if (controllerModelDictionary.TryGetValue(modelKey, out GameObject existingGameObject) && existingGameObject != null)
@@ -132,7 +132,7 @@ public async static Task TryGenerateControllerModelFromPlatformSDK(I
}
#else
await Task.CompletedTask;
-#endif // MROPENXR_PRESENT && (UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_ANDROID) && GLTFAST_PRESENT && KTX_PRESENT
+#endif // MROPENXR_PRESENT && (UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_ANDROID) && GLTFAST_PRESENT
return gltfGameObject;
}
diff --git a/org.mixedrealitytoolkit.input/Visualizers/README.txt b/org.mixedrealitytoolkit.input/Visualizers/README.txt
index 74e2ae942..cebad0a0f 100644
--- a/org.mixedrealitytoolkit.input/Visualizers/README.txt
+++ b/org.mixedrealitytoolkit.input/Visualizers/README.txt
@@ -5,9 +5,7 @@ requires some additional packages.
MRTK3 does not take a hard dependency on these packages, but they are required to load these kind of models.
To add these packages to your project. go to
- Window -> Package Manager -> '+ icon' -> Add package from git url
+ Window -> Package Manager -> '+ icon' -> Add package by name...
-glTFast : https://github.com/atteneder/glTFast.git#v4.8.3
-KTX: https://github.com/atteneder/KtxUnity.git#v2.1.2
-
-We anticipate both of these packages to be available within Unity by default in the future, after which we will add the dependency to the MRTK3 Input Package.
\ No newline at end of file
+glTFast: com.unity.cloud.gltfast
+KTX: com.unity.cloud.ktx
diff --git a/org.mixedrealitytoolkit.input/package.json b/org.mixedrealitytoolkit.input/package.json
index 2b595e8bb..e5e1dbb3b 100644
--- a/org.mixedrealitytoolkit.input/package.json
+++ b/org.mixedrealitytoolkit.input/package.json
@@ -1,6 +1,6 @@
{
"name": "org.mixedrealitytoolkit.input",
- "version": "3.2.2-development",
+ "version": "3.3.0-development",
"description": "This package extends the XR Interaction Toolkit with custom interactors and controllers, hand-joint aggregation, and simulation subsystems. It seamlessly integrates with the Unity Input System.",
"displayName": "MRTK Input",
"msftFeatureCategory": "MRTK3",