Adjustment for sample shared and sample scenario, prepare for 1.9 API… (#162)

* Adjustment for sample shared and sample scenario, prepare for 1.9 API deprecation.

* Fixed a typo

Author: yl-msft

AzureSpatialAnchorsSample/Packages/packages-lock.json

@@ -48,7 +48,7 @@
       "source": "local",
       "dependencies": {
         "com.microsoft.mixedreality.openxr": "1.7.0",
-        "com.microsoft.mrtk.graphicstools.unity": "0.4.0"
+        "com.microsoft.mrtk.graphicstools.unity": "0.5.0"
       }
     },
     "com.microsoft.mixedreality.toolkit.foundation": {

RemotingSample/Packages/packages-lock.json

@@ -28,7 +28,7 @@
       "source": "local",
       "dependencies": {
         "com.microsoft.mixedreality.openxr": "1.7.0",
-        "com.microsoft.mrtk.graphicstools.unity": "0.4.0"
+        "com.microsoft.mrtk.graphicstools.unity": "0.5.0"
       }
     },
     "com.microsoft.mixedreality.toolkit.foundation": {

SampleScenarios/Microsoft.MixedReality.OpenXR.SampleScenarios.asmdef

@@ -22,6 +22,11 @@
             "name": "com.unity.xr.arfoundation",
             "expression": "5.0.0",
             "define": "USE_ARFOUNDATION_5_OR_NEWER"
+        },
+        {
+            "name": "com.microsoft.mixedreality.openxr",
+            "expression": "1.9.0",
+            "define": "USE_MICROSOFT_OPENXR_PLUGIN_1_9_OR_NEWER"
         }
     ],
     "noEngineReferences": false

SampleScenarios/Scenarios/AnchorSample/Scripts/AnchorPersistenceSample.cs

@@ -54,7 +54,11 @@ protected async void OnEnable()
 
             m_arAnchorManager.anchorsChanged += AnchorsChanged;
 
-            m_anchorStore = await m_arAnchorManager.LoadAnchorStoreAsync();
+#if USE_MICROSOFT_OPENXR_PLUGIN_1_9_OR_NEWER
+            m_anchorStore = await XRAnchorStore.LoadAnchorStoreAsync(m_arAnchorManager.subsystem);
+#else
+            m_anchorStore = await XRAnchorStore.LoadAsync(m_arAnchorManager.subsystem);
+#endif
             if (m_anchorStore == null)
             {
                 Debug.Log("XRAnchorStore not available, sample anchor persistence functionality will not be enabled.");

SampleScenarios/package.json

@@ -1,8 +1,8 @@
 {
   "name": "com.microsoft.mixedreality.openxr.samplescenarios",
   "displayName": "Mixed Reality OpenXR Sample Scenarios",
-  "version": "0.0.4",
-  "unity": "2020.3",
+  "version": "0.0.6",
+  "unity": "2021.3",
   "msftFeatureCategory": "Platform Support",
   "description": "Scenarios showcasing Mixed Reality OpenXR features.",
   "keywords": [
@@ -21,10 +21,8 @@
   },
   "license": "MIT",
   "files": [
-    "/Scenarios*",
-    "Microsoft.MixedReality.OpenXR.SampleScenarios.asmdef*",
-    "LICENSE.md*",
-    "package.json*",
-    "!*.pdb*"
+    "/Scenarios/**/*",
+    "*",
+    "!**/*.pdb*"
   ]
 }

SampleShared/Assets/Prefabs/Axes.prefab

@@ -28,6 +28,7 @@ Transform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 9045106990711866059}
   m_RootOrder: 0
@@ -51,6 +52,7 @@ MeshRenderer:
   m_CastShadows: 0
   m_ReceiveShadows: 0
   m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 0
   m_ReflectionProbeUsage: 0
@@ -109,6 +111,7 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 9045106990711866059}
   m_RootOrder: 2
@@ -132,6 +135,7 @@ MeshRenderer:
   m_CastShadows: 0
   m_ReceiveShadows: 0
   m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 0
   m_ReflectionProbeUsage: 0
@@ -190,6 +194,7 @@ Transform:
   m_LocalRotation: {x: 0, y: 0.70710677, z: 0.70710677, w: 0}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 9045106990711866059}
   m_RootOrder: 3
@@ -213,6 +218,7 @@ MeshRenderer:
   m_CastShadows: 0
   m_ReceiveShadows: 0
   m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 0
   m_ReflectionProbeUsage: 0
@@ -271,6 +277,7 @@ Transform:
   m_LocalRotation: {x: 0.70710677, y: 0.70710677, z: 0, w: 0}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 9045106990711866059}
   m_RootOrder: 1
@@ -294,6 +301,7 @@ MeshRenderer:
   m_CastShadows: 0
   m_ReceiveShadows: 0
   m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 0
   m_ReflectionProbeUsage: 0
@@ -351,6 +359,7 @@ Transform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7422490303879603107}
   - {fileID: 8999416023320091584}

SampleShared/Assets/Prefabs/TextPanel.prefab

@@ -10,6 +10,7 @@ GameObject:
   m_Component:
   - component: {fileID: 7471063828548225205}
   - component: {fileID: 3053082487779848052}
+  - component: {fileID: 4517569666841396487}
   m_Layer: 0
   m_Name: TextPanel
   m_TagString: Untagged
@@ -50,6 +51,18 @@ MonoBehaviour:
   m_foregroundColor: {r: 1, g: 1, b: 1, a: 1}
   m_backgroundColor: {r: 0.26666668, g: 0.29411766, b: 0.32941177, a: 1}
   m_minimumWidth: 400
+--- !u!114 &4517569666841396487
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 308227702559030708}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8d66e10dc0c01cf448ee8aa4a9c572b5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &3954227148511934971
 GameObject:
   m_ObjectHideFlags: 0

SampleShared/Assets/Scripts/RuntimeInfo.cs

@@ -41,7 +41,6 @@ string ITextProvider.UpdateText()
                     $"\nMixed Reality OpenXR Plugin {typeof(OpenXRContext).Assembly.GetName().Version}" +
                     $"\n{runtimeName}" +
                     $"\n{GetDisplayInfo()}" +
-                    $"\nAR Session State: {ARSession.state}, {GetTrackingMode()}, {GetOriginMode()}" +
                     $"\nHead tracking state: {GetTrackingState(XRNode.Head)}" +
                     $"\nLeft Hand tracking state: {GetTrackingState(XRNode.LeftHand)}" +
                     $"\nRight Hand tracking state: {GetTrackingState(XRNode.RightHand)}";

SampleShared/package.json

@@ -1,8 +1,8 @@
 {
   "name": "com.microsoft.mixedreality.openxr.sampleshared",
   "displayName": "Mixed Reality OpenXR Sample Shared",
-  "version": "0.0.5",
-  "unity": "2020.3",
+  "version": "0.0.6",
+  "unity": "2021.3",
   "msftFeatureCategory": "Platform Support",
   "description": "Shared assets and utilities for Mixed Reality OpenXR samples.",
   "keywords": [
@@ -20,10 +20,8 @@
   },
   "license": "MIT",
   "files": [
-    "/Assets*",
-    "Microsoft.MixedReality.OpenXR.SampleShared.asmdef*",
-    "LICENSE.md*",
-    "package.json*",
-    "!*.pdb*"
+    "/Assets/**/*",
+    "*",
+    "!**/*.pdb*"
   ]
 }