Skip to content

Commit af98077

Browse files
committed
Release v1.8.0
1 parent 10dfef9 commit af98077

File tree

8 files changed

+100
-14
lines changed

8 files changed

+100
-14
lines changed

Assets/MagicLeap/Examples/Scenes/EyeTracking.unity

Lines changed: 7 additions & 7 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.18018606, g: 0.22559257, b: 0.30678663, a: 1}
41+
m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
4242
m_UseRadianceAmbientProbe: 0
4343
--- !u!157 &3
4444
LightmapSettings:
@@ -941,12 +941,12 @@ PrefabInstance:
941941
tracking.\r\nThe example provides a EyeTrackingExample script that drives
942942
parameters of the eye tracking API and displays tracking points and details.\r\n\r\nThe
943943
scene detects where eyes are pointed and displays the cubes in your environment
944-
as you look around. Details about eye tracking are displayed above. Bumper
945-
is used to switch between tracking modes.\r\n\r\nTracking Modes:\r\nBoth
946-
Eyes - Tracks each eye separately and displays for each eye it's focus point.\r\nFixation
947-
Point - Displays both eyes approximate focus point.\r\n \r\n<color=#B7B7B8><b>Mandatory
948-
permissions required by this feature</b></color>\r\n\r\n<color=#B7B7B8><b>Permissions
949-
required by this example</b></color>"
944+
as you look around. Details about eye tracking are displayed above.\n\r\nTracking
945+
Modes:\r\nBoth Eyes - Tracks each eye separately and displays for each eye
946+
it's focus point.\r\nFixation Point - Displays both eyes approximate focus
947+
point.\r\n \r\n<color=#B7B7B8><b>Mandatory permissions required by this
948+
feature</b></color>\r\n\r\n<color=#B7B7B8><b>Permissions required by this
949+
example</b></color>"
950950
objectReference: {fileID: 0}
951951
- target: {fileID: 9144045081354614237, guid: 6906f74934047d24e9a47bbdd1afb57a,
952952
type: 3}

Assets/MagicLeap/Examples/Scripts/AnchorsExample.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ private void HandleOnTrigger(InputAction.CallbackContext obj)
7777
{
7878
if (MLPermissions.CheckPermission(MLPermission.SpatialAnchors).IsOk)
7979
{
80-
MLAnchors.Anchor.Create(new Pose(controllerActions.Position.ReadValue<Vector3>(), controllerActions.Rotation.ReadValue<Quaternion>()), 300, out MLAnchors.Anchor anchor);
80+
MLAnchors.Anchor.Create(new Pose(controllerActions.Position.ReadValue<Vector3>(), controllerActions.Rotation.ReadValue<Quaternion>()), 0, out MLAnchors.Anchor anchor);
8181
anchor.Publish();
8282
}
8383
}

Assets/MagicLeap/Examples/Scripts/EyeTrackingExample.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ private void Update()
107107
$"Center:\n({eyes.leftEyePosition.x:F2}, {eyes.leftEyePosition.y:F2}, {eyes.leftEyePosition.z:F2})\n" +
108108
$"Gaze:\n({leftEyeForwardGaze.x:F2}, {leftEyeForwardGaze.y:F2}, {leftEyeForwardGaze.z:F2})\n" +
109109
$"Confidence:\n{trackingState.LeftCenterConfidence:F2}\n" +
110-
$"Pupil Size:\n{eyes.leftEyeOpenAmount:F2}";
110+
$"Openness:\n{eyes.leftEyeOpenAmount:F2}";
111111

112112
leftEyeTextStatic.text = leftEyeText;
113113

@@ -117,7 +117,7 @@ private void Update()
117117
$"Center:\n({eyes.rightEyePosition.x:F2}, {eyes.rightEyePosition.y:F2}, {eyes.rightEyePosition.z:F2})\n" +
118118
$"Gaze:\n({rightEyeForwardGaze.x:F2}, {rightEyeForwardGaze.y:F2}, {rightEyeForwardGaze.z:F2})\n" +
119119
$"Confidence:\n{trackingState.RightCenterConfidence:F2}\n" +
120-
$"Pupil Size:\n{eyes.rightEyeOpenAmount:F2}";
120+
$"Openness:\n{eyes.rightEyeOpenAmount:F2}";
121121

122122
rightEyeTextStatic.text = rightEyeText;
123123

Assets/MagicLeap/Examples/Scripts/Visualizers/TexturedWireframe/TexturedWireframeGraph.shadergraph

Lines changed: 70 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,9 @@
9292
},
9393
{
9494
"m_Id": "d77e510b6f994fe59405586cda287747"
95+
},
96+
{
97+
"m_Id": "cc11a3cf66fd42758b05ea6c329caafd"
9598
}
9699
],
97100
"m_GroupDatas": [
@@ -382,6 +385,20 @@
382385
"m_SlotId": 0
383386
}
384387
},
388+
{
389+
"m_OutputSlot": {
390+
"m_Node": {
391+
"m_Id": "d77e510b6f994fe59405586cda287747"
392+
},
393+
"m_SlotId": 2
394+
},
395+
"m_InputSlot": {
396+
"m_Node": {
397+
"m_Id": "cc11a3cf66fd42758b05ea6c329caafd"
398+
},
399+
"m_SlotId": 0
400+
}
401+
},
385402
{
386403
"m_OutputSlot": {
387404
"m_Node": {
@@ -422,6 +439,9 @@
422439
"m_Blocks": [
423440
{
424441
"m_Id": "cc0efaa5b7f848c4afed6bf810d7cf5c"
442+
},
443+
{
444+
"m_Id": "cc11a3cf66fd42758b05ea6c329caafd"
425445
}
426446
]
427447
},
@@ -1000,7 +1020,7 @@
10001020
"m_Id": "a8ebbc2fce694d37826c20a09dc584eb"
10011021
},
10021022
"m_AllowMaterialOverride": false,
1003-
"m_SurfaceType": 0,
1023+
"m_SurfaceType": 1,
10041024
"m_ZTestMode": 4,
10051025
"m_ZWriteControl": 0,
10061026
"m_AlphaMode": 0,
@@ -2434,6 +2454,40 @@
24342454
"m_SerializedDescriptor": "SurfaceDescription.BaseColor"
24352455
}
24362456

