From a99c74b9fe6e7028226312440c1c4ec7d3e19d38 Mon Sep 17 00:00:00 2001 From: dombomdom Date: Fri, 1 Nov 2019 12:32:51 +0100 Subject: [PATCH] fixed wrong haptic backpack ready feedback when controller was not moving --- Projects/Android/jni/src/Lambda1VR/VrInputAlt.c | 3 ++- Projects/Android/jni/src/Lambda1VR/VrInputDefault.c | 3 ++- Projects/Android/jni/src/Lambda1VR/VrInputLeftAlt2.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Projects/Android/jni/src/Lambda1VR/VrInputAlt.c b/Projects/Android/jni/src/Lambda1VR/VrInputAlt.c index 5786db2..baa50aa 100644 --- a/Projects/Android/jni/src/Lambda1VR/VrInputAlt.c +++ b/Projects/Android/jni/src/Lambda1VR/VrInputAlt.c @@ -163,7 +163,8 @@ void HandleInput_Alt( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew, ovr finishReloadNextFrame = false; } - if (pDominantTracking->Status & VRAPI_TRACKING_STATUS_POSITION_TRACKED) { + if ((pDominantTracking->Status & VRAPI_TRACKING_STATUS_POSITION_TRACKED) || + (pDominantTracking->Status & VRAPI_TRACKING_STATUS_POSITION_VALID)) { canUseBackpack = false; } else if (!canUseBackpack && grabMeleeWeapon == 0) { diff --git a/Projects/Android/jni/src/Lambda1VR/VrInputDefault.c b/Projects/Android/jni/src/Lambda1VR/VrInputDefault.c index bcf81ff..416c855 100644 --- a/Projects/Android/jni/src/Lambda1VR/VrInputDefault.c +++ b/Projects/Android/jni/src/Lambda1VR/VrInputDefault.c @@ -175,7 +175,8 @@ void HandleInput_Default( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew, finishReloadNextFrame = false; } - if (pDominantTracking->Status & VRAPI_TRACKING_STATUS_POSITION_TRACKED) { + if ((pDominantTracking->Status & VRAPI_TRACKING_STATUS_POSITION_TRACKED) || + (pDominantTracking->Status & VRAPI_TRACKING_STATUS_POSITION_VALID)) { canUseBackpack = false; } else if (!canUseBackpack && grabMeleeWeapon == 0) { diff --git a/Projects/Android/jni/src/Lambda1VR/VrInputLeftAlt2.c b/Projects/Android/jni/src/Lambda1VR/VrInputLeftAlt2.c index 1ed97ad..107b065 100644 --- a/Projects/Android/jni/src/Lambda1VR/VrInputLeftAlt2.c +++ b/Projects/Android/jni/src/Lambda1VR/VrInputLeftAlt2.c @@ -169,7 +169,8 @@ void HandleInput_LeftAlt2() finishReloadNextFrame = false; } - if (leftRemoteTracking_new.Status & VRAPI_TRACKING_STATUS_POSITION_TRACKED) { + if ((leftRemoteTracking_new.Status & VRAPI_TRACKING_STATUS_POSITION_TRACKED) || + (leftRemoteTracking_new.Status & VRAPI_TRACKING_STATUS_POSITION_VALID)) { canUseBackpack = false; } else if (!canUseBackpack && grabMeleeWeapon == 0) {