From 6148b8452118cd1824f67a0dce681ca6ccf62c58 Mon Sep 17 00:00:00 2001 From: Kurtis Date: Tue, 21 Nov 2023 12:03:38 -0800 Subject: [PATCH 01/16] Account for new package name in asmdef --- org.mixedrealitytoolkit.input/MRTK.Input.asmdef | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/org.mixedrealitytoolkit.input/MRTK.Input.asmdef b/org.mixedrealitytoolkit.input/MRTK.Input.asmdef index e4457d9db..d51ccff49 100644 --- a/org.mixedrealitytoolkit.input/MRTK.Input.asmdef +++ b/org.mixedrealitytoolkit.input/MRTK.Input.asmdef @@ -29,6 +29,11 @@ "expression": "1.5", "define": "MROPENXR_ANIM_PRESENT" }, + { + "name": "com.unity.cloud.gltfast", + "expression": "", + "define": "GLTFAST_PRESENT" + }, { "name": "com.atteneder.gltfast", "expression": "", From 3fd88bfff69c32aa605bd8624857a6f9f9b068eb Mon Sep 17 00:00:00 2001 From: Kurtis Date: Tue, 21 Nov 2023 12:08:23 -0800 Subject: [PATCH 02/16] Update to use the glTFast version in the Unity registry --- .../MRTKDevTemplate/Packages/manifest.json | 30 +++++++++---------- .../Packages/packages-lock.json | 29 +++++++++--------- 2 files changed, 29 insertions(+), 30 deletions(-) diff --git a/UnityProjects/MRTKDevTemplate/Packages/manifest.json b/UnityProjects/MRTKDevTemplate/Packages/manifest.json index 7dded48d4..504944bee 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.0.1", "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..a1b8c64d4 100644 --- a/UnityProjects/MRTKDevTemplate/Packages/packages-lock.json +++ b/UnityProjects/MRTKDevTemplate/Packages/packages-lock.json @@ -1,18 +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, @@ -69,7 +56,7 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.6.6", + "version": "1.8.4", "depth": 1, "source": "registry", "dependencies": { @@ -77,6 +64,18 @@ }, "url": "https://packages.unity.com" }, + "com.unity.cloud.gltfast": { + "version": "6.0.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.mathematics": "1.3.1", + "com.unity.burst": "1.8.4" + }, + "url": "https://packages.unity.com" + }, "com.unity.collab-proxy": { "version": "2.0.1", "depth": 0, @@ -126,7 +125,7 @@ "url": "https://packages.unity.com" }, "com.unity.mathematics": { - "version": "1.2.6", + "version": "1.3.1", "depth": 1, "source": "registry", "dependencies": {}, From de32871fd7df2194772390fa6efac24e1d26fd63 Mon Sep 17 00:00:00 2001 From: Kurtis Date: Tue, 21 Nov 2023 12:28:03 -0800 Subject: [PATCH 03/16] Update MRTK.Input.Editor.asmdef --- .../Editor/MRTK.Input.Editor.asmdef | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/org.mixedrealitytoolkit.input/Editor/MRTK.Input.Editor.asmdef b/org.mixedrealitytoolkit.input/Editor/MRTK.Input.Editor.asmdef index e92fa034b..1f27e277e 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,6 +21,11 @@ "autoReferenced": true, "defineConstraints": [], "versionDefines": [ + { + "name": "com.unity.cloud.gltfast", + "expression": "", + "define": "GLTFAST_PRESENT" + }, { "name": "com.atteneder.gltfast", "expression": "", From 626df196814ef2512ca6cc55690591a345fc8e34 Mon Sep 17 00:00:00 2001 From: Risto Rangel Kuoppa Date: Fri, 2 Feb 2024 15:57:51 -0800 Subject: [PATCH 04/16] Attending PR feedback --- UnityProjects/MRTKDevTemplate/Packages/manifest.json | 2 +- cgmanifest.json | 10 ---------- .../Editor/InputValidation.cs | 2 +- .../Editor/MRTK.Input.Editor.asmdef | 10 ---------- org.mixedrealitytoolkit.input/MRTK.Input.asmdef | 10 ---------- org.mixedrealitytoolkit.input/Visualizers/README.txt | 12 +++++++----- 6 files changed, 9 insertions(+), 37 deletions(-) diff --git a/UnityProjects/MRTKDevTemplate/Packages/manifest.json b/UnityProjects/MRTKDevTemplate/Packages/manifest.json index 504944bee..24556911f 100644 --- a/UnityProjects/MRTKDevTemplate/Packages/manifest.json +++ b/UnityProjects/MRTKDevTemplate/Packages/manifest.json @@ -7,7 +7,7 @@ "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", "com.unity.asset-store-validation": "0.5.1", - "com.unity.cloud.gltfast": "6.0.1", + "com.unity.cloud.gltfast": "6.2.0", "com.unity.collab-proxy": "2.0.1", "com.unity.ide.rider": "3.0.18", "com.unity.ide.visualstudio": "2.0.17", 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/Editor/InputValidation.cs b/org.mixedrealitytoolkit.input/Editor/InputValidation.cs index d4d71110c..d0b6ce616 100644 --- a/org.mixedrealitytoolkit.input/Editor/InputValidation.cs +++ b/org.mixedrealitytoolkit.input/Editor/InputValidation.cs @@ -74,7 +74,7 @@ private static BuildValidationRule GenerateGLTFastRule() return false; #endif }, - FixIt = () => Application.OpenURL("https://github.com/atteneder/glTFast"), + FixIt = () => Application.OpenURL("https://github.com/Unity-Technologies/com.unity.cloud.gltfast.git"), FixItMessage = "Open the GitHub repo for glTFast. Please refer to the installing section for instructions.", FixItAutomatic = false, Error = false diff --git a/org.mixedrealitytoolkit.input/Editor/MRTK.Input.Editor.asmdef b/org.mixedrealitytoolkit.input/Editor/MRTK.Input.Editor.asmdef index 1f27e277e..8c58ddcb1 100644 --- a/org.mixedrealitytoolkit.input/Editor/MRTK.Input.Editor.asmdef +++ b/org.mixedrealitytoolkit.input/Editor/MRTK.Input.Editor.asmdef @@ -26,16 +26,6 @@ "expression": "", "define": "GLTFAST_PRESENT" }, - { - "name": "com.atteneder.gltfast", - "expression": "", - "define": "GLTFAST_PRESENT" - }, - { - "name": "com.atteneder.ktx", - "expression": "", - "define": "KTX_PRESENT" - }, { "name": "com.unity.xr.management", "expression": "4.2", diff --git a/org.mixedrealitytoolkit.input/MRTK.Input.asmdef b/org.mixedrealitytoolkit.input/MRTK.Input.asmdef index d51ccff49..740e5171a 100644 --- a/org.mixedrealitytoolkit.input/MRTK.Input.asmdef +++ b/org.mixedrealitytoolkit.input/MRTK.Input.asmdef @@ -34,16 +34,6 @@ "expression": "", "define": "GLTFAST_PRESENT" }, - { - "name": "com.atteneder.gltfast", - "expression": "", - "define": "GLTFAST_PRESENT" - }, - { - "name": "com.atteneder.ktx", - "expression": "", - "define": "KTX_PRESENT" - }, { "name": "com.unity.xr.management", "expression": "4.2", diff --git a/org.mixedrealitytoolkit.input/Visualizers/README.txt b/org.mixedrealitytoolkit.input/Visualizers/README.txt index 74e2ae942..c3fb62c57 100644 --- a/org.mixedrealitytoolkit.input/Visualizers/README.txt +++ b/org.mixedrealitytoolkit.input/Visualizers/README.txt @@ -4,10 +4,12 @@ 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 +To add glTFast package to your project, go to + Window -> Package Manager -> '+ icon' -> Add package by name... + Use: com.unity.cloud.gltfast -glTFast : https://github.com/atteneder/glTFast.git#v4.8.3 -KTX: https://github.com/atteneder/KtxUnity.git#v2.1.2 +To add KTX package to your project. go to + Window -> Package Manager -> '+ icon' -> Add package from git url + Use: 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 +We anticipate KTX package 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 From adb3c67ab82916cf1b17cf537bd26f7d3674a505 Mon Sep 17 00:00:00 2001 From: Risto Rangel Kuoppa Date: Tue, 6 Feb 2024 09:35:25 -0800 Subject: [PATCH 05/16] Attending PR feedback Update manifest.json --- .../Editor/MRTK.Input.Editor.asmdef | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/org.mixedrealitytoolkit.input/Editor/MRTK.Input.Editor.asmdef b/org.mixedrealitytoolkit.input/Editor/MRTK.Input.Editor.asmdef index 8c58ddcb1..1f27e277e 100644 --- a/org.mixedrealitytoolkit.input/Editor/MRTK.Input.Editor.asmdef +++ b/org.mixedrealitytoolkit.input/Editor/MRTK.Input.Editor.asmdef @@ -26,6 +26,16 @@ "expression": "", "define": "GLTFAST_PRESENT" }, + { + "name": "com.atteneder.gltfast", + "expression": "", + "define": "GLTFAST_PRESENT" + }, + { + "name": "com.atteneder.ktx", + "expression": "", + "define": "KTX_PRESENT" + }, { "name": "com.unity.xr.management", "expression": "4.2", From dc31f3b7172a392f3fee82cac35b607fa3d9bbbb Mon Sep 17 00:00:00 2001 From: Kurtis Date: Thu, 9 Jan 2025 14:43:19 -0800 Subject: [PATCH 06/16] Update to com.unity.cloud.ktx --- .../MRTKDevTemplate/Packages/manifest.json | 2 +- .../Packages/packages-lock.json | 56 +++++++++---------- .../Visualizers/README.txt | 11 +--- 3 files changed, 32 insertions(+), 37 deletions(-) diff --git a/UnityProjects/MRTKDevTemplate/Packages/manifest.json b/UnityProjects/MRTKDevTemplate/Packages/manifest.json index 24556911f..14eab0094 100644 --- a/UnityProjects/MRTKDevTemplate/Packages/manifest.json +++ b/UnityProjects/MRTKDevTemplate/Packages/manifest.json @@ -1,6 +1,5 @@ { "dependencies": { - "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", @@ -8,6 +7,7 @@ "com.microsoft.spatialaudio.spatializer.unity": "file:../../../ExternalDependencies/com.microsoft.spatialaudio.spatializer.unity-2.0.55.tgz", "com.unity.asset-store-validation": "0.5.1", "com.unity.cloud.gltfast": "6.2.0", + "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", diff --git a/UnityProjects/MRTKDevTemplate/Packages/packages-lock.json b/UnityProjects/MRTKDevTemplate/Packages/packages-lock.json index a1b8c64d4..a616e9678 100644 --- a/UnityProjects/MRTKDevTemplate/Packages/packages-lock.json +++ b/UnityProjects/MRTKDevTemplate/Packages/packages-lock.json @@ -1,14 +1,5 @@ { "dependencies": { - "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, @@ -65,14 +56,23 @@ "url": "https://packages.unity.com" }, "com.unity.cloud.gltfast": { - "version": "6.0.1", + "version": "6.2.0", "depth": 0, "source": "registry", "dependencies": { - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.burst": "1.8.4", "com.unity.mathematics": "1.3.1", - "com.unity.burst": "1.8.4" + "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" }, @@ -186,9 +186,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" @@ -207,9 +207,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" }, @@ -220,13 +220,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" }, @@ -246,8 +246,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" }, @@ -258,14 +258,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" }, @@ -284,11 +284,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" }, @@ -297,9 +297,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/org.mixedrealitytoolkit.input/Visualizers/README.txt b/org.mixedrealitytoolkit.input/Visualizers/README.txt index c3fb62c57..ea5f16994 100644 --- a/org.mixedrealitytoolkit.input/Visualizers/README.txt +++ b/org.mixedrealitytoolkit.input/Visualizers/README.txt @@ -4,12 +4,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 glTFast package to your project, go to +To add these packages to your project. go to Window -> Package Manager -> '+ icon' -> Add package by name... - Use: com.unity.cloud.gltfast - -To add KTX package to your project. go to - Window -> Package Manager -> '+ icon' -> Add package from git url - Use: https://github.com/atteneder/KtxUnity.git#v2.1.2 - -We anticipate KTX package 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 From 60eca519f2a727a660d63e2c51972a516bbc5e31 Mon Sep 17 00:00:00 2001 From: Kurtis Date: Thu, 9 Jan 2025 14:53:56 -0800 Subject: [PATCH 07/16] Update README.txt --- org.mixedrealitytoolkit.input/Visualizers/README.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/org.mixedrealitytoolkit.input/Visualizers/README.txt b/org.mixedrealitytoolkit.input/Visualizers/README.txt index ea5f16994..cebad0a0f 100644 --- a/org.mixedrealitytoolkit.input/Visualizers/README.txt +++ b/org.mixedrealitytoolkit.input/Visualizers/README.txt @@ -6,5 +6,6 @@ MRTK3 does not take a hard dependency on these packages, but they are required t To add these packages to your project. go to Window -> Package Manager -> '+ icon' -> Add package by name... - glTFast: com.unity.cloud.gltfast - KTX: com.unity.cloud.ktx + +glTFast: com.unity.cloud.gltfast +KTX: com.unity.cloud.ktx From 1dddb075d8f1f59991ee3209f6618e8e8b33aac7 Mon Sep 17 00:00:00 2001 From: Kurtis Date: Thu, 9 Jan 2025 15:01:36 -0800 Subject: [PATCH 08/16] Updating assembly definitions --- .../Editor/MRTK.Input.Editor.asmdef | 5 ----- org.mixedrealitytoolkit.input/MRTK.Input.asmdef | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/org.mixedrealitytoolkit.input/Editor/MRTK.Input.Editor.asmdef b/org.mixedrealitytoolkit.input/Editor/MRTK.Input.Editor.asmdef index 1f27e277e..10afac27e 100644 --- a/org.mixedrealitytoolkit.input/Editor/MRTK.Input.Editor.asmdef +++ b/org.mixedrealitytoolkit.input/Editor/MRTK.Input.Editor.asmdef @@ -31,11 +31,6 @@ "expression": "", "define": "GLTFAST_PRESENT" }, - { - "name": "com.atteneder.ktx", - "expression": "", - "define": "KTX_PRESENT" - }, { "name": "com.unity.xr.management", "expression": "4.2", diff --git a/org.mixedrealitytoolkit.input/MRTK.Input.asmdef b/org.mixedrealitytoolkit.input/MRTK.Input.asmdef index 740e5171a..022475a5a 100644 --- a/org.mixedrealitytoolkit.input/MRTK.Input.asmdef +++ b/org.mixedrealitytoolkit.input/MRTK.Input.asmdef @@ -34,6 +34,11 @@ "expression": "", "define": "GLTFAST_PRESENT" }, + { + "name": "com.atteneder.gltfast", + "expression": "", + "define": "GLTFAST_PRESENT" + }, { "name": "com.unity.xr.management", "expression": "4.2", From 9715bf17a691b01e12d461568bfb6d8295ebc9e7 Mon Sep 17 00:00:00 2001 From: Kurtis Date: Thu, 9 Jan 2025 15:16:20 -0800 Subject: [PATCH 09/16] Auto-add packages when fixing --- .../Editor/InputValidation.cs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/org.mixedrealitytoolkit.input/Editor/InputValidation.cs b/org.mixedrealitytoolkit.input/Editor/InputValidation.cs index d0b6ce616..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/Unity-Technologies/com.unity.cloud.gltfast.git"), - 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 }; } From 6d16fff7d9a5bc651fee57db7c946a172aeb321d Mon Sep 17 00:00:00 2001 From: Kurtis Date: Thu, 9 Jan 2025 15:16:42 -0800 Subject: [PATCH 10/16] Update glTFast --- .../MRTKDevTemplate/Packages/manifest.json | 2 +- .../MRTKDevTemplate/Packages/packages-lock.json | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/UnityProjects/MRTKDevTemplate/Packages/manifest.json b/UnityProjects/MRTKDevTemplate/Packages/manifest.json index 14eab0094..c603c6d80 100644 --- a/UnityProjects/MRTKDevTemplate/Packages/manifest.json +++ b/UnityProjects/MRTKDevTemplate/Packages/manifest.json @@ -6,7 +6,7 @@ "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", "com.unity.asset-store-validation": "0.5.1", - "com.unity.cloud.gltfast": "6.2.0", + "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", diff --git a/UnityProjects/MRTKDevTemplate/Packages/packages-lock.json b/UnityProjects/MRTKDevTemplate/Packages/packages-lock.json index a616e9678..ea7e5f1ec 100644 --- a/UnityProjects/MRTKDevTemplate/Packages/packages-lock.json +++ b/UnityProjects/MRTKDevTemplate/Packages/packages-lock.json @@ -56,12 +56,13 @@ "url": "https://packages.unity.com" }, "com.unity.cloud.gltfast": { - "version": "6.2.0", + "version": "6.10.1", "depth": 0, "source": "registry", "dependencies": { "com.unity.burst": "1.8.4", - "com.unity.mathematics": "1.3.1", + "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" }, @@ -83,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, @@ -125,7 +136,7 @@ "url": "https://packages.unity.com" }, "com.unity.mathematics": { - "version": "1.3.1", + "version": "1.2.6", "depth": 1, "source": "registry", "dependencies": {}, From f60229d55b7bdd9a0436a3f4065231dced832f77 Mon Sep 17 00:00:00 2001 From: Kurtis Date: Thu, 9 Jan 2025 15:20:12 -0800 Subject: [PATCH 11/16] Update usage of KTX_PRESENT Update ControllerModelLoader.cs Update ControllerModelLoader.cs --- .../Editor/MRTK.Input.Editor.asmdef | 10 ++++++++++ .../ControllerVisualizer/ControllerModelLoader.cs | 14 +++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/org.mixedrealitytoolkit.input/Editor/MRTK.Input.Editor.asmdef b/org.mixedrealitytoolkit.input/Editor/MRTK.Input.Editor.asmdef index 10afac27e..bf7c6ed7d 100644 --- a/org.mixedrealitytoolkit.input/Editor/MRTK.Input.Editor.asmdef +++ b/org.mixedrealitytoolkit.input/Editor/MRTK.Input.Editor.asmdef @@ -31,6 +31,16 @@ "expression": "", "define": "GLTFAST_PRESENT" }, + { + "name": "com.unity.cloud.ktx", + "expression": "", + "define": "KTX_PRESENT" + }, + { + "name": "com.atteneder.ktx", + "expression": "", + "define": "KTX_PRESENT" + }, { "name": "com.unity.xr.management", "expression": "4.2", diff --git a/org.mixedrealitytoolkit.input/Visualizers/ControllerVisualizer/ControllerModelLoader.cs b/org.mixedrealitytoolkit.input/Visualizers/ControllerVisualizer/ControllerModelLoader.cs index ed03b2456..f7eced207 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,7 +102,7 @@ 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()); @@ -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; } From 6c5a793befb79c6806b7d2c2c9d8af84502fc64e Mon Sep 17 00:00:00 2001 From: Kurtis Date: Thu, 9 Jan 2025 15:55:28 -0800 Subject: [PATCH 12/16] Update ControllerModelLoader.cs --- .../Visualizers/ControllerVisualizer/ControllerModelLoader.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.mixedrealitytoolkit.input/Visualizers/ControllerVisualizer/ControllerModelLoader.cs b/org.mixedrealitytoolkit.input/Visualizers/ControllerVisualizer/ControllerModelLoader.cs index f7eced207..8786a502c 100644 --- a/org.mixedrealitytoolkit.input/Visualizers/ControllerVisualizer/ControllerModelLoader.cs +++ b/org.mixedrealitytoolkit.input/Visualizers/ControllerVisualizer/ControllerModelLoader.cs @@ -106,7 +106,7 @@ public async static Task TryGenerateControllerModelFromPlatformSDK(I 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) From 47b23dc6bfd69add32d919e49f2dbe54e69ffda0 Mon Sep 17 00:00:00 2001 From: Kurtis Date: Thu, 9 Jan 2025 16:05:02 -0800 Subject: [PATCH 13/16] Enable Motion Controller Model feature for samples --- .../Assets/XR/Settings/OpenXR Package Settings.asset | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 From 49ea0d99428892f1bd3450b44b41a585bbc611c2 Mon Sep 17 00:00:00 2001 From: Kurtis Date: Thu, 9 Jan 2025 16:26:14 -0800 Subject: [PATCH 14/16] Update CHANGELOG.md --- org.mixedrealitytoolkit.input/CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/org.mixedrealitytoolkit.input/CHANGELOG.md b/org.mixedrealitytoolkit.input/CHANGELOG.md index b548dd814..e73654138 100644 --- a/org.mixedrealitytoolkit.input/CHANGELOG.md +++ b/org.mixedrealitytoolkit.input/CHANGELOG.md @@ -2,6 +2,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). +## [3.3.0-development] - 2025-01-09 + +### Added + +* Added support for Unity's com.unity.cloud.gltfast and com.unity.cloud.ktx packages when loading controller models. + ## [3.2.2-development] - 2024-06-24 ### Fixed From ac8acdee17d1e57771ce6d04233dabf5301a409a Mon Sep 17 00:00:00 2001 From: Kurtis Date: Thu, 9 Jan 2025 16:29:01 -0800 Subject: [PATCH 15/16] Update package.json --- org.mixedrealitytoolkit.input/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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", From 95eaa95cc2336453c7b6cff7daad35fc1864a854 Mon Sep 17 00:00:00 2001 From: Kurtis Date: Mon, 13 Jan 2025 16:27:59 -0800 Subject: [PATCH 16/16] Update CHANGELOG.md --- org.mixedrealitytoolkit.input/CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/org.mixedrealitytoolkit.input/CHANGELOG.md b/org.mixedrealitytoolkit.input/CHANGELOG.md index e73654138..25372b740 100644 --- a/org.mixedrealitytoolkit.input/CHANGELOG.md +++ b/org.mixedrealitytoolkit.input/CHANGELOG.md @@ -2,20 +2,20 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). -## [3.3.0-development] - 2025-01-09 +## Unreleased ### Added * Added support for Unity's com.unity.cloud.gltfast and com.unity.cloud.ktx packages when loading controller models. -## [3.2.2-development] - 2024-06-24 +## [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 @@ -24,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