diff options
author | Nat Brown <natb@valvesoftware.com> | 2019-01-31 02:41:38 +0300 |
---|---|---|
committer | Nat Brown <natb@valvesoftware.com> | 2019-01-31 02:41:38 +0300 |
commit | 823135df1783009cb468d0fc4190816254f7687d (patch) | |
tree | d0c64b95bacd960c26f05b4fe1a85cfe15cc6286 | |
parent | fc60d2da07de6cf906ca90ad0cf5f6a88ca85601 (diff) |
OpenVR SDK v1.2.10:v1.2.10
General:
* Added new, more specific error messages for many compositor startup failures.
* Fix for IVRCompositor.GetFrameTimings C# binding (https://github.com/ValveSoftware/openvr/issues/1001)
* Added VRNotifications and VRIOBuffer C# accessors.
Event and Overlay changes:
* Scroll events have been split into two types. The first, VREvent_ScrollDiscrete, is meant for applications that are tuned to accept primarily detented mousewheel events, which replaces the previous VREvent_Scroll event. The second, VREvent_ScrollSmooth, is for applications that are tuned for more touchscreen-like, analog scrolling.
* VROverlayFlags have been updated to allow overlays to indicate their preferred scroll event type. The VROverlayFlags_SendVRDiscreteScrollEvents flag renames the VROverlayFlags_SendVRScrollEvents flag, and the overlay will receive VREvent_ScrollDiscrete events when this flag is set. The VROverlayFlags_SendVRSmoothScrollEvents flag is added, and the overlay's owning application will receive VREvent_ScrollSmooth events when this flag is set.
* VREvent_Input_BindingsUpdated is sent when a user has updated controller bindings using the system input binding UI.
IVRIOBuffer:
* Adds ability for writers to detect if an IOBuffer has readers (IVRIOBuffer::HasReaders), to avoid potentially expensive writing work
[git-p4: depot-paths = "//vr/steamvr/sdk_release/": change = 4926575]
-rwxr-xr-x | bin/linux32/libopenvr_api.so | bin | 300620 -> 300620 bytes | |||
-rwxr-xr-x | bin/linux32/libopenvr_api.so.dbg | bin | 2136769 -> 2136769 bytes | |||
-rwxr-xr-x | bin/linux64/libopenvr_api.so | bin | 303264 -> 303264 bytes | |||
-rwxr-xr-x | bin/linux64/libopenvr_api.so.dbg | bin | 2677518 -> 2677518 bytes | |||
-rwxr-xr-x | bin/osx32/libopenvr_api.dylib | bin | 315368 -> 315368 bytes | |||
-rw-r--r-- | bin/osx32/libopenvr_api.dylib.dSYM/Contents/Resources/DWARF/libopenvr_api.dylib | bin | 2134894 -> 2134894 bytes | |||
-rw-r--r-- | bin/win32/openvr_api.dll | bin | 491808 -> 491808 bytes | |||
-rw-r--r-- | bin/win32/openvr_api.pdb | bin | 9916416 -> 9924608 bytes | |||
-rw-r--r-- | bin/win64/openvr_api.dll | bin | 598816 -> 598816 bytes | |||
-rw-r--r-- | bin/win64/openvr_api.pdb | bin | 9744384 -> 9744384 bytes | |||
-rw-r--r-- | headers/openvr.h | 22 | ||||
-rw-r--r-- | headers/openvr_api.cs | 33 | ||||
-rw-r--r-- | headers/openvr_api.json | 3 | ||||
-rw-r--r-- | headers/openvr_capi.h | 1 | ||||
-rwxr-xr-x | lib/linux32/libopenvr_api.so | bin | 2122334 -> 2122334 bytes | |||
-rwxr-xr-x | lib/linux64/libopenvr_api.so | bin | 2661935 -> 2661935 bytes | |||
-rw-r--r-- | samples/bin/osx32/libopenvr_api.dylib | bin | 315368 -> 315368 bytes | |||
-rw-r--r-- | samples/bin/win32/openvr_api.dll | bin | 491808 -> 491808 bytes | |||
-rw-r--r-- | samples/bin/win64/openvr_api.dll | bin | 598816 -> 598816 bytes |
19 files changed, 54 insertions, 5 deletions
diff --git a/bin/linux32/libopenvr_api.so b/bin/linux32/libopenvr_api.so Binary files differindex 0f92d86..6206801 100755 --- a/bin/linux32/libopenvr_api.so +++ b/bin/linux32/libopenvr_api.so diff --git a/bin/linux32/libopenvr_api.so.dbg b/bin/linux32/libopenvr_api.so.dbg Binary files differindex 9cac557..9d72aec 100755 --- a/bin/linux32/libopenvr_api.so.dbg +++ b/bin/linux32/libopenvr_api.so.dbg diff --git a/bin/linux64/libopenvr_api.so b/bin/linux64/libopenvr_api.so Binary files differindex 7ac901f..19001b3 100755 --- a/bin/linux64/libopenvr_api.so +++ b/bin/linux64/libopenvr_api.so diff --git a/bin/linux64/libopenvr_api.so.dbg b/bin/linux64/libopenvr_api.so.dbg Binary files differindex f265398..ee2fa4d 100755 --- a/bin/linux64/libopenvr_api.so.dbg +++ b/bin/linux64/libopenvr_api.so.dbg diff --git a/bin/osx32/libopenvr_api.dylib b/bin/osx32/libopenvr_api.dylib Binary files differindex 2f4195f..0c65153 100755 --- a/bin/osx32/libopenvr_api.dylib +++ b/bin/osx32/libopenvr_api.dylib diff --git a/bin/osx32/libopenvr_api.dylib.dSYM/Contents/Resources/DWARF/libopenvr_api.dylib b/bin/osx32/libopenvr_api.dylib.dSYM/Contents/Resources/DWARF/libopenvr_api.dylib Binary files differindex 33d0864..a27e410 100644 --- a/bin/osx32/libopenvr_api.dylib.dSYM/Contents/Resources/DWARF/libopenvr_api.dylib +++ b/bin/osx32/libopenvr_api.dylib.dSYM/Contents/Resources/DWARF/libopenvr_api.dylib diff --git a/bin/win32/openvr_api.dll b/bin/win32/openvr_api.dll Binary files differindex d854bc8..39cbaf3 100644 --- a/bin/win32/openvr_api.dll +++ b/bin/win32/openvr_api.dll diff --git a/bin/win32/openvr_api.pdb b/bin/win32/openvr_api.pdb Binary files differindex 0193083..f1f486d 100644 --- a/bin/win32/openvr_api.pdb +++ b/bin/win32/openvr_api.pdb diff --git a/bin/win64/openvr_api.dll b/bin/win64/openvr_api.dll Binary files differindex 6851259..ca35766 100644 --- a/bin/win64/openvr_api.dll +++ b/bin/win64/openvr_api.dll diff --git a/bin/win64/openvr_api.pdb b/bin/win64/openvr_api.pdb Binary files differindex e63f7de..3c67e20 100644 --- a/bin/win64/openvr_api.pdb +++ b/bin/win64/openvr_api.pdb diff --git a/headers/openvr.h b/headers/openvr.h index 1b1bb96..8d405aa 100644 --- a/headers/openvr.h +++ b/headers/openvr.h @@ -4820,6 +4820,16 @@ namespace vr return m_pVRInput; } + IVRIOBuffer *VRIOBuffer() + { + if ( !m_pVRIOBuffer ) + { + EVRInitError eError; + m_pVRIOBuffer = ( IVRIOBuffer * )VR_GetGenericInterface( IVRIOBuffer_Version, &eError ); + } + return m_pVRIOBuffer; + } + IVRSpatialAnchors *VRSpatialAnchors() { CheckClear(); @@ -4831,14 +4841,15 @@ namespace vr return m_pVRSpatialAnchors; } - IVRIOBuffer *VRIOBuffer() + IVRNotifications *VRNotifications() { - if ( !m_pVRIOBuffer ) + CheckClear(); + if ( !m_pVRNotifications ) { EVRInitError eError; - m_pVRIOBuffer = ( IVRIOBuffer * )VR_GetGenericInterface( IVRIOBuffer_Version, &eError ); + m_pVRNotifications = ( IVRNotifications * )VR_GetGenericInterface( IVRNotifications_Version, &eError ); } - return m_pVRIOBuffer; + return m_pVRNotifications; } private: @@ -4858,6 +4869,7 @@ namespace vr IVRInput *m_pVRInput; IVRIOBuffer *m_pVRIOBuffer; IVRSpatialAnchors *m_pVRSpatialAnchors; + IVRNotifications *m_pVRNotifications; }; inline COpenVRContext &OpenVRInternal_ModuleContext() @@ -4882,6 +4894,7 @@ namespace vr inline IVRInput *VR_CALLTYPE VRInput() { return OpenVRInternal_ModuleContext().VRInput(); } inline IVRIOBuffer *VR_CALLTYPE VRIOBuffer() { return OpenVRInternal_ModuleContext().VRIOBuffer(); } inline IVRSpatialAnchors *VR_CALLTYPE VRSpatialAnchors() { return OpenVRInternal_ModuleContext().VRSpatialAnchors(); } + inline IVRNotifications *VR_CALLTYPE VRNotifications() { return OpenVRInternal_ModuleContext().VRNotifications(); } inline void COpenVRContext::Clear() { @@ -4901,6 +4914,7 @@ namespace vr m_pVRInput = nullptr; m_pVRIOBuffer = nullptr; m_pVRSpatialAnchors = nullptr; + m_pVRNotifications = nullptr; } VR_INTERFACE uint32_t VR_CALLTYPE VR_InitInternal2( EVRInitError *peError, EVRApplicationType eApplicationType, const char *pStartupInfo ); diff --git a/headers/openvr_api.cs b/headers/openvr_api.cs index 840edfd..a3986f1 100644 --- a/headers/openvr_api.cs +++ b/headers/openvr_api.cs @@ -5740,6 +5740,7 @@ public enum EIOBufferMode public IntPtr m_pVRInput; // class vr::IVRInput * public IntPtr m_pVRIOBuffer; // class vr::IVRIOBuffer * public IntPtr m_pVRSpatialAnchors; // class vr::IVRSpatialAnchors * + public IntPtr m_pVRNotifications; // class vr::IVRNotifications * } public class OpenVR @@ -6058,7 +6059,9 @@ public class OpenVR m_pVRScreenshots = null; m_pVRTrackedCamera = null; m_pVRInput = null; + m_pIOBuffer = null; m_pVRSpatialAnchors = null; + m_pVRNotifications = null; } void CheckClear() @@ -6226,6 +6229,19 @@ public class OpenVR return m_pVRInput; } + public CVRIOBuffer VRIOBuffer() + { + CheckClear(); + if (m_pVRIOBuffer == null) + { + var eError = EVRInitError.None; + var pInterface = OpenVRInterop.GetGenericInterface(FnTable_Prefix + IVRIOBuffer_Version, ref eError); + if (pInterface != IntPtr.Zero && eError == EVRInitError.None) + m_pVRIOBuffer = new CVRIOBuffer(pInterface); + } + return m_pVRIOBuffer; + } + public CVRSpatialAnchors VRSpatialAnchors() { CheckClear(); @@ -6239,6 +6255,19 @@ public class OpenVR return m_pVRSpatialAnchors; } + public CVRNotifications VRNotifications() + { + CheckClear(); + if (m_pVRNotifications == null) + { + var eError = EVRInitError.None; + var pInterface = OpenVRInterop.GetGenericInterface(FnTable_Prefix + IVRNotifications_Version, ref eError); + if (pInterface != IntPtr.Zero && eError == EVRInitError.None) + m_pVRNotifications = new CVRNotifications(pInterface); + } + return m_pVRNotifications; + } + private CVRSystem m_pVRSystem; private CVRChaperone m_pVRChaperone; private CVRChaperoneSetup m_pVRChaperoneSetup; @@ -6251,7 +6280,9 @@ public class OpenVR private CVRScreenshots m_pVRScreenshots; private CVRTrackedCamera m_pVRTrackedCamera; private CVRInput m_pVRInput; + private CVRIOBuffer m_pVRIOBuffer; private CVRSpatialAnchors m_pVRSpatialAnchors; + private CVRNotifications m_pVRNotifications; }; private static COpenVRContext _OpenVRInternal_ModuleContext = null; @@ -6277,7 +6308,9 @@ public class OpenVR public static CVRScreenshots Screenshots { get { return OpenVRInternal_ModuleContext.VRScreenshots(); } } public static CVRTrackedCamera TrackedCamera { get { return OpenVRInternal_ModuleContext.VRTrackedCamera(); } } public static CVRInput Input { get { return OpenVRInternal_ModuleContext.VRInput(); } } + public static CVRIOBuffer IOBuffer { get { return OpenVRInternal_ModuleContext.VRIOBuffer(); } } public static CVRSpatialAnchors SpatialAnchors { get { return OpenVRInternal_ModuleContext.VRSpatialAnchors(); } } + public static CVRNotifications Notifications { get { return OpenVRInternal_ModuleContext.VRNotifications(); } } /** Finds the active installation of vrclient.dll and initializes it */ public static CVRSystem Init(ref EVRInitError peError, EVRApplicationType eApplicationType = EVRApplicationType.VRApplication_Scene, string pchStartupInfo= "") diff --git a/headers/openvr_api.json b/headers/openvr_api.json index 7bff855..6eddbd4 100644 --- a/headers/openvr_api.json +++ b/headers/openvr_api.json @@ -1999,7 +1999,8 @@ { "fieldname": "m_pVRDriverManager", "fieldtype": "class vr::IVRDriverManager *"}, { "fieldname": "m_pVRInput", "fieldtype": "class vr::IVRInput *"}, { "fieldname": "m_pVRIOBuffer", "fieldtype": "class vr::IVRIOBuffer *"}, -{ "fieldname": "m_pVRSpatialAnchors", "fieldtype": "class vr::IVRSpatialAnchors *"}]} +{ "fieldname": "m_pVRSpatialAnchors", "fieldtype": "class vr::IVRSpatialAnchors *"}, +{ "fieldname": "m_pVRNotifications", "fieldtype": "class vr::IVRNotifications *"}]} ], "methods":[{ "classname": "vr::IVRSystem", diff --git a/headers/openvr_capi.h b/headers/openvr_capi.h index 01597fd..8cf0cbf 100644 --- a/headers/openvr_capi.h +++ b/headers/openvr_capi.h @@ -2184,6 +2184,7 @@ typedef struct COpenVRContext intptr_t m_pVRInput; // class vr::IVRInput * intptr_t m_pVRIOBuffer; // class vr::IVRIOBuffer * intptr_t m_pVRSpatialAnchors; // class vr::IVRSpatialAnchors * + intptr_t m_pVRNotifications; // class vr::IVRNotifications * } COpenVRContext; diff --git a/lib/linux32/libopenvr_api.so b/lib/linux32/libopenvr_api.so Binary files differindex a3cfe99..f195165 100755 --- a/lib/linux32/libopenvr_api.so +++ b/lib/linux32/libopenvr_api.so diff --git a/lib/linux64/libopenvr_api.so b/lib/linux64/libopenvr_api.so Binary files differindex c26673a..f0de3c9 100755 --- a/lib/linux64/libopenvr_api.so +++ b/lib/linux64/libopenvr_api.so diff --git a/samples/bin/osx32/libopenvr_api.dylib b/samples/bin/osx32/libopenvr_api.dylib Binary files differindex 2f4195f..0c65153 100644 --- a/samples/bin/osx32/libopenvr_api.dylib +++ b/samples/bin/osx32/libopenvr_api.dylib diff --git a/samples/bin/win32/openvr_api.dll b/samples/bin/win32/openvr_api.dll Binary files differindex d854bc8..39cbaf3 100644 --- a/samples/bin/win32/openvr_api.dll +++ b/samples/bin/win32/openvr_api.dll diff --git a/samples/bin/win64/openvr_api.dll b/samples/bin/win64/openvr_api.dll Binary files differindex 6851259..ca35766 100644 --- a/samples/bin/win64/openvr_api.dll +++ b/samples/bin/win64/openvr_api.dll |