Skip to content

Commit

Permalink
Swap touchpad and grip button indices
Browse files Browse the repository at this point in the history
  • Loading branch information
toji committed Jun 26, 2019
1 parent 2a92a3e commit a5a83ba
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions index.bs
Expand Up @@ -1505,13 +1505,13 @@ In order to report a {{Gamepad/mapping}} of {{GamepadMappingType/xr-standard}} t
</tr>
<tr>
<td>buttons[1]</td>
<td>Touchpad Press</td>
<td>If thumbstick is not present</td>
<td>Secondary Button/Grip Trigger</td>
<td>No</td>
</tr>
<tr>
<td>buttons[2]</td>
<td>Secondary Button/Grip Trigger</td>
<td>No</td>
<td>Touchpad Press</td>
<td>If thumbstick is not present</td>
</tr>
<tr>
<td>buttons[3]</td>
Expand Down
8 changes: 4 additions & 4 deletions input-explainer.md
Expand Up @@ -335,8 +335,8 @@ The WebXR Device API also introduces a new standard controller layout indicated
| Button | `xr-standard` Binding |
| ---------- | -----------------------|
| buttons[0] | Primary trigger |
| buttons[1] | Touchpad press |
| buttons[2] | Grip/Secondary trigger |
| buttons[1] | Grip/Secondary trigger |
| buttons[2] | Touchpad press |
| buttons[3] | Thumbstick press |

| Axis | `xr-standard` Binding |
Expand Down Expand Up @@ -365,8 +365,8 @@ When using an API that limits reading controller input to use of an action map,
| Button/Axis | Action name | Sample binding |
|-------------|--------------------|-----------------------------|
| button[0] | "trigger" | "[device]/trigger" |
| button[1] | "touchpad-click" | "[device]/touchpad/click" |
| button[2] | "grip" | "[device]/grip" |
| button[1] | "grip" | "[device]/grip" |
| button[2] | "touchpad-click" | "[device]/touchpad/click" |
| button[3] | "thumbstick-click" | "[device]/thumbstick/click" |
| axis[0] | "touchpad-x" | "[device]/touchpad/x" |
| axis[1] | "touchpad-y" | "[device]/touchpad/y" |
Expand Down

0 comments on commit a5a83ba

Please sign in to comment.