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

openvr: add curl/splay axes for finger devices;

This commit is contained in:
bjorn 2020-01-24 18:14:44 -08:00
parent d448bdc95c
commit 71e63ddac2
2 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/l_headset.c
View File

@ -466,7 +466,9 @@ static const int axisCounts[MAX_AXES] = {
[AXIS_TRIGGER] = 1,
[AXIS_THUMBSTICK] = 2,
[AXIS_TOUCHPAD] = 2,
[AXIS_GRIP] = 1
[AXIS_GRIP] = 1,
[AXIS_CURL] = 1,
[AXIS_SPLAY] = 2
};
static int l_lovrHeadsetGetAxis(lua_State* L) {

38
src/modules/headset/openvr.c
View File

@ -69,7 +69,7 @@ static struct {
struct VR_IVRRenderModels_FnTable* renderModels;
struct VR_IVRInput_FnTable* input;
VRActionSetHandle_t actionSet;
VRActionHandle_t poseActions[MAX_DEVICES];
VRActionHandle_t poseActions[3];
VRActionHandle_t buttonActions[2][MAX_BUTTONS];
VRActionHandle_t touchActions[2][MAX_BUTTONS];
VRActionHandle_t axisActions[2][MAX_AXES];
@ -439,14 +439,40 @@ static bool openvr_isTouched(Device device, DeviceButton button, bool* touched)
}
static bool openvr_getAxis(Device device, DeviceAxis axis, vec3 value) {
if (device != DEVICE_HAND_LEFT && device != DEVICE_HAND_RIGHT) {
if (device == DEVICE_HAND_LEFT || device == DEVICE_HAND_RIGHT) {
InputAnalogActionData_t actionData;
state.input->GetAnalogActionData(state.axisActions[device - DEVICE_HAND_LEFT][axis], &actionData, sizeof(actionData), 0);
vec3_set(value, actionData.x, actionData.y, actionData.z);
return actionData.bActive;
}
uint32_t finger;
VRActionHandle_t skeletonAction;
if (device >= DEVICE_HAND_LEFT_FINGER_THUMB && device <= DEVICE_HAND_LEFT_FINGER_PINKY) {
finger = device - DEVICE_HAND_LEFT_FINGER_THUMB;
skeletonAction = state.skeletonActions[0];
} else if (device >= DEVICE_HAND_RIGHT_FINGER_THUMB && device <= DEVICE_HAND_RIGHT_FINGER_PINKY) {
finger = device - DEVICE_HAND_RIGHT_FINGER_THUMB;
skeletonAction = state.skeletonActions[1];
} else {
return false;
}
InputAnalogActionData_t actionData;
state.input->GetAnalogActionData(state.axisActions[device - DEVICE_HAND_LEFT][axis], &actionData, sizeof(actionData), 0);
vec3_set(value, actionData.x, actionData.y, actionData.z);
return actionData.bActive;
VRSkeletalSummaryData_t summary;
if (state.input->GetSkeletalSummaryData(skeletonAction, &summary)) {
return false;
}
if (axis == AXIS_CURL) {
value[0] = summary.flFingerCurl[finger];
return true;
} else if (axis == AXIS_SPLAY) {
value[0] = finger > 0 ? summary.flFingerSplay[finger - 1] : 0.f;
value[1] = finger < 4 ? summary.flFingerSplay[finger - 0] : 0.f;
return true;
}
return false;
}
static bool openvr_vibrate(Device device, float strength, float duration, float frequency) {