1.10 Update (#170)

Updates ARAnchor scene to demonstrate new TrackingMap APIs.
microsoft · Dec 6, 2023 · 942f50a · 942f50a
1 parent c566400
commit 942f50a
Show file tree

Hide file tree

Showing 21 changed files with 538 additions and 81 deletions.
diff --git a/AzureSpatialAnchorsSample/Assets/XR/Settings/OpenXR Package Settings.asset b/AzureSpatialAnchorsSample/Assets/XR/Settings/OpenXR Package Settings.asset
@@ -54,9 +54,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0c8f1ce8139888c4ab621f6b3c8bb558, type: 3}
   m_Name: MotionControllerFeaturePlugin WSA
   m_EditorClassIdentifier: 
-  m_enabled: 0
+  m_enabled: 1
   nameUi: Motion Controller Model
-  version: 1.9.0
+  version: 1.10.0
   featureIdInternal: com.microsoft.openxr.feature.controller
   openxrExtensionStrings: XR_MSFT_controller_model XR_FB_render_model
   company: Microsoft
@@ -176,7 +176,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_enabled: 1
   nameUi: Mixed Reality Features
-  version: 1.9.0
+  version: 1.10.0
   featureIdInternal: com.microsoft.openxr.feature.hololens
   openxrExtensionStrings: XR_MSFT_holographic_window_attachment XR_KHR_win32_convert_performance_counter_time
     XR_MSFT_unbounded_reference_space XR_MSFT_spatial_anchor XR_MSFT_secondary_view_configuration
@@ -220,6 +220,7 @@ MonoBehaviour:
   - {fileID: 8285308273667768336}
   m_renderMode: 1
   m_depthSubmissionMode: 0
+  m_symmetricProjection: 0
 --- !u!114 &-6804906655704171061
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -284,6 +285,10 @@ MonoBehaviour:
     manifestName: cambria
     enabled: 1
   forceRemoveInternetPermission: 1
+  symmetricProjection: 0
+  systemSplashScreen: {fileID: 0}
+  lateLatchingMode: 0
+  lateLatchingDebug: 0
 --- !u!114 &-6631738441101422452
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -360,7 +365,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_enabled: 0
   nameUi: Hand Tracking
-  version: 1.9.0
+  version: 1.10.0
   featureIdInternal: com.microsoft.openxr.feature.handtracking
   openxrExtensionStrings: XR_EXT_hand_tracking XR_EXT_hand_joints_motion_range XR_EXT_hand_tracking_data_source
     XR_MSFT_hand_tracking_mesh
@@ -386,7 +391,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_enabled: 1
   nameUi: Mixed Reality Features
-  version: 1.9.0
+  version: 1.10.0
   featureIdInternal: com.microsoft.openxr.feature.hololens
   openxrExtensionStrings: XR_MSFT_holographic_window_attachment XR_KHR_win32_convert_performance_counter_time
     XR_MSFT_unbounded_reference_space XR_MSFT_spatial_anchor XR_MSFT_secondary_view_configuration
@@ -433,7 +438,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_enabled: 0
   nameUi: Holographic Remoting for Play Mode
-  version: 1.9.0
+  version: 1.10.0
   featureIdInternal: com.microsoft.openxr.feature.playmoderemoting
   openxrExtensionStrings: XR_MSFT_holographic_remoting XR_MSFT_holographic_remoting_speech
   company: Microsoft
@@ -458,7 +463,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_enabled: 0
   nameUi: Holographic Remoting remote app
-  version: 1.9.0
+  version: 1.10.0
   featureIdInternal: com.microsoft.openxr.feature.appremoting
   openxrExtensionStrings: XR_MSFT_holographic_remoting XR_MSFT_holographic_remoting_speech
   company: Microsoft
@@ -538,7 +543,8 @@ MonoBehaviour:
   - {fileID: -6322264966494190108}
   - {fileID: 3159989109347170179}
   m_renderMode: 1
