Update OVR to 1.10.30 (#379)
* updated to ovr 1.10.30 * fixed updated showoverlaykeyboard call * fixed keyboard location
This commit is contained in:
ykeara
+83
-42
@@ -15,8 +15,8 @@
|
||||
namespace vr
|
||||
{
|
||||
static const uint32_t k_nSteamVRVersionMajor = 1;
|
||||
static const uint32_t k_nSteamVRVersionMinor = 9;
|
||||
static const uint32_t k_nSteamVRVersionBuild = 16;
|
||||
static const uint32_t k_nSteamVRVersionMinor = 10;
|
||||
static const uint32_t k_nSteamVRVersionBuild = 30;
|
||||
} // namespace vr
|
||||
|
||||
// vrtypes.h
|
||||
@@ -206,7 +206,7 @@ enum ETrackedControllerRole
|
||||
TrackedControllerRole_LeftHand = 1, // Tracked device associated with the left hand
|
||||
TrackedControllerRole_RightHand = 2, // Tracked device associated with the right hand
|
||||
TrackedControllerRole_OptOut = 3, // Tracked device is opting out of left/right hand selection
|
||||
TrackedControllerRole_Treadmill = 4, // Tracked device is a treadmill
|
||||
TrackedControllerRole_Treadmill = 4, // Tracked device is a treadmill or other locomotion device
|
||||
TrackedControllerRole_Stylus = 5, // Tracked device is a stylus
|
||||
TrackedControllerRole_Max = 5
|
||||
};
|
||||
@@ -278,6 +278,7 @@ static const PropertyTypeTag_t k_unUint64PropertyTag = 3;
|
||||
static const PropertyTypeTag_t k_unBoolPropertyTag = 4;
|
||||
static const PropertyTypeTag_t k_unStringPropertyTag = 5;
|
||||
static const PropertyTypeTag_t k_unErrorPropertyTag = 6;
|
||||
static const PropertyTypeTag_t k_unDoublePropertyTag = 7;
|
||||
|
||||
static const PropertyTypeTag_t k_unHmdMatrix34PropertyTag = 20;
|
||||
static const PropertyTypeTag_t k_unHmdMatrix44PropertyTag = 21;
|
||||
@@ -450,7 +451,7 @@ enum ETrackedDeviceProperty
|
||||
Prop_DisplayMinAnalogGain_Float = 2086,
|
||||
Prop_DisplayMaxAnalogGain_Float = 2087,
|
||||
|
||||
Prop_DashboardLayoutPathName_String = 2090,
|
||||
// Prop_DashboardLayoutPathName_String = 2090, // DELETED
|
||||
Prop_DashboardScale_Float = 2091,
|
||||
Prop_IpdUIRangeMinMeters_Float = 2100,
|
||||
Prop_IpdUIRangeMaxMeters_Float = 2101,
|
||||
@@ -629,6 +630,10 @@ enum EVRSubmitFlags
|
||||
// Set to indicate that pTexture is a pointer to a VRTextureWithDepth_t.
|
||||
// This flag can be combined with Submit_TextureWithPose to pass a VRTextureWithPoseAndDepth_t.
|
||||
Submit_TextureWithDepth = 0x10,
|
||||
|
||||
// Set to indicate a discontinuity between this and the last frame.
|
||||
// This will prevent motion smoothing from attempting to extrapolate using the pair.
|
||||
Submit_FrameDiscontinuty = 0x20,
|
||||
};
|
||||
|
||||
/** Data required for passing Vulkan textures to IVRCompositor::Submit.
|
||||
@@ -693,14 +698,14 @@ enum EVREventType
|
||||
VREvent_ButtonTouch = 202, // data is controller
|
||||
VREvent_ButtonUntouch = 203, // data is controller
|
||||
|
||||
VREvent_DualAnalog_Press = 250, // data is dualAnalog
|
||||
VREvent_DualAnalog_Unpress = 251, // data is dualAnalog
|
||||
VREvent_DualAnalog_Touch = 252, // data is dualAnalog
|
||||
VREvent_DualAnalog_Untouch = 253, // data is dualAnalog
|
||||
VREvent_DualAnalog_Move = 254, // data is dualAnalog
|
||||
VREvent_DualAnalog_ModeSwitch1 = 255, // data is dualAnalog
|
||||
VREvent_DualAnalog_ModeSwitch2 = 256, // data is dualAnalog
|
||||
VREvent_DualAnalog_Cancel = 257, // data is dualAnalog
|
||||
// VREvent_DualAnalog_Press = 250, // No longer sent
|
||||
// VREvent_DualAnalog_Unpress = 251, // No longer sent
|
||||
// VREvent_DualAnalog_Touch = 252, // No longer sent
|
||||
// VREvent_DualAnalog_Untouch = 253, // No longer sent
|
||||
// VREvent_DualAnalog_Move = 254, // No longer sent
|
||||
// VREvent_DualAnalog_ModeSwitch1 = 255, // No longer sent
|
||||
// VREvent_DualAnalog_ModeSwitch2 = 256, // No longer sent
|
||||
VREvent_Modal_Cancel = 257, // Sent to overlays with the
|
||||
|
||||
VREvent_MouseMove = 300, // data is mouse
|
||||
VREvent_MouseButtonDown = 301, // data is mouse
|
||||
@@ -712,6 +717,8 @@ enum EVREventType
|
||||
VREvent_OverlayFocusChanged = 307, // data is overlay, global event
|
||||
VREvent_ReloadOverlays = 308,
|
||||
VREvent_ScrollSmooth = 309, // data is scroll
|
||||
VREvent_LockMousePosition = 310,
|
||||
VREvent_UnlockMousePosition = 311,
|
||||
|
||||
VREvent_InputFocusCaptured = 400, // data is process DEPRECATED
|
||||
VREvent_InputFocusReleased = 401, // data is process DEPRECATED
|
||||
@@ -1092,19 +1099,6 @@ struct VREvent_Property_t
|
||||
ETrackedDeviceProperty prop;
|
||||
};
|
||||
|
||||
enum EDualAnalogWhich
|
||||
{
|
||||
k_EDualAnalog_Left = 0,
|
||||
k_EDualAnalog_Right = 1,
|
||||
};
|
||||
|
||||
struct VREvent_DualAnalog_t
|
||||
{
|
||||
float x, y; // coordinates are -1..1 analog values
|
||||
float transformedX, transformedY; // transformed by the center and radius numbers provided by the overlay
|
||||
EDualAnalogWhich which;
|
||||
};
|
||||
|
||||
struct VREvent_HapticVibration_t
|
||||
{
|
||||
uint64_t containerHandle; // property container handle of the device with the haptic component
|
||||
@@ -1159,6 +1153,7 @@ enum EShowUIType
|
||||
ShowUI_Settings = 4,
|
||||
ShowUI_DebugCommands = 5,
|
||||
ShowUI_FullControllerBinding = 6,
|
||||
ShowUI_ManageDrivers = 7,
|
||||
};
|
||||
|
||||
struct VREvent_ShowUI_t
|
||||
@@ -1207,7 +1202,6 @@ typedef union
|
||||
VREvent_EditingCameraSurface_t cameraSurface;
|
||||
VREvent_MessageOverlay_t messageOverlay;
|
||||
VREvent_Property_t property;
|
||||
VREvent_DualAnalog_t dualAnalog;
|
||||
VREvent_HapticVibration_t hapticVibration;
|
||||
VREvent_WebConsole_t webConsole;
|
||||
VREvent_InputBindingLoad_t inputBinding;
|
||||
@@ -1241,6 +1235,28 @@ struct VREvent_t
|
||||
#pragma pack( pop )
|
||||
#endif
|
||||
|
||||
typedef uint32_t VRComponentProperties;
|
||||
|
||||
enum EVRComponentProperty
|
||||
{
|
||||
VRComponentProperty_IsStatic = (1 << 0),
|
||||
VRComponentProperty_IsVisible = (1 << 1),
|
||||
VRComponentProperty_IsTouched = (1 << 2),
|
||||
VRComponentProperty_IsPressed = (1 << 3),
|
||||
VRComponentProperty_IsScrolled = (1 << 4),
|
||||
VRComponentProperty_IsHighlighted = (1 << 5),
|
||||
};
|
||||
|
||||
|
||||
/** Describes state information about a render-model component, including transforms and other dynamic properties */
|
||||
struct RenderModel_ComponentState_t
|
||||
{
|
||||
HmdMatrix34_t mTrackingToComponentRenderModel; // Transform required when drawing the component render model
|
||||
HmdMatrix34_t mTrackingToComponentLocal; // Transform available for attaching to a local component coordinate system (-Z out from surface )
|
||||
VRComponentProperties uProperties;
|
||||
};
|
||||
|
||||
|
||||
enum EVRInputError
|
||||
{
|
||||
VRInputError_None = 0,
|
||||
@@ -1261,6 +1277,9 @@ enum EVRInputError
|
||||
VRInputError_MismatchedActionManifest = 15,
|
||||
VRInputError_MissingSkeletonData = 16,
|
||||
VRInputError_InvalidBoneIndex = 17,
|
||||
VRInputError_InvalidPriority = 18,
|
||||
VRInputError_PermissionDenied = 19,
|
||||
VRInputError_InvalidRenderModel = 20,
|
||||
};
|
||||
|
||||
enum EVRSpatialAnchorError
|
||||
@@ -1377,17 +1396,6 @@ enum ECollisionBoundsStyle
|
||||
COLLISION_BOUNDS_STYLE_COUNT
|
||||
};
|
||||
|
||||
/** Allows the application to customize how the overlay appears in the compositor */
|
||||
struct Compositor_OverlaySettings
|
||||
{
|
||||
uint32_t size; // sizeof(Compositor_OverlaySettings)
|
||||
bool curved, antialias;
|
||||
float scale, distance, alpha;
|
||||
float uOffset, vOffset, uScale, vScale;
|
||||
float gridDivs, gridWidth, gridScale;
|
||||
HmdMatrix44_t transform;
|
||||
};
|
||||
|
||||
/** used to refer to a single VR overlay */
|
||||
typedef uint64_t VROverlayHandle_t;
|
||||
|
||||
@@ -1486,11 +1494,11 @@ enum EVRSkeletalTrackingLevel
|
||||
// body part location can be measured directly but with fewer degrees of freedom than the actual body
|
||||
// part. Certain body part positions may be unmeasured by the device and estimated from other input data.
|
||||
// E.g. Index Controllers, gloves that only measure finger curl
|
||||
VRSkeletalTracking_Partial,
|
||||
VRSkeletalTracking_Partial = 1,
|
||||
|
||||
// Body part location can be measured directly throughout the entire range of motion of the body part.
|
||||
// E.g. Mocap suit for the full body, gloves that measure rotation of each finger segment
|
||||
VRSkeletalTracking_Full,
|
||||
VRSkeletalTracking_Full = 2,
|
||||
|
||||
VRSkeletalTrackingLevel_Count,
|
||||
VRSkeletalTrackingLevel_Max = VRSkeletalTrackingLevel_Count - 1
|
||||
@@ -1674,7 +1682,7 @@ enum EVRInitError
|
||||
VRInitError_Compositor_CreateFallbackSyncTexture = 477,
|
||||
VRInitError_Compositor_ShareFallbackSyncTexture = 478,
|
||||
VRInitError_Compositor_CreateOverlayIndexBuffer = 479,
|
||||
VRInitError_Compositor_CreateOverlayVertextBuffer = 480,
|
||||
VRInitError_Compositor_CreateOverlayVertexBuffer = 480,
|
||||
VRInitError_Compositor_CreateTextVertexBuffer = 481,
|
||||
VRInitError_Compositor_CreateTextIndexBuffer = 482,
|
||||
VRInitError_Compositor_CreateMirrorTextures = 483,
|
||||
@@ -1682,7 +1690,10 @@ enum EVRInitError
|
||||
VRInitError_Compositor_CreateMirrorOverlay = 485,
|
||||
VRInitError_Compositor_FailedToCreateVirtualDisplayBackbuffer = 486,
|
||||
VRInitError_Compositor_DisplayModeNotSupported = 487,
|
||||
|
||||
VRInitError_Compositor_CreateOverlayInvalidCall = 488,
|
||||
VRInitError_Compositor_CreateOverlayAlreadyInitialized = 489,
|
||||
VRInitError_Compositor_FailedToCreateMailbox = 490,
|
||||
|
||||
VRInitError_VendorSpecific_UnableToConnectToOculusRuntime = 1000,
|
||||
VRInitError_VendorSpecific_WindowsNotInDevMode = 1001,
|
||||
|
||||
@@ -1862,6 +1873,13 @@ struct Compositor_FrameTiming
|
||||
uint32_t m_nNumVSyncsToFirstView;
|
||||
};
|
||||
|
||||
/** Provides compositor benchmark results to the app */
|
||||
struct Compositor_BenchmarkResults
|
||||
{
|
||||
float m_flMegaPixelsPerSecond; // Measurement of GPU MP/s performed by compositor benchmark
|
||||
float m_flHmdRecommendedMegaPixelsPerSecond; // Recommended default MP/s given the HMD resolution, refresh, and panel mask.
|
||||
};
|
||||
|
||||
/** Frame timing data provided by direct mode drivers. */
|
||||
struct DriverDirectMode_FrameTiming
|
||||
{
|
||||
@@ -1872,6 +1890,12 @@ struct DriverDirectMode_FrameTiming
|
||||
uint32_t m_nReprojectionFlags;
|
||||
};
|
||||
|
||||
/** These flags will be set on DriverDirectMode_FrameTiming::m_nReprojectionFlags when IVRDriverDirectModeComponent::GetFrameTiming is called for drivers to optionally respond to. */
|
||||
const uint32_t VRCompositor_ReprojectionMotion_Enabled = 0x100; // Motion Smoothing is enabled in the UI for the currently running application
|
||||
const uint32_t VRCompositor_ReprojectionMotion_ForcedOn = 0x200; // Motion Smoothing is forced on in the UI for the currently running application
|
||||
const uint32_t VRCompositor_ReprojectionMotion_AppThrottled = 0x400; // Application is requesting throttling via ForceInterleavedReprojectionOn
|
||||
|
||||
|
||||
enum EVSync
|
||||
{
|
||||
VSync_None,
|
||||
@@ -2254,6 +2278,8 @@ namespace vr
|
||||
static const char * const k_pch_SteamVR_CustomIconStyle_String = "customIconStyle";
|
||||
static const char * const k_pch_SteamVR_CustomOffIconStyle_String = "customOffIconStyle";
|
||||
static const char * const k_pch_SteamVR_CustomIconForceUpdate_String = "customIconForceUpdate";
|
||||
static const char * const k_pch_SteamVR_AllowGlobalActionSetPriority = "globalActionSetPriority";
|
||||
static const char * const k_pch_SteamVR_OverlayRenderQuality = "overlayRenderQuality_2";
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// direct mode keys
|
||||
@@ -2387,7 +2413,6 @@ namespace vr
|
||||
static const char * const k_pch_Dashboard_Section = "dashboard";
|
||||
static const char * const k_pch_Dashboard_EnableDashboard_Bool = "enableDashboard";
|
||||
static const char * const k_pch_Dashboard_ArcadeMode_Bool = "arcadeMode";
|
||||
static const char * const k_pch_Dashboard_UseWebKeyboard = "useWebKeyboard";
|
||||
static const char * const k_pch_Dashboard_UseWebSettings = "useWebSettings";
|
||||
static const char * const k_pch_Dashboard_Position = "position";
|
||||
static const char * const k_pch_Dashboard_DesktopScale = "desktopScale";
|
||||
@@ -2400,6 +2425,7 @@ namespace vr
|
||||
//-----------------------------------------------------------------------------
|
||||
// driver keys - These could be checked in any driver_<name> section
|
||||
static const char * const k_pch_Driver_Enable_Bool = "enable";
|
||||
static const char * const k_pch_Driver_BlockedBySafemode_Bool = "blocked_by_safe_mode";
|
||||
static const char * const k_pch_Driver_LoadPriority_Int32 = "loadPriority";
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
@@ -2420,9 +2446,12 @@ namespace vr
|
||||
//-----------------------------------------------------------------------------
|
||||
// per-app keys - the section name for these is the app key itself. Some of these are prefixed by the controller type
|
||||
static const char* const k_pch_App_BindingAutosaveURLSuffix_String = "AutosaveURL";
|
||||
static const char* const k_pch_App_BindingLegacyAPISuffix_String = "_legacy";
|
||||
static const char* const k_pch_App_BindingSteamVRInputAPISuffix_String = "_steamvrinput";
|
||||
static const char* const k_pch_App_BindingCurrentURLSuffix_String = "CurrentURL";
|
||||
static const char* const k_pch_App_BindingPreviousURLSuffix_String = "PreviousURL";
|
||||
static const char* const k_pch_App_NeedToUpdateAutosaveSuffix_Bool = "NeedToUpdateAutosave";
|
||||
static const char* const k_pch_App_DominantHand_Int32 = "DominantHand";
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// configuration for trackers
|
||||
@@ -2915,6 +2944,7 @@ public:
|
||||
HmdVector2_t GetVec2Property( PropertyContainerHandle_t ulContainerHandle, ETrackedDeviceProperty prop, ETrackedPropertyError *pError = 0L );
|
||||
HmdVector3_t GetVec3Property( PropertyContainerHandle_t ulContainerHandle, ETrackedDeviceProperty prop, ETrackedPropertyError *pError = 0L );
|
||||
HmdVector4_t GetVec4Property( PropertyContainerHandle_t ulContainerHandle, ETrackedDeviceProperty prop, ETrackedPropertyError *pError = 0L );
|
||||
double GetDoubleProperty( PropertyContainerHandle_t ulContainerHandle, ETrackedDeviceProperty prop, ETrackedPropertyError *pError = 0L );
|
||||
|
||||
/** Returns a single typed property. If the device index is not valid or the property is not a string type this function will
|
||||
* return 0. Otherwise it returns the length of the number of bytes necessary to hold this string including the trailing
|
||||
@@ -2943,6 +2973,7 @@ public:
|
||||
ETrackedPropertyError SetVec2Property( PropertyContainerHandle_t ulContainerHandle, ETrackedDeviceProperty prop, const HmdVector2_t & vNewValue );
|
||||
ETrackedPropertyError SetVec3Property( PropertyContainerHandle_t ulContainerHandle, ETrackedDeviceProperty prop, const HmdVector3_t & vNewValue );
|
||||
ETrackedPropertyError SetVec4Property( PropertyContainerHandle_t ulContainerHandle, ETrackedDeviceProperty prop, const HmdVector4_t & vNewValue );
|
||||
ETrackedPropertyError SetDoubleProperty( PropertyContainerHandle_t ulContainerHandle, ETrackedDeviceProperty prop, double vNewValue );
|
||||
|
||||
/** Sets a string property. The new value will be returned on any subsequent call to get this property in any process. */
|
||||
ETrackedPropertyError SetStringProperty( PropertyContainerHandle_t ulContainerHandle, ETrackedDeviceProperty prop, const char *pchNewValue );
|
||||
@@ -3125,6 +3156,11 @@ inline float CVRPropertyHelpers::GetFloatProperty( PropertyContainerHandle_t ulC
|
||||
return GetPropertyHelper<float>( ulContainerHandle, prop, pError, 0.f, k_unFloatPropertyTag );
|
||||
}
|
||||
|
||||
inline double CVRPropertyHelpers::GetDoubleProperty( PropertyContainerHandle_t ulContainerHandle, ETrackedDeviceProperty prop, ETrackedPropertyError *pError )
|
||||
{
|
||||
return GetPropertyHelper<double>( ulContainerHandle, prop, pError, 0., k_unDoublePropertyTag );
|
||||
}
|
||||
|
||||
inline int32_t CVRPropertyHelpers::GetInt32Property( PropertyContainerHandle_t ulContainerHandle, ETrackedDeviceProperty prop, ETrackedPropertyError *pError )
|
||||
{
|
||||
return GetPropertyHelper<int32_t>( ulContainerHandle, prop, pError, 0, k_unInt32PropertyTag );
|
||||
@@ -3163,6 +3199,11 @@ inline ETrackedPropertyError CVRPropertyHelpers::SetFloatProperty( PropertyConta
|
||||
return SetProperty( ulContainerHandle, prop, &fNewValue, sizeof( fNewValue ), k_unFloatPropertyTag );
|
||||
}
|
||||
|
||||
inline ETrackedPropertyError CVRPropertyHelpers::SetDoubleProperty( PropertyContainerHandle_t ulContainerHandle, ETrackedDeviceProperty prop, double fNewValue )
|
||||
{
|
||||
return SetProperty( ulContainerHandle, prop, &fNewValue, sizeof( fNewValue ), k_unDoublePropertyTag );
|
||||
}
|
||||
|
||||
inline ETrackedPropertyError CVRPropertyHelpers::SetInt32Property( PropertyContainerHandle_t ulContainerHandle, ETrackedDeviceProperty prop, int32_t nNewValue )
|
||||
{
|
||||
return SetProperty( ulContainerHandle, prop, &nNewValue, sizeof( nNewValue ), k_unInt32PropertyTag );
|
||||
|
||||
Reference in New Issue
Block a user