Center Marker/ Chaperone Refactor/ IVROverlay/IVRSettings wrappers PT 1/? (#438)
* changed click noises to internal sounds * udpated to ovr 1.11.11 * in prog added prototypes * began wrapper for IVRSettings * added getters for chaperone colors * added setters for chaperone color * fixed type conversion issue * fixed linking issue, added additional settings chaperone page * adjusted chaperone page qml * added color chaperone UI * refactor in prog * updated ivrsettings wrapper, refactor in prog * refactor in prog * collision bound style add * refactor * cleaned up error logging * fixed fade distance remember bug * fixed sounds * fixed brightness opacity bug setting to 0 when 0 * fixed sounds * added wrapper for removing keys * refactored reset * added chaperone Styles to UI * added chaperone floor always on * fixed copy/paste error * adjsuted ui chaperone color slider * started adding chaperone floor marker * fixeed naming error overlay * finalized chaperone Ideas, added chaperone markers * began ivroverlay wrapper * center marker fully implemented * added function prototypes for new settings * added setting, and updated ui for New Center Marker Overlay * adjsuted sound effect volume and formatting for chaperonecolorbox * adjusted volume back * fixed various issues aroudn new overlay * removed artifact comment * cleaned up settings wrapper * cleaned up chaperone tab controller for namespace changes * removed ide comment issue * cleanup overlay wrapper * cleaned up tab/space changed file name * renamed files * fixed include statements * updated namespace in chaperonetabcontroller * fixed tab/space issues * re-activated boundbasisheight * fixed bulgarian case * changed chaperone warnings to only work in roomscale * fix capitilization * fixed tracking universe update * direct text input change for brightness * qml fixes * fixed qml format issues * fixed sound issue w/ sliders * fixed super truely * Add SDL libraries to CircleCI * Remove -tidy from circleCI config * flushed out error messages in overlaywrapper * removed hungarian notation * added get/set string to ovrsettings wrapper * misc cleanup * add reset orientation btn and new center marker to chaperone * ui adjustments * changed alarm audio * adjusted sound effect volume slightly lower * updated for 5.1.0 release Co-authored-by: Vasily <vautkin@teknik.io>
This commit is contained in:
ykeara
Vasily
Vendored
+24
-6
@@ -15,8 +15,8 @@
|
||||
namespace vr
|
||||
{
|
||||
static const uint32_t k_nSteamVRVersionMajor = 1;
|
||||
static const uint32_t k_nSteamVRVersionMinor = 10;
|
||||
static const uint32_t k_nSteamVRVersionBuild = 30;
|
||||
static const uint32_t k_nSteamVRVersionMinor = 11;
|
||||
static const uint32_t k_nSteamVRVersionBuild = 11;
|
||||
} // namespace vr
|
||||
|
||||
// vrtypes.h
|
||||
@@ -746,7 +746,7 @@ enum EVREventType
|
||||
//VREvent_DashboardThumbSelected = 504, // Sent to the overlay manager - data is overlay - No longer sent
|
||||
VREvent_DashboardRequested = 505, // Sent to the overlay manager - data is overlay
|
||||
VREvent_ResetDashboard = 506, // Send to the overlay manager
|
||||
VREvent_RenderToast = 507, // Send to the dashboard to render a toast - data is the notification ID
|
||||
//VREvent_RenderToast = 507, // Send to the dashboard to render a toast - data is the notification ID -- no longer sent
|
||||
VREvent_ImageLoaded = 508, // Sent to overlays when a SetOverlayRaw or SetOverlayFromFile call finishes loading
|
||||
VREvent_ShowKeyboard = 509, // Sent to keyboard renderer in the dashboard to invoke it
|
||||
VREvent_HideKeyboard = 510, // Sent to keyboard renderer in the dashboard to hide it
|
||||
@@ -816,6 +816,8 @@ enum EVREventType
|
||||
VREvent_LastKnownSectionSettingChanged = 867,
|
||||
VREvent_DismissedWarningsSectionSettingChanged = 868,
|
||||
VREvent_GpuSpeedSectionSettingChanged = 869,
|
||||
VREvent_WindowsMRSectionSettingChanged = 870,
|
||||
VREvent_OtherSectionSettingChanged = 871,
|
||||
|
||||
VREvent_StatusUpdate = 900,
|
||||
|
||||
@@ -2736,6 +2738,10 @@ namespace vr
|
||||
static const char * const k_pch_Null_SecondsFromVsyncToPhotons_Float = "secondsFromVsyncToPhotons";
|
||||
static const char * const k_pch_Null_DisplayFrequency_Float = "displayFrequency";
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Windows MR keys
|
||||
static const char * const k_pch_WindowsMR_Section = "driver_holographic";
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// user interface keys
|
||||
static const char * const k_pch_UserInterface_Section = "userinterface";
|
||||
@@ -2778,6 +2784,7 @@ namespace vr
|
||||
static const char * const k_pch_CollisionBounds_CenterMarkerOn_Bool = "CollisionBoundsCenterMarkerOn";
|
||||
static const char * const k_pch_CollisionBounds_PlaySpaceOn_Bool = "CollisionBoundsPlaySpaceOn";
|
||||
static const char * const k_pch_CollisionBounds_FadeDistance_Float = "CollisionBoundsFadeDistance";
|
||||
static const char * const k_pch_CollisionBounds_WallHeight_Float = "CollisionBoundsWallHeight";
|
||||
static const char * const k_pch_CollisionBounds_ColorGammaR_Int32 = "CollisionBoundsColorGammaR";
|
||||
static const char * const k_pch_CollisionBounds_ColorGammaG_Int32 = "CollisionBoundsColorGammaG";
|
||||
static const char * const k_pch_CollisionBounds_ColorGammaB_Int32 = "CollisionBoundsColorGammaB";
|
||||
@@ -2813,6 +2820,8 @@ namespace vr
|
||||
static const char * const k_pch_audio_PlaybackMirrorDevice_String = "playbackMirrorDevice";
|
||||
static const char * const k_pch_audio_PlaybackMirrorDeviceName_String = "playbackMirrorDeviceName";
|
||||
static const char * const k_pch_audio_OldPlaybackMirrorDevice_String = "onPlaybackMirrorDevice";
|
||||
static const char * const k_pch_audio_ActiveMirrorDevice_String = "activePlaybackMirrorDevice";
|
||||
static const char * const k_pch_audio_EnablePlaybackMirrorIndependentVolume_Bool = "enablePlaybackMirrorIndependentVolume";
|
||||
static const char * const k_pch_audio_LastHmdPlaybackDeviceId_String = "lastHmdPlaybackDeviceId";
|
||||
static const char * const k_pch_audio_VIVEHDMIGain = "viveHDMIGain";
|
||||
|
||||
@@ -2831,7 +2840,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_UseWebSettings = "useWebSettings";
|
||||
static const char * const k_pch_Dashboard_Position = "position";
|
||||
static const char * const k_pch_Dashboard_DesktopScale = "desktopScale";
|
||||
static const char * const k_pch_Dashboard_DashboardScale = "dashboardScale";
|
||||
@@ -3033,7 +3041,7 @@ public:
|
||||
/** Sets the Play Area in the working copy. */
|
||||
virtual void SetWorkingPlayAreaSize( float sizeX, float sizeZ ) = 0;
|
||||
|
||||
/** Sets the Collision Bounds in the working copy. */
|
||||
/** Sets the Collision Bounds in the working copy. Note: ceiling height is ignored. */
|
||||
virtual void SetWorkingCollisionBoundsInfo( VR_ARRAY_COUNT(unQuadsCount) HmdQuad_t *pQuadsBuffer, uint32_t unQuadsCount ) = 0;
|
||||
|
||||
/** Sets the Collision Bounds in the working copy. */
|
||||
@@ -4162,6 +4170,15 @@ enum EVRRenderModelError
|
||||
VRRenderModelError_InvalidTexture = 400,
|
||||
};
|
||||
|
||||
enum EVRRenderModelTextureFormat
|
||||
{
|
||||
VRRenderModelTextureFormat_RGBA8_SRGB = 0, // RGBA with 8 bits per channel per pixel. Data size is width * height * 4ub
|
||||
VRRenderModelTextureFormat_BC2,
|
||||
VRRenderModelTextureFormat_BC4,
|
||||
VRRenderModelTextureFormat_BC7,
|
||||
VRRenderModelTextureFormat_BC7_SRGB
|
||||
};
|
||||
|
||||
/** A single vertex in a render model */
|
||||
struct RenderModel_Vertex_t
|
||||
{
|
||||
@@ -4180,7 +4197,8 @@ struct RenderModel_Vertex_t
|
||||
struct RenderModel_TextureMap_t
|
||||
{
|
||||
uint16_t unWidth, unHeight; // width and height of the texture map in pixels
|
||||
const uint8_t *rubTextureMapData; // Map texture data. All textures are RGBA with 8 bits per channel per pixel. Data size is width * height * 4ub
|
||||
const uint8_t *rubTextureMapData; // Map texture data.
|
||||
EVRRenderModelTextureFormat format; // Refer to EVRRenderModelTextureFormat
|
||||
};
|
||||
#if defined(__linux__) || defined(__APPLE__)
|
||||
#pragma pack( pop )
|
||||
|
||||
+18
-2
@@ -4403,7 +4403,6 @@ public enum EVREventType
|
||||
VREvent_DashboardDeactivated = 503,
|
||||
VREvent_DashboardRequested = 505,
|
||||
VREvent_ResetDashboard = 506,
|
||||
VREvent_RenderToast = 507,
|
||||
VREvent_ImageLoaded = 508,
|
||||
VREvent_ShowKeyboard = 509,
|
||||
VREvent_HideKeyboard = 510,
|
||||
@@ -4462,6 +4461,8 @@ public enum EVREventType
|
||||
VREvent_LastKnownSectionSettingChanged = 867,
|
||||
VREvent_DismissedWarningsSectionSettingChanged = 868,
|
||||
VREvent_GpuSpeedSectionSettingChanged = 869,
|
||||
VREvent_WindowsMRSectionSettingChanged = 870,
|
||||
VREvent_OtherSectionSettingChanged = 871,
|
||||
VREvent_StatusUpdate = 900,
|
||||
VREvent_WebInterface_InstallDriverCompleted = 950,
|
||||
VREvent_MCImageUpdated = 1000,
|
||||
@@ -5168,6 +5169,14 @@ public enum EVRRenderModelError
|
||||
NotEnoughTexCoords = 308,
|
||||
InvalidTexture = 400,
|
||||
}
|
||||
public enum EVRRenderModelTextureFormat
|
||||
{
|
||||
RGBA8_SRGB = 0,
|
||||
BC2 = 1,
|
||||
BC4 = 2,
|
||||
BC7 = 3,
|
||||
BC7_SRGB = 4,
|
||||
}
|
||||
public enum EVRNotificationType
|
||||
{
|
||||
Transient = 0,
|
||||
@@ -5947,6 +5956,7 @@ public enum EVRDebugError
|
||||
public ushort unWidth;
|
||||
public ushort unHeight;
|
||||
public IntPtr rubTextureMapData; // const uint8_t *
|
||||
public EVRRenderModelTextureFormat format;
|
||||
}
|
||||
// This structure is for backwards binary compatibility on Linux and OSX only
|
||||
[StructLayout(LayoutKind.Sequential, Pack = 4)] public struct RenderModel_TextureMap_t_Packed
|
||||
@@ -5954,17 +5964,20 @@ public enum EVRDebugError
|
||||
public ushort unWidth;
|
||||
public ushort unHeight;
|
||||
public IntPtr rubTextureMapData; // const uint8_t *
|
||||
public EVRRenderModelTextureFormat format;
|
||||
public RenderModel_TextureMap_t_Packed(RenderModel_TextureMap_t unpacked)
|
||||
{
|
||||
this.unWidth = unpacked.unWidth;
|
||||
this.unHeight = unpacked.unHeight;
|
||||
this.rubTextureMapData = unpacked.rubTextureMapData;
|
||||
this.format = unpacked.format;
|
||||
}
|
||||
public void Unpack(ref RenderModel_TextureMap_t unpacked)
|
||||
{
|
||||
unpacked.unWidth = this.unWidth;
|
||||
unpacked.unHeight = this.unHeight;
|
||||
unpacked.rubTextureMapData = this.rubTextureMapData;
|
||||
unpacked.format = this.format;
|
||||
}
|
||||
}
|
||||
[StructLayout(LayoutKind.Sequential)] public struct RenderModel_t
|
||||
@@ -7072,6 +7085,7 @@ public class OpenVR
|
||||
public const string k_pch_Null_RenderHeight_Int32 = "renderHeight";
|
||||
public const string k_pch_Null_SecondsFromVsyncToPhotons_Float = "secondsFromVsyncToPhotons";
|
||||
public const string k_pch_Null_DisplayFrequency_Float = "displayFrequency";
|
||||
public const string k_pch_WindowsMR_Section = "driver_holographic";
|
||||
public const string k_pch_UserInterface_Section = "userinterface";
|
||||
public const string k_pch_UserInterface_StatusAlwaysOnTop_Bool = "StatusAlwaysOnTop";
|
||||
public const string k_pch_UserInterface_MinimizeToTray_Bool = "MinimizeToTray";
|
||||
@@ -7100,6 +7114,7 @@ public class OpenVR
|
||||
public const string k_pch_CollisionBounds_CenterMarkerOn_Bool = "CollisionBoundsCenterMarkerOn";
|
||||
public const string k_pch_CollisionBounds_PlaySpaceOn_Bool = "CollisionBoundsPlaySpaceOn";
|
||||
public const string k_pch_CollisionBounds_FadeDistance_Float = "CollisionBoundsFadeDistance";
|
||||
public const string k_pch_CollisionBounds_WallHeight_Float = "CollisionBoundsWallHeight";
|
||||
public const string k_pch_CollisionBounds_ColorGammaR_Int32 = "CollisionBoundsColorGammaR";
|
||||
public const string k_pch_CollisionBounds_ColorGammaG_Int32 = "CollisionBoundsColorGammaG";
|
||||
public const string k_pch_CollisionBounds_ColorGammaB_Int32 = "CollisionBoundsColorGammaB";
|
||||
@@ -7129,6 +7144,8 @@ public class OpenVR
|
||||
public const string k_pch_audio_PlaybackMirrorDevice_String = "playbackMirrorDevice";
|
||||
public const string k_pch_audio_PlaybackMirrorDeviceName_String = "playbackMirrorDeviceName";
|
||||
public const string k_pch_audio_OldPlaybackMirrorDevice_String = "onPlaybackMirrorDevice";
|
||||
public const string k_pch_audio_ActiveMirrorDevice_String = "activePlaybackMirrorDevice";
|
||||
public const string k_pch_audio_EnablePlaybackMirrorIndependentVolume_Bool = "enablePlaybackMirrorIndependentVolume";
|
||||
public const string k_pch_audio_LastHmdPlaybackDeviceId_String = "lastHmdPlaybackDeviceId";
|
||||
public const string k_pch_audio_VIVEHDMIGain = "viveHDMIGain";
|
||||
public const string k_pch_Power_Section = "power";
|
||||
@@ -7141,7 +7158,6 @@ public class OpenVR
|
||||
public const string k_pch_Dashboard_Section = "dashboard";
|
||||
public const string k_pch_Dashboard_EnableDashboard_Bool = "enableDashboard";
|
||||
public const string k_pch_Dashboard_ArcadeMode_Bool = "arcadeMode";
|
||||
public const string k_pch_Dashboard_UseWebSettings = "useWebSettings";
|
||||
public const string k_pch_Dashboard_Position = "position";
|
||||
public const string k_pch_Dashboard_DesktopScale = "desktopScale";
|
||||
public const string k_pch_Dashboard_DashboardScale = "dashboardScale";
|
||||
|
||||
+19
-4
@@ -390,7 +390,6 @@
|
||||
,{"name": "VREvent_DashboardDeactivated","value": "503"}
|
||||
,{"name": "VREvent_DashboardRequested","value": "505"}
|
||||
,{"name": "VREvent_ResetDashboard","value": "506"}
|
||||
,{"name": "VREvent_RenderToast","value": "507"}
|
||||
,{"name": "VREvent_ImageLoaded","value": "508"}
|
||||
,{"name": "VREvent_ShowKeyboard","value": "509"}
|
||||
,{"name": "VREvent_HideKeyboard","value": "510"}
|
||||
@@ -449,6 +448,8 @@
|
||||
,{"name": "VREvent_LastKnownSectionSettingChanged","value": "867"}
|
||||
,{"name": "VREvent_DismissedWarningsSectionSettingChanged","value": "868"}
|
||||
,{"name": "VREvent_GpuSpeedSectionSettingChanged","value": "869"}
|
||||
,{"name": "VREvent_WindowsMRSectionSettingChanged","value": "870"}
|
||||
,{"name": "VREvent_OtherSectionSettingChanged","value": "871"}
|
||||
,{"name": "VREvent_StatusUpdate","value": "900"}
|
||||
,{"name": "VREvent_WebInterface_InstallDriverCompleted","value": "950"}
|
||||
,{"name": "VREvent_MCImageUpdated","value": "1000"}
|
||||
@@ -1108,6 +1109,13 @@
|
||||
,{"name": "VRRenderModelError_NotEnoughTexCoords","value": "308"}
|
||||
,{"name": "VRRenderModelError_InvalidTexture","value": "400"}
|
||||
]}
|
||||
, {"enumname": "vr::EVRRenderModelTextureFormat","values": [
|
||||
{"name": "VRRenderModelTextureFormat_RGBA8_SRGB","value": "0"}
|
||||
,{"name": "VRRenderModelTextureFormat_BC2","value": "1"}
|
||||
,{"name": "VRRenderModelTextureFormat_BC4","value": "2"}
|
||||
,{"name": "VRRenderModelTextureFormat_BC7","value": "3"}
|
||||
,{"name": "VRRenderModelTextureFormat_BC7_SRGB","value": "4"}
|
||||
]}
|
||||
, {"enumname": "vr::EVRNotificationType","values": [
|
||||
{"name": "EVRNotificationType_Transient","value": "0"}
|
||||
,{"name": "EVRNotificationType_Persistent","value": "1"}
|
||||
@@ -1532,6 +1540,8 @@
|
||||
"constname": "k_pch_Null_SecondsFromVsyncToPhotons_Float","consttype": "const char *const", "constval": "secondsFromVsyncToPhotons"}
|
||||
,{
|
||||
"constname": "k_pch_Null_DisplayFrequency_Float","consttype": "const char *const", "constval": "displayFrequency"}
|
||||
,{
|
||||
"constname": "k_pch_WindowsMR_Section","consttype": "const char *const", "constval": "driver_holographic"}
|
||||
,{
|
||||
"constname": "k_pch_UserInterface_Section","consttype": "const char *const", "constval": "userinterface"}
|
||||
,{
|
||||
@@ -1588,6 +1598,8 @@
|
||||
"constname": "k_pch_CollisionBounds_PlaySpaceOn_Bool","consttype": "const char *const", "constval": "CollisionBoundsPlaySpaceOn"}
|
||||
,{
|
||||
"constname": "k_pch_CollisionBounds_FadeDistance_Float","consttype": "const char *const", "constval": "CollisionBoundsFadeDistance"}
|
||||
,{
|
||||
"constname": "k_pch_CollisionBounds_WallHeight_Float","consttype": "const char *const", "constval": "CollisionBoundsWallHeight"}
|
||||
,{
|
||||
"constname": "k_pch_CollisionBounds_ColorGammaR_Int32","consttype": "const char *const", "constval": "CollisionBoundsColorGammaR"}
|
||||
,{
|
||||
@@ -1646,6 +1658,10 @@
|
||||
"constname": "k_pch_audio_PlaybackMirrorDeviceName_String","consttype": "const char *const", "constval": "playbackMirrorDeviceName"}
|
||||
,{
|
||||
"constname": "k_pch_audio_OldPlaybackMirrorDevice_String","consttype": "const char *const", "constval": "onPlaybackMirrorDevice"}
|
||||
,{
|
||||
"constname": "k_pch_audio_ActiveMirrorDevice_String","consttype": "const char *const", "constval": "activePlaybackMirrorDevice"}
|
||||
,{
|
||||
"constname": "k_pch_audio_EnablePlaybackMirrorIndependentVolume_Bool","consttype": "const char *const", "constval": "enablePlaybackMirrorIndependentVolume"}
|
||||
,{
|
||||
"constname": "k_pch_audio_LastHmdPlaybackDeviceId_String","consttype": "const char *const", "constval": "lastHmdPlaybackDeviceId"}
|
||||
,{
|
||||
@@ -1670,8 +1686,6 @@
|
||||
"constname": "k_pch_Dashboard_EnableDashboard_Bool","consttype": "const char *const", "constval": "enableDashboard"}
|
||||
,{
|
||||
"constname": "k_pch_Dashboard_ArcadeMode_Bool","consttype": "const char *const", "constval": "arcadeMode"}
|
||||
,{
|
||||
"constname": "k_pch_Dashboard_UseWebSettings","consttype": "const char *const", "constval": "useWebSettings"}
|
||||
,{
|
||||
"constname": "k_pch_Dashboard_Position","consttype": "const char *const", "constval": "position"}
|
||||
,{
|
||||
@@ -2117,7 +2131,8 @@
|
||||
,{"struct": "vr::RenderModel_TextureMap_t","fields": [
|
||||
{ "fieldname": "unWidth", "fieldtype": "uint16_t"},
|
||||
{ "fieldname": "unHeight", "fieldtype": "uint16_t"},
|
||||
{ "fieldname": "rubTextureMapData", "fieldtype": "const uint8_t *"}]}
|
||||
{ "fieldname": "rubTextureMapData", "fieldtype": "const uint8_t *"},
|
||||
{ "fieldname": "format", "fieldtype": "enum vr::EVRRenderModelTextureFormat"}]}
|
||||
,{"struct": "vr::RenderModel_t","fields": [
|
||||
{ "fieldname": "rVertexData", "fieldtype": "const struct vr::RenderModel_Vertex_t *"},
|
||||
{ "fieldname": "unVertexCount", "fieldtype": "uint32_t"},
|
||||
|
||||
+73
-59
@@ -63,66 +63,66 @@ typedef uint64_t VRInputValueHandle_t;
|
||||
|
||||
// OpenVR Constants
|
||||
|
||||
static const unsigned int k_nDriverNone = 4294967295;
|
||||
static const unsigned int k_unMaxDriverDebugResponseSize = 32768;
|
||||
static const unsigned int k_unTrackedDeviceIndex_Hmd = 0;
|
||||
static const unsigned int k_unMaxTrackedDeviceCount = 64;
|
||||
static const unsigned int k_unTrackedDeviceIndexOther = 4294967294;
|
||||
static const unsigned int k_unTrackedDeviceIndexInvalid = 4294967295;
|
||||
static const unsigned long k_ulInvalidPropertyContainer = 0;
|
||||
static const unsigned int k_unInvalidPropertyTag = 0;
|
||||
static const unsigned long k_ulInvalidDriverHandle = 0;
|
||||
static const unsigned int k_unFloatPropertyTag = 1;
|
||||
static const unsigned int k_unInt32PropertyTag = 2;
|
||||
static const unsigned int k_unUint64PropertyTag = 3;
|
||||
static const unsigned int k_unBoolPropertyTag = 4;
|
||||
static const unsigned int k_unStringPropertyTag = 5;
|
||||
static const unsigned int k_unErrorPropertyTag = 6;
|
||||
static const unsigned int k_unDoublePropertyTag = 7;
|
||||
static const unsigned int k_unHmdMatrix34PropertyTag = 20;
|
||||
static const unsigned int k_unHmdMatrix44PropertyTag = 21;
|
||||
static const unsigned int k_unHmdVector3PropertyTag = 22;
|
||||
static const unsigned int k_unHmdVector4PropertyTag = 23;
|
||||
static const unsigned int k_unHmdVector2PropertyTag = 24;
|
||||
static const unsigned int k_unHmdQuadPropertyTag = 25;
|
||||
static const unsigned int k_unHiddenAreaPropertyTag = 30;
|
||||
static const unsigned int k_unPathHandleInfoTag = 31;
|
||||
static const unsigned int k_unActionPropertyTag = 32;
|
||||
static const unsigned int k_unInputValuePropertyTag = 33;
|
||||
static const unsigned int k_unWildcardPropertyTag = 34;
|
||||
static const unsigned int k_unHapticVibrationPropertyTag = 35;
|
||||
static const unsigned int k_unSkeletonPropertyTag = 36;
|
||||
static const unsigned int k_unSpatialAnchorPosePropertyTag = 40;
|
||||
static const unsigned int k_unJsonPropertyTag = 41;
|
||||
static const unsigned int k_unActiveActionSetPropertyTag = 42;
|
||||
static const unsigned int k_unOpenVRInternalReserved_Start = 1000;
|
||||
static const unsigned int k_unOpenVRInternalReserved_End = 10000;
|
||||
static const unsigned int k_unMaxPropertyStringSize = 32768;
|
||||
static const unsigned long k_ulInvalidActionHandle = 0;
|
||||
static const unsigned long k_ulInvalidActionSetHandle = 0;
|
||||
static const unsigned long k_ulInvalidInputValueHandle = 0;
|
||||
static const unsigned int k_unControllerStateAxisCount = 5;
|
||||
static const unsigned long k_ulOverlayHandleInvalid = 0;
|
||||
static const unsigned int k_unMaxDistortionFunctionParameters = 8;
|
||||
static const unsigned int k_unScreenshotHandleInvalid = 0;
|
||||
static const unsigned long k_nDriverNone = 4294967295;
|
||||
static const unsigned long k_unMaxDriverDebugResponseSize = 32768;
|
||||
static const unsigned long k_unTrackedDeviceIndex_Hmd = 0;
|
||||
static const unsigned long k_unMaxTrackedDeviceCount = 64;
|
||||
static const unsigned long k_unTrackedDeviceIndexOther = 4294967294;
|
||||
static const unsigned long k_unTrackedDeviceIndexInvalid = 4294967295;
|
||||
static const unsigned long long k_ulInvalidPropertyContainer = 0;
|
||||
static const unsigned long k_unInvalidPropertyTag = 0;
|
||||
static const unsigned long long k_ulInvalidDriverHandle = 0;
|
||||
static const unsigned long k_unFloatPropertyTag = 1;
|
||||
static const unsigned long k_unInt32PropertyTag = 2;
|
||||
static const unsigned long k_unUint64PropertyTag = 3;
|
||||
static const unsigned long k_unBoolPropertyTag = 4;
|
||||
static const unsigned long k_unStringPropertyTag = 5;
|
||||
static const unsigned long k_unErrorPropertyTag = 6;
|
||||
static const unsigned long k_unDoublePropertyTag = 7;
|
||||
static const unsigned long k_unHmdMatrix34PropertyTag = 20;
|
||||
static const unsigned long k_unHmdMatrix44PropertyTag = 21;
|
||||
static const unsigned long k_unHmdVector3PropertyTag = 22;
|
||||
static const unsigned long k_unHmdVector4PropertyTag = 23;
|
||||
static const unsigned long k_unHmdVector2PropertyTag = 24;
|
||||
static const unsigned long k_unHmdQuadPropertyTag = 25;
|
||||
static const unsigned long k_unHiddenAreaPropertyTag = 30;
|
||||
static const unsigned long k_unPathHandleInfoTag = 31;
|
||||
static const unsigned long k_unActionPropertyTag = 32;
|
||||
static const unsigned long k_unInputValuePropertyTag = 33;
|
||||
static const unsigned long k_unWildcardPropertyTag = 34;
|
||||
static const unsigned long k_unHapticVibrationPropertyTag = 35;
|
||||
static const unsigned long k_unSkeletonPropertyTag = 36;
|
||||
static const unsigned long k_unSpatialAnchorPosePropertyTag = 40;
|
||||
static const unsigned long k_unJsonPropertyTag = 41;
|
||||
static const unsigned long k_unActiveActionSetPropertyTag = 42;
|
||||
static const unsigned long k_unOpenVRInternalReserved_Start = 1000;
|
||||
static const unsigned long k_unOpenVRInternalReserved_End = 10000;
|
||||
static const unsigned long k_unMaxPropertyStringSize = 32768;
|
||||
static const unsigned long long k_ulInvalidActionHandle = 0;
|
||||
static const unsigned long long k_ulInvalidActionSetHandle = 0;
|
||||
static const unsigned long long k_ulInvalidInputValueHandle = 0;
|
||||
static const unsigned long k_unControllerStateAxisCount = 5;
|
||||
static const unsigned long long k_ulOverlayHandleInvalid = 0;
|
||||
static const unsigned long k_unMaxDistortionFunctionParameters = 8;
|
||||
static const unsigned long k_unScreenshotHandleInvalid = 0;
|
||||
static const char * IVRSystem_Version = "IVRSystem_021";
|
||||
static const char * IVRExtendedDisplay_Version = "IVRExtendedDisplay_001";
|
||||
static const char * IVRTrackedCamera_Version = "IVRTrackedCamera_006";
|
||||
static const unsigned int k_unMaxApplicationKeyLength = 128;
|
||||
static const unsigned long k_unMaxApplicationKeyLength = 128;
|
||||
static const char * k_pch_MimeType_HomeApp = "vr/home";
|
||||
static const char * k_pch_MimeType_GameTheater = "vr/game_theater";
|
||||
static const char * IVRApplications_Version = "IVRApplications_007";
|
||||
static const char * IVRChaperone_Version = "IVRChaperone_003";
|
||||
static const char * IVRChaperoneSetup_Version = "IVRChaperoneSetup_006";
|
||||
static const char * IVRCompositor_Version = "IVRCompositor_026";
|
||||
static const unsigned int k_unVROverlayMaxKeyLength = 128;
|
||||
static const unsigned int k_unVROverlayMaxNameLength = 128;
|
||||
static const unsigned int k_unMaxOverlayCount = 128;
|
||||
static const unsigned int k_unMaxOverlayIntersectionMaskPrimitivesCount = 32;
|
||||
static const unsigned long k_unVROverlayMaxKeyLength = 128;
|
||||
static const unsigned long k_unVROverlayMaxNameLength = 128;
|
||||
static const unsigned long k_unMaxOverlayCount = 128;
|
||||
static const unsigned long k_unMaxOverlayIntersectionMaskPrimitivesCount = 32;
|
||||
static const char * IVROverlay_Version = "IVROverlay_024";
|
||||
static const char * IVROverlayView_Version = "IVROverlayView_003";
|
||||
static const unsigned int k_unHeadsetViewMaxWidth = 3840;
|
||||
static const unsigned int k_unHeadsetViewMaxHeight = 2160;
|
||||
static const unsigned long k_unHeadsetViewMaxWidth = 3840;
|
||||
static const unsigned long k_unHeadsetViewMaxHeight = 2160;
|
||||
static const char * k_pchHeadsetViewOverlayKey = "system.HeadsetView";
|
||||
static const char * IVRHeadsetView_Version = "IVRHeadsetView_001";
|
||||
static const char * k_pch_Controller_Component_GDC2015 = "gdc2015";
|
||||
@@ -131,9 +131,9 @@ static const char * k_pch_Controller_Component_Tip = "tip";
|
||||
static const char * k_pch_Controller_Component_HandGrip = "handgrip";
|
||||
static const char * k_pch_Controller_Component_Status = "status";
|
||||
static const char * IVRRenderModels_Version = "IVRRenderModels_006";
|
||||
static const unsigned int k_unNotificationTextMaxSize = 256;
|
||||
static const unsigned long k_unNotificationTextMaxSize = 256;
|
||||
static const char * IVRNotifications_Version = "IVRNotifications_002";
|
||||
static const unsigned int k_unMaxSettingsKeyLength = 128;
|
||||
static const unsigned long k_unMaxSettingsKeyLength = 128;
|
||||
static const char * IVRSettings_Version = "IVRSettings_003";
|
||||
static const char * k_pch_SteamVR_Section = "steamvr";
|
||||
static const char * k_pch_SteamVR_RequireHmd_String = "requireHmd";
|
||||
@@ -232,6 +232,7 @@ static const char * k_pch_Null_RenderWidth_Int32 = "renderWidth";
|
||||
static const char * k_pch_Null_RenderHeight_Int32 = "renderHeight";
|
||||
static const char * k_pch_Null_SecondsFromVsyncToPhotons_Float = "secondsFromVsyncToPhotons";
|
||||
static const char * k_pch_Null_DisplayFrequency_Float = "displayFrequency";
|
||||
static const char * k_pch_WindowsMR_Section = "driver_holographic";
|
||||
static const char * k_pch_UserInterface_Section = "userinterface";
|
||||
static const char * k_pch_UserInterface_StatusAlwaysOnTop_Bool = "StatusAlwaysOnTop";
|
||||
static const char * k_pch_UserInterface_MinimizeToTray_Bool = "MinimizeToTray";
|
||||
@@ -260,6 +261,7 @@ static const char * k_pch_CollisionBounds_GroundPerimeterOn_Bool = "CollisionBou
|
||||
static const char * k_pch_CollisionBounds_CenterMarkerOn_Bool = "CollisionBoundsCenterMarkerOn";
|
||||
static const char * k_pch_CollisionBounds_PlaySpaceOn_Bool = "CollisionBoundsPlaySpaceOn";
|
||||
static const char * k_pch_CollisionBounds_FadeDistance_Float = "CollisionBoundsFadeDistance";
|
||||
static const char * k_pch_CollisionBounds_WallHeight_Float = "CollisionBoundsWallHeight";
|
||||
static const char * k_pch_CollisionBounds_ColorGammaR_Int32 = "CollisionBoundsColorGammaR";
|
||||
static const char * k_pch_CollisionBounds_ColorGammaG_Int32 = "CollisionBoundsColorGammaG";
|
||||
static const char * k_pch_CollisionBounds_ColorGammaB_Int32 = "CollisionBoundsColorGammaB";
|
||||
@@ -289,6 +291,8 @@ static const char * k_pch_audio_EnablePlaybackMirror_Bool = "enablePlaybackMirro
|
||||
static const char * k_pch_audio_PlaybackMirrorDevice_String = "playbackMirrorDevice";
|
||||
static const char * k_pch_audio_PlaybackMirrorDeviceName_String = "playbackMirrorDeviceName";
|
||||
static const char * k_pch_audio_OldPlaybackMirrorDevice_String = "onPlaybackMirrorDevice";
|
||||
static const char * k_pch_audio_ActiveMirrorDevice_String = "activePlaybackMirrorDevice";
|
||||
static const char * k_pch_audio_EnablePlaybackMirrorIndependentVolume_Bool = "enablePlaybackMirrorIndependentVolume";
|
||||
static const char * k_pch_audio_LastHmdPlaybackDeviceId_String = "lastHmdPlaybackDeviceId";
|
||||
static const char * k_pch_audio_VIVEHDMIGain = "viveHDMIGain";
|
||||
static const char * k_pch_Power_Section = "power";
|
||||
@@ -301,7 +305,6 @@ static const char * k_pch_Power_PauseCompositorOnStandby_Bool = "pauseCompositor
|
||||
static const char * k_pch_Dashboard_Section = "dashboard";
|
||||
static const char * k_pch_Dashboard_EnableDashboard_Bool = "enableDashboard";
|
||||
static const char * k_pch_Dashboard_ArcadeMode_Bool = "arcadeMode";
|
||||
static const char * k_pch_Dashboard_UseWebSettings = "useWebSettings";
|
||||
static const char * k_pch_Dashboard_Position = "position";
|
||||
static const char * k_pch_Dashboard_DesktopScale = "desktopScale";
|
||||
static const char * k_pch_Dashboard_DashboardScale = "dashboardScale";
|
||||
@@ -335,17 +338,17 @@ static const char * k_pch_GpuSpeed_Section = "GpuSpeed";
|
||||
static const char * IVRScreenshots_Version = "IVRScreenshots_001";
|
||||
static const char * IVRResources_Version = "IVRResources_001";
|
||||
static const char * IVRDriverManager_Version = "IVRDriverManager_001";
|
||||
static const unsigned int k_unMaxActionNameLength = 64;
|
||||
static const unsigned int k_unMaxActionSetNameLength = 64;
|
||||
static const unsigned int k_unMaxActionOriginCount = 16;
|
||||
static const unsigned int k_unMaxBoneNameLength = 32;
|
||||
static const unsigned long k_unMaxActionNameLength = 64;
|
||||
static const unsigned long k_unMaxActionSetNameLength = 64;
|
||||
static const unsigned long k_unMaxActionOriginCount = 16;
|
||||
static const unsigned long k_unMaxBoneNameLength = 32;
|
||||
static const int k_nActionSetOverlayGlobalPriorityMin = 16777216;
|
||||
static const int k_nActionSetOverlayGlobalPriorityMax = 33554431;
|
||||
static const int k_nActionSetPriorityReservedMin = 33554432;
|
||||
static const char * IVRInput_Version = "IVRInput_010";
|
||||
static const unsigned long k_ulInvalidIOBufferHandle = 0;
|
||||
static const unsigned long long k_ulInvalidIOBufferHandle = 0;
|
||||
static const char * IVRIOBuffer_Version = "IVRIOBuffer_002";
|
||||
static const unsigned int k_ulInvalidSpatialAnchorHandle = 0;
|
||||
static const unsigned long k_ulInvalidSpatialAnchorHandle = 0;
|
||||
static const char * IVRSpatialAnchors_Version = "IVRSpatialAnchors_001";
|
||||
static const char * IVRDebug_Version = "IVRDebug_001";
|
||||
|
||||
@@ -727,7 +730,6 @@ typedef enum EVREventType
|
||||
EVREventType_VREvent_DashboardDeactivated = 503,
|
||||
EVREventType_VREvent_DashboardRequested = 505,
|
||||
EVREventType_VREvent_ResetDashboard = 506,
|
||||
EVREventType_VREvent_RenderToast = 507,
|
||||
EVREventType_VREvent_ImageLoaded = 508,
|
||||
EVREventType_VREvent_ShowKeyboard = 509,
|
||||
EVREventType_VREvent_HideKeyboard = 510,
|
||||
@@ -786,6 +788,8 @@ typedef enum EVREventType
|
||||
EVREventType_VREvent_LastKnownSectionSettingChanged = 867,
|
||||
EVREventType_VREvent_DismissedWarningsSectionSettingChanged = 868,
|
||||
EVREventType_VREvent_GpuSpeedSectionSettingChanged = 869,
|
||||
EVREventType_VREvent_WindowsMRSectionSettingChanged = 870,
|
||||
EVREventType_VREvent_OtherSectionSettingChanged = 871,
|
||||
EVREventType_VREvent_StatusUpdate = 900,
|
||||
EVREventType_VREvent_WebInterface_InstallDriverCompleted = 950,
|
||||
EVREventType_VREvent_MCImageUpdated = 1000,
|
||||
@@ -1540,6 +1544,15 @@ typedef enum EVRRenderModelError
|
||||
EVRRenderModelError_VRRenderModelError_InvalidTexture = 400,
|
||||
} EVRRenderModelError;
|
||||
|
||||
typedef enum EVRRenderModelTextureFormat
|
||||
{
|
||||
EVRRenderModelTextureFormat_VRRenderModelTextureFormat_RGBA8_SRGB = 0,
|
||||
EVRRenderModelTextureFormat_VRRenderModelTextureFormat_BC2 = 1,
|
||||
EVRRenderModelTextureFormat_VRRenderModelTextureFormat_BC4 = 2,
|
||||
EVRRenderModelTextureFormat_VRRenderModelTextureFormat_BC7 = 3,
|
||||
EVRRenderModelTextureFormat_VRRenderModelTextureFormat_BC7_SRGB = 4,
|
||||
} EVRRenderModelTextureFormat;
|
||||
|
||||
typedef enum EVRNotificationType
|
||||
{
|
||||
EVRNotificationType_Transient = 0,
|
||||
@@ -2233,6 +2246,7 @@ typedef struct RenderModel_TextureMap_t
|
||||
uint16_t unWidth;
|
||||
uint16_t unHeight;
|
||||
uint8_t * rubTextureMapData; // const uint8_t *
|
||||
enum EVRRenderModelTextureFormat format;
|
||||
} RenderModel_TextureMap_t;
|
||||
|
||||
#if defined(__linux__) || defined(__APPLE__)
|
||||
|
||||
+17
-6
@@ -15,8 +15,8 @@
|
||||
namespace vr
|
||||
{
|
||||
static const uint32_t k_nSteamVRVersionMajor = 1;
|
||||
static const uint32_t k_nSteamVRVersionMinor = 10;
|
||||
static const uint32_t k_nSteamVRVersionBuild = 30;
|
||||
static const uint32_t k_nSteamVRVersionMinor = 11;
|
||||
static const uint32_t k_nSteamVRVersionBuild = 11;
|
||||
} // namespace vr
|
||||
|
||||
// vrtypes.h
|
||||
@@ -746,7 +746,7 @@ enum EVREventType
|
||||
//VREvent_DashboardThumbSelected = 504, // Sent to the overlay manager - data is overlay - No longer sent
|
||||
VREvent_DashboardRequested = 505, // Sent to the overlay manager - data is overlay
|
||||
VREvent_ResetDashboard = 506, // Send to the overlay manager
|
||||
VREvent_RenderToast = 507, // Send to the dashboard to render a toast - data is the notification ID
|
||||
//VREvent_RenderToast = 507, // Send to the dashboard to render a toast - data is the notification ID -- no longer sent
|
||||
VREvent_ImageLoaded = 508, // Sent to overlays when a SetOverlayRaw or SetOverlayFromFile call finishes loading
|
||||
VREvent_ShowKeyboard = 509, // Sent to keyboard renderer in the dashboard to invoke it
|
||||
VREvent_HideKeyboard = 510, // Sent to keyboard renderer in the dashboard to hide it
|
||||
@@ -816,6 +816,8 @@ enum EVREventType
|
||||
VREvent_LastKnownSectionSettingChanged = 867,
|
||||
VREvent_DismissedWarningsSectionSettingChanged = 868,
|
||||
VREvent_GpuSpeedSectionSettingChanged = 869,
|
||||
VREvent_WindowsMRSectionSettingChanged = 870,
|
||||
VREvent_OtherSectionSettingChanged = 871,
|
||||
|
||||
VREvent_StatusUpdate = 900,
|
||||
|
||||
@@ -2318,6 +2320,10 @@ namespace vr
|
||||
static const char * const k_pch_Null_SecondsFromVsyncToPhotons_Float = "secondsFromVsyncToPhotons";
|
||||
static const char * const k_pch_Null_DisplayFrequency_Float = "displayFrequency";
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Windows MR keys
|
||||
static const char * const k_pch_WindowsMR_Section = "driver_holographic";
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// user interface keys
|
||||
static const char * const k_pch_UserInterface_Section = "userinterface";
|
||||
@@ -2360,6 +2366,7 @@ namespace vr
|
||||
static const char * const k_pch_CollisionBounds_CenterMarkerOn_Bool = "CollisionBoundsCenterMarkerOn";
|
||||
static const char * const k_pch_CollisionBounds_PlaySpaceOn_Bool = "CollisionBoundsPlaySpaceOn";
|
||||
static const char * const k_pch_CollisionBounds_FadeDistance_Float = "CollisionBoundsFadeDistance";
|
||||
static const char * const k_pch_CollisionBounds_WallHeight_Float = "CollisionBoundsWallHeight";
|
||||
static const char * const k_pch_CollisionBounds_ColorGammaR_Int32 = "CollisionBoundsColorGammaR";
|
||||
static const char * const k_pch_CollisionBounds_ColorGammaG_Int32 = "CollisionBoundsColorGammaG";
|
||||
static const char * const k_pch_CollisionBounds_ColorGammaB_Int32 = "CollisionBoundsColorGammaB";
|
||||
@@ -2395,6 +2402,8 @@ namespace vr
|
||||
static const char * const k_pch_audio_PlaybackMirrorDevice_String = "playbackMirrorDevice";
|
||||
static const char * const k_pch_audio_PlaybackMirrorDeviceName_String = "playbackMirrorDeviceName";
|
||||
static const char * const k_pch_audio_OldPlaybackMirrorDevice_String = "onPlaybackMirrorDevice";
|
||||
static const char * const k_pch_audio_ActiveMirrorDevice_String = "activePlaybackMirrorDevice";
|
||||
static const char * const k_pch_audio_EnablePlaybackMirrorIndependentVolume_Bool = "enablePlaybackMirrorIndependentVolume";
|
||||
static const char * const k_pch_audio_LastHmdPlaybackDeviceId_String = "lastHmdPlaybackDeviceId";
|
||||
static const char * const k_pch_audio_VIVEHDMIGain = "viveHDMIGain";
|
||||
|
||||
@@ -2413,7 +2422,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_UseWebSettings = "useWebSettings";
|
||||
static const char * const k_pch_Dashboard_Position = "position";
|
||||
static const char * const k_pch_Dashboard_DesktopScale = "desktopScale";
|
||||
static const char * const k_pch_Dashboard_DashboardScale = "dashboardScale";
|
||||
@@ -2700,8 +2708,11 @@ namespace vr
|
||||
|
||||
// Projection matrix used to render the depth buffer.
|
||||
vr::HmdMatrix44_t mProjection;
|
||||
|
||||
// Hmd pose used to render this layer.
|
||||
vr::HmdMatrix34_t mHmdPose;
|
||||
};
|
||||
virtual void SubmitLayer( const SubmitLayerPerEye_t( &perEye )[ 2 ], const vr::HmdMatrix34_t *pPose ) {}
|
||||
virtual void SubmitLayer( const SubmitLayerPerEye_t( &perEye )[ 2 ] ) {}
|
||||
|
||||
/** Submits queued layers for display. */
|
||||
virtual void Present( vr::SharedTextureHandle_t syncTexture ) {}
|
||||
@@ -2713,7 +2724,7 @@ namespace vr
|
||||
virtual void GetFrameTiming( DriverDirectMode_FrameTiming *pFrameTiming ) {}
|
||||
};
|
||||
|
||||
static const char *IVRDriverDirectModeComponent_Version = "IVRDriverDirectModeComponent_005";
|
||||
static const char *IVRDriverDirectModeComponent_Version = "IVRDriverDirectModeComponent_006";
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user