Skip to content

Commit a3f8bf9

Browse files
Bvallon-slBvallon-sl
authored
Merge pull request #317 from stereolabs/v5.2
V5.2
2 parents 7f6566c + 9ffd9c3 commit a3f8bf9

26 files changed

+509
-288
lines changed

‎ZEDCamera/Assets/Prefabs/ZED_Rig_Mono.prefab‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@ MonoBehaviour:
7070
enableTracking: 1
7171
enableSpatialMemory: 1
7272
pathSpatialMemory:
73-
positionalTrackingMode: 0
73+
positionalTrackingMode: 2
74+
enableLocalizationOnly: 0
75+
enable2DGroundMode: 0
7476
setFloorAsOrigin: 1
7577
trackingIsStatic: 0
7678
planeDetectionMaxDistanceThreshold: 0.15
@@ -258,6 +260,11 @@ MeshRenderer:
258260
m_ReflectionProbeUsage: 1
259261
m_RayTracingMode: 2
260262
m_RayTraceProcedural: 0
263+
m_RayTracingAccelStructBuildFlagsOverride: 0
264+
m_RayTracingAccelStructBuildFlags: 1
265+
m_SmallMeshCulling: 1
266+
m_ForceMeshLod: -1
267+
m_MeshLodSelectionBias: 0
261268
m_RenderingLayerMask: 4294967295
262269
m_RendererPriority: 0
263270
m_Materials:
@@ -279,9 +286,11 @@ MeshRenderer:
279286
m_AutoUVMaxDistance: 0.5
280287
m_AutoUVMaxAngle: 89
281288
m_LightmapParameters: {fileID: 0}
289+
m_GlobalIlluminationMeshLod: 0
282290
m_SortingLayerID: 0
283291
m_SortingLayer: 0
284292
m_SortingOrder: 0
293+
m_MaskInteraction: 0
285294
m_AdditionalVertexStreams: {fileID: 0}
286295
--- !u!114 &114589286496521468
287296
MonoBehaviour:

