Updates to version .88

* New features * Update various packages and dependencies * com.magicleap.mrtk3 to 1.3.0 * com.magicleap.soundfield to 3.4.9-240906.127306.upstrea * com.magicleap.spectator to 1.3.6 * com.magicleap.unitysdk to 2.5.0 * com.unity.ide.rider to 3.0.34 * com.unity.localization to 1.5.3 * com.unity.toolchain.macos-x86_64-linux-x86_64 to 2.0.10 * com.unity.xr.hands to 1.4.3 * com.unity.xr.management to 4.5.0 * Switch MRTK3 to use Unity Asset Store assets and delete submodule * Bug fixes * Play brush stroke and eraser sounds at correct locations instead of at the origin
magicleap · Oct 25, 2024 · c48ba10 · c48ba10
1 parent ccb9bed
commit c48ba10
Show file tree

Hide file tree

Showing 18 changed files with 413 additions and 177 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "third_party/grpc"]
 	path = third_party/grpc
 	url = https://github.com/grpc/grpc
-[submodule "UnityPackages/ThirdParty/MixedRealityToolkit-Unity"]
-	path = UnityPackages/ThirdParty/MixedRealityToolkit-Unity
-	url = https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity.git
diff --git a/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Tools/PolyBrush.prefab b/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Tools/PolyBrush.prefab
@@ -14,8 +14,6 @@ GameObject:
   - component: {fileID: 4956974968747702228}
   - component: {fileID: 7054335474371100955}
   - component: {fileID: 7354559637444127314}
-  - component: {fileID: 3186744892060591940}
-  - component: {fileID: 5421614604008742582}
   m_Layer: 0
   m_Name: PolyBrush
   m_TagString: Untagged
@@ -37,6 +35,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6209736454387026908}
+  - {fileID: 176053710057531115}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &8734790011195410590
@@ -57,7 +56,7 @@ MonoBehaviour:
     type: 2}
   _dimmerAlphaMaterial: {fileID: 2100000, guid: 8346aa1a1ae184be8a1e2eb9274f6cf1,
     type: 2}
-  _drawPointSound: {fileID: 3186744892060591940}
+  _drawPointSound: {fileID: 1307959279326953595}
 --- !u!33 &2841490051788236240
 MeshFilter:
   m_ObjectHideFlags: 0
@@ -157,13 +156,46 @@ Rigidbody:
   m_Interpolate: 0
   m_Constraints: 126
   m_CollisionDetection: 0
---- !u!82 &3186744892060591940
+--- !u!1 &4547216270475566601
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 176053710057531115}
+  - component: {fileID: 1307959279326953595}
+  - component: {fileID: 1689051864802877913}
+  m_Layer: 0
+  m_Name: Audio
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &176053710057531115
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4547216270475566601}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1127884730027632192}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!82 &1307959279326953595
 AudioSource:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 930424238358415018}
+  m_GameObject: {fileID: 4547216270475566601}
   m_Enabled: 1
   serializedVersion: 4
   OutputAudioMixerGroup: {fileID: 0}
@@ -253,13 +285,13 @@ AudioSource:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
---- !u!82 &5421614604008742582
+--- !u!82 &1689051864802877913
 AudioSource:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 930424238358415018}
+  m_GameObject: {fileID: 4547216270475566601}
   m_Enabled: 1
   serializedVersion: 4
   OutputAudioMixerGroup: {fileID: 0}

diff --git a/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Tools/PolyBrushTool.prefab b/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Tools/PolyBrushTool.prefab
@@ -24,6 +24,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 930424238358415018}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -32,7 +33,6 @@ Transform:
   - {fileID: 3305572047710437634}
   - {fileID: 7658000812860537116}
   m_Father: {fileID: 0}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &3746689280781274632
 MonoBehaviour:
@@ -47,10 +47,11 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   _brushControllerTransform: {fileID: 0}
+  _isHandControlled: 0
   Prefab: {fileID: 930424238358415018, guid: e138e278e0ba1464bb6e5ec56b69b004, type: 3}
   _snapVisualization: {fileID: 2693407278348592159}
-  _drawPointSound: {fileID: 1027202195290865670}
-  _drawEndSound: {fileID: 7585676602061453812}
+  _drawPointSound: {fileID: 3485226893071492921}
+  _drawEndSound: {fileID: 3821439338853877403}
   _brush: {fileID: 6575528479904853980}
 --- !u!1001 &2212616340229495618
 PrefabInstance:
@@ -221,15 +222,21 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e138e278e0ba1464bb6e5ec56b69b004, type: 3}
---- !u!82 &1027202195290865670 stripped
+--- !u!4 &3305572047710437634 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 1127884730027632192, guid: e138e278e0ba1464bb6e5ec56b69b004,
+    type: 3}
+  m_PrefabInstance: {fileID: 2483961058971068226}
+  m_PrefabAsset: {fileID: 0}
+--- !u!82 &3485226893071492921 stripped
 AudioSource:
