From 9a353795f22c3ba7a2c747623becd5989405a583 Mon Sep 17 00:00:00 2001
From: "gpt-engineer-app[bot]"
 <159125892+gpt-engineer-app[bot]@users.noreply.github.com>
Date: Wed, 13 May 2026 21:33:15 +0000
Subject: [PATCH] Changes

Co-authored-by: Reifonas <211114984+Reifonas@users.noreply.github.com>
---
 src/hooks/useControllerGrab.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/hooks/useControllerGrab.ts b/src/hooks/useControllerGrab.ts
index b41f2de..0fcb596 100644
--- a/src/hooks/useControllerGrab.ts
+++ b/src/hooks/useControllerGrab.ts
@@ -87,8 +87,9 @@ export function useControllerGrab() {
       const gp = source.gamepad;
 
       if (gp) {
-        const gripBtn = gp.buttons[2];
-        const trigBtn = gp.buttons[1];
+        // xr-standard mapping: [0]=trigger, [1]=squeeze/grip, [2]=touchpad, [3]=thumbstick
+        const trigBtn = gp.buttons[0];
+        const gripBtn = gp.buttons[1];
         const gripValue = gripBtn ? (gripBtn.value || (gripBtn.pressed ? 1 : 0)) : 0;
         const trigValue = trigBtn ? (trigBtn.value || (trigBtn.pressed ? 1 : 0)) : 0;
         slot.gripValue = gripValue;