From 7e31a1e49b865193b22be5f9158a147e87cf11ce Mon Sep 17 00:00:00 2001
From: Lubosz Sarnecki <lubosz@gmail.com>
Date: Sun, 17 Mar 2024 11:09:52 +0100
Subject: [PATCH] controllers: Improve openxr_index.json mapping.

---
 .../resources/controllers/openxr_index.json   | 23 +++++++------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/interface/resources/controllers/openxr_index.json b/interface/resources/controllers/openxr_index.json
index 7a1199e1a0..44e1ae0a97 100644
--- a/interface/resources/controllers/openxr_index.json
+++ b/interface/resources/controllers/openxr_index.json
@@ -1,29 +1,26 @@
 {
-    "name": "OpenXR Index to Standard",
+    "name": "OpenXR Index to Actions",
     "channels": [
       { "from": "Index.LeftHand", "to": "Standard.LeftHand" },
       { "from": "Index.RightHand", "to": "Standard.RightHand" },
       { "from": "Index.Head", "to" : "Standard.Head", "when" : [ "Application.InHMD"] },
 
-      { "from": "Index.RightPrimaryThumb", "to": "Standard.RightPrimaryThumb" },
-      { "from": "Index.RightSecondaryThumb", "to": "Standard.RightSecondaryThumb" },
-      { "from": "Index.LeftPrimaryThumb", "to": "Standard.LeftPrimaryThumb" },
-      { "from": "Index.LeftSecondaryThumb", "to": "Standard.LeftSecondaryThumb" },
-
+      { "from": "Index.LeftPrimaryThumb", "to": "Actions.Down" },
       { "from": "Index.LeftPrimaryThumbTouch", "to": "Standard.LeftPrimaryThumbTouch" },
+      { "from": "Index.LeftSecondaryThumb", "to": "Actions.ContextMenu" },
       { "from": "Index.LeftSecondaryThumbTouch", "to": "Standard.LeftSecondaryThumbTouch" },
-      { "from": "Index.LeftThumbUp", "to": "Standard.LeftThumbUp" },
 
+      { "from": "Index.RightPrimaryThumb", "to": "Actions.Up" },
       { "from": "Index.RightPrimaryThumbTouch", "to": "Standard.RightPrimaryThumbTouch" },
+      { "from": "Index.RightSecondaryThumb", "to": "Actions.Sprint" },
       { "from": "Index.RightSecondaryThumbTouch", "to": "Standard.RightSecondaryThumbTouch" },
-      { "from": "Index.RightThumbUp", "to": "Standard.RightThumbUp" },
 
       { "from": "Index.LY", "to": "Actions.TranslateZ", "filters": ["invert"] },
       { "from": "Index.LX", "to": "Actions.TranslateX" },
       { "from": "Index.RY", "to": "Standard.RY" },
       { "from": "Index.RX", "to": "Standard.RX" },
       { "from": "Index.LS", "to": "Standard.LS" },
-      { "from": "Index.RS", "to": "Standard.RS" },
+      { "from": "Index.RS", "to": "Actions.CycleCamera" },
       { "from": "Index.LSTouch", "to": "Standard.LSTouch" },
       { "from": "Index.RSTouch", "to": "Standard.RSTouch" },
 
@@ -31,12 +28,8 @@
       { "from": "Index.LT", "to": "Standard.LT" },
       { "from": "Index.RTClick", "to": "Standard.RTClick" },
       { "from": "Index.LTClick", "to": "Standard.LTClick" },
-      { "from": "Index.LeftPrimaryIndexTouch", "to": "Standard.LeftPrimaryIndexTouch" },
-      { "from": "Index.RightPrimaryIndexTouch", "to": "Standard.RightPrimaryIndexTouch" },
-      { "from": "Index.LeftIndexPoint", "to": "Standard.LeftIndexPoint" },
-      { "from": "Index.RightIndexPoint", "to": "Standard.RightIndexPoint" },
 
-      { "from": "Index.LeftApplicationMenu", "to": "Standard.Back" },
-      { "from": "Index.RightApplicationMenu", "to": "Standard.Start" }
+      { "from": "Index.LeftPrimaryIndexTouch", "to": "Standard.LeftPrimaryIndexTouch" },
+      { "from": "Index.RightPrimaryIndexTouch", "to": "Standard.RightPrimaryIndexTouch" }
     ]
 }