Updates to version .86

* New features
  * Switch to the MagicLeap OpenXR plugin. This removes usage of the
    deprecated MLSDK unity plugin.
  * Add MagicLeap Spectator support. This component, available under
    `Settings > Advanced`, allows users to view the Leap Brush scene
    from a separate phone for high quality mixed reality capture. See
    https://www.magicleap.care/hc/en-us/articles/22350469887117-Magic-Leap-Spectator-User-Guide
  * Update various packages and dependencies
    * Update Unity Editor to LTS 2022.3.33f1
    * Update MRTK3 to v3.2.0
    * Update com.magicleap.mrtk3 to 1.1.0
    * Update com.magicleap.soundfield to 3.4.6-240418.125575.a7b4d14
    * Update com.magicleap.spectator to 1.3.4
    * Update com.magicleap.unitysdk to 2.3.0
    * Update com.unity.ide.rider to 3.0.31
    * Update com.unity.textmeshpro to 3.2.0-pre.10
    * Update com.unity.toolchain.macos-x86_64-linux-x86_64 to 2.0.9
    * Update com.unity.xr.arfoundation to 5.1.5
    * Update com.unity.xr.openxr to 1.11.0
  * Added segmented dimming to most UI content. Hand visuals remain
    un-dimmed to avoid distraction.
    * Uses the OpenXR PreMultipliedAlpha layer flag to allow for pure
      additive content.
    * Improve dimmer shader and simplify -- now uses stock shaders
      with a separate dimmer override pass
    * Improve MagicLeap capture visuals by properly setting alpha
      values.
  * Reduce app load time from 12 to 6 seconds: Disable the Unity
    splash screen and move the keyboard scene to be on-demand
  * Clean up Anchor management to use lastest unitysdk
    recommendations, integration with ARAnchorManager, etc
* Bug fixes
  * Preload shaders, enable graphics jobs, and spread out glb file
    loading to improve performance and reduce stuttering.
  * Allow controller to draw strokes even if out of view: limit the
    out of view checks to hand input only.
  * Fix a race condition around joining a remote user and hiding their
    Headset visuals
  * Fix the position of the Controller instructions to properly align
  * Fix an issue where brush strokes could move to origin if tracking
    is lost while drawing

commit sha 60c22f3182916261f8dd322ed58f64ec103bb547

Author: ghazen-ml

LeapBrush/Assets/MRTK.Generated/MRTKSettings.asset

@@ -17,6 +17,6 @@ MonoBehaviour:
     - key: 1
       value: {fileID: 11400000, guid: c677e5c4eb85b7849a8da406775c299d, type: 2}
     - key: 7
-      value: {fileID: 11400000, guid: 46eb174601bc4384f8481fe881e8da53, type: 2}
+      value: {fileID: 11400000, guid: a4d48fb8885c8bd4e9dd5c57fba1824e, type: 2}
   buildPreferences:
     appLauncherModel: {fileID: 0}

LeapBrush/Assets/MagicLeap/LeapBrush/Editor/ShaderWarmingEditor.cs

