teambeef/ioq3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/ioq3quest.git synced 2025-02-16 17:11:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

OpenXR haptics and refreshrate fixed

Browse source
This commit is contained in:
Lubos 2022-04-23 19:44:18 +02:00
parent 4716387e52
commit 0bf485664c
1 changed files with 7 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -649,10 +649,10 @@ void IN_VRInit( void )
moveOnLeftJoystickAction = CreateAction(runningActionSet, XR_ACTION_TYPE_VECTOR2F_INPUT, "move_on_left_joy", "Move on left Joy", 0, NULL); moveOnLeftJoystickAction = CreateAction(runningActionSet, XR_ACTION_TYPE_VECTOR2F_INPUT, "move_on_left_joy", "Move on left Joy", 0, NULL);
moveOnRightJoystickAction = CreateAction(runningActionSet, XR_ACTION_TYPE_VECTOR2F_INPUT, "move_on_right_joy", "Move on right Joy", 0, NULL); moveOnRightJoystickAction = CreateAction(runningActionSet, XR_ACTION_TYPE_VECTOR2F_INPUT, "move_on_right_joy", "Move on right Joy", 0, NULL);
thumbstickClickAction = CreateAction(runningActionSet, XR_ACTION_TYPE_BOOLEAN_INPUT, "thumbstick_click", "Thumbstick Click", 0, NULL); thumbstickClickAction = CreateAction(runningActionSet, XR_ACTION_TYPE_BOOLEAN_INPUT, "thumbstick_click", "Thumbstick Click", 0, NULL);
XrAction vibrateLeftToggle = CreateAction(runningActionSet, XR_ACTION_TYPE_BOOLEAN_INPUT, "vibrate_left", "Vibrate Left Controller", 0, NULL); vibrateLeftToggle = CreateAction(runningActionSet, XR_ACTION_TYPE_BOOLEAN_INPUT, "vibrate_left", "Vibrate Left Controller", 0, NULL);
XrAction vibrateRightToggle = CreateAction(runningActionSet, XR_ACTION_TYPE_BOOLEAN_INPUT, "vibrate_right", "Vibrate Right Controller", 0, NULL); vibrateRightToggle = CreateAction(runningActionSet, XR_ACTION_TYPE_BOOLEAN_INPUT, "vibrate_right", "Vibrate Right Controller", 0, NULL);
XrAction vibrateLeftFeedback = CreateAction(runningActionSet, XR_ACTION_TYPE_VIBRATION_OUTPUT, "vibrate_left_feedback", "Vibrate Left Controller Feedback", 0, NULL); vibrateLeftFeedback = CreateAction(runningActionSet, XR_ACTION_TYPE_VIBRATION_OUTPUT, "vibrate_left_feedback", "Vibrate Left Controller Feedback", 0, NULL);
XrAction vibrateRightFeedback = CreateAction(runningActionSet, XR_ACTION_TYPE_VIBRATION_OUTPUT, "vibrate_right_feedback", "Vibrate Right Controller Feedback", 0, NULL); vibrateRightFeedback = CreateAction(runningActionSet, XR_ACTION_TYPE_VIBRATION_OUTPUT, "vibrate_right_feedback", "Vibrate Right Controller Feedback", 0, NULL);
OXR(xrStringToPath(engine->appState.Instance, "/user/hand/left", &leftHandPath)); OXR(xrStringToPath(engine->appState.Instance, "/user/hand/left", &leftHandPath));
OXR(xrStringToPath(engine->appState.Instance, "/user/hand/right", &rightHandPath)); OXR(xrStringToPath(engine->appState.Instance, "/user/hand/right", &rightHandPath));
@ -1288,15 +1288,15 @@ void IN_VRInputFrame( void )
memset(&rightController, 0, sizeof(rightController)); memset(&rightController, 0, sizeof(rightController));
controllerInit = qtrue; controllerInit = qtrue;
} }
engine_t* engine = VR_GetEngine();
if (vr_extralatencymode != NULL && if (vr_extralatencymode != NULL &&
vr_extralatencymode->integer) { vr_extralatencymode->integer) {
//TODO:vrapi_SetExtraLatencyMode(VR_GetEngine()->ovr, VRAPI_EXTRA_LATENCY_MODE_ON); //TODO:vrapi_SetExtraLatencyMode(VR_GetEngine()->ovr, VRAPI_EXTRA_LATENCY_MODE_ON);
} }
if (vr_refreshrate != NULL && vr_refreshrate->integer) if (vr_refreshrate != NULL && vr_refreshrate->integer) {
{ OXR(engine->appState.pfnRequestDisplayRefreshRate(engine->appState.Session, (float)vr_refreshrate->integer));
//TODO:vrapi_SetDisplayRefreshRate(VR_GetEngine()->ovr, (float)vr_refreshrate->integer);
} }
vr.virtual_screen = VR_useScreenLayer(); vr.virtual_screen = VR_useScreenLayer();
@ -1374,7 +1374,6 @@ void IN_VRInputFrame( void )
} }
// OpenXR input // OpenXR input
engine_t* engine = VR_GetEngine();
{ {
// Attach to session // Attach to session
XrSessionActionSetsAttachInfo attachInfo = {}; XrSessionActionSetsAttachInfo attachInfo = {};
@ -1406,22 +1405,6 @@ void IN_VRInputFrame( void )
XrActionStateBoolean vibrateLeftState = GetActionStateBoolean(vibrateLeftToggle); XrActionStateBoolean vibrateLeftState = GetActionStateBoolean(vibrateLeftToggle);
XrActionStateBoolean vibrateRightState = GetActionStateBoolean(vibrateRightToggle); XrActionStateBoolean vibrateRightState = GetActionStateBoolean(vibrateRightToggle);
XrActionStateBoolean thumbstickClickState = GetActionStateBoolean(thumbstickClickAction); XrActionStateBoolean thumbstickClickState = GetActionStateBoolean(thumbstickClickAction);
//TODO:remove (this is just a rest of sample code)
if (thumbstickClickState.changedSinceLastSync &&
thumbstickClickState.currentState == XR_TRUE) {
float currentRefreshRate = 0.0f;
OXR(engine->appState.pfnGetDisplayRefreshRate(engine->appState.Session, &currentRefreshRate));
ALOGV("Current Display Refresh Rate: %f", currentRefreshRate);
const int requestedRateIndex = engine->appState.RequestedDisplayRefreshRateIndex++ %
engine->appState.NumSupportedDisplayRefreshRates;
const float requestRefreshRate =
engine->appState.SupportedDisplayRefreshRates[requestedRateIndex];
ALOGV("Requesting Display Refresh Rate: %f", requestRefreshRate);
OXR(engine->appState.pfnRequestDisplayRefreshRate(engine->appState.Session, requestRefreshRate));
}
} }
//TODO: //TODO: