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

OpenXR do not use pose velocity to track controllers

Browse source
This commit is contained in:
Lubos 2022-05-06 09:25:59 +02:00
parent 42bf984ef8
commit ed96160ffc
1 changed files with 13 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -43,11 +43,6 @@ XrSpace rightControllerAimSpace = XR_NULL_HANDLE;
qboolean inputInitialized = qfalse; qboolean inputInitialized = qfalse;
qboolean useSimpleProfile = qfalse; qboolean useSimpleProfile = qfalse;
typedef struct {
XrSpaceLocation loc;
XrSpaceVelocity vel;
} LocVel;
enum { enum {
VR_TOUCH_AXIS_UP = 1 << 0, VR_TOUCH_AXIS_UP = 1 << 0,
VR_TOUCH_AXIS_UPRIGHT = 1 << 1, VR_TOUCH_AXIS_UPRIGHT = 1 << 1,
@ -579,16 +574,6 @@ qboolean ActionPoseIsActive(XrAction action, XrPath subactionPath) {
return state.isActive != XR_FALSE; return state.isActive != XR_FALSE;
} }
LocVel GetSpaceLocVel(XrSpace space, XrTime time) {
LocVel lv = {{}};
lv.loc.type = XR_TYPE_SPACE_LOCATION;
lv.loc.next = &lv.vel;
lv.vel.type = XR_TYPE_SPACE_VELOCITY;
OXR(xrLocateSpace(space, VR_GetEngine()->appState.CurrentSpace, time, &lv.loc));
lv.loc.next = NULL; // pointer no longer valid or necessary
return lv;
}
XrActionStateFloat GetActionStateFloat(XrAction action) { XrActionStateFloat GetActionStateFloat(XrAction action) {
XrActionStateGetInfo getInfo = {}; XrActionStateGetInfo getInfo = {};
getInfo.type = XR_TYPE_ACTION_STATE_GET_INFO; getInfo.type = XR_TYPE_ACTION_STATE_GET_INFO;
@ -1405,29 +1390,30 @@ void IN_VRInputFrame( void )
void IN_VRUpdateControllers( float predictedDisplayTime ) void IN_VRUpdateControllers( float predictedDisplayTime )
{ {
engine_t* engine = VR_GetEngine();
//get controller poses //get controller poses
XrAction controller[] = {handPoseLeftAction, handPoseRightAction}; XrAction controller[] = {handPoseLeftAction, handPoseRightAction};
XrPath subactionPath[] = {leftHandPath, rightHandPath}; XrPath subactionPath[] = {leftHandPath, rightHandPath};
XrSpace controllerSpace[] = {leftControllerAimSpace, rightControllerAimSpace}; XrSpace controllerSpace[] = {leftControllerAimSpace, rightControllerAimSpace};
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
if (ActionPoseIsActive(controller[i], subactionPath[i])) { if (ActionPoseIsActive(controller[i], subactionPath[i])) {
LocVel lv = GetSpaceLocVel(controllerSpace[i], predictedDisplayTime); XrSpaceLocation loc = {};
VR_GetEngine()->appState.TrackedController[i].Active = (lv.loc.locationFlags & XR_SPACE_LOCATION_POSITION_VALID_BIT) != 0; loc.type = XR_TYPE_SPACE_LOCATION;
VR_GetEngine()->appState.TrackedController[i].Pose = lv.loc.pose; OXR(xrLocateSpace(controllerSpace[i], engine->appState.CurrentSpace, predictedDisplayTime, &loc));
for (int j = 0; j < 3; j++) {
float dt = 0.01f; // use 0.2f for for testing velocity vectors engine->appState.TrackedController[i].Active = (loc.locationFlags & XR_SPACE_LOCATION_POSITION_VALID_BIT) != 0;
(&VR_GetEngine()->appState.TrackedController[i].Pose.position.x)[j] += (&lv.vel.linearVelocity.x)[j] * dt; engine->appState.TrackedController[i].Pose = loc.pose;
}
} else { } else {
ovrTrackedController_Clear(&VR_GetEngine()->appState.TrackedController[i]); ovrTrackedController_Clear(&engine->appState.TrackedController[i]);
} }
} }
//apply controller poses //apply controller poses
if (VR_GetEngine()->appState.TrackedController[0].Active) if (engine->appState.TrackedController[0].Active)
IN_VRController(qfalse, VR_GetEngine()->appState.TrackedController[0].Pose); IN_VRController(qfalse, engine->appState.TrackedController[0].Pose);
if (VR_GetEngine()->appState.TrackedController[1].Active) if (engine->appState.TrackedController[1].Active)
IN_VRController(qtrue, VR_GetEngine()->appState.TrackedController[1].Pose); IN_VRController(qtrue, engine->appState.TrackedController[1].Pose);
} }
//#endif //#endif