-  m_depthSubmissionMode: 0
+  m_depthSubmissionMode: 1
+  m_symmetricProjection: 0
 --- !u!114 &-1863264517852689691
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -614,7 +620,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_enabled: 0
   nameUi: HP Reverb G2 Controller Profile
-  version: 1.9.0
+  version: 1.10.0
   featureIdInternal: com.microsoft.openxr.feature.interaction.hpmixedrealitycontroller
   openxrExtensionStrings: XR_EXT_hp_mixed_reality_controller
   company: Microsoft
@@ -731,7 +737,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_enabled: 0
   nameUi: Motion Controller Model
-  version: 1.9.0
+  version: 1.10.0
   featureIdInternal: com.microsoft.openxr.feature.controller
   openxrExtensionStrings: XR_MSFT_controller_model XR_FB_render_model
   company: Microsoft
@@ -791,7 +797,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_enabled: 0
   nameUi: Holographic Remoting remote app
-  version: 1.9.0
+  version: 1.10.0
   featureIdInternal: com.microsoft.openxr.feature.appremoting
   openxrExtensionStrings: XR_MSFT_holographic_remoting XR_MSFT_holographic_remoting_speech
   company: Microsoft
@@ -831,7 +837,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_enabled: 0
   nameUi: HP Reverb G2 Controller Profile
-  version: 1.9.0
+  version: 1.10.0
   featureIdInternal: com.microsoft.openxr.feature.interaction.hpmixedrealitycontroller
   openxrExtensionStrings: XR_EXT_hp_mixed_reality_controller
   company: Microsoft
@@ -851,7 +857,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_enabled: 0
   nameUi: Motion Controller Model
-  version: 1.9.0
+  version: 1.10.0
   featureIdInternal: com.microsoft.openxr.feature.controller
   openxrExtensionStrings: XR_MSFT_controller_model XR_FB_render_model
   company: Microsoft
@@ -954,6 +960,7 @@ MonoBehaviour:
   - {fileID: -6631738441101422452}
   m_renderMode: 1
   m_depthSubmissionMode: 0
+  m_symmetricProjection: 0
 --- !u!114 &3004377197438603822
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1048,7 +1055,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_enabled: 0
   nameUi: Hand Tracking
-  version: 1.9.0
+  version: 1.10.0
   featureIdInternal: com.microsoft.openxr.feature.handtracking
   openxrExtensionStrings: XR_EXT_hand_tracking XR_EXT_hand_joints_motion_range XR_EXT_hand_tracking_data_source
     XR_MSFT_hand_tracking_mesh
@@ -1363,9 +1370,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c79c911b38743a649b1c1eddb5097202, type: 3}
   m_Name: HandTrackingFeaturePlugin WSA
   m_EditorClassIdentifier: 
-  m_enabled: 0
+  m_enabled: 1
   nameUi: Hand Tracking
-  version: 1.9.0
+  version: 1.10.0
   featureIdInternal: com.microsoft.openxr.feature.handtracking
   openxrExtensionStrings: XR_EXT_hand_tracking XR_EXT_hand_joints_motion_range XR_EXT_hand_tracking_data_source
     XR_MSFT_hand_tracking_mesh

