Merge remote-tracking branch 'origin/v4.1.0' into v4.1.0

Author: SLJLMacarit

ZEDCamera/Assets/ZED/Editor/Scripts/ZEDCameraEditor.cs

@@ -607,7 +607,7 @@ public override void OnInspectorGUI()
 
         GUIContent positionalTrackingModePropertyLabel = new GUIContent("Positional Tracking Mode", "Lists the mode of positional tracking that can be used.\r\n " +
                         "- GEN_1 : Default mode, best compromise in performance and accuracy.\r\n" +
-                        "- GEN_2 : 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.");
+                        "- GEN_2 : Next generation of positional tracking, allows better accuracy.");
         positionalTrackingModeProperty.enumValueIndex = (int)(sl.POSITIONAL_TRACKING_MODE)EditorGUILayout.EnumPopup(positionalTrackingModePropertyLabel, (sl.POSITIONAL_TRACKING_MODE)positionalTrackingModeProperty.enumValueIndex);
 
         EditorGUI.indentLevel--;

ZEDCamera/Assets/ZED/SDK/Helpers/Shaders/Lighting/ZED_Deferred.shader

@@ -125,7 +125,7 @@ Properties
 					#elif SHADER_API_GLCORE 
 									outDepth = 1000;//fake infinite depth
 					#elif SHADER_API_VULCAN
-									outDepth = 1000;
+									outDepth = 0;
 					#endif				
 				#else
 						outDepth = saturate(d);

ZEDCamera/Assets/ZED/SDK/NativeInterface/ZEDCamera.cs

@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System;
 using System.Runtime.InteropServices;
-using System.Reflection;
 
 namespace sl
 {

ZEDCamera/Assets/ZED/SDK/NativeInterface/ZEDCommon.cs

@@ -749,7 +749,7 @@ public struct SVOData
         public ulong timestamp;
         /// <summary>
         /// Content stored as SVOData
-        /// Allow any type of content, including raw data like compressed images of json.
+        /// Allow any type of content, including raw data like compressed images or JSON.
         /// </summary>
         IntPtr content;
         /// <summary>
@@ -1420,7 +1420,7 @@ public enum POSITIONAL_TRACKING_MODE
         /// </summary>
         GEN_1,
         /// <summary>
-        /// 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.
+        /// Next generation of positional tracking, allows for better accuracy.
         /// </summary>
         GEN_2
     }
@@ -1477,7 +1477,7 @@ public enum POSITIONAL_TRACKING_FUSION_STATUS
         GNSS = 3,
         VISUAL_INERTIAL_GNSS = 4,
         VISUAL_GNSS = 5,
-        INTERTIAL_GNSS = 6,
+        INERTIAL_GNSS = 6,
         UNAVAILABLE = 7
     }
 
@@ -2906,9 +2906,9 @@ public enum AI_MODELS
         /// <summary>
         /// related to sl.DETECTION_MODEL.NEURAL_PLUS
         /// </summary>
-        NEURAL_PLUS_DEPTH = 12,
+        NEURAL_PLUS_DEPTH = 13,
 
-        LAST =13
+        LAST =14
     };
 
     /// <summary>

ZEDCamera/ProjectSettings/ProjectSettings.asset

@@ -635,7 +635,7 @@ PlayerSettings:
   webGLPowerPreference: 2
   scriptingDefineSymbols:
     Android: USE_INPUT_SYSTEM_POSE_CONTROL;ZED_OCULUS
-    Standalone: USE_INPUT_SYSTEM_POSE_CONTROL;ZED_OCULUS;ZED_OPENCV_FOR_UNITY
+    Standalone: USE_INPUT_SYSTEM_POSE_CONTROL
     Windows Store Apps: USE_INPUT_SYSTEM_POSE_CONTROL
   additionalCompilerArguments: {}
   platformArchitecture: {}