Release v1.12.0

magicleap · Nov 8, 2023 · 17cf096 · 17cf096
1 parent 9e4553b
commit 17cf096
Show file tree

Hide file tree

Showing 238 changed files with 846 additions and 1,082 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/Editor/APKBuilder.cs b/Editor/APKBuilder.cs
@@ -227,7 +227,7 @@ private System.IO.FileInfo GetBuildFolder()
             string outDir = "Build";
             TryGetArgValue(Arg_OutDir, ref outDir);
 
-            System.IO.FileInfo buildFolder = new System.IO.FileInfo(System.IO.Path.Combine(outDir, EditorUserBuildSettings.activeBuildTarget.ToString()));
+            System.IO.FileInfo buildFolder = new System.IO.FileInfo(outDir);
             buildFolder.Directory.Create();
 
             return buildFolder;

diff --git a/Editor/BuildPreprocessor.cs b/Editor/BuildPreprocessor.cs
@@ -16,7 +16,7 @@
 using UnityEditor.XR.Management;
 using System.Linq;
 using UnityEngine.XR.MagicLeap;
-#if UNITY_OPENXR_1_7_0_OR_NEWER
+#if UNITY_OPENXR_1_9_0_OR_NEWER
 using UnityEngine.XR.OpenXR;
 #endif
 
