diff --git a/ZEDCamera/Assets/ZED/Editor/Scripts/ZEDCameraEditor.cs b/ZEDCamera/Assets/ZED/Editor/Scripts/ZEDCameraEditor.cs index 19f78444..bdffa8b9 100644 --- a/ZEDCamera/Assets/ZED/Editor/Scripts/ZEDCameraEditor.cs +++ b/ZEDCamera/Assets/ZED/Editor/Scripts/ZEDCameraEditor.cs @@ -28,6 +28,7 @@ public class ZEDCameraEditor : Editor private SerializedProperty depthModeProperty; private SerializedProperty usbResolutionProperty; private SerializedProperty usbFPSProperty; + private SerializedProperty usbSNProperty; private SerializedProperty svoFileNameProperty; private SerializedProperty svoLoopProperty; private SerializedProperty svoRealTimeModeProperty; @@ -218,6 +219,7 @@ private void OnEnable() inputTypeProperty = serializedObject.FindProperty("inputType"); usbResolutionProperty = serializedObject.FindProperty("resolution"); usbFPSProperty = serializedObject.FindProperty("FPS"); + usbSNProperty = serializedObject.FindProperty("serialNumber"); svoFileNameProperty = serializedObject.FindProperty("svoInputFileName"); svoLoopProperty = serializedObject.FindProperty("svoLoopBack"); svoRealTimeModeProperty = serializedObject.FindProperty("svoRealTimeMode"); @@ -377,6 +379,10 @@ public override void OnInspectorGUI() "- HD2k: 15FPS\r\n\n- HD1080: 30FPS\r\n\n- HD720p: 60FPS\r\n\n- VGA: 100FPS"); GUI.enabled = !Application.isPlaying; usbFPSProperty.intValue = EditorGUILayout.IntField(cameraFPSLabel, usbFPSProperty.intValue); + + GUIContent cameraSerialNumberLabel = new GUIContent("Serial Number", "Serial number of the camera to open. Set the SN to 0 to open the camera by ID."); + GUI.enabled = !Application.isPlaying; + usbSNProperty.intValue = EditorGUILayout.IntField(cameraSerialNumberLabel, usbSNProperty.intValue); GUI.enabled = true; serializedObject.ApplyModifiedProperties(); diff --git a/ZEDCamera/Assets/ZED/Editor/Scripts/ZEDCameraEditor.cs.meta b/ZEDCamera/Assets/ZED/Editor/Scripts/ZEDCameraEditor.cs.meta new file mode 100644 index 00000000..6a3a2bdf --- /dev/null +++ b/ZEDCamera/Assets/ZED/Editor/Scripts/ZEDCameraEditor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 03b0e3705ef780a44bd436f87506364f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ZEDCamera/Assets/ZED/Examples/Object Detection/Scenes/2D Object Detection.unity b/ZEDCamera/Assets/ZED/Examples/Object Detection/Scenes/2D Object Detection.unity index f0dfbce6..191dbcc5 100644 --- a/ZEDCamera/Assets/ZED/Examples/Object Detection/Scenes/2D Object Detection.unity +++ b/ZEDCamera/Assets/ZED/Examples/Object Detection/Scenes/2D Object Detection.unity @@ -152,8 +152,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_IgnoreReversedGraphics: 1 m_BlockingObjects: 0 m_BlockingMask: @@ -169,8 +169,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 @@ -357,8 +357,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6797e7683a7af834484d666ec79e9909, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: zedManager: {fileID: 1078485266} canvas: {fileID: 65360501} startObjectDetectionAutomatically: 1 @@ -589,7 +589,7 @@ PrefabInstance: - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: svoInputFileName - value: + value: objectReference: {fileID: 0} - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} @@ -760,8 +760,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 75b2a3ff7b847ca4490808f4c0432cd4, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!224 &1123750126 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 224477321843734534, guid: a71fe20b5d673e34fb3fef09b4bb6ee3, @@ -796,8 +796,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -815,8 +815,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_FirstSelected: {fileID: 0} m_sendNavigationEvents: 1 m_DragThreshold: 10 diff --git a/ZEDCamera/Assets/ZED/Examples/Object Detection/Scenes/3D Object Detection.unity b/ZEDCamera/Assets/ZED/Examples/Object Detection/Scenes/3D Object Detection.unity index b318134f..7802f3d6 100644 --- a/ZEDCamera/Assets/ZED/Examples/Object Detection/Scenes/3D Object Detection.unity +++ b/ZEDCamera/Assets/ZED/Examples/Object Detection/Scenes/3D Object Detection.unity @@ -229,7 +229,7 @@ PrefabInstance: - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: svoInputFileName - value: D:/SVO/MultiPeople.svo + value: objectReference: {fileID: 0} - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} @@ -348,8 +348,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 75b2a3ff7b847ca4490808f4c0432cd4, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!1 &1103816800 GameObject: m_ObjectHideFlags: 0 @@ -484,8 +484,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 050df1fa7a5de6f40a3677d766ed3063, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: zedManager: {fileID: 56380649} startObjectDetectionAutomatically: 1 boundingBoxPrefab: {fileID: 1438017172825460, guid: 2d803190bc4738d4daf5932468a5495e, diff --git a/ZEDCamera/Assets/ZED/Examples/SimpleMR/Scenes/SimpleMR.unity b/ZEDCamera/Assets/ZED/Examples/SimpleMR/Scenes/SimpleMR.unity index b9169c5d..3d4c5578 100644 --- a/ZEDCamera/Assets/ZED/Examples/SimpleMR/Scenes/SimpleMR.unity +++ b/ZEDCamera/Assets/ZED/Examples/SimpleMR/Scenes/SimpleMR.unity @@ -283,7 +283,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 261599528} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 1} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1919687801} @@ -1101,7 +1101,7 @@ Light: m_InnerSpotAngle: 52.492146 m_CookieSize: 10 m_Shadows: - m_Type: 0 + m_Type: 2 m_Resolution: 2 m_CustomResolution: -1 m_Strength: 0.887 @@ -1516,6 +1516,11 @@ PrefabInstance: propertyPath: arlayer value: 30 objectReference: {fileID: 0} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, + type: 3} + propertyPath: depthMode + value: 3 + objectReference: {fileID: 0} - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: inputType @@ -1531,6 +1536,16 @@ PrefabInstance: propertyPath: sensingMode value: 1 objectReference: {fileID: 0} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, + type: 3} + propertyPath: serialNumber + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, + type: 3} + propertyPath: svoInputFileName + value: + objectReference: {fileID: 0} - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: advancedPanelOpen @@ -1824,7 +1839,7 @@ Light: m_Type: 2 m_Resolution: 1 m_CustomResolution: -1 - m_Strength: 0.3 + m_Strength: 1 m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 diff --git a/ZEDCamera/Assets/ZED/Examples/SkeletonTracking/Scene/SkeletonDemo.unity b/ZEDCamera/Assets/ZED/Examples/SkeletonTracking/Scene/SkeletonDemo.unity index 91b1bae2..8a34a2db 100644 --- a/ZEDCamera/Assets/ZED/Examples/SkeletonTracking/Scene/SkeletonDemo.unity +++ b/ZEDCamera/Assets/ZED/Examples/SkeletonTracking/Scene/SkeletonDemo.unity @@ -326,7 +326,7 @@ PrefabInstance: - target: {fileID: 20287226139793380, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: m_TargetTexture - value: + value: objectReference: {fileID: 8400000, guid: e0e43b005e1a1f347b4924d258914f0b, type: 2} - target: {fileID: 20287226139793380, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} @@ -416,7 +416,7 @@ PrefabInstance: - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: svoInputFileName - value: + value: objectReference: {fileID: 0} - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} @@ -640,7 +640,7 @@ PrefabInstance: - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, type: 3} propertyPath: Avatar - value: + value: objectReference: {fileID: 1577629577426895579, guid: b2033efe657eddf4bbe61be41cc051bd, type: 3} - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, @@ -656,12 +656,12 @@ PrefabInstance: - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, type: 3} propertyPath: viewCamera - value: + value: objectReference: {fileID: 1394870590} - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, type: 3} propertyPath: zedManager - value: + value: objectReference: {fileID: 1786428179} - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, type: 3} @@ -858,8 +858,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 75b2a3ff7b847ca4490808f4c0432cd4, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!1001 &6360354422455212558 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/ZEDCamera/Assets/ZED/HDRP_Assets/HDRenderPipelineAsset.asset b/ZEDCamera/Assets/ZED/HDRP_Assets/HDRenderPipelineAsset.asset index 3b2854e9..19ed84a0 100644 --- a/ZEDCamera/Assets/ZED/HDRP_Assets/HDRenderPipelineAsset.asset +++ b/ZEDCamera/Assets/ZED/HDRP_Assets/HDRenderPipelineAsset.asset @@ -148,16 +148,19 @@ MonoBehaviour: enableFptlForForwardOpaque: 0 enableBigTilePrepass: 0 isFptlEnabled: 0 - m_RenderPipelineResources: {fileID: 11400000, guid: 3ce144cff5783da45aa5d4fdc2da14b7, type: 2} + m_RenderPipelineResources: {fileID: 11400000, guid: 3ce144cff5783da45aa5d4fdc2da14b7, + type: 2} m_RenderPipelineRayTracingResources: {fileID: 0} - m_DefaultVolumeProfile: {fileID: 11400000, guid: 7637fdba9232786489a40fbcbaf21daf, type: 2} + m_DefaultVolumeProfile: {fileID: 11400000, guid: 7637fdba9232786489a40fbcbaf21daf, + type: 2} m_LensAttenuation: 0 m_UseRenderGraph: 1 - m_DefaultLookDevProfile: {fileID: 11400000, guid: 7637fdba9232786489a40fbcbaf21daf, type: 2} + m_DefaultLookDevProfile: {fileID: 11400000, guid: 4dc3f0f4d35a148409c5e3a4d1270541, + type: 2} m_RenderingPathDefaultCameraFrameSettings: bitDatas: - data1: 69838057344013 - data2: 4539628425463136280 + data1: 70284954143757 + data2: 4539628425461039128 lodBias: 1 lodBiasMode: 0 lodBiasQualityLevel: 0 @@ -197,10 +200,10 @@ MonoBehaviour: sssCustomSampleBudget: 20 materialQuality: 0 m_RenderPipelineSettings: - supportShadowMask: 1 + supportShadowMask: 0 supportSSR: 0 supportSSRTransparent: 0 - supportSSAO: 0 + supportSSAO: 1 supportSSGI: 0 supportSubsurfaceScattering: 0 sssSampleBudget: @@ -218,11 +221,11 @@ MonoBehaviour: lightLayerName6: Light Layer 6 lightLayerName7: Light Layer 7 supportDistortion: 0 - supportTransparentBackface: 0 - supportTransparentDepthPrepass: 0 - supportTransparentDepthPostpass: 0 + supportTransparentBackface: 1 + supportTransparentDepthPrepass: 1 + supportTransparentDepthPostpass: 1 colorBufferFormat: 74 - supportCustomPass: 0 + supportCustomPass: 1 customBufferFormat: 12 supportedLitShaderMode: 1 planarReflectionResolution: @@ -241,9 +244,9 @@ MonoBehaviour: decalLayerName7: Decal Layer 7 msaaSampleCount: 4 supportMotionVectors: 1 - supportRuntimeDebugDisplay: 1 + supportRuntimeDebugDisplay: 0 supportRuntimeAOVAPI: 0 - supportDitheringCrossFade: 0 + supportDitheringCrossFade: 1 supportTerrainHole: 0 supportProbeVolume: 0 supportRayTracing: 0 @@ -261,7 +264,7 @@ MonoBehaviour: reflectionCubemapSize: 256 reflectionCacheCompressed: 0 reflectionProbeFormat: 74 - skyReflectionSize: 256 + skyReflectionSize: 512 skyLightingOverrideLayerMask: serializedVersion: 2 m_Bits: 0 @@ -275,18 +278,18 @@ MonoBehaviour: maxLightsPerClusterCell: 8 hdShadowInitParams: maxShadowRequests: 128 - directionalShadowsDepthBits: 32 + directionalShadowsDepthBits: 16 shadowFilteringQuality: 1 punctualLightShadowAtlas: shadowAtlasResolution: 4096 shadowAtlasDepthBits: 32 useDynamicViewportRescale: 1 areaLightShadowAtlas: - shadowAtlasResolution: 4096 - shadowAtlasDepthBits: 32 - useDynamicViewportRescale: 1 + shadowAtlasResolution: 2048 + shadowAtlasDepthBits: 16 + useDynamicViewportRescale: 0 cachedPunctualLightShadowAtlas: 2048 - cachedAreaLightShadowAtlas: 1024 + cachedAreaLightShadowAtlas: 2048 shadowResolutionDirectional: m_Values: 00010000000200000004000000080000 m_SchemaId: @@ -351,7 +354,7 @@ MonoBehaviour: ChromaticAberrationMaxSamples: 03000000060000000c000000 lightSettings: useContactShadow: - m_Values: 000000 + m_Values: 000101 m_SchemaId: m_Id: maximumLODLevel: @@ -440,8 +443,8 @@ MonoBehaviour: m_DefaultMaterialQualityLevel: 4 diffusionProfileSettings: {fileID: 0} diffusionProfileSettingsList: - - {fileID: 11400000, guid: 06480f7f9faa1a34aa7de0fbed8c1c7b, type: 2} - - {fileID: 11400000, guid: 959748e3f61f6c3478b2a239a1eccb6a, type: 2} + - {fileID: 11400000, guid: 4e24b63c2d1821042aa23b182a67d8a9, type: 2} + - {fileID: 11400000, guid: ce7ab8c994cb43a4caa2d122cd328d78, type: 2} beforeTransparentCustomPostProcesses: [] beforeTAACustomPostProcesses: [] beforePostProcessCustomPostProcesses: [] diff --git a/ZEDCamera/Assets/ZED/HDRP_Assets/HDRenderPipelineAsset.asset.meta b/ZEDCamera/Assets/ZED/HDRP_Assets/HDRenderPipelineAsset.asset.meta index 922fbd85..0e03d981 100644 --- a/ZEDCamera/Assets/ZED/HDRP_Assets/HDRenderPipelineAsset.asset.meta +++ b/ZEDCamera/Assets/ZED/HDRP_Assets/HDRenderPipelineAsset.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3d39bf61cdf408f4abf914424eed3d4e +guid: e33728e351e7d384bb6e60b5204cd00d NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/ZEDCamera/Assets/ZED/HDRP_Assets/LightingSettings.lighting.meta b/ZEDCamera/Assets/ZED/HDRP_Assets/LightingSettings.lighting.meta index 50036475..be6ef5e2 100644 --- a/ZEDCamera/Assets/ZED/HDRP_Assets/LightingSettings.lighting.meta +++ b/ZEDCamera/Assets/ZED/HDRP_Assets/LightingSettings.lighting.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6928ccd480261b942af2cdd0d9fe68e2 +guid: d72410555a965674b8a24191144c3125 NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/ZEDCamera/Assets/ZED/HDRP_Assets/VolumeProfile.asset b/ZEDCamera/Assets/ZED/HDRP_Assets/VolumeProfile.asset index 0f77a78c..dcbb7b6e 100644 --- a/ZEDCamera/Assets/ZED/HDRP_Assets/VolumeProfile.asset +++ b/ZEDCamera/Assets/ZED/HDRP_Assets/VolumeProfile.asset @@ -1,132 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &-7089757308646879465 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bcf384b154398e341b6b29969c078198, type: 3} - m_Name: MotionBlur - m_EditorClassIdentifier: - active: 0 - m_AdvancedMode: 0 - quality: - m_OverrideState: 1 - m_Value: 1 - intensity: - m_OverrideState: 1 - m_Value: 0.5 - min: 0 - maximumVelocity: - m_OverrideState: 0 - m_Value: 200 - min: 0 - max: 1500 - minimumVelocity: - m_OverrideState: 0 - m_Value: 2 - min: 0 - max: 64 - cameraMotionBlur: - m_OverrideState: 0 - m_Value: 1 - specialCameraClampMode: - m_OverrideState: 0 - m_Value: 0 - cameraVelocityClamp: - m_OverrideState: 0 - m_Value: 0.05 - min: 0 - max: 0.3 - cameraTranslationVelocityClamp: - m_OverrideState: 0 - m_Value: 0.05 - min: 0 - max: 0.3 - cameraRotationVelocityClamp: - m_OverrideState: 0 - m_Value: 0.03 - min: 0 - max: 0.2 - depthComparisonExtent: - m_OverrideState: 0 - m_Value: 1 - min: 0 - max: 20 - m_SampleCount: - m_OverrideState: 1 - m_Value: 8 - min: 2 ---- !u!114 &-1016694868962581565 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 56b145d2b9ee1ac4f846968484e7485a, type: 3} - m_Name: ContactShadows - m_EditorClassIdentifier: - active: 0 - m_AdvancedMode: 0 - quality: - m_OverrideState: 0 - m_Value: 3 - enable: - m_OverrideState: 0 - m_Value: 0 - length: - m_OverrideState: 0 - m_Value: 0.184 - min: 0 - max: 1 - opacity: - m_OverrideState: 0 - m_Value: 1 - min: 0 - max: 1 - distanceScaleFactor: - m_OverrideState: 0 - m_Value: 0.5 - min: 0 - max: 1 - maxDistance: - m_OverrideState: 0 - m_Value: 50 - min: 0 - minDistance: - m_OverrideState: 0 - m_Value: 0 - min: 0 - fadeDistance: - m_OverrideState: 0 - m_Value: 5 - min: 0 - fadeInDistance: - m_OverrideState: 0 - m_Value: 0 - min: 0 - rayBias: - m_OverrideState: 0 - m_Value: 0.2 - min: 0 - max: 1 - thicknessScale: - m_OverrideState: 0 - m_Value: 0.139 - min: 0.02 - max: 1 - m_SampleCount: - m_OverrideState: 1 - m_Value: 8 - min: 4 - max: 64 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -141,14 +14,12 @@ MonoBehaviour: m_EditorClassIdentifier: components: - {fileID: 7686318427622180703} - - {fileID: -1016694868962581565} - {fileID: 7502528774814404555} - {fileID: 7542669330009093999} - {fileID: 1501199423866068322} - - {fileID: 5315503232242033309} - {fileID: 1932259527246508038} - {fileID: 448115243408767295} - - {fileID: -7089757308646879465} + - {fileID: 2018669385028736523} --- !u!114 &448115243408767295 MonoBehaviour: m_ObjectHideFlags: 3 @@ -173,7 +44,7 @@ MonoBehaviour: m_Value: 0 exposure: m_OverrideState: 0 - m_Value: 13.5 + m_Value: 0 multiplier: m_OverrideState: 0 m_Value: 1 @@ -186,8 +57,8 @@ MonoBehaviour: m_OverrideState: 0 m_Value: {x: 0.18750614, y: 0.29181972, z: 0.5} desiredLuxValue: - m_OverrideState: 0 - m_Value: 20000 + m_OverrideState: 1 + m_Value: -3.82 updateMode: m_OverrideState: 0 m_Value: 0 @@ -294,7 +165,7 @@ MonoBehaviour: min: 0 intensity: m_OverrideState: 1 - m_Value: 0.2 + m_Value: 0.1 min: 0 max: 1 scatter: @@ -339,18 +210,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0d7593b3a9277ac4696b20006c21dde2, type: 3} m_Name: VisualEnvironment m_EditorClassIdentifier: - active: 0 + active: 1 m_AdvancedMode: 0 skyType: m_OverrideState: 1 m_Value: 1 skyAmbientMode: - m_OverrideState: 0 - m_Value: 0 + m_OverrideState: 1 + m_Value: 1 fogType: m_OverrideState: 0 m_Value: 0 ---- !u!114 &5315503232242033309 +--- !u!114 &2018669385028736523 MonoBehaviour: m_ObjectHideFlags: 3 m_CorrespondingSourceObject: {fileID: 0} @@ -365,11 +236,11 @@ MonoBehaviour: active: 0 m_AdvancedMode: 0 mode: - m_OverrideState: 0 - m_Value: 1 - meteringMode: m_OverrideState: 0 m_Value: 0 + meteringMode: + m_OverrideState: 1 + m_Value: 2 luminanceSource: m_OverrideState: 0 m_Value: 1 @@ -378,13 +249,13 @@ MonoBehaviour: m_Value: 0 compensation: m_OverrideState: 1 - m_Value: 1 + m_Value: 0 limitMin: - m_OverrideState: 0 - m_Value: -10 + m_OverrideState: 1 + m_Value: -1 limitMax: - m_OverrideState: 0 - m_Value: 10 + m_OverrideState: 1 + m_Value: 14 curveMap: m_OverrideState: 0 m_Value: @@ -520,7 +391,7 @@ MonoBehaviour: m_Name: AmbientOcclusion m_EditorClassIdentifier: active: 0 - m_AdvancedMode: 1 + m_AdvancedMode: 0 quality: m_OverrideState: 0 m_Value: 1 @@ -539,7 +410,7 @@ MonoBehaviour: max: 1 radius: m_OverrideState: 1 - m_Value: 1.5 + m_Value: 1 min: 0.25 max: 5 spatialBilateralAggressiveness: @@ -672,11 +543,11 @@ MonoBehaviour: m_AdvancedMode: 0 maxShadowDistance: m_OverrideState: 1 - m_Value: 150 + m_Value: 70 min: 0 directionalTransmissionMultiplier: m_OverrideState: 0 - m_Value: 0.983 + m_Value: 1 min: 0 max: 1 cascadeShadowSplitCount: @@ -685,23 +556,23 @@ MonoBehaviour: min: 1 max: 4 cascadeShadowSplit0: - m_OverrideState: 0 - m_Value: 0.05 + m_OverrideState: 1 + m_Value: 0.046875 cascadeShadowSplit1: - m_OverrideState: 0 - m_Value: 0.15 + m_OverrideState: 1 + m_Value: 0.140625 cascadeShadowSplit2: - m_OverrideState: 0 - m_Value: 0.3 + m_OverrideState: 1 + m_Value: 0.375 cascadeShadowBorder0: m_OverrideState: 1 - m_Value: 0.13333334 + m_Value: 0.6666667 cascadeShadowBorder1: m_OverrideState: 1 - m_Value: 0.06666666 + m_Value: 0.33333334 cascadeShadowBorder2: - m_OverrideState: 0 - m_Value: 0 + m_OverrideState: 1 + m_Value: 0.13333334 cascadeShadowBorder3: m_OverrideState: 0 m_Value: 0 diff --git a/ZEDCamera/Assets/ZED/HDRP_Assets/VolumeProfile.asset.meta b/ZEDCamera/Assets/ZED/HDRP_Assets/VolumeProfile.asset.meta index 6d58dc21..567ad383 100644 --- a/ZEDCamera/Assets/ZED/HDRP_Assets/VolumeProfile.asset.meta +++ b/ZEDCamera/Assets/ZED/HDRP_Assets/VolumeProfile.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e375937bfcefafd419ce65b814c7977c +guid: 7637fdba9232786489a40fbcbaf21daf NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/ZEDCamera/Assets/ZED/SDK/Helpers/Scripts/ZEDManager.cs b/ZEDCamera/Assets/ZED/SDK/Helpers/Scripts/ZEDManager.cs index 87e16a7e..ca99b1b0 100644 --- a/ZEDCamera/Assets/ZED/SDK/Helpers/Scripts/ZEDManager.cs +++ b/ZEDCamera/Assets/ZED/SDK/Helpers/Scripts/ZEDManager.cs @@ -100,6 +100,12 @@ public static List GetInstances() [HideInInspector] public int FPS = 60; + /// + /// Serial number of the camera to open. Leave the SN to 0 to open the camera by ID + /// + [HideInInspector] + public uint serialNumber = 0; + /// /// SVO Input FileName /// @@ -1800,6 +1806,7 @@ void Awake() initParameters = new sl.InitParameters(); initParameters.resolution = resolution; initParameters.cameraFPS = FPS; + initParameters.serialNumber = serialNumber; initParameters.cameraDeviceID = (int)cameraID; initParameters.depthMode = depthMode; initParameters.depthStabilization = depthStabilizer; diff --git a/ZEDCamera/Assets/ZED/SDK/NativeInterface/ZEDCamera.cs b/ZEDCamera/Assets/ZED/SDK/NativeInterface/ZEDCamera.cs index 0f8e6ced..0c95a123 100644 --- a/ZEDCamera/Assets/ZED/SDK/NativeInterface/ZEDCamera.cs +++ b/ZEDCamera/Assets/ZED/SDK/NativeInterface/ZEDCamera.cs @@ -322,7 +322,7 @@ public int TagInvisibleToZED * Opening function (Opens camera and creates textures). */ [DllImport(nameDll, EntryPoint = "sl_open_camera")] - private static extern int dllz_open(int cameraID, ref dll_initParameters parameters, System.Text.StringBuilder svoPath, System.Text.StringBuilder ipStream, int portStream, System.Text.StringBuilder output, System.Text.StringBuilder opt_settings_path, System.Text.StringBuilder opencv_calib_path); + private static extern int dllz_open(int cameraID, ref dll_initParameters parameters, uint serialNumber, System.Text.StringBuilder svoPath, System.Text.StringBuilder ipStream, int portStream, System.Text.StringBuilder output, System.Text.StringBuilder opt_settings_path, System.Text.StringBuilder opencv_calib_path); /* @@ -1053,7 +1053,7 @@ public ERROR_CODE Init(ref InitParameters initParameters) } dll_initParameters initP = new dll_initParameters(initParameters); //DLL-friendly version of InitParameters. initP.coordinateSystem = COORDINATE_SYSTEM.LEFT_HANDED_Y_UP; //Left-hand, Y-up is Unity's coordinate system, so we match that. - int v = dllz_open(CameraID, ref initP, + int v = dllz_open(CameraID, ref initP, initParameters.serialNumber, new System.Text.StringBuilder(initParameters.pathSVO, initParameters.pathSVO.Length), new System.Text.StringBuilder(initParameters.ipStream, initParameters.ipStream.Length), initParameters.portStream, diff --git a/ZEDCamera/Assets/ZED/SDK/NativeInterface/ZEDCommon.cs b/ZEDCamera/Assets/ZED/SDK/NativeInterface/ZEDCommon.cs index a5161859..bc029819 100644 --- a/ZEDCamera/Assets/ZED/SDK/NativeInterface/ZEDCommon.cs +++ b/ZEDCamera/Assets/ZED/SDK/NativeInterface/ZEDCommon.cs @@ -1369,6 +1369,10 @@ public class InitParameters /// public int cameraDeviceID; /// + /// Serial number of the camera to open + /// + public uint serialNumber; + /// /// Path to a recorded SVO file to play, including filename. /// public string pathSVO = ""; @@ -1471,6 +1475,7 @@ public InitParameters() this.resolution = RESOLUTION.HD720; this.cameraFPS = 60; this.cameraDeviceID = 0; + this.serialNumber = 0; this.pathSVO = ""; this.svoRealTimeMode = false; this.coordinateUnit = UNIT.METER; diff --git a/ZEDCamera/Assets/ZED/SDK/Plugins/win64/sl_unitywrapper.dll b/ZEDCamera/Assets/ZED/SDK/Plugins/win64/sl_unitywrapper.dll index dc50b093..310d7781 100644 Binary files a/ZEDCamera/Assets/ZED/SDK/Plugins/win64/sl_unitywrapper.dll and b/ZEDCamera/Assets/ZED/SDK/Plugins/win64/sl_unitywrapper.dll differ diff --git a/ZEDCamera/Packages/manifest.json b/ZEDCamera/Packages/manifest.json index 3f40726b..3bf73069 100644 --- a/ZEDCamera/Packages/manifest.json +++ b/ZEDCamera/Packages/manifest.json @@ -7,6 +7,7 @@ "com.unity.test-framework": "1.1.22", "com.unity.textmeshpro": "3.0.1", "com.unity.timeline": "1.4.6", + "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.2", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/ZEDCamera/Packages/packages-lock.json b/ZEDCamera/Packages/packages-lock.json index 3cd602a5..944f2431 100644 --- a/ZEDCamera/Packages/packages-lock.json +++ b/ZEDCamera/Packages/packages-lock.json @@ -39,6 +39,22 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.sysroot": { + "version": "2.0.3", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.sysroot.linux-x86_64": { + "version": "2.0.2", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.sysroot": "2.0.3" + }, + "url": "https://packages.unity.com" + }, "com.unity.test-framework": { "version": "1.1.22", "depth": 0, @@ -71,6 +87,16 @@ }, "url": "https://packages.unity.com" }, + "com.unity.toolchain.win-x86_64-linux-x86_64": { + "version": "2.0.2", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.sysroot": "2.0.3", + "com.unity.sysroot.linux-x86_64": "2.0.2" + }, + "url": "https://packages.unity.com" + }, "com.unity.ugui": { "version": "1.0.0", "depth": 0,