Skip to content

Commit c3ac08a

Browse files
bsawyer-mlbsawyer-ml
committed
Release v2.3.0
1 parent 58383be commit c3ac08a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1685
-4286
lines changed

‎Assets/MagicLeapInput.inputactions.meta‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Scenes/Control.unity‎

Lines changed: 121 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0.18028377, g: 0.22571412, b: 0.30692285, a: 1}
41+
m_IndirectSpecularColor: {r: 0.18018535, g: 0.22559482, b: 0.30677685, a: 1}
4242
m_UseRadianceAmbientProbe: 0
4343
--- !u!157 &3
4444
LightmapSettings:
@@ -263,6 +263,36 @@ PrefabInstance:
263263
propertyPath: m_SizeDelta.y
264264
value: 0
265265
objectReference: {fileID: 0}
266+
- target: {fileID: 2244539710391034114, guid: e11acd7e824adcc43a4715c4f5daa2ba,
267+
type: 3}
268+
propertyPath: m_AnchorMax.y
269+
value: 0
270+
objectReference: {fileID: 0}
271+
- target: {fileID: 2244539710391034114, guid: e11acd7e824adcc43a4715c4f5daa2ba,
272+
type: 3}
273+
propertyPath: m_AnchorMin.y
274+
value: 0
275+
objectReference: {fileID: 0}
276+
- target: {fileID: 2244539710391034114, guid: e11acd7e824adcc43a4715c4f5daa2ba,
277+
type: 3}
278+
propertyPath: m_SizeDelta.x
279+
value: 0
280+
objectReference: {fileID: 0}
281+
- target: {fileID: 2244539710391034114, guid: e11acd7e824adcc43a4715c4f5daa2ba,
282+
type: 3}
283+
propertyPath: m_SizeDelta.y
284+
value: 0
285+
objectReference: {fileID: 0}
286+
- target: {fileID: 2244539710391034114, guid: e11acd7e824adcc43a4715c4f5daa2ba,
287+
type: 3}
288+
propertyPath: m_AnchoredPosition.x
289+
value: 0
290+
objectReference: {fileID: 0}
291+
- target: {fileID: 2244539710391034114, guid: e11acd7e824adcc43a4715c4f5daa2ba,
292+
type: 3}
293+
propertyPath: m_AnchoredPosition.y
294+
value: 0
295+
objectReference: {fileID: 0}
266296
- target: {fileID: 3062218150148249415, guid: e11acd7e824adcc43a4715c4f5daa2ba,
267297
type: 3}
268298
propertyPath: m_AnchorMax.y
@@ -283,11 +313,76 @@ PrefabInstance:
283313
propertyPath: m_AnchoredPosition.y
284314
value: 0
285315
objectReference: {fileID: 0}
316+
- target: {fileID: 3313964705153920904, guid: e11acd7e824adcc43a4715c4f5daa2ba,
317+
type: 3}
318+
propertyPath: m_AnchorMax.y
319+
value: 0
320+
objectReference: {fileID: 0}
321+
- target: {fileID: 3313964705153920904, guid: e11acd7e824adcc43a4715c4f5daa2ba,
322+
type: 3}
323+
propertyPath: m_AnchorMin.y
324+
value: 0
325+
objectReference: {fileID: 0}
326+
- target: {fileID: 3313964705153920904, guid: e11acd7e824adcc43a4715c4f5daa2ba,
327+
type: 3}
328+
propertyPath: m_AnchoredPosition.x
329+
value: 0
330+
objectReference: {fileID: 0}
331+
- target: {fileID: 3313964705153920904, guid: e11acd7e824adcc43a4715c4f5daa2ba,
332+
type: 3}
333+
propertyPath: m_AnchoredPosition.y
334+
value: 0
335+
objectReference: {fileID: 0}
336+
- target: {fileID: 3440436707807112889, guid: e11acd7e824adcc43a4715c4f5daa2ba,
337+
type: 3}
338+
propertyPath: m_AnchorMax.y
339+
value: 0
340+
objectReference: {fileID: 0}
341+
- target: {fileID: 3440436707807112889, guid: e11acd7e824adcc43a4715c4f5daa2ba,
342+
type: 3}
343+
propertyPath: m_AnchorMin.y
344+
value: 0
345+
objectReference: {fileID: 0}
346+
- target: {fileID: 3440436707807112889, guid: e11acd7e824adcc43a4715c4f5daa2ba,
347+
type: 3}
348+
propertyPath: m_AnchoredPosition.x
349+
value: 0
350+
objectReference: {fileID: 0}
351+
- target: {fileID: 3440436707807112889, guid: e11acd7e824adcc43a4715c4f5daa2ba,
352+
type: 3}
353+
propertyPath: m_AnchoredPosition.y
354+
value: 0
355+
objectReference: {fileID: 0}
356+
- target: {fileID: 3981727701387534120, guid: e11acd7e824adcc43a4715c4f5daa2ba,
357+
type: 3}
358+
propertyPath: m_AnchorMax.y
359+
value: 0
360+
objectReference: {fileID: 0}
361+
- target: {fileID: 3981727701387534120, guid: e11acd7e824adcc43a4715c4f5daa2ba,
362+
type: 3}
363+
propertyPath: m_AnchorMin.y
364+
value: 0
365+
objectReference: {fileID: 0}
366+
- target: {fileID: 3981727701387534120, guid: e11acd7e824adcc43a4715c4f5daa2ba,
367+
type: 3}
368+
propertyPath: m_AnchoredPosition.x
369+
value: 0
370+
objectReference: {fileID: 0}
371+
- target: {fileID: 3981727701387534120, guid: e11acd7e824adcc43a4715c4f5daa2ba,
372+
type: 3}
373+
propertyPath: m_AnchoredPosition.y
374+
value: 0
375+
objectReference: {fileID: 0}
286376
- target: {fileID: 4503248613550427396, guid: e11acd7e824adcc43a4715c4f5daa2ba,
287377
type: 3}
288378
propertyPath: m_Name
289379
value: UserInterface
290380
objectReference: {fileID: 0}
381+
- target: {fileID: 4611675272600868204, guid: e11acd7e824adcc43a4715c4f5daa2ba,
382+
type: 3}
383+
propertyPath: title
384+
value: Control
385+
objectReference: {fileID: 0}
291386
- target: {fileID: 4611675272600868204, guid: e11acd7e824adcc43a4715c4f5daa2ba,
292387
type: 3}
293388
propertyPath: controls
@@ -339,6 +434,26 @@ PrefabInstance:
339434
propertyPath: m_SizeDelta.y
340435
value: 0
341436
objectReference: {fileID: 0}
437+
- target: {fileID: 6069143674600871185, guid: e11acd7e824adcc43a4715c4f5daa2ba,
438+
type: 3}
439+
propertyPath: m_AnchorMax.y
440+
value: 0
441+
objectReference: {fileID: 0}
442+
- target: {fileID: 6069143674600871185, guid: e11acd7e824adcc43a4715c4f5daa2ba,
443+
type: 3}
444+
propertyPath: m_AnchorMin.y
445+
value: 0
446+
objectReference: {fileID: 0}
447+
- target: {fileID: 6069143674600871185, guid: e11acd7e824adcc43a4715c4f5daa2ba,
448+
type: 3}
449+
propertyPath: m_AnchoredPosition.x
450+
value: 0
451+
objectReference: {fileID: 0}
452+
- target: {fileID: 6069143674600871185, guid: e11acd7e824adcc43a4715c4f5daa2ba,
453+
type: 3}
454+
propertyPath: m_AnchoredPosition.y
455+
value: 0
456+
objectReference: {fileID: 0}
342457
- target: {fileID: 6976083336696383706, guid: e11acd7e824adcc43a4715c4f5daa2ba,
343458
type: 3}
344459
propertyPath: m_LocalPosition.x
@@ -389,6 +504,11 @@ PrefabInstance:
389504
propertyPath: m_LocalEulerAnglesHint.z
390505
value: 0
391506
objectReference: {fileID: 0}
507+
- target: {fileID: 6992061018102155267, guid: e11acd7e824adcc43a4715c4f5daa2ba,
508+
type: 3}
509+
propertyPath: m_SizeDelta.y
510+
value: 0
511+
objectReference: {fileID: 0}
392512
- target: {fileID: 8721641415031968443, guid: e11acd7e824adcc43a4715c4f5daa2ba,
393513
type: 3}
394514
propertyPath: m_AnchorMax.y