-  m_CorrespondingSourceObject: {fileID: 3186744892060591940, guid: e138e278e0ba1464bb6e5ec56b69b004,
+  m_CorrespondingSourceObject: {fileID: 1307959279326953595, guid: e138e278e0ba1464bb6e5ec56b69b004,
     type: 3}
   m_PrefabInstance: {fileID: 2483961058971068226}
   m_PrefabAsset: {fileID: 0}
---- !u!4 &3305572047710437634 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 1127884730027632192, guid: e138e278e0ba1464bb6e5ec56b69b004,
+--- !u!82 &3821439338853877403 stripped
+AudioSource:
+  m_CorrespondingSourceObject: {fileID: 1689051864802877913, guid: e138e278e0ba1464bb6e5ec56b69b004,
     type: 3}
   m_PrefabInstance: {fileID: 2483961058971068226}
   m_PrefabAsset: {fileID: 0}
@@ -245,9 +252,3 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f637d38f20394925b6550aef2cb534b5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!82 &7585676602061453812 stripped
-AudioSource:
-  m_CorrespondingSourceObject: {fileID: 5421614604008742582, guid: e138e278e0ba1464bb6e5ec56b69b004,
-    type: 3}
-  m_PrefabInstance: {fileID: 2483961058971068226}
-  m_PrefabAsset: {fileID: 0}
diff --git a/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Tools/ScribbleBrush.prefab b/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Tools/ScribbleBrush.prefab
@@ -14,8 +14,6 @@ GameObject:
   - component: {fileID: 4956974968747702228}
   - component: {fileID: 7054335474371100955}
   - component: {fileID: 7354559637444127314}
-  - component: {fileID: 7786503166106154313}
-  - component: {fileID: 3923114871895260967}
   m_Layer: 0
   m_Name: ScribbleBrush
   m_TagString: Untagged
@@ -35,7 +33,8 @@ Transform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 7507783530324755649}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &7562795435256879299
@@ -50,8 +49,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 7daa9bbf470b4c51a1719f58f328b55c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  _drawStartSound: {fileID: 7786503166106154313}
-  _drawEndSound: {fileID: 3923114871895260967}
+  _drawStartSound: {fileID: 6290096552619398490}
+  _drawEndSound: {fileID: 3464618309320648997}
 --- !u!33 &2841490051788236240
 MeshFilter:
   m_ObjectHideFlags: 0
@@ -151,13 +150,46 @@ Rigidbody:
   m_Interpolate: 0
   m_Constraints: 126
   m_CollisionDetection: 0
---- !u!82 &7786503166106154313
+--- !u!1 &3540130841697796159
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7507783530324755649}
+  - component: {fileID: 6290096552619398490}
+  - component: {fileID: 3464618309320648997}
+  m_Layer: 0
+  m_Name: Audio
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7507783530324755649
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3540130841697796159}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1127884730027632192}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!82 &6290096552619398490
 AudioSource:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 930424238358415018}
+  m_GameObject: {fileID: 3540130841697796159}
   m_Enabled: 1
   serializedVersion: 4
   OutputAudioMixerGroup: {fileID: 0}
@@ -247,13 +279,13 @@ AudioSource:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
---- !u!82 &3923114871895260967
+--- !u!82 &3464618309320648997
 AudioSource:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 930424238358415018}
+  m_GameObject: {fileID: 3540130841697796159}
   m_Enabled: 1
   serializedVersion: 4
   OutputAudioMixerGroup: {fileID: 0}

diff --git a/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Tools/ScribbleBrushTool.prefab b/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Tools/ScribbleBrushTool.prefab
@@ -24,14 +24,14 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 930424238358415018}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2517402048049516709}
   m_Father: {fileID: 0}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &550542572964801706
 MonoBehaviour:
@@ -46,9 +46,10 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   _brushControllerTransform: {fileID: 0}
+  _isHandControlled: 0
   Prefab: {fileID: 930424238358415018, guid: 753873366eb5840cfb25824d65382348, type: 3}
-  _drawStartSound: {fileID: 4703906059343971244}
-  _drawEndSound: {fileID: 1961637373446523330}
+  _drawStartSound: {fileID: 8791729612393456575}
+  _drawEndSound: {fileID: 2115668190266154944}
   _brush: {fileID: 5025142649436892710}
 --- !u!1001 &3263023941357631205
 PrefabInstance:
@@ -63,11 +64,6 @@ PrefabInstance:
       propertyPath: m_Name
       value: ScribbleBrush
       objectReference: {fileID: 0}
-    - target: {fileID: 1127884730027632192, guid: 753873366eb5840cfb25824d65382348,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 1127884730027632192, guid: 753873366eb5840cfb25824d65382348,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -123,9 +119,9 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 753873366eb5840cfb25824d65382348, type: 3}
---- !u!82 &1961637373446523330 stripped
+--- !u!82 &2115668190266154944 stripped
 AudioSource:
-  m_CorrespondingSourceObject: {fileID: 3923114871895260967, guid: 753873366eb5840cfb25824d65382348,
+  m_CorrespondingSourceObject: {fileID: 3464618309320648997, guid: 753873366eb5840cfb25824d65382348,
     type: 3}
   m_PrefabInstance: {fileID: 3263023941357631205}
   m_PrefabAsset: {fileID: 0}
@@ -135,12 +131,6 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 3263023941357631205}
   m_PrefabAsset: {fileID: 0}
---- !u!82 &4703906059343971244 stripped
-AudioSource:
-  m_CorrespondingSourceObject: {fileID: 7786503166106154313, guid: 753873366eb5840cfb25824d65382348,
-    type: 3}
-  m_PrefabInstance: {fileID: 3263023941357631205}
-  m_PrefabAsset: {fileID: 0}
 --- !u!114 &5025142649436892710 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 7562795435256879299, guid: 753873366eb5840cfb25824d65382348,
@@ -153,3 +143,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 7daa9bbf470b4c51a1719f58f328b55c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!82 &8791729612393456575 stripped
+AudioSource:
+  m_CorrespondingSourceObject: {fileID: 6290096552619398490, guid: 753873366eb5840cfb25824d65382348,
+    type: 3}
+  m_PrefabInstance: {fileID: 3263023941357631205}
+  m_PrefabAsset: {fileID: 0}