From 7da73d0ff11832b66ed8a5e81e0e650391da4ae1 Mon Sep 17 00:00:00 2001
From: "Anthony J. Thibault" <tony@highfidelity.io>
Date: Fri, 2 Jun 2017 18:01:40 -0700
Subject: [PATCH 1/2] teleport.js should still function on avatars with no
 feet.

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

diff --git a/scripts/system/controllers/teleport.js b/scripts/system/controllers/teleport.js
index dcbcaeb621..d6248fc6e0 100644
--- a/scripts/system/controllers/teleport.js
+++ b/scripts/system/controllers/teleport.js
@@ -366,45 +366,25 @@ function Teleporter() {
 }
 
 // related to repositioning the avatar after you teleport
+var FOOT_JOINT_NAMES = ["RightToe_End", "RightToeBase", "RightFoot"];
+var DEFAULT_ROOT_TO_FOOT_OFFSET = 0.5;
 function getAvatarFootOffset() {
-    var data = getJointData();
-    var upperLeg, lowerLeg, foot, toe, toeTop;
-    data.forEach(function(d) {
 
-        var jointName = d.joint;
-        if (jointName === "RightUpLeg") {
-            upperLeg = d.translation.y;
-        } else if (jointName === "RightLeg") {
-            lowerLeg = d.translation.y;
-        } else if (jointName === "RightFoot") {
-            foot = d.translation.y;
-        } else if (jointName === "RightToeBase") {
-            toe = d.translation.y;
-        } else if (jointName === "RightToe_End") {
-            toeTop = d.translation.y;
+    // find a valid foot jointIndex
+    var footJointIndex = -1;
+    var i, l = FOOT_JOINT_NAMES.length;
+    for (i = 0; i < l; i++) {
+        footJointIndex = MyAvatar.getJointIndex(FOOT_JOINT_NAMES[i]);
+        if (footJointIndex != -1) {
+            break;
         }
-    });
-
-    var offset = upperLeg + lowerLeg + foot + toe + toeTop;
-    offset = offset / 100;
-    return offset;
-}
-
-function getJointData() {
-    var allJointData = [];
-    var jointNames = MyAvatar.jointNames;
-    jointNames.forEach(function(joint, index) {
-        var translation = MyAvatar.getJointTranslation(index);
-        var rotation = MyAvatar.getJointRotation(index);
-        allJointData.push({
-            joint: joint,
-            index: index,
-            translation: translation,
-            rotation: rotation
-        });
-    });
-
-    return allJointData;
+    }
+    if (footJointIndex != -1) {
+        // default vertical offset from foot to avatar root.
+        return -MyAvatar.getAbsoluteDefaultJointTranslationInObjectFrame(footJointIndex).y;
+    } else {
+        return DEFAULT_ROOT_TO_FOOT_OFFSET;
+    }
 }
 
 var leftPad = new ThumbPad('left');

From 90d241ca3c643ff5d0adec8afc5dbd4de83200b6 Mon Sep 17 00:00:00 2001
From: "Anthony J. Thibault" <tony@highfidelity.io>
Date: Tue, 6 Jun 2017 09:10:46 -0700
Subject: [PATCH 2/2] Account for avatar scale

---
 scripts/system/controllers/teleport.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/system/controllers/teleport.js b/scripts/system/controllers/teleport.js
index d6248fc6e0..b058ec670f 100644
--- a/scripts/system/controllers/teleport.js
+++ b/scripts/system/controllers/teleport.js
@@ -383,7 +383,7 @@ function getAvatarFootOffset() {
         // default vertical offset from foot to avatar root.
         return -MyAvatar.getAbsoluteDefaultJointTranslationInObjectFrame(footJointIndex).y;
     } else {
-        return DEFAULT_ROOT_TO_FOOT_OFFSET;
+        return DEFAULT_ROOT_TO_FOOT_OFFSET * MyAvatar.scale;
     }
 }