Skip to content

Commit 10dfef9

Browse files
bsawyer-mlbsawyer-ml
committed
Release v1.7.0
1 parent 1fc9526 commit 10dfef9

18 files changed

+274
-151
lines changed

‎Assets/MagicLeap/Examples/Scenes/MediaPlayer.unity‎

Lines changed: 114 additions & 4 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.18028386, g: 0.22571427, b: 0.3069231, 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:
@@ -155,6 +155,18 @@ Transform:
155155
m_Father: {fileID: 0}
156156
m_RootOrder: 0
157157
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
158+
--- !u!1 &425463606 stripped
159+
GameObject:
160+
m_CorrespondingSourceObject: {fileID: 1212932027842687027, guid: 0ffd6c0636c54b94cb445a6bcd349bf1,
161+
type: 3}
162+
m_PrefabInstance: {fileID: 1530880107}
163+
m_PrefabAsset: {fileID: 0}
164+
--- !u!1 &437861588 stripped
165+
GameObject:
166+
m_CorrespondingSourceObject: {fileID: 1212932027842687027, guid: 0ffd6c0636c54b94cb445a6bcd349bf1,
167+
type: 3}
168+
m_PrefabInstance: {fileID: 1319996495}
169+
m_PrefabAsset: {fileID: 0}
158170
--- !u!114 &618107767 stripped
159171
MonoBehaviour:
160172
m_CorrespondingSourceObject: {fileID: 9144045081349396371, guid: 6906f74934047d24e9a47bbdd1afb57a,
@@ -200,6 +212,12 @@ Transform:
200212
m_Father: {fileID: 0}
201213
m_RootOrder: 1
202214
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
215+
--- !u!1 &1029815186 stripped
216+
GameObject:
217+
m_CorrespondingSourceObject: {fileID: 1212932027842687027, guid: 0ffd6c0636c54b94cb445a6bcd349bf1,
218+
type: 3}
219+
m_PrefabInstance: {fileID: 1672931625}
220+
m_PrefabAsset: {fileID: 0}
203221
--- !u!1001 &1144542540
204222
PrefabInstance:
205223
m_ObjectHideFlags: 0
@@ -980,23 +998,69 @@ PrefabInstance:
980998
propertyPath: m_Enabled
981999
value: 0
9821000
objectReference: {fileID: 0}
1001+
- target: {fileID: 6669455948576777451, guid: 0ffd6c0636c54b94cb445a6bcd349bf1,
1002+
type: 3}
1003+
propertyPath: prepareAfterStop
1004+
value: 1
1005+
objectReference: {fileID: 0}
9831006
m_RemovedComponents: []
9841007
m_RemovedGameObjects: []
9851008
m_AddedGameObjects: []
986-
m_AddedComponents: []
1009+
m_AddedComponents:
1010+
- targetCorrespondingSourceObject: {fileID: 1212932027842687027, guid: 0ffd6c0636c54b94cb445a6bcd349bf1,
1011+
type: 3}
1012+
insertIndex: -1
1013+
addedObject: {fileID: 1319996498}
9871014
m_SourcePrefab: {fileID: 100100000, guid: 0ffd6c0636c54b94cb445a6bcd349bf1, type: 3}
9881015
--- !u!4 &1319996496 stripped
9891016
Transform:
9901017
m_CorrespondingSourceObject: {fileID: 1349745745868055630, guid: 0ffd6c0636c54b94cb445a6bcd349bf1,
9911018
type: 3}
9921019
m_PrefabInstance: {fileID: 1319996495}
9931020
m_PrefabAsset: {fileID: 0}
1021+
--- !u!114 &1319996498
1022+
MonoBehaviour:
1023+
m_ObjectHideFlags: 0
1024+
m_CorrespondingSourceObject: {fileID: 0}
1025+
m_PrefabInstance: {fileID: 0}
1026+
m_PrefabAsset: {fileID: 0}
1027+
m_GameObject: {fileID: 437861588}
1028+
m_Enabled: 1
1029+
m_EditorHideFlags: 0
1030+
m_Script: {fileID: 11500000, guid: 47e4e021355edcc449ac2d9cca5b9105, type: 3}
1031+
m_Name:
1032+
m_EditorClassIdentifier:
1033+
mediaPlayerBehavior: {fileID: 1432346203}
9941034
--- !u!23 &1370325391 stripped
9951035
MeshRenderer:
9961036
m_CorrespondingSourceObject: {fileID: 3131652113458425602, guid: 0ffd6c0636c54b94cb445a6bcd349bf1,
9971037
type: 3}
9981038
m_PrefabInstance: {fileID: 1530880107}
9991039
m_PrefabAsset: {fileID: 0}
1040+
--- !u!114 &1370325394 stripped
1041+
MonoBehaviour:
1042+
m_CorrespondingSourceObject: {fileID: 6669455948576777451, guid: 0ffd6c0636c54b94cb445a6bcd349bf1,
1043+
type: 3}
1044+
m_PrefabInstance: {fileID: 1530880107}
1045+
m_PrefabAsset: {fileID: 0}
1046+
m_GameObject: {fileID: 0}
1047+
m_Enabled: 1
1048+
m_EditorHideFlags: 0
1049+
m_Script: {fileID: 11500000, guid: 9e09ce4a5f1fc4144a50a63bff73dc6b, type: 3}
1050+
m_Name:
1051+
m_EditorClassIdentifier:
1052+
--- !u!114 &1432346203 stripped
1053+
MonoBehaviour:
1054+
m_CorrespondingSourceObject: {fileID: 6669455948576777451, guid: 0ffd6c0636c54b94cb445a6bcd349bf1,
1055+
type: 3}
1056+
m_PrefabInstance: {fileID: 1319996495}
1057+
m_PrefabAsset: {fileID: 0}
1058+
m_GameObject: {fileID: 0}
1059+
m_Enabled: 1
1060+
m_EditorHideFlags: 0
1061+
m_Script: {fileID: 11500000, guid: 9e09ce4a5f1fc4144a50a63bff73dc6b, type: 3}
1062+
m_Name:
1063+
m_EditorClassIdentifier:
10001064
--- !u!1 &1462129510
10011065
GameObject:
10021066
m_ObjectHideFlags: 0
@@ -1251,14 +1315,43 @@ PrefabInstance:
12511315
m_RemovedComponents: []
12521316
m_RemovedGameObjects: []
12531317
m_AddedGameObjects: []
1254-
m_AddedComponents: []
1318+
m_AddedComponents:
1319+
- targetCorrespondingSourceObject: {fileID: 1212932027842687027, guid: 0ffd6c0636c54b94cb445a6bcd349bf1,
1320+
type: 3}
1321+
insertIndex: -1
1322+
addedObject: {fileID: 1530880110}
12551323
m_SourcePrefab: {fileID: 100100000, guid: 0ffd6c0636c54b94cb445a6bcd349bf1, type: 3}
12561324
--- !u!4 &1530880108 stripped
12571325
Transform:
12581326
m_CorrespondingSourceObject: {fileID: 1349745745868055630, guid: 0ffd6c0636c54b94cb445a6bcd349bf1,
12591327
type: 3}
12601328
m_PrefabInstance: {fileID: 1530880107}
12611329
m_PrefabAsset: {fileID: 0}
1330+
--- !u!114 &1530880110
1331+
MonoBehaviour:
1332+
m_ObjectHideFlags: 0
1333+
m_CorrespondingSourceObject: {fileID: 0}
1334+
m_PrefabInstance: {fileID: 0}
1335+
m_PrefabAsset: {fileID: 0}
1336+
m_GameObject: {fileID: 425463606}
1337+
m_Enabled: 1
1338+
m_EditorHideFlags: 0
1339+
m_Script: {fileID: 11500000, guid: 47e4e021355edcc449ac2d9cca5b9105, type: 3}
1340+
m_Name:
1341+
m_EditorClassIdentifier:
1342+
mediaPlayerBehavior: {fileID: 1370325394}
1343+
--- !u!114 &1659751857 stripped
1344+
MonoBehaviour:
1345+
m_CorrespondingSourceObject: {fileID: 6669455948576777451, guid: 0ffd6c0636c54b94cb445a6bcd349bf1,
1346+
type: 3}
1347+
m_PrefabInstance: {fileID: 1672931625}
1348+
m_PrefabAsset: {fileID: 0}
1349+
m_GameObject: {fileID: 0}
1350+
m_Enabled: 1
1351+
m_EditorHideFlags: 0
1352+
m_Script: {fileID: 11500000, guid: 9e09ce4a5f1fc4144a50a63bff73dc6b, type: 3}
1353+
m_Name:
1354+
m_EditorClassIdentifier:
12621355
--- !u!1001 &1672931625
12631356
PrefabInstance:
12641357
m_ObjectHideFlags: 0
@@ -1405,14 +1498,31 @@ PrefabInstance:
14051498
m_RemovedComponents: []
14061499
m_RemovedGameObjects: []
14071500
m_AddedGameObjects: []
1408-
m_AddedComponents: []
1501+
m_AddedComponents:
1502+
- targetCorrespondingSourceObject: {fileID: 1212932027842687027, guid: 0ffd6c0636c54b94cb445a6bcd349bf1,
1503+
type: 3}
1504+
insertIndex: -1
1505+
addedObject: {fileID: 1672931628}
14091506
m_SourcePrefab: {fileID: 100100000, guid: 0ffd6c0636c54b94cb445a6bcd349bf1, type: 3}
14101507
--- !u!4 &1672931626 stripped
14111508
Transform:
14121509
m_CorrespondingSourceObject: {fileID: 1349745745868055630, guid: 0ffd6c0636c54b94cb445a6bcd349bf1,
14131510
type: 3}
14141511
m_PrefabInstance: {fileID: 1672931625}
14151512
m_PrefabAsset: {fileID: 0}
1513+
--- !u!114 &1672931628
1514+
MonoBehaviour:
1515+
m_ObjectHideFlags: 0
1516+
m_CorrespondingSourceObject: {fileID: 0}
1517+
m_PrefabInstance: {fileID: 0}
1518+
m_PrefabAsset: {fileID: 0}
1519+
m_GameObject: {fileID: 1029815186}
1520+
m_Enabled: 1
1521+
m_EditorHideFlags: 0
1522+
m_Script: {fileID: 11500000, guid: 47e4e021355edcc449ac2d9cca5b9105, type: 3}
1523+
m_Name:
1524+
m_EditorClassIdentifier:
1525+
mediaPlayerBehavior: {fileID: 1659751857}
14161526
--- !u!1001 &1710279060
14171527
PrefabInstance:
14181528
m_ObjectHideFlags: 0

‎Assets/MagicLeap/Examples/Scripts/CVCameraExample.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ private void UpdateStatusText()
122122
}
123123
if (!string.IsNullOrEmpty(poseText))
124124
{
125-
_statusText.text += poseText;
125+
_statusText.text += "\n" + poseText;
126126
}
127127
}
128128

