Merge pull request #60 from dombomdom/master

fixed wrong haptic backpack ready feedback if controller was not moving
This commit is contained in:
Simon authored and GitHub committed 2019-11-04 22:51:31 +00:00
commit 32bd48c044
3 files changed
+6 -3

No files matched your search

@@ -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) {
@@ -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) {
@@ -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) {