teambeef/ioq3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/ioq3quest.git synced 2024-11-14 00:21:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

OpenXR restore haptics calling

Browse source
This commit is contained in:
Lubos 2022-05-10 22:30:10 +02:00
parent d354212c5d
commit 5ecbbac97e
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
android/app/src/main/cpp/code/vr/vr_input.c
View file

@ -228,7 +228,6 @@ void QuatToYawPitchRoll(XrQuaternionf q, vec3_t rotation, vec3_t out) {
//0 = left, 1 = right //0 = left, 1 = right
float vibration_channel_duration[2] = {0.0f, 0.0f}; float vibration_channel_duration[2] = {0.0f, 0.0f};
float vibration_channel_intensity[2] = {0.0f, 0.0f}; float vibration_channel_intensity[2] = {0.0f, 0.0f};
qboolean vibration_stopped[2] = {qtrue, qtrue};
void VR_Vibrate( int duration, int chan, float intensity ) void VR_Vibrate( int duration, int chan, float intensity )
{ {
@ -272,7 +271,6 @@ static void VR_processHaptics() {
hapticActionInfo.next = NULL; hapticActionInfo.next = NULL;
hapticActionInfo.action = i == 0 ? vibrateLeftFeedback : vibrateRightFeedback; hapticActionInfo.action = i == 0 ? vibrateLeftFeedback : vibrateRightFeedback;
OXR(xrApplyHapticFeedback(VR_GetEngine()->appState.Session, &hapticActionInfo, (const XrHapticBaseHeader*)&vibration)); OXR(xrApplyHapticFeedback(VR_GetEngine()->appState.Session, &hapticActionInfo, (const XrHapticBaseHeader*)&vibration));
vibration_stopped[i] = qfalse;
if (vibration_channel_duration[i] != -1.0f) { if (vibration_channel_duration[i] != -1.0f) {
vibration_channel_duration[i] -= frametime; vibration_channel_duration[i] -= frametime;
@ -282,14 +280,13 @@ static void VR_processHaptics() {
vibration_channel_intensity[i] = 0.0f; vibration_channel_intensity[i] = 0.0f;
} }
} }
} else if (!vibration_stopped[i]) { } else {
// Stop haptics // Stop haptics
XrHapticActionInfo hapticActionInfo = {}; XrHapticActionInfo hapticActionInfo = {};
hapticActionInfo.type = XR_TYPE_HAPTIC_ACTION_INFO; hapticActionInfo.type = XR_TYPE_HAPTIC_ACTION_INFO;
hapticActionInfo.next = NULL; hapticActionInfo.next = NULL;
hapticActionInfo.action = i == 0 ? vibrateLeftFeedback : vibrateRightFeedback; hapticActionInfo.action = i == 0 ? vibrateLeftFeedback : vibrateRightFeedback;
OXR(xrStopHapticFeedback(VR_GetEngine()->appState.Session, &hapticActionInfo)); OXR(xrStopHapticFeedback(VR_GetEngine()->appState.Session, &hapticActionInfo));
vibration_stopped[i] = qtrue;
} }
} }
} }