Skip to content

Commit 4687f1e

Browse files
committed
Release v1.11.0
1 parent 6ebf8b2 commit 4687f1e

18 files changed

+1735
-471
lines changed

Assets/MagicLeap/Examples/Scenes/AudioCapture.unity

Lines changed: 1240 additions & 113 deletions
Large diffs are not rendered by default.

Assets/MagicLeap/Examples/Scenes/WacomTablet.unity

Lines changed: 66 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -840,6 +840,11 @@ PrefabInstance:
840840
propertyPath: m_AnchoredPosition.y
841841
value: 0
842842
objectReference: {fileID: 0}
843+
- target: {fileID: 9144045080598716609, guid: 6906f74934047d24e9a47bbdd1afb57a,
844+
type: 3}
845+
propertyPath: m_IsActive
846+
value: 1
847+
objectReference: {fileID: 0}
843848
- target: {fileID: 9144045080755800258, guid: 6906f74934047d24e9a47bbdd1afb57a,
844849
type: 3}
845850
propertyPath: m_AnchorMax.y
@@ -860,27 +865,43 @@ PrefabInstance:
860865
propertyPath: m_AnchoredPosition.y
861866
value: 0
862867
objectReference: {fileID: 0}
868+
- target: {fileID: 9144045080803666704, guid: 6906f74934047d24e9a47bbdd1afb57a,
869+
type: 3}
870+
propertyPath: m_AnchorMax.y
871+
value: 0
872+
objectReference: {fileID: 0}
873+
- target: {fileID: 9144045080803666704, guid: 6906f74934047d24e9a47bbdd1afb57a,
874+
type: 3}
875+
propertyPath: m_AnchorMin.y
876+
value: 0
877+
objectReference: {fileID: 0}
878+
- target: {fileID: 9144045080803666704, guid: 6906f74934047d24e9a47bbdd1afb57a,
879+
type: 3}
880+
propertyPath: m_SizeDelta.x
881+
value: 0
882+
objectReference: {fileID: 0}
883+
- target: {fileID: 9144045080803666704, guid: 6906f74934047d24e9a47bbdd1afb57a,
884+
type: 3}
885+
propertyPath: m_SizeDelta.y
886+
value: 0
887+
objectReference: {fileID: 0}
888+
- target: {fileID: 9144045080803666704, guid: 6906f74934047d24e9a47bbdd1afb57a,
889+
type: 3}
890+
propertyPath: m_AnchoredPosition.x
891+
value: 0
892+
objectReference: {fileID: 0}
893+
- target: {fileID: 9144045080803666704, guid: 6906f74934047d24e9a47bbdd1afb57a,
894+
type: 3}
895+
propertyPath: m_AnchoredPosition.y
896+
value: 0
897+
objectReference: {fileID: 0}
863898
- target: {fileID: 9144045080803666705, guid: 6906f74934047d24e9a47bbdd1afb57a,
864899
type: 3}
865900
propertyPath: m_Text
866-
value: '<color=#B7B7B8><b>Hometap</b></color>
867-
868-
Toggle the tablet following
869-
head pose.
870-
871-
872-
873-
<color=#B7B7B8><b>Tablet Touch Ring</b></color>
901+
value: '<color=#B7B7B8><b>Controller Menu Button</b></color>
874902
875-
Rotate
876-
through a list of 16 pre-defined colors.
877-
878-
879-
880-
<color=#B7B7B8><b>Tablet
881-
Touch Ring - Button</b></color>
882-
883-
Clear the canvas.
903+
Toggle
904+
the tablet following head pose.
884905
885906
886907
@@ -894,10 +915,13 @@ PrefabInstance:
894915
<color=#B7B7B8><b>Erasing</b></color>
895916
896917
-
897-
Default Pen: Use the opposite end of the pen while drawing to erase content.
918+
Button 1: Clear
919+
920+
921+
<color=#B7B7B8><b>Change Color</b></color>
898922
899923
-
900-
Both Pens: Hold the [Back] button on the pen while drawing to erase content.
924+
Button 2: Change color, will cycle through the rainbow.
901925
902926
'
903927
objectReference: {fileID: 0}
@@ -955,13 +979,14 @@ PrefabInstance:
955979
type: 3}
956980
propertyPath: m_Text
957981
value: "The example demonstrates how to visualize information from the Wacom
958-
Intuos tablet using the MLInput Tablet API.\r\n\r\nOnce connected, the tablet
959-
will display which buttons are being pressed and the pen will respond by
960-
indicating position and pressure on the tablet. \r\n\r\nAs you begin to draw
961-
the line thickness will change based on applied pressure and the color will
962-
reflect the selection from the color wheel.\r\n\r\nWith the tablet turned
963-
on, hold the center ring button until a blue light flashes on the right,
964-
to the right of the Wacom logo.\r\n\r\n<i>Visible in Settings/Connectivity/Bluetooth.</i>\r\n\r\n<color=#B7B7B8><b>Permissions
982+
Intuos tablet on the ML2 Device. Currently there is limited support for Wacom
983+
Tablet.\n\nTo connect, with the tablet turned on, hold the center ring button
984+
until a blue light flashes on the right, to the right of the Wacom logo.\r\n\nGo
985+
To <i>Settings/Connectivity/Bluetooth.</i>\r and select the Blurtooth device
986+
to connect.\n\r\nOnce connected, the pen will respond by indicating position
987+
and pressure on the tablet. \rDifferent pens will have different button behavior.\n\r\nAs
988+
you begin to draw the line thickness will change based on applied pressure
989+
and the color will reflect the selected color.\n\r\n<color=#B7B7B8><b>Permissions
965990
required by this example</b></color>\r\n- ControllerPose"
966991
objectReference: {fileID: 0}
967992
- target: {fileID: 9144045081096290919, guid: 6906f74934047d24e9a47bbdd1afb57a,
@@ -1024,6 +1049,21 @@ PrefabInstance:
10241049
propertyPath: m_AnchoredPosition.y
10251050
value: 0
10261051
objectReference: {fileID: 0}
1052+
- target: {fileID: 9144045081524275821, guid: 6906f74934047d24e9a47bbdd1afb57a,
1053+
type: 3}
1054+
propertyPath: m_AnchorMax.x
1055+
value: 0
1056+
objectReference: {fileID: 0}
1057+
- target: {fileID: 9144045081524275821, guid: 6906f74934047d24e9a47bbdd1afb57a,
1058+
type: 3}
1059+
propertyPath: m_AnchorMax.y
1060+
value: 0
1061+
objectReference: {fileID: 0}
1062+
- target: {fileID: 9144045081617561596, guid: 6906f74934047d24e9a47bbdd1afb57a,
1063+
type: 3}
1064+
propertyPath: m_SizeDelta.y
1065+
value: 0
1066+
objectReference: {fileID: 0}
10271067
m_RemovedComponents: []
10281068
m_RemovedGameObjects: []
10291069
m_AddedGameObjects: []

Assets/MagicLeap/Examples/Scripts/AnchorsExample.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,14 @@ public class AnchorsExample : MonoBehaviour
2121

2222
void Start()
2323
{
24+
#if UNITY_EDITOR
25+
Debug.LogError("Spatial Anchors is not supported on Application Simulator; please see the Application Simulator documentation for more info.");
26+
this.enabled = false;
27+
AnchorVisualizer vis = FindObjectOfType<AnchorVisualizer>();
28+
if (vis)
29+
vis.enabled = false;
30+
return;
31+
#endif
2432
magicLeapInputs = new MagicLeapInputs();
2533
magicLeapInputs.Enable();
2634
controllerActions = new MagicLeapInputs.ControllerActions(magicLeapInputs);
@@ -32,6 +40,7 @@ void Start()
3240

3341
private void Update()
3442
{
43+
3544
if (localizationInfoUpdateTimer.LimitPassed)
3645
{
3746
localizationInfoUpdateTimer.Reset();
@@ -47,11 +56,14 @@ private void Update()
4756
}
4857

4958
}
59+
60+
#if !UNITY_EDITOR
5061
private void OnDestroy()
5162
{
5263
controllerActions.Bumper.performed -= HandleOnBumper;
5364
controllerActions.Trigger.performed -= HandleOnTrigger;
5465
}
66+
#endif
5567

5668
private void HandleOnBumper(InputAction.CallbackContext obj)
5769
{

0 commit comments

Comments
 (0)