From 4207f9c279e832e3afcb3f5fc6cd8d84cb4cfe4c Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sat, 28 Mar 2015 01:43:35 +0100 Subject: Bump OculusVR RIFT SDK to 0.5.0.1 --- LibOVR/Src/CAPI/CAPI_HSWDisplay.h | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) (limited to 'LibOVR/Src/CAPI/CAPI_HSWDisplay.h') diff --git a/LibOVR/Src/CAPI/CAPI_HSWDisplay.h b/LibOVR/Src/CAPI/CAPI_HSWDisplay.h index ee984d8..d98f351 100644 --- a/LibOVR/Src/CAPI/CAPI_HSWDisplay.h +++ b/LibOVR/Src/CAPI/CAPI_HSWDisplay.h @@ -27,7 +27,7 @@ limitations under the License. #ifndef OVR_CAPI_HSWDisplay_h #define OVR_CAPI_HSWDisplay_h -#include "../OVR_CAPI.h" +#include "OVR_CAPI.h" #include "CAPI_HMDRenderState.h" #include @@ -78,23 +78,6 @@ limitations under the License. -//------------------------------------------------------------------------------------- -// ***** Experimental C API functions -// -// These are currently not formally supported and may be promoted to the formal C API -// or may be removed in the future. - -extern "C" -{ - // Normally if an application uses SDK-based distortion rendering - // (ovrHmd_BeginFrame / ovrHmd_EndFrame) then the SDK also takes care of - // drawing the health and safety warning. If an application is using - // SDK-based rendering but wants to draw the warning display itself, - // it call this function with enabled set to false. - OVR_EXPORT void ovrhmd_EnableHSWDisplaySDKRender(ovrHmd hmd, ovrBool enabled); -} - - namespace OVR { namespace CAPI { @@ -214,7 +197,7 @@ protected: void SetCurrentProfileLastHSWTime(time_t t); // Generates an appropriate stereo ortho projection matrix. - static void GetOrthoProjection(const HMDRenderState& RenderState, Matrix4f OrthoProjection[2]); + void GetOrthoProjection(const HMDRenderState& RenderState, Matrix4f OrthoProjection[2]); // Returns the default HSW display texture data. static const uint8_t* GetDefaultTexture(size_t& TextureSize); -- cgit v1.2.3