Skip to content
Snippets Groups Projects
Commit 5c745d30 authored by sdegrande's avatar sdegrande
Browse files

Make logitech mx ink profile use 'dominant' rather than left/right

parent 4c919028
Branches
No related tags found
No related merge requests found
......@@ -3,7 +3,7 @@
"poses" : [
{
"action" : "primary-pose",
"location" : "/user/hand/left/input/aim"
"location" : "/user/hand/dominant/input/aim"
}
],
"inputs" : [
......@@ -11,28 +11,28 @@
"action" : "main-interaction-button",
"or-combiner" : [
{
"location" : "/user/hand/left/input/cluster_front_logitech",
"location" : "/user/hand/dominant/input/cluster_front_logitech",
"component" : "click"
},
{
"location" : "/user/hand/left/input/tip_logitech",
"location" : "/user/hand/dominant/input/tip_logitech",
"component" : "force|threshold(0)"
}
]
},
{
"action" : "second-interaction-button",
"location" : "/user/hand/left/input/cluster_back_logitech",
"location" : "/user/hand/dominant/input/cluster_back_logitech",
"component" : "click"
},
{
"action" : "main-interaction-analog",
"location" : "/user/hand/left/input/cluster_middle_logitech",
"location" : "/user/hand/dominant/input/cluster_middle_logitech",
"component" : "force|loop(-1.0)"
},
{
"action" : "pen-active",
"location" : "/user/hand/left/input/tip_logitech",
"location" : "/user/hand/dominant/input/tip_logitech",
"component" : "force|threshold(0)"
}
]
......
......@@ -160,7 +160,7 @@ void Pencil::update()
if (interactionSet->isPenOnTable()) {
pointerNormal.y = 0.0;
pointerNormal = glm::normalize(pointerNormal);
pencilWidth = 0.005f;
pencilWidth = 0.0025f;
drawingGap = 0.0005f;
}
......
......@@ -902,9 +902,11 @@ void OpenXRSet::handleInput()
if (activeNavMode == NO_NAV) {
#if 1
if (oxrInput.oxrControllers.interactionAnalog) {
float padValue = (*oxrInput.oxrControllers.interactionAnalog + 1.0f) * 0.5f;
interactionAnalog = padValue;
interactionRelAnalog = padValue;
}
#else
if (*oxrInput.oxrControllers.interactionAnalogActive) {
float padValue = (*oxrInput.oxrControllers.interactionAnalog + 1.0f) * 0.5f;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment