Update OpenVR from 1.1.3b to 1.2.10
The openvr/bin/linux64 directory also contained a file called empty.dir. This has been removed because it was an empty file. VREvent_Scroll has been renamed to VREvent_ScrollSmooth, and not VREvent_ScrollDescrete because the second one will keep scrolling after having let go of the scroll (tested on Vive controller). This feels weird when done on a Vive controller and so the first option was chosen. The first option also feels more like the old system. Even though the version jump is weird this is the next release.
This commit is contained in:
Vasily
Vendored
+168
-40
@@ -15,8 +15,8 @@
|
||||
namespace vr
|
||||
{
|
||||
static const uint32_t k_nSteamVRVersionMajor = 1;
|
||||
static const uint32_t k_nSteamVRVersionMinor = 1;
|
||||
static const uint32_t k_nSteamVRVersionBuild = 3;
|
||||
static const uint32_t k_nSteamVRVersionMinor = 2;
|
||||
static const uint32_t k_nSteamVRVersionBuild = 10;
|
||||
} // namespace vr
|
||||
|
||||
// vrtypes.h
|
||||
@@ -249,6 +249,14 @@ enum ETrackingUniverseOrigin
|
||||
TrackingUniverseRawAndUncalibrated = 2, // Poses are provided in the coordinate system defined by the driver. It has Y up and is unified for devices of the same driver. You usually don't want this one.
|
||||
};
|
||||
|
||||
enum EAdditionalRadioFeatures
|
||||
{
|
||||
AdditionalRadioFeatures_None = 0x00000000,
|
||||
AdditionalRadioFeatures_HTCLinkBox = 0x00000001,
|
||||
AdditionalRadioFeatures_InternalDongle = 0x00000002,
|
||||
AdditionalRadioFeatures_ExternalDongle = 0x00000004,
|
||||
};
|
||||
|
||||
typedef uint64_t WebConsoleHandle_t;
|
||||
#define INVALID_WEB_CONSOLE_HANDLE ((vr::WebConsoleHandle_t)0)
|
||||
|
||||
@@ -286,6 +294,7 @@ static const PropertyTypeTag_t k_unSkeletonPropertyTag = 36;
|
||||
|
||||
static const PropertyTypeTag_t k_unSpatialAnchorPosePropertyTag = 40;
|
||||
static const PropertyTypeTag_t k_unJsonPropertyTag = 41;
|
||||
static const PropertyTypeTag_t k_unActiveActionSetPropertyTag = 42;
|
||||
|
||||
static const PropertyTypeTag_t k_unOpenVRInternalReserved_Start = 1000;
|
||||
static const PropertyTypeTag_t k_unOpenVRInternalReserved_End = 10000;
|
||||
@@ -342,6 +351,7 @@ enum ETrackedDeviceProperty
|
||||
Prop_CameraStreamFormat_Int32 = 1041, // ECameraVideoStreamFormat value
|
||||
Prop_AdditionalDeviceSettingsPath_String = 1042, // driver-relative path to additional device and global configuration settings
|
||||
Prop_Identifiable_Bool = 1043, // Whether device supports being identified from vrmonitor (e.g. blink LED, vibrate haptics, etc)
|
||||
Prop_BootloaderVersion_Uint64 = 1044,
|
||||
|
||||
// Properties that are unique to TrackedDeviceClass_HMD
|
||||
Prop_ReportsTimeSinceVSync_Bool = 2000,
|
||||
@@ -412,6 +422,11 @@ enum ETrackedDeviceProperty
|
||||
Prop_ImuFactoryAccelerometerScale_Vector3 = 2067,
|
||||
// reserved 2068
|
||||
Prop_ConfigurationIncludesLighthouse20Features_Bool = 2069,
|
||||
Prop_AdditionalRadioFeatures_Uint64 = 2070,
|
||||
Prop_CameraWhiteBalance_Vector4_Array = 2071, // Prop_NumCameras_Int32-sized array of float[4] RGBG white balance calibration data (max size is vr::k_unMaxCameras)
|
||||
Prop_CameraDistortionFunction_Int32_Array = 2072, // Prop_NumCameras_Int32-sized array of vr::EVRDistortionFunctionType values (max size is vr::k_unMaxCameras)
|
||||
Prop_CameraDistortionCoefficients_Float_Array = 2073, // Prop_NumCameras_Int32-sized array of double[vr::k_unMaxDistortionFunctionParameters] (max size is vr::k_unMaxCameras)
|
||||
Prop_ExpectedControllerType_String = 2074,
|
||||
|
||||
// Driver requested mura correction properties
|
||||
Prop_DriverRequestedMuraCorrectionMode_Int32 = 2200,
|
||||
@@ -646,10 +661,11 @@ enum EVREventType
|
||||
VREvent_MouseButtonUp = 302, // data is mouse
|
||||
VREvent_FocusEnter = 303, // data is overlay
|
||||
VREvent_FocusLeave = 304, // data is overlay
|
||||
VREvent_Scroll = 305, // data is mouse
|
||||
VREvent_ScrollDiscrete = 305, // data is scroll
|
||||
VREvent_TouchPadMove = 306, // data is mouse
|
||||
VREvent_OverlayFocusChanged = 307, // data is overlay, global event
|
||||
VREvent_ReloadOverlays = 308,
|
||||
VREvent_ScrollSmooth = 309, // data is scroll
|
||||
|
||||
VREvent_InputFocusCaptured = 400, // data is process DEPRECATED
|
||||
VREvent_InputFocusReleased = 401, // data is process DEPRECATED
|
||||
@@ -721,24 +737,25 @@ enum EVREventType
|
||||
|
||||
VREvent_AudioSettingsHaveChanged = 820,
|
||||
|
||||
VREvent_BackgroundSettingHasChanged = 850,
|
||||
VREvent_CameraSettingsHaveChanged = 851,
|
||||
VREvent_ReprojectionSettingHasChanged = 852,
|
||||
VREvent_ModelSkinSettingsHaveChanged = 853,
|
||||
VREvent_EnvironmentSettingsHaveChanged = 854,
|
||||
VREvent_PowerSettingsHaveChanged = 855,
|
||||
VREvent_EnableHomeAppSettingsHaveChanged = 856,
|
||||
VREvent_SteamVRSectionSettingChanged = 857,
|
||||
VREvent_LighthouseSectionSettingChanged = 858,
|
||||
VREvent_NullSectionSettingChanged = 859,
|
||||
VREvent_UserInterfaceSectionSettingChanged = 860,
|
||||
VREvent_NotificationsSectionSettingChanged = 861,
|
||||
VREvent_KeyboardSectionSettingChanged = 862,
|
||||
VREvent_PerfSectionSettingChanged = 863,
|
||||
VREvent_DashboardSectionSettingChanged = 864,
|
||||
VREvent_WebInterfaceSectionSettingChanged = 865,
|
||||
VREvent_TrackersSectionSettingChanged = 866,
|
||||
VREvent_LastKnownSectionSettingChanged = 867,
|
||||
VREvent_BackgroundSettingHasChanged = 850,
|
||||
VREvent_CameraSettingsHaveChanged = 851,
|
||||
VREvent_ReprojectionSettingHasChanged = 852,
|
||||
VREvent_ModelSkinSettingsHaveChanged = 853,
|
||||
VREvent_EnvironmentSettingsHaveChanged = 854,
|
||||
VREvent_PowerSettingsHaveChanged = 855,
|
||||
VREvent_EnableHomeAppSettingsHaveChanged = 856,
|
||||
VREvent_SteamVRSectionSettingChanged = 857,
|
||||
VREvent_LighthouseSectionSettingChanged = 858,
|
||||
VREvent_NullSectionSettingChanged = 859,
|
||||
VREvent_UserInterfaceSectionSettingChanged = 860,
|
||||
VREvent_NotificationsSectionSettingChanged = 861,
|
||||
VREvent_KeyboardSectionSettingChanged = 862,
|
||||
VREvent_PerfSectionSettingChanged = 863,
|
||||
VREvent_DashboardSectionSettingChanged = 864,
|
||||
VREvent_WebInterfaceSectionSettingChanged = 865,
|
||||
VREvent_TrackersSectionSettingChanged = 866,
|
||||
VREvent_LastKnownSectionSettingChanged = 867,
|
||||
VREvent_DismissedWarningsSectionSettingChanged = 868,
|
||||
|
||||
VREvent_StatusUpdate = 900,
|
||||
|
||||
@@ -787,6 +804,7 @@ enum EVREventType
|
||||
VREvent_Input_ActionManifestLoadFailed = 1704, // data is actionManifest
|
||||
VREvent_Input_ProgressUpdate = 1705, // data is progressUpdate
|
||||
VREvent_Input_TrackerActivated = 1706,
|
||||
VREvent_Input_BindingsUpdated = 1707,
|
||||
|
||||
VREvent_SpatialAnchors_PoseUpdated = 1800, // data is spatialAnchor. broadcast
|
||||
VREvent_SpatialAnchors_DescriptorUpdated = 1801, // data is spatialAnchor. broadcast
|
||||
@@ -913,6 +931,8 @@ struct VREvent_Process_t
|
||||
uint32_t pid;
|
||||
uint32_t oldPid;
|
||||
bool bForced;
|
||||
// If the associated event was triggered by a connection loss
|
||||
bool bConnectionLost;
|
||||
};
|
||||
|
||||
|
||||
@@ -1066,6 +1086,7 @@ enum EShowUIType
|
||||
ShowUI_ControllerBinding = 0,
|
||||
ShowUI_ManageTrackers = 1,
|
||||
ShowUI_QuickStart = 2,
|
||||
ShowUI_Pairing = 3,
|
||||
};
|
||||
|
||||
struct VREvent_ShowUI_t
|
||||
@@ -1472,12 +1493,91 @@ enum EVRInitError
|
||||
VRInitError_IPC_CompositorInvalidConnectResponse = 307,
|
||||
VRInitError_IPC_ConnectFailedAfterMultipleAttempts = 308,
|
||||
|
||||
VRInitError_Compositor_Failed = 400,
|
||||
VRInitError_Compositor_D3D11HardwareRequired = 401,
|
||||
VRInitError_Compositor_FirmwareRequiresUpdate = 402,
|
||||
VRInitError_Compositor_OverlayInitFailed = 403,
|
||||
VRInitError_Compositor_ScreenshotsInitFailed = 404,
|
||||
VRInitError_Compositor_UnableToCreateDevice = 405,
|
||||
VRInitError_Compositor_Failed = 400,
|
||||
VRInitError_Compositor_D3D11HardwareRequired = 401,
|
||||
VRInitError_Compositor_FirmwareRequiresUpdate = 402,
|
||||
VRInitError_Compositor_OverlayInitFailed = 403,
|
||||
VRInitError_Compositor_ScreenshotsInitFailed = 404,
|
||||
VRInitError_Compositor_UnableToCreateDevice = 405,
|
||||
VRInitError_Compositor_SharedStateIsNull = 406,
|
||||
VRInitError_Compositor_NotificationManagerIsNull = 407,
|
||||
VRInitError_Compositor_ResourceManagerClientIsNull = 408,
|
||||
VRInitError_Compositor_MessageOverlaySharedStateInitFailure = 409,
|
||||
VRInitError_Compositor_PropertiesInterfaceIsNull = 410,
|
||||
VRInitError_Compositor_CreateFullscreenWindowFailed = 411,
|
||||
VRInitError_Compositor_SettingsInterfaceIsNull = 412,
|
||||
VRInitError_Compositor_FailedToShowWindow = 413,
|
||||
VRInitError_Compositor_DistortInterfaceIsNull = 414,
|
||||
VRInitError_Compositor_DisplayFrequencyFailure = 415,
|
||||
VRInitError_Compositor_RendererInitializationFailed = 416,
|
||||
VRInitError_Compositor_DXGIFactoryInterfaceIsNull = 417,
|
||||
VRInitError_Compositor_DXGIFactoryCreateFailed = 418,
|
||||
VRInitError_Compositor_DXGIFactoryQueryFailed = 419,
|
||||
VRInitError_Compositor_InvalidAdapterDesktop = 420,
|
||||
VRInitError_Compositor_InvalidHmdAttachment = 421,
|
||||
VRInitError_Compositor_InvalidOutputDesktop = 422,
|
||||
VRInitError_Compositor_InvalidDeviceProvided = 423,
|
||||
VRInitError_Compositor_D3D11RendererInitializationFailed = 424,
|
||||
VRInitError_Compositor_FailedToFindDisplayMode = 425,
|
||||
VRInitError_Compositor_FailedToCreateSwapChain = 426,
|
||||
VRInitError_Compositor_FailedToGetBackBuffer = 427,
|
||||
VRInitError_Compositor_FailedToCreateRenderTarget = 428,
|
||||
VRInitError_Compositor_FailedToCreateDXGI2SwapChain = 429,
|
||||
VRInitError_Compositor_FailedtoGetDXGI2BackBuffer = 430,
|
||||
VRInitError_Compositor_FailedToCreateDXGI2RenderTarget = 431,
|
||||
VRInitError_Compositor_FailedToGetDXGIDeviceInterface = 432,
|
||||
VRInitError_Compositor_SelectDisplayMode = 433,
|
||||
VRInitError_Compositor_FailedToCreateNvAPIRenderTargets = 434,
|
||||
VRInitError_Compositor_NvAPISetDisplayMode = 435,
|
||||
VRInitError_Compositor_FailedToCreateDirectModeDisplay = 436,
|
||||
VRInitError_Compositor_InvalidHmdPropertyContainer = 437,
|
||||
VRInitError_Compositor_UpdateDisplayFrequency = 438,
|
||||
VRInitError_Compositor_CreateRasterizerState = 439,
|
||||
VRInitError_Compositor_CreateWireframeRasterizerState = 440,
|
||||
VRInitError_Compositor_CreateSamplerState = 441,
|
||||
VRInitError_Compositor_CreateClampToBorderSamplerState = 442,
|
||||
VRInitError_Compositor_CreateAnisoSamplerState = 443,
|
||||
VRInitError_Compositor_CreateOverlaySamplerState = 444,
|
||||
VRInitError_Compositor_CreatePanoramaSamplerState = 445,
|
||||
VRInitError_Compositor_CreateFontSamplerState = 446,
|
||||
VRInitError_Compositor_CreateNoBlendState = 447,
|
||||
VRInitError_Compositor_CreateBlendState = 448,
|
||||
VRInitError_Compositor_CreateAlphaBlendState = 449,
|
||||
VRInitError_Compositor_CreateBlendStateMaskR = 450,
|
||||
VRInitError_Compositor_CreateBlendStateMaskG = 451,
|
||||
VRInitError_Compositor_CreateBlendStateMaskB = 452,
|
||||
VRInitError_Compositor_CreateDepthStencilState = 453,
|
||||
VRInitError_Compositor_CreateDepthStencilStateNoWrite = 454,
|
||||
VRInitError_Compositor_CreateDepthStencilStateNoDepth = 455,
|
||||
VRInitError_Compositor_CreateFlushTexture = 456,
|
||||
VRInitError_Compositor_CreateDistortionSurfaces = 457,
|
||||
VRInitError_Compositor_CreateConstantBuffer = 458,
|
||||
VRInitError_Compositor_CreateHmdPoseConstantBuffer = 459,
|
||||
VRInitError_Compositor_CreateHmdPoseStagingConstantBuffer = 460,
|
||||
VRInitError_Compositor_CreateSharedFrameInfoConstantBuffer = 461,
|
||||
VRInitError_Compositor_CreateOverlayConstantBuffer = 462,
|
||||
VRInitError_Compositor_CreateSceneTextureIndexConstantBuffer = 463,
|
||||
VRInitError_Compositor_CreateReadableSceneTextureIndexConstantBuffer = 464,
|
||||
VRInitError_Compositor_CreateLayerGraphicsTextureIndexConstantBuffer = 465,
|
||||
VRInitError_Compositor_CreateLayerComputeTextureIndexConstantBuffer = 466,
|
||||
VRInitError_Compositor_CreateLayerComputeSceneTextureIndexConstantBuffer = 467,
|
||||
VRInitError_Compositor_CreateComputeHmdPoseConstantBuffer = 468,
|
||||
VRInitError_Compositor_CreateGeomConstantBuffer = 469,
|
||||
VRInitError_Compositor_CreatePanelMaskConstantBuffer = 470,
|
||||
VRInitError_Compositor_CreatePixelSimUBO = 471,
|
||||
VRInitError_Compositor_CreateMSAARenderTextures = 472,
|
||||
VRInitError_Compositor_CreateResolveRenderTextures = 473,
|
||||
VRInitError_Compositor_CreateComputeResolveRenderTextures = 474,
|
||||
VRInitError_Compositor_CreateDriverDirectModeResolveTextures = 475,
|
||||
VRInitError_Compositor_OpenDriverDirectModeResolveTextures = 476,
|
||||
VRInitError_Compositor_CreateFallbackSyncTexture = 477,
|
||||
VRInitError_Compositor_ShareFallbackSyncTexture = 478,
|
||||
VRInitError_Compositor_CreateOverlayIndexBuffer = 479,
|
||||
VRInitError_Compositor_CreateOverlayVertextBuffer = 480,
|
||||
VRInitError_Compositor_CreateTextVertexBuffer = 481,
|
||||
VRInitError_Compositor_CreateTextIndexBuffer = 482,
|
||||
VRInitError_Compositor_CreateMirrorTextures = 483,
|
||||
VRInitError_Compositor_CreateLastFrameRenderTexture = 484,
|
||||
|
||||
VRInitError_VendorSpecific_UnableToConnectToOculusRuntime = 1000,
|
||||
VRInitError_VendorSpecific_WindowsNotInDevMode = 1001,
|
||||
@@ -1556,7 +1656,7 @@ enum EVRDistortionFunctionType
|
||||
{
|
||||
VRDistortionFunctionType_None,
|
||||
VRDistortionFunctionType_FTheta,
|
||||
VRDistortionFucntionType_Extended_FTheta,
|
||||
VRDistortionFunctionType_Extended_FTheta,
|
||||
MAX_DISTORTION_FUNCTION_TYPES,
|
||||
};
|
||||
|
||||
@@ -2378,13 +2478,14 @@ namespace vr
|
||||
static const char * const k_pch_SteamVR_HaveStartedTutorialForNativeChaperoneDriver_Bool = "haveStartedTutorialForNativeChaperoneDriver";
|
||||
static const char * const k_pch_SteamVR_ForceWindows32bitVRMonitor = "forceWindows32BitVRMonitor";
|
||||
static const char * const k_pch_SteamVR_DebugInput = "debugInput";
|
||||
static const char * const k_pch_SteamVR_LegacyInputRebinding = "legacyInputRebinding";
|
||||
static const char * const k_pch_SteamVR_DebugInputBinding = "debugInputBinding";
|
||||
static const char * const k_pch_SteamVR_InputBindingUIBlock = "inputBindingUI";
|
||||
static const char * const k_pch_SteamVR_RenderCameraMode = "renderCameraMode";
|
||||
static const char * const k_pch_SteamVR_EnableSharedResourceJournaling = "enableSharedResourceJournaling";
|
||||
static const char * const k_pch_SteamVR_EnableSafeMode = "enableSafeMode";
|
||||
static const char * const k_pch_SteamVR_PreferredRefreshRate = "preferredRefreshRate";
|
||||
static const char * const k_pch_SteamVR_LastVersionNotice = "lastVersionNotice";
|
||||
static const char * const k_pch_SteamVR_LastVersionNoticeDate = "lastVersionNoticeDate";
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// direct mode keys
|
||||
@@ -2542,7 +2643,6 @@ namespace vr
|
||||
static const char* const k_pch_App_BindingAutosaveURLSuffix_String = "AutosaveURL";
|
||||
static const char* const k_pch_App_BindingCurrentURLSuffix_String = "CurrentURL";
|
||||
static const char* const k_pch_App_NeedToUpdateAutosaveSuffix_Bool = "NeedToUpdateAutosave";
|
||||
static const char* const k_pch_App_ActionManifestURL_String = "ActionManifestURL";
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// configuration for trackers
|
||||
@@ -2558,6 +2658,10 @@ namespace vr
|
||||
static const char* const k_pch_LastKnown_HMDManufacturer_String = "HMDManufacturer";
|
||||
static const char* const k_pch_LastKnown_HMDModel_String = "HMDModel";
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Dismissed warnings
|
||||
static const char * const k_pch_DismissedWarnings_Section = "DismissedWarnings";
|
||||
|
||||
} // namespace vr
|
||||
|
||||
// ivrchaperone.h
|
||||
@@ -2873,8 +2977,8 @@ public:
|
||||
* - IsNotSceneApplication (make sure to call VR_Init with VRApplicaiton_Scene)
|
||||
* - DoNotHaveFocus (some other app has taken focus - this will throttle the call to 10hz to reduce the impact on that app)
|
||||
*/
|
||||
virtual EVRCompositorError WaitGetPoses( VR_ARRAY_COUNT(unRenderPoseArrayCount) TrackedDevicePose_t* pRenderPoseArray, uint32_t unRenderPoseArrayCount,
|
||||
VR_ARRAY_COUNT(unGamePoseArrayCount) TrackedDevicePose_t* pGamePoseArray, uint32_t unGamePoseArrayCount ) = 0;
|
||||
virtual EVRCompositorError WaitGetPoses( VR_ARRAY_COUNT( unRenderPoseArrayCount ) TrackedDevicePose_t* pRenderPoseArray, uint32_t unRenderPoseArrayCount,
|
||||
VR_ARRAY_COUNT( unGamePoseArrayCount ) TrackedDevicePose_t* pGamePoseArray, uint32_t unGamePoseArrayCount ) = 0;
|
||||
|
||||
/** Get the last set of poses returned by WaitGetPoses. */
|
||||
virtual EVRCompositorError GetLastPoses( VR_ARRAY_COUNT( unRenderPoseArrayCount ) TrackedDevicePose_t* pRenderPoseArray, uint32_t unRenderPoseArrayCount,
|
||||
@@ -2919,7 +3023,7 @@ public:
|
||||
|
||||
/** Interface for copying a range of timing data. Frames are returned in ascending order (oldest to newest) with the last being the most recent frame.
|
||||
* Only the first entry's m_nSize needs to be set, as the rest will be inferred from that. Returns total number of entries filled out. */
|
||||
virtual uint32_t GetFrameTimings( Compositor_FrameTiming *pTiming, uint32_t nFrames ) = 0;
|
||||
virtual uint32_t GetFrameTimings( VR_ARRAY_COUNT( nFrames ) Compositor_FrameTiming *pTiming, uint32_t nFrames ) = 0;
|
||||
|
||||
/** Returns the time in seconds left in the current (as identified by FrameTiming's frameIndex) frame.
|
||||
* Due to "running start", this value may roll over to the next frame before ever reaching 0.0. */
|
||||
@@ -3199,8 +3303,11 @@ namespace vr
|
||||
// Indicates that the overlay should dim/brighten to show gamepad focus
|
||||
VROverlayFlags_ShowGamepadFocus = 5,
|
||||
|
||||
// When in VROverlayInputMethod_Mouse you can optionally enable sending VRScroll_t
|
||||
VROverlayFlags_SendVRScrollEvents = 6,
|
||||
// When this is set the overlay will receive VREvent_ScrollDiscrete events like a mouse wheel.
|
||||
// Requires mouse input mode.
|
||||
VROverlayFlags_SendVRDiscreteScrollEvents = 6,
|
||||
|
||||
// Indicates that the overlay would like to receive
|
||||
VROverlayFlags_SendVRTouchpadEvents = 7,
|
||||
|
||||
// If set this will render a vertical scroll wheel on the primary controller,
|
||||
@@ -3228,6 +3335,10 @@ namespace vr
|
||||
// If this is set and the overlay's input method is not none, the system-wide laser mouse
|
||||
// mode will be activated whenever this overlay is visible.
|
||||
VROverlayFlags_MakeOverlaysInteractiveIfVisible = 16,
|
||||
|
||||
// If this is set the overlay will receive smooth VREvent_ScrollSmooth that emulate trackpad scrolling.
|
||||
// Requires mouse input mode.
|
||||
VROverlayFlags_SendVRSmoothScrollEvents = 17,
|
||||
};
|
||||
|
||||
enum VRMessageOverlayResponse
|
||||
@@ -4403,9 +4514,12 @@ static const uint64_t k_ulInvalidIOBufferHandle = 0;
|
||||
|
||||
/** retrieves the property container of an buffer. */
|
||||
virtual vr::PropertyContainerHandle_t PropertyContainer( vr::IOBufferHandle_t ulBuffer ) = 0;
|
||||
|
||||
/** inexpensively checks for readers to allow writers to fast-fail potentially expensive copies and writes. */
|
||||
virtual bool HasReaders( vr::IOBufferHandle_t ulBuffer ) = 0;
|
||||
};
|
||||
|
||||
static const char *IVRIOBuffer_Version = "IVRIOBuffer_001";
|
||||
static const char *IVRIOBuffer_Version = "IVRIOBuffer_002";
|
||||
}
|
||||
|
||||
// ivrspatialanchors.h
|
||||
@@ -4706,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();
|
||||
@@ -4717,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:
|
||||
@@ -4744,6 +4869,7 @@ namespace vr
|
||||
IVRInput *m_pVRInput;
|
||||
IVRIOBuffer *m_pVRIOBuffer;
|
||||
IVRSpatialAnchors *m_pVRSpatialAnchors;
|
||||
IVRNotifications *m_pVRNotifications;
|
||||
};
|
||||
|
||||
inline COpenVRContext &OpenVRInternal_ModuleContext()
|
||||
@@ -4768,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()
|
||||
{
|
||||
@@ -4787,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 );
|
||||
|
||||
Reference in New Issue
Block a user