2.6.0b3 (sdk 1.13.10) - Upgrading to sdk 1.13.10

Author: keithbradner

Assets/SteamVR/OpenVRAutoUpdater/Editor/OpenVRAutoUpdater.cs

@@ -60,9 +60,9 @@ private static double runningSeconds
 
         static OpenVRAutoUpdater()
         {
-            #if UNITY_2020_1_OR_NEWER || VALVE_UPDATE_FORCE
+#if UNITY_2020_1_OR_NEWER || VALVE_UPDATE_FORCE
             Start();
-            #endif
+#endif
         }
 
         public static void Start()

Assets/SteamVR/Plugins/openvr_api.cs

@@ -8,6 +8,7 @@
 
 using System;
 using System.Runtime.InteropServices;
+using Valve.VR;
 
 #if UNITY_5_3_OR_NEWER
 using UnityEngine;
@@ -79,11 +80,6 @@ public struct IVRSystem
 	[MarshalAs(UnmanagedType.FunctionPtr)]
 	internal _GetDeviceToAbsoluteTrackingPose GetDeviceToAbsoluteTrackingPose;
 
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _ResetSeatedZeroPose();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _ResetSeatedZeroPose ResetSeatedZeroPose;
-
 	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
 	internal delegate HmdMatrix34_t _GetSeatedZeroPoseToStandingAbsoluteTrackingPose();
 	[MarshalAs(UnmanagedType.FunctionPtr)]
@@ -549,6 +545,11 @@ public struct IVRChaperone
 	[MarshalAs(UnmanagedType.FunctionPtr)]
 	internal _ForceBoundsVisible ForceBoundsVisible;
 
+	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
+	internal delegate void _ResetZeroPose(ETrackingUniverseOrigin eTrackingUniverseOrigin);
+	[MarshalAs(UnmanagedType.FunctionPtr)]
+	internal _ResetZeroPose ResetZeroPose;
+
 }
 
 [StructLayout(LayoutKind.Sequential)]
