-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
## [7.1.0] - 2024-05-22 - Deprecation messaging for deprecation after Unity 6 - Fix a Vulkan issue that could cause the device to randomly freeze with some projects. - Adding support within the MagicLeapLoader to support the XRHandSubsystem. - Updated controller tracking api to be enabled by default. - Change ML2s projection type request to better align with Unity's depth model.
- Loading branch information
Unity Technologies
committed
May 22, 2024
1 parent
d4f879a
commit 8ecac57
Showing
106 changed files
with
10,865 additions
and
10,785 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,3 @@ | ||
* [About Magic Leap XR Support](index.md) | ||
* [Deprecation](index.md) | ||
* [About Magic Leap XR Support](index.md) | ||
* [What's new](whats-new.md) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
Please update your links to [index.html](xref:magic-leap-home). | ||
Please update your links to [index.html](xref:magic-leap-home). |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,10 @@ | ||
apiRules: | ||
- exclude: | ||
uidRegex: .*Tests$ | ||
type: Namespace | ||
- exclude: | ||
uidRegex: Rendering | ||
type: Namespace | ||
- exclude: | ||
uidRegex: Unity\.MagicLeap\.Samples\.Rendering | ||
type: Namespace | ||
apiRules: | ||
- exclude: | ||
uidRegex: .*Tests$ | ||
type: Namespace | ||
- exclude: | ||
uidRegex: Rendering | ||
type: Namespace | ||
- exclude: | ||
uidRegex: Unity\.MagicLeap\.Samples\.Rendering | ||
type: Namespace |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,22 +1,22 @@ | ||
# What's new in version [7.0.0-pre.1] | ||
|
||
This is a preview release of the XR Provider for Magic Leap 2. | ||
|
||
Version 7.0.0 is targeted for Magic Leap 2 devices only. For older Magic Leap devices, please continue to use 6.x.x. | ||
|
||
The main updates in this release include: | ||
|
||
## Added | ||
|
||
- Support for Magic Leap 2 devices. | ||
- Added support for the Segmented Dimmer. | ||
- Added performance stats via `MagicLeapPerformance` class. | ||
- Added a new project validation system. | ||
|
||
## Updated | ||
|
||
- Compiling against the latest MLSDK. | ||
- Updating ARSubsystem to ARFoundation 5.0.0 | ||
|
||
|
||
For a full list of changes and updates in this version, see the [com.unity.xr.magicleap] package [changelog](xref:magic-leap-changelog). | ||
# What's new in version [7.0.0] | ||
|
||
This is a preview release of the XR Provider for Magic Leap 2. | ||
|
||
Version 7.0.0 is targeted for Magic Leap 2 devices only. For older Magic Leap devices, please continue to use 6.x.x. | ||
|
||
The main updates in this release include: | ||
|
||
## Added | ||
|
||
- Support for Magic Leap 2 devices. | ||
- Added support for the Segmented Dimmer. | ||
- Added performance stats via `MagicLeapPerformance` class. | ||
- Added a new project validation system. | ||
|
||
## Updated | ||
|
||
- Compiling against the latest MLSDK. | ||
- Updating ARSubsystem to ARFoundation 5.0.0 | ||
|
||
|
||
For a full list of changes and updates in this version, see the [com.unity.xr.magicleap] package [changelog](xref:magic-leap-changelog). |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
using System.Runtime.CompilerServices; | ||
using UnityEditor.UIElements; | ||
|
||
[assembly:InternalsVisibleTo("Unity.XR.MagicLeap.EditorTests")] | ||
using System.Runtime.CompilerServices; | ||
using UnityEditor.UIElements; | ||
|
||
[assembly:InternalsVisibleTo("Unity.XR.MagicLeap.EditorTests")] | ||
[assembly:UxmlNamespacePrefix("UnityEditor.XR.MagicLeap", "ml")] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,61 +1,61 @@ | ||
using System.Linq; | ||
using UnityEditor.Build; | ||
using UnityEditor.Build.Reporting; | ||
using UnityEditor.XR.Management; | ||
using UnityEngine.XR.Management; | ||
|
||
namespace UnityEditor.XR.MagicLeap | ||
{ | ||
[InitializeOnLoad] | ||
internal class BuildHelperUtils : IPreprocessBuildWithReport | ||
{ | ||
public static bool HasLoader(BuildTargetGroup targetGroup, System.Type loader) | ||
{ | ||
var settings = XRGeneralSettingsPerBuildTarget.XRGeneralSettingsForBuildTarget(targetGroup); | ||
|
||
if (settings) | ||
{ | ||
#pragma warning disable CS0618 | ||
return settings.Manager.loaders.Any(loader.IsInstanceOfType); | ||
#pragma warning restore CS0618 | ||
} | ||
|
||
return false; | ||
} | ||
|
||
public int callbackOrder => -100; | ||
|
||
public void OnPreprocessBuild(BuildReport report) | ||
{ | ||
MakeSureXRGeneralSettingsExists(report.summary.platformGroup); | ||
} | ||
|
||
public static XRGeneralSettings MakeSureXRGeneralSettingsExists(BuildTargetGroup targetGroup) | ||
{ | ||
// If we don't have XRGeneralSettings in EditorBuildSettings, check if we have one in the project and set it. | ||
var settings = XRGeneralSettingsPerBuildTarget.XRGeneralSettingsForBuildTarget(targetGroup); | ||
if (!settings) | ||
{ | ||
string searchText = "t:XRGeneralSettings"; | ||
string[] assets = AssetDatabase.FindAssets(searchText); | ||
if (assets.Length > 0) | ||
{ | ||
string path = AssetDatabase.GUIDToAssetPath(assets[0]); | ||
var allSettings = AssetDatabase.LoadAssetAtPath(path, typeof(XRGeneralSettingsPerBuildTarget)) as XRGeneralSettingsPerBuildTarget; | ||
EditorBuildSettings.AddConfigObject(XRGeneralSettings.k_SettingsKey, allSettings, true); | ||
} | ||
} | ||
|
||
return settings; | ||
} | ||
|
||
static BuildHelperUtils() | ||
{ | ||
EditorApplication.playModeStateChanged += (state) => | ||
{ | ||
if (state == PlayModeStateChange.ExitingEditMode) | ||
MakeSureXRGeneralSettingsExists(BuildTargetGroup.Standalone); | ||
}; | ||
} | ||
} | ||
} | ||
using System.Linq; | ||
using UnityEditor.Build; | ||
using UnityEditor.Build.Reporting; | ||
using UnityEditor.XR.Management; | ||
using UnityEngine.XR.Management; | ||
|
||
namespace UnityEditor.XR.MagicLeap | ||
{ | ||
[InitializeOnLoad] | ||
internal class BuildHelperUtils : IPreprocessBuildWithReport | ||
{ | ||
public static bool HasLoader(BuildTargetGroup targetGroup, System.Type loader) | ||
{ | ||
var settings = XRGeneralSettingsPerBuildTarget.XRGeneralSettingsForBuildTarget(targetGroup); | ||
|
||
if (settings) | ||
{ | ||
#pragma warning disable CS0618 | ||
return settings.Manager.loaders.Any(loader.IsInstanceOfType); | ||
#pragma warning restore CS0618 | ||
} | ||
|
||
return false; | ||
} | ||
|
||
public int callbackOrder => -100; | ||
|
||
public void OnPreprocessBuild(BuildReport report) | ||
{ | ||
MakeSureXRGeneralSettingsExists(report.summary.platformGroup); | ||
} | ||
|
||
public static XRGeneralSettings MakeSureXRGeneralSettingsExists(BuildTargetGroup targetGroup) | ||
{ | ||
// If we don't have XRGeneralSettings in EditorBuildSettings, check if we have one in the project and set it. | ||
var settings = XRGeneralSettingsPerBuildTarget.XRGeneralSettingsForBuildTarget(targetGroup); | ||
if (!settings) | ||
{ | ||
string searchText = "t:XRGeneralSettings"; | ||
string[] assets = AssetDatabase.FindAssets(searchText); | ||
if (assets.Length > 0) | ||
{ | ||
string path = AssetDatabase.GUIDToAssetPath(assets[0]); | ||
var allSettings = AssetDatabase.LoadAssetAtPath(path, typeof(XRGeneralSettingsPerBuildTarget)) as XRGeneralSettingsPerBuildTarget; | ||
EditorBuildSettings.AddConfigObject(XRGeneralSettings.k_SettingsKey, allSettings, true); | ||
} | ||
} | ||
|
||
return settings; | ||
} | ||
|
||
static BuildHelperUtils() | ||
{ | ||
EditorApplication.playModeStateChanged += (state) => | ||
{ | ||
if (state == PlayModeStateChange.ExitingEditMode) | ||
MakeSureXRGeneralSettingsExists(BuildTargetGroup.Standalone); | ||
}; | ||
} | ||
} | ||
} |
Oops, something went wrong.