From a5f3089fdaf9f0244f95c3e61d53e33d211ac58a Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@brown.edu>
Date: Mon, 8 Aug 2016 13:14:14 -0700
Subject: [PATCH] fix ABXY mapping for touch

---
 interface/resources/controllers/oculus_touch.json | 9 +++++++--
 interface/resources/controllers/standard.json     | 3 ---
 interface/resources/controllers/xbox.json         | 4 +++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/interface/resources/controllers/oculus_touch.json b/interface/resources/controllers/oculus_touch.json
index 82f52e50db..ef5d8c59a8 100644
--- a/interface/resources/controllers/oculus_touch.json
+++ b/interface/resources/controllers/oculus_touch.json
@@ -1,8 +1,13 @@
 {
     "name": "Oculus Touch to Standard",
     "channels": [
-        { "from": "OculusTouch.A", "to": "Standard.RightPrimaryThumb" },
-        { "from": "OculusTouch.X", "to": "Standard.LeftPrimaryThumb" },
+        { "from": "OculusTouch.A", "to": "Standard.RightPrimaryThumb", "peek": true },
+        { "from": "OculusTouch.X", "to": "Standard.LeftPrimaryThumb", "peek": true },
+
+        { "from": "OculusTouch.A", "to": "Standard.A" },
+        { "from": "OculusTouch.B", "to": "Standard.B" },
+        { "from": "OculusTouch.X", "to": "Standard.X" },
+        { "from": "OculusTouch.Y", "to": "Standard.Y" },
 
         { "from": "OculusTouch.LY", "to": "Standard.LY",
             "filters": [
diff --git a/interface/resources/controllers/standard.json b/interface/resources/controllers/standard.json
index 5c0ea09939..222357ac9d 100644
--- a/interface/resources/controllers/standard.json
+++ b/interface/resources/controllers/standard.json
@@ -32,9 +32,6 @@
         { "from": "Standard.Back", "to": "Actions.CycleCamera" },
         { "from": "Standard.Start", "to": "Actions.ContextMenu" },
 
-        { "from": [ "Standard.DU", "Standard.DL", "Standard.DR", "Standard.DD" ], "to": "Standard.LeftPrimaryThumb" },
-        { "from": [ "Standard.A", "Standard.B", "Standard.X", "Standard.Y" ], "to": "Standard.RightPrimaryThumb" },
-
         { "from": "Standard.LT", "to": "Actions.LeftHandClick" }, 
         { "from": "Standard.RT", "to": "Actions.RightHandClick" },
 
diff --git a/interface/resources/controllers/xbox.json b/interface/resources/controllers/xbox.json
index fdac70ff33..1234372a7e 100644
--- a/interface/resources/controllers/xbox.json
+++ b/interface/resources/controllers/xbox.json
@@ -15,12 +15,14 @@
 
         { "from": "GamePad.Back", "to": "Standard.Back" }, 
         { "from": "GamePad.Start", "to": "Standard.Start" }, 
-        
+
+        { "from": [ "GamePad.DU", "GamePad.DL", "GamePad.DR", "GamePad.DD" ], "to": "Standard.LeftPrimaryThumb", "peek": true },
         { "from": "GamePad.DU", "to": "Standard.DU" },
         { "from": "GamePad.DD", "to": "Standard.DD" }, 
         { "from": "GamePad.DL", "to": "Standard.DL" },
         { "from": "GamePad.DR", "to": "Standard.DR" }, 
 
+        { "from": [ "GamePad.A", "GamePad.B", "GamePad.X", "GamePad.Y" ], "to": "Standard.RightPrimaryThumb", "peek": true },
         { "from": "GamePad.A", "to": "Standard.A" }, 
         { "from": "GamePad.B", "to": "Standard.B" }, 
         { "from": "GamePad.X", "to": "Standard.X" },