Updated LibOVR to SDK version 1.8
Weird, OVR_Version.h still points to 1.7, probably a typo...
This commit is contained in:
raysan5
parent
79c8eb543e
commit
c5bf9623d1
7 changed files with 114 additions and 58 deletions
63
src/external/OculusSDK/LibOVR/Include/OVR_CAPI.h
vendored
63
src/external/OculusSDK/LibOVR/Include/OVR_CAPI.h
vendored
|
|
@ -271,6 +271,12 @@ typedef char ovrBool; ///< Boolean type
|
|||
//-----------------------------------------------------------------------------------
|
||||
// ***** Simple Math Structures
|
||||
|
||||
/// A RGBA color with normalized float components.
|
||||
typedef struct OVR_ALIGNAS(4) ovrColorf_
|
||||
{
|
||||
float r, g, b, a;
|
||||
} ovrColorf;
|
||||
|
||||
/// A 2D vector with integer components.
|
||||
typedef struct OVR_ALIGNAS(4) ovrVector2i_
|
||||
{
|
||||
|
|
@ -883,6 +889,15 @@ typedef struct ovrHapticsPlaybackState_
|
|||
int SamplesQueued;
|
||||
} ovrHapticsPlaybackState;
|
||||
|
||||
/// Position tracked devices
|
||||
typedef enum ovrTrackedDeviceType_
|
||||
{
|
||||
ovrTrackedDevice_HMD = 0x0001,
|
||||
ovrTrackedDevice_LTouch = 0x0002,
|
||||
ovrTrackedDevice_RTouch = 0x0004,
|
||||
ovrTrackedDevice_Touch = 0x0006,
|
||||
ovrTrackedDevice_All = 0xFFFF,
|
||||
} ovrTrackedDeviceType;
|
||||
|
||||
/// Provides names for the left and right hand array indexes.
|
||||
///
|
||||
|
|
@ -903,27 +918,43 @@ typedef enum ovrHandType_
|
|||
/// their inputs are combined.
|
||||
typedef struct ovrInputState_
|
||||
{
|
||||
// System type when the controller state was last updated.
|
||||
/// System type when the controller state was last updated.
|
||||
double TimeInSeconds;
|
||||
|
||||
// Values for buttons described by ovrButton.
|
||||
/// Values for buttons described by ovrButton.
|
||||
unsigned int Buttons;
|
||||
|
||||
// Touch values for buttons and sensors as described by ovrTouch.
|
||||
/// Touch values for buttons and sensors as described by ovrTouch.
|
||||
unsigned int Touches;
|
||||
|
||||
// Left and right finger trigger values (ovrHand_Left and ovrHand_Right), in the range 0.0 to 1.0f.
|
||||
/// Left and right finger trigger values (ovrHand_Left and ovrHand_Right), in the range 0.0 to 1.0f.
|
||||
/// Returns 0 if the value would otherwise be less than 0.1176, for ovrControllerType_XBox
|
||||
float IndexTrigger[ovrHand_Count];
|
||||
|
||||
// Left and right hand trigger values (ovrHand_Left and ovrHand_Right), in the range 0.0 to 1.0f.
|
||||
/// Left and right hand trigger values (ovrHand_Left and ovrHand_Right), in the range 0.0 to 1.0f.
|
||||
float HandTrigger[ovrHand_Count];
|
||||
|
||||
// Horizontal and vertical thumbstick axis values (ovrHand_Left and ovrHand_Right), in the range -1.0f to 1.0f.
|
||||
/// Horizontal and vertical thumbstick axis values (ovrHand_Left and ovrHand_Right), in the range -1.0f to 1.0f.
|
||||
/// Returns a deadzone (value 0) per each axis if the value on that axis would otherwise have been between -.2746 to +.2746, for ovrControllerType_XBox
|
||||
ovrVector2f Thumbstick[ovrHand_Count];
|
||||
|
||||
// The type of the controller this state is for.
|
||||
/// The type of the controller this state is for.
|
||||
ovrControllerType ControllerType;
|
||||
|
||||
/// Left and right finger trigger values (ovrHand_Left and ovrHand_Right), in the range 0.0 to 1.0f.
|
||||
/// Does not apply a deadzone
|
||||
/// Added in 1.7
|
||||
float IndexTriggerNoDeadzone[ovrHand_Count];
|
||||
|
||||
/// Left and right hand trigger values (ovrHand_Left and ovrHand_Right), in the range 0.0 to 1.0f.
|
||||
/// Does not apply a deadzone
|
||||
/// Added in 1.7
|
||||
float HandTriggerNoDeadzone[ovrHand_Count];
|
||||
|
||||
/// Horizontal and vertical thumbstick axis values (ovrHand_Left and ovrHand_Right), in the range -1.0f to 1.0f
|
||||
/// Does not apply a deadzone
|
||||
/// Added in 1.7
|
||||
ovrVector2f ThumbstickNoDeadzone[ovrHand_Count];
|
||||
} ovrInputState;
|
||||
|
||||
|
||||
|
|
@ -1014,6 +1045,7 @@ typedef struct OVR_ALIGNAS(8) ovrInitParams_
|
|||
extern "C" {
|
||||
#endif
|
||||
|
||||
#if !defined(OVR_EXPORTING_CAPI)
|
||||
|
||||
// -----------------------------------------------------------------------------------
|
||||
// ***** API Interfaces
|
||||
|
|
@ -1242,6 +1274,7 @@ OVR_PUBLIC_FUNCTION(ovrResult) ovr_Create(ovrSession* pSession, ovrGraphicsLuid*
|
|||
///
|
||||
OVR_PUBLIC_FUNCTION(void) ovr_Destroy(ovrSession session);
|
||||
|
||||
#endif // !defined(OVR_EXPORTING_CAPI)
|
||||
|
||||
/// Specifies status information for the current session.
|
||||
///
|
||||
|
|
@ -1257,6 +1290,7 @@ typedef struct ovrSessionStatus_
|
|||
ovrBool ShouldRecenter; ///< True if UX has requested re-centering. Must call ovr_ClearShouldRecenterFlag or ovr_RecenterTrackingOrigin.
|
||||
}ovrSessionStatus;
|
||||
|
||||
#if !defined(OVR_EXPORTING_CAPI)
|
||||
|
||||
/// Returns status information for the application.
|
||||
///
|
||||
|
|
@ -1448,7 +1482,7 @@ OVR_PUBLIC_FUNCTION(ovrResult) ovr_SubmitControllerVibration(ovrSession session,
|
|||
OVR_PUBLIC_FUNCTION(ovrResult) ovr_GetControllerVibrationState(ovrSession session, ovrControllerType controllerType, ovrHapticsPlaybackState* outState);
|
||||
|
||||
|
||||
///@}
|
||||
#endif // !defined(OVR_EXPORTING_CAPI)
|
||||
|
||||
//-------------------------------------------------------------------------------------
|
||||
// @name Layers
|
||||
|
|
@ -1672,7 +1706,7 @@ typedef union ovrLayer_Union_
|
|||
|
||||
//@}
|
||||
|
||||
|
||||
#if !defined(OVR_EXPORTING_CAPI)
|
||||
|
||||
/// @name SDK Distortion Rendering
|
||||
///
|
||||
|
|
@ -1874,7 +1908,7 @@ OVR_PUBLIC_FUNCTION(ovrResult) ovr_SubmitFrame(ovrSession session, long long fra
|
|||
ovrLayerHeader const * const * layerPtrList, unsigned int layerCount);
|
||||
///@}
|
||||
|
||||
|
||||
#endif // !defined(OVR_EXPORTING_CAPI)
|
||||
|
||||
//-------------------------------------------------------------------------------------
|
||||
/// @name Frame Timing
|
||||
|
|
@ -1882,6 +1916,8 @@ OVR_PUBLIC_FUNCTION(ovrResult) ovr_SubmitFrame(ovrSession session, long long fra
|
|||
//@{
|
||||
|
||||
|
||||
#if !defined(OVR_EXPORTING_CAPI)
|
||||
|
||||
/// Gets the time of the specified frame midpoint.
|
||||
///
|
||||
/// Predicts the time at which the given frame will be displayed. The predicted time
|
||||
|
|
@ -1889,7 +1925,7 @@ OVR_PUBLIC_FUNCTION(ovrResult) ovr_SubmitFrame(ovrSession session, long long fra
|
|||
/// be displayed.
|
||||
///
|
||||
/// The application should increment frameIndex for each successively targeted frame,
|
||||
/// and pass that index to any relevent OVR functions that need to apply to the frame
|
||||
/// and pass that index to any relevant OVR functions that need to apply to the frame
|
||||
/// identified by that index.
|
||||
///
|
||||
/// This function is thread-safe and allows for multiple application threads to target
|
||||
|
|
@ -1917,6 +1953,7 @@ OVR_PUBLIC_FUNCTION(double) ovr_GetPredictedDisplayTime(ovrSession session, long
|
|||
///
|
||||
OVR_PUBLIC_FUNCTION(double) ovr_GetTimeInSeconds();
|
||||
|
||||
#endif // !defined(OVR_EXPORTING_CAPI)
|
||||
|
||||
/// Performance HUD enables the HMD user to see information critical to
|
||||
/// the real-time operation of the VR application such as latency timing,
|
||||
|
|
@ -1984,7 +2021,7 @@ typedef enum ovrDebugHudStereoMode_
|
|||
} ovrDebugHudStereoMode;
|
||||
|
||||
|
||||
|
||||
#if !defined(OVR_EXPORTING_CAPI)
|
||||
|
||||
// -----------------------------------------------------------------------------------
|
||||
/// @name Property Access
|
||||
|
|
@ -2102,7 +2139,7 @@ OVR_PUBLIC_FUNCTION(ovrBool) ovr_SetString(ovrSession session, const char* prope
|
|||
|
||||
///@}
|
||||
|
||||
|
||||
#endif // !defined(OVR_EXPORTING_CAPI)
|
||||
|
||||
#ifdef __cplusplus
|
||||
} // extern "C"
|
||||
|
|
|
|||
|
|
@ -17,6 +17,8 @@
|
|||
#include "OVR_CAPI.h"
|
||||
#define OVR_AUDIO_MAX_DEVICE_STR_SIZE 128
|
||||
|
||||
#if !defined(OVR_EXPORTING_CAPI)
|
||||
|
||||
/// Gets the ID of the preferred VR audio output device.
|
||||
///
|
||||
/// \param[out] deviceOutId The ID of the user's preferred VR audio device to use, which will be valid upon a successful return value, else it will be WAVE_MAPPER.
|
||||
|
|
@ -75,6 +77,8 @@ OVR_PUBLIC_FUNCTION(ovrResult) ovr_GetAudioDeviceInGuidStr(WCHAR deviceInStrBuff
|
|||
///
|
||||
OVR_PUBLIC_FUNCTION(ovrResult) ovr_GetAudioDeviceInGuid(GUID* deviceInGuid);
|
||||
|
||||
#endif // !defined(OVR_EXPORTING_CAPI)
|
||||
|
||||
#endif //OVR_OS_MS
|
||||
|
||||
#endif // OVR_CAPI_Audio_h
|
||||
|
|
|
|||
|
|
@ -14,6 +14,8 @@
|
|||
#if defined (_WIN32)
|
||||
#include <Unknwn.h>
|
||||
|
||||
#if !defined(OVR_EXPORTING_CAPI)
|
||||
|
||||
//-----------------------------------------------------------------------------------
|
||||
// ***** Direct3D Specific
|
||||
|
||||
|
|
@ -149,6 +151,7 @@ OVR_PUBLIC_FUNCTION(ovrResult) ovr_GetMirrorTextureBufferDX(ovrSession session,
|
|||
IID iid,
|
||||
void** out_Buffer);
|
||||
|
||||
#endif // !defined(OVR_EXPORTING_CAPI)
|
||||
|
||||
#endif // _WIN32
|
||||
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@
|
|||
|
||||
#include "OVR_CAPI.h"
|
||||
|
||||
#if !defined(OVR_EXPORTING_CAPI)
|
||||
|
||||
/// Creates a TextureSwapChain suitable for use with OpenGL.
|
||||
///
|
||||
/// \param[in] session Specifies an ovrSession previously returned by ovr_Create.
|
||||
|
|
@ -95,5 +97,6 @@ OVR_PUBLIC_FUNCTION(ovrResult) ovr_GetMirrorTextureBufferGL(ovrSession session,
|
|||
ovrMirrorTexture mirrorTexture,
|
||||
unsigned int* out_TexId);
|
||||
|
||||
#endif // !defined(OVR_EXPORTING_CAPI)
|
||||
|
||||
#endif // OVR_CAPI_GL_h
|
||||
|
|
|
|||
|
|
@ -88,6 +88,7 @@ typedef enum ovrErrorType_
|
|||
ovrError_ClientSkippedDestroy = -1012, ///< The client failed to call ovr_Destroy on an active session before calling ovr_Shutdown. Or the client crashed.
|
||||
ovrError_ClientSkippedShutdown = -1013, ///< The client failed to call ovr_Shutdown or the client crashed.
|
||||
ovrError_ServiceDeadlockDetected = -1014, ///< The service watchdog discovered a deadlock.
|
||||
ovrError_InvalidOperation = -1015, ///< Function call is invalid for object's current state
|
||||
|
||||
/* Audio error range, reserved for Audio errors. */
|
||||
ovrError_AudioDeviceNotFound = -2001, ///< Failure to find the specified audio device.
|
||||
|
|
@ -115,6 +116,9 @@ typedef enum ovrErrorType_
|
|||
ovrError_HybridGraphicsNotSupported = -3018, ///< The system is using hybrid graphics (Optimus, etc...), which is not support.
|
||||
ovrError_DisplayManagerInit = -3019, ///< Initialization of the DisplayManager failed.
|
||||
ovrError_TrackerDriverInit = -3020, ///< Failed to get the interface for an attached tracker
|
||||
ovrError_LibSignCheck = -3021, ///< LibOVRRT signature check failure.
|
||||
ovrError_LibPath = -3022, ///< LibOVRRT path failure.
|
||||
ovrError_LibSymbols = -3023, ///< LibOVRRT symbol resolution failure.
|
||||
|
||||
/* Rendering errors */
|
||||
ovrError_DisplayLost = -6000, ///< In the event of a system-wide graphics reset or cable unplug this is returned to the app.
|
||||
|
|
@ -130,6 +134,11 @@ typedef enum ovrErrorType_
|
|||
/* Fatal errors */
|
||||
ovrError_RuntimeException = -7000, ///< A runtime exception occurred. The application is required to shutdown LibOVR and re-initialize it before this error state will be cleared.
|
||||
|
||||
/* Calibration errors */
|
||||
ovrError_NoCalibration = -9000, ///< Result of a missing calibration block
|
||||
ovrError_OldVersion = -9001, ///< Result of an old calibration block
|
||||
ovrError_MisformattedBlock = -9002, ///< Result of a bad calibration block due to lengths
|
||||
|
||||
|
||||
} ovrErrorType;
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
// Master version numbers
|
||||
#define OVR_PRODUCT_VERSION 1 // Product version doesn't participate in semantic versioning.
|
||||
#define OVR_MAJOR_VERSION 1 // If you change these values then you need to also make sure to change LibOVR/Projects/Windows/LibOVR.props in parallel.
|
||||
#define OVR_MINOR_VERSION 6 //
|
||||
#define OVR_MINOR_VERSION 7 //
|
||||
#define OVR_PATCH_VERSION 0
|
||||
#define OVR_BUILD_NUMBER 0
|
||||
|
||||
|
|
|
|||
BIN
src/external/OculusSDK/LibOVR/LibOVRRT32_1.dll
vendored
BIN
src/external/OculusSDK/LibOVR/LibOVRRT32_1.dll
vendored
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue