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

trackpad -> touchpad; 

Sorry
This commit is contained in:
bjorn 2019-05-08 16:57:51 -07:00
parent 57321db2cd
commit 2ecae65925
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/api/headset.c
View File

@ -44,7 +44,7 @@ const char* Devices[] = {
const char* DeviceButtons[] = {
[BUTTON_TRIGGER] = "trigger",
[BUTTON_THUMBSTICK] = "thumbstick",
[BUTTON_TRACKPAD] = "trackpad",
[BUTTON_TOUCHPAD] = "touchpad",
[BUTTON_GRIP] = "grip",
[BUTTON_MENU] = "menu",
[BUTTON_A] = "a",
@ -59,8 +59,8 @@ const char* DeviceAxes[] = {
[AXIS_TRIGGER] = "trigger",
[AXIS_THUMBSTICK_X] = "thumbstick/x",
[AXIS_THUMBSTICK_Y] = "thumbstick/y",
[AXIS_TRACKPAD_X] = "trackpad/x",
[AXIS_TRACKPAD_Y] = "trackpad/y",
[AXIS_TOUCHPAD_X] = "touchpad/x",
[AXIS_TOUCHPAD_Y] = "touchpad/y",
[AXIS_PINCH] = "pinch",
[AXIS_GRIP] = "grip",
NULL

6
src/headset/headset.h
View File

@ -39,7 +39,7 @@ typedef enum {
typedef enum {
BUTTON_TRIGGER,
BUTTON_THUMBSTICK,
BUTTON_TRACKPAD,
BUTTON_TOUCHPAD,
BUTTON_GRIP,
BUTTON_MENU,
BUTTON_A,
@ -53,8 +53,8 @@ typedef enum {
AXIS_TRIGGER,
AXIS_THUMBSTICK_X,
AXIS_THUMBSTICK_Y,
AXIS_TRACKPAD_X,
AXIS_TRACKPAD_Y,
AXIS_TOUCHPAD_X,
AXIS_TOUCHPAD_Y,
AXIS_PINCH,
AXIS_GRIP
} DeviceAxis;

6
src/headset/oculus_mobile.c
View File

@ -130,7 +130,7 @@ static bool buttonCheck(BridgeLovrButton field, Device device, DeviceButton butt
switch (button) {
case BUTTON_MENU: return *result = (field & BRIDGE_LOVR_BUTTON_MENU), true;
case BUTTON_TRIGGER: return *result = (field & BRIDGE_LOVR_BUTTON_SHOULDER), true;
case BUTTON_TRACKPAD: return *result = (field & BRIDGE_LOVR_BUTTON_TOUCHPAD), true;
case BUTTON_TOUCHPAD: return *result = (field & BRIDGE_LOVR_BUTTON_TOUCHPAD), true;
default: return false;
}
}
@ -149,8 +149,8 @@ static int vrapi_getAxis(Device device, DeviceAxis axis, float* x, float* y, flo
}
switch (axis) {
case AXIS_TRACKPAD_X: return *value = (bridgeLovrMobileData.updateData.goTrackpad.x - 160.f) / 160.f, true;
case AXIS_TRACKPAD_Y: return *value = (bridgeLovrMobileData.updateData.goTrackpad.y - 160.f) / 160.f, true;
case AXIS_TOUCHPAD_X: return *value = (bridgeLovrMobileData.updateData.goTrackpad.x - 160.f) / 160.f, true;
case AXIS_TOUCHPAD_Y: return *value = (bridgeLovrMobileData.updateData.goTrackpad.y - 160.f) / 160.f, true;
case AXIS_TRIGGER: return *value = bridgeLovrMobileData.updateData.goButtonDown ? 1.f : 0.f, true;
default: return false;
}

6
src/headset/openvr.c
View File

@ -252,7 +252,7 @@ static bool getButtonState(Device device, DeviceButton button, bool touch, bool*
} else {
switch (button) {
case BUTTON_TRIGGER: return *value = (mask >> EVRButtonId_k_EButton_SteamVR_Trigger) & 1, true;
case BUTTON_TRACKPAD: return *value = (mask >> EVRButtonId_k_EButton_SteamVR_Touchpad) & 1, true;
case BUTTON_TOUCHPAD: return *value = (mask >> EVRButtonId_k_EButton_SteamVR_Touchpad) & 1, true;
case BUTTON_MENU: return *value = (mask >> EVRButtonId_k_EButton_ApplicationMenu) & 1, true;
case BUTTON_GRIP: return *value = (mask >> EVRButtonId_k_EButton_Grip) & 1, true;
default: return false;
@ -279,8 +279,8 @@ static bool openvr_getAxis(Device device, DeviceAxis axis, float* value) {
switch (axis) {
case AXIS_TRIGGER: return *value = input.rAxis[1].x, true;
case AXIS_GRIP: return *value = input.rAxis[2].x, state.rift;
case AXIS_TRACKPAD_X: return *value = input.rAxis[0].x, !state.rift;
case AXIS_TRACKPAD_Y: return *value = input.rAxis[0].y, !state.rift;
case AXIS_TOUCHPAD_X: return *value = input.rAxis[0].x, !state.rift;
case AXIS_TOUCHPAD_Y: return *value = input.rAxis[0].y, !state.rift;
case AXIS_THUMBSTICK_X: return *value = input.rAxis[0].x, state.rift;
case AXIS_THUMBSTICK_Y: return *value = input.rAxis[0].y, state.rift;
default: return false;

6
src/headset/openxr.c
View File

@ -518,7 +518,7 @@ static bool getButtonState(Device device, DeviceButton button, bool* value, bool
Action type;
switch (button) {
case BUTTON_TRIGGER: type = ACTION_TRIGGER_DOWN + touch; break;
case BUTTON_TRACKPAD: type = ACTION_TRACKPAD_DOWN + touch; break;
case BUTTON_TOUCHPAD: type = ACTION_TRACKPAD_DOWN + touch; break;
case BUTTON_MENU: type = ACTION_MENU_DOWN + touch; break;
case BUTTON_GRIP: type = ACTION_GRIP_DOWN + touch; break;
default: return false;
@ -548,8 +548,8 @@ static bool openxr_getAxis(Device device, DeviceAxis axis, float* value) {
Action type;
switch (axis) {
case AXIS_TRIGGER: type = ACTION_TRIGGER_AXIS; break;
case AXIS_TRACKPAD_X: type = ACTION_TRACKPAD_X; break;
case AXIS_TRACKPAD_Y: type = ACTION_TRACKPAD_Y; break;
case AXIS_TOUCHPAD_X: type = ACTION_TRACKPAD_X; break;
case AXIS_TOUCHPAD_Y: type = ACTION_TRACKPAD_Y; break;
case AXIS_GRIP: type = ACTION_GRIP_AXIS; break;
default: return false;
}