Skip to content

Commit

Permalink
Release v2.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
bsawyer-ml committed Mar 20, 2024
1 parent 937ce95 commit a04dcbf
Show file tree
Hide file tree
Showing 242 changed files with 24,758 additions and 2,251 deletions.
31 changes: 31 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,36 @@
# Changelog

## [2.1.0]

### Features
- Update OpenXR Plugin dependency to `1.10.0`.
- Added `Magic Leap 2 Facial Expressions` OpenXR Feature.
- Added `Magic Leap 2 Environmental Meshing` OpenXR feature.
- Added `Magic Leap 2 Spatial Anchors` OpenXR Feature
- Added `Magic Leap 2 Spatial Anchors Storage` OpenXR Feature
- Added `MagicLeap.Android.Permissions`, a new and improved Permissions API.
- Included an AprilTagSettings struct to the `Magic Leap 2 Marker Understanding` OpenXR Feature

### Experimental
- Added `AndroidCamera` APIs for performing basic YUV and JPEG Camera capture.

### Bugfixes
- Fixed issue where JPEG screen capture with `MLCamera` was not displaying an image.
- Fixed legacy `MLPlanes` subsystem not being initialized when using Magic Leap XR Provider.
- Added project validation rules to check for Player Settings required by Magic Leap 2.
- Fixed `MLCVCamera` being unable to query Headpose from the MLSDK when the OpenXR PRovider is active.
- Fixed `MLMarkerTracker` issue where detected `AprilTag` markers are flipped.

### Deprecations & Removals
- Removed Preferences>External Tools>Magic Leap.
- Marked `MLPermissions` Obsolete. Use `MagicLeap.Android.Permissions` instead.

### Known Issues
- `MLAnchors` API does not work when the `Magic Leap 2 Spatial Anchors` or `Magic Leap 2 Spatial Anchors Storage` OpenXR Features are enabled.

### Misc.
- Renamed the ML Rig & Inputs Sample input actions asset as well as the old `MagicLeapInputs` asset to make it clear what the differences are.

## [2.0.0]

### Features
Expand Down
51 changes: 0 additions & 51 deletions Editor/APKBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,6 @@ public class APKBuilder
private static readonly string Arg_ForceSDKPathFromEnvVar = "--force_sdk_path_from_env_var";
private static readonly string Arg_AppVersionCodeValue = "--version-code";

#if !UNITY_2022_2_OR_NEWER
private static readonly Dictionary<BuildTarget, BuildTargetGroup> BuildTargetToGroup = new Dictionary<BuildTarget, BuildTargetGroup>()
{
{ BuildTarget.Relish, BuildTargetGroup.Relish }
};
#endif

private bool didSetSDKPathFromEnvVar = false;

private class BuildSettingsCache
Expand Down Expand Up @@ -71,15 +64,8 @@ private void Build()
{
throw new System.Exception("You must be on the Android Build Target to use APKBuilder.");
}
#else
if (!BuildTargetToGroup.ContainsKey(EditorUserBuildSettings.activeBuildTarget))
{
throw new System.Exception($"Unsupported build target {EditorUserBuildSettings.activeBuildTarget} for APKBuilder. Only Relish build target is supported.");
}
#endif

SetupSDKPaths(System.Array.IndexOf(System.Environment.GetCommandLineArgs(), Arg_ForceSDKPathFromEnvVar) != -1);

BuildSettingsCache buildSettingsCache = new BuildSettingsCache();

try
Expand Down Expand Up @@ -252,43 +238,6 @@ private bool TryGetArgValue(string arg, ref string value)
return false;
}

/// <summary>
/// Magic Leap SDK is required during the build process to include the
/// correct permissions in AndroidManifest.xml.
/// </summary>
/// <param name="bForceSetFromEnvVar"></param>
private void SetupSDKPaths(bool bForceSetFromEnvVar)
{
bool didSetFromEnvVar = false;
if (bForceSetFromEnvVar || !MagicLeapSDKUtil.SdkAvailable)
{
string relishSDKPath = System.Environment.GetEnvironmentVariable("RELISHSDK_UNITY");
if (string.IsNullOrEmpty(relishSDKPath))
{
Debug.LogWarning("No SDK path found for Relish in editor preferences or RELISHSDK_UNITY environment variable. Build will probably fail OR Magic Leap permissions will not be included in AndroidManifest.xml.");
}
else
{
if (bForceSetFromEnvVar)
{
Debug.LogFormat("{0} was passed as cmd line arg. Force setting Relish SDK Path to {1} from env vars.", Arg_ForceSDKPathFromEnvVar, relishSDKPath);
}
else
{
Debug.LogFormat("No SDK path set for Relish in editor preferences. Using {0} from env vars.", relishSDKPath);
}
MagicLeapSDKUtil.SdkPath = relishSDKPath;
didSetFromEnvVar = true;
}
}
else
{
Debug.LogFormat("Relish SDK found in editor preferences at {0}", MagicLeapSDKUtil.SdkPath);
}

this.didSetSDKPathFromEnvVar = didSetFromEnvVar;
}

[Serializable]
private class SimplePackageManifest
{
Expand Down
114 changes: 0 additions & 114 deletions Editor/MLAppSim/AppSimShimLibSupport.cs

This file was deleted.

Loading

0 comments on commit a04dcbf

Please sign in to comment.