Fix WebXR button and input detection.

Had to partially roll back the OpenXR Action Map work because WebXR
doesn't use it. Instead, we manually detect the trigger and button input
names that we so gracefully avoided.

WebXR works again, but probably only on Touch/Pico and similar
controllers.

Author: mgiuca

scenes/ball.gd

@@ -57,6 +57,7 @@ var controller_average_angular_velocity : Vector3:
   get():
     return Globals.average_vectors(last_n_angular_velocities)
 
+var trigger_pressed : bool = false
 var grip_pressed : bool = false
 
 @onready var snd_hit_ground : AudioStreamPlayer3D = $SndHitGround
@@ -155,15 +156,22 @@ func _physics_process(delta: float) -> void:
       last_n_angular_velocities.remove_at(0)
 
 func _on_controller_button_pressed(button_name: String) -> void:
-  if button_name == 'grip_click':
+  # NOTE: The OpenXR mapping only uses 'grip_click' for both trigger and grip.
+  # However, WebXR doesn't use that mapping, so we also must check the trigger
+  # directly, as a fallback. !!!
+  if button_name == 'trigger_click':
+    trigger_pressed = true
+  elif button_name == 'grip_click':
     grip_pressed = true
 
 func _on_controller_button_released(button_name: String) -> void:
-  var grip_was_pressed := grip_pressed
-  if button_name == 'grip_click':
+  var trigger_or_grip_was_pressed := trigger_pressed or grip_pressed
+  if button_name == 'trigger_click':
+    trigger_pressed = false
+  elif button_name == 'grip_click':
     grip_pressed = false
 
-  if grip_was_pressed and not grip_pressed:
+  if trigger_or_grip_was_pressed and not trigger_pressed and not grip_pressed:
     # Was gripping, now released.
     detached = true
     reattach_timer.start()

scenes/main.gd

@@ -323,21 +323,26 @@ func _on_right_hand_button_released(button_name: String) -> void:
   _on_controller_button_released(button_name, right_hand)
 
 func _on_controller_button_pressed(button_name: String, controller: Node) -> void:
-  if button_name == 'quit':
+  # NOTE: The first button name in each case is the "nice" OpenXR button name.
+  # However, WebXR doesn't use that mapping, so we also check the clunky direct
+  # controller names from the default Godot action set (which is always used
+  # in WebXR) as a fallback. !!!
+  if button_name == 'quit' or (button_name == 'by_button' and controller == left_hand) \
+    or button_name == 'menu_button':
     # (e.g. Y or menu on Touch/Pico) = long-press to quit
     long_press_quit_timer.start()
     setup_long_press_label(controller, 'Quitting')
-  elif button_name == 'calibrate':
+  elif button_name == 'calibrate' or (button_name == 'by_button' and controller == right_hand):
     # (e.g. B on Touch/Pico) = long-press to calibrate
     long_press_calibrate_timer.start()
     setup_long_press_label(controller, 'Calibrating')
-  elif button_name == 'skip':
+  elif button_name == 'skip' or button_name == 'ax_button':
     # (e.g. A or X on Touch/Pico) = long-press to skip
     long_press_skip_timer.start()
     setup_long_press_label(controller, 'Skipping')
 
 func _on_controller_button_released(button_name: String, _controller: Node) -> void:
-  if button_name == 'quit' or button_name == 'calibrate' or button_name == 'skip':
+  if button_name in ['quit', 'calibrate', 'skip', 'by_button', 'ax_button', 'menu_button']:
     # Cancel all long-presses
     long_press_skip_timer.stop()
     long_press_calibrate_timer.stop()