Skip to content

Commit

Permalink
Merge v3.8 (#242)
Browse files Browse the repository at this point in the history
* fix recording path error

* add updated lib for linux

* Add Vsync in SK sample code

* clean scenes parameters

* initial commit

* release 3.5

* 3.5 release

* modify AR settings panel to AR Pass-through settings

* change SK example scene (model + settings)

* first commit + remove API errors

* fix SK sample for unity 2020

* remove svo path (used for debug) in zedmanager

* update linux wrapper

* add unity version check and fix hasXRDevice() function

* remove debug log from last commit

* initial commit

* multi cam - wip

* 3.6 - WIP

* add multicam scripts

* add missings files

* clean local repo / add missing shaders

* update plugin version to 4.0

* New SK API - WIP

* fix new Body tracking sample with new fitting API

* Improve SK readme

* add comments in SK sample scripts

* clean SK sampleé

* add missing meta file

* update dll calls

* fix dll call

* release_3.6

* remove debug logs

* fix object_class enum

* clean repo

* fix dll fonction name

* merge xr compatibility branch - need more QA

* add custom od sample

* update OD readme

* add is_grounded + body_34

* final update for 3.6

* update linux wrapper

* modify grab error code to public variable

* wip fix sk rigging

* add new svo compression modes

* initial commit

* initial commit - add RPdefiner + remove LWRP

* update linux wrapper

* add hdrp/urp files

* update shaders for planetarium scene

* add option to convert zed prefab to srp

* update mats

* update planetarium materials

* change VR rig to use only one cam

* fix mat + add missing include

* fix last materials + update readme

* add new RT params : remove satured areas

* add height offset slider

* add keyboard bindings for height offset

* update with new api (3.7)

* prepare 3.7 release

* update linux wrapper for 3.7

* update api to 3.8

* add new 3.8 params

* prepare for release

* add last api change for 3.8

* fix merge conflicts

* update wrappers

Co-authored-by: obraun <[email protected]>
  • Loading branch information
Bvallon-sl and obraun-sl committed Oct 18, 2022
1 parent 662ed3e commit bc676d5
Show file tree
Hide file tree
Showing 39 changed files with 2,108 additions and 1,791 deletions.
57 changes: 57 additions & 0 deletions ZEDCamera/Assets/UniversalRenderPipelineAsset.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: bf2edee5c58d82540a51f03df9d42094, type: 3}
m_Name: UniversalRenderPipelineAsset
m_EditorClassIdentifier:
k_AssetVersion: 6
k_AssetPreviousVersion: 5
m_RendererType: 1
m_RendererData: {fileID: 0}
m_RendererDataList:
- {fileID: 11400000, guid: 5ab9d918f28d78b46abec2e4c1ef5aca, type: 2}
m_DefaultRendererIndex: 0
m_RequireDepthTexture: 0
m_RequireOpaqueTexture: 0
m_OpaqueDownsampling: 1
m_SupportsTerrainHoles: 1
m_SupportsHDR: 1
m_MSAA: 4
m_RenderScale: 1
m_MainLightRenderingMode: 1
m_MainLightShadowsSupported: 1
m_MainLightShadowmapResolution: 2048
m_AdditionalLightsRenderingMode: 1
m_AdditionalLightsPerObjectLimit: 4
m_AdditionalLightShadowsSupported: 0
m_AdditionalLightsShadowmapResolution: 512
m_ShadowDistance: 50
m_ShadowCascadeCount: 1
m_Cascade2Split: 0.25
m_Cascade3Split: {x: 0.1, y: 0.3}
m_Cascade4Split: {x: 0.067, y: 0.2, z: 0.467}
m_ShadowDepthBias: 1
m_ShadowNormalBias: 1
m_SoftShadowsSupported: 1
m_UseSRPBatcher: 1
m_SupportsDynamicBatching: 0
m_MixedLightingSupported: 1
m_DebugLevel: 0
m_UseAdaptivePerformance: 1
m_ColorGradingMode: 0
m_ColorGradingLutSize: 32
m_ShadowType: 1
m_LocalShadowsSupported: 0
m_LocalShadowsAtlasResolution: 256
m_MaxPixelLights: 0
m_ShadowAtlasResolution: 256
m_ShaderVariantLogLevel: 0
m_ShadowCascades: 0
8 changes: 8 additions & 0 deletions ZEDCamera/Assets/UniversalRenderPipelineAsset.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

