steam-frame/astromaddie--lambda1-vr
1
0 Fork 0
mirror of https://github.com/astromaddie/lambda1-vr.git synced 2026-10-19 21:00:15 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #53 from dombomdom/master

Browse Source 
add backpack ready vibration feedback
This commit is contained in:
Simon authored and GitHub committed 2019-10-21 20:36:57 +01:00
2 parents 3b433554de 9c8c23871c
commit aa24ea4ea1
2 files changed
+20
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Projects/Android/jni/src/Lambda1VR/VrInputAlt.c
+10
View File
@@ -42,6 +42,7 @@ void HandleInput_Alt( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew, ovr
static bool dominantGripPushed = false;
static int grabMeleeWeapon = 0;
static bool canUseBackpack = false;
static float dominantGripPushTime = 0.0f;
static bool selectingWeapon = false;
@@ -162,6 +163,15 @@ void HandleInput_Alt( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew, ovr
finishReloadNextFrame = false;
}
if (pDominantTracking->Status & VRAPI_TRACKING_STATUS_POSITION_TRACKED) {
canUseBackpack = false;
}
else if (!canUseBackpack && grabMeleeWeapon == 0) {
int channel = (vr_control_scheme->integer >= 10) ? 0 : 1;
Android_Vibrate(40, channel, 0.5); // vibrate to let user know they can switch
canUseBackpack = true;
}
if ((pDominantTrackedRemoteNew->Buttons & ovrButton_GripTrigger) !=
(pDominantTrackedRemoteOld->Buttons & ovrButton_GripTrigger)) {
Projects/Android/jni/src/Lambda1VR/VrInputDefault.c
+10
View File
@@ -42,6 +42,7 @@ void HandleInput_Default( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew,
static bool dominantGripPushed = false;
static int grabMeleeWeapon = 0;
static bool canUseBackpack = false;
static float dominantGripPushTime = 0.0f;
//Show screen view (if in multiplayer toggle scoreboard)
@@ -174,6 +175,15 @@ void HandleInput_Default( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew,
finishReloadNextFrame = false;
}
if (pDominantTracking->Status & VRAPI_TRACKING_STATUS_POSITION_TRACKED) {
canUseBackpack = false;
}
else if (!canUseBackpack && grabMeleeWeapon == 0) {
int channel = (vr_control_scheme->integer >= 10) ? 0 : 1;
Android_Vibrate(40, channel, 0.5); // vibrate to let user know they can switch
canUseBackpack = true;
}
if ((pDominantTrackedRemoteNew->Buttons & ovrButton_GripTrigger) !=
(pDominantTrackedRemoteOld->Buttons & ovrButton_GripTrigger)) {