Skip to content

Commit

Permalink
com.unity.xr.magicleap@6.2.2
Browse files Browse the repository at this point in the history
## [6.2.2] - 2021-02-15
- Update C# assemblies to compile with "warnings as errors"
- Fix usage of obsolete APIs from XR Managment
- Fix an issue where eyetracking would fail in ZI.
  • Loading branch information
Unity Technologies committed Feb 15, 2021
1 parent ffe270b commit c815dd4
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 6 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
# Changelog

## [6.2.2] - 2021-02-15
- Update C# assemblies to compile with "warnings as errors"
- Fix usage of obsolete APIs from XR Managment
- Fix an issue where eyetracking would fail in ZI.

## [6.2.0] - 2021-02-02
- Downgrade to AR Subsystems `4.0.12`

## [6.1.0] - 2021-01-28
- Bump minimum Unity version to `2020.2`
- Update XR Management to `4.0.1`
- Fixed a bug where setting 'Force Multipass' to true was being ignored.
- Fixed a case where hands weren't properly shutdown when stopping the XR Input subsystem

## [6.1.0-preview.2] - 2021-01-05
Expand Down
2 changes: 1 addition & 1 deletion Editor/MagicLeapBuildProcessor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public bool ShouldIncludeRuntimePluginsInBuild(string path)
if (generalSettings == null)
return false;

foreach (var loader in generalSettings.Manager.loaders)
foreach (var loader in generalSettings.Manager.activeLoaders)
{
if (loader is MagicLeapLoader)
return true;
Expand Down
Binary file modified Runtime/Lumin/UnityMagicLeap.so
Binary file not shown.
8 changes: 6 additions & 2 deletions Runtime/MagicLeapLoader.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Runtime.InteropServices;

using UnityEngine.XR;
Expand Down Expand Up @@ -187,6 +188,10 @@ public override bool Start()

if (!isLegacyDeviceActive)
{
StartSubsystem<XRDisplaySubsystem>();

// we need to set the layout after the display subsystem has started, as these values are not used during
// the XRDisplayProvider's startup (Starting the Subsystem).
var settings = MagicLeapSettings.currentSettings;
#if UNITY_2020_1_OR_NEWER
if (settings != null && settings.forceMultipass)
Expand All @@ -199,7 +204,6 @@ public override bool Start()
else
displaySubsystem.singlePassRenderingDisabled = false;
#endif // UNITY_2020_1_OR_NEWER
StartSubsystem<XRDisplaySubsystem>();
m_DisplaySubsystemRunning = true;
}
return true;
Expand Down Expand Up @@ -320,7 +324,7 @@ internal static class XRMangementEditorExtensions
internal static bool IsEnabledForPlatform(this XRLoader loader, BuildTargetGroup group)
{
var settings = XRGeneralSettingsPerBuildTarget.XRGeneralSettingsForBuildTarget(group);
return settings?.Manager?.loaders?.Contains(loader) ?? false;
return settings?.Manager?.activeLoaders?.Contains(loader) ?? false;
}

internal static bool IsEnabledForPlatform(this XRLoader loader, BuildTarget target)
Expand Down
Binary file modified Runtime/Windows/UnityMagicLeap.dll
Binary file not shown.
Binary file modified Runtime/Windows/UnityMagicLeap.dll.lib
Binary file not shown.
Binary file modified Runtime/macOS/UnityMagicLeap.bundle
Binary file not shown.
4 changes: 4 additions & 0 deletions Tests/Runtime/Unity.XR.MagicLeap.Tests.asmdef
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,9 @@
],
"references": [
"UnityEngine.XR.MagicLeap"
],
"autoReferenced": false,
"defineConstraints": [
"UNITY_INCLUDE_TESTS"
]
}
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "com.unity.xr.magicleap",
"displayName": "Magic Leap XR Plugin",
"version": "6.2.0",
"version": "6.2.2",
"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",
"keywords": [
Expand All @@ -22,12 +22,12 @@
"com.unity.xr.management": "4.0.1"
},
"upmCi": {
"footprint": "faa3dca49e5ced7b40097b7668dab6dba8cad4d3"
"footprint": "eb3f6b32a5acd473b7a67c9c93df4f7975eaaa22"
},
"repository": {
"url": "https://github.cds.internal.unity3d.com/unity/xr.sdk.magicleap.git",
"type": "git",
"revision": "4f8fd329cae742cc7fc7291045094c97f02d26f8"
"revision": "0c951c7b40e1977d835807ffad84eaa18345ec1a"
},
"samples": [
{
Expand Down

0 comments on commit c815dd4

Please sign in to comment.