45 changes: 45 additions & 0 deletions ZEDCamera/Assets/UniversalRenderPipelineAsset_Renderer.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: de640fe3d0db1804a85f9fc8f5cadab6, type: 3}
m_Name: UniversalRenderPipelineAsset_Renderer
m_EditorClassIdentifier:
m_RendererFeatures: []
m_RendererFeatureMap:
postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2}
shaders:
blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3}
copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}
screenSpaceShadowPS: {fileID: 4800000, guid: 0f854b35a0cf61a429bd5dcfea30eddd,
type: 3}
samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3}
tileDepthInfoPS: {fileID: 0}
tileDeferredPS: {fileID: 0}
stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3}
fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3}
materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3}
m_OpaqueLayerMask:
serializedVersion: 2
m_Bits: 4294967295
m_TransparentLayerMask:
serializedVersion: 2
m_Bits: 4294967295
m_DefaultStencilState:
overrideStencilState: 0
stencilReference: 0
stencilCompareFunction: 8
passOperation: 2
failOperation: 0
zFailOperation: 0
m_ShadowTransparentReceive: 1
m_RenderingMode: 0
m_AccurateGbufferNormals: 0

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 10 additions & 5 deletions ZEDCamera/Assets/ZED/Editor/Scripts/ZEDCameraEditor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ public class ZEDCameraEditor : Editor
private SerializedProperty OD_DetectionModel;
private SerializedProperty OD_MaxRange;
private SerializedProperty OD_FilteringMode;
private SerializedProperty OD_MinimumKPThresh;
//Object Detection Runtime Prop
private SerializedProperty OD_VehicleDetectionConfidence;
private SerializedProperty OD_PersonDetectionConfidence;
Expand Down Expand Up @@ -266,6 +267,7 @@ private void OnEnable()
OD_DetectionModel = serializedObject.FindProperty("objectDetectionModel");
OD_MaxRange = serializedObject.FindProperty("objectDetectionMaxRange");
OD_FilteringMode = serializedObject.FindProperty("objectDetectionFilteringMode");
OD_MinimumKPThresh = serializedObject.FindProperty("minimumKeypointsThreshold");

OD_PersonDetectionConfidence = serializedObject.FindProperty("OD_personDetectionConfidenceThreshold");
SK_PersonDetectionConfidence = serializedObject.FindProperty("SK_personDetectionConfidenceThreshold");
Expand Down Expand Up @@ -380,7 +382,7 @@ public override void OnInspectorGUI()
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.");
GUIContent cameraSerialNumberLabel = new GUIContent("Serial Number", "Serial number of the camera to open. Leave the SN to 0 to open the camera by ID.");
GUI.enabled = !Application.isPlaying;
usbSNProperty.intValue = EditorGUILayout.IntField(cameraSerialNumberLabel, usbSNProperty.intValue);
GUI.enabled = true;
Expand Down Expand Up @@ -783,6 +785,9 @@ public override void OnInspectorGUI()
GUIContent BodyFittingLabel = new GUIContent("Enable Body Fitting", "Defines if the body fitting will be applied.\r\n\n" +
"Requires tracking to be on. It's also recommended to enable Estimate Initial Position to find the floor.");
OD_BodyFitting.boolValue = EditorGUILayout.Toggle(BodyFittingLabel, OD_BodyFitting.boolValue);

GUIContent MinKPThresh = new GUIContent("Minimum keypoints threshold", "Filter detections with low number of keypoints detected");
OD_MinimumKPThresh.intValue = EditorGUILayout.IntSlider(MinKPThresh, OD_MinimumKPThresh.intValue, 0, 34);
}

GUIContent MaxRangeLabel = new GUIContent("Max Range", "Defines a upper depth range for detections.");
Expand Down Expand Up @@ -868,7 +873,7 @@ 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.");
OD_PersonDetectionConfidence.intValue = EditorGUILayout.IntSlider(OD_personDetectionConfidenceThresholdLabel, OD_PersonDetectionConfidence.intValue, 1, 99);
}
else if (OD_DetectionModel.enumValueIndex == (int)sl.DETECTION_MODEL.CUSTOM_BOX_OBJECTS) {
else if (OD_DetectionModel.enumValueIndex == (int)sl.DETECTION_MODEL.CUSTOM_BOX_OBJECTS) {
}
else //SKELETON
{
Expand Down Expand Up @@ -1056,7 +1061,7 @@ public override void OnInspectorGUI()
GUIContent enalbeIMUFusionLabel = new GUIContent("Visual-Inertial Tracking", "If true, and you are using a ZED2 or ZED Mini, IMU fusion uses data from the camera's IMU to improve tracking results. ");
enableIMUFusionProperty.boolValue = EditorGUILayout.Toggle(enalbeIMUFusionLabel, enableIMUFusionProperty.boolValue);

//Whether to enable the ZED SDK's self-calibration feature.
//Whether to enable the ZED SDK's self-calibration feature.
GUIContent enableselfcaliblabel = new GUIContent("Self-Calibration", "If true, the ZED SDK will subtly adjust the ZED's calibration " +
"during runtime to account for heat and other factors. Reasons to disable this are rare. ");
enableSelfCalibrationProperty.boolValue = EditorGUILayout.Toggle(enableselfcaliblabel, enableSelfCalibrationProperty.boolValue);
Expand All @@ -1083,7 +1088,7 @@ public override void OnInspectorGUI()

EditorGUI.indentLevel++;

//Style for the AR layer box.
//Style for the AR layer box.
GUIStyle layerboxstyle = new GUIStyle(EditorStyles.numberField);
layerboxstyle.fixedWidth = 30;
layerboxstyle.stretchWidth = false;
Expand Down Expand Up @@ -1190,7 +1195,7 @@ public override void OnInspectorGUI()
"usually be left on. However, in some setups, like when using a custom mount, this can cause tracking errors.");
setIMUPrior.boolValue = EditorGUILayout.Toggle(setimupriorlabel, manager.setIMUPriorInAR);

//Fade In At Start toggle.
//Fade In At Start toggle.
GUIContent fadeinlabel = new GUIContent("Fade In at Start", "When enabled, makes the ZED image fade in from black when the application starts.");
fadeinonstart.boolValue = EditorGUILayout.Toggle(fadeinlabel, manager.fadeInOnStart);

Expand Down
Loading

0 comments on commit bc676d5

Please sign in to comment.