Skip to content

Commit

Permalink
com.unity.xr.magicleap@6.4.0-pre.3
Browse files Browse the repository at this point in the history
## [6.4.0-pre.3] - 2021-07-29
- Bump preview revision

## [6.4.0-pre.2] - 2021-07-29
- Bump preview revision

## [6.4.0-pre.1] - 2021-07-29
- Deprecating Lumin for 2021.1 and onwards.
  • Loading branch information
Unity Technologies committed Jul 29, 2021
1 parent 879cc8f commit 793d98d
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 6 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## [6.4.0-pre.3] - 2021-07-29
- Bump preview revision

## [6.4.0-pre.2] - 2021-07-29
- Bump preview revision

## [6.4.0-pre.1] - 2021-07-29
- Deprecating Lumin for 2021.1 and onwards.
## [6.3.0-preview.2] - 2021-07-15
- Fixed 90 degree offset issue for Image Tracking.

Expand Down
2 changes: 1 addition & 1 deletion Editor/ImageDatabase/MagicLeapImageDatabaseLibraryCache.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public MagicLeapImageDatabaseLibraryCache()
m_ImageLibraryCache = new List<ImageDatabaseEntry>(25);
}

[Obsolete("To be removed when we bump the major version", true)]
[Obsolete("To be removed when we bump the major version", false)]
public Dictionary<string, DateTime> m_LibraryCache;

public List<ImageDatabaseEntry> m_ImageLibraryCache;
Expand Down
17 changes: 17 additions & 0 deletions Editor/MagicLeapPackageMetadata.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,19 @@ namespace UnityEditor.XR.MagicLeap
{
class XRPackage : IXRPackage
{
const string k_NotificationKey = "DidWarnAboutLuminDeprecation";
const string k_PackageNotificationTooltip =
@"Unity 2020 LTS will be the last version of the editor which supports Magic Leap 1. Developers can continue to build for Magic Leap 1 using Unity 2020 LTS or 2019 LTS.";

static XRPackage()
{
if (!SessionState.GetBool(k_NotificationKey, false))
{
Debug.LogWarning(k_PackageNotificationTooltip);
SessionState.SetBool(k_NotificationKey, true);
}
}

private class MagicLeapPackageMetadata : IXRPackageMetadata
{
public string packageName => "Magic Leap Plugin";
Expand All @@ -27,7 +40,11 @@ private class MagicLeapPackageMetadata : IXRPackageMetadata

private class MagicLeapLoaderMetadata : IXRLoaderMetadata
{
#if (UNITY_2021_1_OR_NEWER)
public string loaderName => "Magic Leap - Note: Lumin Platform will be deprecated in Unity 2021.2!";
#else
public string loaderName => "Magic Leap";
#endif
public string loaderType => "UnityEngine.XR.MagicLeap.MagicLeapLoader";
public List<BuildTargetGroup> supportedBuildTargets => s_SupportedBuildTargets;
private static List<BuildTargetGroup> s_SupportedBuildTargets = new List<BuildTargetGroup>() { BuildTargetGroup.Lumin };
Expand Down
4 changes: 4 additions & 0 deletions Editor/Manifest/ManifestEditorGUI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ internal static class Messages
internal const string kCannotLocateSDK = "Cannot find the Lumin SDK. Please specify the path to the Lumin SDK in the editor preferences";
internal const string kUnusableSDK = "Your Lumin SDK appears to have an API level below the minimum API level. Please upgrade your Lumin SDK";
internal const string kShouldSynchronize = "Click the 'Synchronize' button below to update the privileges list against the Lumin SDK specified in the editor preferences. If you've recently upgraded the Lumin SDK, you'll need to do this to get access to newer privileges";
internal const string kLuminPlatformDeprecation = "Unity 2020 LTS will be the last version of the editor which supports Magic Leap 1. Developers can continue to build for Magic Leap 1 using Unity 2020 LTS or 2019 LTS.";
}
class RenderState
{
Expand All @@ -35,6 +36,9 @@ public static void RenderManifest(MagicLeapManifestSettings settings)
EditorGUILayout.HelpBox(Messages.kUnusableSDK, MessageType.Error, true);
using (new EditorGUI.DisabledScope(missingSdk || invalidSdk))
{
#if UNITY_2020_1_OR_NEWER
EditorGUILayout.HelpBox(Messages.kLuminPlatformDeprecation, MessageType.Warning, true);
#endif
var apiLevel = serializedObject.FindProperty("m_MinimumAPILevel");
apiLevel.intValue = PlatformLevelSelector.SelectorGUI(apiLevel.intValue);

Expand Down
Binary file modified Runtime/Windows/UnityMagicLeap.dll
Binary file not shown.
Binary file modified Runtime/macOS/UnityMagicLeap.bundle
Binary file not shown.
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "com.unity.xr.magicleap",
"displayName": "Magic Leap XR Plugin",
"version": "6.3.0-preview.2",
"version": "6.4.0-pre.3",
"unity": "2020.2",
"description": "Provides rendering and spatial mapping support for Magic Leap.\n\nNOTE: As of Unity 2019.2, Legacy XR support for MagicLeap is disabled in favor of XR SDK",
"description": "Provides rendering and spatial mapping support for Magic Leap.\n\nNOTE: Unity 2020 LTS will be the last version of the editor which supports Magic Leap 1.\n\nDevelopers can continue to build for Magic Leap 1 using Unity 2020 LTS or 2019 LTS.",
"keywords": [
"magicleap",
"ar",
Expand All @@ -19,15 +19,15 @@
"com.unity.ugui": "1.0.0",
"com.unity.xr.arsubsystems": "4.0.12",
"com.unity.xr.interactionsubsystems": "1.0.1",
"com.unity.xr.management": "4.0.1"
"com.unity.xr.management": "4.0.7"
},
"upmCi": {
"footprint": "69f321f67ec29db0d082a3e6bc032ce05c37845b"
"footprint": "6d090f9fe7760f074999eb53c40193010b3838e7"
},
"repository": {
"url": "https://github.cds.internal.unity3d.com/unity/xr.sdk.magicleap.git",
"type": "git",
"revision": "22663c895d398b70ec65f433c5ba49f5b8ab810d"
"revision": "617a7dfd001fe6227a7a5844fc09215af3f38951"
},
"samples": [
{
Expand Down

0 comments on commit 793d98d

Please sign in to comment.