diff --git a/Pipelines/Scripts/update-versions.ps1 b/Pipelines/Scripts/update-versions.ps1 index 8982b3c3a..c6ddef9a9 100644 --- a/Pipelines/Scripts/update-versions.ps1 +++ b/Pipelines/Scripts/update-versions.ps1 @@ -158,8 +158,9 @@ Get-ChildItem -Path $PackagesRoot -Filter "package.json" -Recurse | ForEach-Obje # Update the CHANGELOG.md file with the new version and release date Write-Output "Patching CHANGELOG.md version to [$version$tag] - $year-$month-$day" + $escapedVersion = [regex]::Escape($version) Get-ChildItem -Path $packagePath/CHANGELOG.md -Recurse | ForEach-Object { - (Get-Content -Path $_ -Raw) -Replace "## \[$version(-[a-zA-Z0-9.]+)?\] - \b\d{4}\b-\b(0[1-9]|1[0-2])\b-\b(0[1-9]|[12][0-9]|3[01])\b", "## [$version$tag] - $year-$month-$day" | Set-Content -Path $_ -NoNewline + (Get-Content -Path $_ -Raw) -Replace "## (\[$escapedVersion(-[a-zA-Z0-9.]+)?\] - \b\d{4}\b-\b(0[1-9]|1[0-2])\b-\b(0[1-9]|[12][0-9]|3[01])\b|Unreleased)", "## [$version$tag] - $year-$month-$day" | Set-Content -Path $_ -NoNewline } } diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/Audio/AudioLoFiExample.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/Audio/AudioLoFiExample.unity index 251f879bf..01249fc16 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/Audio/AudioLoFiExample.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/Audio/AudioLoFiExample.unity @@ -987,6 +987,17 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &525252188 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 800708247703322884, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + m_PrefabInstance: {fileID: 107443798} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &562708120 GameObject: m_ObjectHideFlags: 0 @@ -2019,6 +2030,10 @@ GameObject: - component: {fileID: 1170623173} - component: {fileID: 1170623176} - component: {fileID: 1170623175} + - component: {fileID: 1170623179} + - component: {fileID: 1170623178} + - component: {fileID: 1170623177} + - component: {fileID: 1170623180} m_Layer: 0 m_Name: EffectControls m_TagString: Untagged @@ -2091,6 +2106,281 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 +--- !u!114 &1170623177 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1170623172} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 525252188} + m_Colliders: + - {fileID: 1170623179} + m_InteractionLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_InteractionLayers: + m_Bits: 1 + m_DistanceCalculationMode: 1 + m_SelectMode: 1 + m_CustomReticle: {fileID: 0} + m_AllowGazeInteraction: 0 + m_AllowGazeSelect: 0 + m_OverrideGazeTimeToSelect: 0 + m_GazeTimeToSelect: 0.5 + m_OverrideTimeToAutoDeselectGaze: 0 + m_TimeToAutoDeselectGaze: 3 + m_AllowGazeAssistance: 0 + m_FirstHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_LastHoverExited: + m_PersistentCalls: + m_Calls: [] + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_FirstSelectEntered: + m_PersistentCalls: + m_Calls: [] + m_LastSelectExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_Activated: + m_PersistentCalls: + m_Calls: [] + m_Deactivated: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] + m_OnFirstHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_OnLastHoverExited: + m_PersistentCalls: + m_Calls: [] + m_OnHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_OnHoverExited: + m_PersistentCalls: + m_Calls: [] + m_OnSelectEntered: + m_PersistentCalls: + m_Calls: [] + m_OnSelectExited: + m_PersistentCalls: + m_Calls: [] + m_OnSelectCanceled: + m_PersistentCalls: + m_Calls: [] + m_OnActivate: + m_PersistentCalls: + m_Calls: [] + m_OnDeactivate: + m_PersistentCalls: + m_Calls: [] + isGazePinchSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isRaySelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isPokeSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGazeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGazePinchHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isRayHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isPokeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isActiveHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + disabledInteractorTypes: + - reference: MixedReality.Toolkit.IPokeInteractor, MixedReality.Toolkit.Core + k__BackingField: 0 + k__BackingField: 0.9 + k__BackingField: 0.1 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + allowSelectByVoice: 1 + speechRecognitionKeyword: select + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + hostTransform: {fileID: 491858691} + allowedManipulations: 7 + allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 + applyTorque: 1 + springForceSoftness: 0.1 + springTorqueSoftness: 0.1 + springDamping: 1 + springForceLimit: 100 + rotationAnchorNear: 1 + rotationAnchorFar: 1 + releaseBehavior: 3 + transformSmoothingLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.DefaultTransformSmoothingLogic, + MixedReality.Toolkit.SpatialManipulation + smoothingFar: 1 + smoothingNear: 1 + moveLerpTime: 0.001 + rotateLerpTime: 0.001 + scaleLerpTime: 0.001 + enableConstraints: 1 + constraintsManager: {fileID: 0} + manipulationLogicTypes: + moveLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation + rotateLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation + scaleLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation +--- !u!114 &1170623178 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1170623172} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 50cdab0cd5a0916419324bb54314773d, type: 3} + m_Name: + m_EditorClassIdentifier: + autoConstraintSelection: 1 + selectedConstraints: [] +--- !u!65 &1170623179 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1170623172} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 322, y: 341, z: 2} + m_Center: {x: 0, y: -12.5, z: 1} +--- !u!114 &1170623180 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1170623172} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 80f85af46f9bddd4ea78f11cee5e3b2e, type: 3} + m_Name: + m_EditorClassIdentifier: + handType: 3 + proximityType: 3 + executionOrder: 0 + minimumScale: {x: 0.2, y: 0.2, z: 0.2} + maximumScale: {x: 2, y: 2, z: 2} + relativeToInitialState: 1 --- !u!1 &1231290231 GameObject: m_ObjectHideFlags: 0 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/Audio/AudioOcclusionExample.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/Audio/AudioOcclusionExample.unity index 4065da16b..5349909fb 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/Audio/AudioOcclusionExample.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/Audio/AudioOcclusionExample.unity @@ -1689,7 +1689,7 @@ MonoBehaviour: k__BackingField: m_PersistentCalls: m_Calls: [] - hostTransform: {fileID: 1966272100} + hostTransform: {fileID: 1918790412} allowedManipulations: 7 allowedInteractionTypes: -1 rigidbodyMovementType: 0 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/DialogExample.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/DialogExample.unity index 9fe8894cf..93fe0c08b 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/DialogExample.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/DialogExample.unity @@ -1791,6 +1791,10 @@ GameObject: - component: {fileID: 1388522987} - component: {fileID: 1388522990} - component: {fileID: 1388522989} + - component: {fileID: 1388522993} + - component: {fileID: 1388522992} + - component: {fileID: 1388522991} + - component: {fileID: 1388522994} m_Layer: 0 m_Name: Canvas m_TagString: Untagged @@ -1863,6 +1867,281 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 +--- !u!114 &1388522991 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1388522986} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 1990843814} + m_Colliders: + - {fileID: 1388522993} + m_InteractionLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_InteractionLayers: + m_Bits: 1 + m_DistanceCalculationMode: 1 + m_SelectMode: 1 + m_CustomReticle: {fileID: 0} + m_AllowGazeInteraction: 0 + m_AllowGazeSelect: 0 + m_OverrideGazeTimeToSelect: 0 + m_GazeTimeToSelect: 0.5 + m_OverrideTimeToAutoDeselectGaze: 0 + m_TimeToAutoDeselectGaze: 3 + m_AllowGazeAssistance: 0 + m_FirstHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_LastHoverExited: + m_PersistentCalls: + m_Calls: [] + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_FirstSelectEntered: + m_PersistentCalls: + m_Calls: [] + m_LastSelectExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_Activated: + m_PersistentCalls: + m_Calls: [] + m_Deactivated: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] + m_OnFirstHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_OnLastHoverExited: + m_PersistentCalls: + m_Calls: [] + m_OnHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_OnHoverExited: + m_PersistentCalls: + m_Calls: [] + m_OnSelectEntered: + m_PersistentCalls: + m_Calls: [] + m_OnSelectExited: + m_PersistentCalls: + m_Calls: [] + m_OnSelectCanceled: + m_PersistentCalls: + m_Calls: [] + m_OnActivate: + m_PersistentCalls: + m_Calls: [] + m_OnDeactivate: + m_PersistentCalls: + m_Calls: [] + isGazePinchSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isRaySelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isPokeSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGazeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGazePinchHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isRayHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isPokeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isActiveHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + disabledInteractorTypes: + - reference: MixedReality.Toolkit.IPokeInteractor, MixedReality.Toolkit.Core + k__BackingField: 0 + k__BackingField: 0.9 + k__BackingField: 0.1 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + allowSelectByVoice: 1 + speechRecognitionKeyword: select + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + hostTransform: {fileID: 694430462} + allowedManipulations: 7 + allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 + applyTorque: 1 + springForceSoftness: 0.1 + springTorqueSoftness: 0.1 + springDamping: 1 + springForceLimit: 100 + rotationAnchorNear: 1 + rotationAnchorFar: 1 + releaseBehavior: 3 + transformSmoothingLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.DefaultTransformSmoothingLogic, + MixedReality.Toolkit.SpatialManipulation + smoothingFar: 1 + smoothingNear: 1 + moveLerpTime: 0.001 + rotateLerpTime: 0.001 + scaleLerpTime: 0.001 + enableConstraints: 1 + constraintsManager: {fileID: 0} + manipulationLogicTypes: + moveLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation + rotateLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation + scaleLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation +--- !u!114 &1388522992 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1388522986} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 50cdab0cd5a0916419324bb54314773d, type: 3} + m_Name: + m_EditorClassIdentifier: + autoConstraintSelection: 1 + selectedConstraints: [] +--- !u!65 &1388522993 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1388522986} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 197.8389, y: 291.3, z: 2} + m_Center: {x: 0, y: 0, z: 1} +--- !u!114 &1388522994 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1388522986} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 80f85af46f9bddd4ea78f11cee5e3b2e, type: 3} + m_Name: + m_EditorClassIdentifier: + handType: 3 + proximityType: 3 + executionOrder: 0 + minimumScale: {x: 0.2, y: 0.2, z: 0.2} + maximumScale: {x: 2, y: 2, z: 2} + relativeToInitialState: 1 --- !u!1001 &1389116871 PrefabInstance: m_ObjectHideFlags: 0 @@ -2417,6 +2696,17 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} m_PrefabInstance: {fileID: 110026553} m_PrefabAsset: {fileID: 0} +--- !u!114 &1990843814 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 800708247703322884, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + m_PrefabInstance: {fileID: 666296028} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &2058368292 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/NonCanvasDialogExample.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/NonCanvasDialogExample.unity index bf13ef1c2..73a25242e 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/NonCanvasDialogExample.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/NonCanvasDialogExample.unity @@ -1725,6 +1725,10 @@ GameObject: - component: {fileID: 1388522987} - component: {fileID: 1388522990} - component: {fileID: 1388522989} + - component: {fileID: 1388522994} + - component: {fileID: 1388522993} + - component: {fileID: 1388522992} + - component: {fileID: 1388522991} m_Layer: 0 m_Name: Canvas m_TagString: Untagged @@ -1797,6 +1801,281 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 +--- !u!114 &1388522991 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1388522986} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 80f85af46f9bddd4ea78f11cee5e3b2e, type: 3} + m_Name: + m_EditorClassIdentifier: + handType: 3 + proximityType: 3 + executionOrder: 0 + minimumScale: {x: 0.2, y: 0.2, z: 0.2} + maximumScale: {x: 2, y: 2, z: 2} + relativeToInitialState: 1 +--- !u!114 &1388522992 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1388522986} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 1990843814} + m_Colliders: + - {fileID: 1388522994} + m_InteractionLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_InteractionLayers: + m_Bits: 1 + m_DistanceCalculationMode: 1 + m_SelectMode: 1 + m_CustomReticle: {fileID: 0} + m_AllowGazeInteraction: 0 + m_AllowGazeSelect: 0 + m_OverrideGazeTimeToSelect: 0 + m_GazeTimeToSelect: 0.5 + m_OverrideTimeToAutoDeselectGaze: 0 + m_TimeToAutoDeselectGaze: 3 + m_AllowGazeAssistance: 0 + m_FirstHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_LastHoverExited: + m_PersistentCalls: + m_Calls: [] + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_FirstSelectEntered: + m_PersistentCalls: + m_Calls: [] + m_LastSelectExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_Activated: + m_PersistentCalls: + m_Calls: [] + m_Deactivated: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] + m_OnFirstHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_OnLastHoverExited: + m_PersistentCalls: + m_Calls: [] + m_OnHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_OnHoverExited: + m_PersistentCalls: + m_Calls: [] + m_OnSelectEntered: + m_PersistentCalls: + m_Calls: [] + m_OnSelectExited: + m_PersistentCalls: + m_Calls: [] + m_OnSelectCanceled: + m_PersistentCalls: + m_Calls: [] + m_OnActivate: + m_PersistentCalls: + m_Calls: [] + m_OnDeactivate: + m_PersistentCalls: + m_Calls: [] + isGazePinchSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isRaySelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isPokeSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGazeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGazePinchHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isRayHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isPokeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isActiveHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + disabledInteractorTypes: + - reference: MixedReality.Toolkit.IPokeInteractor, MixedReality.Toolkit.Core + k__BackingField: 0 + k__BackingField: 0.9 + k__BackingField: 0.1 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + allowSelectByVoice: 1 + speechRecognitionKeyword: select + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + hostTransform: {fileID: 694430462} + allowedManipulations: 7 + allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 + applyTorque: 1 + springForceSoftness: 0.1 + springTorqueSoftness: 0.1 + springDamping: 1 + springForceLimit: 100 + rotationAnchorNear: 1 + rotationAnchorFar: 1 + releaseBehavior: 3 + transformSmoothingLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.DefaultTransformSmoothingLogic, + MixedReality.Toolkit.SpatialManipulation + smoothingFar: 1 + smoothingNear: 1 + moveLerpTime: 0.001 + rotateLerpTime: 0.001 + scaleLerpTime: 0.001 + enableConstraints: 1 + constraintsManager: {fileID: 0} + manipulationLogicTypes: + moveLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation + rotateLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation + scaleLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation +--- !u!114 &1388522993 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1388522986} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 50cdab0cd5a0916419324bb54314773d, type: 3} + m_Name: + m_EditorClassIdentifier: + autoConstraintSelection: 1 + selectedConstraints: [] +--- !u!65 &1388522994 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1388522986} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 197.8389, y: 259.3, z: 2} + m_Center: {x: 0, y: 0, z: 1} --- !u!1001 &1389116871 PrefabInstance: m_ObjectHideFlags: 0 @@ -2166,6 +2445,17 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} +--- !u!114 &1990843814 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 800708247703322884, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + m_PrefabInstance: {fileID: 1798130885} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &2058368292 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/SpatialMappingExample.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/SpatialMappingExample.unity index 6e3b944d0..e1aeb5e96 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/SpatialMappingExample.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/SpatialMappingExample.unity @@ -149,7 +149,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 807272872} m_Modifications: - target: {fileID: 4950694038239395254, guid: a6483e229cd4fa742ad3a449648648ee, type: 3} propertyPath: Spatialize @@ -165,19 +165,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6356446544631578721, guid: a6483e229cd4fa742ad3a449648648ee, type: 3} propertyPath: m_RootOrder - value: 4 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6356446544631578721, guid: a6483e229cd4fa742ad3a449648648ee, type: 3} propertyPath: m_LocalPosition.x - value: 0.024 + value: 0.1768 objectReference: {fileID: 0} - target: {fileID: 6356446544631578721, guid: a6483e229cd4fa742ad3a449648648ee, type: 3} propertyPath: m_LocalPosition.y - value: 1.51 + value: -0.01639998 objectReference: {fileID: 0} - target: {fileID: 6356446544631578721, guid: a6483e229cd4fa742ad3a449648648ee, type: 3} propertyPath: m_LocalPosition.z - value: 0.78 + value: 0.010399997 objectReference: {fileID: 0} - target: {fileID: 6356446544631578721, guid: a6483e229cd4fa742ad3a449648648ee, type: 3} propertyPath: m_LocalRotation.w @@ -217,6 +217,44 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a6483e229cd4fa742ad3a449648648ee, type: 3} +--- !u!4 &572461882 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6356446544631578721, guid: a6483e229cd4fa742ad3a449648648ee, type: 3} + m_PrefabInstance: {fileID: 572461881} + m_PrefabAsset: {fileID: 0} +--- !u!1 &807272871 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 807272872} + m_Layer: 0 + m_Name: SceneContent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &807272872 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 807272871} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.1528, y: 1.5264, z: 0.7696} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 572461882} + - {fileID: 1636869729} + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &975632638 PrefabInstance: m_ObjectHideFlags: 0 @@ -278,7 +316,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} propertyPath: m_RootOrder - value: 6 + value: 5 objectReference: {fileID: 0} - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} propertyPath: m_LocalPosition.x @@ -334,6 +372,17 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} +--- !u!114 &1127029051 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 800708247703322884, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + m_PrefabInstance: {fileID: 2060945776} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1214139331 PrefabInstance: m_ObjectHideFlags: 0 @@ -343,7 +392,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} propertyPath: m_RootOrder - value: 7 + value: 6 objectReference: {fileID: 0} - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} propertyPath: m_LocalPosition.x @@ -461,7 +510,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 807272872} m_Modifications: - target: {fileID: 566361764857432160, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} propertyPath: m_AnchoredPosition.y @@ -488,7 +537,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} propertyPath: m_RootOrder - value: 5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} propertyPath: m_AnchorMax.x @@ -536,7 +585,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} propertyPath: m_LocalPosition.z - value: 0.7696 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} propertyPath: m_LocalRotation.w @@ -556,11 +605,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} propertyPath: m_AnchoredPosition.x - value: -0.1528 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} propertyPath: m_AnchoredPosition.y - value: 1.5264 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -664,6 +713,296 @@ MonoBehaviour: m_TextureCoordinates: 0 m_Colors: 1 m_ConcurrentQueueSize: 4 +--- !u!224 &1636869729 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + m_PrefabInstance: {fileID: 1636869728} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1636869730 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8323939510892415185, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + m_PrefabInstance: {fileID: 1636869728} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1636869731 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6540126486176102408, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + m_PrefabInstance: {fileID: 1636869728} + m_PrefabAsset: {fileID: 0} +--- !u!65 &1636869732 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1636869730} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.9999999, y: 0.9999999, z: 0.09999999} + m_Center: {x: 0, y: 0, z: 0.049999993} +--- !u!114 &1636869733 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1636869731} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 80f85af46f9bddd4ea78f11cee5e3b2e, type: 3} + m_Name: + m_EditorClassIdentifier: + handType: 3 + proximityType: 3 + executionOrder: 0 + minimumScale: {x: 0.2, y: 0.2, z: 0.2} + maximumScale: {x: 2, y: 2, z: 2} + relativeToInitialState: 1 +--- !u!114 &1636869734 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1636869731} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 1127029051} + m_Colliders: + - {fileID: 1636869732} + m_InteractionLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_InteractionLayers: + m_Bits: 1 + m_DistanceCalculationMode: 1 + m_SelectMode: 1 + m_CustomReticle: {fileID: 0} + m_AllowGazeInteraction: 0 + m_AllowGazeSelect: 0 + m_OverrideGazeTimeToSelect: 0 + m_GazeTimeToSelect: 0.5 + m_OverrideTimeToAutoDeselectGaze: 0 + m_TimeToAutoDeselectGaze: 3 + m_AllowGazeAssistance: 0 + m_FirstHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_LastHoverExited: + m_PersistentCalls: + m_Calls: [] + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_FirstSelectEntered: + m_PersistentCalls: + m_Calls: [] + m_LastSelectExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_Activated: + m_PersistentCalls: + m_Calls: [] + m_Deactivated: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] + m_OnFirstHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_OnLastHoverExited: + m_PersistentCalls: + m_Calls: [] + m_OnHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_OnHoverExited: + m_PersistentCalls: + m_Calls: [] + m_OnSelectEntered: + m_PersistentCalls: + m_Calls: [] + m_OnSelectExited: + m_PersistentCalls: + m_Calls: [] + m_OnSelectCanceled: + m_PersistentCalls: + m_Calls: [] + m_OnActivate: + m_PersistentCalls: + m_Calls: [] + m_OnDeactivate: + m_PersistentCalls: + m_Calls: [] + isGazePinchSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isRaySelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isPokeSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGazeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGazePinchHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isRayHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isPokeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isActiveHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + disabledInteractorTypes: + - reference: MixedReality.Toolkit.IPokeInteractor, MixedReality.Toolkit.Core + k__BackingField: 0 + k__BackingField: 0.9 + k__BackingField: 0.1 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + allowSelectByVoice: 1 + speechRecognitionKeyword: select + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + hostTransform: {fileID: 807272872} + allowedManipulations: 7 + allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 + applyTorque: 1 + springForceSoftness: 0.1 + springTorqueSoftness: 0.1 + springDamping: 1 + springForceLimit: 100 + rotationAnchorNear: 1 + rotationAnchorFar: 1 + releaseBehavior: 3 + transformSmoothingLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.DefaultTransformSmoothingLogic, + MixedReality.Toolkit.SpatialManipulation + smoothingFar: 1 + smoothingNear: 1 + moveLerpTime: 0.001 + rotateLerpTime: 0.001 + scaleLerpTime: 0.001 + enableConstraints: 1 + constraintsManager: {fileID: 0} + manipulationLogicTypes: + moveLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation + rotateLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation + scaleLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation +--- !u!114 &1636869735 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1636869731} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 50cdab0cd5a0916419324bb54314773d, type: 3} + m_Name: + m_EditorClassIdentifier: + autoConstraintSelection: 1 + selectedConstraints: [] --- !u!1001 &1743944743 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/ToggleCollectionExample.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/ToggleCollectionExample.unity index 3f3b8616c..f3de28652 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/ToggleCollectionExample.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/ToggleCollectionExample.unity @@ -385,6 +385,10 @@ GameObject: - component: {fileID: 60128899} - component: {fileID: 60128898} - component: {fileID: 60128897} + - component: {fileID: 60128903} + - component: {fileID: 60128902} + - component: {fileID: 60128901} + - component: {fileID: 60128900} m_Layer: 0 m_Name: Canvas m_TagString: Untagged @@ -474,6 +478,281 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 +--- !u!114 &60128900 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 60128895} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 80f85af46f9bddd4ea78f11cee5e3b2e, type: 3} + m_Name: + m_EditorClassIdentifier: + handType: 3 + proximityType: 3 + executionOrder: 0 + minimumScale: {x: 0.2, y: 0.2, z: 0.2} + maximumScale: {x: 2, y: 2, z: 2} + relativeToInitialState: 1 +--- !u!114 &60128901 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 60128895} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 1996034750} + m_Colliders: + - {fileID: 60128903} + m_InteractionLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_InteractionLayers: + m_Bits: 1 + m_DistanceCalculationMode: 1 + m_SelectMode: 1 + m_CustomReticle: {fileID: 0} + m_AllowGazeInteraction: 0 + m_AllowGazeSelect: 0 + m_OverrideGazeTimeToSelect: 0 + m_GazeTimeToSelect: 0.5 + m_OverrideTimeToAutoDeselectGaze: 0 + m_TimeToAutoDeselectGaze: 3 + m_AllowGazeAssistance: 0 + m_FirstHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_LastHoverExited: + m_PersistentCalls: + m_Calls: [] + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_FirstSelectEntered: + m_PersistentCalls: + m_Calls: [] + m_LastSelectExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_Activated: + m_PersistentCalls: + m_Calls: [] + m_Deactivated: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] + m_OnFirstHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_OnLastHoverExited: + m_PersistentCalls: + m_Calls: [] + m_OnHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_OnHoverExited: + m_PersistentCalls: + m_Calls: [] + m_OnSelectEntered: + m_PersistentCalls: + m_Calls: [] + m_OnSelectExited: + m_PersistentCalls: + m_Calls: [] + m_OnSelectCanceled: + m_PersistentCalls: + m_Calls: [] + m_OnActivate: + m_PersistentCalls: + m_Calls: [] + m_OnDeactivate: + m_PersistentCalls: + m_Calls: [] + isGazePinchSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isRaySelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isPokeSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGazeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGazePinchHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isRayHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isPokeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isActiveHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + disabledInteractorTypes: + - reference: MixedReality.Toolkit.IPokeInteractor, MixedReality.Toolkit.Core + k__BackingField: 0 + k__BackingField: 0.9 + k__BackingField: 0.1 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + allowSelectByVoice: 1 + speechRecognitionKeyword: select + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + hostTransform: {fileID: 161196863} + allowedManipulations: 7 + allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 + applyTorque: 1 + springForceSoftness: 0.1 + springTorqueSoftness: 0.1 + springDamping: 1 + springForceLimit: 100 + rotationAnchorNear: 1 + rotationAnchorFar: 1 + releaseBehavior: 3 + transformSmoothingLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.DefaultTransformSmoothingLogic, + MixedReality.Toolkit.SpatialManipulation + smoothingFar: 1 + smoothingNear: 1 + moveLerpTime: 0.001 + rotateLerpTime: 0.001 + scaleLerpTime: 0.001 + enableConstraints: 1 + constraintsManager: {fileID: 0} + manipulationLogicTypes: + moveLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation + rotateLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation + scaleLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation +--- !u!114 &60128902 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 60128895} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 50cdab0cd5a0916419324bb54314773d, type: 3} + m_Name: + m_EditorClassIdentifier: + autoConstraintSelection: 1 + selectedConstraints: [] +--- !u!65 &60128903 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 60128895} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 197.8389, y: 250, z: 2} + m_Center: {x: 0, y: 0, z: 1} --- !u!1 &161196862 GameObject: m_ObjectHideFlags: 0 @@ -2659,6 +2938,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c32e8a7644144f8419bb881ad588ed0e, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1996034750 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 800708247703322884, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + m_PrefabInstance: {fileID: 1444963630} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &2049952374 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/UnityProjects/MRTKDevTemplate/Packages/packages-lock.json b/UnityProjects/MRTKDevTemplate/Packages/packages-lock.json index 89c9645d5..f282671d1 100644 --- a/UnityProjects/MRTKDevTemplate/Packages/packages-lock.json +++ b/UnityProjects/MRTKDevTemplate/Packages/packages-lock.json @@ -330,8 +330,8 @@ "depth": 0, "source": "local", "dependencies": { - "com.microsoft.mrtk.graphicstools.unity": "0.5.12", - "org.mixedrealitytoolkit.core": "3.0.0", + "com.microsoft.mrtk.graphicstools.unity": "0.8.0", + "org.mixedrealitytoolkit.core": "3.2.2", "com.unity.textmeshpro": "3.0.6" } }, @@ -340,7 +340,7 @@ "depth": 0, "source": "local", "dependencies": { - "org.mixedrealitytoolkit.core": "3.0.0" + "org.mixedrealitytoolkit.core": "3.2.2" } }, "org.mixedrealitytoolkit.core": { @@ -358,7 +358,7 @@ "depth": 0, "source": "local", "dependencies": { - "org.mixedrealitytoolkit.core": "3.0.0", + "org.mixedrealitytoolkit.core": "3.2.2", "com.unity.nuget.newtonsoft-json": "2.0.2", "com.unity.textmeshpro": "3.0.6" } @@ -368,7 +368,7 @@ "depth": 0, "source": "local", "dependencies": { - "org.mixedrealitytoolkit.core": "3.0.0", + "org.mixedrealitytoolkit.core": "3.2.2", "com.unity.xr.management": "4.2.1" } }, @@ -377,7 +377,7 @@ "depth": 0, "source": "local", "dependencies": { - "org.mixedrealitytoolkit.standardassets": "3.1.0" + "org.mixedrealitytoolkit.standardassets": "3.2.1" } }, "org.mixedrealitytoolkit.input": { @@ -385,7 +385,7 @@ "depth": 0, "source": "local", "dependencies": { - "com.microsoft.mrtk.graphicstools.unity": "0.5.12", + "com.microsoft.mrtk.graphicstools.unity": "0.8.0", "com.unity.inputsystem": "1.6.1", "com.unity.xr.arfoundation": "5.0.5", "com.unity.xr.core-utils": "2.1.0", @@ -410,7 +410,7 @@ "depth": 0, "source": "local", "dependencies": { - "com.microsoft.mrtk.graphicstools.unity": "0.5.12" + "com.microsoft.mrtk.graphicstools.unity": "0.8.0" } }, "org.mixedrealitytoolkit.tools": { @@ -418,7 +418,7 @@ "depth": 0, "source": "local", "dependencies": { - "org.mixedrealitytoolkit.core": "3.0.0" + "org.mixedrealitytoolkit.core": "3.2.2" } }, "org.mixedrealitytoolkit.uxcomponents": { @@ -426,10 +426,10 @@ "depth": 0, "source": "local", "dependencies": { - "com.microsoft.mrtk.graphicstools.unity": "0.5.12", + "com.microsoft.mrtk.graphicstools.unity": "0.8.0", "org.mixedrealitytoolkit.uxcore": "4.0.0", "org.mixedrealitytoolkit.spatialmanipulation": "4.0.0", - "org.mixedrealitytoolkit.standardassets": "3.1.0", + "org.mixedrealitytoolkit.standardassets": "3.2.1", "com.unity.xr.interaction.toolkit": "3.0.4" } }, @@ -440,7 +440,7 @@ "dependencies": { "org.mixedrealitytoolkit.uxcore": "4.0.0", "org.mixedrealitytoolkit.spatialmanipulation": "4.0.0", - "org.mixedrealitytoolkit.standardassets": "3.1.0" + "org.mixedrealitytoolkit.standardassets": "3.2.1" } }, "org.mixedrealitytoolkit.uxcore": { @@ -448,7 +448,7 @@ "depth": 0, "source": "local", "dependencies": { - "com.microsoft.mrtk.graphicstools.unity": "0.5.12", + "com.microsoft.mrtk.graphicstools.unity": "0.8.0", "org.mixedrealitytoolkit.core": "4.0.0", "com.unity.inputsystem": "1.6.1", "com.unity.textmeshpro": "3.0.6", @@ -460,8 +460,8 @@ "depth": 0, "source": "local", "dependencies": { - "com.microsoft.mrtk.tts.windows": "1.0.1", - "org.mixedrealitytoolkit.core": "3.0.0" + "com.microsoft.mrtk.tts.windows": "1.0.4", + "org.mixedrealitytoolkit.core": "3.2.2" } }, "com.unity.modules.ai": { diff --git a/org.mixedrealitytoolkit.accessibility/CHANGELOG.md b/org.mixedrealitytoolkit.accessibility/CHANGELOG.md index b744072b5..acfe178c2 100644 --- a/org.mixedrealitytoolkit.accessibility/CHANGELOG.md +++ b/org.mixedrealitytoolkit.accessibility/CHANGELOG.md @@ -7,6 +7,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). ### Fixed * Reduced package description to support for UPM package publishing in the Unity Asset Store. +* Updated dependencies to match Unity Asset Store packages. [PR #1054](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1054) + * com.microsoft.mrtk.graphicstools.unity 0.8.0 + * org.mixedrealitytoolkit.core 3.2.2 ## [1.0.2-pre.20] - 2024-03-20 diff --git a/org.mixedrealitytoolkit.accessibility/package.json b/org.mixedrealitytoolkit.accessibility/package.json index ebe5fbe46..24564d64a 100644 --- a/org.mixedrealitytoolkit.accessibility/package.json +++ b/org.mixedrealitytoolkit.accessibility/package.json @@ -17,8 +17,8 @@ "unityRelease": "26f1", "documentationUrl": "https://www.mixedrealitytoolkit.org", "dependencies": { - "com.microsoft.mrtk.graphicstools.unity": "0.5.12", - "org.mixedrealitytoolkit.core": "3.0.0", + "com.microsoft.mrtk.graphicstools.unity": "0.8.0", + "org.mixedrealitytoolkit.core": "3.2.2", "com.unity.textmeshpro": "3.0.6" }, "msftTestDependencies": { diff --git a/org.mixedrealitytoolkit.audio/CHANGELOG.md b/org.mixedrealitytoolkit.audio/CHANGELOG.md index 7d0c77da7..70d4007af 100644 --- a/org.mixedrealitytoolkit.audio/CHANGELOG.md +++ b/org.mixedrealitytoolkit.audio/CHANGELOG.md @@ -2,7 +2,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). -## [3.0.4-development] - 2024-08-29 +## [3.0.5] - 2025-11-12 + +### Fixed + +* Updated dependencies to match Unity Asset Store packages. [PR #1054](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1054) + * org.mixedrealitytoolkit.core 3.2.2 + +## [3.0.4] - 2024-08-29 ### Changed diff --git a/org.mixedrealitytoolkit.audio/package.json b/org.mixedrealitytoolkit.audio/package.json index 8abe4a100..282f54933 100644 --- a/org.mixedrealitytoolkit.audio/package.json +++ b/org.mixedrealitytoolkit.audio/package.json @@ -1,6 +1,6 @@ { "name": "org.mixedrealitytoolkit.audio", - "version": "3.0.4-development", + "version": "3.0.5-development", "description": "Features to enhance audio in xr experiences.\n\nFor the audio effects to be spatialized, a spatializer plugin must be imported into the project. Spatializer plugins may be platform specific.", "displayName": "MRTK Audio Effects", "msftFeatureCategory": "MRTK3", @@ -17,7 +17,7 @@ "unityRelease": "26f1", "documentationUrl": "https://www.mixedrealitytoolkit.org", "dependencies": { - "org.mixedrealitytoolkit.core": "3.0.0" + "org.mixedrealitytoolkit.core": "3.2.2" }, "msftOptionalPackages": { "com.microsoft.spatialaudio.spatializer.unity": "1.0.246" diff --git a/org.mixedrealitytoolkit.core/CHANGELOG.md b/org.mixedrealitytoolkit.core/CHANGELOG.md index 58ea40a5f..34b687ad3 100644 --- a/org.mixedrealitytoolkit.core/CHANGELOG.md +++ b/org.mixedrealitytoolkit.core/CHANGELOG.md @@ -46,7 +46,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). * ControllerLookup marked as Obsolete. -## Unreleased 3.x +## [3.3.0] - 2025-11-12 ### Changed diff --git a/org.mixedrealitytoolkit.data/CHANGELOG.md b/org.mixedrealitytoolkit.data/CHANGELOG.md index 5c29f6615..2b354fdb7 100644 --- a/org.mixedrealitytoolkit.data/CHANGELOG.md +++ b/org.mixedrealitytoolkit.data/CHANGELOG.md @@ -8,6 +8,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). * Fixed missing [CanEditMultipleObject] attributes as per Bug 573 [PR #698](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/698) * Reduced package description to support for UPM package publishing in the Unity Asset Store. +* Updated dependencies to match Unity Asset Store packages. [PR #1054](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1054) + * org.mixedrealitytoolkit.core 3.2.2 ## [1.0.2-pre.20] - 2024-03-20 diff --git a/org.mixedrealitytoolkit.data/package.json b/org.mixedrealitytoolkit.data/package.json index 3c1f72f27..0dc0608de 100644 --- a/org.mixedrealitytoolkit.data/package.json +++ b/org.mixedrealitytoolkit.data/package.json @@ -17,7 +17,7 @@ "unityRelease": "26f1", "documentationUrl": "https://www.mixedrealitytoolkit.org", "dependencies": { - "org.mixedrealitytoolkit.core": "3.0.0", + "org.mixedrealitytoolkit.core": "3.2.2", "com.unity.nuget.newtonsoft-json": "2.0.2", "com.unity.textmeshpro": "3.0.6" } diff --git a/org.mixedrealitytoolkit.diagnostics/CHANGELOG.md b/org.mixedrealitytoolkit.diagnostics/CHANGELOG.md index 759af09ff..067563146 100644 --- a/org.mixedrealitytoolkit.diagnostics/CHANGELOG.md +++ b/org.mixedrealitytoolkit.diagnostics/CHANGELOG.md @@ -2,7 +2,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). -## [3.0.2-development] - 2024-03-20 +## [3.0.3] - 2025-11-12 + +### Fixed + +* Updated dependencies to match Unity Asset Store packages. [PR #1054](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1054) + * org.mixedrealitytoolkit.core 3.2.2 + +## [3.0.2] - 2024-03-20 ### Fixed diff --git a/org.mixedrealitytoolkit.diagnostics/package.json b/org.mixedrealitytoolkit.diagnostics/package.json index cda093da9..3d12bff44 100644 --- a/org.mixedrealitytoolkit.diagnostics/package.json +++ b/org.mixedrealitytoolkit.diagnostics/package.json @@ -1,6 +1,6 @@ { "name": "org.mixedrealitytoolkit.diagnostics", - "version": "3.0.2-development", + "version": "3.0.3-development", "description": "Subsystems and utilities for common diagnostic and performance monitoring tasks.", "displayName": "MRTK Diagnostics", "msftFeatureCategory": "MRTK3", @@ -17,7 +17,7 @@ "unityRelease": "26f1", "documentationUrl": "https://www.mixedrealitytoolkit.org", "dependencies": { - "org.mixedrealitytoolkit.core": "3.0.0", + "org.mixedrealitytoolkit.core": "3.2.2", "com.unity.xr.management": "4.2.1" } } \ No newline at end of file diff --git a/org.mixedrealitytoolkit.extendedassets/CHANGELOG.md b/org.mixedrealitytoolkit.extendedassets/CHANGELOG.md index 486447bee..fbbcc4a51 100644 --- a/org.mixedrealitytoolkit.extendedassets/CHANGELOG.md +++ b/org.mixedrealitytoolkit.extendedassets/CHANGELOG.md @@ -2,7 +2,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). -## [3.0.3-development] - 2024-08-29 +## [3.0.4] - 2025-11-12 + +### Fixed + +* Updated dependencies to match Unity Asset Store packages. [PR #1054](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1054) + * org.mixedrealitytoolkit.standardassets 3.2.1 + +## [3.0.3] - 2024-08-29 ### Changed diff --git a/org.mixedrealitytoolkit.extendedassets/package.json b/org.mixedrealitytoolkit.extendedassets/package.json index 584341e30..a48dfce7b 100644 --- a/org.mixedrealitytoolkit.extendedassets/package.json +++ b/org.mixedrealitytoolkit.extendedassets/package.json @@ -1,6 +1,6 @@ { "name": "org.mixedrealitytoolkit.extendedassets", - "version": "3.0.3-development", + "version": "3.0.4-development", "description": "This package offers additional assets helpful for example scenes or rapid prototyping. These assets are in addition to the more commonly-used assets located in StandardAssets.", "displayName": "MRTK Extended Assets", "msftFeatureCategory": "MRTK3", @@ -17,6 +17,6 @@ "unityRelease": "26f1", "documentationUrl": "https://www.mixedrealitytoolkit.org", "dependencies": { - "org.mixedrealitytoolkit.standardassets": "3.1.0" + "org.mixedrealitytoolkit.standardassets": "3.2.1" } } \ No newline at end of file diff --git a/org.mixedrealitytoolkit.input/CHANGELOG.md b/org.mixedrealitytoolkit.input/CHANGELOG.md index 7502b760c..7781c078b 100644 --- a/org.mixedrealitytoolkit.input/CHANGELOG.md +++ b/org.mixedrealitytoolkit.input/CHANGELOG.md @@ -4,34 +4,19 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). ## Unreleased -### Added - -* Added a project validation rule to ensure the Unity XR Hands subsystem is enabled in the OpenXR settings when the corresponding MRTK subsystem is enabled. [PR #973](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/973) -* Added support for Unity's com.unity.cloud.gltfast and com.unity.cloud.ktx packages when loading controller models. [PR #631](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/631) -* Added toggle for frame rate independent smoothing in camera simulation. [PR #1011](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1011) -* Added implementation for the synthesized TriggerButton, accounting for animation smoothing. [PR #1043](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1043) -* Added a "squeeze" alias for the grip states, to account for broader input action mapping support. [PR #1043](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1043) - -### Fixed - -* Fixed controller model fallback visualization becoming stuck visible when hands became tracked after initialization. [PR #984](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/984) - ### Changed * Updated the minimum editor version to 2022.3.6f1 [PR #1003](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1003) -* Updated tests to follow existing MRTK test patterns. [PR #1046](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1046) -* Remapped the synthetic hands config to read the float "select value" action instead of the bool "select" action, since it's read as a float. [PR #1043](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1043) * Split out mappings for "airtap" and "grab", as well as mapping other bespoke interaction profile actions (like those provided by the Hand Interaction Profile). [PR #1040](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1040) -* Updated tests to follow existing MRTK test patterns. [PR #1046](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1046) - -### Removed - -* Removed HandNode property and field from HandModel, as it was largely unused. [PR #1045](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1045) ### Deprecated * Deprecated IHandedInteractor across the interactor implementations, as its info is now queryable directly from IXRInteractor's handedness property. [PR #1042](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1042) +### Removed + +* Removed HandNode property and field from HandModel, as it was largely unused. [PR #1045](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1045) + ## [4.0.0-development.pre.1] - 2024-07-16 ### Added @@ -98,6 +83,28 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). * Removed obsolete ControllerVisualizer.HandsAggregator field. * Removed no longer needed Experimental\XRI3 folder +## [3.3.0] - 2025-11-12 + +### Added + +* Added a project validation rule to ensure the Unity XR Hands subsystem is enabled in the OpenXR settings when the corresponding MRTK subsystem is enabled. [PR #973](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/973) +* Added support for Unity's com.unity.cloud.gltfast and com.unity.cloud.ktx packages when loading controller models. [PR #631](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/631) +* Added toggle for frame rate independent smoothing in camera simulation. [PR #1011](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1011) +* Added implementation for the synthesized TriggerButton, accounting for animation smoothing. [PR #1043](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1043) +* Added a "squeeze" alias for the grip states, to account for broader input action mapping support. [PR #1043](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1043) + +### Changed + +* Remapped the synthetic hands config to read the float "select value" action instead of the bool "select" action, since it's read as a float. [PR #1043](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1043) +* Updated tests to follow existing MRTK test patterns. [PR #1046](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1046) + +### Fixed + +* Fixed controller model fallback visualization becoming stuck visible when hands became tracked after initialization. [PR #984](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/984) +* Updated dependencies to match Unity Asset Store packages. [PR #1054](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1054) + * com.microsoft.mrtk.graphicstools.unity 0.8.0 + * org.mixedrealitytoolkit.core 3.2.2 + ## [3.2.2] - 2024-09-18 ### Fixed diff --git a/org.mixedrealitytoolkit.input/MRTK.Input.asmdef b/org.mixedrealitytoolkit.input/MRTK.Input.asmdef index 80c051a23..75718572f 100644 --- a/org.mixedrealitytoolkit.input/MRTK.Input.asmdef +++ b/org.mixedrealitytoolkit.input/MRTK.Input.asmdef @@ -35,11 +35,31 @@ "expression": "", "define": "GLTFAST_PRESENT" }, + { + "name": "com.unity.cloud.gltfast", + "expression": "6.11", + "define": "GLTFAST_6_11_OR_NEWER" + }, + { + "name": "com.unity.cloud.gltfast", + "expression": "5", + "define": "GLTFAST_5_0_OR_NEWER" + }, { "name": "com.atteneder.gltfast", "expression": "", "define": "GLTFAST_PRESENT" }, + { + "name": "com.atteneder.gltfast", + "expression": "6.11", + "define": "GLTFAST_6_11_OR_NEWER" + }, + { + "name": "com.atteneder.gltfast", + "expression": "5", + "define": "GLTFAST_5_0_OR_NEWER" + }, { "name": "com.unity.xr.management", "expression": "4.2", diff --git a/org.mixedrealitytoolkit.input/Subsystems/Hands/UnityHandsSubsystem.cs b/org.mixedrealitytoolkit.input/Subsystems/Hands/UnityHandsSubsystem.cs index e1d87767f..ef893321a 100644 --- a/org.mixedrealitytoolkit.input/Subsystems/Hands/UnityHandsSubsystem.cs +++ b/org.mixedrealitytoolkit.input/Subsystems/Hands/UnityHandsSubsystem.cs @@ -48,7 +48,7 @@ private static void Register() /// public UnityHandsSubsystem() { -#if UNITY_ANDROID +#if UNITY_ANDROID && !UNITY_EDITOR if (!Permission.HasUserAuthorizedPermission(HandTrackingPermission)) { PermissionCallbacks callbacks = new(); @@ -84,7 +84,7 @@ void OnPermissionGranted(string permission) { Debug.Log($"{HandTrackingPermission} newly granted for MRTK."); } -#endif // UNITY_ANDROID +#endif // UNITY_ANDROID && !UNITY_EDITOR } private class UnityHandContainer : HandDataContainer diff --git a/org.mixedrealitytoolkit.input/Visualizers/ControllerVisualizer/ControllerModelLoader.cs b/org.mixedrealitytoolkit.input/Visualizers/ControllerVisualizer/ControllerModelLoader.cs index bb59c35c7..292f720b0 100644 --- a/org.mixedrealitytoolkit.input/Visualizers/ControllerVisualizer/ControllerModelLoader.cs +++ b/org.mixedrealitytoolkit.input/Visualizers/ControllerVisualizer/ControllerModelLoader.cs @@ -105,9 +105,21 @@ public async static Task TryGenerateControllerModelFromPlatformSDK(s // Finally try to create a GameObject from the model data GltfImport gltf = new GltfImport(); - bool success = await gltf.LoadGltfBinary(modelStream); gltfGameObject = new GameObject(modelKey.ToString()); - if (success && await gltf.InstantiateMainSceneAsync(gltfGameObject.transform)) + + if ( +#if GLTFAST_6_11_OR_NEWER + await gltf.Load(modelStream) +#else + await gltf.LoadGltfBinary(modelStream) +#endif + && +#if GLTFAST_5_0_OR_NEWER + await gltf.InstantiateMainSceneAsync(gltfGameObject.transform) +#else + gltf.InstantiateMainScene(gltfGameObject.transform) +#endif + ) { // After all the awaits, double check that another task didn't finish earlier if (controllerModelDictionary.TryGetValue(modelKey, out GameObject existingGameObject) && existingGameObject != null) diff --git a/org.mixedrealitytoolkit.input/package.json b/org.mixedrealitytoolkit.input/package.json index 2e82c0cdd..a8d509f42 100644 --- a/org.mixedrealitytoolkit.input/package.json +++ b/org.mixedrealitytoolkit.input/package.json @@ -17,7 +17,7 @@ "unityRelease": "6f1", "documentationUrl": "https://www.mixedrealitytoolkit.org", "dependencies": { - "com.microsoft.mrtk.graphicstools.unity": "0.5.12", + "com.microsoft.mrtk.graphicstools.unity": "0.8.0", "com.unity.inputsystem": "1.6.1", "com.unity.xr.arfoundation": "5.0.5", "com.unity.xr.core-utils": "2.1.0", diff --git a/org.mixedrealitytoolkit.spatialmanipulation/BoundsControl/Visuals/SpatialManipulationReticle.cs b/org.mixedrealitytoolkit.spatialmanipulation/BoundsControl/Visuals/SpatialManipulationReticle.cs index 5f892d9e6..d5c91a720 100644 --- a/org.mixedrealitytoolkit.spatialmanipulation/BoundsControl/Visuals/SpatialManipulationReticle.cs +++ b/org.mixedrealitytoolkit.spatialmanipulation/BoundsControl/Visuals/SpatialManipulationReticle.cs @@ -13,6 +13,7 @@ namespace MixedReality.Toolkit.SpatialManipulation /// A reticle used to visualize spatial manipulation capabilities when hovering over a bounding box handle. /// The reticle is oriented in relation to the bounding box, to indicate the direction for rotation or scaling. /// + [AddComponentMenu("MRTK/Spatial Manipulation/Spatial Manipulation Reticle")] public class SpatialManipulationReticle : MonoBehaviour, IReticleVisual { /// @@ -114,7 +115,7 @@ private void RotateReticle(Vector3 reticleNormal, Transform hitTargetTransform) } default: break; } - + // Cache the world rotation worldRotationCache = transform.rotation; } diff --git a/org.mixedrealitytoolkit.spatialmanipulation/CHANGELOG.md b/org.mixedrealitytoolkit.spatialmanipulation/CHANGELOG.md index bb704220c..a8b76d3f2 100644 --- a/org.mixedrealitytoolkit.spatialmanipulation/CHANGELOG.md +++ b/org.mixedrealitytoolkit.spatialmanipulation/CHANGELOG.md @@ -23,7 +23,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). * Updated package com.unity.xr.interaction.toolkit to 3.0.4 -## Unreleased +## [3.4.0] - 2025-11-12 ### Added @@ -37,6 +37,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). * ConstantViewSize solver now retains the initial scale and aspect ratio [PR #719](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/719) * Fixed Follow solver frequently logging "Look Rotation Viewing Vector Is Zero" [PR #895](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/895) * Fixed issues with HandConstraint hand tracking events not being fired (OnFirstHandDetected/OnHandActivate/OnLastHandLost/OnHandDeactivate) when SolverHandler TrackedHand is set to Right or Left (not Both) [PR #956](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/956) +* Updated dependencies to match Unity Asset Store packages. [PR #1054](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1054) + * org.mixedrealitytoolkit.core 3.2.2 +* Fixed `Constraint Manager` not properly highlighting custom constraints via the "Go to component" button. [PR #1078](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1078) ## [3.3.0] - 2024-04-30 diff --git a/org.mixedrealitytoolkit.spatialmanipulation/Constraints/FixedDistanceConstraint.cs b/org.mixedrealitytoolkit.spatialmanipulation/Constraints/FixedDistanceConstraint.cs index 210f3efcc..0632b09f7 100644 --- a/org.mixedrealitytoolkit.spatialmanipulation/Constraints/FixedDistanceConstraint.cs +++ b/org.mixedrealitytoolkit.spatialmanipulation/Constraints/FixedDistanceConstraint.cs @@ -13,6 +13,7 @@ namespace MixedReality.Toolkit.SpatialManipulation /// MRTK's constraint system might be redesigned in the near future. When /// this occurs, the old constraint components will be deprecated. /// + [AddComponentMenu("MRTK/Spatial Manipulation/Fixed Distance Constraint")] public class FixedDistanceConstraint : TransformConstraint { #region Properties diff --git a/org.mixedrealitytoolkit.spatialmanipulation/Constraints/FixedRotationToUserConstraint.cs b/org.mixedrealitytoolkit.spatialmanipulation/Constraints/FixedRotationToUserConstraint.cs index d444772ca..56c9e6931 100644 --- a/org.mixedrealitytoolkit.spatialmanipulation/Constraints/FixedRotationToUserConstraint.cs +++ b/org.mixedrealitytoolkit.spatialmanipulation/Constraints/FixedRotationToUserConstraint.cs @@ -12,6 +12,7 @@ namespace MixedReality.Toolkit.SpatialManipulation /// MRTK's constraint system might be redesigned in the near future. When /// this occurs, the old constraint components will be deprecated. /// + [AddComponentMenu("MRTK/Spatial Manipulation/Fixed Rotation to User Constraint")] public class FixedRotationToUserConstraint : TransformConstraint { #region Properties @@ -46,4 +47,4 @@ public override void ApplyConstraint(ref MixedRealityTransform transform) #endregion Public Methods } -} \ No newline at end of file +} diff --git a/org.mixedrealitytoolkit.spatialmanipulation/Constraints/FixedRotationToWorldConstraint.cs b/org.mixedrealitytoolkit.spatialmanipulation/Constraints/FixedRotationToWorldConstraint.cs index 710f0ec3f..19cd2d4f8 100644 --- a/org.mixedrealitytoolkit.spatialmanipulation/Constraints/FixedRotationToWorldConstraint.cs +++ b/org.mixedrealitytoolkit.spatialmanipulation/Constraints/FixedRotationToWorldConstraint.cs @@ -1,6 +1,8 @@ // Copyright (c) Mixed Reality Toolkit Contributors // Licensed under the BSD 3-Clause +using UnityEngine; + namespace MixedReality.Toolkit.SpatialManipulation { /// @@ -10,6 +12,7 @@ namespace MixedReality.Toolkit.SpatialManipulation /// MRTK's constraint system might be redesigned in the near future. When /// this occurs, the old constraint components will be deprecated. /// + [AddComponentMenu("MRTK/Spatial Manipulation/Fixed Rotation to World Constraint")] public class FixedRotationToWorldConstraint : TransformConstraint { #region Properties @@ -31,4 +34,4 @@ public override void ApplyConstraint(ref MixedRealityTransform transform) #endregion Public Methods } -} \ No newline at end of file +} diff --git a/org.mixedrealitytoolkit.spatialmanipulation/Constraints/MaintainApparentSizeConstraint.cs b/org.mixedrealitytoolkit.spatialmanipulation/Constraints/MaintainApparentSizeConstraint.cs index 2d457ef14..11c84fc20 100644 --- a/org.mixedrealitytoolkit.spatialmanipulation/Constraints/MaintainApparentSizeConstraint.cs +++ b/org.mixedrealitytoolkit.spatialmanipulation/Constraints/MaintainApparentSizeConstraint.cs @@ -13,6 +13,7 @@ namespace MixedReality.Toolkit.SpatialManipulation /// MRTK's constraint system might be redesigned in the near future. When /// this occurs, the old constraint components will be deprecated. /// + [AddComponentMenu("MRTK/Spatial Manipulation/Maintain Apparent Size Constraint")] public class MaintainApparentSizeConstraint : TransformConstraint { #region Properties diff --git a/org.mixedrealitytoolkit.spatialmanipulation/Constraints/MoveAxisConstraint.cs b/org.mixedrealitytoolkit.spatialmanipulation/Constraints/MoveAxisConstraint.cs index 95005e494..7694ea4f5 100644 --- a/org.mixedrealitytoolkit.spatialmanipulation/Constraints/MoveAxisConstraint.cs +++ b/org.mixedrealitytoolkit.spatialmanipulation/Constraints/MoveAxisConstraint.cs @@ -13,6 +13,7 @@ namespace MixedReality.Toolkit.SpatialManipulation /// MRTK's constraint system might be redesigned in the near future. When /// this occurs, the old constraint components will be deprecated. /// + [AddComponentMenu("MRTK/Spatial Manipulation/Move Axis Constraint")] public class MoveAxisConstraint : TransformConstraint { #region Properties @@ -103,4 +104,4 @@ public override void ApplyConstraint(ref MixedRealityTransform transform) #endregion Public Methods } -} \ No newline at end of file +} diff --git a/org.mixedrealitytoolkit.spatialmanipulation/Constraints/RotationAxisConstraint.cs b/org.mixedrealitytoolkit.spatialmanipulation/Constraints/RotationAxisConstraint.cs index 243e44609..8ccea8cff 100644 --- a/org.mixedrealitytoolkit.spatialmanipulation/Constraints/RotationAxisConstraint.cs +++ b/org.mixedrealitytoolkit.spatialmanipulation/Constraints/RotationAxisConstraint.cs @@ -12,6 +12,7 @@ namespace MixedReality.Toolkit.SpatialManipulation /// /// The constraint system might be reworked in the future. In such a case, these existing components will be deprecated. /// + [AddComponentMenu("MRTK/Spatial Manipulation/Rotation Axis Constraint")] public class RotationAxisConstraint : TransformConstraint { #region Properties @@ -78,4 +79,4 @@ public override void ApplyConstraint(ref MixedRealityTransform transform) #endregion Public Methods } -} \ No newline at end of file +} diff --git a/org.mixedrealitytoolkit.spatialmanipulation/Editor/Constraints/ConstraintManagerEditor.cs b/org.mixedrealitytoolkit.spatialmanipulation/Editor/Constraints/ConstraintManagerEditor.cs index 6ce110fd4..0ca95ed62 100644 --- a/org.mixedrealitytoolkit.spatialmanipulation/Editor/Constraints/ConstraintManagerEditor.cs +++ b/org.mixedrealitytoolkit.spatialmanipulation/Editor/Constraints/ConstraintManagerEditor.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Reflection; using UnityEditor; using UnityEngine; @@ -29,7 +30,7 @@ public class ConstraintManagerEditor : UnityEditor.Editor private ConstraintManager constraintManager; private const string autoMsg = "Constraint manager is currently set to auto mode. In auto mode all" + - " constraints attached to this gameobject will automatically be processed by this manager."; + " constraints attached to this GameObject will automatically be processed by this manager."; private const string manualMsg = "Constraint manager is currently set to manual mode. In manual mode" + " only constraints that are linked in the below component list will be processed by this manager."; @@ -75,7 +76,7 @@ private static EntryAction RenderManualConstraintItem(SerializedProperty constra return EntryAction.Highlight; } - if (InspectorUIUtility.FlexButton(new GUIContent("Remove Entry", "Remove constraint from constraint manager but keep constraint component attached to the gameobject."))) + if (InspectorUIUtility.FlexButton(new GUIContent("Remove Entry", "Remove constraint from constraint manager but keep constraint component attached to the GameObject."))) { return EntryAction.Detach; } @@ -86,8 +87,8 @@ private static EntryAction RenderManualConstraintItem(SerializedProperty constra private void AddNewConstraint(Type t) { - var constraint = constraintManager.gameObject.AddComponent((Type)t); - AttachConstraint((TransformConstraint)constraint); + TransformConstraint constraint = constraintManager.gameObject.AddComponent(t) as TransformConstraint; + AttachConstraint(constraint); } private void AttachConstraint(TransformConstraint constraint) @@ -101,23 +102,21 @@ private void AttachConstraint(TransformConstraint constraint) private void RenderAutoConstraintMenu() { // component list - var constraints = constraintManager.gameObject.GetComponents(); - foreach (var constraint in constraints) + TransformConstraint[] constraints = constraintManager.gameObject.GetComponents(); + foreach (TransformConstraint constraint in constraints) { using (new EditorGUILayout.HorizontalScope()) { - string constraintName = constraint.GetType().Name; - EditorGUILayout.LabelField($"Priority {(constraint as TransformConstraint).ExecutionPriority}: {constraint.GetType().Name}"); + EditorGUILayout.LabelField($"Priority {constraint.ExecutionPriority}: {constraint.GetType().Name}"); if (GUILayout.Button("Go to component")) { - Highlighter.Highlight("Inspector", $"{ObjectNames.NicifyVariableName(constraintName)}"); - EditorGUIUtility.ExitGUI(); + HighlightConstraint(constraint.GetType()); } } } // add button - if (EditorGUILayout.DropdownButton(new GUIContent("Add Constraint to GameObject", "Add a constraint to the gameobject that will be picked up by the constraint manager auto mode."), FocusType.Keyboard)) + if (EditorGUILayout.DropdownButton(new GUIContent("Add Constraint to GameObject", "Add a constraint to the GameObject that will be picked up by the constraint manager auto mode."), FocusType.Keyboard)) { // create the menu and add items to it GenericMenu menu = new GenericMenu(); @@ -129,8 +128,7 @@ private void RenderAutoConstraintMenu() foreach (var derivedType in types) { - menu.AddItem(new GUIContent(derivedType.Name), false, t => - constraintManager.gameObject.AddComponent((Type)t), derivedType); + menu.AddItem(new GUIContent(derivedType.Name), false, t => constraintManager.gameObject.AddComponent((Type)t), derivedType); } menu.ShowAsContext(); @@ -142,16 +140,14 @@ private void RenderManualConstraintMenu() for (int i = 0; i < selectedConstraints.arraySize; i++) { SerializedProperty constraintProperty = selectedConstraints.GetArrayElementAtIndex(i); - var buttonAction = RenderManualConstraintItem(constraintProperty, true); + EntryAction buttonAction = RenderManualConstraintItem(constraintProperty, true); if (buttonAction == EntryAction.Detach) { indicesToRemove.Add(i); } else if (buttonAction == EntryAction.Highlight) { - string constraintName = constraintProperty.objectReferenceValue.GetType().Name; - Highlighter.Highlight("Inspector", $"{ObjectNames.NicifyVariableName(constraintName)}"); - EditorGUIUtility.ExitGUI(); + HighlightConstraint(constraintProperty.objectReferenceValue.GetType()); } } @@ -159,7 +155,7 @@ private void RenderManualConstraintMenu() { using (new EditorGUILayout.HorizontalScope()) { - if (EditorGUILayout.DropdownButton(new GUIContent("Add Entry", "Attach an already existing component from this gameobject to the constraint manager selection."), FocusType.Keyboard)) + if (EditorGUILayout.DropdownButton(new GUIContent("Add Entry", "Attach an already existing component from this GameObject to the constraint manager selection."), FocusType.Keyboard)) { // create the menu and add items to it GenericMenu menu = new GenericMenu(); @@ -175,8 +171,7 @@ private void RenderManualConstraintMenu() { hasEntries = true; string constraintName = constraint.GetType().Name; - menu.AddItem(new GUIContent(constraintName), false, t => - AttachConstraint((TransformConstraint)t), constraint); + menu.AddItem(new GUIContent(constraintName), false, t => AttachConstraint((TransformConstraint)t), constraint); } } @@ -194,7 +189,7 @@ private void RenderManualConstraintMenu() menu.ShowAsContext(); } - if (EditorGUILayout.DropdownButton(new GUIContent("Add New Constraint", "Add a constraint to the gameobject and attach to this constraint manager selection."), FocusType.Keyboard)) + if (EditorGUILayout.DropdownButton(new GUIContent("Add New Constraint", "Add a constraint to the GameObject and attach to this constraint manager selection."), FocusType.Keyboard)) { // create the menu and add items to it GenericMenu menu = new GenericMenu(); @@ -206,8 +201,7 @@ private void RenderManualConstraintMenu() foreach (var derivedType in types) { - menu.AddItem(new GUIContent(derivedType.Name), false, t => - AddNewConstraint((Type)t), derivedType); + menu.AddItem(new GUIContent(derivedType.Name), false, t => AddNewConstraint((Type)t), derivedType); } menu.ShowAsContext(); @@ -216,6 +210,23 @@ private void RenderManualConstraintMenu() } } + private void HighlightConstraint(Type type) + { + string highlightName; + AddComponentMenu addComponentMenu = type.GetCustomAttribute(); + if (addComponentMenu != null) + { + // Parse the "nice" name as the last item from the add component menu + highlightName = addComponentMenu.componentMenu.Replace('\\', '/').Split('/')[^1]; + } + else + { + highlightName = $"{ObjectNames.NicifyVariableName(type.Name)} (Script)"; + } + Highlighter.Highlight("Inspector", highlightName); + GUIUtility.ExitGUI(); + } + /// /// Called by the Unity editor to render custom inspector UI for this component. /// @@ -233,8 +244,7 @@ public override void OnInspectorGUI() { EditorGUILayout.Space(); - EditorGUILayout.HelpBox(autoConstraintSelection.boolValue == true ? autoMsg : manualMsg - , UnityEditor.MessageType.Info); + EditorGUILayout.HelpBox(autoConstraintSelection.boolValue == true ? autoMsg : manualMsg, MessageType.Info); EditorGUILayout.Space(); int tab = autoConstraintSelection.boolValue == true ? 0 : 1; @@ -276,7 +286,7 @@ public override void OnInspectorGUI() // we render the instance id of this component so our highlighting function can distinguish between // the different instances of constraint manager - highlighting in the inspector is currently // only available for string search which causes problems with multiple components of the same type - // attached to the same gameobject. + // attached to the same GameObject. EditorGUILayout.Space(); EditorGUILayout.LabelField("ComponentId: " + constraintManager.GetInstanceID(), EditorStyles.miniLabel); @@ -302,7 +312,7 @@ public override void OnInspectorGUI() } /// - /// Util method for drawing a consistent constraints section. + /// Utility method for drawing a consistent constraints section. /// Use this method in a component inspector for linking to a constraint manager. /// /// Game object the constraint manager is attached to. @@ -310,7 +320,7 @@ public override void OnInspectorGUI() /// Serialized property of the constraint manager component link - needs to be type of ConstraintManager. /// Flag for indicating if the constraint foldout was previously collapsed or expanded. /// Current state of expanded or collapsed constraint foldout. Returns true if expanded / contents visible. - static public bool DrawConstraintManagerFoldout(GameObject gameObject, SerializedProperty managerEnabled, SerializedProperty managerRef, bool isExpanded) + public static bool DrawConstraintManagerFoldout(GameObject gameObject, SerializedProperty managerEnabled, SerializedProperty managerRef, bool isExpanded) { isExpanded = EditorGUILayout.Foldout(isExpanded, "Constraints", true); @@ -340,7 +350,7 @@ static public bool DrawConstraintManagerFoldout(GameObject gameObject, Serialize // popups will only show unique elements // in case of auto selection we don't care which one we're selecting as the behavior will be the same. - // in case of manual selection users might want to differentiate which constraintmanager they are referring to. + // in case of manual selection users might want to differentiate which ConstraintManager they are referring to. if (manager.AutoConstraintSelection == true) { options[i] = manager.GetType().Name + " (auto)"; @@ -361,7 +371,7 @@ static public bool DrawConstraintManagerFoldout(GameObject gameObject, Serialize { EditorGUIUtility.PingObject(selectedConstraintManager); Highlighter.Highlight("Inspector", $"ComponentId: {selectedConstraintManager.GetInstanceID()}"); - EditorGUIUtility.ExitGUI(); + GUIUtility.ExitGUI(); } } diff --git a/org.mixedrealitytoolkit.standardassets/CHANGELOG.md b/org.mixedrealitytoolkit.standardassets/CHANGELOG.md index f4fd70603..7c7e8b9bf 100644 --- a/org.mixedrealitytoolkit.standardassets/CHANGELOG.md +++ b/org.mixedrealitytoolkit.standardassets/CHANGELOG.md @@ -2,7 +2,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). -## [3.2.0-development] - 2024-03-22 +## [3.2.1] - 2025-11-12 + +### Fixed + +* Updated dependencies to match Unity Asset Store packages. [PR #1054](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1054) + * com.microsoft.mrtk.graphicstools.unity 0.8.0 + +## [3.2.0] - 2024-03-22 ### Added @@ -14,8 +21,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). * Added SimpleEmptyButton (Experimental) and SimpleActionButton (Experimental) prefabs plus corresponding (Experimental) assets and demoscene. [PR #635](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/635) -### Fixed +### Fixed * Fixed support for UPM package publishing in the Unity Asset Store. [PR #519](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/519) * Fixing shaders of a couple of TMPro fonts [PR #696](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/696) -* Set the Data packages's CooperHewitt-BoldItalic SDK shader to the Graphic Tools TMPro shader [PR #696](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/696) \ No newline at end of file +* Set the Data packages's CooperHewitt-BoldItalic SDK shader to the Graphic Tools TMPro shader [PR #696](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/696) diff --git a/org.mixedrealitytoolkit.standardassets/package.json b/org.mixedrealitytoolkit.standardassets/package.json index 9af9f7c28..a0b21e70f 100644 --- a/org.mixedrealitytoolkit.standardassets/package.json +++ b/org.mixedrealitytoolkit.standardassets/package.json @@ -1,6 +1,6 @@ { "name": "org.mixedrealitytoolkit.standardassets", - "version": "3.2.0-development", + "version": "3.2.1-development", "description": "Common assets used by the MRTK packages, including common fonts, materials, and models. Relies on the Graphics Tools collection of shaders.", "displayName": "MRTK Standard Assets", "msftFeatureCategory": "MRTK3", @@ -17,6 +17,6 @@ "url": "https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/issues" }, "dependencies": { - "com.microsoft.mrtk.graphicstools.unity": "0.5.12" + "com.microsoft.mrtk.graphicstools.unity": "0.8.0" } } \ No newline at end of file diff --git a/org.mixedrealitytoolkit.tools/CHANGELOG.md b/org.mixedrealitytoolkit.tools/CHANGELOG.md index 66698e2f4..136ff5ea9 100644 --- a/org.mixedrealitytoolkit.tools/CHANGELOG.md +++ b/org.mixedrealitytoolkit.tools/CHANGELOG.md @@ -2,7 +2,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). -## [3.0.4-development] - 2024-08-29 +## [3.0.5] - 2025-11-12 + +### Fixed + +* Updated dependencies to match Unity Asset Store packages. [PR #1054](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1054) + * org.mixedrealitytoolkit.core 3.2.2 + +## [3.0.4] - 2024-08-29 ### Changed diff --git a/org.mixedrealitytoolkit.tools/package.json b/org.mixedrealitytoolkit.tools/package.json index c31ea053b..9bcb37a38 100644 --- a/org.mixedrealitytoolkit.tools/package.json +++ b/org.mixedrealitytoolkit.tools/package.json @@ -1,6 +1,6 @@ { "name": "org.mixedrealitytoolkit.tools", - "version": "3.0.4-development", + "version": "3.0.5-development", "description": "A collection of tools, utilities, and wizards that can be used to create and analyze components for use with MRTK3.", "displayName": "MRTK Tools", "msftFeatureCategory": "MRTK3", @@ -17,6 +17,6 @@ "unityRelease": "26f1", "documentationUrl": "https://www.mixedrealitytoolkit.org", "dependencies": { - "org.mixedrealitytoolkit.core": "3.0.0" + "org.mixedrealitytoolkit.core": "3.2.2" } } \ No newline at end of file diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/CHANGELOG.md b/org.mixedrealitytoolkit.uxcomponents.noncanvas/CHANGELOG.md index e0977b989..80bfd2813 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/CHANGELOG.md +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/CHANGELOG.md @@ -14,7 +14,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). * Updated package com.unity.xr.interaction.toolkit to 3.0.4 -## [3.1.4-development] - 2024-08-29 +## [3.1.5] - 2025-11-12 + +### Fixed + +* Updated dependencies to match Unity Asset Store packages. [PR #1054](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1054) + * org.mixedrealitytoolkit.uxcore 3.3.0 + * org.mixedrealitytoolkit.spatialmanipulation 3.4.0 + * org.mixedrealitytoolkit.standardassets 3.2.1 + +## [3.1.4] - 2024-09-18 ### Changed diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/package.json b/org.mixedrealitytoolkit.uxcomponents.noncanvas/package.json index 592610813..565b2a570 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/package.json +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/package.json @@ -19,7 +19,7 @@ "dependencies": { "org.mixedrealitytoolkit.uxcore": "4.0.0", "org.mixedrealitytoolkit.spatialmanipulation": "4.0.0", - "org.mixedrealitytoolkit.standardassets": "3.1.0" + "org.mixedrealitytoolkit.standardassets": "3.2.1" }, "msftOptionalPackages": { "org.mixedrealitytoolkit.data": "1.0.0-development" diff --git a/org.mixedrealitytoolkit.uxcomponents/CHANGELOG.md b/org.mixedrealitytoolkit.uxcomponents/CHANGELOG.md index f52bd0588..acd516ddf 100644 --- a/org.mixedrealitytoolkit.uxcomponents/CHANGELOG.md +++ b/org.mixedrealitytoolkit.uxcomponents/CHANGELOG.md @@ -4,14 +4,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). ## Unreleased -### Added - -* Added touch support for the NonNativeKeyboard. [PR #655](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/655) - -### Fixed - -* Changed PressableButton_Custom_Cylinder using Default-Material to MRTK_Standard_White instead. [PR #740](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/740) - ### Changed * Updated the minimum editor version to 2022.3.6f1 [PR #1003](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1003) @@ -22,6 +14,19 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). * Updated package com.unity.xr.interaction.toolkit to 3.0.4 +## [3.4.0] - 2025-11-12 + +### Added + +* Added touch support for the NonNativeKeyboard. [PR #655](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/655) + +### Fixed + +* Changed PressableButton_Custom_Cylinder using Default-Material to MRTK_Standard_White instead. [PR #740](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/740) +* Updated dependencies to match Unity Asset Store packages. [PR #1054](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1054) + * com.microsoft.mrtk.graphicstools.unity 0.8.0 + * org.mixedrealitytoolkit.standardassets 3.2.1 + ## [3.3.0] - 2024-06-13 ### Added diff --git a/org.mixedrealitytoolkit.uxcomponents/package.json b/org.mixedrealitytoolkit.uxcomponents/package.json index 2282dd946..6fd05fae9 100644 --- a/org.mixedrealitytoolkit.uxcomponents/package.json +++ b/org.mixedrealitytoolkit.uxcomponents/package.json @@ -17,10 +17,10 @@ "unityRelease": "6f1", "documentationUrl": "https://www.mixedrealitytoolkit.org", "dependencies": { - "com.microsoft.mrtk.graphicstools.unity": "0.5.12", + "com.microsoft.mrtk.graphicstools.unity": "0.8.0", "org.mixedrealitytoolkit.uxcore": "4.0.0", "org.mixedrealitytoolkit.spatialmanipulation": "4.0.0", - "org.mixedrealitytoolkit.standardassets": "3.1.0", + "org.mixedrealitytoolkit.standardassets": "3.2.1", "com.unity.xr.interaction.toolkit": "3.0.4" }, "msftTestDependencies": { diff --git a/org.mixedrealitytoolkit.uxcore/Button/PressableButton.cs b/org.mixedrealitytoolkit.uxcore/Button/PressableButton.cs index a4b77f107..ac95cde2c 100644 --- a/org.mixedrealitytoolkit.uxcore/Button/PressableButton.cs +++ b/org.mixedrealitytoolkit.uxcore/Button/PressableButton.cs @@ -1,7 +1,6 @@ // Copyright (c) Mixed Reality Toolkit Contributors // Licensed under the BSD 3-Clause -using MixedReality.Toolkit.Input; using System.Collections.Generic; using Unity.Profiling; using UnityEngine; @@ -10,6 +9,10 @@ using UnityEngine.XR.Interaction.Toolkit.Interactables; using UnityEngine.XR.Interaction.Toolkit.Interactors; +#if MRTK_INPUT_PRESENT +using MixedReality.Toolkit.Input; +#endif + namespace MixedReality.Toolkit.UX { /// @@ -21,7 +24,11 @@ namespace MixedReality.Toolkit.UX /// to obtain a selection progress value or a local displacement, respectively, to implement a visual layer. /// [AddComponentMenu("MRTK/UX/Pressable Button")] - public class PressableButton : StatefulInteractable, IXRProximityInteractable + public class PressableButton : StatefulInteractable +#if MRTK_INPUT_PRESENT + , IXRProximityInteractable +#endif + { [SerializeField] [FormerlySerializedAs("smoothSelectedness")] @@ -183,10 +190,12 @@ public SpaceMode DistanceSpaceMode /// private float WorldToLocalScale => transform.InverseTransformVector(transform.forward).magnitude; +#if MRTK_INPUT_PRESENT /// /// Holds the detectors that trigger proximity. /// private HashSet activeDetectors = new HashSet(); +#endif /// /// If the value is smoothed to within this threshold of 0 or 1, the will snap to 0 or 1. @@ -605,7 +614,6 @@ private bool IsRolledOff() { return true; } - } return false; @@ -641,6 +649,7 @@ private float IntersectQuad(Vector3 start, Vector3 end, float depth) } } +#if MRTK_INPUT_PRESENT /// public void OnProximityEntered(ProximityEnteredEventArgs proximityEnteredEventArgs) { @@ -659,13 +668,18 @@ public void OnProximityExited(ProximityExitedEventArgs proximityExitedEventArgs) UpdateProximityHovered(); } } +#endif /// /// Updates the IsProximityHovered flag based on the whether it is hovered or has active interaction. /// private void UpdateProximityHovered() { - IsProximityHovered.Active = isHovered || (activeDetectors.Count > 0); + IsProximityHovered.Active = isHovered +#if MRTK_INPUT_PRESENT + || (activeDetectors.Count > 0) +#endif + ; } #endregion Private Methods diff --git a/org.mixedrealitytoolkit.uxcore/CHANGELOG.md b/org.mixedrealitytoolkit.uxcore/CHANGELOG.md index 9dd73a033..efffd489f 100644 --- a/org.mixedrealitytoolkit.uxcore/CHANGELOG.md +++ b/org.mixedrealitytoolkit.uxcore/CHANGELOG.md @@ -4,26 +4,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). ## Unreleased -### Added - -* Added automatic update for the `See It Say It Label` when the `SpeechRecognitionKeyword` of a `StatefulInteractable` has changed. Added ability to change the pattern, from inspector or code. [PR #792](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/792) -* When Unity Localization package is installed, a `LocalizedString` is used as pattern. [PR #792](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/792) -* Added touch support for the NonNativeKeyboard. [PR #655](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/655) - ### Changed -* StateVisualizer: Modified access modifiers of State, stateContainers and UpdateStateValue to protected internal to allow adding states through subclassing. [PR #926](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/926) * Updated the minimum editor version to 2022.3.6f1 [PR #1003](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1003) * Updated InteractablePulse to work across all IXRInteractor implementations, instead of just MRTK-specific IHandedInteractor implementations. [PR #1042](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1042) -* Updated tests to follow existing MRTK test patterns. [PR #1046](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1046) - -### Fixed - -* Fixed an issue when selecting a PressableButton in Editor scene view causing error spam. (Issue #772) [PR #943](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/943) -* Prevent simultaneous editing of multiple input fields when using Non-Native Keyboard. [PR #942](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/942) -* Don't try to start a coroutine in VirtualizedScrollRectList when the GameObject is inactive. [PR #972](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/972) -* Fix SliderSounds playing sound even when disabled. [PR #1007](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1007) -* Fix for sliders with min-max values outside range \[0-1\] when slider is configured for grab interaction (IsTouchable = false) [Issue 944](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/issues/944) ## [4.0.0-development.pre.1] - 2024-07-09 @@ -44,6 +28,30 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). * Removed LegacyDialog/README files. * Removed obsolete Slider.SliderValue fields. +## [3.3.0] - 2025-11-12 + +### Added + +* Added automatic update for the `See It Say It Label` when the `SpeechRecognitionKeyword` of a `StatefulInteractable` has changed. Added ability to change the pattern, from inspector or code. [PR #792](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/792) +* When Unity Localization package is installed, a `LocalizedString` is used as pattern. [PR #792](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/792) +* Added touch support for the NonNativeKeyboard. [PR #655](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/655) + +### Changed + +* StateVisualizer: Modified access modifiers of State, stateContainers and UpdateStateValue to protected internal to allow adding states through subclassing. [PR #926](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/926) +* Updated tests to follow existing MRTK test patterns. [PR #1046](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1046) + +### Fixed + +* Fixed an issue when selecting a PressableButton in Editor scene view causing error spam. (Issue #772) [PR #943](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/943) +* Prevent simultaneous editing of multiple input fields when using Non-Native Keyboard. [PR #942](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/942) +* Don't try to start a coroutine in VirtualizedScrollRectList when the GameObject is inactive. [PR #972](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/972) +* Fixed SliderSounds playing sound even when disabled. [PR #1007](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1007) +* Fixed sliders with min-max values outside range \[0-1\] when slider is configured for grab interaction (IsTouchable = false) [Issue 944](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/issues/944) +* Fixed unguarded soft dependency on the MRTK Input package in PressableButton. [PR #1054](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1054) +* Updated dependencies to match Unity Asset Store packages. [PR #1054](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1054) + * com.microsoft.mrtk.graphicstools.unity 0.8.0 + ## [3.2.2] - 2024-09-18 ### Changed diff --git a/org.mixedrealitytoolkit.uxcore/Experimental/NonNativeKeyboard/NonNativeKeyTouchAdapter.cs b/org.mixedrealitytoolkit.uxcore/Experimental/NonNativeKeyboard/NonNativeKeyTouchAdapter.cs index 269ad5855..4f538cfb2 100644 --- a/org.mixedrealitytoolkit.uxcore/Experimental/NonNativeKeyboard/NonNativeKeyTouchAdapter.cs +++ b/org.mixedrealitytoolkit.uxcore/Experimental/NonNativeKeyboard/NonNativeKeyTouchAdapter.cs @@ -2,7 +2,6 @@ // Licensed under the BSD 3-Clause using System.Collections; -using MixedReality.Toolkit.Input; using UnityEngine; using UnityEngine.UI; using UnityEngine.XR.Interaction.Toolkit; @@ -96,7 +95,7 @@ private void Initialize() private void OnSelectStart(SelectEnterEventArgs selectArgs) { - if (selectArgs.interactorObject is not PokeInteractor || + if (selectArgs.interactorObject is not IPokeInteractor || Time.time - lastClickTime < ReClickDelayTime) { return; @@ -114,7 +113,7 @@ private void OnSelectEnd(SelectExitEventArgs _) private void OnHoverStart(HoverEnterEventArgs hoverArgs) { - if (hoverArgs.interactorObject is PokeInteractor) + if (hoverArgs.interactorObject is IPokeInteractor) { button.targetGraphic.CrossFadeColor(button.colors.pressedColor, button.colors.fadeDuration, true, true); } diff --git a/org.mixedrealitytoolkit.uxcore/package.json b/org.mixedrealitytoolkit.uxcore/package.json index a39faef42..9ebe4c33b 100644 --- a/org.mixedrealitytoolkit.uxcore/package.json +++ b/org.mixedrealitytoolkit.uxcore/package.json @@ -17,7 +17,7 @@ "unityRelease": "6f1", "documentationUrl": "https://www.mixedrealitytoolkit.org", "dependencies": { - "com.microsoft.mrtk.graphicstools.unity": "0.5.12", + "com.microsoft.mrtk.graphicstools.unity": "0.8.0", "org.mixedrealitytoolkit.core": "4.0.0", "com.unity.inputsystem": "1.6.1", "com.unity.textmeshpro": "3.0.6", diff --git a/org.mixedrealitytoolkit.windowsspeech/CHANGELOG.md b/org.mixedrealitytoolkit.windowsspeech/CHANGELOG.md index 1902204b5..5d69872e5 100644 --- a/org.mixedrealitytoolkit.windowsspeech/CHANGELOG.md +++ b/org.mixedrealitytoolkit.windowsspeech/CHANGELOG.md @@ -2,12 +2,18 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). -## [Unreleased] +## [3.0.4] - 2025-11-12 ### Changed * Subsystems no longer register themselves on non-Windows platforms. +### Fixed + +* Updated dependencies to match Unity Asset Store packages. [PR #1054](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1054) + * com.microsoft.mrtk.tts.windows 1.0.4 + * org.mixedrealitytoolkit.core 3.2.2 + ## [3.0.3] - 2024-04-17 ### Fixed diff --git a/org.mixedrealitytoolkit.windowsspeech/package.json b/org.mixedrealitytoolkit.windowsspeech/package.json index fbd78aef5..2f287bb69 100644 --- a/org.mixedrealitytoolkit.windowsspeech/package.json +++ b/org.mixedrealitytoolkit.windowsspeech/package.json @@ -17,7 +17,7 @@ "unityRelease": "26f1", "documentationUrl": "https://www.mixedrealitytoolkit.org", "dependencies": { - "com.microsoft.mrtk.tts.windows": "1.0.1", - "org.mixedrealitytoolkit.core": "3.0.0" + "com.microsoft.mrtk.tts.windows": "1.0.4", + "org.mixedrealitytoolkit.core": "3.2.2" } } \ No newline at end of file