mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-21 22:05:59 +00:00
fix: map Quest menu button to SteamVR dashboard
This commit is contained in:
1 parent
220442d634
commit
65c6ca3552
4 files changed
+16
-11
No files matched your search
@@ -455,8 +455,8 @@ public:
|
||||
driverInput->UpdateScalarComponent(padY_, input.stickY, 0);
|
||||
driverInput->UpdateBooleanComponent(padClick_, input.stickClick, 0);
|
||||
driverInput->UpdateBooleanComponent(padTouch_, input.stickTouch, 0);
|
||||
driverInput->UpdateBooleanComponent(menu_, input.menuClick, 0);
|
||||
driverInput->UpdateBooleanComponent(system_, false, 0);
|
||||
driverInput->UpdateBooleanComponent(menu_, false, 0);
|
||||
driverInput->UpdateBooleanComponent(system_, input.systemClick, 0);
|
||||
if (xrMode_) {
|
||||
driverInput->UpdateScalarComponent(gripValue_, input.grip, 0);
|
||||
driverInput->UpdateBooleanComponent(triggerTouch_, input.triggerTouch, 0);
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
struct XrTouchInput {
|
||||
float trigger = 0, grip = 0, stickX = 0, stickY = 0;
|
||||
bool triggerClick = false, gripClick = false, stickClick = false;
|
||||
bool primaryClick = false, secondaryClick = false, menuClick = false;
|
||||
bool primaryClick = false, secondaryClick = false, systemClick = false;
|
||||
bool triggerTouch = false, stickTouch = false, primaryTouch = false, secondaryTouch = false, thumbrestTouch = false;
|
||||
};
|
||||
|
||||
@@ -23,7 +23,7 @@ inline XrTouchInput xr_touch_input(const DroidDeckXrHand &hand, bool right) {
|
||||
input.stickClick = hand.buttons & DROIDDECK_XR_STICK_CLICK;
|
||||
input.primaryClick = hand.buttons & DROIDDECK_XR_PRIMARY_CLICK;
|
||||
input.secondaryClick = hand.buttons & DROIDDECK_XR_SECONDARY_CLICK;
|
||||
input.menuClick = !right && (hand.buttons & DROIDDECK_XR_MENU_CLICK);
|
||||
input.systemClick = !right && (hand.buttons & DROIDDECK_XR_MENU_CLICK);
|
||||
input.triggerTouch = hand.buttons & DROIDDECK_XR_TRIGGER_TOUCH;
|
||||
input.stickTouch = hand.buttons & DROIDDECK_XR_STICK_TOUCH;
|
||||
input.primaryTouch = hand.buttons & DROIDDECK_XR_PRIMARY_TOUCH;
|
||||
|
||||
@@ -11,19 +11,21 @@ int main() {
|
||||
auto input = xr_touch_input(hand, false);
|
||||
assert(input.trigger == hand.trigger && input.grip == hand.squeeze && input.triggerClick && input.gripClick);
|
||||
assert(input.stickX == -0.4f && input.stickY == 0.9f);
|
||||
assert(!input.stickTouch && !input.stickClick && !input.primaryClick && !input.secondaryClick && !input.menuClick);
|
||||
assert(!input.stickTouch && !input.stickClick && !input.primaryClick && !input.secondaryClick && !input.systemClick);
|
||||
hand.buttons = DROIDDECK_XR_PRIMARY_CLICK;
|
||||
input = xr_touch_input(hand, false);
|
||||
assert(input.primaryClick && !input.secondaryClick && !input.stickClick && !input.menuClick && !input.primaryTouch);
|
||||
assert(input.primaryClick && !input.secondaryClick && !input.stickClick && !input.systemClick && !input.primaryTouch);
|
||||
hand.buttons = DROIDDECK_XR_SECONDARY_CLICK;
|
||||
input = xr_touch_input(hand, true);
|
||||
assert(input.secondaryClick && !input.primaryClick && !input.menuClick && !input.stickClick);
|
||||
assert(input.secondaryClick && !input.primaryClick && !input.systemClick && !input.stickClick);
|
||||
hand.buttons = DROIDDECK_XR_STICK_CLICK;
|
||||
input = xr_touch_input(hand, true);
|
||||
assert(input.stickClick && !input.primaryClick && !input.stickTouch);
|
||||
hand.buttons = DROIDDECK_XR_MENU_CLICK;
|
||||
assert(xr_touch_input(hand, false).menuClick);
|
||||
assert(!xr_touch_input(hand, true).menuClick);
|
||||
assert(xr_touch_input(hand, false).systemClick);
|
||||
assert(!xr_touch_input(hand, true).systemClick);
|
||||
hand.buttons = 0;
|
||||
assert(!xr_touch_input(hand, false).systemClick);
|
||||
hand.buttons = DROIDDECK_XR_TRIGGER_TOUCH | DROIDDECK_XR_STICK_TOUCH | DROIDDECK_XR_PRIMARY_TOUCH |
|
||||
DROIDDECK_XR_SECONDARY_TOUCH | DROIDDECK_XR_THUMBREST_TOUCH;
|
||||
hand.trigger = hand.squeeze = 0;
|
||||
@@ -43,7 +45,7 @@ int main() {
|
||||
hand.trigger = hand.squeeze = hand.stick[0] = hand.stick[1] = 1;
|
||||
input = xr_touch_input(hand, false);
|
||||
assert(input.trigger == 0 && input.grip == 0 && input.stickX == 0 && input.stickY == 0);
|
||||
assert(!input.triggerClick && !input.gripClick && !input.stickClick && !input.primaryClick && !input.secondaryClick && !input.menuClick);
|
||||
assert(!input.triggerClick && !input.gripClick && !input.stickClick && !input.primaryClick && !input.secondaryClick && !input.systemClick);
|
||||
assert(!input.triggerTouch && !input.stickTouch && !input.primaryTouch && !input.secondaryTouch && !input.thumbrestTouch);
|
||||
std::puts("Touch input: independent face/stick/menu, real capacitive touch, analog grip, clamping and inactive reset passed");
|
||||
std::puts("Touch input: independent face/stick/system, real capacitive touch, analog grip, clamping and inactive reset passed");
|
||||
}
|
||||
Reference in new issue
Block a user