‎Assets/Scenes/EyeGaze.unity‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -816,6 +816,11 @@ PrefabInstance:
816816
propertyPath: m_Name
817817
value: UserInterface
818818
objectReference: {fileID: 0}
819+
- target: {fileID: 4611675272600868204, guid: e11acd7e824adcc43a4715c4f5daa2ba,
820+
type: 3}
821+
propertyPath: title
822+
value: Eye Gaze
823+
objectReference: {fileID: 0}
819824
- target: {fileID: 4611675272600868204, guid: e11acd7e824adcc43a4715c4f5daa2ba,
820825
type: 3}
821826
propertyPath: controls

‎Assets/Scenes/FacialExpression.unity‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
41+
m_IndirectSpecularColor: {r: 0.18028377, g: 0.22571412, b: 0.30692285, a: 1}
4242
m_UseRadianceAmbientProbe: 0
4343
--- !u!157 &3
4444
LightmapSettings:
@@ -547,6 +547,11 @@ PrefabInstance:
547547
propertyPath: m_IsActive
548548
value: 1
549549
objectReference: {fileID: 0}
550+
- target: {fileID: 4611675272600868204, guid: e11acd7e824adcc43a4715c4f5daa2ba,
551+
type: 3}
552+
propertyPath: title
553+
value: Facial Expressions [Experimental Feature]
554+
objectReference: {fileID: 0}
550555
- target: {fileID: 4611675272600868204, guid: e11acd7e824adcc43a4715c4f5daa2ba,
551556
type: 3}
552557
propertyPath: overview
@@ -555,8 +560,13 @@ PrefabInstance:
555560
is not valid or is not tracked, it will not output a percentage for it.
556561
557562
558-
<color=#B7B7B8><b>Mandatory
559-
permission required by this feature:</b></color>
563+
Facial
564+
Expressions make use of one or more OpenXR Extensions not yet part of the
565+
OpenXR Specification.
566+
567+
568+
<color=#B7B7B8><b>Mandatory permission required
569+
by this feature:</b></color>
560570
561571
com.magicleap.permission.FACIAL_EXPRESSION'
562572
objectReference: {fileID: 0}

