Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 18:13:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Adding more items to the standard controller abstraction

Browse source
This commit is contained in:
Brad Davis 2015-10-22 15:51:09 -07:00
parent 8c163a52e9
commit d1da2f5aab
2 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
libraries/controllers/src/controllers/StandardController.cpp
View file

@ -73,10 +73,26 @@ void StandardController::buildDeviceProxy(DeviceProxy::Pointer proxy) {
availableInputs.append(makePair(LT, "LT")); availableInputs.append(makePair(LT, "LT"));
availableInputs.append(makePair(RT, "RT")); availableInputs.append(makePair(RT, "RT"));
// Finger abstractions
availableInputs.append(makePair(LEFT_PRIMARY_THUMB, "LeftPrimaryThumb"));
availableInputs.append(makePair(LEFT_SECONDARY_THUMB, "LeftSecondaryThumb"));
availableInputs.append(makePair(RIGHT_PRIMARY_THUMB, "RightPrimaryThumb"));
availableInputs.append(makePair(RIGHT_SECONDARY_THUMB, "RightSecondaryThumb"));
availableInputs.append(makePair(LEFT_PRIMARY_INDEX, "LeftPrimaryIndex"));
availableInputs.append(makePair(LEFT_SECONDARY_INDEX, "LeftSecondaryIndex"));
availableInputs.append(makePair(RIGHT_PRIMARY_INDEX, "RightPrimaryIndex"));
availableInputs.append(makePair(RIGHT_SECONDARY_INDEX, "RightSecondaryIndex"));
availableInputs.append(makePair(LEFT_GRIP, "LeftGrip"));
availableInputs.append(makePair(RIGHT_GRIP, "RightGrip"));
// Poses // Poses
availableInputs.append(makePair(LEFT_HAND, "LeftHand")); availableInputs.append(makePair(LEFT_HAND, "LeftHand"));
availableInputs.append(makePair(RIGHT_HAND, "RightHand")); availableInputs.append(makePair(RIGHT_HAND, "RightHand"));
// Aliases, PlayStation style names // Aliases, PlayStation style names
availableInputs.append(makePair(LB, "L1")); availableInputs.append(makePair(LB, "L1"));
availableInputs.append(makePair(RB, "R1")); availableInputs.append(makePair(RB, "R1"));
@ -95,10 +111,6 @@ void StandardController::buildDeviceProxy(DeviceProxy::Pointer proxy) {
availableInputs.append(makePair(DR, "Right")); availableInputs.append(makePair(DR, "Right"));
availableInputs.append(makePair(LEFT_PRIMARY_THUMB, "LeftPrimaryThumb"));
availableInputs.append(makePair(LEFT_SECONDARY_THUMB, "LeftSecondaryThumb"));
availableInputs.append(makePair(RIGHT_PRIMARY_THUMB, "RightPrimaryThumb"));
availableInputs.append(makePair(RIGHT_SECONDARY_THUMB, "RightSecondaryThumb"));
return availableInputs; return availableInputs;
}; };

8
libraries/controllers/src/controllers/StandardControls.h
View file

@ -42,6 +42,14 @@ namespace controller {
RIGHT_PRIMARY_THUMB, RIGHT_PRIMARY_THUMB,
RIGHT_SECONDARY_THUMB, RIGHT_SECONDARY_THUMB,
LEFT_PRIMARY_INDEX,
LEFT_SECONDARY_INDEX,
RIGHT_PRIMARY_INDEX,
RIGHT_SECONDARY_INDEX,
LEFT_GRIP,
RIGHT_GRIP,
NUM_STANDARD_BUTTONS NUM_STANDARD_BUTTONS
}; };