diff --git a/README.md b/README.md index 074afc62b..90b713165 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ ### Long Term Support -* Minimum requirements: OpenXR, Unity 2022.3 LTS, Unity’s XR Interaction Toolkit 3.0. +* Minimum requirements: OpenXR, Unity 6.0 LTS, Unity’s XR Interaction Toolkit 3.0. ## Packages diff --git a/UnityProjects/.gitignore b/UnityProjects/.gitignore deleted file mode 100644 index 77f4616c9..000000000 --- a/UnityProjects/.gitignore +++ /dev/null @@ -1,90 +0,0 @@ -# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore -# -[Ll]ibrary/ -[Tt]emp/ -[Oo]bj/ -[Bb]uild/ -[Bb]uilds/ -[Ll]ogs/ -[Uu]ser[Ss]ettings/ -[Aa]pp/ -[Aa]pk/ -[Aa]ndroid[Ss]tudio/ - -# MemoryCaptures can get excessive in size. -# They also could contain extremely sensitive data -[Mm]emoryCaptures/ - -# Asset meta data should only be ignored when the corresponding asset is also ignored -!*/[Aa]ssets/**/*.meta - -# Uncomment this line if you wish to ignore the asset store tools plugin -# /[Aa]ssets/AssetStoreTools* - -# Autogenerated Jetbrains Rider plugin -*/[Aa]ssets/Plugins/Editor/JetBrains* - -# Visual Studio cache directory -.vs/ - -# Jetbrains cache directory -.idea/ - -# Visual Studio Code cache directory -.vscode/ - -# Gradle cache directory -.gradle/ - -# Autogenerated VS/MD/Consulo solution and project files -ExportedObj/ -.consulo/ -*.csproj -*.unityproj -*.sln -*.suo -*.tmp -*.user -*.userprefs -*.pidb -*.booproj -*.svd -*.pdb -*.mdb -*.opendb -*.VC.db - -# Unity3D generated meta files -*.pidb.meta -*.pdb.meta -*.mdb.meta - -# Unity3D generated file on crash reports -sysinfo.txt - -# Unity3D Test Runner generated files -*/[Aa]ssets/InitTestScene*.unity -*/[Aa]ssets/InitTestScene*.unity.meta - -# Builds -*.apk -*.aab -*.unitypackage - -# Crashlytics generated file -crashlytics-build.properties - -# Packed Addressables -*/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin* - -# Temporary auto-generated Android Assets -*/[Aa]ssets/[Ss]treamingAssets/aa.meta -*/[Aa]ssets/[Ss]treamingAssets/aa/* - -# Project Specific List -*/[Aa]ssets/[Bb]uild[Rr]eports* -*/[Aa]ssets/[Oo]culus* -*/[Aa]ssets/[Ss]amples* -*/[Aa]ssets/TextMesh Pro* -*.pfx -*.pfx.meta diff --git a/UnityProjects/MRTKDevTemplate/.gitignore b/UnityProjects/MRTKDevTemplate/.gitignore new file mode 100644 index 000000000..4b3960c8c --- /dev/null +++ b/UnityProjects/MRTKDevTemplate/.gitignore @@ -0,0 +1,108 @@ +# This .gitignore file should be placed at the root of your Unity project directory +# +# Get latest from https://github.com/github/gitignore/blob/main/Unity.gitignore +# +.utmp/ +/[Ll]ibrary/ +/[Tt]emp/ +/[Oo]bj/ +/[Bb]uild/ +/[Bb]uilds/ +/[Ll]ogs/ +/[Uu]ser[Ss]ettings/ +*.log + +# By default unity supports Blender asset imports, *.blend1 blender files do not need to be commited to version control. +*.blend1 +*.blend1.meta + +# MemoryCaptures can get excessive in size. +# They also could contain extremely sensitive data +/[Mm]emoryCaptures/ + +# Recordings can get excessive in size +/[Rr]ecordings/ + +# Uncomment this line if you wish to ignore the asset store tools plugin +# /[Aa]ssets/AssetStoreTools* + +# Autogenerated Jetbrains Rider plugin +/[Aa]ssets/Plugins/Editor/JetBrains* +# Jetbrains Rider personal-layer settings +*.DotSettings.user + +# Visual Studio cache directory +.vs/ + +# Gradle cache directory +.gradle/ + +# Autogenerated VS/MD/Consulo solution and project files +ExportedObj/ +.consulo/ +*.csproj +*.unityproj +*.sln +*.slnx +*.suo +*.tmp +*.user +*.userprefs +*.pidb +*.booproj +*.svd +*.pdb +*.mdb +*.opendb +*.VC.db + +# Unity3D generated meta files +*.pidb.meta +*.pdb.meta +*.mdb.meta + +# Unity3D generated file on crash reports +sysinfo.txt + +# Mono auto generated files +mono_crash.* + +# Builds +*.apk +*.aab +*.unitypackage +*.unitypackage.meta +*.app + +# Crashlytics generated file +crashlytics-build.properties + +# TestRunner generated files +InitTestScene*.unity* + +# Addressables default ignores, before user customizations +/ServerData +/[Aa]ssets/StreamingAssets/aa* +/[Aa]ssets/AddressableAssetsData/link.xml* +/[Aa]ssets/Addressables_Temp* +# By default, Addressables content builds will generate addressables_content_state.bin +# files in platform-specific subfolders, for example: +# /Assets/AddressableAssetsData/OSX/addressables_content_state.bin +/[Aa]ssets/AddressableAssetsData/*/*.bin* + +# Visual Scripting auto-generated files +/[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db +/[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db.meta +/[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Core/Property Providers +/[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Core/Property Providers.meta + +# Auto-generated scenes by play mode tests +/[Aa]ssets/[Ii]nit[Tt]est[Ss]cene*.unity* + +# Project Specific List +/[Aa]ssets/[Bb]uild[Rr]eports* +/[Aa]ssets/[Oo]culus* +/[Aa]ssets/[Ss]amples* +/[Aa]ssets/TextMesh Pro* +*.pfx +*.pfx.meta diff --git a/UnityProjects/MRTKDevTemplate/Assets/BuildAssets/BuildApp.cs b/UnityProjects/MRTKDevTemplate/Assets/BuildAssets/BuildApp.cs index 976cde345..a5f04aa88 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/BuildAssets/BuildApp.cs +++ b/UnityProjects/MRTKDevTemplate/Assets/BuildAssets/BuildApp.cs @@ -251,12 +251,10 @@ private static void PatchHands(bool addDebug) visualizer.JointMaterial = AssetDatabase.LoadAssetAtPath(AssetDatabase.GUIDToAssetPath(HandJointMaterialGuid)); visualizer.JointMesh = Resources.GetBuiltinResource("Cube.fbx"); } -#if UNITY_6000_0_OR_NEWER else { PrefabUtility.RemoveUnusedOverrides(new[] { leftHandVisualizer }, UnityEditor.InteractionMode.UserAction); } -#endif PrefabUtility.SaveAsPrefabAsset(leftHandVisualizer, leftHandPath); } PrefabUtility.UnloadPrefabContents(leftHandVisualizer); diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scripts/Editor/AndroidXRConfig.cs b/UnityProjects/MRTKDevTemplate/Assets/Scripts/Editor/AndroidXRConfig.cs index 75e222a44..885535db5 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scripts/Editor/AndroidXRConfig.cs +++ b/UnityProjects/MRTKDevTemplate/Assets/Scripts/Editor/AndroidXRConfig.cs @@ -1,18 +1,15 @@ // Copyright (c) Mixed Reality Toolkit Contributors // Licensed under the BSD 3-Clause -#if UNITY_6000_0_OR_NEWER using UnityEditor; using UnityEditor.PackageManager; using UnityEditor.PackageManager.Requests; using UnityEngine; -#endif namespace MixedReality.Toolkit.Examples.Demos.Editor { internal class AndroidXRConfig { -#if UNITY_6000_0_OR_NEWER private static AddAndRemoveRequest request; [MenuItem("Mixed Reality/MRTK3/Examples/Configure for Android XR...", priority = int.MaxValue)] @@ -38,6 +35,5 @@ private static void Progress() request = null; } } -#endif } } diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scripts/EyeTracking/TargetPositioning/MoveObjectByEyeGaze.cs b/UnityProjects/MRTKDevTemplate/Assets/Scripts/EyeTracking/TargetPositioning/MoveObjectByEyeGaze.cs index e319669c1..8054b6b29 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scripts/EyeTracking/TargetPositioning/MoveObjectByEyeGaze.cs +++ b/UnityProjects/MRTKDevTemplate/Assets/Scripts/EyeTracking/TargetPositioning/MoveObjectByEyeGaze.cs @@ -112,7 +112,7 @@ public class MoveObjectByEyeGaze : StatefulInteractable /// Limits the Z position of the GameObject to the specified minimum and maximum. /// public Vector2 LocalMinMaxZ = new Vector2(float.NegativeInfinity, float.PositiveInfinity); - + [Tooltip("Fired when the GameObject is dropped.")] [SerializeField] private UnityEvent onDrop = null; @@ -123,7 +123,7 @@ public class MoveObjectByEyeGaze : StatefulInteractable private bool onlyEyeWarpOnRelease = - true; // Only warp the currently grabbed target to the current look at location once the user releases the pinch gesture. + true; // Only warp the currently grabbed target to the current look at location once the user releases the pinch gesture. private float originalTransparency = -1f; private bool originalUseGravity = false; @@ -366,13 +366,13 @@ private bool IsLookingAwayFromTarget() // Check whether the user is still looking within the proximity of the target float distanceBetweenTargetAndCurrHitPos = Angle_ToCurrHitTarget(gameObject); - // **Note for potential improvement**: It would be better to make this dependent on the target's boundary + // **Note for potential improvement**: It would be better to make this dependent on the target's boundary // instead of its center. The way it is implemented right now may cause problems for large-scale targets. return distanceBetweenTargetAndCurrHitPos > minLookAwayDistToEnableEyeWarp; } /// - /// Determine whether the user is looking away from the preview. + /// Determine whether the user is looking away from the preview. /// private bool IsLookingAwayFromPreview() { @@ -405,7 +405,7 @@ private bool IsLookingAwayFromPreview() /// /// Check if the destination is plausible. For example, this means if the target is placeable - /// on horizontal surfaces then only show a preview for (more or less) horizontal surfaces. + /// on horizontal surfaces then only show a preview for (more or less) horizontal surfaces. /// /// True if the target can be placed on this surface. private bool IsDestinationPlausible() @@ -490,13 +490,8 @@ private void DragAndDrop_Start() originalUseGravity = rigidbody.useGravity; rigidbody.useGravity = false; -#if UNITY_6000_0_OR_NEWER originalDrag = rigidbody.linearDamping; rigidbody.linearDamping = float.PositiveInfinity; -#else - originalDrag = rigidbody.drag; - rigidbody.drag = float.PositiveInfinity; -#endif } } } @@ -525,11 +520,7 @@ private void DragAndDrop_Finish() if (TryGetComponent(out var rigidbody)) { rigidbody.useGravity = originalUseGravity; -#if UNITY_6000_0_OR_NEWER rigidbody.linearDamping = originalDrag; -#else - rigidbody.drag = originalDrag; -#endif } onDrop.Invoke(); diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scripts/TetheredPlacement.cs b/UnityProjects/MRTKDevTemplate/Assets/Scripts/TetheredPlacement.cs index 6248a06c3..72299c3dc 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scripts/TetheredPlacement.cs +++ b/UnityProjects/MRTKDevTemplate/Assets/Scripts/TetheredPlacement.cs @@ -10,7 +10,7 @@ namespace MixedReality.Toolkit.Examples.Demos { /// - /// Helper script to re-spawn objects if they go too far from their original position. + /// Helper script to re-spawn objects if they go too far from their original position. /// /// /// The helper is useful for objects that will fall forever. @@ -28,7 +28,7 @@ internal class TetheredPlacement : MonoBehaviour /// /// A Unity event function that is called on the frame when a script is enabled just before any of the update methods are called the first time. - /// + /// private void Start() { rigidBody = GetComponent(); @@ -49,11 +49,7 @@ private void LateUpdate() // Reset any velocity from falling or moving when re-spawning to original location if (rigidBody != null) { -#if UNITY_6000_0_OR_NEWER rigidBody.linearVelocity = Vector3.zero; -#else - rigidBody.velocity = Vector3.zero; -#endif rigidBody.angularVelocity = Vector3.zero; } @@ -63,4 +59,4 @@ private void LateUpdate() } } } -#pragma warning restore CS1591 \ No newline at end of file +#pragma warning restore CS1591 diff --git a/UnityProjects/MRTKDevTemplate/Assets/XR/Settings/OpenXR Package Settings.asset b/UnityProjects/MRTKDevTemplate/Assets/XR/Settings/OpenXR Package Settings.asset index 4ff94ddae..007f71718 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/XR/Settings/OpenXR Package Settings.asset +++ b/UnityProjects/MRTKDevTemplate/Assets/XR/Settings/OpenXR Package Settings.asset @@ -19,7 +19,9 @@ MonoBehaviour: openxrExtensionStrings: company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: cacheSize: 1048576 perThreadCacheSize: 51200 --- !u!114 &-9152424651521319720 @@ -41,7 +43,9 @@ MonoBehaviour: openxrExtensionStrings: XR_MSFT_holographic_remoting XR_MSFT_holographic_remoting_speech company: Microsoft priority: -100 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &-9152332730062532000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -61,7 +65,9 @@ MonoBehaviour: openxrExtensionStrings: company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &-8319177357708938816 MonoBehaviour: m_ObjectHideFlags: 0 @@ -81,7 +87,9 @@ MonoBehaviour: openxrExtensionStrings: XR_EXT_eye_gaze_interaction company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &-8283577154714071237 MonoBehaviour: m_ObjectHideFlags: 0 @@ -101,7 +109,9 @@ MonoBehaviour: openxrExtensionStrings: company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &-8186726044552108751 MonoBehaviour: m_ObjectHideFlags: 0 @@ -121,7 +131,9 @@ MonoBehaviour: openxrExtensionStrings: XR_KHR_binding_modification XR_EXT_dpad_binding company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: forceThresholdLeft: 0.5 forceThresholdReleaseLeft: 0.4 centerRegionLeft: 0.5 @@ -154,7 +166,9 @@ MonoBehaviour: openxrExtensionStrings: XR_OCULUS_android_initialize_loader company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: targetQuest: 1 targetQuest2: 1 --- !u!114 &-7229825001273466666 @@ -176,7 +190,9 @@ MonoBehaviour: openxrExtensionStrings: XR_MSFT_hand_interaction company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &-7042059687803235483 MonoBehaviour: m_ObjectHideFlags: 0 @@ -196,7 +212,9 @@ MonoBehaviour: openxrExtensionStrings: XR_MSFT_hand_interaction company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &-6794257755403143708 MonoBehaviour: m_ObjectHideFlags: 0 @@ -217,7 +235,9 @@ MonoBehaviour: XR_MSFT_hand_tracking_mesh company: Microsoft priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: leftHandTrackingOptions: motionRange: 0 rightHandTrackingOptions: @@ -242,7 +262,9 @@ MonoBehaviour: openxrExtensionStrings: XR_MSFT_controller_model XR_FB_render_model company: Microsoft priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &-6174246449855855006 MonoBehaviour: m_ObjectHideFlags: 0 @@ -262,7 +284,9 @@ MonoBehaviour: openxrExtensionStrings: XR_EXT_eye_gaze_interaction company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &-5492763381520605560 MonoBehaviour: m_ObjectHideFlags: 0 @@ -286,7 +310,9 @@ MonoBehaviour: XR_MSFT_scene_marker XR_MSFT_spatial_anchor_export_preview XR_MSFT_composition_layer_reprojection company: Microsoft priority: 0 + targetOpenXRApiVersion: required: 1 + customRuntimeLoaderName: disableFirstPersonObserver: 0 enablePoseUpdateOnBeforeRender: 0 validationRuleTarget: 0 @@ -309,7 +335,9 @@ MonoBehaviour: openxrExtensionStrings: XR_KHR_binding_modification XR_EXT_dpad_binding company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: forceThresholdLeft: 0.5 forceThresholdReleaseLeft: 0.4 centerRegionLeft: 0.5 @@ -342,7 +370,9 @@ MonoBehaviour: openxrExtensionStrings: XR_EXT_palm_pose company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &-5414823066519608731 MonoBehaviour: m_ObjectHideFlags: 0 @@ -362,7 +392,9 @@ MonoBehaviour: openxrExtensionStrings: XR_FB_hand_tracking_aim company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &-5000202051992085229 MonoBehaviour: m_ObjectHideFlags: 0 @@ -382,7 +414,9 @@ MonoBehaviour: openxrExtensionStrings: company: Mixed Reality Toolkit Contributors priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &-4989097037534641705 MonoBehaviour: m_ObjectHideFlags: 0 @@ -399,11 +433,12 @@ MonoBehaviour: - {fileID: -676329725382200616} - {fileID: -8186726044552108751} - {fileID: -1144888657426385825} + - {fileID: -910622493186121033} - {fileID: 1500523782327561539} - {fileID: 169602148789327356} - {fileID: 5521749775559828029} - - {fileID: 2426265406813202181} - {fileID: -4689946533738870081} + - {fileID: 2426265406813202181} - {fileID: 5076197482031073275} - {fileID: -9152332730062532000} - {fileID: -5414823066519608731} @@ -423,7 +458,9 @@ MonoBehaviour: - {fileID: 1801456176265505245} - {fileID: 6710627333171298302} - {fileID: -9152424651521319720} + customLoaderName: m_renderMode: 1 + m_latencyOptimization: 0 m_autoColorSubmissionMode: 1 m_colorSubmissionModes: m_List: 00000000 @@ -431,6 +468,7 @@ MonoBehaviour: m_spacewarpMotionVectorTextureFormat: 0 m_optimizeBufferDiscards: 0 m_symmetricProjection: 0 + m_foveatedRenderingApi: 0 --- !u!114 &-4689946533738870081 MonoBehaviour: m_ObjectHideFlags: 0 @@ -450,7 +488,9 @@ MonoBehaviour: openxrExtensionStrings: XR_EXT_hp_mixed_reality_controller company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &-4614918767838866102 MonoBehaviour: m_ObjectHideFlags: 0 @@ -470,7 +510,34 @@ MonoBehaviour: openxrExtensionStrings: company: Mixed Reality Toolkit Contributors priority: 0 + targetOpenXRApiVersion: + required: 0 + customRuntimeLoaderName: +--- !u!114 &-4076602338449401114 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f6a75d1f5ff90154ea2a8e58222a1f59, type: 3} + m_Name: FoveatedRenderingFeature Android + m_EditorClassIdentifier: + m_enabled: 0 + nameUi: Foveated Rendering + version: 1 + featureIdInternal: com.unity.openxr.feature.foveatedrendering + openxrExtensionStrings: XR_UNITY_foveation XR_FB_foveation XR_FB_foveation_configuration + XR_FB_swapchain_update_state XR_FB_foveation_vulkan XR_META_foveation_eye_tracked + XR_META_vulkan_swapchain_create_info + company: Unity + priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: + enableSubsampledLayout: 0 --- !u!114 &-3765664599707111037 MonoBehaviour: m_ObjectHideFlags: 0 @@ -490,7 +557,9 @@ MonoBehaviour: openxrExtensionStrings: XR_EXT_hand_interaction company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &-3273436338079595365 MonoBehaviour: m_ObjectHideFlags: 0 @@ -510,7 +579,34 @@ MonoBehaviour: openxrExtensionStrings: company: Unity priority: 0 + targetOpenXRApiVersion: + required: 0 + customRuntimeLoaderName: +--- !u!114 &-2965066531462613033 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f6a75d1f5ff90154ea2a8e58222a1f59, type: 3} + m_Name: FoveatedRenderingFeature Metro + m_EditorClassIdentifier: + m_enabled: 0 + nameUi: Foveated Rendering + version: 1 + featureIdInternal: com.unity.openxr.feature.foveatedrendering + openxrExtensionStrings: XR_UNITY_foveation XR_FB_foveation XR_FB_foveation_configuration + XR_FB_swapchain_update_state XR_FB_foveation_vulkan XR_META_foveation_eye_tracked + XR_META_vulkan_swapchain_create_info + company: Unity + priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: + enableSubsampledLayout: 0 --- !u!114 &-2854879879689529201 MonoBehaviour: m_ObjectHideFlags: 0 @@ -530,7 +626,9 @@ MonoBehaviour: openxrExtensionStrings: XR_EXT_performance_settings company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &-2783824018031006640 MonoBehaviour: m_ObjectHideFlags: 0 @@ -550,7 +648,9 @@ MonoBehaviour: openxrExtensionStrings: XR_MSFT_controller_model XR_FB_render_model company: Microsoft priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &-2678770202730527855 MonoBehaviour: m_ObjectHideFlags: 0 @@ -567,6 +667,7 @@ MonoBehaviour: - {fileID: -2583294156703308178} - {fileID: -5486743104097466142} - {fileID: -6174246449855855006} + - {fileID: -4076602338449401114} - {fileID: -3765664599707111037} - {fileID: 7747853251997987524} - {fileID: 2243745316666254909} @@ -585,7 +686,9 @@ MonoBehaviour: - {fileID: 4340476533682327203} - {fileID: -1924118926561365233} - {fileID: 1621992913488806095} + customLoaderName: m_renderMode: 1 + m_latencyOptimization: 0 m_autoColorSubmissionMode: 1 m_colorSubmissionModes: m_List: 00000000 @@ -593,6 +696,7 @@ MonoBehaviour: m_spacewarpMotionVectorTextureFormat: 0 m_optimizeBufferDiscards: 1 m_symmetricProjection: 0 + m_foveatedRenderingApi: 0 --- !u!114 &-2583294156703308178 MonoBehaviour: m_ObjectHideFlags: 0 @@ -612,7 +716,9 @@ MonoBehaviour: openxrExtensionStrings: XR_EXT_conformance_automation company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &-2527810363365505607 MonoBehaviour: m_ObjectHideFlags: 0 @@ -632,7 +738,9 @@ MonoBehaviour: openxrExtensionStrings: XR_EXT_hp_mixed_reality_controller company: Microsoft priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &-2219742231848666541 MonoBehaviour: m_ObjectHideFlags: 0 @@ -652,7 +760,9 @@ MonoBehaviour: openxrExtensionStrings: company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: cacheSize: 1048576 perThreadCacheSize: 51200 --- !u!114 &-1990190299391547169 @@ -674,7 +784,9 @@ MonoBehaviour: openxrExtensionStrings: XR_META_touch_controller_plus company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &-1924118926561365233 MonoBehaviour: m_ObjectHideFlags: 0 @@ -694,7 +806,9 @@ MonoBehaviour: openxrExtensionStrings: XR_EXT_performance_settings company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &-1685409458817180080 MonoBehaviour: m_ObjectHideFlags: 0 @@ -714,7 +828,9 @@ MonoBehaviour: openxrExtensionStrings: company: Mixed Reality Toolkit Contributors priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &-1310172892294911860 MonoBehaviour: m_ObjectHideFlags: 0 @@ -734,7 +850,9 @@ MonoBehaviour: openxrExtensionStrings: XR_KHR_binding_modification XR_EXT_dpad_binding company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: forceThresholdLeft: 0.5 forceThresholdReleaseLeft: 0.4 centerRegionLeft: 0.5 @@ -767,7 +885,34 @@ MonoBehaviour: openxrExtensionStrings: XR_EXT_eye_gaze_interaction company: Unity priority: 0 + targetOpenXRApiVersion: + required: 0 + customRuntimeLoaderName: +--- !u!114 &-910622493186121033 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f6a75d1f5ff90154ea2a8e58222a1f59, type: 3} + m_Name: FoveatedRenderingFeature Standalone + m_EditorClassIdentifier: + m_enabled: 0 + nameUi: Foveated Rendering + version: 1 + featureIdInternal: com.unity.openxr.feature.foveatedrendering + openxrExtensionStrings: XR_UNITY_foveation XR_FB_foveation XR_FB_foveation_configuration + XR_FB_swapchain_update_state XR_FB_foveation_vulkan XR_META_foveation_eye_tracked + XR_META_vulkan_swapchain_create_info + company: Unity + priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: + enableSubsampledLayout: 0 --- !u!114 &-676329725382200616 MonoBehaviour: m_ObjectHideFlags: 0 @@ -787,7 +932,9 @@ MonoBehaviour: openxrExtensionStrings: XR_EXT_conformance_automation company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &-468654872820436234 MonoBehaviour: m_ObjectHideFlags: 0 @@ -807,7 +954,9 @@ MonoBehaviour: openxrExtensionStrings: XR_EXT_conformance_automation company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -844,7 +993,9 @@ MonoBehaviour: openxrExtensionStrings: XR_OCULUS_android_initialize_loader company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: targetDevices: - visibleName: Quest manifestName: quest @@ -862,10 +1013,10 @@ MonoBehaviour: manifestName: quest3s enabled: 1 forceRemoveInternetPermission: 0 - symmetricProjection: 0 - foveatedRenderingApi: 0 + m_symmetricProjection: 0 + m_foveatedRenderingApi: 0 systemSplashScreen: {fileID: 0} - optimizeBufferDiscards: 1 + m_optimizeBufferDiscards: 1 lateLatchingMode: 0 lateLatchingDebug: 0 optimizeMultiviewRenderRegions: 0 @@ -889,7 +1040,9 @@ MonoBehaviour: openxrExtensionStrings: XR_EXT_hand_interaction company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &176539555143869308 MonoBehaviour: m_ObjectHideFlags: 0 @@ -909,7 +1062,9 @@ MonoBehaviour: openxrExtensionStrings: XR_MSFT_hand_interaction company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &720212866400260749 MonoBehaviour: m_ObjectHideFlags: 0 @@ -929,7 +1084,9 @@ MonoBehaviour: openxrExtensionStrings: XR_UNITY_null_gfx XR_UNITY_android_present company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: ignoreValidationErrors: 0 --- !u!114 &949057647160003393 MonoBehaviour: @@ -950,7 +1107,9 @@ MonoBehaviour: openxrExtensionStrings: XR_FB_hand_tracking_aim company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &1460439861051510218 MonoBehaviour: m_ObjectHideFlags: 0 @@ -970,7 +1129,9 @@ MonoBehaviour: openxrExtensionStrings: company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &1465162696132078854 MonoBehaviour: m_ObjectHideFlags: 0 @@ -987,11 +1148,12 @@ MonoBehaviour: - {fileID: -468654872820436234} - {fileID: -1310172892294911860} - {fileID: -8319177357708938816} + - {fileID: -2965066531462613033} - {fileID: 7748758100988937420} - {fileID: 2960459550882870430} - {fileID: -6794257755403143708} - - {fileID: -2527810363365505607} - {fileID: 6187458536967842535} + - {fileID: -2527810363365505607} - {fileID: -8283577154714071237} - {fileID: 6273364570239032833} - {fileID: -1990190299391547169} @@ -1008,7 +1170,9 @@ MonoBehaviour: - {fileID: 4533605269789063124} - {fileID: 4996612996642823790} - {fileID: 6764344120280892631} + customLoaderName: m_renderMode: 1 + m_latencyOptimization: 0 m_autoColorSubmissionMode: 1 m_colorSubmissionModes: m_List: 00000000 @@ -1016,6 +1180,7 @@ MonoBehaviour: m_spacewarpMotionVectorTextureFormat: 0 m_optimizeBufferDiscards: 0 m_symmetricProjection: 0 + m_foveatedRenderingApi: 0 --- !u!114 &1500523782327561539 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1035,7 +1200,9 @@ MonoBehaviour: openxrExtensionStrings: XR_EXT_hand_interaction company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &1621992913488806095 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1055,7 +1222,9 @@ MonoBehaviour: openxrExtensionStrings: XR_EXT_hand_tracking company: Unity priority: -100 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &1801456176265505245 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1075,7 +1244,9 @@ MonoBehaviour: openxrExtensionStrings: XR_EXT_hand_tracking company: Unity priority: -100 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &1865504128796090834 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1095,7 +1266,9 @@ MonoBehaviour: openxrExtensionStrings: XR_META_touch_controller_plus company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &2243745316666254909 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1116,7 +1289,9 @@ MonoBehaviour: XR_MSFT_hand_tracking_mesh company: Microsoft priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: leftHandTrackingOptions: motionRange: 0 rightHandTrackingOptions: @@ -1141,7 +1316,9 @@ MonoBehaviour: openxrExtensionStrings: XR_EXT_hp_mixed_reality_controller company: Microsoft priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &2622006578924267534 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1165,7 +1342,9 @@ MonoBehaviour: XR_MSFT_scene_marker XR_MSFT_spatial_anchor_export_preview XR_MSFT_composition_layer_reprojection company: Microsoft priority: 0 + targetOpenXRApiVersion: required: 1 + customRuntimeLoaderName: disableFirstPersonObserver: 0 enablePoseUpdateOnBeforeRender: 0 validationRuleTarget: 0 @@ -1188,7 +1367,9 @@ MonoBehaviour: openxrExtensionStrings: XR_MSFT_controller_model XR_FB_render_model company: Microsoft priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &2960459550882870430 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1208,7 +1389,9 @@ MonoBehaviour: openxrExtensionStrings: XR_EXT_hand_interaction company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &3011703863067035089 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1228,7 +1411,9 @@ MonoBehaviour: openxrExtensionStrings: company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &4108263696553698169 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1248,7 +1433,9 @@ MonoBehaviour: openxrExtensionStrings: XR_FB_touch_controller_pro company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &4334429337943452973 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1268,7 +1455,9 @@ MonoBehaviour: openxrExtensionStrings: company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &4340476533682327203 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1288,7 +1477,9 @@ MonoBehaviour: openxrExtensionStrings: company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: cacheSize: 1048576 perThreadCacheSize: 51200 --- !u!114 &4508051287823359615 @@ -1310,7 +1501,9 @@ MonoBehaviour: openxrExtensionStrings: XR_UNITY_null_gfx XR_UNITY_android_present company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: ignoreValidationErrors: 0 --- !u!114 &4533605269789063124 MonoBehaviour: @@ -1331,7 +1524,9 @@ MonoBehaviour: openxrExtensionStrings: XR_EXT_performance_settings company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &4575689165844638740 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1351,7 +1546,9 @@ MonoBehaviour: openxrExtensionStrings: company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &4825760689371567295 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1371,7 +1568,9 @@ MonoBehaviour: openxrExtensionStrings: company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &4996612996642823790 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1391,7 +1590,9 @@ MonoBehaviour: openxrExtensionStrings: XR_EXT_hand_tracking company: Unity priority: -100 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &5076197482031073275 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1411,7 +1612,9 @@ MonoBehaviour: openxrExtensionStrings: company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &5521749775559828029 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1432,7 +1635,9 @@ MonoBehaviour: XR_MSFT_hand_tracking_mesh company: Microsoft priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: leftHandTrackingOptions: motionRange: 0 rightHandTrackingOptions: @@ -1457,7 +1662,9 @@ MonoBehaviour: openxrExtensionStrings: XR_EXT_hp_mixed_reality_controller company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &6273364570239032833 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1477,7 +1684,9 @@ MonoBehaviour: openxrExtensionStrings: company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &6342154364724310848 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1497,7 +1706,9 @@ MonoBehaviour: openxrExtensionStrings: company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &6698335440458243644 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1517,7 +1728,9 @@ MonoBehaviour: openxrExtensionStrings: XR_EXT_palm_pose company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &6710627333171298302 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1537,7 +1750,9 @@ MonoBehaviour: openxrExtensionStrings: XR_MSFT_holographic_remoting XR_MSFT_holographic_remoting_speech company: Microsoft priority: -100 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: m_remoteHostName: m_remoteHostPort: 8265 m_maxBitrate: 20000 @@ -1562,7 +1777,9 @@ MonoBehaviour: openxrExtensionStrings: XR_MSFT_holographic_remoting XR_MSFT_holographic_remoting_speech company: Microsoft priority: -100 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &7631871841315510880 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1582,7 +1799,9 @@ MonoBehaviour: openxrExtensionStrings: XR_FB_touch_controller_pro company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &7747853251997987524 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1602,7 +1821,9 @@ MonoBehaviour: openxrExtensionStrings: XR_EXT_hand_interaction company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &7748758100988937420 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1622,7 +1843,9 @@ MonoBehaviour: openxrExtensionStrings: XR_EXT_hand_interaction company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &8773911662759437579 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1642,7 +1865,9 @@ MonoBehaviour: openxrExtensionStrings: XR_EXT_palm_pose company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &8785654261743502636 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1662,7 +1887,9 @@ MonoBehaviour: openxrExtensionStrings: company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &8871992131841203481 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1682,7 +1909,9 @@ MonoBehaviour: openxrExtensionStrings: XR_META_touch_controller_plus company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: --- !u!114 &9002463822651398326 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1702,4 +1931,6 @@ MonoBehaviour: openxrExtensionStrings: XR_FB_touch_controller_pro company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: diff --git a/UnityProjects/MRTKDevTemplate/Assets/XR/UserSimulationSettings/Resources/XRSimulationPreferences.asset b/UnityProjects/MRTKDevTemplate/Assets/XR/UserSimulationSettings/Resources/XRSimulationPreferences.asset index bffc7c75a..a219d73d7 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/XR/UserSimulationSettings/Resources/XRSimulationPreferences.asset +++ b/UnityProjects/MRTKDevTemplate/Assets/XR/UserSimulationSettings/Resources/XRSimulationPreferences.asset @@ -12,6 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b2f528b98f844ed8b6b2d5fdf90b40e6, type: 3} m_Name: XRSimulationPreferences m_EditorClassIdentifier: + m_HasInputActionUpgrade: 1 m_EnvironmentPrefab: {fileID: 0} m_FallbackEnvironmentPrefab: {fileID: 7576867131100388943, guid: c7b92c392902f4043a03a64032c02fe1, type: 3} - m_EnableNavigation: 1 + m_UnlockInputActionReference: {fileID: -6503468053843192148, guid: 1dd796eaee8744b4aa41b3f8bf5df64f, type: 3} + m_MoveInputActionReference: {fileID: -8435123576461090514, guid: 1dd796eaee8744b4aa41b3f8bf5df64f, type: 3} + m_LookInputActionReference: {fileID: -2447619311606779944, guid: 1dd796eaee8744b4aa41b3f8bf5df64f, type: 3} + m_SprintInputActionReference: {fileID: -5750007214975788477, guid: 1dd796eaee8744b4aa41b3f8bf5df64f, type: 3} + m_LookSpeed: 1 + m_MoveSpeed: 1 + m_MoveSpeedModifier: 3 diff --git a/UnityProjects/MRTKDevTemplate/Packages/manifest.json b/UnityProjects/MRTKDevTemplate/Packages/manifest.json index d7d83f4b8..23830891f 100644 --- a/UnityProjects/MRTKDevTemplate/Packages/manifest.json +++ b/UnityProjects/MRTKDevTemplate/Packages/manifest.json @@ -5,26 +5,25 @@ "com.microsoft.mrtk.graphicstools.unity": "0.8.0", "com.microsoft.mrtk.tts.windows": "1.0.4", "com.microsoft.spatialaudio.spatializer.unity": "2.0.55", - "com.unity.ai.navigation": "1.1.7", - "com.unity.cloud.gltfast": "6.10.1", - "com.unity.cloud.ktx": "3.4.5", - "com.unity.collab-proxy": "2.7.1", + "com.unity.ai.navigation": "2.0.12", + "com.unity.cloud.gltfast": "6.14.1", + "com.unity.cloud.ktx": "3.6.3", + "com.unity.collab-proxy": "2.11.4", "com.unity.ide.rider": "3.0.39", "com.unity.ide.visualstudio": "2.0.27", - "com.unity.ide.vscode": "1.2.5", - "com.unity.inputsystem": "1.14.2", + "com.unity.inputsystem": "1.17.0", "com.unity.mobile.android-logcat": "1.4.7", + "com.unity.multiplayer.center": "1.0.0", "com.unity.performance.profile-analyzer": "1.2.4", - "com.unity.test-framework": "1.1.33", - "com.unity.textmeshpro": "3.0.9", - "com.unity.timeline": "1.7.7", - "com.unity.ugui": "1.0.0", + "com.unity.test-framework": "1.6.0", + "com.unity.timeline": "1.8.12", + "com.unity.ugui": "2.0.0", "com.unity.upm-publishing-tools": "0.1.2", - "com.unity.xr.arcore": "5.2.2", - "com.unity.xr.arfoundation": "5.2.2", - "com.unity.xr.interaction.toolkit": "3.0.1", + "com.unity.xr.arcore": "6.0.6", + "com.unity.xr.arfoundation": "6.0.6", + "com.unity.xr.interaction.toolkit": "3.0.10", "com.unity.xr.management": "4.5.4", - "com.unity.xr.openxr": "1.14.3", + "com.unity.xr.openxr": "1.16.1", "org.mixedrealitytoolkit.accessibility": "file:../../../org.mixedrealitytoolkit.accessibility", "org.mixedrealitytoolkit.audio": "file:../../../org.mixedrealitytoolkit.audio", "org.mixedrealitytoolkit.core": "file:../../../org.mixedrealitytoolkit.core", @@ -39,6 +38,7 @@ "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.accessibility": "1.0.0", "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 fed734cdc..d652f6d50 100644 --- a/UnityProjects/MRTKDevTemplate/Packages/packages-lock.json +++ b/UnityProjects/MRTKDevTemplate/Packages/packages-lock.json @@ -41,7 +41,7 @@ "url": "https://packages.unity.com" }, "com.unity.ai.navigation": { - "version": "1.1.7", + "version": "2.0.12", "depth": 0, "source": "registry", "dependencies": { @@ -50,7 +50,7 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.21", + "version": "1.8.27", "depth": 1, "source": "registry", "dependencies": { @@ -60,11 +60,11 @@ "url": "https://packages.unity.com" }, "com.unity.cloud.gltfast": { - "version": "6.10.1", + "version": "6.14.1", "depth": 0, "source": "registry", "dependencies": { - "com.unity.burst": "1.8.4", + "com.unity.burst": "1.8.24", "com.unity.collections": "1.2.4", "com.unity.mathematics": "1.2.6", "com.unity.modules.jsonserialize": "1.0.0", @@ -73,7 +73,7 @@ "url": "https://packages.unity.com" }, "com.unity.cloud.ktx": { - "version": "3.4.5", + "version": "3.6.3", "depth": 0, "source": "registry", "dependencies": { @@ -82,19 +82,22 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.7.1", + "version": "2.11.4", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.collections": { - "version": "1.2.4", + "version": "2.6.2", "depth": 1, "source": "registry", "dependencies": { - "com.unity.burst": "1.6.6", - "com.unity.test-framework": "1.1.31" + "com.unity.burst": "1.8.23", + "com.unity.mathematics": "1.3.2", + "com.unity.test-framework": "1.4.6", + "com.unity.nuget.mono-cecil": "1.11.5", + "com.unity.test-framework.performance": "3.0.3" }, "url": "https://packages.unity.com" }, @@ -106,11 +109,10 @@ "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { - "version": "1.0.6", + "version": "2.0.5", "depth": 1, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" + "source": "builtin", + "dependencies": {} }, "com.unity.ide.rider": { "version": "3.0.39", @@ -130,15 +132,8 @@ }, "url": "https://packages.unity.com" }, - "com.unity.ide.vscode": { - "version": "1.2.5", - "depth": 0, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, "com.unity.inputsystem": { - "version": "1.14.2", + "version": "1.17.0", "depth": 0, "source": "registry", "dependencies": { @@ -147,7 +142,7 @@ "url": "https://packages.unity.com" }, "com.unity.mathematics": { - "version": "1.2.6", + "version": "1.3.2", "depth": 1, "source": "registry", "dependencies": {}, @@ -160,6 +155,21 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.multiplayer.center": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.uielements": "1.0.0" + } + }, + "com.unity.nuget.mono-cecil": { + "version": "1.11.5", + "depth": 2, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.nuget.newtonsoft-json": { "version": "3.2.1", "depth": 1, @@ -175,27 +185,35 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.33", + "version": "1.6.0", "depth": 0, - "source": "registry", + "source": "builtin", "dependencies": { - "com.unity.ext.nunit": "1.0.6", + "com.unity.ext.nunit": "2.0.3", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" - }, - "url": "https://packages.unity.com" + } }, - "com.unity.textmeshpro": { - "version": "3.0.9", - "depth": 0, + "com.unity.test-framework.performance": { + "version": "3.2.0", + "depth": 2, "source": "registry", "dependencies": { - "com.unity.ugui": "1.0.0" + "com.unity.test-framework": "1.1.33", + "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, + "com.unity.textmeshpro": { + "version": "5.0.0", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.ugui": "2.0.0" + } + }, "com.unity.timeline": { - "version": "1.7.7", + "version": "1.8.12", "depth": 0, "source": "registry", "dependencies": { @@ -207,7 +225,7 @@ "url": "https://packages.unity.com" }, "com.unity.ugui": { - "version": "1.0.0", + "version": "2.0.0", "depth": 0, "source": "builtin", "dependencies": { @@ -225,29 +243,29 @@ "url": "https://packages.unity.com" }, "com.unity.xr.arcore": { - "version": "5.2.2", + "version": "6.0.6", "depth": 0, "source": "registry", "dependencies": { - "com.unity.xr.core-utils": "2.1.0", - "com.unity.xr.management": "4.0.1", - "com.unity.xr.arfoundation": "5.2.2", + "com.unity.xr.core-utils": "2.2.2", + "com.unity.xr.management": "4.4.0", + "com.unity.xr.arfoundation": "6.0.6", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.unitywebrequest": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.xr.arfoundation": { - "version": "5.2.2", + "version": "6.0.6", "depth": 0, "source": "registry", "dependencies": { - "com.unity.ugui": "1.0.0", + "com.unity.ugui": "2.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.2.1", - "com.unity.xr.management": "4.0.1", + "com.unity.inputsystem": "1.6.3", + "com.unity.mathematics": "1.2.6", + "com.unity.xr.core-utils": "2.3.0", + "com.unity.xr.management": "4.4.0", "com.unity.editorcoroutines": "1.0.0", "com.unity.modules.particlesystem": "1.0.0", "com.unity.modules.unityanalytics": "1.0.0", @@ -256,7 +274,7 @@ "url": "https://packages.unity.com" }, "com.unity.xr.core-utils": { - "version": "2.5.2", + "version": "2.5.3", "depth": 1, "source": "registry", "dependencies": { @@ -265,7 +283,7 @@ "url": "https://packages.unity.com" }, "com.unity.xr.hands": { - "version": "1.6.0", + "version": "1.7.2", "depth": 1, "source": "registry", "dependencies": { @@ -278,8 +296,8 @@ "url": "https://packages.unity.com" }, "com.unity.xr.interaction.toolkit": { - "version": "3.0.4", - "depth": 1, + "version": "3.0.10", + "depth": 0, "source": "registry", "dependencies": { "com.unity.ugui": "1.0.0", @@ -316,13 +334,14 @@ "url": "https://packages.unity.com" }, "com.unity.xr.openxr": { - "version": "1.14.3", + "version": "1.16.1", "depth": 0, "source": "registry", "dependencies": { "com.unity.inputsystem": "1.6.3", "com.unity.xr.core-utils": "2.3.0", "com.unity.xr.management": "4.4.0", + "com.unity.modules.androidjni": "1.0.0", "com.unity.xr.legacyinputhelpers": "2.1.2" }, "url": "https://packages.unity.com" @@ -466,6 +485,12 @@ "org.mixedrealitytoolkit.core": "3.2.2" } }, + "com.unity.modules.accessibility": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, "com.unity.modules.ai": { "version": "1.0.0", "depth": 0, @@ -513,6 +538,12 @@ "com.unity.modules.animation": "1.0.0" } }, + "com.unity.modules.hierarchycore": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": {} + }, "com.unity.modules.imageconversion": { "version": "1.0.0", "depth": 0, @@ -601,7 +632,8 @@ "dependencies": { "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0" + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.hierarchycore": "1.0.0" } }, "com.unity.modules.umbra": { diff --git a/UnityProjects/MRTKDevTemplate/ProjectSettings/EditorBuildSettings.asset b/UnityProjects/MRTKDevTemplate/ProjectSettings/EditorBuildSettings.asset index bf4ae89ed..5c378f595 100644 --- a/UnityProjects/MRTKDevTemplate/ProjectSettings/EditorBuildSettings.asset +++ b/UnityProjects/MRTKDevTemplate/ProjectSettings/EditorBuildSettings.asset @@ -164,3 +164,4 @@ EditorBuildSettings: com.unity.xr.arfoundation.simulation_settings: {fileID: 11400000, guid: 4ce0884cff002f24f83e8b0ceef94646, type: 2} com.unity.xr.management.loader_settings: {fileID: 11400000, guid: 90a3b98e6a849104285d1183acd66c0b, type: 2} com.unity.xr.openxr.settings4: {fileID: 11400000, guid: a03b04948b0cbde4498320e6e1bd5cd6, type: 2} + m_UseUCBPForAssetBundles: 0 diff --git a/UnityProjects/MRTKDevTemplate/ProjectSettings/MultiplayerManager.asset b/UnityProjects/MRTKDevTemplate/ProjectSettings/MultiplayerManager.asset new file mode 100644 index 000000000..2a936644e --- /dev/null +++ b/UnityProjects/MRTKDevTemplate/ProjectSettings/MultiplayerManager.asset @@ -0,0 +1,7 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!655991488 &1 +MultiplayerManager: + m_ObjectHideFlags: 0 + m_EnableMultiplayerRoles: 0 + m_StrippingTypes: {} diff --git a/UnityProjects/MRTKDevTemplate/ProjectSettings/ProjectSettings.asset b/UnityProjects/MRTKDevTemplate/ProjectSettings/ProjectSettings.asset index 71c53747e..6a4d06d0d 100644 --- a/UnityProjects/MRTKDevTemplate/ProjectSettings/ProjectSettings.asset +++ b/UnityProjects/MRTKDevTemplate/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 24 + serializedVersion: 28 productGUID: 24fb2b4e687eaba479b315cd3440717a AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -48,14 +48,17 @@ PlayerSettings: defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 m_ActiveColorSpace: 1 + unsupportedMSAAFallback: 0 + m_SpriteBatchMaxVertexCount: 65535 + m_SpriteBatchVertexThreshold: 300 m_MTRendering: 1 mipStripping: 0 numberOfMipsStripped: 0 + numberOfMipsStrippedPerMipmapLimitGroup: {} m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 iosUseCustomAppBackgroundBehavior: 0 - iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 allowedAutorotateToLandscapeRight: 1 @@ -67,24 +70,29 @@ PlayerSettings: androidStartInFullscreen: 1 androidRenderOutsideSafeArea: 1 androidUseSwappy: 1 + androidDisplayOptions: 1 androidBlitType: 0 - androidResizableWindow: 0 + androidResizeableActivity: 0 androidDefaultWindowWidth: 1920 androidDefaultWindowHeight: 1080 androidMinimumWindowWidth: 400 androidMinimumWindowHeight: 300 androidFullscreenMode: 1 + androidAutoRotationBehavior: 1 + androidPredictiveBackSupport: 1 + androidApplicationEntry: 2 defaultIsNativeResolution: 1 macRetinaSupport: 1 - runInBackground: 0 - captureSingleScreen: 0 + runInBackground: 1 muteOtherAudioSources: 0 Prepare IOS For Recording: 0 Force IOS Speakers When Recording: 0 + audioSpatialExperience: 0 deferSystemGesturesMode: 0 hideHomeButton: 0 submitAnalytics: 1 usePlayerLog: 1 + dedicatedServerOptimizations: 1 bakeCollisionMeshes: 0 forceSingleInstance: 0 useFlipModelSwapchain: 1 @@ -92,6 +100,7 @@ PlayerSettings: useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games gpuSkinning: 1 + meshDeformation: 2 xboxPIXTextureCapture: 0 xboxEnableAvatar: 0 xboxEnableKinect: 0 @@ -119,21 +128,20 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + switchGpuScratchPoolGranularity: 2097152 + switchAllowGpuScratchShrinking: 0 switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 - stadiaPresentMode: 0 - stadiaTargetFramerate: 0 + switchMaxWorkerMultiple: 8 + switchNVNGraphicsFirmwareMemory: 32 vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 vulkanEnablePreTransform: 0 vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 - m_SupportedAspectRatios: - 4:3: 1 - 5:4: 1 - 16:10: 1 - 16:9: 1 - Others: 1 + loadStoreDebugModeEnabled: 0 + visionOSBundleVersion: 1.0 + tvOSBundleVersion: 1.0 bundleVersion: 4.0.0 preloadedAssets: - {fileID: 0} @@ -147,19 +155,22 @@ PlayerSettings: isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 enableOpenGLProfilerGPURecorders: 1 + allowHDRDisplaySupport: 0 useHDRDisplay: 0 - D3DHDRBitDepth: 0 + hdrBitDepth: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 resetResolutionOnWindowResize: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 + androidMinAspectRatio: 1 applicationIdentifier: Android: org.MixedRealityToolkit.MRTK3Sample Standalone: org.MixedRealityToolkit.MRTK3Sample buildNumber: Standalone: 0 + VisionOS: 0 iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 1 @@ -174,15 +185,20 @@ PlayerSettings: ForceInternetPermission: 0 ForceSDCardPermission: 0 CreateWallpaper: 0 - APKExpansionFiles: 0 + androidSplitApplicationBinary: 0 keepLoadedShadersAlive: 0 StripUnusedMeshComponents: 1 + strictShaderVariantMatching: 0 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 12.0 + iOSSimulatorArchitecture: 0 + iOSTargetOSVersionString: 13.0 tvOSSdkVersion: 0 + tvOSSimulatorArchitecture: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 12.0 + tvOSTargetOSVersionString: 13.0 + VisionOSSdkVersion: 0 + VisionOSTargetOSVersionString: 1.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -207,7 +223,6 @@ PlayerSettings: rgba: 0 iOSLaunchScreenFillPct: 100 iOSLaunchScreenSize: 100 - iOSLaunchScreenCustomXibPath: iOSLaunchScreeniPadType: 0 iOSLaunchScreeniPadImage: {fileID: 0} iOSLaunchScreeniPadBackgroundColor: @@ -215,7 +230,6 @@ PlayerSettings: rgba: 0 iOSLaunchScreeniPadFillPct: 100 iOSLaunchScreeniPadSize: 100 - iOSLaunchScreeniPadCustomXibPath: iOSLaunchScreenCustomStoryboardPath: iOSLaunchScreeniPadCustomStoryboardPath: iOSDeviceRequirements: [] @@ -225,13 +239,16 @@ PlayerSettings: iOSMetalForceHardShadows: 0 metalEditorSupport: 1 metalAPIValidation: 1 + metalCompileShaderBinary: 0 iOSRenderExtraFrameOnPause: 0 iosCopyPluginsCodeInsteadOfSymlink: 0 appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: + VisionOSManualSigningProvisioningProfileID: iOSManualSigningProvisioningProfileType: 0 tvOSManualSigningProvisioningProfileType: 0 + VisionOSManualSigningProvisioningProfileType: 0 appleEnableAutomaticSigning: 0 iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 @@ -246,16 +263,21 @@ PlayerSettings: useCustomLauncherGradleManifest: 0 useCustomBaseGradleTemplate: 0 useCustomGradlePropertiesTemplate: 0 + useCustomGradleSettingsTemplate: 0 useCustomProguardFile: 0 AndroidTargetArchitectures: 2 - AndroidTargetDevices: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: AndroidKeyaliasName: + AndroidEnableArmv9SecurityFeatures: 0 + AndroidEnableArm64MTE: 0 AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 AndroidIsGame: 1 + androidAppCategory: 3 + useAndroidAppCategory: 1 + androidAppCategoryOther: AndroidEnableTango: 0 androidEnableBanner: 1 androidUseLowAccuracyLocation: 0 @@ -265,12 +287,12 @@ PlayerSettings: height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 - chromeosInputEmulation: 1 - AndroidMinifyWithR8: 0 AndroidMinifyRelease: 0 AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 + AndroidReportGooglePlayAppDependencies: 1 + androidSymbolsSizeThreshold: 800 m_BuildTargetIcons: [] m_BuildTargetPlatformIcons: - m_BuildTarget: Android @@ -521,7 +543,7 @@ PlayerSettings: m_GraphicsJobMode: 0 m_BuildTargetGraphicsAPIs: - m_BuildTarget: AndroidPlayer - m_APIs: 0b000000 + m_APIs: 15000000 m_Automatic: 0 - m_BuildTarget: iOSSupport m_APIs: 10000000 @@ -532,6 +554,9 @@ PlayerSettings: - m_BuildTarget: WebGLSupport m_APIs: 0b000000 m_Automatic: 1 + - m_BuildTarget: WindowsStandaloneSupport + m_APIs: 02000000 + m_Automatic: 1 m_BuildTargetVRSettings: - m_BuildTarget: Standalone m_Enabled: 0 @@ -549,12 +574,18 @@ PlayerSettings: iPhone: 1 tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: [] + m_BuildTargetGroupHDRCubemapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] + m_BuildTargetGroupLoadStoreDebugModeSettings: [] m_BuildTargetNormalMapEncoding: [] - m_BuildTargetDefaultTextureCompressionFormat: [] + m_BuildTargetDefaultTextureCompressionFormat: + - serializedVersion: 3 + m_BuildTarget: Android + m_Formats: 01000000 playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 + editorGfxJobOverride: 1 enableInternalProfiler: 0 logObjCUncaughtExceptions: 1 enableCrashReportAPI: 0 @@ -562,6 +593,7 @@ PlayerSettings: locationUsageDescription: microphoneUsageDescription: bluetoothUsageDescription: + macOSTargetOSVersion: 11.0 switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 @@ -569,10 +601,11 @@ PlayerSettings: switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 - switchUseGOLDLinker: 0 + switchEnableFileSystemTrace: 0 switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: + switchCompilerFlags: switchTitleNames_0: switchTitleNames_1: switchTitleNames_2: @@ -698,13 +731,14 @@ PlayerSettings: switchSocketBufferEfficiency: 4 switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 - switchPlayerConnectionEnabled: 1 + switchDisableHTCSPlayerConnection: 0 switchUseNewStyleFilepaths: 0 switchUseLegacyFmodPriorities: 1 switchUseMicroSleepForYield: 1 switchEnableRamDiskSupport: 0 switchMicroSleepForYieldTime: 25 switchRamDiskSpaceSize: 12 + switchUpgradedPlayerSettingsToNMETA: 0 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -788,6 +822,7 @@ PlayerSettings: webGLMemorySize: 16 webGLExceptionSupport: 1 webGLNameFilesAsHashes: 0 + webGLShowDiagnostics: 0 webGLDataCaching: 1 webGLDebugSymbols: 0 webGLEmscriptenArgs: @@ -800,7 +835,18 @@ PlayerSettings: webGLLinkerTarget: 1 webGLThreadsSupport: 0 webGLDecompressionFallback: 0 + webGLInitialMemorySize: 32 + webGLMaximumMemorySize: 2048 + webGLMemoryGrowthMode: 2 + webGLMemoryLinearGrowthStep: 16 + webGLMemoryGeometricGrowthStep: 0.2 + webGLMemoryGeometricGrowthCap: 96 + webGLEnableWebGPU: 0 webGLPowerPreference: 2 + webGLWebAssemblyTable: 0 + webGLWebAssemblyBigInt: 0 + webGLCloseOnQuit: 0 + webWasm2023: 0 scriptingDefineSymbols: Android: USE_INPUT_SYSTEM_POSE_CONTROL Standalone: USE_INPUT_SYSTEM_POSE_CONTROL @@ -810,6 +856,8 @@ PlayerSettings: scriptingBackend: Android: 1 il2cppCompilerConfiguration: {} + il2cppCodeGeneration: {} + il2cppStacktraceInformation: {} managedStrippingLevel: Android: 1 EmbeddedLinux: 1 @@ -829,14 +877,12 @@ PlayerSettings: suppressCommonWarnings: 1 allowUnsafeCode: 0 useDeterministicCompilation: 1 - enableRoslynAnalyzers: 1 - selectedPlatform: 0 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 1 - assemblyVersionValidation: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} + editorAssembliesCompatibilityLevel: 1 m_RenderingPath: 1 m_MobileRenderingPath: 1 metroPackageName: MRTK3Sample @@ -860,6 +906,7 @@ PlayerSettings: metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0} metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, a: 1} metroSplashScreenUseBackgroundColor: 0 + syncCapabilities: 0 platformCapabilities: WindowsStoreApps: GazeInput: True @@ -914,7 +961,14 @@ PlayerSettings: luminVersion: m_VersionCode: 1 m_VersionName: + hmiPlayerDataPath: + hmiForceSRGBBlit: 1 + embeddedLinuxEnableGamepadInput: 0 + hmiCpuConfiguration: + hmiLogStartupTiming: 0 + qnxGraphicConfPath: apiCompatibilityLevel: 6 + captureStartupLogs: {} activeInputHandler: 1 windowsGamepadBackendHint: 0 cloudProjectId: @@ -924,6 +978,9 @@ PlayerSettings: organizationId: cloudEnabled: 0 legacyClampBlendShapeWeights: 0 - playerDataPath: - forceSRGBBlit: 1 + hmiLoadingImage: {fileID: 0} + platformRequiresReadableAssets: 0 virtualTexturingSupportEnabled: 0 + insecureHttpOption: 0 + androidVulkanDenyFilterList: [] + androidVulkanAllowFilterList: [] diff --git a/UnityProjects/MRTKDevTemplate/ProjectSettings/ProjectVersion.txt b/UnityProjects/MRTKDevTemplate/ProjectSettings/ProjectVersion.txt index 587f809d7..080074a7b 100644 --- a/UnityProjects/MRTKDevTemplate/ProjectSettings/ProjectVersion.txt +++ b/UnityProjects/MRTKDevTemplate/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.62f3 -m_EditorVersionWithRevision: 2022.3.62f3 (96770f904ca7) +m_EditorVersion: 6000.0.66f2 +m_EditorVersionWithRevision: 6000.0.66f2 (b20bc5da3050) diff --git a/UnityProjects/MRTKDevTemplate/ProjectSettings/SceneTemplateSettings.json b/UnityProjects/MRTKDevTemplate/ProjectSettings/SceneTemplateSettings.json index 6f3e60fd8..6ed312ae2 100644 --- a/UnityProjects/MRTKDevTemplate/ProjectSettings/SceneTemplateSettings.json +++ b/UnityProjects/MRTKDevTemplate/ProjectSettings/SceneTemplateSettings.json @@ -4,164 +4,123 @@ { "userAdded": false, "type": "UnityEngine.AnimationClip", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEditor.Animations.AnimatorController", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.AnimatorOverrideController", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEditor.Audio.AudioMixerController", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.ComputeShader", - "ignore": true, - "defaultInstantiationMode": 1, - "supportsModification": true + "defaultInstantiationMode": 1 }, { "userAdded": false, "type": "UnityEngine.Cubemap", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.GameObject", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEditor.LightingDataAsset", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": false + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.LightingSettings", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.Material", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEditor.MonoScript", - "ignore": true, - "defaultInstantiationMode": 1, - "supportsModification": true + "defaultInstantiationMode": 1 }, { "userAdded": false, "type": "UnityEngine.PhysicMaterial", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicsMaterial", + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.PhysicsMaterial2D", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.Rendering.PostProcessing.PostProcessProfile", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.Rendering.PostProcessing.PostProcessResources", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.Rendering.VolumeProfile", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEditor.SceneAsset", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": false + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.Shader", - "ignore": true, - "defaultInstantiationMode": 1, - "supportsModification": true + "defaultInstantiationMode": 1 }, { "userAdded": false, "type": "UnityEngine.ShaderVariantCollection", - "ignore": true, - "defaultInstantiationMode": 1, - "supportsModification": true + "defaultInstantiationMode": 1 }, { "userAdded": false, "type": "UnityEngine.Texture", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.Texture2D", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.Timeline.TimelineAsset", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 } ], "defaultDependencyTypeInfo": { "userAdded": false, "type": "", - "ignore": false, - "defaultInstantiationMode": 1, - "supportsModification": true + "defaultInstantiationMode": 1 }, "newSceneOverride": 0 } \ No newline at end of file diff --git a/docs/mrtk3-overview/getting-started/setting-up/setup-dev-env.md b/docs/mrtk3-overview/getting-started/setting-up/setup-dev-env.md index 4003479ba..1ce6b3c3d 100644 --- a/docs/mrtk3-overview/getting-started/setting-up/setup-dev-env.md +++ b/docs/mrtk3-overview/getting-started/setting-up/setup-dev-env.md @@ -10,7 +10,7 @@ Before setting up a Unity Project with MRTK3, make sure you have the following s | Software | Version | Notes | | --- | --- | --- | -| Unity | 2022.3 LTS or newer | Recommend using an LTS release
See [Additional tools](#additional-tools) below for recommended modules | +| Unity | 6.0 LTS or newer | Recommend using an LTS release
See [Additional tools](#additional-tools) below for recommended modules | ## Additional tools diff --git a/org.mixedrealitytoolkit.core/CHANGELOG.md b/org.mixedrealitytoolkit.core/CHANGELOG.md index 2585246d7..9cc7a255a 100644 --- a/org.mixedrealitytoolkit.core/CHANGELOG.md +++ b/org.mixedrealitytoolkit.core/CHANGELOG.md @@ -4,6 +4,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). ## Unreleased +### Changed + +* Updated the minimum editor version to 6000.0.66f2 [PR #1112](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1112) + ### Removed * Removed input action focus handling from `MRTKLifecycleManager` and moved to the Input package. [PR #1057](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1057) diff --git a/org.mixedrealitytoolkit.core/package.json b/org.mixedrealitytoolkit.core/package.json index da49abe36..7e450af30 100644 --- a/org.mixedrealitytoolkit.core/package.json +++ b/org.mixedrealitytoolkit.core/package.json @@ -1,6 +1,6 @@ { "name": "org.mixedrealitytoolkit.core", - "version": "4.0.0-development.pre.2", + "version": "4.0.0-development.pre.3", "description": "A limited collection of common interfaces and utilities that most MRTK packages share. Most implementations of these interfaces are contained in other packages in the MRTK ecosystem.", "displayName": "MRTK Core Definitions", "msftFeatureCategory": "MRTK3", @@ -13,8 +13,8 @@ "bugs": { "url": "https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/issues" }, - "unity": "2022.3", - "unityRelease": "6f1", + "unity": "6000.0", + "unityRelease": "66f2", "documentationUrl": "https://www.mixedrealitytoolkit.org", "dependencies": { "com.unity.xr.interaction.toolkit": "3.0.4", diff --git a/org.mixedrealitytoolkit.input/CHANGELOG.md b/org.mixedrealitytoolkit.input/CHANGELOG.md index 4bcb9a2ce..8a73a8db3 100644 --- a/org.mixedrealitytoolkit.input/CHANGELOG.md +++ b/org.mixedrealitytoolkit.input/CHANGELOG.md @@ -14,6 +14,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). * Added input action focus handling to disable controller/hand tracked state when the XrSession goes out of focus. [PR #1057](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1057) * Added support for XR_MSFT_hand_tracking_mesh and XR_ANDROID_hand_mesh on compatible runtimes. [PR #993](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/993) +### Changed + +* Updated the minimum editor version to 6000.0.66f2 [PR #1112](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1112) + ## [4.0.0-pre.2] - 2025-12-05 ### Changed diff --git a/org.mixedrealitytoolkit.input/package.json b/org.mixedrealitytoolkit.input/package.json index 590b61790..b9d3b602a 100644 --- a/org.mixedrealitytoolkit.input/package.json +++ b/org.mixedrealitytoolkit.input/package.json @@ -1,6 +1,6 @@ { "name": "org.mixedrealitytoolkit.input", - "version": "4.0.0-development.pre.2", + "version": "4.0.0-development.pre.3", "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", @@ -13,8 +13,8 @@ "bugs": { "url": "https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/issues" }, - "unity": "2022.3", - "unityRelease": "6f1", + "unity": "6000.0", + "unityRelease": "66f2", "documentationUrl": "https://www.mixedrealitytoolkit.org", "dependencies": { "com.microsoft.mrtk.graphicstools.unity": "0.8.0", diff --git a/org.mixedrealitytoolkit.spatialmanipulation/CHANGELOG.md b/org.mixedrealitytoolkit.spatialmanipulation/CHANGELOG.md index 9d56cf030..1a2807b4e 100644 --- a/org.mixedrealitytoolkit.spatialmanipulation/CHANGELOG.md +++ b/org.mixedrealitytoolkit.spatialmanipulation/CHANGELOG.md @@ -2,6 +2,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). +## Unreleased + +### Changed + +* Updated the minimum editor version to 6000.0.66f2 [PR #1112](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1112) + ## [4.0.0-pre.2] - 2025-12-05 ### Changed diff --git a/org.mixedrealitytoolkit.spatialmanipulation/ObjectManipulator/ObjectManipulator.cs b/org.mixedrealitytoolkit.spatialmanipulation/ObjectManipulator/ObjectManipulator.cs index a89a8406e..b3aea8e05 100644 --- a/org.mixedrealitytoolkit.spatialmanipulation/ObjectManipulator/ObjectManipulator.cs +++ b/org.mixedrealitytoolkit.spatialmanipulation/ObjectManipulator/ObjectManipulator.cs @@ -761,11 +761,7 @@ protected override void OnSelectExited(SelectExitEventArgs args) { if (interactorsSelecting.Count == 0) { -#if UNITY_6000_0_OR_NEWER ReleaseRigidBody(rigidBody.linearVelocity, rigidBody.angularVelocity); -#else - ReleaseRigidBody(rigidBody.velocity, rigidBody.angularVelocity); -#endif } else { @@ -913,11 +909,7 @@ private void ApplyForcesToRigidbody() // when player is moving, we need to anticipate where the targetTransform is going to be one time step from now distance -= referenceFrameVelocity * Time.fixedDeltaTime; -#if UNITY_6000_0_OR_NEWER var velocity = rigidBody.linearVelocity; -#else - var velocity = rigidBody.velocity; -#endif var acceleration = omega * omega * -distance; // acceleration caused by spring force @@ -946,11 +938,7 @@ private void ApplyForcesToRigidbody() velocity += referenceFrameVelocity; // change back to global frame of reference -#if UNITY_6000_0_OR_NEWER rigidBody.linearVelocity = velocity; -#else - rigidBody.velocity = velocity; -#endif if (applyTorque) { @@ -1048,11 +1036,7 @@ private void ReleaseRigidBody(Vector3 velocity, Vector3 angularVelocity) { if (releaseBehavior.IsMaskSet(ReleaseBehaviorType.KeepVelocity)) { -#if UNITY_6000_0_OR_NEWER rigidBody.linearVelocity = velocity; -#else - rigidBody.velocity = velocity; -#endif } if (releaseBehavior.IsMaskSet(ReleaseBehaviorType.KeepAngularVelocity)) diff --git a/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/ObjectManipulatorTests.cs b/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/ObjectManipulatorTests.cs index 542d6d9a9..9333f7234 100644 --- a/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/ObjectManipulatorTests.cs +++ b/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/ObjectManipulatorTests.cs @@ -745,7 +745,7 @@ public IEnumerator TestObjManipTargetChange() Assert.IsTrue(cube1.transform.position.CloseEnoughTo(cube1Pos), "Cube1 moved when it shouldn't have!"); Assert.IsTrue(!cube2.transform.position.CloseEnoughTo(cube2Pos), "Cube2 didn't move when it should have!"); - + // Cube2 should be facing the user. Assert.IsTrue(cube2.transform.forward.CloseEnoughTo(-(cube2.transform.position - Camera.main.transform.position).normalized), "Cube2 didn't stay facing user!"); @@ -983,11 +983,7 @@ public IEnumerator ObjectManipulatorRigidbodyCollision() yield return hand.Move(Vector3.forward * 3f); yield return RuntimeTestUtilities.WaitForFixedUpdates(); -#if UNITY_6000_0_OR_NEWER Assert.AreNotEqual(Vector3.zero, backgroundRigidbody.linearVelocity); -#else - Assert.AreNotEqual(Vector3.zero, backgroundRigidbody.velocity); -#endif Assert.AreEqual(1, collisionListener.CollisionCount); } @@ -1184,7 +1180,7 @@ private void OnCollisionEnter(Collision collision) /************** To be added in the future ***************** /// /// Test validates throw behavior on manipulation handler. Box with disabled gravity should travel a - /// certain distance when being released from grab during hand movement. Specifically for near interactions, + /// certain distance when being released from grab during hand movement. Specifically for near interactions, /// where we expect the thrown object to match the controllers velocities. /// [UnityTest] @@ -1241,7 +1237,7 @@ public IEnumerator ObjectManipulatorNearThrow() /// /// Test validates throw behavior on manipulation handler. Box with disabled gravity should travel a - /// certain distance when being released from grab during hand movement. Specifically for far interactions, + /// certain distance when being released from grab during hand movement. Specifically for far interactions, /// where we expect the thrown object to maintain it's velocities after being thrown /// [UnityTest] diff --git a/org.mixedrealitytoolkit.spatialmanipulation/package.json b/org.mixedrealitytoolkit.spatialmanipulation/package.json index bc2cdd16a..18eea07b5 100644 --- a/org.mixedrealitytoolkit.spatialmanipulation/package.json +++ b/org.mixedrealitytoolkit.spatialmanipulation/package.json @@ -1,6 +1,6 @@ { "name": "org.mixedrealitytoolkit.spatialmanipulation", - "version": "4.0.0-development.pre.2", + "version": "4.0.0-development.pre.3", "description": "Spatial manipulation features, including ObjectManipulator, BoundsControl, and the Solvers/Constraints systems.", "displayName": "MRTK Spatial Manipulation", "msftFeatureCategory": "MRTK3", @@ -13,8 +13,8 @@ "bugs": { "url": "https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/issues" }, - "unity": "2022.3", - "unityRelease": "6f1", + "unity": "6000.0", + "unityRelease": "66f2", "documentationUrl": "https://www.mixedrealitytoolkit.org", "dependencies": { "org.mixedrealitytoolkit.core": "4.0.0", diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/CHANGELOG.md b/org.mixedrealitytoolkit.uxcomponents.noncanvas/CHANGELOG.md index 871b56c24..bdf7fbb5b 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/CHANGELOG.md +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/CHANGELOG.md @@ -2,6 +2,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). +## Unreleased + +### Changed + +* Updated the minimum editor version to 6000.0.66f2 [PR #1112](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1112) + ## [4.0.0-pre.2] - 2025-12-05 ### Changed diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/package.json b/org.mixedrealitytoolkit.uxcomponents.noncanvas/package.json index 565b2a570..7bed92bc4 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/package.json +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/package.json @@ -1,6 +1,6 @@ { "name": "org.mixedrealitytoolkit.uxcomponents.noncanvas", - "version": "4.0.0-development.pre.2", + "version": "4.0.0-development.pre.3", "description": "UX component library for 3D UX without Canvas layout. In some cases, non-Canvas UI may offer better performance.", "displayName": "MRTK UX Components (Non-Canvas)", "msftFeatureCategory": "MRTK3", @@ -13,8 +13,8 @@ "bugs": { "url": "https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/issues" }, - "unity": "2022.3", - "unityRelease": "6f1", + "unity": "6000.0", + "unityRelease": "66f2", "documentationUrl": "https://www.mixedrealitytoolkit.org", "dependencies": { "org.mixedrealitytoolkit.uxcore": "4.0.0", diff --git a/org.mixedrealitytoolkit.uxcomponents/CHANGELOG.md b/org.mixedrealitytoolkit.uxcomponents/CHANGELOG.md index 28792d444..85d4dcb14 100644 --- a/org.mixedrealitytoolkit.uxcomponents/CHANGELOG.md +++ b/org.mixedrealitytoolkit.uxcomponents/CHANGELOG.md @@ -2,6 +2,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). +## Unreleased + +### Changed + +* Updated the minimum editor version to 6000.0.66f2 [PR #1112](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1112) + ## [4.0.0-pre.2] - 2025-12-05 ### Changed diff --git a/org.mixedrealitytoolkit.uxcomponents/package.json b/org.mixedrealitytoolkit.uxcomponents/package.json index 6fd05fae9..45c8af2ac 100644 --- a/org.mixedrealitytoolkit.uxcomponents/package.json +++ b/org.mixedrealitytoolkit.uxcomponents/package.json @@ -1,6 +1,6 @@ { "name": "org.mixedrealitytoolkit.uxcomponents", - "version": "4.0.0-development.pre.2", + "version": "4.0.0-development.pre.3", "description": "UX library leveraging RectTransform and Canvas for dynamic layout and presentation. Contains prefabs, visuals, controls, and everything to get started building 3D user interfaces for mixed reality.", "displayName": "MRTK UX Components", "msftFeatureCategory": "MRTK3", @@ -13,8 +13,8 @@ "bugs": { "url": "https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/issues" }, - "unity": "2022.3", - "unityRelease": "6f1", + "unity": "6000.0", + "unityRelease": "66f2", "documentationUrl": "https://www.mixedrealitytoolkit.org", "dependencies": { "com.microsoft.mrtk.graphicstools.unity": "0.8.0", diff --git a/org.mixedrealitytoolkit.uxcore/CHANGELOG.md b/org.mixedrealitytoolkit.uxcore/CHANGELOG.md index bfed8e569..54645bf68 100644 --- a/org.mixedrealitytoolkit.uxcore/CHANGELOG.md +++ b/org.mixedrealitytoolkit.uxcore/CHANGELOG.md @@ -2,6 +2,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). +## Unreleased + +### Changed + +* Updated the minimum editor version to 6000.0.66f2 [PR #1112](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1112) + ## [4.0.0-pre.2] - 2025-12-05 ### Changed diff --git a/org.mixedrealitytoolkit.uxcore/package.json b/org.mixedrealitytoolkit.uxcore/package.json index 447d5f1b9..963bd54b5 100644 --- a/org.mixedrealitytoolkit.uxcore/package.json +++ b/org.mixedrealitytoolkit.uxcore/package.json @@ -1,6 +1,6 @@ { "name": "org.mixedrealitytoolkit.uxcore", - "version": "4.0.0-development.pre.2", + "version": "4.0.0-development.pre.3", "description": "Core interaction and visualization scripts for building MR UI components. Intended to be consumed when building UX libraries. For pre-existing library of components, see the UX Components package.", "displayName": "MRTK UX Core Scripts", "msftFeatureCategory": "MRTK3", @@ -13,8 +13,8 @@ "bugs": { "url": "https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/issues" }, - "unity": "2022.3", - "unityRelease": "6f1", + "unity": "6000.0", + "unityRelease": "66f2", "documentationUrl": "https://www.mixedrealitytoolkit.org", "dependencies": { "com.microsoft.mrtk.graphicstools.unity": "0.8.0",