Updates to version .51

* Add support for Windows: Unity, Spectator App, and Server. * Code cleanups, refactoring, and documentation. * Switch to Grpc.Core and deprecate the Grpc Web codepaths. * Remove some obsolete server apis (last used late 2022). * Fix a USD mesh rotation issue. * Fix application shutdown to cancel outstanding RPC commit sha 8e42f485e685002307b4c9c21b23fa7ac895390a
magicleap · Mar 21, 2023 · 0079509 · 0079509
1 parent 61919f8
commit 0079509
Show file tree

Hide file tree

Showing 484 changed files with 34,107 additions and 4,257 deletions.
diff --git a/...es/ThirdParty/Grpc.Net.Client.2.44.0.meta → ...Assets/AddressableAssetsData/Windows.meta b/...es/ThirdParty/Grpc.Net.Client.2.44.0.meta → ...Assets/AddressableAssetsData/Windows.meta
diff --git a/LeapBrush/Assets/MagicLeap/Editor/LeapBrushBuild.cs b/LeapBrush/Assets/MagicLeap/Editor/LeapBrushBuild.cs
@@ -51,7 +51,9 @@ public static void Build(LeapBrushBuildUserSettings settings)
                 PlayerSettings.SetScriptingBackend(
                     BuildTargetGroup.Standalone, ScriptingImplementation.Mono2x);
             }
+#if UNITY_STANDALONE_OSX
             UnityEditor.OSXStandalone.UserBuildSettings.architecture = OSArchitecture.x64;
+#endif
 
             BuildPlayerOptions buildPlayerOptions = new();
             buildPlayerOptions.scenes = new string[1];
@@ -126,6 +128,32 @@ public static void Build(LeapBrushBuildUserSettings settings)
                         });
                 }
             }
+            else if (buildTarget == BuildTarget.StandaloneWindows64)
+            {
+                string windowsParentDir = Path.Join(outputDirWithVersion,
+                    "LeapBrush-Windows-" + versionString);
+                if (!Directory.Exists(windowsParentDir))
+                {
+                    Directory.CreateDirectory(windowsParentDir);
+                }
+                buildPlayerOptions.locationPathName =
+                    Path.Join(windowsParentDir, "LeapBrush.exe");
+
+                report = BuildPipeline.BuildPlayer(buildPlayerOptions);
+
+                if (report.summary.result == BuildResult.Succeeded)
+                {
+                    CreateZip(Path.Join(outputDirWithVersion,
+                            "LeapBrush-Windows-" + versionString + ".zip"),
+                        ".",
+                        windowsParentDir,
+                        new[]
+                        {
+                            ".DS_Store",
+                            "LeapBrush_BurstDebugInformation_DoNotShip/*",
+                        });
+                }
+            }
             else if (buildTarget == BuildTarget.Android)
             {
                 buildPlayerOptions.locationPathName =

diff --git a/LeapBrush/Assets/MagicLeap/LeapBrush/Editor/SpaceMeshManagerEditor.cs b/LeapBrush/Assets/MagicLeap/LeapBrush/Editor/SpaceMeshManagerEditor.cs
@@ -1,4 +1,4 @@
-#if UNITY_STANDALONE_OSX || UNITY_STANDALONE_WIN
+#if UNITY_STANDALONE_OSX
 #define ENABLE_USD
 #endif
 
@@ -28,7 +28,7 @@ public override void OnInspectorGUI()
             }
 #endif
 