2457+
{
2458+
"m_SGVersion": 0,
2459+
"m_Type": "UnityEditor.ShaderGraph.BlockNode",
2460+
"m_ObjectId": "cc11a3cf66fd42758b05ea6c329caafd",
2461+
"m_Group": {
2462+
"m_Id": ""
2463+
},
2464+
"m_Name": "SurfaceDescription.Alpha",
2465+
"m_DrawState": {
2466+
"m_Expanded": true,
2467+
"m_Position": {
2468+
"serializedVersion": "2",
2469+
"x": 0.0,
2470+
"y": 0.0,
2471+
"width": 0.0,
2472+
"height": 0.0
2473+
}
2474+
},
2475+
"m_Slots": [
2476+
{
2477+
"m_Id": "e6cd0095942b46b4aafb7fb8f1cf167b"
2478+
}
2479+
],
2480+
"synonyms": [],
2481+
"m_Precision": 0,
2482+
"m_PreviewExpanded": true,
2483+
"m_DismissedVersion": 0,
2484+
"m_PreviewMode": 0,
2485+
"m_CustomColors": {
2486+
"m_SerializableColors": []
2487+
},
2488+
"m_SerializedDescriptor": "SurfaceDescription.Alpha"
2489+
}
2490+
24372491
{
24382492
"m_SGVersion": 0,
24392493
"m_Type": "UnityEditor.ShaderGraph.AddNode",
@@ -2600,6 +2654,21 @@
26002654
]
26012655
}
26022656

2657+
{
2658+
"m_SGVersion": 0,
2659+
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
2660+
"m_ObjectId": "e6cd0095942b46b4aafb7fb8f1cf167b",
2661+
"m_Id": 0,
2662+
"m_DisplayName": "Alpha",
2663+
"m_SlotType": 0,
2664+
"m_Hidden": false,
2665+
"m_ShaderOutputName": "Alpha",
2666+
"m_StageCapability": 2,
2667+
"m_Value": 1.0,
2668+
"m_DefaultValue": 1.0,
2669+
"m_Labels": []
2670+
}
2671+
26032672
{
26042673
"m_SGVersion": 0,
26052674
"m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot",

Assets/MagicLeap/Examples/Scripts/WebRTC/MLWebRTCExample.cs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ public class MLWebRTCExample : MonoBehaviour
7373
private bool waitingForAnswer = false;
7474
private bool waitingForAnswerGetRequest = false;
7575
private bool remotePeerDisconnected = false;
76+
private bool shouldBeConnected = false;
7677

7778
private string serverAddress = "";
7879
private string serverURI = "";
@@ -230,6 +231,8 @@ public void Login()
230231
uiRoot.SetParent(null);
231232
DontDestroyOnLoad(uiRoot.gameObject);
232233
}
234+
235+
shouldBeConnected = true;
233236
});
234237
}
235238
catch (UriFormatException)
@@ -893,6 +896,8 @@ public void Disconnect()
893896

894897
remoteId = "";
895898
localId = "";
899+
900+
shouldBeConnected = false;
896901
}
897902

898903
private void LocalVideoSource_OnCaptureStatusChanged(bool destroyed)
@@ -929,6 +934,18 @@ private void OnPermissionGranted(string permission)
929934
StartAfterPermissions();
930935
}
931936
}
937+
938+
private void OnApplicationPause(bool pause)
939+
{
940+
if(!pause && shouldBeConnected)
941+
{
942+
var result = connection.IsConnected(out bool isConnected);
943+
if(result.IsOk && !isConnected)
944+
{
945+
Connect(PlayerPrefs.GetString(PlayerPrefs_ServerAddress_Key));
946+
}
947+
}
948+
}
932949
}
933950
}
934951

Packages/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"com.unity.modules.vehicles": "1.0.0",
3636
"com.unity.modules.video": "1.0.0",
3737
"com.unity.modules.wind": "1.0.0",
38-
"com.magicleap.unitysdk": "1.7.0"
38+
"com.magicleap.unitysdk": "1.8.0"
3939
},
4040
"scopedRegistries": [
4141
{

Packages/packages-lock.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"dependencies": {
33
"com.magicleap.unitysdk": {
4-
"version": "1.7.0",
4+
"version": "1.8.0",
55
"depth": 0,
66
"source": "registry",
77
"dependencies": {

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ The files in this project can change or even be removed from one release to anot
77

88
## Compatible with
99
- Unity Editor 2022.2
10-
- Magic Leap Unity SDK 1.7.0
10+
- Magic Leap Unity SDK 1.8.0
1111

1212
# Copyright
1313
Copyright (c) 2020-present Magic Leap, Inc. All Rights Reserved.

0 commit comments

Comments
 (0)