summaryrefslogtreecommitdiffhomepage
path: root/examples/oculus_glfw_sample/OculusSDK/LibOVR/Include/Extras
diff options
context:
space:
mode:
authorraysan5 <[email protected]>2016-05-31 20:08:36 +0200
committerraysan5 <[email protected]>2016-05-31 20:08:36 +0200
commit8f91ed81c58fd5cdbeda4db5478649bd677712da (patch)
treee5dfd2e4784aff7630df89f392fd1498f1bfad7d /examples/oculus_glfw_sample/OculusSDK/LibOVR/Include/Extras
parentd17a0cee1aa53978387e68be58d901bffd1ac0a9 (diff)
downloadraylib-8f91ed81c58fd5cdbeda4db5478649bd677712da.tar.gz
raylib-8f91ed81c58fd5cdbeda4db5478649bd677712da.zip
Updated Oculus sample to Oculus SDK 1.4
Still working on the sample but almost finished. Some rlgl internals redesign required and it will be ready!
Diffstat (limited to 'examples/oculus_glfw_sample/OculusSDK/LibOVR/Include/Extras')
-rw-r--r--examples/oculus_glfw_sample/OculusSDK/LibOVR/Include/Extras/OVR_CAPI_Util.h12
-rw-r--r--examples/oculus_glfw_sample/OculusSDK/LibOVR/Include/Extras/OVR_Math.h4
2 files changed, 8 insertions, 8 deletions
diff --git a/examples/oculus_glfw_sample/OculusSDK/LibOVR/Include/Extras/OVR_CAPI_Util.h b/examples/oculus_glfw_sample/OculusSDK/LibOVR/Include/Extras/OVR_CAPI_Util.h
index 587c696e..552f3b12 100644
--- a/examples/oculus_glfw_sample/OculusSDK/LibOVR/Include/Extras/OVR_CAPI_Util.h
+++ b/examples/oculus_glfw_sample/OculusSDK/LibOVR/Include/Extras/OVR_CAPI_Util.h
@@ -137,14 +137,14 @@ OVR_PUBLIC_FUNCTION(ovrMatrix4f) ovrMatrix4f_OrthoSubProjection(ovrMatrix4f proj
/// Computes offset eye poses based on headPose returned by ovrTrackingState.
///
/// \param[in] headPose Indicates the HMD position and orientation to use for the calculation.
-/// \param[in] HmdToEyeOffset Can be ovrEyeRenderDesc.HmdToEyeOffset returned from
+/// \param[in] hmdToEyeOffset Can be ovrEyeRenderDesc.HmdToEyeOffset returned from
/// ovr_GetRenderDesc. For monoscopic rendering, use a vector that is the average
/// of the two vectors for both eyes.
/// \param[out] outEyePoses If outEyePoses are used for rendering, they should be passed to
/// ovr_SubmitFrame in ovrLayerEyeFov::RenderPose or ovrLayerEyeFovDepth::RenderPose.
///
OVR_PUBLIC_FUNCTION(void) ovr_CalcEyePoses(ovrPosef headPose,
- const ovrVector3f HmdToEyeOffset[2],
+ const ovrVector3f hmdToEyeOffset[2],
ovrPosef outEyePoses[2]);
@@ -158,17 +158,17 @@ OVR_PUBLIC_FUNCTION(void) ovr_CalcEyePoses(ovrPosef headPose,
/// \param[in] hmd Specifies an ovrSession previously returned by ovr_Create.
/// \param[in] frameIndex Specifies the targeted frame index, or 0 to refer to one frame after
/// the last time ovr_SubmitFrame was called.
-/// \param[in] HmdToEyeOffset Can be ovrEyeRenderDesc.HmdToEyeOffset returned from
-/// ovr_GetRenderDesc. For monoscopic rendering, use a vector that is the average
-/// of the two vectors for both eyes.
/// \param[in] latencyMarker Specifies that this call is the point in time where
/// the "App-to-Mid-Photon" latency timer starts from. If a given ovrLayer
/// provides "SensorSampleTimestamp", that will override the value stored here.
+/// \param[in] hmdToEyeOffset Can be ovrEyeRenderDesc.HmdToEyeOffset returned from
+/// ovr_GetRenderDesc. For monoscopic rendering, use a vector that is the average
+/// of the two vectors for both eyes.
/// \param[out] outEyePoses The predicted eye poses.
/// \param[out] outSensorSampleTime The time when this function was called. May be NULL, in which case it is ignored.
///
OVR_PUBLIC_FUNCTION(void) ovr_GetEyePoses(ovrSession session, long long frameIndex, ovrBool latencyMarker,
- const ovrVector3f HmdToEyeOffset[2],
+ const ovrVector3f hmdToEyeOffset[2],
ovrPosef outEyePoses[2],
double* outSensorSampleTime);
diff --git a/examples/oculus_glfw_sample/OculusSDK/LibOVR/Include/Extras/OVR_Math.h b/examples/oculus_glfw_sample/OculusSDK/LibOVR/Include/Extras/OVR_Math.h
index 3a8a8045..c182ed5b 100644
--- a/examples/oculus_glfw_sample/OculusSDK/LibOVR/Include/Extras/OVR_Math.h
+++ b/examples/oculus_glfw_sample/OculusSDK/LibOVR/Include/Extras/OVR_Math.h
@@ -1,7 +1,7 @@
/********************************************************************************//**
\file OVR_Math.h
\brief Implementation of 3D primitives such as vectors, matrices.
-\copyright Copyright 2015 Oculus VR, LLC All Rights reserved.
+\copyright Copyright 2014-2016 Oculus VR, LLC All Rights reserved.
*************************************************************************************/
#ifndef OVR_Math_h
@@ -1754,7 +1754,7 @@ public:
: Rotation(s.Rotation), Translation(s.Translation)
{
// Ensure normalized rotation if converting from float to double
- if (sizeof(T) > sizeof(Math<T>::OtherFloatType))
+ if (sizeof(T) > sizeof(typename Math<T>::OtherFloatType))
Rotation.Normalize();
}