‎Assets/MagicLeap/Examples/Scripts/CameraCapture/CameraCaptureExample.cs‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ public class CameraCaptureExample : MonoBehaviour
7676
[SerializeField, Tooltip("Button that disconnect from MLCamera")]
7777
private Button disconnectButton;
7878

79+
private Coroutine recordingRoutine;
80+
7981
private bool IsCameraConnected => captureCamera != null && captureCamera.ConnectionEstablished;
8082

8183
private List<MLCamera.StreamCapability> streamCapabilities;
@@ -149,6 +151,8 @@ private void OnApplicationPause(bool isPaused)
149151
{
150152
if (isPaused && IsCameraConnected)
151153
{
154+
StopCoroutine(recordingRoutine);
155+
StopVideoCapture();
152156
DisconnectCamera();
153157
}
154158
else
@@ -302,7 +306,7 @@ private void OnCaptureButtonClicked()
302306
GetStreamCapability().CaptureType == MLCamera.CaptureType.Preview)
303307
{
304308
StartVideoCapture();
305-
StartCoroutine(StopVideo());
309+
recordingRoutine = StartCoroutine(StopVideo());
306310
}
307311

308312
RefreshUI();
@@ -604,9 +608,11 @@ private void OnCaptureRawVideoFrameAvailable(MLCamera.CameraOutput capturedFrame
604608
captureInfoText.text = capturedFrame.ToString();
605609
}
606610

