Skip to content

Commit 9ae6515

Browse files
committed
changed pickupButtons from list to array
1 parent a1c8a99 commit 9ae6515

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

Packages/webxr-interactions/Runtime/Scripts/ControllerInteraction.cs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class ControllerInteraction : MonoBehaviour
3434
public GameObject inputProfileHandModelParent;
3535

3636
[Header("Input Bindings")]
37-
[SerializeField] private List<WebXRController.ButtonTypes> pickupButtons = new List<WebXRController.ButtonTypes> {
37+
[SerializeField] private WebXRController.ButtonTypes[] pickupButtons = new WebXRController.ButtonTypes[] {
3838
WebXRController.ButtonTypes.Trigger,
3939
WebXRController.ButtonTypes.Grip,
4040
WebXRController.ButtonTypes.ButtonA
@@ -122,14 +122,18 @@ private void Update()
122122
controller.GetAxis(WebXRController.AxisTypes.Grip));
123123

124124
bool pickup = false;
125-
pickupButtons.ForEach(button => pickup = pickup || controller.GetButtonDown(button));
125+
for (int i = 0; i < pickupButtons.Length; i++) {
126+
pickup = pickup || controller.GetButtonDown(pickupButtons[i]);
127+
}
126128
if (pickup)
127129
{
128130
Pickup();
129131
}
130132

131133
bool drop = false;
132-
pickupButtons.ForEach(button => drop = drop || controller.GetButtonUp(button));
134+
for (int i = 0; i < pickupButtons.Length; i++) {
135+
drop = drop || controller.GetButtonUp(pickupButtons[i]);
136+
}
133137
if (drop)
134138
{
135139
Drop();

0 commit comments

Comments
 (0)