-#if UNITY_ANDROID || UNITY_STANDALONE_LINUX
+#if UNITY_ANDROID || UNITY_STANDALONE_LINUX || UNITY_STANDALONE_WIN
             if (GUILayout.Button("Export converted prefab as UnityBundles..."))
             {
                 HandleExportPrefabAsUnityBundles(spaceMeshManager);
@@ -194,6 +194,8 @@ private static void HandleExportPrefabAsUnityBundles(SpaceMeshManager spaceMeshM
             BuildBundleForPlatform(BuildTarget.Android, usdPath, ConvertedPrefabName);
 #elif UNITY_STANDALONE_LINUX
             BuildBundleForPlatform(BuildTarget.StandaloneLinux64, usdPath, ConvertedPrefabName);
+#elif UNITY_STANDALONE_WIN
+            BuildBundleForPlatform(BuildTarget.StandaloneWindows64, usdPath, ConvertedPrefabName);
 #else
             throw new Exception("Unexpected platform");
 #endif
@@ -211,6 +213,9 @@ private static void BuildBundleForPlatform(
                 case BuildTarget.StandaloneLinux64:
                     bundleExtension = SpaceMeshManager.Linux64BundleExtension;
                     break;
+                case BuildTarget.StandaloneWindows64:
+                    bundleExtension = SpaceMeshManager.Windows64BundleExtension;
+                    break;
                 default:
                     throw new Exception("Unexpected build target " + buildTarget);
             }

diff --git a/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Panel_Main.prefab b/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Panel_Main.prefab
@@ -124,6 +124,13 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e23b5707e8ac4e17b2e5a1708cd161af, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  _scribbleBrushButton: {fileID: 5757843143715432950}
+  _colorPaletteButton: {fileID: 5455468354099585931}
+  _polyBrushButton: {fileID: 7421388758205604795}
+  _eraserToolButton: {fileID: 3615578465577734760}
+  _laserPointerButton: {fileID: 1369969955267103981}
+  _importModelButton: {fileID: 4522853473598743012}
+  _settingsButton: {fileID: 201301582186616490}
 --- !u!1 &6767869607523307436
 GameObject:
   m_ObjectHideFlags: 0
@@ -825,6 +832,18 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: cc522a8ab0eb87a41bdbacbf5d4799b2, type: 3}
+--- !u!114 &7421388758205604795 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 9000142975330279187, guid: cc522a8ab0eb87a41bdbacbf5d4799b2,
+    type: 3}
+  m_PrefabInstance: {fileID: 1880533875086982312}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -935739111, guid: b5e08719cdaec43e482cc299e379a5ef, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!224 &9030450003317262839 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 7442873442711598431, guid: cc522a8ab0eb87a41bdbacbf5d4799b2,
@@ -1523,6 +1542,18 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: cc522a8ab0eb87a41bdbacbf5d4799b2, type: 3}
+--- !u!114 &5757843143715432950 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 9000142975330279187, guid: cc522a8ab0eb87a41bdbacbf5d4799b2,
+    type: 3}
+  m_PrefabInstance: {fileID: 3675246863652124389}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -935739111, guid: b5e08719cdaec43e482cc299e379a5ef, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!224 &6074085388364350394 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 7442873442711598431, guid: cc522a8ab0eb87a41bdbacbf5d4799b2,
@@ -1810,6 +1841,18 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: cc522a8ab0eb87a41bdbacbf5d4799b2, type: 3}
+--- !u!114 &5455468354099585931 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 9000142975330279187, guid: cc522a8ab0eb87a41bdbacbf5d4799b2,
+    type: 3}
+  m_PrefabInstance: {fileID: 3986628818150653080}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -935739111, guid: b5e08719cdaec43e482cc299e379a5ef, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!224 &5771710642762746311 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 7442873442711598431, guid: cc522a8ab0eb87a41bdbacbf5d4799b2,
@@ -2128,6 +2171,18 @@ RectTransform:
     type: 3}
   m_PrefabInstance: {fileID: 4765522111290113783}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &4522853473598743012 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 9000142975330279187, guid: cc522a8ab0eb87a41bdbacbf5d4799b2,
+    type: 3}
+  m_PrefabInstance: {fileID: 4765522111290113783}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -935739111, guid: b5e08719cdaec43e482cc299e379a5ef, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &5677899128724114811
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -2446,6 +2501,18 @@ RectTransform:
     type: 3}
   m_PrefabInstance: {fileID: 5677899128724114811}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &3615578465577734760 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 9000142975330279187, guid: cc522a8ab0eb87a41bdbacbf5d4799b2,
+    type: 3}
+  m_PrefabInstance: {fileID: 5677899128724114811}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -935739111, guid: b5e08719cdaec43e482cc299e379a5ef, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &8063117011232658430
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -2764,6 +2831,18 @@ RectTransform:
     type: 3}
   m_PrefabInstance: {fileID: 8063117011232658430}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &1369969955267103981 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 9000142975330279187, guid: cc522a8ab0eb87a41bdbacbf5d4799b2,