‎ZEDCamera/Assets/Prefabs/ZED_Rig_Stereo.prefab‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,7 @@ AudioSource:
259259
serializedVersion: 4
260260
OutputAudioMixerGroup: {fileID: 0}
261261
m_audioClip: {fileID: 0}
262+
m_Resource: {fileID: 0}
262263
m_PlayOnAwake: 1
263264
m_Volume: 1
264265
m_Pitch: 1
@@ -403,6 +404,11 @@ MeshRenderer:
403404
m_ReflectionProbeUsage: 1
404405
m_RayTracingMode: 2
405406
m_RayTraceProcedural: 0
407+
m_RayTracingAccelStructBuildFlagsOverride: 0
408+
m_RayTracingAccelStructBuildFlags: 1
409+
m_SmallMeshCulling: 1
410+
m_ForceMeshLod: -1
411+
m_MeshLodSelectionBias: 0
406412
m_RenderingLayerMask: 4294967295
407413
m_RendererPriority: 0
408414
m_Materials:
@@ -424,9 +430,11 @@ MeshRenderer:
424430
m_AutoUVMaxDistance: 0.5
425431
m_AutoUVMaxAngle: 89
426432
m_LightmapParameters: {fileID: 0}
433+
m_GlobalIlluminationMeshLod: 0
427434
m_SortingLayerID: 0
428435
m_SortingLayer: 0
429436
m_SortingOrder: 0
437+
m_MaskInteraction: 0
430438
m_AdditionalVertexStreams: {fileID: 0}
431439
--- !u!114 &114833973883948664
432440
MonoBehaviour:
@@ -500,6 +508,11 @@ MeshRenderer:
500508
m_ReflectionProbeUsage: 1
501509
m_RayTracingMode: 2
502510
m_RayTraceProcedural: 0
511+
m_RayTracingAccelStructBuildFlagsOverride: 0
512+
m_RayTracingAccelStructBuildFlags: 1
513+
m_SmallMeshCulling: 1
514+
m_ForceMeshLod: -1
515+
m_MeshLodSelectionBias: 0
503516
m_RenderingLayerMask: 4294967295
504517
m_RendererPriority: 0
505518
m_Materials:
@@ -521,9 +534,11 @@ MeshRenderer:
521534
m_AutoUVMaxDistance: 0.5
522535
m_AutoUVMaxAngle: 89
523536
m_LightmapParameters: {fileID: 0}
537+
m_GlobalIlluminationMeshLod: 0
524538
m_SortingLayerID: 0
525539
m_SortingLayer: 0
526540
m_SortingOrder: 0
541+
m_MaskInteraction: 0
527542
m_AdditionalVertexStreams: {fileID: 0}
528543
--- !u!114 &114346753093240460
529544
MonoBehaviour:
@@ -620,7 +635,9 @@ MonoBehaviour:
620635
enableTracking: 1
621636
enableSpatialMemory: 1
622637
pathSpatialMemory:
623-
positionalTrackingMode: 0
638+
positionalTrackingMode: 2
639+
enableLocalizationOnly: 0
640+
enable2DGroundMode: 0
624641
setFloorAsOrigin: 1
625642
trackingIsStatic: 0
626643
planeDetectionMaxDistanceThreshold: 0.15
@@ -817,6 +834,11 @@ MeshRenderer:
817834
m_ReflectionProbeUsage: 1
818835
m_RayTracingMode: 2
819836
m_RayTraceProcedural: 0
837+
m_RayTracingAccelStructBuildFlagsOverride: 0
838+
m_RayTracingAccelStructBuildFlags: 1
839+
m_SmallMeshCulling: 1
840+
m_ForceMeshLod: -1
841+
m_MeshLodSelectionBias: 0
820842
m_RenderingLayerMask: 4294967295
821843
m_RendererPriority: 0
822844
m_Materials:
@@ -838,7 +860,9 @@ MeshRenderer:
838860
m_AutoUVMaxDistance: 0.5
839861
m_AutoUVMaxAngle: 89
840862
m_LightmapParameters: {fileID: 0}
863+
m_GlobalIlluminationMeshLod: 0
841864
m_SortingLayerID: 0
842865
m_SortingLayer: 0
843866
m_SortingOrder: 0
867+
m_MaskInteraction: 0
844868
m_AdditionalVertexStreams: {fileID: 0}

‎ZEDCamera/Assets/SDK/Helpers/Scripts/BodyTracking/HeightOffsetter.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class HeightOffsetter : MonoBehaviour
3232

