diff --git a/.gitignore b/.gitignore index 79c9fc07..7539554c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ [Bb]uild/ [Bb]uilds/ Assets/AssetStoreTools* +unity-wrapper/ # Visual Studio cache directory .vs/ diff --git a/ZEDCamera/Assets/ZED/Editor/Scripts/ZEDCameraEditor.cs b/ZEDCamera/Assets/ZED/Editor/Scripts/ZEDCameraEditor.cs index 41a64080..2501b136 100644 --- a/ZEDCamera/Assets/ZED/Editor/Scripts/ZEDCameraEditor.cs +++ b/ZEDCamera/Assets/ZED/Editor/Scripts/ZEDCameraEditor.cs @@ -51,6 +51,7 @@ public class ZEDCameraEditor : Editor private SerializedProperty pathSMProperty; private SerializedProperty floorAsOriginProperty; private SerializedProperty trackingIsStaticProperty; + private SerializedProperty positionalTrackingModeProperty; //Rendering Prop private SerializedProperty depthOcclusionProperty; @@ -147,6 +148,7 @@ public class ZEDCameraEditor : Editor // runtime params private SerializedProperty BT_Confidence; private SerializedProperty BT_MinimumKPThresh; + private SerializedProperty BT_SkSmoothing; /// /// Layout option used to draw the '...' button for opening a File Explorer window to find a mesh file. @@ -259,6 +261,7 @@ private void OnEnable() pathSMProperty = serializedObject.FindProperty("pathSpatialMemory"); floorAsOriginProperty = serializedObject.FindProperty("setFloorAsOrigin"); trackingIsStaticProperty = serializedObject.FindProperty("trackingIsStatic"); + positionalTrackingModeProperty = serializedObject.FindProperty("positionalTrackingMode"); ///Rendering Serialized Properties @@ -317,6 +320,7 @@ private void OnEnable() BT_BodySelection = serializedObject.FindProperty("bodySelection"); BT_Confidence = serializedObject.FindProperty("bodyTrackingConfidenceThreshold"); + BT_SkSmoothing = serializedObject.FindProperty("bodyTrackingSkeletonSmoothing"); //Recording Serialized Properties svoOutputFileNameProperty = serializedObject.FindProperty("svoOutputFileName"); svoOutputCompressionModeProperty = serializedObject.FindProperty("svoOutputCompressionMode"); @@ -593,6 +597,8 @@ public override void OnInspectorGUI() "Can be useful for stationary cameras where you still need tracking enabled, such as in Object Detection."); trackingIsStaticProperty.boolValue = EditorGUILayout.Toggle(trackingIsStaticPropertyLabel, trackingIsStaticProperty.boolValue); + GUIContent positionalTrackingModePropertyLabel = new GUIContent("Positional Tracking Mode", "Lists the mode of positional tracking that can be used."); + positionalTrackingModeProperty.enumValueIndex = (int)(sl.POSTIONAL_TRACKING_MODE)EditorGUILayout.EnumPopup(positionalTrackingModePropertyLabel, (sl.POSTIONAL_TRACKING_MODE)positionalTrackingModeProperty.enumValueIndex); EditorGUI.indentLevel--; @@ -1016,6 +1022,9 @@ public override void OnInspectorGUI() "an object exists to report it.\r\n\nEx: If the threshold is 80, then only objects where the SDK is 80% sure or greater will appear in the list of detected objects."); BT_Confidence.intValue = EditorGUILayout.IntSlider(BodyTrackingConfidenceLabel, BT_Confidence.intValue, 1, 99); + GUIContent BT_SkSmoothingLabel = new GUIContent("Skeleton Smoothing", "From 0 (no smoothing) to 1 (max smoothing), amount of smoothing applied to the skeleton data during the fitting. Higher values will have more latency, but less jitter."); + BT_SkSmoothing.floatValue = EditorGUILayout.Slider(BT_SkSmoothingLabel, BT_SkSmoothing.floatValue, 0, 1.0f); + GUI.enabled = cameraIsReady; GUILayout.Space(10); diff --git a/ZEDCamera/Assets/ZED/Examples/Body Tracking/Scene/BodyTrackingMulti.unity b/ZEDCamera/Assets/ZED/Examples/Body Tracking/Scene/BodyTrackingMulti.unity index 159e480a..f65b744d 100644 --- a/ZEDCamera/Assets/ZED/Examples/Body Tracking/Scene/BodyTrackingMulti.unity +++ b/ZEDCamera/Assets/ZED/Examples/Body Tracking/Scene/BodyTrackingMulti.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} + m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -98,8 +98,7 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 4890085278179872738, guid: 1f6d475744f98974b9da47a6bd0487df, - type: 2} + m_LightingSettings: {fileID: 4890085278179872738, guid: 1f6d475744f98974b9da47a6bd0487df, type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -131,138 +130,111 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 1863105970153930926, guid: 4899bf235f2a6974288bc0989e3dd88f, - type: 3} + - target: {fileID: 1863105970153930926, guid: 4899bf235f2a6974288bc0989e3dd88f, type: 3} propertyPath: m_SizeDelta.x value: 284 objectReference: {fileID: 0} - - target: {fileID: 1863105970153930926, guid: 4899bf235f2a6974288bc0989e3dd88f, - type: 3} + - target: {fileID: 1863105970153930926, guid: 4899bf235f2a6974288bc0989e3dd88f, type: 3} propertyPath: m_SizeDelta.y value: 160 objectReference: {fileID: 0} - - target: {fileID: 1863105970153930926, guid: 4899bf235f2a6974288bc0989e3dd88f, - type: 3} + - target: {fileID: 1863105970153930926, guid: 4899bf235f2a6974288bc0989e3dd88f, type: 3} propertyPath: m_AnchoredPosition.x value: 150.6 objectReference: {fileID: 0} - - target: {fileID: 1863105970153930926, guid: 4899bf235f2a6974288bc0989e3dd88f, - type: 3} + - target: {fileID: 1863105970153930926, guid: 4899bf235f2a6974288bc0989e3dd88f, type: 3} propertyPath: m_AnchoredPosition.y value: 509.1 objectReference: {fileID: 0} - - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, - type: 3} + - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, type: 3} propertyPath: m_Pivot.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, - type: 3} + - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, type: 3} propertyPath: m_Pivot.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, - type: 3} + - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, type: 3} propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} - - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, - type: 3} + - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, - type: 3} + - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, - type: 3} + - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, type: 3} propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, - type: 3} + - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, - type: 3} + - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, - type: 3} + - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, - type: 3} + - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, - type: 3} + - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, - type: 3} + - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, - type: 3} + - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, - type: 3} + - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, - type: 3} + - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, - type: 3} + - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, - type: 3} + - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, - type: 3} + - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, - type: 3} + - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, - type: 3} + - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, - type: 3} + - target: {fileID: 1863105970403500751, guid: 4899bf235f2a6974288bc0989e3dd88f, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1863105970403500755, guid: 4899bf235f2a6974288bc0989e3dd88f, - type: 3} + - target: {fileID: 1863105970403500755, guid: 4899bf235f2a6974288bc0989e3dd88f, type: 3} propertyPath: m_Name value: Virtual Canvas objectReference: {fileID: 0} - - target: {fileID: 1863105970403500755, guid: 4899bf235f2a6974288bc0989e3dd88f, - type: 3} + - target: {fileID: 1863105970403500755, guid: 4899bf235f2a6974288bc0989e3dd88f, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} @@ -323,308 +295,251 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 20287226139793380, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 20287226139793380, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: field of view value: 26.991467 objectReference: {fileID: 0} - - target: {fileID: 20287226139793380, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 20287226139793380, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: m_TargetTexture value: objectReference: {fileID: 8400000, guid: e0e43b005e1a1f347b4924d258914f0b, type: 2} - - target: {fileID: 20287226139793380, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 20287226139793380, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: m_projectionMatrixMode value: 1 objectReference: {fileID: 0} - - target: {fileID: 114177934168037988, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114177934168037988, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: viewMode value: 0 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: FPS value: 30 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: maxRange value: 2 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: depthMode value: 3 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: inputType value: 0 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: bodyFormat value: 2 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: greySkybox value: 0 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: resolution value: 1 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: bodyFitting value: 1 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: sensingMode value: 0 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: svoLoopBack value: 1 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: serialNumber value: 0 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: streamInputIP value: "192.168.3.113\t " objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: depthOcclusion value: 0 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: enableTracking value: 1 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: postProcessing value: 1 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: m_maxDepthRange value: 40 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: svoRealTimeMode value: 1 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: saveMeshWhenOver value: 0 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: setFloorAsOrigin value: 1 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: svoInputFileName value: objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: trackingIsStatic - value: 0 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: advancedPanelOpen - value: 1 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: bodyTrackingModel value: 2 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: isMappingTextured value: 0 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: mappingRangePreset value: 1 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: enableSpatialMemory value: 0 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: bodyTrackingMaxRange value: 20 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: objectDetectionModel value: 2 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: recordingFoldoutOpen value: 0 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: camControlFoldoutOpen value: 0 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: enableSelfCalibration value: 1 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: m_confidenceThreshold value: 100 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: objectDetection2DMask value: 0 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: bodyTrackingFoldoutOpen value: 1 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: estimateInitialPosition value: 1 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: mappingResolutionPreset value: 2 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: objectDetectionMaxRange value: 10 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: objectDetectionTracking value: 1 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: streamingOutFoldoutOpen value: 0 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: objectClassVehicleFilter value: 1 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: bodyTrackingImageSyncMode value: 1 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: minimumKeypointsThreshold value: 5 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: spatialMappingFoldoutOpen value: 0 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: objectDetectionFoldoutOpen value: 0 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: objectDetectionImageSyncMode value: 1 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} + propertyPath: bodyTrackingSkeletonSmoothing + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: bodyTrackingMinimumKPThreshold value: 8 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: bagDetectionConfidenceThreshold value: 60 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: bodyTrackingConfidenceThreshold value: 40 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: animalDetectionConfidenceThreshold value: 60 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: objectDetectionConfidenceThreshold value: 50 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: personDetectionConfidenceThreshold value: 20 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: vehicleDetectionConfidenceThreshold value: 60 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: vehiculeDetectionConfidenceThreshold value: 50 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: OD_personDetectionConfidenceThreshold value: 60 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: SK_personDetectionConfidenceThreshold value: 70 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: electronicsDetectionConfidenceThreshold value: 60 objectReference: {fileID: 0} - - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} propertyPath: fruitVegetableDetectionConfidenceThreshold value: 60 objectReference: {fileID: 0} @@ -632,8 +547,7 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} --- !u!1 &1080472610 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 1795562263255876, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + m_CorrespondingSourceObject: {fileID: 1795562263255876, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} m_PrefabInstance: {fileID: 1007624042} m_PrefabAsset: {fileID: 0} --- !u!1001 &1283831068 @@ -643,190 +557,163 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 6327103935139800440, guid: ca18a88838151284380d84fc86d327e5, - type: 3} + - target: {fileID: 6327103935139800440, guid: ca18a88838151284380d84fc86d327e5, type: 3} propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} - - target: {fileID: 6327103935139800440, guid: ca18a88838151284380d84fc86d327e5, - type: 3} + - target: {fileID: 6327103935139800440, guid: ca18a88838151284380d84fc86d327e5, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6327103935139800440, guid: ca18a88838151284380d84fc86d327e5, - type: 3} + - target: {fileID: 6327103935139800440, guid: ca18a88838151284380d84fc86d327e5, type: 3} propertyPath: m_LocalPosition.y value: 3.2 objectReference: {fileID: 0} - - target: {fileID: 6327103935139800440, guid: ca18a88838151284380d84fc86d327e5, - type: 3} + - target: {fileID: 6327103935139800440, guid: ca18a88838151284380d84fc86d327e5, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6327103935139800440, guid: ca18a88838151284380d84fc86d327e5, - type: 3} + - target: {fileID: 6327103935139800440, guid: ca18a88838151284380d84fc86d327e5, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 6327103935139800440, guid: ca18a88838151284380d84fc86d327e5, - type: 3} + - target: {fileID: 6327103935139800440, guid: ca18a88838151284380d84fc86d327e5, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 6327103935139800440, guid: ca18a88838151284380d84fc86d327e5, - type: 3} + - target: {fileID: 6327103935139800440, guid: ca18a88838151284380d84fc86d327e5, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 6327103935139800440, guid: ca18a88838151284380d84fc86d327e5, - type: 3} + - target: {fileID: 6327103935139800440, guid: ca18a88838151284380d84fc86d327e5, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 6327103935139800440, guid: ca18a88838151284380d84fc86d327e5, - type: 3} + - target: {fileID: 6327103935139800440, guid: ca18a88838151284380d84fc86d327e5, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6327103935139800440, guid: ca18a88838151284380d84fc86d327e5, - type: 3} + - target: {fileID: 6327103935139800440, guid: ca18a88838151284380d84fc86d327e5, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6327103935139800440, guid: ca18a88838151284380d84fc86d327e5, - type: 3} + - target: {fileID: 6327103935139800440, guid: ca18a88838151284380d84fc86d327e5, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, - type: 3} + - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, type: 3} propertyPath: Avatar value: - objectReference: {fileID: 1751147061473432045, guid: 775f768d129e71541aa062aad10f7275, - type: 3} - - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, - type: 3} + objectReference: {fileID: 1751147061473432045, guid: 775f768d129e71541aa062aad10f7275, type: 3} + - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, type: 3} propertyPath: avatar value: - objectReference: {fileID: 9118140948381514423, guid: bc814fadc039fe94099273e678b5903a, - type: 3} - - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, - type: 3} + objectReference: {fileID: 9118140948381514423, guid: bc814fadc039fe94099273e678b5903a, type: 3} + - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, type: 3} propertyPath: showOFF value: 0 objectReference: {fileID: 0} - - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, - type: 3} + - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, type: 3} propertyPath: bodyModel value: 1 objectReference: {fileID: 0} - - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, - type: 3} + - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, type: 3} propertyPath: useAvatar value: 1 objectReference: {fileID: 0} - - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, - type: 3} + - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, type: 3} propertyPath: mirrorMode - value: 1 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, - type: 3} + - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, type: 3} propertyPath: viewCamera value: objectReference: {fileID: 1394870590} - - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, - type: 3} + - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, type: 3} propertyPath: zedManager value: objectReference: {fileID: 1786428179} - - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, - type: 3} + - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, type: 3} propertyPath: cameraFrame value: objectReference: {fileID: 1080472610} - - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, - type: 3} + - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, type: 3} propertyPath: enableFootIK - value: 0 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, - type: 3} + - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, type: 3} propertyPath: smoothFactor value: 0.1 objectReference: {fileID: 0} - - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, - type: 3} + - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, type: 3} propertyPath: mirrorOnYAxis value: 1 objectReference: {fileID: 0} - - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, - type: 3} + - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, type: 3} propertyPath: showSEARCHING value: 0 objectReference: {fileID: 0} - - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, - type: 3} + - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, type: 3} propertyPath: _mirrorOnYAxis value: 1 objectReference: {fileID: 0} - - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, - type: 3} + - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, type: 3} + propertyPath: manualOffset.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, type: 3} propertyPath: smoothingValue value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, - type: 3} + - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, type: 3} propertyPath: automaticOffset value: 1 objectReference: {fileID: 0} - - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, - type: 3} + - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, type: 3} + propertyPath: enableSmoothing + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, type: 3} propertyPath: smoothingFactor value: 1 objectReference: {fileID: 0} - - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, - type: 3} + - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, type: 3} propertyPath: enableFootLocking - value: 0 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, - type: 3} + - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, type: 3} propertyPath: displaySDKSkeleton + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, type: 3} + propertyPath: offsetSDKSkeleton.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, - type: 3} + - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, type: 3} propertyPath: displayDebugSkeleton value: 0 objectReference: {fileID: 0} - - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, - type: 3} + - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, type: 3} propertyPath: skeletonBaseMaterial value: objectReference: {fileID: 2100000, guid: 1b2395225722dc948a38ffcdcc9f04cc, type: 2} - - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, - type: 3} + - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, type: 3} propertyPath: offsetDebugSkeleton.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, - type: 3} + - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, type: 3} propertyPath: footLockingSmoothingValue - value: 0.8 + value: 0.6 objectReference: {fileID: 0} - - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, - type: 3} + - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, type: 3} propertyPath: maximumNumberOfDetections value: 75 objectReference: {fileID: 0} - - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, - type: 3} + - target: {fileID: 6327103935139800441, guid: ca18a88838151284380d84fc86d327e5, type: 3} propertyPath: startBodyTrackingAutomatically value: 1 objectReference: {fileID: 0} - - target: {fileID: 6327103935139800442, guid: ca18a88838151284380d84fc86d327e5, - type: 3} + - target: {fileID: 6327103935139800442, guid: ca18a88838151284380d84fc86d327e5, type: 3} propertyPath: m_Name value: BodyTrackingModule objectReference: {fileID: 0} @@ -839,68 +726,55 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 9016204339639754595, guid: 62e39df6ad8e382478dc56a09ed786f9, - type: 3} + - target: {fileID: 9016204339639754595, guid: 62e39df6ad8e382478dc56a09ed786f9, type: 3} propertyPath: m_RootOrder value: 4 objectReference: {fileID: 0} - - target: {fileID: 9016204339639754595, guid: 62e39df6ad8e382478dc56a09ed786f9, - type: 3} + - target: {fileID: 9016204339639754595, guid: 62e39df6ad8e382478dc56a09ed786f9, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 9016204339639754595, guid: 62e39df6ad8e382478dc56a09ed786f9, - type: 3} + - target: {fileID: 9016204339639754595, guid: 62e39df6ad8e382478dc56a09ed786f9, type: 3} propertyPath: m_LocalPosition.y value: 1.2 objectReference: {fileID: 0} - - target: {fileID: 9016204339639754595, guid: 62e39df6ad8e382478dc56a09ed786f9, - type: 3} + - target: {fileID: 9016204339639754595, guid: 62e39df6ad8e382478dc56a09ed786f9, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: -1 objectReference: {fileID: 0} - - target: {fileID: 9016204339639754595, guid: 62e39df6ad8e382478dc56a09ed786f9, - type: 3} + - target: {fileID: 9016204339639754595, guid: 62e39df6ad8e382478dc56a09ed786f9, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 9016204339639754595, guid: 62e39df6ad8e382478dc56a09ed786f9, - type: 3} + - target: {fileID: 9016204339639754595, guid: 62e39df6ad8e382478dc56a09ed786f9, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 9016204339639754595, guid: 62e39df6ad8e382478dc56a09ed786f9, - type: 3} + - target: {fileID: 9016204339639754595, guid: 62e39df6ad8e382478dc56a09ed786f9, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9016204339639754595, guid: 62e39df6ad8e382478dc56a09ed786f9, - type: 3} + - target: {fileID: 9016204339639754595, guid: 62e39df6ad8e382478dc56a09ed786f9, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 9016204339639754595, guid: 62e39df6ad8e382478dc56a09ed786f9, - type: 3} + - target: {fileID: 9016204339639754595, guid: 62e39df6ad8e382478dc56a09ed786f9, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 9016204339639754595, guid: 62e39df6ad8e382478dc56a09ed786f9, - type: 3} + - target: {fileID: 9016204339639754595, guid: 62e39df6ad8e382478dc56a09ed786f9, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9016204339639754595, guid: 62e39df6ad8e382478dc56a09ed786f9, - type: 3} + - target: {fileID: 9016204339639754595, guid: 62e39df6ad8e382478dc56a09ed786f9, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 9016204339639754600, guid: 62e39df6ad8e382478dc56a09ed786f9, - type: 3} + - target: {fileID: 9016204339639754600, guid: 62e39df6ad8e382478dc56a09ed786f9, type: 3} propertyPath: m_Name value: Virtual View Camera objectReference: {fileID: 0} - - target: {fileID: 9016204339639754600, guid: 62e39df6ad8e382478dc56a09ed786f9, - type: 3} + - target: {fileID: 9016204339639754600, guid: 62e39df6ad8e382478dc56a09ed786f9, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} @@ -908,8 +782,7 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: 62e39df6ad8e382478dc56a09ed786f9, type: 3} --- !u!20 &1394870590 stripped Camera: - m_CorrespondingSourceObject: {fileID: 9016204339639754596, guid: 62e39df6ad8e382478dc56a09ed786f9, - type: 3} + m_CorrespondingSourceObject: {fileID: 9016204339639754596, guid: 62e39df6ad8e382478dc56a09ed786f9, type: 3} m_PrefabInstance: {fileID: 1394870589} m_PrefabAsset: {fileID: 0} --- !u!1 &1673540942 @@ -1008,8 +881,7 @@ Transform: m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!114 &1786428179 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, - type: 3} + m_CorrespondingSourceObject: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42, type: 3} m_PrefabInstance: {fileID: 1007624042} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -1025,63 +897,51 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 7930176315466754371, guid: a8c20579481be8e41a553aa0337494c6, - type: 3} + - target: {fileID: 7930176315466754371, guid: a8c20579481be8e41a553aa0337494c6, type: 3} propertyPath: m_Name value: Plane objectReference: {fileID: 0} - - target: {fileID: 7930176315466754431, guid: a8c20579481be8e41a553aa0337494c6, - type: 3} + - target: {fileID: 7930176315466754431, guid: a8c20579481be8e41a553aa0337494c6, type: 3} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - - target: {fileID: 7930176315466754431, guid: a8c20579481be8e41a553aa0337494c6, - type: 3} + - target: {fileID: 7930176315466754431, guid: a8c20579481be8e41a553aa0337494c6, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7930176315466754431, guid: a8c20579481be8e41a553aa0337494c6, - type: 3} + - target: {fileID: 7930176315466754431, guid: a8c20579481be8e41a553aa0337494c6, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7930176315466754431, guid: a8c20579481be8e41a553aa0337494c6, - type: 3} + - target: {fileID: 7930176315466754431, guid: a8c20579481be8e41a553aa0337494c6, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7930176315466754431, guid: a8c20579481be8e41a553aa0337494c6, - type: 3} + - target: {fileID: 7930176315466754431, guid: a8c20579481be8e41a553aa0337494c6, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 7930176315466754431, guid: a8c20579481be8e41a553aa0337494c6, - type: 3} + - target: {fileID: 7930176315466754431, guid: a8c20579481be8e41a553aa0337494c6, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7930176315466754431, guid: a8c20579481be8e41a553aa0337494c6, - type: 3} + - target: {fileID: 7930176315466754431, guid: a8c20579481be8e41a553aa0337494c6, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7930176315466754431, guid: a8c20579481be8e41a553aa0337494c6, - type: 3} + - target: {fileID: 7930176315466754431, guid: a8c20579481be8e41a553aa0337494c6, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7930176315466754431, guid: a8c20579481be8e41a553aa0337494c6, - type: 3} + - target: {fileID: 7930176315466754431, guid: a8c20579481be8e41a553aa0337494c6, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7930176315466754431, guid: a8c20579481be8e41a553aa0337494c6, - type: 3} + - target: {fileID: 7930176315466754431, guid: a8c20579481be8e41a553aa0337494c6, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7930176315466754431, guid: a8c20579481be8e41a553aa0337494c6, - type: 3} + - target: {fileID: 7930176315466754431, guid: a8c20579481be8e41a553aa0337494c6, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} diff --git a/ZEDCamera/Assets/ZED/Examples/OpenCV ArUco Detection/Scenes/Simple Marker Placement.unity b/ZEDCamera/Assets/ZED/Examples/OpenCV ArUco Detection/Scenes/Simple Marker Placement.unity index cb5001d5..a0504056 100644 --- a/ZEDCamera/Assets/ZED/Examples/OpenCV ArUco Detection/Scenes/Simple Marker Placement.unity +++ b/ZEDCamera/Assets/ZED/Examples/OpenCV ArUco Detection/Scenes/Simple Marker Placement.unity @@ -161,6 +161,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -214,6 +215,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 0.1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1380222653} m_RootOrder: 0 @@ -273,6 +275,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -4.2, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2010391085} m_Father: {fileID: 0} @@ -316,6 +319,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -369,6 +373,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 0.1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 599479602} m_RootOrder: 0 @@ -380,7 +385,7 @@ LightingSettings: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Settings.lighting - serializedVersion: 3 + serializedVersion: 4 m_GIWorkflowMode: 0 m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 1 @@ -393,7 +398,7 @@ LightingSettings: m_LightmapMaxSize: 1024 m_BakeResolution: 40 m_Padding: 2 - m_TextureCompression: 1 + m_LightmapCompression: 3 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 1 @@ -434,10 +439,10 @@ LightingSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 + m_PVRTiledBaking: 0 --- !u!114 &407337776 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 114711245158774928, guid: e13ee7e0790c7d243b7aa67fe604acac, - type: 3} + m_CorrespondingSourceObject: {fileID: 114711245158774928, guid: e13ee7e0790c7d243b7aa67fe604acac, type: 3} m_PrefabInstance: {fileID: 883453435} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -501,6 +506,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -3.15, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 126909665} m_Father: {fileID: 0} @@ -534,6 +540,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.0008588135, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1094516502} m_Father: {fileID: 0} @@ -657,6 +664,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1436819744} m_Father: {fileID: 0} @@ -711,7 +719,7 @@ MonoBehaviour: m_EditorClassIdentifier: imageRetriever: {fileID: 859701131} markerWidthMeters: 0.175 - markerDictionary: 9 + markerDictionary: 0 --- !u!4 &857114140 Transform: m_ObjectHideFlags: 0 @@ -722,6 +730,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 @@ -766,6 +775,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.46380258, y: 0.45984256, z: 3.7793646} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -809,13 +819,11 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 114711245158774928, guid: e13ee7e0790c7d243b7aa67fe604acac, - type: 3} + - target: {fileID: 114711245158774928, guid: e13ee7e0790c7d243b7aa67fe604acac, type: 3} propertyPath: showarrig value: 1 objectReference: {fileID: 0} - - target: {fileID: 114711245158774928, guid: e13ee7e0790c7d243b7aa67fe604acac, - type: 3} + - target: {fileID: 114711245158774928, guid: e13ee7e0790c7d243b7aa67fe604acac, type: 3} propertyPath: advancedPanelOpen value: 1 objectReference: {fileID: 0} @@ -850,6 +858,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 0.1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 757982340} m_RootOrder: 0 @@ -865,6 +874,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -971,6 +981,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -2.1, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 81208245} m_Father: {fileID: 0} @@ -1004,6 +1015,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 771887902} m_RootOrder: 0 @@ -1145,6 +1157,7 @@ Transform: m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -1187,6 +1200,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1240,6 +1254,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 0.1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 98179969} m_RootOrder: 0 @@ -1282,6 +1297,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1335,6 +1351,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 0.1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2101091372} m_RootOrder: 0 @@ -1369,6 +1386,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -1401,6 +1419,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 10 @@ -1460,6 +1479,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1.05, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2035212747} m_Father: {fileID: 0} diff --git a/ZEDCamera/Assets/ZED/Examples/OpenCV ArUco Detection/Scripts/Core/ZEDToOpenCVRetriever.cs b/ZEDCamera/Assets/ZED/Examples/OpenCV ArUco Detection/Scripts/Core/ZEDToOpenCVRetriever.cs index 8916025a..4948e9d8 100644 --- a/ZEDCamera/Assets/ZED/Examples/OpenCV ArUco Detection/Scripts/Core/ZEDToOpenCVRetriever.cs +++ b/ZEDCamera/Assets/ZED/Examples/OpenCV ArUco Detection/Scripts/Core/ZEDToOpenCVRetriever.cs @@ -214,7 +214,8 @@ private void DeployGrabbedEvent(Camera cam, ref ZEDMat zedmat, VIEW view, ZEDMat Mat buffermat = GetOpenCVBufferMat(zedCam.ImageHeight, zedCam.ImageWidth, SLMatType2CVMatType(mattype)); //copyToMat(zedmat.GetPtr(), cvMat); - MatUtils.copyFromMat(buffermat, zedmat.GetPtr()); + //MatUtils.copyFromMat(buffermat, zedmat.GetPtr()); + MatUtils.copyToMat(zedmat.GetPtr(), buffermat); ConvertColorSpace(buffermat, ref cvMat, conversionatend); //Mat convertedmat = ConvertColorSpace(buffermat, conversionatend); diff --git a/ZEDCamera/Assets/ZED/SDK/Helpers/Scripts/BodyTracking/SkeletonHandler.cs b/ZEDCamera/Assets/ZED/SDK/Helpers/Scripts/BodyTracking/SkeletonHandler.cs index 05ab3fc1..c768774a 100644 --- a/ZEDCamera/Assets/ZED/SDK/Helpers/Scripts/BodyTracking/SkeletonHandler.cs +++ b/ZEDCamera/Assets/ZED/SDK/Helpers/Scripts/BodyTracking/SkeletonHandler.cs @@ -871,7 +871,7 @@ private void UpdateCurrentValues(sl.BODY_FORMAT pBodyFormat) currentKeypointsCount = JointType_70_COUNT; break; default: - Debug.LogError("Error: Invalid BODY_MODEL! Please use either BODY_34, BODY_38 or BODY_70."); + Debug.LogError("Error: Invalid BODY_MODEL! Please use either BODY_34 or BODY_38."); #if UNITY_EDITOR EditorApplication.ExitPlaymode(); #else @@ -1074,9 +1074,10 @@ public void InitSkeleton(int person_id, Material skBaseMat) //sphere.layer = LayerMask.NameToLayer("tagInvisibleToZED"); sphere.GetComponent().material = skBaseMat; skBaseMat.color = color; - sphere.transform.localScale = (BodyFormat == sl.BODY_FORMAT.BODY_70 && j >= JointType_70_LEFT_HAND_THUMB_1) + sphere.transform.localScale = (BodyFormat == sl.BODY_FORMAT.BODY_70 && j >= JointType_70_LEFT_HAND_THUMB_1) ? new Vector3(width, width, width) : new Vector3(width * 2, width * 2, width * 2); + //sphere.transform.localScale = new Vector3(width * 2, width * 2, width * 2); sphere.transform.parent = skeleton.transform; sphere.name = currentSpheresList[j].ToString(); spheres[j] = sphere; @@ -1119,10 +1120,11 @@ void UpdateSkeleton(Vector3 offsetSDK, bool mirrorMode = false) bones[i].SetActive(true); Vector3 offset = end - start; - // if hands, thinner cylinders - Vector3 scale = (BodyFormat == sl.BODY_FORMAT.BODY_70 && i >= 29 ) - ? new Vector3(width/2f, offset.magnitude / 2.0f, width/2f) + // if hands Body70, thinner cylinders + Vector3 scale = (BodyFormat == sl.BODY_FORMAT.BODY_70 && i >= 29) + ? new Vector3(width / 2f, offset.magnitude / 2.0f, width / 2f) : new Vector3(width, offset.magnitude / 2.0f, width); + //Vector3 scale = new Vector3(width, offset.magnitude / 2.0f, width); Vector3 position = start + (offset / 2.0f); bones[i].transform.position = position; diff --git a/ZEDCamera/Assets/ZED/SDK/Helpers/Scripts/BodyTracking/ZEDBodyTrackingManager.cs b/ZEDCamera/Assets/ZED/SDK/Helpers/Scripts/BodyTracking/ZEDBodyTrackingManager.cs index 2a64c5ba..9977e911 100644 --- a/ZEDCamera/Assets/ZED/SDK/Helpers/Scripts/BodyTracking/ZEDBodyTrackingManager.cs +++ b/ZEDCamera/Assets/ZED/SDK/Helpers/Scripts/BodyTracking/ZEDBodyTrackingManager.cs @@ -155,6 +155,11 @@ void Start() zedManager = FindObjectOfType(); } + if(avatar.GetComponent().runtimeAnimatorController == null) + { + Debug.LogWarning("Animator has no animator controller. Animation from ZED plugin will not work."); + } + if (zedManager) { diff --git a/ZEDCamera/Assets/ZED/SDK/Helpers/Scripts/SpatialMapping/ZEDSpatialMapping.cs b/ZEDCamera/Assets/ZED/SDK/Helpers/Scripts/SpatialMapping/ZEDSpatialMapping.cs index 4d544546..bae86fef 100644 --- a/ZEDCamera/Assets/ZED/SDK/Helpers/Scripts/SpatialMapping/ZEDSpatialMapping.cs +++ b/ZEDCamera/Assets/ZED/SDK/Helpers/Scripts/SpatialMapping/ZEDSpatialMapping.cs @@ -847,7 +847,7 @@ public bool LoadMesh(string meshFilePath = "ZEDMesh.obj") zedCamera.DisableTracking(); Quaternion quat = Quaternion.identity; Vector3 tr = Vector3.zero; - if (zedCamera.EnableTracking(ref quat, ref tr, true, false, false, false, true, -1.0f, true, System.IO.File.Exists(basePath + ".area") ? basePath + ".area" : "") != sl.ERROR_CODE.SUCCESS) + if (zedCamera.EnableTracking(ref quat, ref tr, true, false, false, false, true, -1.0f, true, sl.POSTIONAL_TRACKING_MODE.STANDARD, System.IO.File.Exists(basePath + ".area") ? basePath + ".area" : "") != sl.ERROR_CODE.SUCCESS) { Debug.LogWarning(ZEDLogMessage.Error2Str(ZEDLogMessage.ERROR.TRACKING_NOT_INITIALIZED)); } diff --git a/ZEDCamera/Assets/ZED/SDK/Helpers/Scripts/ZEDManager.cs b/ZEDCamera/Assets/ZED/SDK/Helpers/Scripts/ZEDManager.cs index 61c443ed..419778f2 100644 --- a/ZEDCamera/Assets/ZED/SDK/Helpers/Scripts/ZEDManager.cs +++ b/ZEDCamera/Assets/ZED/SDK/Helpers/Scripts/ZEDManager.cs @@ -269,6 +269,12 @@ public enum shaderType [HideInInspector] public string pathSpatialMemory; + /// + /// Positional tracking mode used. Can be used to improve accuracy in some type of scene at the cost of longer runtime. + /// + [HideInInspector] + public sl.POSTIONAL_TRACKING_MODE positionalTrackingMode; + /// /// Estimate initial position by detecting the floor. /// @@ -689,6 +695,12 @@ public enum shaderType [HideInInspector] public int bodyTrackingConfidenceThreshold = 60; + /// + /// Ratio of SDK skeleton smoothing application. 0 is none, 1 is max smoothing. + /// + [HideInInspector] + public float bodyTrackingSkeletonSmoothing = 0.2f; + /// /// Whether the body tracking module has been activated successfully. /// @@ -2574,7 +2586,7 @@ void EnableTrackingThreaded() } sl.ERROR_CODE err = (zedCamera.EnableTracking(ref zedOrientation, ref zedPosition, enableSpatialMemory, - enablePoseSmoothing, setFloorAsOrigin, trackingIsStatic, enableIMUFusion, depthMinRange, setGravityAsOrigin, pathSpatialMemory)); + enablePoseSmoothing, setFloorAsOrigin, trackingIsStatic, enableIMUFusion, depthMinRange, setGravityAsOrigin, positionalTrackingMode, pathSpatialMemory)); //Now enable the tracking with the proper parameters. if (!(enableTracking = (err == sl.ERROR_CODE.SUCCESS))) @@ -3191,7 +3203,7 @@ public void StartBodyTracking() { if (bodyFormat != sl.BODY_FORMAT.BODY_18 && bodyFormat != sl.BODY_FORMAT.BODY_34 && bodyFormat != sl.BODY_FORMAT.BODY_38 && bodyFormat != sl.BODY_FORMAT.BODY_70) { - Debug.LogError("Error: Invalid BODY_MODEL! Please use either BODY_34, BODY_38 or BODY_70."); + Debug.LogError("Error: Invalid BODY_MODEL! Please use either BODY_34 or BODY_38."); #if UNITY_EDITOR EditorApplication.ExitPlaymode(); #else @@ -3276,6 +3288,8 @@ private IEnumerator startBodyTracking() bodyTrackingRuntimeParams.detectionConfidenceThreshold = bodyTrackingConfidenceThreshold; bodyTrackingRuntimeParams.minimumKeypointsThreshold = bodyTrackingMinimumKPThreshold; + bodyTrackingRuntimeParams.skeletonSmoothing = bodyTrackingSkeletonSmoothing; + sl.ERROR_CODE err = zedCamera.EnableBodyTracking(ref bt_param); if (err == sl.ERROR_CODE.SUCCESS) @@ -3317,6 +3331,7 @@ public void UpdateBodiesTracking() //Update the runtime parameters in case the user made changes. bodyTrackingRuntimeParams.detectionConfidenceThreshold = bodyTrackingConfidenceThreshold; bodyTrackingRuntimeParams.minimumKeypointsThreshold = bodyTrackingMinimumKPThreshold; + bodyTrackingRuntimeParams.skeletonSmoothing = bodyTrackingSkeletonSmoothing; if (bodyTrackingImageSyncMode == false) RetrieveBodyTrackingFrame(); //If true, this is called in the AcquireImages function in the image acquisition thread. @@ -3779,7 +3794,7 @@ void OnValidate() { //Enables tracking and initializes the first position of the camera. if (!(enableTracking = (zedCamera.EnableTracking(ref zedOrientation, ref zedPosition, enableSpatialMemory, enablePoseSmoothing, setFloorAsOrigin, trackingIsStatic, - enableIMUFusion, depthMinRange, setGravityAsOrigin, pathSpatialMemory) == sl.ERROR_CODE.SUCCESS))) + enableIMUFusion, depthMinRange, setGravityAsOrigin, positionalTrackingMode, pathSpatialMemory) == sl.ERROR_CODE.SUCCESS))) { isZEDTracked = false; throw new Exception(ZEDLogMessage.Error2Str(ZEDLogMessage.ERROR.TRACKING_NOT_INITIALIZED)); diff --git a/ZEDCamera/Assets/ZED/SDK/NativeInterface/ZEDCamera.cs b/ZEDCamera/Assets/ZED/SDK/NativeInterface/ZEDCamera.cs index 1b3061eb..bf56a8c2 100644 --- a/ZEDCamera/Assets/ZED/SDK/NativeInterface/ZEDCamera.cs +++ b/ZEDCamera/Assets/ZED/SDK/NativeInterface/ZEDCamera.cs @@ -285,7 +285,7 @@ public int TagInvisibleToZED /// /// Current Plugin Version. /// - public static readonly System.Version PluginVersion = new System.Version(4, 0, 2); + public static readonly System.Version PluginVersion = new System.Version(4, 0, 4); /******** DLL members ***********/ [DllImport(nameDll, EntryPoint = "GetRenderEventFunc")] @@ -539,7 +539,7 @@ public int TagInvisibleToZED */ [DllImport(nameDll, EntryPoint = "sl_enable_positional_tracking_unity")] private static extern int dllz_enable_tracking(int cameraID, ref Quaternion quat, ref Vector3 vec, bool enableSpatialMemory = false, bool enablePoseSmoothing = false, bool enableFloorAlignment = false, - bool trackingIsStatic = false, bool enableIMUFusion = true, float depthMinRange = -1.0f, bool setGravityAsOrigin = true, System.Text.StringBuilder aeraFilePath = null); + bool trackingIsStatic = false, bool enableIMUFusion = true, float depthMinRange = -1.0f, bool setGravityAsOrigin = true, sl.POSTIONAL_TRACKING_MODE mode = sl.POSTIONAL_TRACKING_MODE.STANDARD, System.Text.StringBuilder aeraFilePath = null); [DllImport(nameDll, EntryPoint = "sl_disable_positional_tracking")] private static extern void dllz_disable_tracking(int cameraID, System.Text.StringBuilder path); @@ -1354,11 +1354,11 @@ public float GetDepthMaxRangeValue() /// (optional) file of spatial memory file that has to be loaded to relocate in the scene. /// public sl.ERROR_CODE EnableTracking(ref Quaternion quat, ref Vector3 vec, bool enableSpatialMemory = true, bool enablePoseSmoothing = false, bool enableFloorAlignment = false, bool trackingIsStatic = false, - bool enableIMUFusion = true, float depthMinRange = -1.0f, bool setGravityAsOrigin = true, string areaFilePath = "") + bool enableIMUFusion = true, float depthMinRange = -1.0f, bool setGravityAsOrigin = true, sl.POSTIONAL_TRACKING_MODE mode = POSTIONAL_TRACKING_MODE.STANDARD, string areaFilePath = "") { sl.ERROR_CODE trackingStatus = sl.ERROR_CODE.CAMERA_NOT_DETECTED; trackingStatus = (sl.ERROR_CODE)dllz_enable_tracking(CameraID, ref quat, ref vec, enableSpatialMemory, enablePoseSmoothing, enableFloorAlignment, - trackingIsStatic, enableIMUFusion, depthMinRange, setGravityAsOrigin, new System.Text.StringBuilder(areaFilePath, areaFilePath.Length)); + trackingIsStatic, enableIMUFusion, depthMinRange, setGravityAsOrigin, mode, new System.Text.StringBuilder(areaFilePath, areaFilePath.Length)); return trackingStatus; } @@ -2051,8 +2051,6 @@ public void ResetCameraSettings() SetCameraSettings(sl.CAMERA_SETTINGS.AUTO_WHITEBALANCE, 1); SetCameraSettings(sl.CAMERA_SETTINGS.AEC_AGC, 1); SetCameraSettings(sl.CAMERA_SETTINGS.LED_STATUS, 1); - - // SetCameraSettings(sl.CAMERA_SETTINGS.AEC_AGC_ROI,2, new sl.Rect(), true); } /// diff --git a/ZEDCamera/Assets/ZED/SDK/NativeInterface/ZEDCommon.cs b/ZEDCamera/Assets/ZED/SDK/NativeInterface/ZEDCommon.cs index d3844a92..92e602cf 100644 --- a/ZEDCamera/Assets/ZED/SDK/NativeInterface/ZEDCommon.cs +++ b/ZEDCamera/Assets/ZED/SDK/NativeInterface/ZEDCommon.cs @@ -146,6 +146,14 @@ public struct Rect public int y; public int width; public int height; + + Rect(int x_ = 0, int y_ = 0, int width_= 0, int height_= 0) + { + this.x = x_; + this.y = y_; + this.width = width_; + this.height = height_; + } }; public enum CAMERA_STATE @@ -1336,6 +1344,21 @@ public enum TRACKING_STATE TRACKING_SEARCHING_FLOOR_PLANE } + /// + /// Lists the mode of positional tracking that can be used. + /// + public enum POSTIONAL_TRACKING_MODE + { + /// + /// Default mode, best compromise in performance and accuracy + /// + STANDARD, + /// + /// Improve accuracy in more challening scenes such as outdoor repetitive patterns like extensive field. Curently works best with ULTRA depth mode, requires more compute power + /// + QUALITY + } + /// /// SVO compression modes. /// @@ -2236,6 +2259,11 @@ public struct BodyTrackingRuntimeParameters /// It is useful for example to remove unstable fitting results when a skeleton is partially occluded. /// public int minimumKeypointsThreshold; + /// + /// This value controls the smoothing of the fitted fused skeleton. + /// It is ranged from 0 (low smoothing) and 1 (high smoothing) + /// + public float skeletonSmoothing; }; /// diff --git a/ZEDCamera/Assets/ZED/SDK/Plugins/linux/libsl_unitywrapper.so b/ZEDCamera/Assets/ZED/SDK/Plugins/linux/libsl_unitywrapper.so old mode 100755 new mode 100644 index 1a92ec72..1d997d2d Binary files a/ZEDCamera/Assets/ZED/SDK/Plugins/linux/libsl_unitywrapper.so and b/ZEDCamera/Assets/ZED/SDK/Plugins/linux/libsl_unitywrapper.so differ diff --git a/ZEDCamera/Assets/ZED/SDK/Plugins/win64/sl_unitywrapper.dll b/ZEDCamera/Assets/ZED/SDK/Plugins/win64/sl_unitywrapper.dll index 3d271411..c3fa9df7 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