Skip to content

Commit dc47fde

Browse files
committed
Version 2.3.2 (sdk 1.4.18) - updating readme and openvr_api.cs
1 parent bf3ee57 commit dc47fde

File tree

2 files changed

+15
-104
lines changed

2 files changed

+15
-104
lines changed

Assets/SteamVR/Plugins/openvr_api.cs

Lines changed: 12 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
// This file is auto-generated, do not edit it.
55
//
66
//=============================================================================
7+
//sdk version 1.4.18
78

89
using System;
910
using System.Runtime.InteropServices;
@@ -230,6 +231,11 @@ public struct IVRSystem
230231
[MarshalAs(UnmanagedType.FunctionPtr)]
231232
internal _ShouldApplicationReduceRenderingWork ShouldApplicationReduceRenderingWork;
232233

234+
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
235+
internal delegate uint _DriverDebugRequest(uint unDeviceIndex, string pchRequest, System.Text.StringBuilder pchResponseBuffer, uint unResponseBufferSize);
236+
[MarshalAs(UnmanagedType.FunctionPtr)]
237+
internal _DriverDebugRequest DriverDebugRequest;
238+
233239
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
234240
internal delegate EVRFirmwareError _PerformFirmwareUpdate(uint unDeviceIndex);
235241
[MarshalAs(UnmanagedType.FunctionPtr)]
@@ -1545,11 +1551,6 @@ public struct IVRDriverManager
15451551
[MarshalAs(UnmanagedType.FunctionPtr)]
15461552
internal _GetDriverHandle GetDriverHandle;
15471553

1548-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
1549-
internal delegate bool _IsEnabled(uint nDriver);
1550-
[MarshalAs(UnmanagedType.FunctionPtr)]
1551-
internal _IsEnabled IsEnabled;
1552-
15531554
}
15541555

15551556
[StructLayout(LayoutKind.Sequential)]
@@ -1747,31 +1748,6 @@ public struct IVRSpatialAnchors
17471748

17481749
}
17491750

1750-
[StructLayout(LayoutKind.Sequential)]
1751-
public struct IVRDebug
1752-
{
1753-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
1754-
internal delegate EVRDebugError _EmitVrProfilerEvent(string pchMessage);
1755-
[MarshalAs(UnmanagedType.FunctionPtr)]
1756-
internal _EmitVrProfilerEvent EmitVrProfilerEvent;
1757-
1758-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
1759-
internal delegate EVRDebugError _BeginVrProfilerEvent(ref ulong pHandleOut);
1760-
[MarshalAs(UnmanagedType.FunctionPtr)]
1761-
internal _BeginVrProfilerEvent BeginVrProfilerEvent;
1762-
1763-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
1764-
internal delegate EVRDebugError _FinishVrProfilerEvent(ulong hHandle, string pchMessage);
1765-
[MarshalAs(UnmanagedType.FunctionPtr)]
1766-
internal _FinishVrProfilerEvent FinishVrProfilerEvent;
1767-
1768-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
1769-
internal delegate uint _DriverDebugRequest(uint unDeviceIndex, string pchRequest, System.Text.StringBuilder pchResponseBuffer, uint unResponseBufferSize);
1770-
[MarshalAs(UnmanagedType.FunctionPtr)]
1771-
internal _DriverDebugRequest DriverDebugRequest;
1772-
1773-
}
1774-
17751751

17761752
public class CVRSystem
17771753
{
@@ -2075,6 +2051,11 @@ public bool ShouldApplicationReduceRenderingWork()
20752051
bool result = FnTable.ShouldApplicationReduceRenderingWork();
20762052
return result;
20772053
}
2054+
public uint DriverDebugRequest(uint unDeviceIndex,string pchRequest,System.Text.StringBuilder pchResponseBuffer,uint unResponseBufferSize)
2055+
{
2056+
uint result = FnTable.DriverDebugRequest(unDeviceIndex,pchRequest,pchResponseBuffer,unResponseBufferSize);
2057+
return result;
2058+
}
20782059
public EVRFirmwareError PerformFirmwareUpdate(uint unDeviceIndex)
20792060
{
20802061
EVRFirmwareError result = FnTable.PerformFirmwareUpdate(unDeviceIndex);
@@ -3513,11 +3494,6 @@ public ulong GetDriverHandle(string pchDriverName)
35133494
ulong result = FnTable.GetDriverHandle(pchDriverName);
35143495
return result;
35153496
}
3516-
public bool IsEnabled(uint nDriver)
3517-
{
3518-
bool result = FnTable.IsEnabled(nDriver);
3519-
return result;
3520-
}
35213497
}
35223498

35233499

@@ -3741,37 +3717,6 @@ public EVRSpatialAnchorError GetSpatialAnchorDescriptor(uint unHandle,System.Tex
37413717
}
37423718

37433719

