lpnf
/
lovr
mirror of https://github.com/bjornbytes/lovr.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

vrapi: map pinch to trigger axis;

This commit is contained in:
bjorn 2021-06-01 09:59:01 -06:00
parent 055a15eeb3
commit a45fab4416
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/modules/headset/headset_vrapi.c
View File

@ -47,6 +47,7 @@ static struct {
ovrHandSkeleton skeleton[2];
ovrInputCapabilityHeader hands[2];
ovrInputStateTrackedRemote input[2];
ovrInputStateHand handInput[2];
uint32_t changedButtons[2];
float hapticStrength[2];
float hapticDuration[2];
@ -299,7 +300,14 @@ static bool vrapi_getAxis(Device device, DeviceAxis axis, float* value) {
return false;
}
ovrInputStateTrackedRemote* input = &state.input[device - DEVICE_HAND_LEFT];
uint32_t index = device - DEVICE_HAND_LEFT;
if (state.hands[index].Type == ovrControllerType_Hand && axis == AXIS_TRIGGER) {
value[0] = state.handInput[index].PinchStrength[ovrHandPinchStrength_Index];
return state.handPose[index].HandConfidence == ovrConfidence_HIGH;
}
ovrInputStateTrackedRemote* input = &state.input[index];
switch (axis) {
case AXIS_THUMBSTICK:
@ -790,6 +798,9 @@ static void vrapi_update(float dt) {
state.handPose[i].Header.Version = ovrHandVersion_1;
vrapi_GetHandPose(state.session, header->DeviceID, state.displayTime, &state.handPose[i].Header);
state.handInput[i].Header.ControllerType = header->Type;
vrapi_GetCurrentInputState(state.session, header->DeviceID, &state.handInput[i].Header);
break;
default: break;