HumanoidControl/HumanoidControl_Free
HumanoidControl/HumanoidControl_Free
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix triggers/option/touchpad input with UnityXR enabled but not tracking

Browse Source
This commit is contained in:
Pascal Serrarens 2022-02-23 09:41:39 +01:00
parent c7c5ab59e6
commit 14937d96b9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Runtime/HumanoidFree/Scripts/Extensions/UnityXR/UnityXRHand.cs
View File

@ -140,17 +140,17 @@ namespace Passer.Humanoid {
controllerInputSide.stickButton |= (controller.primaryAxis.z > 0.5F); controllerInputSide.stickButton |= (controller.primaryAxis.z > 0.5F);
controllerInputSide.stickTouch |= (controller.primaryAxis.z > -0.5F); controllerInputSide.stickTouch |= (controller.primaryAxis.z > -0.5F);
controllerInputSide.touchpadHorizontal = controller.secondaryAxis.x; controllerInputSide.touchpadHorizontal += controller.secondaryAxis.x;
controllerInputSide.touchpadVertical = controller.secondaryAxis.y; controllerInputSide.touchpadVertical += controller.secondaryAxis.y;
controllerInputSide.touchpadPress |= (controller.secondaryAxis.z > 0.5F); controllerInputSide.touchpadPress |= (controller.secondaryAxis.z > 0.5F);
controllerInputSide.touchpadTouch |= (controller.secondaryAxis.z > -0.5F); controllerInputSide.touchpadTouch |= (controller.secondaryAxis.z > -0.5F);
controllerInputSide.buttons[0] |= (controller.button1 > 0.5F); controllerInputSide.buttons[0] |= (controller.button1 > 0.5F);
controllerInputSide.buttons[1] |= (controller.button2 > 0.5F); controllerInputSide.buttons[1] |= (controller.button2 > 0.5F);
controllerInputSide.trigger1 = controller.trigger1; controllerInputSide.trigger1 += controller.trigger1;
controllerInputSide.trigger2 = controller.trigger2; controllerInputSide.trigger2 += controller.trigger2;
controllerInputSide.option = controller.option > 0; controllerInputSide.option |= controller.option > 0;
} }
// arm model for 3DOF tracking: position is calculated from rotation // arm model for 3DOF tracking: position is calculated from rotation