From 956078bc91ef652ad1b38f66a3d767f87155de35 Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@brown.edu>
Date: Tue, 9 Aug 2016 15:17:36 -0700
Subject: [PATCH 1/2] teleport works with xbox controller

---
 scripts/system/controllers/teleport.js | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/scripts/system/controllers/teleport.js b/scripts/system/controllers/teleport.js
index fae9b98b96..5ec429fae0 100644
--- a/scripts/system/controllers/teleport.js
+++ b/scripts/system/controllers/teleport.js
@@ -232,14 +232,11 @@ function Teleporter() {
     };
 
     this.rightRay = function() {
+        var pose = Controller.getPoseValue(Controller.Standard.RightHand);
+        var rightPosition = pose.valid ? Vec3.sum(Vec3.multiplyQbyV(MyAvatar.orientation, pose.translation), MyAvatar.position) : MyAvatar.getHeadPosition();
+        var rightRotation = pose.valid ? Quat.multiply(MyAvatar.orientation, pose.rotation) : MyAvatar.headOrientation;
 
-        var rightPosition = Vec3.sum(Vec3.multiplyQbyV(MyAvatar.orientation, Controller.getPoseValue(Controller.Standard.RightHand).translation), MyAvatar.position);
-
-        var rightControllerRotation = Controller.getPoseValue(Controller.Standard.RightHand).rotation;
-
-        var rightRotation = Quat.multiply(MyAvatar.orientation, rightControllerRotation);
-
-        var rightFinal = Quat.multiply(rightRotation, Quat.angleAxis(90, {
+        var rightFinal = Quat.multiply(rightRotation, Quat.angleAxis(-90, {
             x: 1,
             y: 0,
             z: 0
@@ -247,7 +244,7 @@ function Teleporter() {
 
         var rightPickRay = {
             origin: rightPosition,
-            direction: Quat.getUp(rightRotation),
+            direction: Quat.getUp(pose.valid ? rightRotation : rightFinal),
         };
 
         this.rightPickRay = rightPickRay;
@@ -288,11 +285,11 @@ function Teleporter() {
 
 
     this.leftRay = function() {
-        var leftPosition = Vec3.sum(Vec3.multiplyQbyV(MyAvatar.orientation, Controller.getPoseValue(Controller.Standard.LeftHand).translation), MyAvatar.position);
+        var pose = Controller.getPoseValue(Controller.Standard.LeftHand);
+        var leftPosition = pose.valid ? Vec3.sum(Vec3.multiplyQbyV(MyAvatar.orientation, pose.translation), MyAvatar.position) : MyAvatar.getHeadPosition();
+        var leftRotation = pose.valid ? Quat.multiply(MyAvatar.orientation, pose.rotation) : MyAvatar.headOrientation;
 
-        var leftRotation = Quat.multiply(MyAvatar.orientation, Controller.getPoseValue(Controller.Standard.LeftHand).rotation)
-
-        var leftFinal = Quat.multiply(leftRotation, Quat.angleAxis(90, {
+        var leftFinal = Quat.multiply(leftRotation, Quat.angleAxis(-90, {
             x: 1,
             y: 0,
             z: 0
@@ -300,7 +297,7 @@ function Teleporter() {
 
         var leftPickRay = {
             origin: leftPosition,
-            direction: Quat.getUp(leftRotation),
+            direction: Quat.getUp(pose.valid ? leftRotation : leftFinal),
         };
 
         this.leftPickRay = leftPickRay;

From 2360e90d395c5e9906188cfa3070b1913efc3909 Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@brown.edu>
Date: Tue, 9 Aug 2016 15:48:31 -0700
Subject: [PATCH 2/2] simplify valid check for rotation

---
 scripts/system/controllers/teleport.js | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/scripts/system/controllers/teleport.js b/scripts/system/controllers/teleport.js
index 5ec429fae0..5a1ae7e5ee 100644
--- a/scripts/system/controllers/teleport.js
+++ b/scripts/system/controllers/teleport.js
@@ -234,17 +234,12 @@ function Teleporter() {
     this.rightRay = function() {
         var pose = Controller.getPoseValue(Controller.Standard.RightHand);
         var rightPosition = pose.valid ? Vec3.sum(Vec3.multiplyQbyV(MyAvatar.orientation, pose.translation), MyAvatar.position) : MyAvatar.getHeadPosition();
-        var rightRotation = pose.valid ? Quat.multiply(MyAvatar.orientation, pose.rotation) : MyAvatar.headOrientation;
-
-        var rightFinal = Quat.multiply(rightRotation, Quat.angleAxis(-90, {
-            x: 1,
-            y: 0,
-            z: 0
-        }));
+        var rightRotation = pose.valid ? Quat.multiply(MyAvatar.orientation, pose.rotation) :
+                                         Quat.multiply(MyAvatar.headOrientation, Quat.angleAxis(-90, {x: 1, y: 0, z: 0}));
 
         var rightPickRay = {
             origin: rightPosition,
-            direction: Quat.getUp(pose.valid ? rightRotation : rightFinal),
+            direction: Quat.getUp(rightRotation),
         };
 
         this.rightPickRay = rightPickRay;
@@ -287,17 +282,12 @@ function Teleporter() {
     this.leftRay = function() {
         var pose = Controller.getPoseValue(Controller.Standard.LeftHand);
         var leftPosition = pose.valid ? Vec3.sum(Vec3.multiplyQbyV(MyAvatar.orientation, pose.translation), MyAvatar.position) : MyAvatar.getHeadPosition();
-        var leftRotation = pose.valid ? Quat.multiply(MyAvatar.orientation, pose.rotation) : MyAvatar.headOrientation;
-
-        var leftFinal = Quat.multiply(leftRotation, Quat.angleAxis(-90, {
-            x: 1,
-            y: 0,
-            z: 0
-        }));
+        var leftRotation = pose.valid ? Quat.multiply(MyAvatar.orientation, pose.rotation) :
+                                        Quat.multiply(MyAvatar.headOrientation, Quat.angleAxis(-90, {x: 1, y: 0, z: 0}));
 
         var leftPickRay = {
             origin: leftPosition,
-            direction: Quat.getUp(pose.valid ? leftRotation : leftFinal),
+            direction: Quat.getUp(leftRotation),
         };
 
         this.leftPickRay = leftPickRay;