@@ -0,0 +1,149 @@
+using System.Collections.Generic;
+using System.Linq;
+using UnityEditor;
+using UnityEngine;
+
+namespace MagicLeap.LeapBrush
+{
+    [CustomEditor(typeof(ShaderWarming))]
+    public class ShaderWarmingEditor : Editor
+    {
+        private string shaderLogString = "";
+
+        public override void OnInspectorGUI()
+        {
+            DrawDefaultInspector();
+            ShaderWarming shaderWarming = (ShaderWarming) target;
+
+            EditorGUILayout.HelpBox(
+                "Log lines are output when ShaderWarming has the [Capture Used Shaders] " +
+                "option turned on. Copy the log lines that include \"UsedNotWarmed\" and/or " +
+                "\"WarmedNotUsed\" into the following text area and press the button below to " +
+                "update the collection.",
+                MessageType.Info);
+            GUILayout.Label("Shader Log Strings (One Per Line):");
+            shaderLogString = GUILayout.TextArea(shaderLogString);
+
+            if (GUILayout.Button("Update Prewarms from Shader Log Strings"))
+            {
+                string[] lines = shaderLogString.Trim().Split("\n");
+                foreach (string line in lines)
+                {
+                    string[] pieces = line.Trim().Split(";");
+                    if (pieces.Length != 4)
+                    {
+                        Debug.LogError($"Invalid format for shader log string: {line}");
+                        return;
+                    }
+
+                    bool wasUsed = pieces[0].EndsWith("UsedNotWarmed");
+                    if (!wasUsed && !pieces[0].EndsWith("WarmedNotUsed"))
+                    {
+                        Debug.LogError("Invalid format for shader log string, expected to find " +
+                                       $"\"UsedNotWarmed\" or \"WarmedNotUsed\" present: {line}");
+                        return;
+                    }
+
+                    string shaderName = pieces[1];
+
+                    List<string> keywords = new();
+                    if (pieces[2].Length > 0)
+                    {
+                        keywords = pieces[2].Split(",").ToList();
+                        keywords.Sort();
+                    }
+
+                    List<ShaderWarming.VertexAttributeDescriptorSerializable> vertexAttributes =
+                        new();
+                    if (pieces[3].Length > 0)
+                    {
+                        foreach (string vertexAttributeStr in pieces[3].Split(","))
+                        {
+                            vertexAttributes.Add(
+                                ShaderWarming.VertexAttributeDescriptorSerializable.FromString(
+                                    vertexAttributeStr));
+                        }
+                    }
+
+                    Shader shader = Shader.Find(shaderName);
+                    if (shader == null)
+                    {
+                        Debug.LogError($"Shader {shaderName} not found");
+                        return;
+                    }
+
+                    ShaderWarming.ShaderWarmingInfo matchedInfo = null;
+                    foreach (ShaderWarming.ShaderWarmingInfo info in shaderWarming
+                                 .ShaderWarmingInfos)
+                    {
+                        if (info.shader != shader)
+                        {
+                            continue;
+                        }
+
+                        if (info.keywords.Count != keywords.Count)
+                        {
+                            continue;
+                        }
+
+                        bool keywordsMatch = true;
+                        for (int i = 0; i < info.keywords.Count; i++)
+                        {
+                            if (info.keywords[i] != keywords[i])
+                            {
+                                keywordsMatch = false;
+                            }
+                        }
+
+                        if (!keywordsMatch)
+                        {
+                            continue;
+                        }
+
+                        if (info.vertexDescriptors.Count != vertexAttributes.Count)
+                        {
+                            continue;
+                        }
+
+                        bool vertexAttributesMatch = true;
+                        for (int i = 0; i < info.vertexDescriptors.Count; i++)
+                        {
+                            if (!info.vertexDescriptors[i].Equals(vertexAttributes[i]))
+                            {
+                                vertexAttributesMatch = false;
+                            }
+                        }
+
+                        if (!vertexAttributesMatch)
+                        {
+                            continue;
+                        }
+
+                        matchedInfo = info;
+                        break;
+                    }
+
+                    if (wasUsed && matchedInfo == null)
+                    {
+                        matchedInfo = new ShaderWarming.ShaderWarmingInfo
+                        {
+                            shader = shader,
+                            keywords = keywords,
+                            vertexDescriptors = vertexAttributes
+                        };
+                        shaderWarming.ShaderWarmingInfos.Add(matchedInfo);
+                    }
+
+                    if (!wasUsed && matchedInfo != null)
+                    {
+                        shaderWarming.ShaderWarmingInfos.Remove(matchedInfo);
+                    }
+                }
+
+                shaderLogString = "";
+
+                EditorUtility.SetDirty(shaderWarming);
+            }
+        }
+    }
+}

LeapBrush/Assets/MagicLeap/LeapBrush/Editor/ShaderWarmingEditor.cs.meta

@@ -9,10 +9,19 @@
                     "name": "Toggle Menu",
                     "type": "Button",
                     "id": "e0b7131d-4e6b-45a5-94fe-adea98c8bf4b",
-                    "expectedControlType": "Button",
+                    "expectedControlType": "",
                     "processors": "",
                     "interactions": "",
                     "initialStateCheck": false