+    type: 3}
+  m_PrefabInstance: {fileID: 8063117011232658430}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -935739111, guid: b5e08719cdaec43e482cc299e379a5ef, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &9092139693893274041
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -3025,6 +3104,18 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: cc522a8ab0eb87a41bdbacbf5d4799b2, type: 3}
+--- !u!114 &201301582186616490 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 9000142975330279187, guid: cc522a8ab0eb87a41bdbacbf5d4799b2,
+    type: 3}
+  m_PrefabInstance: {fileID: 9092139693893274041}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -935739111, guid: b5e08719cdaec43e482cc299e379a5ef, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!224 &1830608895110790374 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 7442873442711598431, guid: cc522a8ab0eb87a41bdbacbf5d4799b2,

diff --git a/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Panel_NotConnected.prefab b/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Panel_NotConnected.prefab
@@ -151,6 +151,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0a5a384e35b64d638ec4edba6ff3e9c9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  _chooseServerButton: {fileID: 3890613930990202612}
+  _drawSoloButton: {fileID: 8614955675677973802}
+  _notConnectedDescriptionText: {fileID: 4382354737683121452}
 --- !u!1 &5402866547119783875
 GameObject:
   m_ObjectHideFlags: 0
@@ -532,6 +535,18 @@ RectTransform:
     type: 3}
   m_PrefabInstance: {fileID: 822072764588130873}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &8614955675677973802 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 9000142975330279187, guid: cc522a8ab0eb87a41bdbacbf5d4799b2,
+    type: 3}
+  m_PrefabInstance: {fileID: 822072764588130873}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -935739111, guid: b5e08719cdaec43e482cc299e379a5ef, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &3743509105738353123
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1051,6 +1066,18 @@ RectTransform:
     type: 3}
   m_PrefabInstance: {fileID: 5267191315268022759}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &3890613930990202612 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 9000142975330279187, guid: cc522a8ab0eb87a41bdbacbf5d4799b2,
+    type: 3}
+  m_PrefabInstance: {fileID: 5267191315268022759}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -935739111, guid: b5e08719cdaec43e482cc299e379a5ef, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &8382390881782026059
 PrefabInstance:
   m_ObjectHideFlags: 0

diff --git a/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Panel_NotLocalized.prefab b/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Panel_NotLocalized.prefab
@@ -291,6 +291,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 6b5212c5018944d18424609252ece4b2, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  _openSpacesAppButton: {fileID: 1630292814985441261}
 --- !u!1001 &3142834669568780731
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -954,6 +955,18 @@ RectTransform:
     type: 3}
   m_PrefabInstance: {fileID: 7672190879026508030}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &1630292814985441261 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 9000142975330279187, guid: cc522a8ab0eb87a41bdbacbf5d4799b2,
+    type: 3}
+  m_PrefabInstance: {fileID: 7672190879026508030}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -935739111, guid: b5e08719cdaec43e482cc299e379a5ef, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &8891374398208093335
 PrefabInstance:
   m_ObjectHideFlags: 0

diff --git a/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Popup_DrawSoloAreYouSure.prefab b/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Popup_DrawSoloAreYouSure.prefab
@@ -129,7 +129,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7371999483242880040}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: -0.181, z: -0.05}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -151,6 +151,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4d20fe4cbf784bc1ae100c9d1d350eb3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  _drawSoloCancelButton: {fileID: 3485787041633895466}
+  _drawSoloContinueButton: {fileID: 7306627647590847986}
 --- !u!1 &7953180387755417872
 GameObject:
   m_ObjectHideFlags: 0
@@ -503,6 +505,18 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: cc522a8ab0eb87a41bdbacbf5d4799b2, type: 3}
+--- !u!114 &7306627647590847986 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 9000142975330279187, guid: cc522a8ab0eb87a41bdbacbf5d4799b2,
+    type: 3}
+  m_PrefabInstance: {fileID: 1837668191291738849}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -935739111, guid: b5e08719cdaec43e482cc299e379a5ef, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!224 &9136344100264083390 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 7442873442711598431, guid: cc522a8ab0eb87a41bdbacbf5d4799b2,
@@ -738,6 +752,18 @@ RectTransform:
     type: 3}
   m_PrefabInstance: {fileID: 5514357033315752761}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &3485787041633895466 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 9000142975330279187, guid: cc522a8ab0eb87a41bdbacbf5d4799b2,
+    type: 3}
+  m_PrefabInstance: {fileID: 5514357033315752761}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -935739111, guid: b5e08719cdaec43e482cc299e379a5ef, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &6828741600015820844
 PrefabInstance:
   m_ObjectHideFlags: 0