@@ -1996,8 +1997,10 @@ public class Utils
 {
 	public static IntPtr ToUtf8(string managedString)
 	{
-		if (string.IsNullOrEmpty(managedString))
+		if (managedString == null)
+		{
 			return IntPtr.Zero;
+		}
 
 		int size = System.Text.Encoding.UTF8.GetByteCount(managedString) + 1;
 		if (buffer.Length < size) buffer = new byte[size];
@@ -2082,10 +2085,6 @@ public void GetDeviceToAbsoluteTrackingPose(ETrackingUniverseOrigin eOrigin,floa
 	{
 		FnTable.GetDeviceToAbsoluteTrackingPose(eOrigin,fPredictedSecondsToPhotonsFromNow,pTrackedDevicePoseArray,(uint) pTrackedDevicePoseArray.Length);
 	}
-	public void ResetSeatedZeroPose()
-	{
-		FnTable.ResetSeatedZeroPose();
-	}
 	public HmdMatrix34_t GetSeatedZeroPoseToStandingAbsoluteTrackingPose()
 	{
 		HmdMatrix34_t result = FnTable.GetSeatedZeroPoseToStandingAbsoluteTrackingPose();
@@ -2710,6 +2709,10 @@ public void ForceBoundsVisible(bool bForce)
 	{
 		FnTable.ForceBoundsVisible(bForce);
 	}
+	public void ResetZeroPose(ETrackingUniverseOrigin eTrackingUniverseOrigin)
+	{
+		FnTable.ResetZeroPose(eTrackingUniverseOrigin);
+	}
 }
 
 
@@ -4692,6 +4695,7 @@ public enum ETrackedDeviceProperty
 	Prop_DriverProvidedChaperoneVisibility_Bool = 2076,
 	Prop_HmdColumnCorrectionSettingPrefix_String = 2077,
 	Prop_CameraSupportsCompatibilityModes_Bool = 2078,
+	Prop_SupportsRoomViewDepthProjection_Bool = 2079,
 	Prop_DisplayAvailableFrameRates_Float_Array = 2080,
 	Prop_DisplaySupportsMultipleFramerates_Bool = 2081,
 	Prop_DisplayColorMultLeft_Vector3 = 2082,
@@ -4898,6 +4902,7 @@ public enum EVREventType
 	VREvent_ChaperoneFlushCache = 805,
 	VREvent_ChaperoneRoomSetupStarting = 806,
 	VREvent_ChaperoneRoomSetupFinished = 807,
+	VREvent_StandingZeroPoseReset = 808,
 	VREvent_AudioSettingsHaveChanged = 820,
 	VREvent_BackgroundSettingHasChanged = 850,
 	VREvent_CameraSettingsHaveChanged = 851,
@@ -5145,7 +5150,8 @@ public enum EVRApplicationType
 	VRApplication_SteamWatchdog = 6,
 	VRApplication_Bootstrapper = 7,
 	VRApplication_WebHelper = 8,
-	VRApplication_Max = 9,
+	VRApplication_OpenXR = 9,
+	VRApplication_Max = 10,
 }
 public enum EVRFirmwareError
 {
@@ -5975,6 +5981,9 @@ private static void _copysign(ref float sizeval, float signval)
 }
 [StructLayout(LayoutKind.Sequential)] public struct VRTextureWithPose_t
 {
+	public IntPtr handle; // void *
+	public ETextureType eType;
+	public EColorSpace eColorSpace;
 	public HmdMatrix34_t mDeviceToAbsoluteTracking;
 }
 [StructLayout(LayoutKind.Sequential)] public struct VRTextureDepthInfo_t
@@ -5985,10 +5994,17 @@ private static void _copysign(ref float sizeval, float signval)
 }
 [StructLayout(LayoutKind.Sequential)] public struct VRTextureWithDepth_t
 {
+	public IntPtr handle; // void *
+	public ETextureType eType;
+	public EColorSpace eColorSpace;
 	public VRTextureDepthInfo_t depth;
 }
 [StructLayout(LayoutKind.Sequential)] public struct VRTextureWithPoseAndDepth_t
 {
+	public IntPtr handle; // void *
+	public ETextureType eType;
+	public EColorSpace eColorSpace;
+	public HmdMatrix34_t mDeviceToAbsoluteTracking;
 	public VRTextureDepthInfo_t depth;
 }
 [StructLayout(LayoutKind.Sequential)] public struct VRVulkanTextureData_t
@@ -7491,14 +7507,14 @@ public static uint GetInitToken()
 	public const ulong k_ulOverlayHandleInvalid = 0;
 	public const uint k_unMaxDistortionFunctionParameters = 8;
 	public const uint k_unScreenshotHandleInvalid = 0;
-	public const string IVRSystem_Version = "IVRSystem_021";
+	public const string IVRSystem_Version = "IVRSystem_022";
 	public const string IVRExtendedDisplay_Version = "IVRExtendedDisplay_001";
 	public const string IVRTrackedCamera_Version = "IVRTrackedCamera_006";
 	public const uint k_unMaxApplicationKeyLength = 128;
 	public const string k_pch_MimeType_HomeApp = "vr/home";
 	public const string k_pch_MimeType_GameTheater = "vr/game_theater";
 	public const string IVRApplications_Version = "IVRApplications_007";
-	public const string IVRChaperone_Version = "IVRChaperone_003";
+	public const string IVRChaperone_Version = "IVRChaperone_004";
 	public const string IVRChaperoneSetup_Version = "IVRChaperoneSetup_006";
 	public const string IVRCompositor_Version = "IVRCompositor_026";
 	public const uint k_unVROverlayMaxKeyLength = 128;
@@ -7657,15 +7673,15 @@ public static uint GetInitToken()
 	public const string k_pch_CollisionBounds_EnableDriverImport = "enableDriverBoundsImport";
 	public const string k_pch_Camera_Section = "camera";
 	public const string k_pch_Camera_EnableCamera_Bool = "enableCamera";
-	public const string k_pch_Camera_EnableCameraInDashboard_Bool = "enableCameraInDashboard";
+	public const string k_pch_Camera_ShowOnController_Bool = "showOnController";
 	public const string k_pch_Camera_EnableCameraForCollisionBounds_Bool = "enableCameraForCollisionBounds";
-	public const string k_pch_Camera_EnableCameraForRoomView_Bool = "enableCameraForRoomView";
+	public const string k_pch_Camera_RoomView_Int32 = "roomView";
 	public const string k_pch_Camera_BoundsColorGammaR_Int32 = "cameraBoundsColorGammaR";
 	public const string k_pch_Camera_BoundsColorGammaG_Int32 = "cameraBoundsColorGammaG";
 	public const string k_pch_Camera_BoundsColorGammaB_Int32 = "cameraBoundsColorGammaB";
 	public const string k_pch_Camera_BoundsColorGammaA_Int32 = "cameraBoundsColorGammaA";
 	public const string k_pch_Camera_BoundsStrength_Int32 = "cameraBoundsStrength";
-	public const string k_pch_Camera_RoomViewMode_Int32 = "cameraRoomViewMode";
+	public const string k_pch_Camera_RoomViewStyle_Int32 = "roomViewStyle";
 	public const string k_pch_audio_Section = "audio";
 	public const string k_pch_audio_SetOsDefaultPlaybackDevice_Bool = "setOsDefaultPlaybackDevice";
 	public const string k_pch_audio_EnablePlaybackDeviceOverride_Bool = "enablePlaybackDeviceOverride";
@@ -8147,5 +8163,5 @@ public static void Shutdown()
 
 
 }