3333
private void Awake()
3434
{
35-
bodyTrackingManager = FindObjectOfType<ZEDBodyTrackingManager>();
35+
bodyTrackingManager = FindFirstObjectByType<ZEDBodyTrackingManager>();
3636
if (bodyTrackingManager == null)
3737
{
3838
Debug.LogError("ZEDManagerIK: No body tracking manager loaded!");

‎ZEDCamera/Assets/SDK/Helpers/Scripts/BodyTracking/VirtualCamController.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ public class VirtualCamController : MonoBehaviour
1414

1515
private Quaternion currentRotation = Quaternion.identity;
1616
private Vector3 currentPosition = Vector3.zero;
17-
private float stepTranslation = 0.1f;
18-
private float stepRotation = 5f;
1917

2018
private bool initialized = false;
2119

‎ZEDCamera/Assets/SDK/Helpers/Scripts/BodyTracking/ZEDBodyTrackingManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ void Start()
164164
avatarControlList = new Dictionary<int,SkeletonHandler> ();
165165
if (!zedManager)
166166
{
167-
zedManager = FindObjectOfType<ZEDManager>();
167+
zedManager = FindFirstObjectByType<ZEDManager>();
168168
}
169169

170170
if(avatar.GetComponent<Animator>().runtimeAnimatorController == null)

‎ZEDCamera/Assets/SDK/Helpers/Scripts/Display/ZEDFusedPointCloudRenderer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ void Start()
7373
{
7474
if (zedManager == null)
7575
{
76-
zedManager = FindObjectOfType<ZEDManager>();
76+
zedManager = FindFirstObjectByType<ZEDManager>();
7777
if (ZEDManager.GetInstances().Count > 1) //We chose a ZED arbitrarily, but there are multiple cams present. Warn the user.
7878
{
7979
Debug.Log("Warning: " + gameObject.name + "'s zedManager was not specified, so the first available ZEDManager instance was " +

‎ZEDCamera/Assets/SDK/Helpers/Scripts/Display/ZEDPointCloudManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ void Start()
131131
{
132132
if(zedManager == null)
133133
{
134-
zedManager = FindObjectOfType<ZEDManager>();
134+
zedManager = FindFirstObjectByType<ZEDManager>();
135135
if(ZEDManager.GetInstances().Count > 1) //We chose a ZED arbitrarily, but there are multiple cams present. Warn the user.
136136
{
137137
Debug.Log("Warning: " + gameObject.name + "'s zedManager was not specified, so the first available ZEDManager instance was " +

‎ZEDCamera/Assets/SDK/Helpers/Scripts/Display/ZEDRenderingPlane.cs‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -465,14 +465,6 @@ private void Start()
465465
//blurMaterial.SetTexture("_Mask", mask);
466466
blurMaterial.SetTexture(maskPropID, mask);
467467

468-
469-
//Force Unity into 16:9 mode to match the ZED's output.
470-
#if UNITY_EDITOR
471-
UnityEditor.PlayerSettings.SetAspectRatio(UnityEditor.AspectRatio.Aspect16by9, true);
472-
UnityEditor.PlayerSettings.SetAspectRatio(UnityEditor.AspectRatio.Aspect16by10, false);
473-
UnityEditor.PlayerSettings.SetAspectRatio(UnityEditor.AspectRatio.Aspect4by3, false);
474-
UnityEditor.PlayerSettings.SetAspectRatio(UnityEditor.AspectRatio.Aspect5by4, false);
475-
#endif
476468
CreateRenderTexture();
477469

478470
//Load the blender for the zedmesher

‎ZEDCamera/Assets/SDK/Helpers/Scripts/Interactions/ZEDControllerTracker.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ protected virtual void Awake()
101101

102102
if (!zedManager)
103103
{
104-
zedManager = FindObjectOfType<ZEDManager>();
104+
zedManager = FindFirstObjectByType<ZEDManager>();
105105
//If there are multiple cameras in a scene, this arbitrary assignment could be bad. Warn the user.
106106
if (ZEDManager.GetInstances().Count > 1)
107107
{

‎ZEDCamera/Assets/SDK/Helpers/Scripts/Interactions/ZEDTransformController.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ private IEnumerator Start()
119119

120120
if (!zedManager)
121121
{
122-
zedManager = FindObjectOfType<ZEDManager>();
122+
zedManager = FindFirstObjectByType<ZEDManager>();
123123
if (ZEDManager.GetInstances().Count > 1) //They let the plugin auto-assign a ZED but there are multiple ZED's. Warn the user.
124124
{
125125
Debug.Log("Warning: ZEDTransformController's zedManager field was not specified, but there are multiple ZEDManagers in the scene " +
@@ -132,7 +132,7 @@ private IEnumerator Start()
132132
//Find the available VR controllers and assigning them to our List.
133133
yield return new WaitForSeconds(1f);
134134

135-
var trackers = FindObjectsOfType<ZEDControllerTracker_DemoInputs>();
135+
var trackers = FindObjectsByType<ZEDControllerTracker_DemoInputs>(FindObjectsSortMode.None);
136136

137137
objectTrackers.AddRange(trackers);
138138

0 commit comments

Comments
 (0)