@@ -101,7 +101,7 @@ private bool IsMagicLeapLoaderEnabled()
 
         private bool IsOpenXRLoaderEnabled()
         {
-#if UNITY_OPENXR_1_7_0_OR_NEWER
+#if UNITY_OPENXR_1_9_0_OR_NEWER
             var settings = XRGeneralSettingsPerBuildTarget.XRGeneralSettingsForBuildTarget(BuildTargetGroup.Android);
             if (settings != null && settings.Manager != null && settings.Manager.activeLoaders.Where(l => l is OpenXRLoader).Count() > 0)
             {

diff --git a/Editor/MLAppSim/AppSimShimLibSupport.cs b/Editor/MLAppSim/AppSimShimLibSupport.cs
@@ -16,7 +16,7 @@
 using UnityEngine.XR.MagicLeap;
 using UnityEngine.XR.Management;
 using UnityEditor.XR.Management;
-#if UNITY_OPENXR_1_7_0_OR_NEWER
+#if UNITY_OPENXR_1_9_0_OR_NEWER
 using UnityEngine.XR.OpenXR;
 #endif
 
@@ -46,7 +46,7 @@ private static void CheckForLibrarySearchPaths()
             bool foundSupportedLoader = false;
 #if UNITY_XR_MAGICLEAP_PROVIDER
             foundSupportedLoader = settings.Manager.activeLoaders.Any(l => l is MagicLeapLoader);
-#elif UNITY_OPENXR_1_7_0_OR_NEWER
+#elif UNITY_OPENXR_1_9_0_OR_NEWER
             foundSupportedLoader = settings.Manager.activeLoaders.Any(l => l is OpenXRLoader);
 #endif
 

diff --git a/Editor/MagicLeap.SDK.Editor.asmdef b/Editor/MagicLeap.SDK.Editor.asmdef
@@ -7,8 +7,8 @@
         "GUID:1fc69d160eafe774ab0a8e5191500311",
         "GUID:e40ba710768534012815d3193fa296cb",
         "GUID:f9fe0089ec81f4079af78eb2287a6163",
-        "GUID:96aa6ba065960476598f8f643e7252b6",
-        "GUID:4847341ff46394e83bb78fbd0652937e"
+        "GUID:4847341ff46394e83bb78fbd0652937e",
+        "GUID:96aa6ba065960476598f8f643e7252b6"
     ],
     "includePlatforms": [
         "Editor"
@@ -22,8 +22,8 @@
     "versionDefines": [
         {
             "name": "com.unity.xr.openxr",
-            "expression": "1.7.0-ml.exp.x64",
-            "define": "UNITY_OPENXR_1_7_0_OR_NEWER"
+            "expression": "1.9.0-preview.1",
+            "define": "UNITY_OPENXR_1_9_0_OR_NEWER"
         },
         {
             "name": "com.unity.xr.magicleap",

diff --git a/Editor/OpenXR/AndroidBootConfig.cs b/Editor/OpenXR/AndroidBootConfig.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEditor;

diff --git a/Editor/OpenXR/MagicLeapFeatureGroup.cs b/Editor/OpenXR/MagicLeapFeatureGroup.cs
@@ -8,7 +8,7 @@
 // ---------------------------------------------------------------------
 // %BANNER_END%
 
-#if UNITY_OPENXR_1_7_0_OR_NEWER
+#if UNITY_OPENXR_1_9_0_OR_NEWER
 using UnityEditor;
 using UnityEditor.XR.OpenXR.Features;
 
@@ -21,12 +21,8 @@ namespace UnityEngine.XR.OpenXR.Features.MagicLeapSupport
         SupportedBuildTargets = new [] { BuildTargetGroup.Android, BuildTargetGroup.Standalone },
         FeatureIds = new [] {
             MagicLeapFeature.featureId ,
-#if XR_HANDS
-            MagicLeapHandTrackingFeature.featureId,
-#endif
             MagicLeapRenderingExtensionsFeature.featureId,
             MagicLeapReferenceSpacesFeature.featureId,
-            MagicLeapClippingPlaneEnforcementFeature.featureId,
             MagicLeapPlanesFeature.FeatureId,
             MagicLeapUserCalibrationFeature.featureId,
         }

diff --git a/Editor/OpenXR/OpenXRBuildProcessor.cs b/Editor/OpenXR/OpenXRBuildProcessor.cs
@@ -4,7 +4,7 @@
 using UnityEditor.Build.Reporting;
 using UnityEditor.XR.MagicLeap;
 
-#if UNITY_OPENXR_1_7_0_OR_NEWER
+#if UNITY_OPENXR_1_9_0_OR_NEWER
 using UnityEngine.XR.OpenXR.Features.MagicLeapSupport;
 
 namespace UnityEditor.XR.OpenXR.Features.MagicLeapSupport

diff --git a/Editor/OpenXR/SegmentedDimmerMenuItem.cs b/Editor/OpenXR/SegmentedDimmerMenuItem.cs
@@ -8,7 +8,7 @@
 // ---------------------------------------------------------------------
 // %BANNER_END%
 
-#if UNITY_OPENXR_1_7_0_OR_NEWER
+#if UNITY_OPENXR_1_9_0_OR_NEWER
 using UnityEngine;
 using UnityEngine.XR.OpenXR.Features.MagicLeapSupport;
 

diff --git a/Plugins/Android/libMLAudioOutput.so b/Plugins/Android/libMLAudioOutput.so
diff --git a/Plugins/Android/libMagicLeapXrProvider.so b/Plugins/Android/libMagicLeapXrProvider.so
diff --git a/Plugins/Android/libml_c_utils.so b/Plugins/Android/libml_c_utils.so
diff --git a/Plugins/Android/libml_sdk_loader.so b/Plugins/Android/libml_sdk_loader.so
diff --git a/Plugins/MacEditor/libMagicLeapXrProvider.dylib b/Plugins/MacEditor/libMagicLeapXrProvider.dylib
diff --git a/Plugins/MacEditor/libml_sdk_loader.dylib b/Plugins/MacEditor/libml_sdk_loader.dylib
diff --git a/Plugins/MacEditor/libml_sdk_tests_provider.dylib b/Plugins/MacEditor/libml_sdk_tests_provider.dylib
diff --git a/Plugins/MacEditor/libml_unity_native_logging.dylib b/Plugins/MacEditor/libml_unity_native_logging.dylib
diff --git a/Plugins/WindowsEditor/MLAudioOutput.dll b/Plugins/WindowsEditor/MLAudioOutput.dll
diff --git a/Plugins/WindowsEditor/MagicLeapXrProvider.dll b/Plugins/WindowsEditor/MagicLeapXrProvider.dll
diff --git a/Plugins/WindowsEditor/ml_sdk_loader.dll b/Plugins/WindowsEditor/ml_sdk_loader.dll
diff --git a/Plugins/WindowsEditor/ml_sdk_tests_provider.dll b/Plugins/WindowsEditor/ml_sdk_tests_provider.dll
diff --git a/Plugins/WindowsEditor/ml_unity_native_logging.dll b/Plugins/WindowsEditor/ml_unity_native_logging.dll
diff --git a/Runtime/APIs/Anchors/MLAnchors.cs b/Runtime/APIs/Anchors/MLAnchors.cs
@@ -73,6 +73,28 @@ public enum MappingMode
             ARCloud,
         };
 
+        /// <summary>
+        /// The quality of the local space around the anchor. 
+        /// This can change over time as the user continues to scan the space.
+        /// </summary>
+        public enum Quality
+        {
+            /// <summary>
+            /// Low quality, this anchor can be expected to move significantly.
+            /// </summary>
+            Low,
+
+            /// <summary>
+            /// Medium quality, this anchor may move slightly.
+            /// </summary>
+            Medium,
+
+            /// <summary>
+            /// High quality, this anchor is stable and suitable for digital content attachment.
+            /// </summary>
+            High,
+        }
+
         /// <summary>
         ///  Maximum size for the name of the space in the #MLSpatialAnchorLocalizationInfo structure.
         /// </summary>
@@ -297,6 +319,11 @@ public static MLResult DeleteAnchorWithId(string anchorId)
             /// </summary>
             public string SpaceId => this.spaceId.ToString();
 
+            /// <summary>
+            /// The quality of the local space that this anchor occupies. This value may change over time.
+            /// </summary>
+            public string Quality => this.quality.ToString();
+
             /// <summary>
             /// Pose.
             /// </summary>
@@ -330,6 +357,11 @@ public static MLResult DeleteAnchorWithId(string anchorId)
             /// </summary>
             internal readonly MagicLeapNativeBindings.MLCoordinateFrameUID cfuid;
 
+            /// <summary>
+            /// The quality of the local space that this anchor occupies. This value may change over time.
+            /// </summary>
+            internal readonly Quality quality;
+
             public MLResult Publish()
             {
                 var resultCode = MLAnchors.Instance.PublishAnchor(this);
@@ -369,6 +401,7 @@ internal Anchor(NativeBindings.MLSpatialAnchor nativeAnchor)
                 MagicLeapXrProviderNativeBindings.GetUnityPose(nativeAnchor.Cfuid, out this.Pose);
                 this.ExpirationTimeStamp = nativeAnchor.ExpirationTimeStamp;
                 this.IsPersisted = nativeAnchor.IsPersisted;
+                this.quality = nativeAnchor.Quality;
             }
 
             public static bool operator ==(Anchor one, Anchor two)
@@ -397,7 +430,7 @@ public override int GetHashCode()
                 return this.Id.GetHashCode();
             }
 
-            public override string ToString() => $"id: {Id},\nPose: {Pose},\nExpirationTimeStamp: {ExpirationTimeStamp},\nIsPersisted: {IsPersisted},\nSpaceId: {SpaceId}";
+            public override string ToString() => $"id: {Id},\nPose: {Pose}, \nQuality: {Quality}, \nExpirationTimeStamp: {ExpirationTimeStamp},\nIsPersisted: {IsPersisted},\nSpaceId: {SpaceId}";
         }
 
         /// <summary>

diff --git a/Runtime/APIs/Anchors/MLAnchorsNativeBindings.cs b/Runtime/APIs/Anchors/MLAnchorsNativeBindings.cs
@@ -76,24 +76,31 @@ public readonly struct MLSpatialAnchor
                 /// </summary>
                 public readonly MLUUIDBytes SpaceId;
 
+                /// <summary>
+                /// The quality of the local space that this anchor occupies. This value may change over time.
+                /// </summary>
+                public readonly Quality Quality;
+
                 public MLSpatialAnchor(MLAnchors.Anchor anchor)
                 {
-                    this.Version = 1;
+                    this.Version = 2;
                     this.Id = anchor.id;
                     this.Cfuid = anchor.cfuid;
                     this.ExpirationTimeStamp = anchor.ExpirationTimeStamp;
                     this.IsPersisted = anchor.IsPersisted;
                     this.SpaceId = anchor.spaceId;
+                    this.Quality = anchor.quality;
                 }
 
                 public MLSpatialAnchor(MLAnchors.Anchor anchor, ulong expirationTimeStamp)
                 {
-                    this.Version = 1;
+                    this.Version = 2;
                     this.Id = anchor.id;
                     this.Cfuid = anchor.cfuid;
                     this.ExpirationTimeStamp = expirationTimeStamp;
                     this.IsPersisted = anchor.IsPersisted;
                     this.SpaceId = anchor.spaceId;
+                    this.Quality = anchor.quality;
                 }
             };
 