‎Assets/Scenes/GlobalDimmer.unity‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
41+
m_IndirectSpecularColor: {r: 0.18028377, g: 0.22571412, b: 0.30692285, a: 1}
4242
m_UseRadianceAmbientProbe: 0
4343
--- !u!157 &3
4444
LightmapSettings:
@@ -450,6 +450,11 @@ PrefabInstance:
450450
propertyPath: m_Name
451451
value: UserInterface
452452
objectReference: {fileID: 0}
453+
- target: {fileID: 4611675272600868204, guid: e11acd7e824adcc43a4715c4f5daa2ba,
454+
type: 3}
455+
propertyPath: title
456+
value: Global Dimmer
457+
objectReference: {fileID: 0}
453458
- target: {fileID: 4611675272600868204, guid: e11acd7e824adcc43a4715c4f5daa2ba,
454459
type: 3}
455460
propertyPath: controls

‎Assets/Scenes/Hands.unity‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1149,6 +1149,11 @@ PrefabInstance:
11491149
propertyPath: m_Name
11501150
value: UserInterface
11511151
objectReference: {fileID: 0}
1152+
- target: {fileID: 4611675272600868204, guid: e11acd7e824adcc43a4715c4f5daa2ba,
1153+
type: 3}
1154+
propertyPath: title
1155+
value: Hand Tracking & Interaction
1156+
objectReference: {fileID: 0}
11521157
- target: {fileID: 4611675272600868204, guid: e11acd7e824adcc43a4715c4f5daa2ba,
11531158
type: 3}
11541159
propertyPath: controls