3744-
public class CVRDebug
3745-
{
3746-
IVRDebug FnTable;
3747-
internal CVRDebug(IntPtr pInterface)
3748-
{
3749-
FnTable = (IVRDebug)Marshal.PtrToStructure(pInterface, typeof(IVRDebug));
3750-
}
3751-
public EVRDebugError EmitVrProfilerEvent(string pchMessage)
3752-
{
3753-
EVRDebugError result = FnTable.EmitVrProfilerEvent(pchMessage);
3754-
return result;
3755-
}
3756-
public EVRDebugError BeginVrProfilerEvent(ref ulong pHandleOut)
3757-
{
3758-
pHandleOut = 0;
3759-
EVRDebugError result = FnTable.BeginVrProfilerEvent(ref pHandleOut);
3760-
return result;
3761-
}
3762-
public EVRDebugError FinishVrProfilerEvent(ulong hHandle,string pchMessage)
3763-
{
3764-
EVRDebugError result = FnTable.FinishVrProfilerEvent(hHandle,pchMessage);
3765-
return result;
3766-
}
3767-
public uint DriverDebugRequest(uint unDeviceIndex,string pchRequest,System.Text.StringBuilder pchResponseBuffer,uint unResponseBufferSize)
3768-
{
3769-
uint result = FnTable.DriverDebugRequest(unDeviceIndex,pchRequest,pchResponseBuffer,unResponseBufferSize);
3770-
return result;
3771-
}
3772-
}
3773-
3774-
37753720
public class OpenVRInterop
37763721
{
37773722
[DllImportAttribute("openvr_api", EntryPoint = "VR_InitInternal", CallingConvention = CallingConvention.Cdecl)]
@@ -3982,7 +3927,6 @@ public enum ETrackedDeviceProperty
39823927
Prop_CameraDistortionFunction_Int32_Array = 2072,
39833928
Prop_CameraDistortionCoefficients_Float_Array = 2073,
39843929
Prop_ExpectedControllerType_String = 2074,
3985-
Prop_HmdTrackingStyle_Int32 = 2075,
39863930
Prop_DisplayAvailableFrameRates_Float_Array = 2080,
39873931
Prop_DisplaySupportsMultipleFramerates_Bool = 2081,
39883932
Prop_DashboardLayoutPathName_String = 2090,
@@ -4055,13 +3999,6 @@ public enum ETrackedPropertyError
40553999
TrackedProp_CannotWriteToWildcards = 12,
40564000
TrackedProp_IPCReadFailure = 13,
40574001
}
4058-
public enum EHmdTrackingStyle
4059-
{
4060-
Unknown = 0,
4061-
Lighthouse = 1,
4062-
OutsideInCameras = 2,
4063-
InsideOutCameras = 3,
4064-
}
40654002
public enum EVRSubmitFlags
40664003
{
40674004
Submit_Default = 0,
@@ -4302,7 +4239,6 @@ public enum EShowUIType
43024239
ShowUI_ManageTrackers = 1,
43034240
ShowUI_Pairing = 3,
43044241
ShowUI_Settings = 4,
4305-
ShowUI_DebugCommands = 5,
43064242
}
43074243
public enum EHDCPError
43084244
{
@@ -4601,8 +4537,6 @@ public enum EVRInitError
46014537
Compositor_CreateTextIndexBuffer = 482,
46024538
Compositor_CreateMirrorTextures = 483,
46034539
Compositor_CreateLastFrameRenderTexture = 484,
4604-
Compositor_CreateMirrorOverlay = 485,
4605-
Compositor_FailedToCreateVirtualDisplayBackbuffer = 486,
46064540
VendorSpecific_UnableToConnectToOculusRuntime = 1000,
46074541
VendorSpecific_WindowsNotInDevMode = 1001,
46084542
VendorSpecific_HmdFound_CantOpenDevice = 1101,
@@ -4976,11 +4910,6 @@ public enum EIOBufferMode
49764910
Write = 2,
49774911
Create = 512,
49784912
}
4979-
public enum EVRDebugError
4980-
{
4981-
Success = 0,
4982-
BadParameter = 1,
4983-
}
49844913

49854914
[StructLayout(LayoutKind.Explicit)] public struct VREvent_Data_t
49864915
{
@@ -5905,7 +5834,6 @@ public string rchRenderModelComponentName
59055834
public IntPtr m_pVRInput; // class vr::IVRInput *
59065835
public IntPtr m_pVRIOBuffer; // class vr::IVRIOBuffer *
59075836
public IntPtr m_pVRSpatialAnchors; // class vr::IVRSpatialAnchors *
5908-
public IntPtr m_pVRDebug; // class vr::IVRDebug *
59095837
public IntPtr m_pVRNotifications; // class vr::IVRNotifications *
59105838
}
59115839