diff --git a/Runtime/APIs/CVCamera/MLCVCamera.cs b/Runtime/APIs/CVCamera/MLCVCamera.cs
@@ -89,8 +89,12 @@ protected override MLResult.Code StopAPI()
         /// </returns>
         private MLResult InternalGetFramePose(NativeBindings.CameraID cameraId, MLTime vcamTimestamp, out Matrix4x4 outTransform)
         {
+            if (!MagicLeapXrProviderNativeBindings.IsHeadTrackingAvailable())
+            {
+                outTransform = default;
+                return MLResult.Create(MLResult.Code.PoseNotFound, "HeadTracking is not available");
+            }
             MagicLeapNativeBindings.MLTransform outInternalTransform = new MagicLeapNativeBindings.MLTransform();
-
             MLResult.Code resultCode = NativeBindings.MLCVCameraGetFramePose(Handle, MagicLeapXrProviderNativeBindings.GetHeadTrackerHandle(), cameraId, vcamTimestamp.Value, ref outInternalTransform);
             MLResult.DidNativeCallSucceed(resultCode, nameof(NativeBindings.MLCVCameraGetFramePose));
             MLResult poseResult = MLResult.Create(resultCode);

diff --git a/Runtime/APIs/Dimmers/DimmerCameraControl.cs b/Runtime/APIs/Dimmers/DimmerCameraControl.cs
@@ -8,7 +8,7 @@
 // ---------------------------------------------------------------------
 // %BANNER_END%
 
-#if UNITY_OPENXR_1_7_0_OR_NEWER
+#if UNITY_OPENXR_1_9_0_OR_NEWER
 namespace UnityEngine.XR.OpenXR.Features.MagicLeapSupport
 {
     [RequireComponent(typeof(Camera))]

diff --git a/Runtime/APIs/Dimmers/MLGlobalDimmer.cs b/Runtime/APIs/Dimmers/MLGlobalDimmer.cs
@@ -7,9 +7,6 @@
 // %COPYRIGHT_END%
 // ---------------------------------------------------------------------
 // %BANNER_END%
-#if UNITY_OPENXR_1_7_0_OR_NEWER
-using UnityEngine.XR.OpenXR.Features.MagicLeapSupport;
-#endif
 
 namespace UnityEngine.XR.MagicLeap
 {
@@ -28,24 +25,11 @@ public static partial class MLGlobalDimmer
         /// 0.0 corresponds no global dimming while 1.0 corresponds to max global
         /// dimming.</param>
         /// <param name="enabled">Enable or disable the global dimmer.</param>
-#if UNITY_OPENXR_1_7_0_OR_NEWER
-        public static MLResult.Code SetValue(float dimmerValue, bool enabled)
-        {
-            float clampedValue = Mathf.Clamp(dimmerValue, 0.0f, 1.0f);
-            var dimmerInfoStruct = new NativeBindings.XrGlobalDimmerFrameEndInfoML(clampedValue, enabled);
-
-            var resultCode = NativeBindings.MLOpenXRSetGlobalDimmerFrameEndInfoParams(dimmerInfoStruct);
-            MLResult.DidNativeCallSucceed(resultCode, nameof(NativeBindings.MLOpenXRSetGlobalDimmerFrameEndInfoParams));
-
-            return resultCode;
-        }
-#else
         public static MLResult SetValue(float dimmerValue, bool enabled = true)
         {
             float clampedValue = Mathf.Clamp(dimmerValue, 0.0f, 1.0f);
             NativeBindings.UnityMagicLeap_RenderingSetGlobalDimmerValue(clampedValue);
             return MLResult.Create(MLResult.Code.Ok);
         }
-#endif
     }
 }
diff --git a/Runtime/APIs/Dimmers/MLGlobalDimmerNativeBindings.cs b/Runtime/APIs/Dimmers/MLGlobalDimmerNativeBindings.cs
@@ -8,34 +8,12 @@ public static partial class MLGlobalDimmer
     {
         private class NativeBindings : MagicLeapNativeBindings
         {
-            public const int XR_TYPE_GLOBAL_DIMMER_FRAME_END_INFO_ML = 1000136000;
-
-            [StructLayout(LayoutKind.Sequential)]
-            public readonly struct XrGlobalDimmerFrameEndInfoML
-            {
-                public readonly int Type;
-                public readonly IntPtr Next;
-                public readonly float DimmerValue;
-                public readonly long EnabledFlag;
-
-                public XrGlobalDimmerFrameEndInfoML(float dimmerValue, bool enabled)
-                {
-                    Type = XR_TYPE_GLOBAL_DIMMER_FRAME_END_INFO_ML;
-                    Next = IntPtr.Zero;
-                    DimmerValue = dimmerValue;
-                    EnabledFlag = enabled ? 1L : 0L;
-                }
-            }
-
             /// <summary>
             /// Sets the GlobalDimmer value via the Magic Leap XR Plugin
             /// </summary>
             /// <param name="dimmerValue">Level of opacity, between 0 and 1, of global dimmer.</param>
             [DllImport(UnityMagicLeapDll, CallingConvention = CallingConvention.Cdecl)]
             public static extern void UnityMagicLeap_RenderingSetGlobalDimmerValue(float dimmerValue);
-
-            [DllImport(MagicLeapXrProviderNativeBindings.MagicLeapXrProviderDll, CallingConvention = CallingConvention.Cdecl)]
-            public static extern MLResult.Code MLOpenXRSetGlobalDimmerFrameEndInfoParams(XrGlobalDimmerFrameEndInfoML globalDimmerFrameEndInfoML);
         }
     }
 }