‎Assets/Scenes/HelloCube.unity‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ GameObject:
133133
m_Component:
134134
- component: {fileID: 203844589}
135135
- component: {fileID: 203844588}
136+
- component: {fileID: 203844590}
136137
m_Layer: 0
137138
m_Name: Directional Light
138139
m_TagString: Untagged
@@ -217,6 +218,29 @@ Transform:
217218
m_Children: []
218219
m_Father: {fileID: 0}
219220
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
221+
--- !u!114 &203844590
222+
MonoBehaviour:
223+
m_ObjectHideFlags: 0
224+
m_CorrespondingSourceObject: {fileID: 0}
225+
m_PrefabInstance: {fileID: 0}
226+
m_PrefabAsset: {fileID: 0}
227+
m_GameObject: {fileID: 203844586}
228+
m_Enabled: 1
229+
m_EditorHideFlags: 0
230+
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
231+
m_Name:
232+
m_EditorClassIdentifier:
233+
m_Version: 3
234+
m_UsePipelineSettings: 1
235+
m_AdditionalLightsShadowResolutionTier: 2
236+
m_LightLayerMask: 1
237+
m_RenderingLayers: 1
238+
m_CustomShadowLayers: 0
239+
m_ShadowLayerMask: 1
240+
m_ShadowRenderingLayers: 1
241+
m_LightCookieSize: {x: 1, y: 1}
242+
m_LightCookieOffset: {x: 0, y: 0}
243+
m_SoftShadowQuality: 0
220244
--- !u!1 &372276229
221245
GameObject:
222246
m_ObjectHideFlags: 0
@@ -538,6 +562,11 @@ PrefabInstance:
538562
propertyPath: m_Name
539563
value: UserInterface
540564
objectReference: {fileID: 0}
565+
- target: {fileID: 4611675272600868204, guid: e11acd7e824adcc43a4715c4f5daa2ba,
566+
type: 3}
567+
propertyPath: title
568+
value: Magic Leap 2 Examples
569+
objectReference: {fileID: 0}
541570
- target: {fileID: 4611675272600868204, guid: e11acd7e824adcc43a4715c4f5daa2ba,
542571
type: 3}
543572
propertyPath: controls

‎Assets/Scenes/Meshing.unity‎

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -608,6 +608,10 @@ PrefabInstance:
608608
drives parameters of the meshing API through the MeshingSubsystemComponent.
609609
610610
611+
Spatial
612+
Anchors makes use of OpenXR Extensions not yet part of the OpenXR Specification.
613+
614+
611615
This
612616
example provides a use case of the MapEvents functionality, clearing all
613617
fragments and refreshing the mesh when a new map is detected.
@@ -658,6 +662,11 @@ PrefabInstance:
658662
propertyPath: m_Name
659663
value: UserInterface
660664
objectReference: {fileID: 0}
665+
- target: {fileID: 4611675272600868204, guid: e11acd7e824adcc43a4715c4f5daa2ba,
666+
type: 3}
667+
propertyPath: title
668+
value: World Meshing [Experimental Feature]
669+
objectReference: {fileID: 0}
661670
- target: {fileID: 4611675272600868204, guid: e11acd7e824adcc43a4715c4f5daa2ba,
662671
type: 3}
663672
propertyPath: controls
@@ -676,28 +685,32 @@ PrefabInstance:
676685
drives parameters of the meshing API through the MeshingSubsystemComponent.
677686
678687
679-
This
680-
example provides a use case of the MapEvents functionality, clearing all
681-
fragments and refreshing the mesh when a new map is detected.
688+
World
689+
Meshing makes use of one or more OpenXR Extensions not yet part of the OpenXR
690+
Specification.
682691
683-
It
684-
uses Unity''s default ARMeshManager to drive the meshing subsystem.
685692
693+
This example provides a use case of the MapEvents
694+
functionality, clearing all fragments and refreshing the mesh when a new
695+
map is detected.
686696
687-
The
688-
scene provides several examples of changing the way rendering and physics
689-
interact with the meshing results. You can:
697+
It uses Unity''s default ARMeshManager to drive
698+
the meshing subsystem.
690699
691-
- Visualize the mesh
692-
results. Each setting demonstrates the different parameters used for tweaking
693-
the mesh detector
694700
695-
- Shoot prefab spheres into the scene for physics
696-
interaction.
701+
The scene provides several examples of changing
702+
the way rendering and physics interact with the meshing results. You can:
697703
704+
-
705+
Visualize the mesh results. Each setting demonstrates the different parameters
706+
used for tweaking the mesh detector
698707
699-
<color=#B7B7B8><b>Mandatory permissions required by
700-
this feature</b></color>
708+
- Shoot prefab spheres into
709+
the scene for physics interaction.
710+
711+
712+
<color=#B7B7B8><b>Mandatory
713+
permissions required by this feature</b></color>
701714
702715
- SpatialMapping'
703716
objectReference: {fileID: 0}

0 commit comments

Comments
 (0)