From a6cbc09eacb144a580a08837d3249016eb5e458b Mon Sep 17 00:00:00 2001 From: Sam Gondelman Date: Thu, 2 Jul 2015 12:32:35 -0700 Subject: [PATCH] reverted to openvr 0.9.1 --- cmake/externals/openvr/CMakeLists.txt | 4 ++-- .../src/display-plugins/openvr/OpenVrDisplayPlugin.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake/externals/openvr/CMakeLists.txt b/cmake/externals/openvr/CMakeLists.txt index 65c6b8687c..413618c842 100644 --- a/cmake/externals/openvr/CMakeLists.txt +++ b/cmake/externals/openvr/CMakeLists.txt @@ -7,8 +7,8 @@ string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER) ExternalProject_Add( ${EXTERNAL_NAME} - URL https://github.com/ValveSoftware/openvr/archive/0.9.2.zip - URL_MD5 3ff7b67861b63ef673014e353f2c1bf6 + URL https://github.com/ValveSoftware/openvr/archive/0.9.1.zip + URL_MD5 f986f5a6815e9454c53c5bf58ce02fdc CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND "" diff --git a/libraries/display-plugins/src/display-plugins/openvr/OpenVrDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/openvr/OpenVrDisplayPlugin.cpp index 0a943ad626..c121942102 100644 --- a/libraries/display-plugins/src/display-plugins/openvr/OpenVrDisplayPlugin.cpp +++ b/libraries/display-plugins/src/display-plugins/openvr/OpenVrDisplayPlugin.cpp @@ -167,8 +167,8 @@ void OpenVrDisplayPlugin::customizeContext(PluginContainer * container) { void OpenVrDisplayPlugin::display(GLuint finalTexture, const glm::uvec2& sceneSize) { // Flip y-axis since GL UV coords are backwards. - static vr::VRTextureBounds_t leftBounds{ 0, 1, 0.5f, 0 }; - static vr::VRTextureBounds_t rightBounds{ 0.5f, 1, 1, 0 }; + static vr::Compositor_TextureBounds leftBounds{ 0, 1, 0.5f, 0 }; + static vr::Compositor_TextureBounds rightBounds{ 0.5f, 1, 1, 0 }; _compositor->Submit(vr::Eye_Left, (void*)finalTexture, &leftBounds); _compositor->Submit(vr::Eye_Right, (void*)finalTexture, &rightBounds); glFinish(); @@ -177,7 +177,7 @@ void OpenVrDisplayPlugin::display(GLuint finalTexture, const glm::uvec2& sceneSi void OpenVrDisplayPlugin::finishFrame() { // swapBuffers(); doneCurrent(); - _compositor->WaitGetPoses(_trackedDevicePose, vr::k_unMaxTrackedDeviceCount, nullptr, 0); + _compositor->WaitGetPoses(_trackedDevicePose, vr::k_unMaxTrackedDeviceCount); for (int i = 0; i < vr::k_unMaxTrackedDeviceCount; i++) { _trackedDevicePoseMat4[i] = toGlm(_trackedDevicePose[i].mDeviceToAbsoluteTracking); }