607-
if (OutputFormat == MLCamera.OutputFormat.RGBA_8888 && FrameRate == MLCamera.CaptureFrameRate._30FPS && GetStreamCapability().Width >= 4096)
611+
if (OutputFormat == MLCamera.OutputFormat.RGBA_8888 && FrameRate == MLCamera.CaptureFrameRate._30FPS && GetStreamCapability().Width >= 3840)
608612
{
609-
// cameraCaptureVisualizer cannot handle throughput of RGBA_8888 4096x3072 at 30 fps
613+
// cameraCaptureVisualizer cannot handle throughput of:
614+
// 1) RGBA_8888 3840x2160 at 30 fps
615+
// 2) RGBA_8888 4096x3072 at 30 fps
610616
skipFrame = !skipFrame;
611617
if (skipFrame)
612618
{

‎Assets/MagicLeap/Examples/Scripts/ControlExample.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ private void UpdateStatus()
7878

7979
StringBuilder strBuilder = new StringBuilder();
8080
strBuilder.Append($"Position: <i>{controllerActions.Position.ReadValue<Vector3>().ToString("n2")}</i>\n");
81+
strBuilder.Append($"Velocity: <i>{controllerActions.Velocity.ReadValue<Vector3>().ToString("n2")}</i>\n");
82+
strBuilder.Append($"AngularVelocity: <i>{controllerActions.AngularVelocity.ReadValue<Vector3>().ToString("n2")}</i>\n");
8183
strBuilder.Append($"Acceleration: <i>{controllerActions.Acceleration.ReadValue<Vector3>().ToString("n2")}</i>\n");
8284
strBuilder.Append($"AngularAcceleration: <i>{controllerActions.AngularAcceleration.ReadValue<Vector3>().ToString("n2")}</i>\n");
8385

‎Assets/MagicLeap/Examples/Scripts/DepthCameraExample.cs‎

Lines changed: 30 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ public class DepthCameraExample : MonoBehaviour
88

99
private bool permissionGranted;
1010
private bool isFrameAvailable = false;
11-
private MLDepthCamera depthCamera = null;
1211
private MLDepthCamera.Data lastData = null;
1312

1413
/// <summary>
@@ -48,6 +47,8 @@ public class DepthCameraExample : MonoBehaviour
4847
private float confidenceMinDist;
4948
private float confidenceMaxDist;
5049

50+
private bool isPerceptionSystemStarted;
51+
5152
[SerializeField, Tooltip("Timeout in milliseconds for data retrieval.")]
5253
private ulong timeout = 0;
5354

@@ -91,13 +92,6 @@ void Awake()
9192

9293
void Start()
9394
{
94-
var settings = new MLDepthCamera.Settings()
95-
{
96-
Mode = mode,
97-
Flags = captureFlag
98-
};
99-
depthCamera = new MLDepthCamera(settings);
100-
10195
MLPermissions.RequestPermission(MLPermission.DepthCamera, permissionCallbacks);
10296
}
10397

@@ -108,18 +102,23 @@ private void OnEnable()
108102

109103
void Update()
110104
{
111-
if (!permissionGranted || depthCamera == null || !depthCamera.IsConnected)
105+
if (!permissionGranted || !MLDepthCamera.IsConnected)
112106
{
113107
return;
114108
}
115109

116-
var result = depthCamera.GetLatestDepthData(timeout, out MLDepthCamera.Data data);
110+
var result = MLDepthCamera.GetLatestDepthData(timeout, out MLDepthCamera.Data data);
117111
isFrameAvailable = result.IsOk;
118112
if (result.IsOk)
119113
{
120114
lastData = data;
121115
}
122116

117+
if (lastData == null)
118+
{
119+
return;
120+
}
121+
123122
switch (captureFlag)
124123
{
125124
case MLDepthCamera.CaptureFlags.AmbientRawDepthImage:
@@ -171,7 +170,10 @@ private void OnDestroy()
171170
permissionCallbacks.OnPermissionGranted -= OnPermissionGranted;
172171
permissionCallbacks.OnPermissionDenied -= OnPermissionDenied;
173172
permissionCallbacks.OnPermissionDeniedAndDontAskAgain -= OnPermissionDenied;
174-
DisonnectCamera();
173+
if (MLDepthCamera.IsConnected)
174+
{
175+
DisonnectCamera();
176+
}
175177
}
176178

177179
private void OnPermissionDenied(string permission)
@@ -190,16 +192,25 @@ private void OnPermissionGranted(string permission)
190192
{
191193
MLPluginLog.Debug($"Granted {permission}.");
192194
permissionGranted = true;
195+
196+
var settings = new MLDepthCamera.Settings()
197+
{
198+
Mode = mode,
199+
Flags = captureFlag
200+
};
201+
MLDepthCamera.SetSettings(settings);
202+
193203
ConnectCamera();
194204
UpdateUI(0);
195205
}
196206

197207
private void ConnectCamera()
198208
{
199-
var result = depthCamera.Connect();
200-
if (result.IsOk && depthCamera.IsConnected)
209+
var result = MLDepthCamera.Connect();
210+
if (result.IsOk && MLDepthCamera.IsConnected)
201211
{
202-
Debug.Log($"Connected to new depth camera with mode = {depthCamera.CurrentSettings.Mode} and flags = {depthCamera.CurrentSettings.Flags}");
212+
isPerceptionSystemStarted = true;
213+
Debug.Log($"Connected to new depth camera with mode = {MLDepthCamera.CurrentSettings.Mode} and flags = {MLDepthCamera.CurrentSettings.Flags}");
203214
}
204215
else
205216
{
@@ -209,10 +220,10 @@ private void ConnectCamera()
209220

210221
private void DisonnectCamera()
211222
{
212-
var result = depthCamera.Disconnect();
213-
if (result.IsOk && !depthCamera.IsConnected)
223+
var result = MLDepthCamera.Disconnect();
224+
if (result.IsOk && !MLDepthCamera.IsConnected)
214225
{
215-
Debug.Log($"Disconnected depth camera with mode = {depthCamera.CurrentSettings.Mode} and flags = {depthCamera.CurrentSettings.Flags}");
226+
Debug.Log($"Disconnected depth camera with mode = {MLDepthCamera.CurrentSettings.Mode} and flags = {MLDepthCamera.CurrentSettings.Flags}");
216227
}
217228
else
218229
{
@@ -222,7 +233,6 @@ private void DisonnectCamera()
222233

223234
void UpdateUI(int _)
224235
{
225-
226236
mode = cameraModeDropdown.GetSelected<MLDepthCamera.Mode>();
227237
captureFlag = captureFlagsDropdown.GetSelected<MLDepthCamera.CaptureFlags>();
228238

@@ -267,7 +277,7 @@ void UpdateUI(int _)
267277

268278
private void CheckAndCreateTexture(int width, int height)
269279
{
270-
if (ImageTexture == null || ImageTexture.width != width || ImageTexture.height != height)
280+
if (ImageTexture == null || (ImageTexture != null && (ImageTexture.width != width || ImageTexture.height != height)))
271281
{
272282
ImageTexture = new Texture2D(width, height, TextureFormat.RFloat, false);
273283
ImageTexture.filterMode = FilterMode.Bilinear;
@@ -292,6 +302,6 @@ private void UpdateSettings()
292302
Flags = captureFlag
293303
};
294304

295-
depthCamera.UpdateSettings(settings);
305+
MLDepthCamera.UpdateSettings(settings);
296306
}
297307
}

0 commit comments

Comments
 (0)