@@ -6002,7 +5930,7 @@ public static uint GetInitToken()
60025930
public const ulong k_ulOverlayHandleInvalid = 0;
60035931
public const uint k_unMaxDistortionFunctionParameters = 8;
60045932
public const uint k_unScreenshotHandleInvalid = 0;
6005-
public const string IVRSystem_Version = "IVRSystem_020";
5933+
public const string IVRSystem_Version = "IVRSystem_019";
60065934
public const string IVRExtendedDisplay_Version = "IVRExtendedDisplay_001";
60075935
public const string IVRTrackedCamera_Version = "IVRTrackedCamera_005";
60085936
public const uint k_unMaxApplicationKeyLength = 128;
@@ -6178,7 +6106,6 @@ public static uint GetInitToken()
61786106
public const string k_pch_Dashboard_UseWebPowerMenu = "useWebPowerMenu";
61796107
public const string k_pch_modelskin_Section = "modelskins";
61806108
public const string k_pch_Driver_Enable_Bool = "enable";
6181-
public const string k_pch_Driver_LoadPriority_Int32 = "loadPriority";
61826109
public const string k_pch_WebInterface_Section = "WebInterface";
61836110
public const string k_pch_WebInterface_WebEnable_Bool = "WebEnable";
61846111
public const string k_pch_WebInterface_WebPort_String = "WebPort";
@@ -6207,7 +6134,6 @@ public static uint GetInitToken()
62076134
public const string IVRIOBuffer_Version = "IVRIOBuffer_002";
62086135
public const uint k_ulInvalidSpatialAnchorHandle = 0;
62096136
public const string IVRSpatialAnchors_Version = "IVRSpatialAnchors_001";
6210-
public const string IVRDebug_Version = "IVRDebug_001";
62116137

62126138
static uint VRToken { get; set; }
62136139

@@ -6234,7 +6160,6 @@ public void Clear()
62346160
m_pVRIOBuffer = null;
62356161
m_pVRSpatialAnchors = null;
62366162
m_pVRNotifications = null;
6237-
m_pVRDebug = null;
62386163
}
62396164

62406165
void CheckClear()
@@ -6428,19 +6353,6 @@ public CVRSpatialAnchors VRSpatialAnchors()
64286353
return m_pVRSpatialAnchors;
64296354
}
64306355

6431-
public CVRDebug VRDebug()
6432-
{
6433-
CheckClear();
6434-
if (m_pVRDebug == null)
6435-
{
6436-
var eError = EVRInitError.None;
6437-
var pInterface = OpenVRInterop.GetGenericInterface(FnTable_Prefix + IVRDebug_Version, ref eError);
6438-
if (pInterface != IntPtr.Zero && eError == EVRInitError.None)
6439-
m_pVRDebug = new CVRDebug(pInterface);
6440-
}
6441-
return m_pVRDebug;
6442-
}
6443-
64446356
public CVRNotifications VRNotifications()
64456357
{
64466358
CheckClear();
@@ -6469,7 +6381,6 @@ public CVRNotifications VRNotifications()
64696381
private CVRIOBuffer m_pVRIOBuffer;
64706382
private CVRSpatialAnchors m_pVRSpatialAnchors;
64716383
private CVRNotifications m_pVRNotifications;
6472-
private CVRDebug m_pVRDebug;
64736384
};
64746385

64756386
private static COpenVRContext _OpenVRInternal_ModuleContext = null;
@@ -6498,8 +6409,6 @@ static COpenVRContext OpenVRInternal_ModuleContext
64986409
public static CVRIOBuffer IOBuffer { get { return OpenVRInternal_ModuleContext.VRIOBuffer(); } }
64996410
public static CVRSpatialAnchors SpatialAnchors { get { return OpenVRInternal_ModuleContext.VRSpatialAnchors(); } }
65006411
public static CVRNotifications Notifications { get { return OpenVRInternal_ModuleContext.VRNotifications(); } }
6501-
public static CVRDebug Debug { get { return OpenVRInternal_ModuleContext.VRDebug(); } }
6502-
65036412

65046413
/** Finds the active installation of vrclient.dll and initializes it */
65056414
public static CVRSystem Init(ref EVRInitError peError, EVRApplicationType eApplicationType = EVRApplicationType.VRApplication_Scene, string pchStartupInfo= "")

Assets/SteamVR/readme.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SteamVR Unity Plugin - v2.3.2
1+
# SteamVR Unity Plugin - v2.3.2 (sdk 1.4.18)
22

33
Copyright (c) Valve Corporation, All rights reserved.
44

@@ -33,6 +33,8 @@ Support:
3333

3434

3535
Changes for 2.3.2
36+
37+
* Updated openvr sdk version to 1.4.18
3638

3739
* Added SteamVR.asmdef.20192 for Unity 2019.2b and 2019.3a - replace SteamVR.asmdef to fix UI errors in these versions.
3840

0 commit comments

Comments
 (0)