+                },
+                {
+                    "name": "ControllerTrackpad",
+                    "type": "Value",
+                    "id": "e66682a7-ea1d-4c75-84b1-aded5267d6b7",
+                    "expectedControlType": "Vector2",
+                    "processors": "",
+                    "interactions": "",
+                    "initialStateCheck": true
                 }
             ],
             "bindings": [
@@ -48,6 +57,39 @@
                     "action": "Toggle Menu",
                     "isComposite": false,
                     "isPartOfComposite": false
+                },
+                {
+                    "name": "",
+                    "id": "be3381ee-0e54-4ff0-a671-8c08a43a4615",
+                    "path": "<XRController>{LeftHand}/menuButton",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "",
+                    "action": "Toggle Menu",
+                    "isComposite": false,
+                    "isPartOfComposite": false
+                },
+                {
+                    "name": "",
+                    "id": "95e98f49-27e1-41ee-a947-ef543dd35d4d",
+                    "path": "<MagicLeapController>{RightHand}/trackpad",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "",
+                    "action": "ControllerTrackpad",
+                    "isComposite": false,
+                    "isPartOfComposite": false
+                },
+                {
+                    "name": "",
+                    "id": "10ece7ce-8b5a-4d6c-8e96-c025d198cf5c",
+                    "path": "<MagicLeapController>{LeftHand}/trackpad",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "",
+                    "action": "ControllerTrackpad",
+                    "isComposite": false,
+                    "isPartOfComposite": false
                 }
             ]
         }

LeapBrush/Assets/MagicLeap/LeapBrush/Input/LeapBrushInput.inputactions

@@ -7,26 +7,24 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Dimmer
-  m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3}
+  m_Name: DimmerAlpha
+  m_Shader: {fileID: 4800000, guid: 109e1aab8c2f549d3855a94bf8a1885c, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
-  m_InvalidKeywords:
-  - _EMISSION
-  m_LightmapFlags: 0
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 1
-  m_CustomRenderQueue: 2000
-  stringTagMap:
-    RenderType: Opaque
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 4000
+  stringTagMap: {}
   disabledShaderPasses: []
   m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
     - _BaseMap:
-        m_Texture: {fileID: 0}
+        m_Texture: {fileID: 2800000, guid: 02b41135652424687a583bd15f3acd28, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BumpMap:
@@ -49,10 +47,6 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
-    - _Illum:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
     - _MainTex:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -69,65 +63,64 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
-    - _Tex:
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
-    - _Texture:
+    - unity_ShadowMasks:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
+    - _Alpha: 0
     - _AlphaClip: 0
     - _AlphaToMask: 0
     - _Blend: 0
+    - _BlendModePreserveSpecular: 1
     - _BlendOp: 0
     - _BumpScale: 1
-    - _Cull: 0
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
     - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _DstBlendAlpha: 0
-    - _Emission: 1
-    - _Exposure: 1
-    - _FresnelBias: 0
-    - _FresnelPower: 1.09
-    - _FresnelScale: 1
-    - _GlossMapScale: 1
-    - _Glossiness: 0.5
-    - _GlossyReflections: 1
-    - _Inside: 0.397
-    - _InvFade: 1.81
+    - _EnvironmentReflections: 0
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 0
     - _Metallic: 0
-    - _Mode: 0
     - _OcclusionStrength: 1
-    - _Parallax: 0.02
+    - _Parallax: 0.005
     - _QueueOffset: 0
-    - _Rim: 0.499
-    - _Rotation: 0
+    - _ReceiveShadows: 0
     - _SampleGI: 0
-    - _Shininess: 0.7
+    - _Smoothness: 0.5
     - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _Speed: 0.5
+    - _SpecularHighlights: 0
     - _SrcBlend: 1
     - _SrcBlendAlpha: 1
-    - _Strength: 1.5
     - _Surface: 0
-    - _Tile: 5
-    - _UVSec: 0
+    - _WorkflowMode: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
-    - _FresnelColor: {r: 1, g: 1, b: 1, a: 1}
-    - _SpecColor: {r: 1, g: 1, b: 1, a: 1}
-    - _Tint: {r: 1, g: 1, b: 1, a: 1}
-    - _TintColor: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
---- !u!114 &3264011209724917906
+--- !u!114 &1356495905160393411
 MonoBehaviour:
   m_ObjectHideFlags: 11
   m_CorrespondingSourceObject: {fileID: 0}