From f651adbd24c93f4a9c2ef624c287d50518c32861 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Tue, 8 Mar 2016 15:12:54 -0800 Subject: [PATCH] Correcting vive button naming --- interface/resources/controllers/vive.json | 4 ++-- plugins/openvr/src/ViveControllerManager.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/resources/controllers/vive.json b/interface/resources/controllers/vive.json index 62602ee36d..1f71658946 100644 --- a/interface/resources/controllers/vive.json +++ b/interface/resources/controllers/vive.json @@ -15,8 +15,8 @@ { "from": "Vive.RB", "to": "Standard.RB" }, { "from": "Vive.RS", "to": "Standard.RS" }, - { "from": "Vive.Back", "to": "Standard.Back" }, - { "from": "Vive.Start", "to": "Standard.Start" }, + { "from": "Vive.LeftApplicationMenu", "to": "Standard.Back" }, + { "from": "Vive.RightApplicationMenu", "to": "Standard.Start" }, { "from": "Vive.LeftHand", "to": "Standard.LeftHand" }, { "from": "Vive.RightHand", "to": "Standard.RightHand" } diff --git a/plugins/openvr/src/ViveControllerManager.cpp b/plugins/openvr/src/ViveControllerManager.cpp index be3f3adc92..fa74a57466 100644 --- a/plugins/openvr/src/ViveControllerManager.cpp +++ b/plugins/openvr/src/ViveControllerManager.cpp @@ -426,8 +426,8 @@ controller::Input::NamedVector ViveControllerManager::InputDevice::getAvailableI makePair(LEFT_HAND, "LeftHand"), makePair(RIGHT_HAND, "RightHand"), - makePair(BACK, "Back"), - makePair(START, "Start"), + makePair(BACK, "LeftApplicationMenu"), + makePair(START, "RightApplicationMenu"), }; //availableInputs.append(Input::NamedPair(makeInput(BUTTON_A, 0), "Left Button A"));