Skip to content

Commit c48ba10

Browse files
ghazen-mlghazen-ml
committed
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
1 parent ccb9bed commit c48ba10

File tree

18 files changed

+413
-177
lines changed

18 files changed

+413
-177
lines changed

‎.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
[submodule "third_party/grpc"]
22
path = third_party/grpc
33
url = https://github.com/grpc/grpc
4-
[submodule "UnityPackages/ThirdParty/MixedRealityToolkit-Unity"]
5-
path = UnityPackages/ThirdParty/MixedRealityToolkit-Unity
6-
url = https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity.git

‎LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Tools/PolyBrush.prefab

Lines changed: 39 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ GameObject:
1414
- component: {fileID: 4956974968747702228}
1515
- component: {fileID: 7054335474371100955}
1616
- component: {fileID: 7354559637444127314}
17-
- component: {fileID: 3186744892060591940}
18-
- component: {fileID: 5421614604008742582}
1917
m_Layer: 0
2018
m_Name: PolyBrush
2119
m_TagString: Untagged
@@ -37,6 +35,7 @@ Transform:
3735
m_ConstrainProportionsScale: 0
3836
m_Children:
3937
- {fileID: 6209736454387026908}
38+
- {fileID: 176053710057531115}
4039
m_Father: {fileID: 0}
4140
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
4241
--- !u!114 &8734790011195410590
@@ -57,7 +56,7 @@ MonoBehaviour:
5756
type: 2}
5857
_dimmerAlphaMaterial: {fileID: 2100000, guid: 8346aa1a1ae184be8a1e2eb9274f6cf1,
5958
type: 2}
60-
_drawPointSound: {fileID: 3186744892060591940}
59+
_drawPointSound: {fileID: 1307959279326953595}
6160
--- !u!33 &2841490051788236240
6261
MeshFilter:
6362
m_ObjectHideFlags: 0
@@ -157,13 +156,46 @@ Rigidbody:
157156
m_Interpolate: 0
158157
m_Constraints: 126
159158
m_CollisionDetection: 0
160-
--- !u!82 &3186744892060591940
159+
--- !u!1 &4547216270475566601
160+
GameObject:
161+
m_ObjectHideFlags: 0
162+
m_CorrespondingSourceObject: {fileID: 0}
163+
m_PrefabInstance: {fileID: 0}
164+
m_PrefabAsset: {fileID: 0}
165+
serializedVersion: 6
166+
m_Component:
167+
- component: {fileID: 176053710057531115}
168+
- component: {fileID: 1307959279326953595}
169+
- component: {fileID: 1689051864802877913}
170+
m_Layer: 0
171+
m_Name: Audio
172+
m_TagString: Untagged
173+
m_Icon: {fileID: 0}
174+
m_NavMeshLayer: 0
175+
m_StaticEditorFlags: 0
176+
m_IsActive: 1
177+
--- !u!4 &176053710057531115
178+
Transform:
179+
m_ObjectHideFlags: 0
180+
m_CorrespondingSourceObject: {fileID: 0}
181+
m_PrefabInstance: {fileID: 0}
182+
m_PrefabAsset: {fileID: 0}
183+
m_GameObject: {fileID: 4547216270475566601}
184+
serializedVersion: 2
185+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
186+
m_LocalPosition: {x: 0, y: 0, z: 0}
187+
m_LocalScale: {x: 1, y: 1, z: 1}
188+
m_ConstrainProportionsScale: 0
189+
m_Children: []
190+
m_Father: {fileID: 1127884730027632192}
191+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
192+
--- !u!82 &1307959279326953595
161193
AudioSource:
162194
m_ObjectHideFlags: 0
163195
m_CorrespondingSourceObject: {fileID: 0}
164196
m_PrefabInstance: {fileID: 0}
165197
m_PrefabAsset: {fileID: 0}
166-
m_GameObject: {fileID: 930424238358415018}
198+
m_GameObject: {fileID: 4547216270475566601}
167199
m_Enabled: 1
168200
serializedVersion: 4
169201
OutputAudioMixerGroup: {fileID: 0}
@@ -253,13 +285,13 @@ AudioSource:
253285
m_PreInfinity: 2
254286
m_PostInfinity: 2
255287
m_RotationOrder: 4
256-
--- !u!82 &5421614604008742582
288+
--- !u!82 &1689051864802877913
257289
AudioSource:
258290
m_ObjectHideFlags: 0
259291
m_CorrespondingSourceObject: {fileID: 0}
260292
m_PrefabInstance: {fileID: 0}
261293
m_PrefabAsset: {fileID: 0}
262-
m_GameObject: {fileID: 930424238358415018}
294+
m_GameObject: {fileID: 4547216270475566601}
263295
m_Enabled: 1
264296
serializedVersion: 4
265297
OutputAudioMixerGroup: {fileID: 0}

