Skip to content

Commit d084bb4

Browse files
committed
Fix swapping items after new controls system
1 parent d640508 commit d084bb4

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

TABGVR/Input/VRControls.cs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,16 +92,18 @@ private void UpdateBinaryInputsInternal(VRInputBinary input, bool value)
9292
input.HoldingDown = value;
9393
}
9494

95-
private void UpdateBinaryInputs(InputDevice hand, VRInputBinary input, InputFeatureUsage<bool> feature)
95+
private bool UpdateBinaryInputs(InputDevice hand, VRInputBinary input, InputFeatureUsage<bool> feature)
9696
{
9797
hand.TryGetFeatureValue(feature, out var value);
9898
UpdateBinaryInputsInternal(input, value);
99+
return value;
99100
}
100101

101-
private void UpdateBinaryInputs(InputDevice hand, VRInputBinary input, InputFeatureUsage<float> feature)
102+
private float UpdateBinaryInputs(InputDevice hand, VRInputBinary input, InputFeatureUsage<float> feature)
102103
{
103104
hand.TryGetFeatureValue(feature, out var value);
104105
UpdateBinaryInputsInternal(input, value > TriggerDeadZone);
106+
return value;
105107
}
106108

107109
private void Update1DInputs(VRInput1D input, float value)
@@ -121,8 +123,8 @@ private void Update()
121123
Controllers.RightHandXR.TryGetFeatureValue(CommonUsages.primary2DAxis, out var rightJoystick);
122124
Controllers.LeftHandXR.TryGetFeatureValue(CommonUsages.primary2DAxis, out var leftJoystick);
123125

124-
UpdateBinaryInputs(Controllers.LeftHandXR, ControlList.LeftTriggerBinary, CommonUsages.trigger);
125-
UpdateBinaryInputs(Controllers.RightHandXR, ControlList.RightTriggerBinary, CommonUsages.trigger);
126+
var leftTrigger = UpdateBinaryInputs(Controllers.LeftHandXR, ControlList.LeftTriggerBinary, CommonUsages.trigger);
127+
var rightTrigger = UpdateBinaryInputs(Controllers.RightHandXR, ControlList.RightTriggerBinary, CommonUsages.trigger);
126128

127129
UpdateBinaryInputs(Controllers.RightHandXR, ControlList.AButton, CommonUsages.primaryButton);
128130
UpdateBinaryInputs(Controllers.RightHandXR, ControlList.BButton, CommonUsages.secondaryButton);
@@ -194,7 +196,7 @@ private void Update()
194196
}
195197
}
196198

197-
SomethingTriggered = ControlList.LeftTriggerBinary.HoldingDown || ControlList.RightTriggerBinary.HoldingDown;
199+
SomethingTriggered = leftTrigger > 0.1 || rightTrigger > 0.1;
198200

199201
// Right Click
200202
if (ControlList.RightStick.JustPressed)

0 commit comments

Comments
 (0)