+#endif
 
-#endif

Assets/SteamVR/Scripts/SteamVR_ExternalCamera.cs

@@ -119,6 +119,11 @@ public void ReadConfig()
             }
         }
 
+        System.IO.FileSystemWatcher watcher;
+#else
+	}
+#endif
+
         public void SetupPose(SteamVR_Action_Pose newCameraPose, SteamVR_Input_Sources newCameraSource)
         {
             cameraPose = newCameraPose;
@@ -142,10 +147,6 @@ void OnChanged(object source, System.IO.FileSystemEventArgs e)
             ReadConfig();
         }
 
-        System.IO.FileSystemWatcher watcher;
-#else
-	}
-#endif
         Camera cam;
         Transform target;
         GameObject clipQuad;

Assets/SteamVR/Scripts/SteamVR_Menu.cs

@@ -170,9 +170,9 @@ void OnGUI()
 
                     if (GUILayout.Button("Center View"))
                     {
-                        var system = OpenVR.System;
-                        if (system != null)
-                            system.ResetSeatedZeroPose();
+                        var chaperone = OpenVR.Chaperone;
+                        if (chaperone != null)
+                            chaperone.ResetZeroPose(SteamVR.settings.trackingSpace);
                     }
                 }
                 else

Assets/SteamVR/readme.txt

@@ -1,4 +1,4 @@
-# SteamVR Unity Plugin - v2.6.0b2 (sdk 1.12.5)
+# SteamVR Unity Plugin - v2.6.0b3 (sdk 1.13.10)
 
 Copyright (c) Valve Corporation, All rights reserved.
 
@@ -35,8 +35,14 @@ Input and Steam:
 
  If you publish your game to steam you can let users change their input bindings while the game is not running by setting the location of your action manifest. On the steamworks partner site go to the Application settings, and the Virtual Reality Section. At the bottom you'll see a radio button to designate your title as a SteamVR Input application. You then can set the location of your action manifest. In older versions of the plugin this was next to the executable. In versions 2.3.3 and above this is in [GameName]_Data/StreamingAssets/SteamVR/actions.json.
 
+ 
+Changes for 2.6.0b3
+ * Updated sdk header to 1.13.10
+
+ * Moved System.ResetSeatedPosition to Chaperone.ResetZeroPosition(trackingUniverse)
 
 Changes for 2.6.0b2
+
  * Updated sdk header to 1.12.5
 
  * Added basic Universal Rendering Pipeline support