Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 14:47:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Adding the hand poses channels in the controller mapping files

Browse source
This commit is contained in:
samcake 2015-10-20 18:19:44 -07:00
parent e0615309bb
commit da26d0dee1
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/resources/controllers/hydra.json
View file

@ -23,6 +23,9 @@
{ "from": "Hydra.R1", "to": "Standard.X" },
{ "from": "Hydra.R2", "to": "Standard.A" },
{ "from": "Hydra.R3", "to": "Standard.B" },
{ "from": "Hydra.R4", "to": "Standard.Y" }
]
{ "from": "Hydra.R4", "to": "Standard.Y" },
{ "from": "Hydra.LeftHand", "to": "Standard.LeftHand" },
{ "from": "Hydra.RightHand", "to": "Standard.RightHand" }
]
}

4
interface/resources/controllers/standard.json
View file

@ -36,6 +36,8 @@
"from": "Standard.LT",
"to": "Actions.BOOM_OUT",
"filters": [ { "type": "scale", "scale": 0.1 } ]
}
},
{ "from": "Standard.LeftHand", "to": "Actions.LEFT_HAND" },
{ "from": "Standard.RightHand", "to": "Actions.RIGHT_HAND" }
]
}

1
libraries/controllers/src/controllers/UserInputMapper.h
View file

@ -174,6 +174,5 @@ Q_DECLARE_METATYPE(QVector<controller::Action>)
// Cheating.
using UserInputMapper = controller::UserInputMapper;
//>>>>>>> 9c031b6bef988f123cb955c81299395386ec488c
#endif // hifi_UserInputMapper_h