diff --git a/AzureSpatialAnchorsSample/Packages/manifest.json b/AzureSpatialAnchorsSample/Packages/manifest.json
@@ -2,7 +2,7 @@
   "dependencies": {
     "com.microsoft.azure.spatial-anchors-sdk.core": "2.13.0",
     "com.microsoft.azure.spatial-anchors-sdk.windows": "2.13.0",
-    "com.microsoft.mixedreality.openxr": "1.9.0",
+    "com.microsoft.mixedreality.openxr": "1.10.0",
     "com.microsoft.mixedreality.openxr.samplescenarios": "file:../../SampleScenarios",
     "com.microsoft.mixedreality.openxr.sampleshared": "file:../../SampleShared",
     "com.microsoft.mixedreality.toolkit.foundation": "2.8.3",
@@ -14,9 +14,9 @@
     "com.unity.textmeshpro": "3.0.6",
     "com.unity.timeline": "1.6.5",
     "com.unity.ugui": "1.0.0",
-    "com.unity.xr.arfoundation": "4.2.8",
+    "com.unity.xr.arfoundation": "4.2.9",
     "com.unity.xr.management": "4.3.3",
-    "com.unity.xr.openxr": "1.8.2",
+    "com.unity.xr.openxr": "1.9.1",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",

diff --git a/AzureSpatialAnchorsSample/Packages/packages-lock.json b/AzureSpatialAnchorsSample/Packages/packages-lock.json
@@ -21,7 +21,7 @@
       "url": "https://pkgs.dev.azure.com/aipmr/MixedReality-Unity-Packages/_packaging/Unity-packages/npm/registry"
     },
     "com.microsoft.mixedreality.openxr": {
-      "version": "1.9.0",
+      "version": "1.10.0",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -168,18 +168,18 @@
       }
     },
     "com.unity.xr.arfoundation": {
-      "version": "4.2.8",
+      "version": "4.2.9",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.xr.arsubsystems": "4.2.8",
+        "com.unity.xr.arsubsystems": "4.2.9",
         "com.unity.xr.management": "4.0.1",
         "com.unity.modules.particlesystem": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },
     "com.unity.xr.arsubsystems": {
-      "version": "4.2.8",
+      "version": "4.2.9",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -208,8 +208,8 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.xr.management": {
-      "version": "4.3.3",
-      "depth": 0,
+      "version": "4.4.0",
+      "depth": 1,
       "source": "registry",
       "dependencies": {
         "com.unity.modules.subsystems": "1.0.0",
@@ -220,13 +220,13 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.xr.openxr": {
-      "version": "1.8.2",
+      "version": "1.9.1",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.xr.management": "4.0.1",
+        "com.unity.xr.management": "4.4.0",
         "com.unity.xr.legacyinputhelpers": "2.1.2",
-        "com.unity.inputsystem": "1.4.4",
+        "com.unity.inputsystem": "1.6.3",
         "com.unity.xr.core-utils": "2.1.1"
       },
       "url": "https://packages.unity.com"

diff --git a/AzureSpatialAnchorsSample/ProjectSettings/EditorBuildSettings.asset b/AzureSpatialAnchorsSample/ProjectSettings/EditorBuildSettings.asset
@@ -4,7 +4,10 @@
 EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
-  m_Scenes: []
+  m_Scenes:
+  - enabled: 1
+    path: Assets/AzureSpatialAnchorsSample.unity
+    guid: fbde09789321942488caea5a9736d493
   m_configObjects:
     com.unity.xr.management.loader_settings: {fileID: 11400000, guid: 9718ce27c30f1ae49aa3cc0c2dce679f, type: 2}
     com.unity.xr.openxr.settings4: {fileID: 11400000, guid: 18b22e2797df3c74687b7702918dfec1, type: 2}
diff --git a/AzureSpatialAnchorsSample/ProjectSettings/MixedRealityOpenXRValidationSettings.asset b/AzureSpatialAnchorsSample/ProjectSettings/MixedRealityOpenXRValidationSettings.asset
@@ -0,0 +1,3 @@
+{
+    "<Ruleset>k__BackingField": 0
+}
diff --git a/AzureSpatialAnchorsSample/ProjectSettings/ProjectSettings.asset b/AzureSpatialAnchorsSample/ProjectSettings/ProjectSettings.asset
@@ -770,7 +770,7 @@ PlayerSettings:
       SpatialPerception: True
       InternetClient: True
       WebCam: True
-      Microphone: False
+      Microphone: True
   metroTargetDeviceFamilies: {}
   metroFTAName: 
   metroFTAFileTypes: []