From 0d4af3a447973a5b263784c313afa7ab3aee4330 Mon Sep 17 00:00:00 2001 From: Imanol Fernandez Date: Mon, 24 Sep 2018 19:40:02 +0200 Subject: [PATCH] Update to Oculus SDK 1.17 (#566) --- app/src/oculusvr/cpp/DeviceDelegateOculusVR.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/oculusvr/cpp/DeviceDelegateOculusVR.cpp b/app/src/oculusvr/cpp/DeviceDelegateOculusVR.cpp index c53d75774..3605f3f42 100644 --- a/app/src/oculusvr/cpp/DeviceDelegateOculusVR.cpp +++ b/app/src/oculusvr/cpp/DeviceDelegateOculusVR.cpp @@ -272,8 +272,10 @@ struct DeviceDelegateOculusVR::State { const bool triggerPressed = (controllerState.Buttons & ovrButton_A) != 0; const bool trackpadPressed = (controllerState.Buttons & ovrButton_Enter) != 0; const bool trackpadTouched = (bool) controllerState.TrackpadStatus; + const bool backPressed = (controllerState.Buttons & ovrButton_Back) != 0; controller->SetButtonState(0, ControllerDelegate::BUTTON_TRIGGER, 1, triggerPressed, triggerPressed); controller->SetButtonState(0, ControllerDelegate::BUTTON_TOUCHPAD, 0, trackpadPressed, trackpadTouched); + controller->SetButtonState(0, ControllerDelegate::BUTTON_APP, -1, backPressed, backPressed); const float trackpadX = controllerState.TrackpadPosition.x / (float)controllerCapabilities.TrackpadMaxX; const float trackpadY = controllerState.TrackpadPosition.y / (float)controllerCapabilities.TrackpadMaxY; @@ -541,7 +543,7 @@ DeviceDelegateOculusVR::EnterVR(const crow::BrowserEGLContext& aEGLContext) { vrapi_SetPerfThread(m.ovr, VRAPI_PERF_THREAD_TYPE_RENDERER, gettid()); } - //vrapi_SetRemoteEmulation(m.ovr, false); + vrapi_SetRemoteEmulation(m.ovr, false); } void