‎LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Tools/PolyBrushTool.prefab

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ Transform:
2424
m_PrefabInstance: {fileID: 0}
2525
m_PrefabAsset: {fileID: 0}
2626
m_GameObject: {fileID: 930424238358415018}
27+
serializedVersion: 2
2728
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
2829
m_LocalPosition: {x: 0, y: 0, z: 0}
2930
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -32,7 +33,6 @@ Transform:
3233
- {fileID: 3305572047710437634}
3334
- {fileID: 7658000812860537116}
3435
m_Father: {fileID: 0}
35-
m_RootOrder: 0
3636
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3737
--- !u!114 &3746689280781274632
3838
MonoBehaviour:
@@ -47,10 +47,11 @@ MonoBehaviour:
4747
m_Name:
4848
m_EditorClassIdentifier:
4949
_brushControllerTransform: {fileID: 0}
50+
_isHandControlled: 0
5051
Prefab: {fileID: 930424238358415018, guid: e138e278e0ba1464bb6e5ec56b69b004, type: 3}
5152
_snapVisualization: {fileID: 2693407278348592159}
52-
_drawPointSound: {fileID: 1027202195290865670}
53-
_drawEndSound: {fileID: 7585676602061453812}
53+
_drawPointSound: {fileID: 3485226893071492921}
54+
_drawEndSound: {fileID: 3821439338853877403}
5455
_brush: {fileID: 6575528479904853980}
5556
--- !u!1001 &2212616340229495618
5657
PrefabInstance:
@@ -221,15 +222,21 @@ PrefabInstance:
221222
m_AddedGameObjects: []
222223
m_AddedComponents: []
223224
m_SourcePrefab: {fileID: 100100000, guid: e138e278e0ba1464bb6e5ec56b69b004, type: 3}
224-
--- !u!82 &1027202195290865670 stripped
225+
--- !u!4 &3305572047710437634 stripped
226+
Transform:
227+
m_CorrespondingSourceObject: {fileID: 1127884730027632192, guid: e138e278e0ba1464bb6e5ec56b69b004,
228+
type: 3}
229+
m_PrefabInstance: {fileID: 2483961058971068226}
230+
m_PrefabAsset: {fileID: 0}
231+
--- !u!82 &3485226893071492921 stripped
225232
AudioSource:
226-
m_CorrespondingSourceObject: {fileID: 3186744892060591940, guid: e138e278e0ba1464bb6e5ec56b69b004,
233+
m_CorrespondingSourceObject: {fileID: 1307959279326953595, guid: e138e278e0ba1464bb6e5ec56b69b004,
227234
type: 3}
228235
m_PrefabInstance: {fileID: 2483961058971068226}
229236
m_PrefabAsset: {fileID: 0}
230-
--- !u!4 &3305572047710437634 stripped
231-
Transform:
232-
m_CorrespondingSourceObject: {fileID: 1127884730027632192, guid: e138e278e0ba1464bb6e5ec56b69b004,
237+
--- !u!82 &3821439338853877403 stripped
238+
AudioSource:
239+
m_CorrespondingSourceObject: {fileID: 1689051864802877913, guid: e138e278e0ba1464bb6e5ec56b69b004,
233240
type: 3}
234241
m_PrefabInstance: {fileID: 2483961058971068226}
235242
m_PrefabAsset: {fileID: 0}
@@ -245,9 +252,3 @@ MonoBehaviour:
245252
m_Script: {fileID: 11500000, guid: f637d38f20394925b6550aef2cb534b5, type: 3}
246253
m_Name:
247254
m_EditorClassIdentifier:
248-
--- !u!82 &7585676602061453812 stripped
249-
AudioSource:
250-
m_CorrespondingSourceObject: {fileID: 5421614604008742582, guid: e138e278e0ba1464bb6e5ec56b69b004,
251-
type: 3}
252-
m_PrefabInstance: {fileID: 2483961058971068226}
253-
m_PrefabAsset: {fileID: 0}

‎LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Tools/ScribbleBrush.prefab

Lines changed: 41 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ GameObject:
1414
- component: {fileID: 4956974968747702228}
1515
- component: {fileID: 7054335474371100955}
1616
- component: {fileID: 7354559637444127314}
17-
- component: {fileID: 7786503166106154313}
18-
- component: {fileID: 3923114871895260967}
1917
m_Layer: 0
2018
m_Name: ScribbleBrush
2119
m_TagString: Untagged
@@ -35,7 +33,8 @@ Transform:
3533
m_LocalPosition: {x: 0, y: 0, z: 0}
3634
m_LocalScale: {x: 1, y: 1, z: 1}
3735
m_ConstrainProportionsScale: 0
38-
m_Children: []
36+
m_Children:
37+
- {fileID: 7507783530324755649}
3938
m_Father: {fileID: 0}
4039
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
4140
--- !u!114 &7562795435256879299
@@ -50,8 +49,8 @@ MonoBehaviour:
5049
m_Script: {fileID: 11500000, guid: 7daa9bbf470b4c51a1719f58f328b55c, type: 3}
5150
m_Name:
5251
m_EditorClassIdentifier:
53-
_drawStartSound: {fileID: 7786503166106154313}
54-
_drawEndSound: {fileID: 3923114871895260967}
52+
_drawStartSound: {fileID: 6290096552619398490}
53+
_drawEndSound: {fileID: 3464618309320648997}
5554
--- !u!33 &2841490051788236240
5655
MeshFilter:
5756
m_ObjectHideFlags: 0
@@ -151,13 +150,46 @@ Rigidbody:
151150
m_Interpolate: 0
152151
m_Constraints: 126
153152
m_CollisionDetection: 0
154-
--- !u!82 &7786503166106154313
153+
--- !u!1 &3540130841697796159
154+
GameObject:
155+
m_ObjectHideFlags: 0
156+
m_CorrespondingSourceObject: {fileID: 0}
157+
m_PrefabInstance: {fileID: 0}
158+
m_PrefabAsset: {fileID: 0}
159+
serializedVersion: 6
160+
m_Component:
161+
- component: {fileID: 7507783530324755649}
162+
- component: {fileID: 6290096552619398490}
163+
- component: {fileID: 3464618309320648997}
164+
m_Layer: 0
165+
m_Name: Audio
166+
m_TagString: Untagged
167+
m_Icon: {fileID: 0}
168+
m_NavMeshLayer: 0
169+
m_StaticEditorFlags: 0
170+
m_IsActive: 1
171+
--- !u!4 &7507783530324755649
172+
Transform:
173+
m_ObjectHideFlags: 0
174+
m_CorrespondingSourceObject: {fileID: 0}
175+
m_PrefabInstance: {fileID: 0}
176+
m_PrefabAsset: {fileID: 0}
177+
m_GameObject: {fileID: 3540130841697796159}
178+
serializedVersion: 2
179+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
180+
m_LocalPosition: {x: 0, y: 0, z: 0}
181+
m_LocalScale: {x: 1, y: 1, z: 1}
182+
m_ConstrainProportionsScale: 0
183+
m_Children: []
184+
m_Father: {fileID: 1127884730027632192}
185+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
186+
--- !u!82 &6290096552619398490
155187
AudioSource:
156188
m_ObjectHideFlags: 0
157189
m_CorrespondingSourceObject: {fileID: 0}
158190
m_PrefabInstance: {fileID: 0}
159191
m_PrefabAsset: {fileID: 0}
160-
m_GameObject: {fileID: 930424238358415018}
192+
m_GameObject: {fileID: 3540130841697796159}
161193
m_Enabled: 1
162194
serializedVersion: 4
163195
OutputAudioMixerGroup: {fileID: 0}
@@ -247,13 +279,13 @@ AudioSource:
247279
m_PreInfinity: 2
248280
m_PostInfinity: 2
249281
m_RotationOrder: 4
250-
--- !u!82 &3923114871895260967
282+
--- !u!82 &3464618309320648997
251283
AudioSource:
252284
m_ObjectHideFlags: 0
253285
m_CorrespondingSourceObject: {fileID: 0}
254286
m_PrefabInstance: {fileID: 0}
255287
m_PrefabAsset: {fileID: 0}
256-
m_GameObject: {fileID: 930424238358415018}
288+
m_GameObject: {fileID: 3540130841697796159}
257289
m_Enabled: 1
258290
serializedVersion: 4
259291
OutputAudioMixerGroup: {fileID: 0}

‎LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Tools/ScribbleBrushTool.prefab

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ Transform:
2424
m_PrefabInstance: {fileID: 0}
2525
m_PrefabAsset: {fileID: 0}
2626
m_GameObject: {fileID: 930424238358415018}
27+
serializedVersion: 2
2728
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
2829
m_LocalPosition: {x: 0, y: 0, z: 0}
2930
m_LocalScale: {x: 1, y: 1, z: 1}
3031
m_ConstrainProportionsScale: 0
3132
m_Children:
3233
- {fileID: 2517402048049516709}
3334
m_Father: {fileID: 0}
34-
m_RootOrder: 0
3535
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3636
--- !u!114 &550542572964801706
3737
MonoBehaviour:
@@ -46,9 +46,10 @@ MonoBehaviour:
4646
m_Name:
4747
m_EditorClassIdentifier:
4848
_brushControllerTransform: {fileID: 0}
49+
_isHandControlled: 0
4950
Prefab: {fileID: 930424238358415018, guid: 753873366eb5840cfb25824d65382348, type: 3}
50-
_drawStartSound: {fileID: 4703906059343971244}
51-
_drawEndSound: {fileID: 1961637373446523330}
51+
_drawStartSound: {fileID: 8791729612393456575}
52+
_drawEndSound: {fileID: 2115668190266154944}
5253
_brush: {fileID: 5025142649436892710}
5354
--- !u!1001 &3263023941357631205
5455
PrefabInstance:
@@ -63,11 +64,6 @@ PrefabInstance:
6364
propertyPath: m_Name
6465
value: ScribbleBrush
6566
objectReference: {fileID: 0}
66-
- target: {fileID: 1127884730027632192, guid: 753873366eb5840cfb25824d65382348,
67-
type: 3}
68-
propertyPath: m_RootOrder
69-
value: 0
70-
objectReference: {fileID: 0}
7167
- target: {fileID: 1127884730027632192, guid: 753873366eb5840cfb25824d65382348,
7268
type: 3}
7369
propertyPath: m_LocalPosition.x
@@ -123,9 +119,9 @@ PrefabInstance:
123119
m_AddedGameObjects: []
124120
m_AddedComponents: []
125121
m_SourcePrefab: {fileID: 100100000, guid: 753873366eb5840cfb25824d65382348, type: 3}
126-
--- !u!82 &1961637373446523330 stripped
122+
--- !u!82 &2115668190266154944 stripped
127123
AudioSource:
128-
m_CorrespondingSourceObject: {fileID: 3923114871895260967, guid: 753873366eb5840cfb25824d65382348,
124+
m_CorrespondingSourceObject: {fileID: 3464618309320648997, guid: 753873366eb5840cfb25824d65382348,
129125
type: 3}
130126
m_PrefabInstance: {fileID: 3263023941357631205}
131127
m_PrefabAsset: {fileID: 0}
@@ -135,12 +131,6 @@ Transform:
135131
type: 3}
136132
m_PrefabInstance: {fileID: 3263023941357631205}
137133
m_PrefabAsset: {fileID: 0}
138-
--- !u!82 &4703906059343971244 stripped
139-
AudioSource:
140-
m_CorrespondingSourceObject: {fileID: 7786503166106154313, guid: 753873366eb5840cfb25824d65382348,
141-
type: 3}
142-
m_PrefabInstance: {fileID: 3263023941357631205}
143-
m_PrefabAsset: {fileID: 0}
144134
--- !u!114 &5025142649436892710 stripped
145135
MonoBehaviour:
146136
m_CorrespondingSourceObject: {fileID: 7562795435256879299, guid: 753873366eb5840cfb25824d65382348,
@@ -153,3 +143,9 @@ MonoBehaviour:
153143
m_Script: {fileID: 11500000, guid: 7daa9bbf470b4c51a1719f58f328b55c, type: 3}
154144
m_Name:
155145
m_EditorClassIdentifier:
146+
--- !u!82 &8791729612393456575 stripped
147+
AudioSource:
148+
m_CorrespondingSourceObject: {fileID: 6290096552619398490, guid: 753873366eb5840cfb25824d65382348,
149+
type: 3}
150+
m_PrefabInstance: {fileID: 3263023941357631205}
151+
m_PrefabAsset: {fileID: 0}

0 commit comments

Comments
 (0)