Merge pull request #6223 from AlessandroSigna/controllers

Vive Controller
This commit is contained in:
Brad Hefta-Gaub 2015-10-29 14:16:34 -07:00
commit ffa805affb
2 changed files with 9 additions and 1 deletions

View file

@ -17,6 +17,9 @@
{ "from": "Vive.Start", "to": "Standard.Start" },
{ "from": "Vive.A", "to": "Standard.A" },
{ "from": "Vive.B", "to": "Standard.B" }
{ "from": "Vive.B", "to": "Standard.B" },
{ "from": "Vive.LeftHand", "to": "Standard.LeftHand" },
{ "from": "Vive.RightHand", "to": "Standard.RightHand" }
]
}

View file

@ -424,6 +424,11 @@ controller::Input::NamedVector ViveControllerManager::getAvailableInputs() const
makePair(RS, "RS"),
makePair(LEFT_HAND, "LeftHand"),
makePair(RIGHT_HAND, "RightHand"),
makePair(A, "A"),
makePair(B, "B"),
makePair(BACK, "Back"),
makePair(START, "Start"),
};
//availableInputs.append(Input::NamedPair(makeInput(BUTTON_A, 0), "Left Button A"));