|
16 | 16 | namespace vr
|
17 | 17 | {
|
18 | 18 | static const uint32_t k_nSteamVRVersionMajor = 2;
|
19 |
| - static const uint32_t k_nSteamVRVersionMinor = 2; |
20 |
| - static const uint32_t k_nSteamVRVersionBuild = 3; |
| 19 | + static const uint32_t k_nSteamVRVersionMinor = 5; |
| 20 | + static const uint32_t k_nSteamVRVersionBuild = 1; |
21 | 21 | } // namespace vr
|
22 | 22 |
|
23 | 23 | // public_vrtypes.h
|
@@ -885,6 +885,11 @@ enum EVREventType
|
885 | 885 | VREvent_DesktopMightBeVisible = 536, // Sent when any known desktop related overlay is visible
|
886 | 886 | VREvent_DesktopMightBeHidden = 537, // Sent when all known desktop related overlays are hidden
|
887 | 887 |
|
| 888 | + VREvent_MutualSteamCapabilitiesChanged = 538, // Sent when the set of capabilities common between both Steam and SteamVR have changed. |
| 889 | + |
| 890 | + VREvent_OverlayCreated = 539, // An OpenVR overlay of any sort was created. Data is overlay. |
| 891 | + VREvent_OverlayDestroyed = 540, // An OpenVR overlay of any sort was destroyed. Data is overlay. |
| 892 | + |
888 | 893 | VREvent_Notification_Shown = 600,
|
889 | 894 | VREvent_Notification_Hidden = 601,
|
890 | 895 | VREvent_Notification_BeginInteraction = 602,
|
@@ -1647,6 +1652,7 @@ enum EVRNotificationError
|
1647 | 1652 | VRNotificationError_NotificationQueueFull = 101,
|
1648 | 1653 | VRNotificationError_InvalidOverlayHandle = 102,
|
1649 | 1654 | VRNotificationError_SystemWithUserValueAlreadyExists = 103,
|
| 1655 | + VRNotificationError_ServiceUnavailable = 104, |
1650 | 1656 | };
|
1651 | 1657 |
|
1652 | 1658 |
|
@@ -2014,22 +2020,22 @@ static const uint32_t k_unScreenshotHandleInvalid = 0;
|
2014 | 2020 | /** Compositor frame timing reprojection flags. */
|
2015 | 2021 | const uint32_t VRCompositor_ReprojectionReason_Cpu = 0x01;
|
2016 | 2022 | const uint32_t VRCompositor_ReprojectionReason_Gpu = 0x02;
|
2017 |
| -const uint32_t VRCompositor_ReprojectionAsync = 0x04; // This flag indicates the async reprojection mode is active, |
| 2023 | +const uint32_t VRCompositor_ReprojectionAsync = 0x04; // This flag indicates the async reprojection mode is active, |
2018 | 2024 | // but does not indicate if reprojection actually happened or not.
|
2019 | 2025 | // Use the ReprojectionReason flags above to check if reprojection
|
2020 | 2026 | // was actually applied (i.e. scene texture was reused).
|
2021 | 2027 | // NumFramePresents > 1 also indicates the scene texture was reused,
|
2022 | 2028 | // and also the number of times that it was presented in total.
|
2023 | 2029 |
|
2024 |
| -const uint32_t VRCompositor_ReprojectionMotion = 0x08; // This flag indicates whether or not motion smoothing was triggered for this frame |
| 2030 | +const uint32_t VRCompositor_ReprojectionMotion = 0x08; // This flag indicates whether or not motion smoothing was triggered for this frame |
2025 | 2031 |
|
2026 |
| -const uint32_t VRCompositor_PredictionMask = 0xF0; // The runtime may predict more than one frame (up to four) ahead if |
2027 |
| - // it detects the application is taking too long to render. These two |
| 2032 | +const uint32_t VRCompositor_PredictionMask = 0xF0; // The runtime may predict more than one frame ahead if |
| 2033 | + // it detects the application is taking too long to render. These |
2028 | 2034 | // bits will contain the count of additional frames (normally zero).
|
2029 | 2035 | // Use the VR_COMPOSITOR_ADDITIONAL_PREDICTED_FRAMES macro to read from
|
2030 | 2036 | // the latest frame timing entry.
|
2031 | 2037 |
|
2032 |
| -const uint32_t VRCompositor_ThrottleMask = 0xF00; // Number of frames the compositor is throttling the application. |
| 2038 | +const uint32_t VRCompositor_ThrottleMask = 0xF00; // Number of frames the compositor is throttling the application. |
2033 | 2039 | // Use the VR_COMPOSITOR_NUMBER_OF_THROTTLED_FRAMES macro to read from
|
2034 | 2040 | // the latest frame timing entry.
|
2035 | 2041 |
|
@@ -2081,6 +2087,8 @@ struct Compositor_FrameTiming
|
2081 | 2087 |
|
2082 | 2088 | uint32_t m_nNumVSyncsReadyForUse;
|
2083 | 2089 | uint32_t m_nNumVSyncsToFirstView;
|
| 2090 | + |
| 2091 | + float m_flTransferLatencyMs; |
2084 | 2092 | };
|
2085 | 2093 | #if defined(__linux__) || defined(__APPLE__)
|
2086 | 2094 | #pragma pack( pop )
|
@@ -2728,6 +2736,7 @@ namespace vr
|
2728 | 2736 | VRSettingsError_ReadFailed = 3,
|
2729 | 2737 | VRSettingsError_JsonParseFailed = 4,
|
2730 | 2738 | VRSettingsError_UnsetSettingHasNoDefault = 5, // This will be returned if the setting does not appear in the appropriate default file and has not been set
|
| 2739 | + VRSettingsError_AccessDenied = 6, |
2731 | 2740 | };
|
2732 | 2741 |
|
2733 | 2742 | // The maximum length of a settings key
|
@@ -2869,6 +2878,7 @@ namespace vr
|
2869 | 2878 | static const char * const k_pch_SteamVR_AdditionalFramesToPredict_Int32 = "additionalFramesToPredict";
|
2870 | 2879 | static const char * const k_pch_SteamVR_WorldScale_Float = "worldScale";
|
2871 | 2880 | static const char * const k_pch_SteamVR_FovScale_Int32 = "fovScale";
|
| 2881 | + static const char * const k_pch_SteamVR_FovScaleLetterboxed_Bool = "fovScaleLetterboxed"; |
2872 | 2882 | static const char * const k_pch_SteamVR_DisableAsyncReprojection_Bool = "disableAsync";
|
2873 | 2883 | static const char * const k_pch_SteamVR_ForceFadeOnBadTracking_Bool = "forceFadeOnBadTracking";
|
2874 | 2884 | static const char * const k_pch_SteamVR_DefaultMirrorView_Int32 = "mirrorView";
|
@@ -3069,7 +3079,7 @@ namespace vr
|
3069 | 3079 | static const char * const k_pch_Dashboard_StickyDashboard = "stickyDashboard";
|
3070 | 3080 | static const char * const k_pch_Dashboard_AllowSteamOverlays_Bool = "allowSteamOverlays";
|
3071 | 3081 | static const char * const k_pch_Dashboard_AllowVRGamepadUI_Bool = "allowVRGamepadUI";
|
3072 |
| - static const char * const k_pch_Dashboard_AllowDesktopBPMWithVRGamepadUI_Bool = "allowDesktopBPMWithVRGamepadUI"; |
| 3082 | + static const char * const k_pch_Dashboard_AllowVRGamepadUIViaGamescope_Bool = "allowVRGamepadUIViaGamescope"; |
3073 | 3083 | static const char * const k_pch_Dashboard_SteamMatchesHMDFramerate = "steamMatchesHMDFramerate";
|
3074 | 3084 |
|
3075 | 3085 | //-----------------------------------------------------------------------------
|
@@ -3184,13 +3194,13 @@ class IVRChaperone
|
3184 | 3194 | virtual bool GetPlayAreaSize( float *pSizeX, float *pSizeZ ) = 0;
|
3185 | 3195 |
|
3186 | 3196 | /** Returns a quad describing the Play Area (formerly named Soft Bounds).
|
3187 |
| - * The corners form a rectangle. |
| 3197 | + * The corners form a rectangle. |
3188 | 3198 | * Corners are in counter-clockwise order, starting at the front-right.
|
3189 | 3199 | * The positions are given relative to the standing origin.
|
3190 | 3200 | * The center of the rectangle is the center of the user's calibrated play space, not necessarily the standing
|
3191 |
| - * origin. |
| 3201 | + * origin. |
3192 | 3202 | * The Play Area's forward direction goes from its center through the mid-point of a line drawn between the
|
3193 |
| - * first and second corner. |
| 3203 | + * first and second corner. |
3194 | 3204 | * The quad lies on the XZ plane (height = 0y), with 2 sides parallel to the X-axis and two sides parallel
|
3195 | 3205 | * to the Z-axis of the user's calibrated Play Area. **/
|
3196 | 3206 | virtual bool GetPlayAreaRect( HmdQuad_t *rect ) = 0;
|
@@ -4338,7 +4348,7 @@ namespace vr
|
4338 | 4348 | /** Shows the dashboard. */
|
4339 | 4349 | virtual void ShowDashboard( const char *pchOverlayToShow ) = 0;
|
4340 | 4350 |
|
4341 |
| - /** Returns the tracked device that has the laser pointer in the dashboard */ |
| 4351 | + /** Returns the tracked device index that has the laser pointer in the dashboard, or the last one that was used. */ |
4342 | 4352 | virtual vr::TrackedDeviceIndex_t GetPrimaryDashboardDevice() = 0;
|
4343 | 4353 |
|
4344 | 4354 | // ---------------------------------------------
|
@@ -5229,7 +5239,7 @@ namespace vr
|
5229 | 5239 | virtual EVRInputError GetOriginTrackedDeviceInfo( VRInputValueHandle_t origin, InputOriginInfo_t *pOriginInfo, uint32_t unOriginInfoSize ) = 0;
|
5230 | 5240 |
|
5231 | 5241 | /** Retrieves useful information about the bindings for an action */
|
5232 |
| - virtual EVRInputError GetActionBindingInfo( VRActionHandle_t action, InputBindingInfo_t *pOriginInfo, uint32_t unBindingInfoSize, uint32_t unBindingInfoCount, uint32_t *punReturnedBindingInfoCount ) = 0; |
| 5242 | + virtual EVRInputError GetActionBindingInfo( VRActionHandle_t action, VR_ARRAY_COUNT( unBindingInfoCount ) InputBindingInfo_t *pOriginInfo, uint32_t unBindingInfoSize, uint32_t unBindingInfoCount, uint32_t *punReturnedBindingInfoCount ) = 0; |
5233 | 5243 |
|
5234 | 5244 | /** Shows the current binding for the action in-headset */
|
5235 | 5245 | virtual EVRInputError ShowActionOrigins( VRActionSetHandle_t actionSetHandle, VRActionHandle_t ulActionHandle ) = 0;
|
|
0 commit comments