From bc78ebe05d855f88ef11a2032814215a8e1f932c Mon Sep 17 00:00:00 2001 From: amantley Date: Wed, 19 Dec 2018 14:21:14 -0800 Subject: [PATCH] cleaned up the button event code for the proximity sensor button --- plugins/openvr/src/OpenVrHelpers.cpp | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/plugins/openvr/src/OpenVrHelpers.cpp b/plugins/openvr/src/OpenVrHelpers.cpp index 3f0b54ad44..108431a8ac 100644 --- a/plugins/openvr/src/OpenVrHelpers.cpp +++ b/plugins/openvr/src/OpenVrHelpers.cpp @@ -277,29 +277,17 @@ void handleOpenVrEvents() { default: break; } - #if DEV_BUILD if (event.data.controller.button == vr::k_EButton_ProximitySensor) { - qDebug() << "fired the proximity sensor!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! "; vr::VRControllerState_t controllerState = vr::VRControllerState_t(); if (activeHmd->GetControllerState(vr::k_unTrackedDeviceIndex_Hmd, &controllerState, sizeof(vr::VRControllerState_t))) { - ulong prox = controllerState.ulButtonPressed & (1UL << ((int)vr::k_EButton_ProximitySensor)); - qDebug() << "prox is -----------------------------> " << (int)prox; - bool test = false; - if (prox == (1UL << ((int)vr::k_EButton_ProximitySensor))) { - test = true; - } - if (prox) { - qDebug() << "headset is on " << test; - _headInHeadset = true; - } else { - qDebug() << "headset is off " << test; - _headInHeadset = false; - } + ulong promitySensorFlag = (1UL << ((int)vr::k_EButton_ProximitySensor)); + _headInHeadset = (controllerState.ulButtonPressed & promitySensorFlag) == promitySensorFlag; } - } else { - qDebug() << "OpenVR: Event " << activeHmd->GetEventTypeNameFromEnum((vr::EVREventType)event.eventType) << "(" << event.eventType << ")"; } + + #if DEV_BUILD + qDebug() << "OpenVR: Event " << activeHmd->GetEventTypeNameFromEnum((vr::EVREventType)event.eventType) << "(" << event.eventType << ")"; #endif }