From f4be767d228b54abd0a74df7ff5623bfffdc1ab7 Mon Sep 17 00:00:00 2001
From: Gabriel Calero <gcalero1984@gmail.com>
Date: Fri, 21 Sep 2018 14:58:11 -0300
Subject: [PATCH 01/14] Android sign up

---
 android/app/src/main/cpp/native.cpp           |  53 +++++
 .../hifiinterface/InterfaceActivity.java      |   4 +
 .../hifiinterface/MainActivity.java           |  27 ++-
 .../hifiinterface/fragment/LoginFragment.java |  10 +
 .../fragment/SignupFragment.java              | 190 ++++++++++++++++++
 .../src/main/res/layout/fragment_login.xml    |  14 ++
 .../src/main/res/layout/fragment_signup.xml   | 146 ++++++++++++++
 android/app/src/main/res/values/strings.xml   |   6 +
 interface/src/AndroidHelper.cpp               |  76 +++++++
 interface/src/AndroidHelper.h                 |  11 +
 10 files changed, 536 insertions(+), 1 deletion(-)
 create mode 100644 android/app/src/main/java/io/highfidelity/hifiinterface/fragment/SignupFragment.java
 create mode 100644 android/app/src/main/res/layout/fragment_signup.xml

diff --git a/android/app/src/main/cpp/native.cpp b/android/app/src/main/cpp/native.cpp
index ba956ba322..518c958f26 100644
--- a/android/app/src/main/cpp/native.cpp
+++ b/android/app/src/main/cpp/native.cpp
@@ -26,6 +26,7 @@
 
 QAndroidJniObject __interfaceActivity;
 QAndroidJniObject __loginCompletedListener;
+QAndroidJniObject __signupCompletedListener;
 QAndroidJniObject __loadCompleteListener;
 QAndroidJniObject __usernameChangedListener;
 void tempMessageHandler(QtMsgType type, const QMessageLogContext& context, const QString& message) {
@@ -306,6 +307,58 @@ Java_io_highfidelity_hifiinterface_fragment_LoginFragment_nativeLogin(JNIEnv *en
                               Q_ARG(const QString&, username), Q_ARG(const QString&, password));
 }
 
+JNIEXPORT void Java_io_highfidelity_hifiinterface_InterfaceActivity_nativeInitAfterAppLoaded(JNIEnv* env, jobject obj) {
+    AndroidHelper::instance().moveToThread(qApp->thread());
+}
+
+JNIEXPORT void JNICALL
+Java_io_highfidelity_hifiinterface_fragment_SignupFragment_nativeSignup(JNIEnv *env, jobject instance,
+                                                                       jstring email_, jstring username_,
+                                                                       jstring password_) {
+
+    const char *c_email = env->GetStringUTFChars(email_, 0);
+    const char *c_username = env->GetStringUTFChars(username_, 0);
+    const char *c_password = env->GetStringUTFChars(password_, 0);
+    QString email = QString(c_email);
+    QString username = QString(c_username);
+    QString password = QString(c_password);
+    env->ReleaseStringUTFChars(email_, c_email);
+    env->ReleaseStringUTFChars(username_, c_username);
+    env->ReleaseStringUTFChars(password_, c_password);
+
+    __signupCompletedListener = QAndroidJniObject(instance);
+
+    // disconnect any previous callback
+    QObject::disconnect(&AndroidHelper::instance(), &AndroidHelper::handleSignupCompleted, nullptr, nullptr);
+    QObject::disconnect(&AndroidHelper::instance(), &AndroidHelper::handleSignupFailed, nullptr, nullptr);
+
+    QObject::connect(&AndroidHelper::instance(), &AndroidHelper::handleSignupCompleted, []() {
+        jboolean jSuccess = (jboolean) true;
+        if (__signupCompletedListener.isValid()) {
+            __signupCompletedListener.callMethod<void>("handleSignupCompleted", "()V", jSuccess);
+        }
+    });
+
+    QObject::connect(&AndroidHelper::instance(), &AndroidHelper::handleSignupFailed, [](QString errorString) {
+        jboolean jSuccess = (jboolean) false;
+        jstring jError = QAndroidJniObject::fromString(errorString).object<jstring>();
+        if (__signupCompletedListener.isValid()) {
+            QAndroidJniObject string = QAndroidJniObject::fromString(errorString);
+            __signupCompletedListener.callMethod<void>("handleSignupFailed", "(Ljava/lang/String;)V", string.object<jstring>());
+        }
+    });
+
+    AndroidHelper::instance().signup(email, username, password);
+}
+
+JNIEXPORT void JNICALL
+Java_io_highfidelity_hifiinterface_fragment_SignupFragment_nativeCancelSignup(JNIEnv *env, jobject instance) {
+    QObject::disconnect(&AndroidHelper::instance(), &AndroidHelper::handleSignupCompleted, nullptr, nullptr);
+    QObject::disconnect(&AndroidHelper::instance(), &AndroidHelper::handleSignupFailed, nullptr, nullptr);
+
+    __signupCompletedListener = nullptr;
+}
+
 JNIEXPORT jboolean JNICALL
 Java_io_highfidelity_hifiinterface_fragment_FriendsFragment_nativeIsLoggedIn(JNIEnv *env, jobject instance) {
     auto accountManager = DependencyManager::get<AccountManager>();
diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java b/android/app/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java
index f161783d6a..94dd958600 100644
--- a/android/app/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java
@@ -65,6 +65,7 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
     private native void nativeEnterBackground();
     private native void nativeEnterForeground();
     private native long nativeOnExitVr();
+    private native void nativeInitAfterAppLoaded();
 
     private AssetManager assetManager;
 
@@ -335,6 +336,9 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
         if (nativeEnterBackgroundCallEnqueued) {
             nativeEnterBackground();
         }
+        runOnUiThread(() -> {
+            nativeInitAfterAppLoaded();
+        });
     }
 
     public void performHapticFeedback(int duration) {
diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/MainActivity.java b/android/app/src/main/java/io/highfidelity/hifiinterface/MainActivity.java
index db6f0fca24..ab85852ed0 100644
--- a/android/app/src/main/java/io/highfidelity/hifiinterface/MainActivity.java
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/MainActivity.java
@@ -25,6 +25,7 @@ import android.view.Window;
 import android.view.WindowManager;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.squareup.picasso.Callback;
 import com.squareup.picasso.Picasso;
@@ -33,12 +34,14 @@ import io.highfidelity.hifiinterface.fragment.FriendsFragment;
 import io.highfidelity.hifiinterface.fragment.HomeFragment;
 import io.highfidelity.hifiinterface.fragment.LoginFragment;
 import io.highfidelity.hifiinterface.fragment.PolicyFragment;
+import io.highfidelity.hifiinterface.fragment.SignupFragment;
 import io.highfidelity.hifiinterface.task.DownloadProfileImageTask;
 
 public class MainActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener,
                                                                 LoginFragment.OnLoginInteractionListener,
                                                                 HomeFragment.OnHomeInteractionListener,
-                                                                FriendsFragment.OnHomeInteractionListener {
+                                                                FriendsFragment.OnHomeInteractionListener,
+                                                                SignupFragment.OnSignupInteractionListener {
 
     private static final int PROFILE_PICTURE_PLACEHOLDER = R.drawable.default_profile_avatar;
     public static final String DEFAULT_FRAGMENT = "Home";
@@ -139,6 +142,12 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
         loadFragment(fragment, getString(R.string.login), getString(R.string.tagFragmentLogin), true);
     }
 
+    private void loadSignupFragment() {
+        Fragment fragment = SignupFragment.newInstance();
+
+        loadFragment(fragment, getString(R.string.signup), getString(R.string.tagFragmentSignup), true);
+    }
+
     private void loadPrivacyPolicyFragment() {
         Fragment fragment = PolicyFragment.newInstance();
 
@@ -307,6 +316,22 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
         }
     }
 
+    @Override
+    public void onLoginRequested() {
+        loadLoginFragment();
+    }
+
+    @Override
+    public void onSignupRequested() {
+        loadSignupFragment();
+    }
+
+    @Override
+    public void onSignupCompleted() {
+        Toast.makeText(this, "Sign up succeeded", Toast.LENGTH_SHORT).show();
+        loadLoginFragment();
+    }
+
     public void handleUsernameChanged(String username) {
         runOnUiThread(() -> updateProfileHeader(username));
     }
diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/LoginFragment.java b/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/LoginFragment.java
index 92cdec19a1..764e0c8ed5 100644
--- a/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/LoginFragment.java
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/LoginFragment.java
@@ -30,6 +30,7 @@ public class LoginFragment extends Fragment {
     private EditText mPassword;
     private TextView mError;
     private TextView mForgotPassword;
+    private TextView mSignup;
     private Button mLoginButton;
 
     private ProgressDialog mDialog;
@@ -58,10 +59,12 @@ public class LoginFragment extends Fragment {
         mError = rootView.findViewById(R.id.error);
         mLoginButton = rootView.findViewById(R.id.loginButton);
         mForgotPassword = rootView.findViewById(R.id.forgotPassword);
+        mSignup = rootView.findViewById(R.id.signup);
 
         mLoginButton.setOnClickListener(view -> login());
 
         mForgotPassword.setOnClickListener(view -> forgotPassword());
+        mSignup.setOnClickListener(view -> signup());
 
         mPassword.setOnEditorActionListener(
                 (textView, actionId, keyEvent) -> {
@@ -121,6 +124,12 @@ public class LoginFragment extends Fragment {
         }
     }
 
+    public void signup() {
+        if (mListener != null) {
+            mListener.onSignupRequested();
+        }
+    }
+
     private void hideKeyboard() {
         View view = getActivity().getCurrentFocus();
         if (view != null) {
@@ -182,6 +191,7 @@ public class LoginFragment extends Fragment {
 
     public interface OnLoginInteractionListener {
         void onLoginCompleted();
+        void onSignupRequested();
     }
 
 }
diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/SignupFragment.java b/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/SignupFragment.java
new file mode 100644
index 0000000000..eb3a20b449
--- /dev/null
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/SignupFragment.java
@@ -0,0 +1,190 @@
+package io.highfidelity.hifiinterface.fragment;
+
+import android.app.Fragment;
+import android.app.ProgressDialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import org.qtproject.qt5.android.QtNative;
+
+import io.highfidelity.hifiinterface.R;
+
+import static org.qtproject.qt5.android.QtActivityDelegate.ApplicationActive;
+import static org.qtproject.qt5.android.QtActivityDelegate.ApplicationInactive;
+
+public class SignupFragment extends Fragment {
+
+    private EditText mEmail;
+    private EditText mUsername;
+    private EditText mPassword;
+    private TextView mError;
+    private TextView mLogin;
+
+    private Button mSignupButton;
+
+    private ProgressDialog mDialog;
+
+    public native void nativeSignup(String email, String username, String password); // move to SignupFragment
+    public native void nativeCancelSignup();
+
+    private SignupFragment.OnSignupInteractionListener mListener;
+
+    public SignupFragment() {
+        // Required empty public constructor
+    }
+
+    public static SignupFragment newInstance() {
+        SignupFragment fragment = new SignupFragment();
+        return fragment;
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View rootView = inflater.inflate(R.layout.fragment_signup, container, false);
+
+        mEmail = rootView.findViewById(R.id.email);
+        mUsername = rootView.findViewById(R.id.username);
+        mPassword = rootView.findViewById(R.id.password);
+        mError = rootView.findViewById(R.id.error);
+        mSignupButton = rootView.findViewById(R.id.signupButton);
+        mLogin = rootView.findViewById(R.id.login);
+
+        mSignupButton.setOnClickListener(view -> signup());
+        mLogin.setOnClickListener(view -> login());
+        mPassword.setOnEditorActionListener(
+                (textView, actionId, keyEvent) -> {
+                    if (actionId == EditorInfo.IME_ACTION_DONE) {
+                        mSignupButton.performClick();
+                        return true;
+                    }
+                    return false;
+                });
+        return rootView;
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        if (context instanceof OnSignupInteractionListener) {
+            mListener = (OnSignupInteractionListener) context;
+        } else {
+            throw new RuntimeException(context.toString()
+                    + " must implement OnSignupInteractionListener");
+        }
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        mListener = null;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        // This hack intends to keep Qt threads running even after the app comes from background
+        QtNative.setApplicationState(ApplicationActive);
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        cancelActivityIndicator();
+        // Leave the Qt app paused
+        QtNative.setApplicationState(ApplicationInactive);
+        hideKeyboard();
+    }
+
+    private void login() {
+        if (mListener != null) {
+            mListener.onLoginRequested();
+        }
+    }
+
+    public void signup() {
+        String email = mEmail.getText().toString().trim();
+        String username = mUsername.getText().toString().trim();
+        String password = mPassword.getText().toString();
+        hideKeyboard();
+        if (email.isEmpty() || username.isEmpty() || password.isEmpty()) {
+            showError(getString(R.string.signup_email_username_or_password_incorrect));
+        } else {
+            mSignupButton.setEnabled(false);
+            hideError();
+            showActivityIndicator();
+            nativeSignup(email, username, password);
+        }
+    }
+
+    private void hideKeyboard() {
+        View view = getActivity().getCurrentFocus();
+        if (view != null) {
+            InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+            imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
+        }
+    }
+
+    private void showActivityIndicator() {
+        if (mDialog == null) {
+            mDialog = new ProgressDialog(getContext());
+        }
+        mDialog.setMessage(getString(R.string.creating_account));
+        mDialog.setCancelable(true);
+        mDialog.setOnCancelListener(dialogInterface -> {
+            nativeCancelSignup();
+            cancelActivityIndicator();
+            mSignupButton.setEnabled(true);
+        });
+        mDialog.show();
+    }
+
+    private void cancelActivityIndicator() {
+        if (mDialog != null) {
+            mDialog.cancel();
+        }
+    }
+    private void showError(String error) {
+        mError.setText(error);
+        mError.setVisibility(View.VISIBLE);
+    }
+
+    private void hideError() {
+        mError.setText("");
+        mError.setVisibility(View.INVISIBLE);
+    }
+
+    public interface OnSignupInteractionListener {
+        void onSignupCompleted();
+        void onLoginRequested();
+    }
+
+    public void handleSignupCompleted() {
+        getActivity().runOnUiThread(() -> {
+            mSignupButton.setEnabled(true);
+            cancelActivityIndicator();
+            if (mListener != null) {
+                mListener.onSignupCompleted();
+            }
+            mError.setText("handleSignupCompleted");
+        });
+    }
+
+    public void handleSignupFailed(String error) {
+        getActivity().runOnUiThread(() -> {
+            mSignupButton.setEnabled(true);
+            cancelActivityIndicator();
+            mError.setText(error);
+            mError.setVisibility(View.VISIBLE);
+        });
+    }
+
+}
diff --git a/android/app/src/main/res/layout/fragment_login.xml b/android/app/src/main/res/layout/fragment_login.xml
index 46ed783898..6066c46a10 100644
--- a/android/app/src/main/res/layout/fragment_login.xml
+++ b/android/app/src/main/res/layout/fragment_login.xml
@@ -120,6 +120,20 @@
         app:layout_constraintRight_toLeftOf="@id/loginButton"
         android:textColor="@color/colorButton1"/>
 
+    <TextView
+        android:id="@+id/signup"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:fontFamily="@font/raleway_semibold"
+        android:textSize="14dp"
+        android:text="@string/signup"
+        android:textStyle="italic"
+        android:paddingRight="10dp"
+        android:layout_marginTop="20dp"
+        app:layout_constraintLeft_toLeftOf="@id/passwordLayout"
+        app:layout_constraintTop_toBottomOf="@id/forgotPassword"
+        app:layout_constraintRight_toLeftOf="@id/loginButton"
+        android:textColor="@color/colorButton1"/>
 
 
 
diff --git a/android/app/src/main/res/layout/fragment_signup.xml b/android/app/src/main/res/layout/fragment_signup.xml
new file mode 100644
index 0000000000..09e9ec352f
--- /dev/null
+++ b/android/app/src/main/res/layout/fragment_signup.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/backgroundLight">
+
+    <ImageView
+        android:id="@+id/header"
+        android:layout_width="@dimen/header_hifi_width"
+        android:layout_height="@dimen/header_hifi_height"
+        android:layout_marginTop="@dimen/header_hifi_margin_top"
+        android:contentDescription="HighFidelity"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/hifi_header" />
+
+    <TextView
+        android:id="@+id/error"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
+        android:fontFamily="@font/raleway"
+        android:textColor="@color/colorLoginError"
+        android:textSize="12sp"
+        app:layout_constraintBottom_toTopOf="@id/email"
+        app:layout_constraintLeft_toLeftOf="@id/email"
+        app:layout_constraintRight_toRightOf="@id/email"
+        android:visibility="invisible"/>
+
+    <EditText
+        android:id="@+id/email"
+        android:layout_width="match_parent"
+        android:layout_height="35dp"
+        android:layout_marginLeft="46dp"
+        android:layout_marginRight="46dp"
+        android:background="@drawable/rounded_edit"
+        android:padding="7dp"
+        android:paddingRight="12dp"
+        android:paddingTop="14dp"
+        android:ems="10"
+        android:fontFamily="@font/raleway"
+        android:textSize="17sp"
+        android:inputType="textEmailAddress"
+        android:textStyle="italic"
+        android:textColor="@color/editTextColor"
+        android:textColorHint="@color/editTextColor"
+        android:gravity="left|center_vertical"
+        app:layout_constraintTop_toBottomOf="@id/header"
+        android:layout_marginTop="70dp"
+        android:hint="@string/email" />
+
+    <EditText
+        android:id="@+id/username"
+        android:layout_width="match_parent"
+        android:layout_height="35dp"
+        android:layout_marginLeft="46dp"
+        android:layout_marginRight="46dp"
+        android:background="@drawable/rounded_edit"
+        android:padding="7dp"
+        android:paddingRight="12dp"
+        android:paddingTop="14dp"
+        android:ems="10"
+        android:fontFamily="@font/raleway"
+        android:textSize="17sp"
+        android:inputType="text"
+        android:textStyle="italic"
+        android:textColor="@color/editTextColor"
+        android:textColorHint="@color/editTextColor"
+        android:gravity="left|center_vertical"
+        app:layout_constraintTop_toBottomOf="@id/email"
+        android:layout_marginTop="13dp"
+        android:hint="@string/username" />
+
+
+    <android.support.design.widget.TextInputLayout
+        android:id="@+id/passwordLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="46dp"
+        android:layout_marginRight="46dp"
+        app:passwordToggleTint="@color/showPasswordColor"
+        app:passwordToggleEnabled="true"
+        app:hintAnimationEnabled="false"
+        app:passwordToggleDrawable="@drawable/selector_show_password"
+        app:hintEnabled="false"
+        app:layout_constraintTop_toBottomOf="@id/username"
+        android:layout_marginTop="13dp"
+        >
+    <android.support.design.widget.TextInputEditText
+        android:id="@+id/password"
+        android:layout_width="match_parent"
+        android:layout_height="35dp"
+        android:background="@drawable/rounded_edit"
+        android:padding="7dp"
+        android:drawablePadding="55dp"
+        android:paddingTop="14dp"
+        android:drawableEnd="@drawable/ic_eye_noshow"
+        android:ems="10"
+        android:fontFamily="@font/raleway"
+        android:textSize="17sp"
+        android:textStyle="italic"
+        android:textColor="@color/editTextColor"
+        android:textColorHint="@color/editTextColor"
+        android:gravity="left|center_vertical"
+        android:imeOptions="actionDone"
+        android:hint="@string/password"
+        android:inputType="textPassword" />
+    </android.support.design.widget.TextInputLayout>
+
+    <Button
+        android:id="@+id/signupButton"
+        android:layout_width="154dp"
+        android:layout_height="38dp"
+        android:layout_marginTop="16dp"
+        android:background="@drawable/rounded_button"
+        android:fontFamily="@font/raleway_semibold"
+        android:paddingBottom="0dp"
+        android:paddingLeft="20dp"
+        android:paddingRight="20dp"
+        android:paddingTop="0dp"
+        android:text="@string/signup"
+        android:textColor="@color/white_opaque"
+        android:textAllCaps="false"
+        android:textSize="15sp"
+        app:layout_constraintRight_toRightOf="@id/username"
+        app:layout_constraintTop_toBottomOf="@id/passwordLayout"
+        app:layout_goneMarginTop="4dp"/>
+
+    <TextView
+        android:id="@+id/login"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:fontFamily="@font/raleway_semibold"
+        android:textSize="14dp"
+        android:text="@string/login"
+        android:textStyle="italic"
+        android:paddingRight="10dp"
+        app:layout_constraintLeft_toLeftOf="@id/passwordLayout"
+        app:layout_constraintTop_toTopOf="@id/signupButton"
+        app:layout_constraintRight_toLeftOf="@id/loginButton"
+        android:textColor="@color/colorButton1"/>
+
+</android.support.constraint.ConstraintLayout>
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 5a9b8a8bf3..09057d40fd 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -10,6 +10,8 @@
     <string name="popular">POPULAR</string>
     <string name="bookmarks">BOOKMARKS</string>
     <string name="goto_url_hint">Type a domain url</string>
+    <string name="email">Email</string>
+    <string name="username">Username</string>
     <string name="username_or_email">Username or email</string>
     <string name="password">Password</string>
     <string name="login">Login</string>
@@ -23,10 +25,14 @@
     <string name="privacyPolicy">Privacy Policy</string>
     <string name="your_last_location">Your Last Location</string>
     <string name="online">Online</string>
+    <string name="signup">Sign up</string>
+    <string name="creating_account">Creating your High Fidelity account</string>
+    <string name="signup_email_username_or_password_incorrect">Email, username or password incorrect.</string>
 
     <!-- tags -->
     <string name="tagFragmentHome">tagFragmentHome</string>
     <string name="tagFragmentLogin">tagFragmentLogin</string>
+    <string name="tagFragmentSignup">tagFragmentSignup</string>
     <string name="tagFragmentPolicy">tagFragmentPolicy</string>
     <string name="tagFragmentPeople">tagFragmentPeople</string>
 </resources>
diff --git a/interface/src/AndroidHelper.cpp b/interface/src/AndroidHelper.cpp
index 419382f2cb..e1345ecc28 100644
--- a/interface/src/AndroidHelper.cpp
+++ b/interface/src/AndroidHelper.cpp
@@ -10,6 +10,7 @@
 //
 #include "AndroidHelper.h"
 #include <QDebug>
+#include <AccountManager.h>
 #include "Application.h"
 
 #if defined(qApp)
@@ -56,3 +57,78 @@ void AndroidHelper::processURL(const QString &url) {
         qApp->acceptURL(url);
     }
 }
+
+void AndroidHelper::signup(QString email, QString username, QString password) {
+    JSONCallbackParameters callbackParams;
+    callbackParams.callbackReceiver = this;
+    callbackParams.jsonCallbackMethod = "signupCompleted";
+    callbackParams.errorCallbackMethod = "signupFailed";
+
+    QJsonObject payload;
+
+    QJsonObject userObject;
+    userObject.insert("email", email);
+    userObject.insert("username", username);
+    userObject.insert("password", password);
+
+    payload.insert("user", userObject);
+
+    static const QString API_SIGNUP_PATH = "api/v1/users";
+
+    auto accountManager = DependencyManager::get<AccountManager>();
+
+    accountManager->sendRequest(API_SIGNUP_PATH, AccountManagerAuth::None,
+                                QNetworkAccessManager::PostOperation, callbackParams,
+                                QJsonDocument(payload).toJson());
+}
+
+void AndroidHelper::signupCompleted(QNetworkReply* reply) {
+    emit handleSignupCompleted();
+}
+
+QString AndroidHelper::errorStringFromAPIObject(const QJsonValue& apiObject) {
+    if (apiObject.isArray()) {
+        return apiObject.toArray()[0].toString();
+    } else if (apiObject.isString()) {
+        return apiObject.toString();
+    } else {
+        return "is invalid";
+    }
+}
+
+void AndroidHelper::signupFailed(QNetworkReply* reply) {
+    // parse the returned JSON to see what the problem was
+    auto jsonResponse = QJsonDocument::fromJson(reply->readAll());
+
+    static const QString RESPONSE_DATA_KEY = "data";
+
+    auto dataJsonValue = jsonResponse.object()[RESPONSE_DATA_KEY];
+
+    if (dataJsonValue.isObject()) {
+        auto dataObject = dataJsonValue.toObject();
+
+        static const QString EMAIL_DATA_KEY = "email";
+        static const QString USERNAME_DATA_KEY = "username";
+        static const QString PASSWORD_DATA_KEY = "password";
+
+        QStringList errorStringList;
+
+        if (dataObject.contains(EMAIL_DATA_KEY)) {
+            errorStringList.append(QString("Email %1.").arg(errorStringFromAPIObject(dataObject[EMAIL_DATA_KEY])));
+        }
+
+        if (dataObject.contains(USERNAME_DATA_KEY)) {
+            errorStringList.append(QString("Username %1.").arg(errorStringFromAPIObject(dataObject[USERNAME_DATA_KEY])));
+        }
+
+        if (dataObject.contains(PASSWORD_DATA_KEY)) {
+            errorStringList.append(QString("Password %1.").arg(errorStringFromAPIObject(dataObject[PASSWORD_DATA_KEY])));
+        }
+
+        emit handleSignupFailed(errorStringList.join('\n'));
+    } else {
+        static const QString DEFAULT_SIGN_UP_FAILURE_MESSAGE = "There was an unknown error while creating your account. Please try again later.";
+        emit handleSignupFailed(DEFAULT_SIGN_UP_FAILURE_MESSAGE);
+    }
+}
+
diff --git a/interface/src/AndroidHelper.h b/interface/src/AndroidHelper.h
index 03d92f91d9..aec1907801 100644
--- a/interface/src/AndroidHelper.h
+++ b/interface/src/AndroidHelper.h
@@ -13,6 +13,8 @@
 #define hifi_Android_Helper_h
 
 #include <QObject>
+#include <QNetworkReply>
+#include <QtCore/QEventLoop>
 
 class AndroidHelper : public QObject {
     Q_OBJECT
@@ -33,8 +35,12 @@ public:
     AndroidHelper(AndroidHelper const&)  = delete;
     void operator=(AndroidHelper const&) = delete;
 
+    void signup(QString email, QString username, QString password);
+
 public slots:
     void showLoginDialog();
+    void signupCompleted(QNetworkReply* reply);
+    void signupFailed(QNetworkReply* reply);
 
 signals:
     void androidActivityRequested(const QString &activityName, const bool backToScene, QList<QString> args = QList<QString>());
@@ -45,9 +51,14 @@ signals:
 
     void hapticFeedbackRequested(int duration);
 
+    void handleSignupCompleted();
+    void handleSignupFailed(QString errorString);
+
 private:
     AndroidHelper();
     ~AndroidHelper();
+
+    QString errorStringFromAPIObject(const QJsonValue& apiObject);
 };
 
 #endif

From b467267e40884fb019b7f5481208a7459cf05c1a Mon Sep 17 00:00:00 2001
From: Anthony Thibault <tony@highfidelity.io>
Date: Mon, 24 Sep 2018 11:47:05 -0700
Subject: [PATCH 02/14] Fix for bad static_pointer_cast on exit.

Identified by Address Sanatizer on Linux.

On exit ~Applicaiton calls AvatarManager::deleteAllAvatars.  This iterates over all avatars remaining in the _avatarHash.
Typically this includes the MyAvatar instance.  In this case the previous code would attempt to static cast an AvatarData pointer to an instance
of OtherAvatar.  This might be harmless, but could also lead hard to diagnose issues such as memory corruption.
---
 interface/src/avatar/AvatarManager.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/interface/src/avatar/AvatarManager.cpp b/interface/src/avatar/AvatarManager.cpp
index 1faf17ea9a..0334b49fbe 100644
--- a/interface/src/avatar/AvatarManager.cpp
+++ b/interface/src/avatar/AvatarManager.cpp
@@ -481,12 +481,15 @@ void AvatarManager::deleteAllAvatars() {
     assert(_avatarsToChangeInPhysics.empty());
 
     QReadLocker locker(&_hashLock);
-    AvatarHash::iterator avatarIterator =  _avatarHash.begin();
+    AvatarHash::iterator avatarIterator = _avatarHash.begin();
     while (avatarIterator != _avatarHash.end()) {
-        auto avatar = std::static_pointer_cast<OtherAvatar>(avatarIterator.value());
+        auto avatar = std::static_pointer_cast<Avatar>(avatarIterator.value());
         avatarIterator = _avatarHash.erase(avatarIterator);
         avatar->die();
-        assert(!avatar->_motionState);
+        if (avatar != _myAvatar) {
+            auto otherAvatar = std::static_pointer_cast<OtherAvatar>(avatar);
+            assert(!otherAvatar->_motionState);
+        }
     }
 }
 

From fa27bb7e11e89ed4b5487cf8cbbf622939221771 Mon Sep 17 00:00:00 2001
From: Anthony Thibault <tony@highfidelity.io>
Date: Mon, 24 Sep 2018 16:56:22 -0700
Subject: [PATCH 03/14] Bug fix for Vive puck calibration of hands and feet

Before this PR, there were small errors that can occur if you calibrate while not facing down the z-axis in vive sensor space.
As indicated by the small arrow in the steam vr grid.

The hands could end up flipped 180 degrees and the feet could end up with an incorrect offset resulting in a wider or narrower stance then expected.
This PR is intended to fix these issues.
---
 plugins/openvr/src/ViveControllerManager.cpp | 33 +++++++++-----------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/plugins/openvr/src/ViveControllerManager.cpp b/plugins/openvr/src/ViveControllerManager.cpp
index 0deb4c75e7..f5b4411f51 100644
--- a/plugins/openvr/src/ViveControllerManager.cpp
+++ b/plugins/openvr/src/ViveControllerManager.cpp
@@ -568,6 +568,7 @@ void ViveControllerManager::InputDevice::calibrate(const controller::InputCalibr
         return;
     }
 
+    // Compute the defaultToRefrenceMat, this will take inputCalibration default poses into the reference frame. (sensor space)
     glm::mat4 defaultToReferenceMat = glm::mat4();
     if (_headConfig == HeadConfig::HMD) {
         defaultToReferenceMat = calculateDefaultToReferenceForHmd(inputCalibration);
@@ -1025,17 +1026,15 @@ void ViveControllerManager::InputDevice::hapticsHelper(float deltaTime, bool lef
 
 void ViveControllerManager::InputDevice::calibrateLeftHand(const glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration, PuckPosePair& handPair) {
     controller::Pose& handPose = handPair.second;
-    glm::mat4 handPoseAvatarMat = createMatFromQuatAndPos(handPose.getRotation(), handPose.getTranslation());
-    glm::vec3 handPoseTranslation = extractTranslation(handPoseAvatarMat);
-    glm::vec3 handPoseZAxis = glmExtractRotation(handPoseAvatarMat) * glm::vec3(0.0f, 0.0f, 1.0f);
-    glm::vec3 avatarHandYAxis = transformVectorFast(inputCalibration.defaultLeftHand, glm::vec3(0.0f, 1.0f, 0.0f));
+    glm::vec3 handPoseZAxis = handPose.getRotation() * glm::vec3(0.0f, 0.0f, 1.0f);
+    glm::vec3 defaultHandYAxis = transformVectorFast(defaultToReferenceMat * inputCalibration.defaultLeftHand, glm::vec3(0.0f, 1.0f, 0.0f));
     const float EPSILON = 1.0e-4f;
-    if (fabsf(fabsf(glm::dot(glm::normalize(avatarHandYAxis), glm::normalize(handPoseZAxis))) - 1.0f) < EPSILON) {
+    if (fabsf(fabsf(glm::dot(glm::normalize(defaultHandYAxis), glm::normalize(handPoseZAxis))) - 1.0f) < EPSILON) {
         handPoseZAxis = glm::vec3(0.0f, 0.0f, 1.0f);
     }
 
     glm::vec3 zPrime = handPoseZAxis;
-    glm::vec3 xPrime = glm::normalize(glm::cross(avatarHandYAxis, handPoseZAxis));
+    glm::vec3 xPrime = glm::normalize(glm::cross(defaultHandYAxis, handPoseZAxis));
     glm::vec3 yPrime = glm::normalize(glm::cross(zPrime, xPrime));
 
     glm::mat4 newHandMat = glm::mat4(glm::vec4(xPrime, 0.0f), glm::vec4(yPrime, 0.0f),
@@ -1043,7 +1042,7 @@ void ViveControllerManager::InputDevice::calibrateLeftHand(const glm::mat4& defa
 
 
     glm::vec3 translationOffset = glm::vec3(0.0f, _handPuckYOffset, _handPuckZOffset);
-    glm::quat initialRotation = glmExtractRotation(handPoseAvatarMat);
+    glm::quat initialRotation = handPose.getRotation();
     glm::quat finalRotation = glmExtractRotation(newHandMat);
 
     glm::quat rotationOffset = glm::inverse(initialRotation) * finalRotation;
@@ -1056,17 +1055,15 @@ void ViveControllerManager::InputDevice::calibrateLeftHand(const glm::mat4& defa
 
 void ViveControllerManager::InputDevice::calibrateRightHand(const glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration, PuckPosePair& handPair) {
     controller::Pose& handPose = handPair.second;
-    glm::mat4 handPoseAvatarMat = createMatFromQuatAndPos(handPose.getRotation(), handPose.getTranslation());
-    glm::vec3 handPoseTranslation = extractTranslation(handPoseAvatarMat);
-    glm::vec3 handPoseZAxis = glmExtractRotation(handPoseAvatarMat) * glm::vec3(0.0f, 0.0f, 1.0f);
-    glm::vec3 avatarHandYAxis = transformVectorFast(inputCalibration.defaultRightHand, glm::vec3(0.0f, 1.0f, 0.0f));
+    glm::vec3 handPoseZAxis = handPose.getRotation() * glm::vec3(0.0f, 0.0f, 1.0f);
+    glm::vec3 defaultHandYAxis = transformVectorFast(defaultToReferenceMat * inputCalibration.defaultRightHand, glm::vec3(0.0f, 1.0f, 0.0f));
     const float EPSILON = 1.0e-4f;
-    if (fabsf(fabsf(glm::dot(glm::normalize(avatarHandYAxis), glm::normalize(handPoseZAxis))) - 1.0f) < EPSILON) {
+    if (fabsf(fabsf(glm::dot(glm::normalize(defaultHandYAxis), glm::normalize(handPoseZAxis))) - 1.0f) < EPSILON) {
         handPoseZAxis = glm::vec3(0.0f, 0.0f, 1.0f);
     }
 
     glm::vec3 zPrime = handPoseZAxis;
-    glm::vec3 xPrime = glm::normalize(glm::cross(avatarHandYAxis, handPoseZAxis));
+    glm::vec3 xPrime = glm::normalize(glm::cross(defaultHandYAxis, handPoseZAxis));
     glm::vec3 yPrime = glm::normalize(glm::cross(zPrime, xPrime));
     glm::mat4 newHandMat = glm::mat4(glm::vec4(xPrime, 0.0f), glm::vec4(yPrime, 0.0f),
                                      glm::vec4(zPrime, 0.0f), glm::vec4(0.0f, 0.0f, 0.0f, 1.0f));
@@ -1074,7 +1071,7 @@ void ViveControllerManager::InputDevice::calibrateRightHand(const glm::mat4& def
 
 
     glm::vec3 translationOffset = glm::vec3(0.0f, _handPuckYOffset, _handPuckZOffset);
-    glm::quat initialRotation = glmExtractRotation(handPoseAvatarMat);
+    glm::quat initialRotation = handPose.getRotation();
     glm::quat finalRotation = glmExtractRotation(newHandMat);
 
     glm::quat rotationOffset = glm::inverse(initialRotation) * finalRotation;
@@ -1105,15 +1102,15 @@ void ViveControllerManager::InputDevice::calibrateFeet(const glm::mat4& defaultT
 
 void ViveControllerManager::InputDevice::calibrateFoot(const glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration, PuckPosePair& footPair, bool isLeftFoot){
     controller::Pose footPose = footPair.second;
-    glm::mat4 puckPoseAvatarMat = createMatFromQuatAndPos(footPose.getRotation(), footPose.getTranslation());
+    glm::mat4 puckPoseMat = createMatFromQuatAndPos(footPose.getRotation(), footPose.getTranslation());
     glm::mat4 defaultFoot = isLeftFoot ? inputCalibration.defaultLeftFoot : inputCalibration.defaultRightFoot;
     glm::mat4 footOffset = computeOffset(defaultToReferenceMat, defaultFoot, footPose);
 
     glm::quat rotationOffset = glmExtractRotation(footOffset);
     glm::vec3 translationOffset = extractTranslation(footOffset);
-    glm::vec3 avatarXAxisInPuckFrame = glm::normalize(transformVectorFast(glm::inverse(puckPoseAvatarMat), glm::vec3(-1.0f, 0.0f, 0.0f)));
-    float distance = glm::dot(translationOffset, avatarXAxisInPuckFrame);
-    glm::vec3 finalTranslation =  translationOffset - (distance * avatarXAxisInPuckFrame);
+    glm::vec3 localXAxisInPuckFrame = glm::normalize(transformVectorFast(glm::inverse(puckPoseMat) * defaultToReferenceMat, glm::vec3(-1.0f, 0.0f, 0.0f)));
+    float distance = glm::dot(translationOffset, localXAxisInPuckFrame);
+    glm::vec3 finalTranslation =  translationOffset - (distance * localXAxisInPuckFrame);
     glm::mat4 finalOffset = createMatFromQuatAndPos(rotationOffset, finalTranslation);
 
     if (isLeftFoot) {

From af897bdef28adf2e751a9506fd43f82ecb09ca36 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Tue, 25 Sep 2018 09:13:59 -0700
Subject: [PATCH 04/14] Fix models with 1^3 dimensions never being resized

---
 libraries/entities-renderer/src/RenderableModelEntityItem.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index 3a01650a04..deba00d9c1 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -210,7 +210,8 @@ void RenderableModelEntityItem::updateModelBounds() {
     }
 
     if (model->getScaleToFitDimensions() != getScaledDimensions() ||
-            model->getRegistrationPoint() != getRegistrationPoint()) {
+            model->getRegistrationPoint() != getRegistrationPoint() ||
+            !model->getIsScaledToFit()) {
         // The machinery for updateModelBounds will give existing models the opportunity to fix their
         // translation/rotation/scale/registration.  The first two are straightforward, but the latter two
         // have guards to make sure they don't happen after they've already been set.  Here we reset those guards.

From a41591323b75c0253756b5663f32a47b8dcc7ff5 Mon Sep 17 00:00:00 2001
From: Anthony Thibault <tony@highfidelity.io>
Date: Tue, 25 Sep 2018 10:42:43 -0700
Subject: [PATCH 05/14] Code review feedback.

---
 plugins/openvr/src/ViveControllerManager.cpp | 25 +++++++++++---------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/plugins/openvr/src/ViveControllerManager.cpp b/plugins/openvr/src/ViveControllerManager.cpp
index f5b4411f51..bf2e384b62 100644
--- a/plugins/openvr/src/ViveControllerManager.cpp
+++ b/plugins/openvr/src/ViveControllerManager.cpp
@@ -1027,20 +1027,20 @@ void ViveControllerManager::InputDevice::hapticsHelper(float deltaTime, bool lef
 void ViveControllerManager::InputDevice::calibrateLeftHand(const glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration, PuckPosePair& handPair) {
     controller::Pose& handPose = handPair.second;
     glm::vec3 handPoseZAxis = handPose.getRotation() * glm::vec3(0.0f, 0.0f, 1.0f);
-    glm::vec3 defaultHandYAxis = transformVectorFast(defaultToReferenceMat * inputCalibration.defaultLeftHand, glm::vec3(0.0f, 1.0f, 0.0f));
+    glm::vec3 referenceHandYAxis = transformVectorFast(defaultToReferenceMat * inputCalibration.defaultLeftHand, glm::vec3(0.0f, 1.0f, 0.0f));
     const float EPSILON = 1.0e-4f;
-    if (fabsf(fabsf(glm::dot(glm::normalize(defaultHandYAxis), glm::normalize(handPoseZAxis))) - 1.0f) < EPSILON) {
+    if (fabsf(fabsf(glm::dot(glm::normalize(referenceHandYAxis), glm::normalize(handPoseZAxis))) - 1.0f) < EPSILON) {
         handPoseZAxis = glm::vec3(0.0f, 0.0f, 1.0f);
     }
 
+    // This allows the user to not have to match the t-pose exactly.  We assume that the y facing of the hand lies in the plane of the puck.
+    // Where the plane of the puck is defined by the the local z-axis of the puck, which is facing out of the vive logo/power button.
     glm::vec3 zPrime = handPoseZAxis;
-    glm::vec3 xPrime = glm::normalize(glm::cross(defaultHandYAxis, handPoseZAxis));
+    glm::vec3 xPrime = glm::normalize(glm::cross(referenceHandYAxis, handPoseZAxis));
     glm::vec3 yPrime = glm::normalize(glm::cross(zPrime, xPrime));
-
     glm::mat4 newHandMat = glm::mat4(glm::vec4(xPrime, 0.0f), glm::vec4(yPrime, 0.0f),
                                      glm::vec4(zPrime, 0.0f), glm::vec4(0.0f, 0.0f, 0.0f, 1.0f));
 
-
     glm::vec3 translationOffset = glm::vec3(0.0f, _handPuckYOffset, _handPuckZOffset);
     glm::quat initialRotation = handPose.getRotation();
     glm::quat finalRotation = glmExtractRotation(newHandMat);
@@ -1056,20 +1056,20 @@ void ViveControllerManager::InputDevice::calibrateLeftHand(const glm::mat4& defa
 void ViveControllerManager::InputDevice::calibrateRightHand(const glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration, PuckPosePair& handPair) {
     controller::Pose& handPose = handPair.second;
     glm::vec3 handPoseZAxis = handPose.getRotation() * glm::vec3(0.0f, 0.0f, 1.0f);
-    glm::vec3 defaultHandYAxis = transformVectorFast(defaultToReferenceMat * inputCalibration.defaultRightHand, glm::vec3(0.0f, 1.0f, 0.0f));
+    glm::vec3 referenceHandYAxis = transformVectorFast(defaultToReferenceMat * inputCalibration.defaultRightHand, glm::vec3(0.0f, 1.0f, 0.0f));
     const float EPSILON = 1.0e-4f;
-    if (fabsf(fabsf(glm::dot(glm::normalize(defaultHandYAxis), glm::normalize(handPoseZAxis))) - 1.0f) < EPSILON) {
+    if (fabsf(fabsf(glm::dot(glm::normalize(referenceHandYAxis), glm::normalize(handPoseZAxis))) - 1.0f) < EPSILON) {
         handPoseZAxis = glm::vec3(0.0f, 0.0f, 1.0f);
     }
 
+    // This allows the user to not have to match the t-pose exactly.  We assume that the y facing of the hand lies in the plane of the puck.
+    // Where the plane of the puck is defined by the the local z-axis of the puck, which is facing out of the vive logo/power button.
     glm::vec3 zPrime = handPoseZAxis;
-    glm::vec3 xPrime = glm::normalize(glm::cross(defaultHandYAxis, handPoseZAxis));
+    glm::vec3 xPrime = glm::normalize(glm::cross(referenceHandYAxis, handPoseZAxis));
     glm::vec3 yPrime = glm::normalize(glm::cross(zPrime, xPrime));
     glm::mat4 newHandMat = glm::mat4(glm::vec4(xPrime, 0.0f), glm::vec4(yPrime, 0.0f),
                                      glm::vec4(zPrime, 0.0f), glm::vec4(0.0f, 0.0f, 0.0f, 1.0f));
 
-
-
     glm::vec3 translationOffset = glm::vec3(0.0f, _handPuckYOffset, _handPuckZOffset);
     glm::quat initialRotation = handPose.getRotation();
     glm::quat finalRotation = glmExtractRotation(newHandMat);
@@ -1105,11 +1105,14 @@ void ViveControllerManager::InputDevice::calibrateFoot(const glm::mat4& defaultT
     glm::mat4 puckPoseMat = createMatFromQuatAndPos(footPose.getRotation(), footPose.getTranslation());
     glm::mat4 defaultFoot = isLeftFoot ? inputCalibration.defaultLeftFoot : inputCalibration.defaultRightFoot;
     glm::mat4 footOffset = computeOffset(defaultToReferenceMat, defaultFoot, footPose);
-
     glm::quat rotationOffset = glmExtractRotation(footOffset);
     glm::vec3 translationOffset = extractTranslation(footOffset);
+
     glm::vec3 localXAxisInPuckFrame = glm::normalize(transformVectorFast(glm::inverse(puckPoseMat) * defaultToReferenceMat, glm::vec3(-1.0f, 0.0f, 0.0f)));
     float distance = glm::dot(translationOffset, localXAxisInPuckFrame);
+
+    // We ensure the offset vector lies in the sagital plane of the avatar.
+    // This helps prevent wide or narrow stances due to the user not matching the t-pose perfectly.
     glm::vec3 finalTranslation =  translationOffset - (distance * localXAxisInPuckFrame);
     glm::mat4 finalOffset = createMatFromQuatAndPos(rotationOffset, finalTranslation);
 

From b6d7b9b544494e227ba52e8c7981b651f3d48c79 Mon Sep 17 00:00:00 2001
From: Anthony Thibault <tony@highfidelity.io>
Date: Tue, 25 Sep 2018 10:44:00 -0700
Subject: [PATCH 06/14] spelling

---
 plugins/openvr/src/ViveControllerManager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/openvr/src/ViveControllerManager.cpp b/plugins/openvr/src/ViveControllerManager.cpp
index bf2e384b62..50bae3e33c 100644
--- a/plugins/openvr/src/ViveControllerManager.cpp
+++ b/plugins/openvr/src/ViveControllerManager.cpp
@@ -1111,7 +1111,7 @@ void ViveControllerManager::InputDevice::calibrateFoot(const glm::mat4& defaultT
     glm::vec3 localXAxisInPuckFrame = glm::normalize(transformVectorFast(glm::inverse(puckPoseMat) * defaultToReferenceMat, glm::vec3(-1.0f, 0.0f, 0.0f)));
     float distance = glm::dot(translationOffset, localXAxisInPuckFrame);
 
-    // We ensure the offset vector lies in the sagital plane of the avatar.
+    // We ensure the offset vector lies in the sagittal plane of the avatar.
     // This helps prevent wide or narrow stances due to the user not matching the t-pose perfectly.
     glm::vec3 finalTranslation =  translationOffset - (distance * localXAxisInPuckFrame);
     glm::mat4 finalOffset = createMatFromQuatAndPos(rotationOffset, finalTranslation);

From 6908107979b544b254bbaed0d0e466921f69ff6a Mon Sep 17 00:00:00 2001
From: Gabriel Calero <gcalero1984@gmail.com>
Date: Wed, 26 Sep 2018 16:00:14 -0300
Subject: [PATCH 07/14] Apply UI changes in android signup

---
 android/app/src/main/cpp/native.cpp           | 17 +++++
 .../hifiinterface/MainActivity.java           | 24 ++++--
 .../hifiinterface/fragment/LoginFragment.java |  2 +-
 .../fragment/SignedInFragment.java            | 73 +++++++++++++++++++
 .../fragment/SignupFragment.java              | 41 +++++++++--
 .../res/drawable/rounded_secondary_button.xml | 24 ++++++
 .../src/main/res/layout/fragment_login.xml    | 46 ++++++------
 .../src/main/res/layout/fragment_signedin.xml | 63 ++++++++++++++++
 .../src/main/res/layout/fragment_signup.xml   | 36 +++++----
 android/app/src/main/res/values/colors.xml    |  3 +
 android/app/src/main/res/values/strings.xml   |  9 ++-
 11 files changed, 287 insertions(+), 51 deletions(-)
 create mode 100644 android/app/src/main/java/io/highfidelity/hifiinterface/fragment/SignedInFragment.java
 create mode 100644 android/app/src/main/res/drawable/rounded_secondary_button.xml
 create mode 100644 android/app/src/main/res/layout/fragment_signedin.xml

diff --git a/android/app/src/main/cpp/native.cpp b/android/app/src/main/cpp/native.cpp
index 518c958f26..12a7af622e 100644
--- a/android/app/src/main/cpp/native.cpp
+++ b/android/app/src/main/cpp/native.cpp
@@ -266,6 +266,14 @@ Java_io_highfidelity_hifiinterface_fragment_LoginFragment_nativeCancelLogin(JNIE
 
 }
 
+JNIEXPORT void JNICALL
+Java_io_highfidelity_hifiinterface_fragment_SignupFragment_nativeCancelLogin(JNIEnv *env,
+                                                                             jobject instance) {
+
+    Java_io_highfidelity_hifiinterface_fragment_LoginFragment_nativeCancelLogin(env, instance);
+}
+
+
 JNIEXPORT void JNICALL
 Java_io_highfidelity_hifiinterface_fragment_LoginFragment_nativeLogin(JNIEnv *env, jobject instance,
                                                             jstring username_, jstring password_,
@@ -307,6 +315,15 @@ Java_io_highfidelity_hifiinterface_fragment_LoginFragment_nativeLogin(JNIEnv *en
                               Q_ARG(const QString&, username), Q_ARG(const QString&, password));
 }
 
+JNIEXPORT void JNICALL
+Java_io_highfidelity_hifiinterface_fragment_SignupFragment_nativeLogin(JNIEnv *env,
+                                                                       jobject instance,
+                                                                       jstring username_,
+                                                                       jstring password_,
+                                                                       jobject usernameChangedListener) {
+    Java_io_highfidelity_hifiinterface_fragment_LoginFragment_nativeLogin(env, instance, username_, password_, usernameChangedListener);
+}
+
 JNIEXPORT void Java_io_highfidelity_hifiinterface_InterfaceActivity_nativeInitAfterAppLoaded(JNIEnv* env, jobject obj) {
     AndroidHelper::instance().moveToThread(qApp->thread());
 }
diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/MainActivity.java b/android/app/src/main/java/io/highfidelity/hifiinterface/MainActivity.java
index ab85852ed0..aecbb3fc2f 100644
--- a/android/app/src/main/java/io/highfidelity/hifiinterface/MainActivity.java
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/MainActivity.java
@@ -25,7 +25,6 @@ import android.view.Window;
 import android.view.WindowManager;
 import android.widget.ImageView;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.squareup.picasso.Callback;
 import com.squareup.picasso.Picasso;
@@ -34,6 +33,7 @@ import io.highfidelity.hifiinterface.fragment.FriendsFragment;
 import io.highfidelity.hifiinterface.fragment.HomeFragment;
 import io.highfidelity.hifiinterface.fragment.LoginFragment;
 import io.highfidelity.hifiinterface.fragment.PolicyFragment;
+import io.highfidelity.hifiinterface.fragment.SignedInFragment;
 import io.highfidelity.hifiinterface.fragment.SignupFragment;
 import io.highfidelity.hifiinterface.task.DownloadProfileImageTask;
 
@@ -41,7 +41,8 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
                                                                 LoginFragment.OnLoginInteractionListener,
                                                                 HomeFragment.OnHomeInteractionListener,
                                                                 FriendsFragment.OnHomeInteractionListener,
-                                                                SignupFragment.OnSignupInteractionListener {
+                                                                SignupFragment.OnSignupInteractionListener,
+                                                                SignedInFragment.OnSignedInInteractionListener {
 
     private static final int PROFILE_PICTURE_PLACEHOLDER = R.drawable.default_profile_avatar;
     public static final String DEFAULT_FRAGMENT = "Home";
@@ -138,10 +139,14 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
 
     private void loadLoginFragment() {
         Fragment fragment = LoginFragment.newInstance();
-
         loadFragment(fragment, getString(R.string.login), getString(R.string.tagFragmentLogin), true);
     }
 
+    private void loadSignedInFragment() {
+        Fragment fragment = SignedInFragment.newInstance();
+        loadFragment(fragment, getString(R.string.welcome), getString(R.string.tagFragmentSignedIn), true);
+    }
+
     private void loadSignupFragment() {
         Fragment fragment = SignupFragment.newInstance();
 
@@ -316,6 +321,15 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
         }
     }
 
+    @Override
+    public void onGettingStarted() {
+        loadHomeFragment(false);
+        if (backToScene) {
+            backToScene = false;
+            goToLastLocation();
+        }
+    }
+
     @Override
     public void onLoginRequested() {
         loadLoginFragment();
@@ -328,8 +342,8 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
 
     @Override
     public void onSignupCompleted() {
-        Toast.makeText(this, "Sign up succeeded", Toast.LENGTH_SHORT).show();
-        loadLoginFragment();
+        loadSignedInFragment();
+        updateLoginMenu();
     }
 
     public void handleUsernameChanged(String username) {
diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/LoginFragment.java b/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/LoginFragment.java
index 764e0c8ed5..f22e5cd6bb 100644
--- a/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/LoginFragment.java
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/LoginFragment.java
@@ -59,7 +59,7 @@ public class LoginFragment extends Fragment {
         mError = rootView.findViewById(R.id.error);
         mLoginButton = rootView.findViewById(R.id.loginButton);
         mForgotPassword = rootView.findViewById(R.id.forgotPassword);
-        mSignup = rootView.findViewById(R.id.signup);
+        mSignup = rootView.findViewById(R.id.signupButton);
 
         mLoginButton.setOnClickListener(view -> login());
 
diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/SignedInFragment.java b/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/SignedInFragment.java
new file mode 100644
index 0000000000..9ed2f1c7f5
--- /dev/null
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/SignedInFragment.java
@@ -0,0 +1,73 @@
+package io.highfidelity.hifiinterface.fragment;
+
+import android.app.Fragment;
+import android.content.Context;
+import android.os.Bundle;
+import android.text.Html;
+import android.text.Spanned;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import io.highfidelity.hifiinterface.R;
+
+public class SignedInFragment extends Fragment {
+
+    private Button mGetStartedButton;
+    private OnSignedInInteractionListener mListener;
+
+    public SignedInFragment() {
+        // Required empty public constructor
+    }
+
+    public static SignedInFragment newInstance() {
+        SignedInFragment fragment = new SignedInFragment();
+        return fragment;
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View rootView = inflater.inflate(R.layout.fragment_signedin, container, false);
+        mGetStartedButton = rootView.findViewById(R.id.getStarted);
+
+        mGetStartedButton.setOnClickListener(view -> {
+            getStarted();
+        });
+
+        return rootView;
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        if (context instanceof SignedInFragment.OnSignedInInteractionListener) {
+            mListener = (SignedInFragment.OnSignedInInteractionListener) context;
+        } else {
+            throw new RuntimeException(context.toString()
+                    + " must implement OnSignedInInteractionListener");
+        }
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        mListener = null;
+    }
+
+    public void getStarted() {
+        if (mListener != null) {
+            mListener.onGettingStarted();
+        }
+    }
+
+    public interface OnSignedInInteractionListener {
+        void onGettingStarted();
+    }
+
+}
diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/SignupFragment.java b/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/SignupFragment.java
index eb3a20b449..33644e5bda 100644
--- a/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/SignupFragment.java
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/SignupFragment.java
@@ -1,5 +1,6 @@
 package io.highfidelity.hifiinterface.fragment;
 
+import android.app.Activity;
 import android.app.Fragment;
 import android.app.ProgressDialog;
 import android.content.Context;
@@ -26,7 +27,7 @@ public class SignupFragment extends Fragment {
     private EditText mUsername;
     private EditText mPassword;
     private TextView mError;
-    private TextView mLogin;
+    private TextView mCancelButton;
 
     private Button mSignupButton;
 
@@ -34,6 +35,8 @@ public class SignupFragment extends Fragment {
 
     public native void nativeSignup(String email, String username, String password); // move to SignupFragment
     public native void nativeCancelSignup();
+    public native void nativeLogin(String username, String password, Activity usernameChangedListener);
+    public native void nativeCancelLogin();
 
     private SignupFragment.OnSignupInteractionListener mListener;
 
@@ -56,10 +59,10 @@ public class SignupFragment extends Fragment {
         mPassword = rootView.findViewById(R.id.password);
         mError = rootView.findViewById(R.id.error);
         mSignupButton = rootView.findViewById(R.id.signupButton);
-        mLogin = rootView.findViewById(R.id.login);
+        mCancelButton = rootView.findViewById(R.id.cancelButton);
 
         mSignupButton.setOnClickListener(view -> signup());
-        mLogin.setOnClickListener(view -> login());
+        mCancelButton.setOnClickListener(view -> login());
         mPassword.setOnEditorActionListener(
                 (textView, actionId, keyEvent) -> {
                     if (actionId == EditorInfo.IME_ACTION_DONE) {
@@ -168,14 +171,19 @@ public class SignupFragment extends Fragment {
     }
 
     public void handleSignupCompleted() {
-        getActivity().runOnUiThread(() -> {
-            mSignupButton.setEnabled(true);
+        String username = mUsername.getText().toString().trim();
+        String password = mPassword.getText().toString();
+        mDialog.setMessage(getString(R.string.logging_in));
+        mDialog.setCancelable(true);
+        mDialog.setOnCancelListener(dialogInterface -> {
+            nativeCancelLogin();
             cancelActivityIndicator();
             if (mListener != null) {
-                mListener.onSignupCompleted();
+                mListener.onLoginRequested();
             }
-            mError.setText("handleSignupCompleted");
         });
+        mDialog.show();
+        nativeLogin(username, password, getActivity());
     }
 
     public void handleSignupFailed(String error) {
@@ -187,4 +195,23 @@ public class SignupFragment extends Fragment {
         });
     }
 
+    public void handleLoginCompleted(boolean success) {
+        getActivity().runOnUiThread(() -> {
+            mSignupButton.setEnabled(true);
+            cancelActivityIndicator();
+
+            if (success) {
+                if (mListener != null) {
+                    mListener.onSignupCompleted();
+                }
+            } else {
+                // Registration was successful but login failed.
+                // Let the user to login manually
+                mListener.onLoginRequested();
+            }
+        });
+    }
+
+
+
 }
diff --git a/android/app/src/main/res/drawable/rounded_secondary_button.xml b/android/app/src/main/res/drawable/rounded_secondary_button.xml
new file mode 100644
index 0000000000..6230885b30
--- /dev/null
+++ b/android/app/src/main/res/drawable/rounded_secondary_button.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_pressed="true" >
+        <shape android:shape="rectangle"  >
+            <corners android:radius="4dip" />
+            <stroke android:width="1dip" android:color="@color/colorButton2" />
+            <solid android:color="@color/colorButton2"/>
+        </shape>
+    </item>
+    <item android:state_focused="true">
+        <shape android:shape="rectangle"  >
+            <corners android:radius="4dip" />
+            <stroke android:width="1dip" android:color="@color/colorButton2" />
+            <solid android:color="@color/colorButton2"/>
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle"  >
+            <corners android:radius="4dip" />
+            <stroke android:width="1dip" android:color="@color/colorButton2" />
+            <solid android:color="@color/colorButton2"/>
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/android/app/src/main/res/layout/fragment_login.xml b/android/app/src/main/res/layout/fragment_login.xml
index 6066c46a10..e5a16b453f 100644
--- a/android/app/src/main/res/layout/fragment_login.xml
+++ b/android/app/src/main/res/layout/fragment_login.xml
@@ -21,10 +21,12 @@
         android:id="@+id/error"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="16dp"
+        android:layout_marginBottom="25dp"
+        android:layout_marginLeft="9dp"
+        android:layout_marginRight="9dp"
         android:fontFamily="@font/raleway"
         android:textColor="@color/colorLoginError"
-        android:textSize="12sp"
+        android:textSize="14sp"
         app:layout_constraintBottom_toTopOf="@id/username"
         app:layout_constraintLeft_toLeftOf="@id/username"
         android:visibility="invisible"/>
@@ -95,45 +97,47 @@
         android:background="@drawable/rounded_button"
         android:fontFamily="@font/raleway_semibold"
         android:paddingBottom="0dp"
-        android:paddingLeft="55dp"
-        android:paddingRight="55dp"
+        android:paddingLeft="25dp"
+        android:paddingRight="25dp"
         android:paddingTop="0dp"
         android:text="@string/login"
         android:textColor="@color/white_opaque"
         android:textAllCaps="false"
-        android:textSize="15sp"
+        android:textSize="18sp"
         app:layout_constraintRight_toRightOf="@id/username"
-        app:layout_constraintTop_toBottomOf="@id/passwordLayout"
+        app:layout_constraintTop_toBottomOf="@id/forgotPassword"
         app:layout_goneMarginTop="4dp"/>
 
     <TextView
         android:id="@+id/forgotPassword"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="9dp"
         android:fontFamily="@font/raleway_semibold"
         android:textSize="14dp"
         android:text="@string/forgot_password"
         android:textStyle="italic"
-        android:paddingRight="10dp"
-        app:layout_constraintLeft_toLeftOf="@id/passwordLayout"
-        app:layout_constraintTop_toTopOf="@id/loginButton"
-        app:layout_constraintRight_toLeftOf="@id/loginButton"
+        app:layout_constraintRight_toRightOf="@id/passwordLayout"
+        app:layout_constraintTop_toBottomOf="@id/passwordLayout"
         android:textColor="@color/colorButton1"/>
 
-    <TextView
-        android:id="@+id/signup"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+    <Button
+        android:id="@+id/signupButton"
+        android:layout_width="154dp"
+        android:layout_height="38dp"
+        android:background="@drawable/rounded_secondary_button"
         android:fontFamily="@font/raleway_semibold"
-        android:textSize="14dp"
+        android:paddingBottom="0dp"
+        android:paddingLeft="25dp"
+        android:paddingRight="25dp"
+        android:paddingTop="0dp"
         android:text="@string/signup"
-        android:textStyle="italic"
-        android:paddingRight="10dp"
-        android:layout_marginTop="20dp"
+        android:textColor="@color/white_opaque"
+        android:textAllCaps="false"
+        android:textSize="18sp"
         app:layout_constraintLeft_toLeftOf="@id/passwordLayout"
-        app:layout_constraintTop_toBottomOf="@id/forgotPassword"
-        app:layout_constraintRight_toLeftOf="@id/loginButton"
-        android:textColor="@color/colorButton1"/>
+        app:layout_constraintTop_toTopOf="@id/loginButton"
+        app:layout_goneMarginTop="4dp"/>
 
 
 
diff --git a/android/app/src/main/res/layout/fragment_signedin.xml b/android/app/src/main/res/layout/fragment_signedin.xml
new file mode 100644
index 0000000000..1c982b0e0d
--- /dev/null
+++ b/android/app/src/main/res/layout/fragment_signedin.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/backgroundLight">
+
+    <ImageView
+        android:id="@+id/header"
+        android:layout_width="@dimen/header_hifi_width"
+        android:layout_height="@dimen/header_hifi_height"
+        android:layout_marginTop="@dimen/header_hifi_margin_top"
+        android:contentDescription="HighFidelity"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/hifi_header" />
+
+    <TextView
+        android:id="@+id/welcome"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="50dp"
+        android:paddingLeft="86dp"
+        android:paddingRight="86dp"
+        android:fontFamily="@font/raleway"
+        android:textColor="@color/clearText"
+        android:textSize="24sp"
+        android:text="@string/signedin_welcome"
+        app:layout_constraintTop_toBottomOf="@id/header"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        android:gravity="center"
+
+        />
+
+    <Button
+        android:id="@+id/getStarted"
+        android:layout_width="217dp"
+        android:layout_height="38dp"
+        android:layout_marginTop="30dp"
+        android:background="@drawable/rounded_button"
+        android:fontFamily="@font/raleway_semibold"
+        android:paddingBottom="0dp"
+        android:paddingLeft="25dp"
+        android:paddingRight="25dp"
+        android:paddingTop="0dp"
+        android:text="@string/get_started"
+        android:textColor="@color/white_opaque"
+        android:textAllCaps="false"
+        android:textSize="18sp"
+        app:layout_constraintTop_toBottomOf="@id/welcome"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+
+        app:layout_goneMarginTop="4dp"/>
+
+
+
+
+
+</android.support.constraint.ConstraintLayout>
diff --git a/android/app/src/main/res/layout/fragment_signup.xml b/android/app/src/main/res/layout/fragment_signup.xml
index 09e9ec352f..f83c8abd81 100644
--- a/android/app/src/main/res/layout/fragment_signup.xml
+++ b/android/app/src/main/res/layout/fragment_signup.xml
@@ -22,9 +22,11 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
+        android:layout_marginLeft="9dp"
+        android:layout_marginRight="9dp"
         android:fontFamily="@font/raleway"
         android:textColor="@color/colorLoginError"
-        android:textSize="12sp"
+        android:textSize="14sp"
         app:layout_constraintBottom_toTopOf="@id/email"
         app:layout_constraintLeft_toLeftOf="@id/email"
         app:layout_constraintRight_toRightOf="@id/email"
@@ -71,7 +73,7 @@
         android:textColorHint="@color/editTextColor"
         android:gravity="left|center_vertical"
         app:layout_constraintTop_toBottomOf="@id/email"
-        android:layout_marginTop="13dp"
+        android:layout_marginTop="7dp"
         android:hint="@string/username" />
 
 
@@ -87,7 +89,7 @@
         app:passwordToggleDrawable="@drawable/selector_show_password"
         app:hintEnabled="false"
         app:layout_constraintTop_toBottomOf="@id/username"
-        android:layout_marginTop="13dp"
+        android:layout_marginTop="7dp"
         >
     <android.support.design.widget.TextInputEditText
         android:id="@+id/password"
@@ -114,7 +116,7 @@
         android:id="@+id/signupButton"
         android:layout_width="154dp"
         android:layout_height="38dp"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="44dp"
         android:background="@drawable/rounded_button"
         android:fontFamily="@font/raleway_semibold"
         android:paddingBottom="0dp"
@@ -124,23 +126,27 @@
         android:text="@string/signup"
         android:textColor="@color/white_opaque"
         android:textAllCaps="false"
-        android:textSize="15sp"
+        android:textSize="18sp"
         app:layout_constraintRight_toRightOf="@id/username"
         app:layout_constraintTop_toBottomOf="@id/passwordLayout"
         app:layout_goneMarginTop="4dp"/>
 
-    <TextView
-        android:id="@+id/login"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+    <Button
+        android:id="@+id/cancelButton"
+        android:layout_width="154dp"
+        android:layout_height="38dp"
+        android:background="@drawable/rounded_secondary_button"
         android:fontFamily="@font/raleway_semibold"
-        android:textSize="14dp"
-        android:text="@string/login"
-        android:textStyle="italic"
-        android:paddingRight="10dp"
+        android:paddingBottom="0dp"
+        android:paddingLeft="20dp"
+        android:paddingRight="20dp"
+        android:paddingTop="0dp"
+        android:text="@string/cancel"
+        android:textColor="@color/white_opaque"
+        android:textAllCaps="false"
+        android:textSize="18sp"
         app:layout_constraintLeft_toLeftOf="@id/passwordLayout"
         app:layout_constraintTop_toTopOf="@id/signupButton"
-        app:layout_constraintRight_toLeftOf="@id/loginButton"
-        android:textColor="@color/colorButton1"/>
+        app:layout_goneMarginTop="4dp"/>
 
 </android.support.constraint.ConstraintLayout>
diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
index 216b3491d8..fad2c98fb8 100644
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -9,6 +9,7 @@
     <color name="showPasswordColor">#3D3D3D</color>
     <color name="tabs">#1EB5EC</color>
     <color name="colorButton1">#00B4EF</color>
+    <color name="colorButton2">#828282</color>
     <color name="backgroundDark">#333333</color>
     <color name="backgroundLight">#4F4F4F</color>
     <color name="backgroundSearch">#33999999</color>
@@ -23,4 +24,6 @@
     <color name="starSelectedTint">#FBD92A</color>
     <color name="starUnselectedTint">#8A8A8A</color>
     <color name="slidingUpPanelFadeColor">#40000000</color>
+    <color name="clearText">#F2F2F2</color>
+
 </resources>
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 09057d40fd..1d9be76774 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -16,7 +16,7 @@
     <string name="password">Password</string>
     <string name="login">Login</string>
     <string name="logout">Logout</string>
-    <string name="forgot_password">Forgot password?\u00A0</string>
+    <string name="forgot_password"><u>Forgot password?</u>\u00A0</string>
     <string name="login_username_or_password_incorrect">Username or password incorrect.</string>
     <string name="logging_in">Logging into High Fidelity</string>
     <string name="search_hint"><i>Search for a place by name</i>\u00A0</string>
@@ -25,9 +25,13 @@
     <string name="privacyPolicy">Privacy Policy</string>
     <string name="your_last_location">Your Last Location</string>
     <string name="online">Online</string>
-    <string name="signup">Sign up</string>
+    <string name="signup">Sign Up</string>
     <string name="creating_account">Creating your High Fidelity account</string>
     <string name="signup_email_username_or_password_incorrect">Email, username or password incorrect.</string>
+    <string name="signedin_welcome">You are now signed into High Fidelity</string>
+    <string name="welcome">Welcome</string>
+    <string name="cancel">Cancel</string>
+    <string name="get_started">Get Started</string>
 
     <!-- tags -->
     <string name="tagFragmentHome">tagFragmentHome</string>
@@ -35,4 +39,5 @@
     <string name="tagFragmentSignup">tagFragmentSignup</string>
     <string name="tagFragmentPolicy">tagFragmentPolicy</string>
     <string name="tagFragmentPeople">tagFragmentPeople</string>
+    <string name="tagFragmentSignedIn">tagFragmentSignedIn</string>
 </resources>

From 5fc24b258765dc83ae4fe73916c333cfa8c7c70c Mon Sep 17 00:00:00 2001
From: Gabriel Calero <gcalero1984@gmail.com>
Date: Thu, 27 Sep 2018 19:20:38 -0300
Subject: [PATCH 08/14] UI fixes in login and signup for S8 and S9 aspect ratio

---
 android/app/src/main/res/layout/fragment_login.xml  | 9 ++++-----
 android/app/src/main/res/layout/fragment_signup.xml | 9 ++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/android/app/src/main/res/layout/fragment_login.xml b/android/app/src/main/res/layout/fragment_login.xml
index e5a16b453f..e9b2577ee7 100644
--- a/android/app/src/main/res/layout/fragment_login.xml
+++ b/android/app/src/main/res/layout/fragment_login.xml
@@ -97,8 +97,6 @@
         android:background="@drawable/rounded_button"
         android:fontFamily="@font/raleway_semibold"
         android:paddingBottom="0dp"
-        android:paddingLeft="25dp"
-        android:paddingRight="25dp"
         android:paddingTop="0dp"
         android:text="@string/login"
         android:textColor="@color/white_opaque"
@@ -123,20 +121,21 @@
 
     <Button
         android:id="@+id/signupButton"
-        android:layout_width="154dp"
+        android:layout_width="0dp"
+        app:layout_constraintWidth_default="spread"
         android:layout_height="38dp"
         android:background="@drawable/rounded_secondary_button"
         android:fontFamily="@font/raleway_semibold"
         android:paddingBottom="0dp"
-        android:paddingLeft="25dp"
-        android:paddingRight="25dp"
         android:paddingTop="0dp"
+        android:layout_marginRight="15dp"
         android:text="@string/signup"
         android:textColor="@color/white_opaque"
         android:textAllCaps="false"
         android:textSize="18sp"
         app:layout_constraintLeft_toLeftOf="@id/passwordLayout"
         app:layout_constraintTop_toTopOf="@id/loginButton"
+        app:layout_constraintRight_toLeftOf="@id/loginButton"
         app:layout_goneMarginTop="4dp"/>
 
 
diff --git a/android/app/src/main/res/layout/fragment_signup.xml b/android/app/src/main/res/layout/fragment_signup.xml
index f83c8abd81..41c4a8cbbe 100644
--- a/android/app/src/main/res/layout/fragment_signup.xml
+++ b/android/app/src/main/res/layout/fragment_signup.xml
@@ -120,8 +120,6 @@
         android:background="@drawable/rounded_button"
         android:fontFamily="@font/raleway_semibold"
         android:paddingBottom="0dp"
-        android:paddingLeft="20dp"
-        android:paddingRight="20dp"
         android:paddingTop="0dp"
         android:text="@string/signup"
         android:textColor="@color/white_opaque"
@@ -133,20 +131,21 @@
 
     <Button
         android:id="@+id/cancelButton"
-        android:layout_width="154dp"
+        android:layout_width="0dp"
+        app:layout_constraintWidth_default="spread"
         android:layout_height="38dp"
         android:background="@drawable/rounded_secondary_button"
         android:fontFamily="@font/raleway_semibold"
         android:paddingBottom="0dp"
-        android:paddingLeft="20dp"
-        android:paddingRight="20dp"
         android:paddingTop="0dp"
+        android:layout_marginRight="15dp"
         android:text="@string/cancel"
         android:textColor="@color/white_opaque"
         android:textAllCaps="false"
         android:textSize="18sp"
         app:layout_constraintLeft_toLeftOf="@id/passwordLayout"
         app:layout_constraintTop_toTopOf="@id/signupButton"
+        app:layout_constraintRight_toLeftOf="@id/signupButton"
         app:layout_goneMarginTop="4dp"/>
 
 </android.support.constraint.ConstraintLayout>

From f5d9dd82d91cb46eb9f278fcb36583111f9b0e67 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Thu, 27 Sep 2018 16:01:20 -0700
Subject: [PATCH 09/14] better pick plane for stretch, camera-facing pick plane
 for scale, debug pick plane, overall cleanup

---
 .../system/libraries/entitySelectionTool.js   | 1354 ++++++++---------
 1 file changed, 671 insertions(+), 683 deletions(-)

diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index 1fc0f0611c..eaba6db34a 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -16,9 +16,9 @@
 /* global SelectionManager, SelectionDisplay, grid, rayPlaneIntersection, rayPlaneIntersection2, pushCommandForSelections,
    getMainTabletIDs, getControllerWorldLocation, TRIGGER_ON_VALUE */
 
-var SPACE_LOCAL = "local";
-var SPACE_WORLD = "world";
-var HIGHLIGHT_LIST_NAME = "editHandleHighlightList";
+const SPACE_LOCAL = "local";
+const SPACE_WORLD = "world";
+const HIGHLIGHT_LIST_NAME = "editHandleHighlightList";
 
 Script.include([
     "./controllers.js",
@@ -393,68 +393,73 @@ function normalizeDegrees(degrees) {
 SelectionDisplay = (function() {
     var that = {};
 
-    var NEGATE_VECTOR = -1;
+    const COLOR_GREEN = { red: 31, green: 198, blue: 166 };
+    const COLOR_BLUE = { red: 0, green: 147, blue: 197 };
+    const COLOR_RED = { red: 226, green: 51, blue: 77 };
+    const COLOR_HOVER = { red: 227, green: 227, blue: 227 };
+    const COLOR_ROTATE_CURRENT_RING = { red: 255, green: 99, blue: 9 };
+    const COLOR_BOUNDING_EDGE = { red: 87, green: 87, blue: 87 };
+    const COLOR_SCALE_CUBE = { red: 106, green: 106, blue: 106 };
+    const COLOR_SCALE_CUBE_SELECTED = { red: 18, green: 18, blue: 18 };
+    const COLOR_DEBUG_PICK_PLANE = { red: 255, green: 255, blue: 255 };
+    const COLOR_DEBUG_PICK_PLANE_HIT = { red: 255, green: 165, blue: 0 };
 
-    var COLOR_GREEN = { red: 31, green: 198, blue: 166 };
-    var COLOR_BLUE = { red: 0, green: 147, blue: 197 };
-    var COLOR_RED = { red: 226, green: 51, blue: 77 };
-    var COLOR_HOVER = { red: 227, green: 227, blue: 227 };
-    var COLOR_ROTATE_CURRENT_RING = { red: 255, green: 99, blue: 9 };
-    var COLOR_BOUNDING_EDGE = { red: 87, green: 87, blue: 87 };
-    var COLOR_SCALE_CUBE = { red: 106, green: 106, blue: 106 };
-    var COLOR_SCALE_CUBE_SELECTED = { red: 18, green: 18, blue: 18 };
+    const TRANSLATE_ARROW_CYLINDER_OFFSET = 0.1;
+    const TRANSLATE_ARROW_CYLINDER_CAMERA_DISTANCE_MULTIPLE = 0.005;
+    const TRANSLATE_ARROW_CYLINDER_Y_MULTIPLE = 7.5;
+    const TRANSLATE_ARROW_CONE_CAMERA_DISTANCE_MULTIPLE = 0.025;
+    const TRANSLATE_ARROW_CONE_OFFSET_CYLINDER_DIMENSION_MULTIPLE = 0.83;
 
-    var TRANSLATE_ARROW_CYLINDER_OFFSET = 0.1;
-    var TRANSLATE_ARROW_CYLINDER_CAMERA_DISTANCE_MULTIPLE = 0.005;
-    var TRANSLATE_ARROW_CYLINDER_Y_MULTIPLE = 7.5;
-    var TRANSLATE_ARROW_CONE_CAMERA_DISTANCE_MULTIPLE = 0.025;
-    var TRANSLATE_ARROW_CONE_OFFSET_CYLINDER_DIMENSION_MULTIPLE = 0.83;
-
-    var ROTATE_RING_CAMERA_DISTANCE_MULTIPLE = 0.15;
-    var ROTATE_CTRL_SNAP_ANGLE = 22.5;
-    var ROTATE_DEFAULT_SNAP_ANGLE = 1;
-    var ROTATE_DEFAULT_TICK_MARKS_ANGLE = 5;
-    var ROTATE_RING_IDLE_INNER_RADIUS = 0.92;
-    var ROTATE_RING_SELECTED_INNER_RADIUS = 0.9;
+    const ROTATE_RING_CAMERA_DISTANCE_MULTIPLE = 0.15;
+    const ROTATE_CTRL_SNAP_ANGLE = 22.5;
+    const ROTATE_DEFAULT_SNAP_ANGLE = 1;
+    const ROTATE_DEFAULT_TICK_MARKS_ANGLE = 5;
+    const ROTATE_RING_IDLE_INNER_RADIUS = 0.92;
+    const ROTATE_RING_SELECTED_INNER_RADIUS = 0.9;
 
     // These are multipliers for sizing the rotation degrees display while rotating an entity
-    var ROTATE_DISPLAY_DISTANCE_MULTIPLIER = 2;
-    var ROTATE_DISPLAY_SIZE_X_MULTIPLIER = 0.2;
-    var ROTATE_DISPLAY_SIZE_Y_MULTIPLIER = 0.09;
-    var ROTATE_DISPLAY_LINE_HEIGHT_MULTIPLIER = 0.07;
+    const ROTATE_DISPLAY_DISTANCE_MULTIPLIER = 2;
+    const ROTATE_DISPLAY_SIZE_X_MULTIPLIER = 0.2;
+    const ROTATE_DISPLAY_SIZE_Y_MULTIPLIER = 0.09;
+    const ROTATE_DISPLAY_LINE_HEIGHT_MULTIPLIER = 0.07;
 
-    var STRETCH_CUBE_OFFSET = 0.06;
-    var STRETCH_CUBE_CAMERA_DISTANCE_MULTIPLE = 0.02;
-    var STRETCH_MINIMUM_DIMENSION = 0.001;
-    var STRETCH_ALL_MINIMUM_DIMENSION = 0.01;
-    var STRETCH_DIRECTION_ALL_CAMERA_DISTANCE_MULTIPLE = 2;
-    var STRETCH_PANEL_WIDTH = 0.01;
+    const STRETCH_CUBE_OFFSET = 0.06;
+    const STRETCH_CUBE_CAMERA_DISTANCE_MULTIPLE = 0.02;
+    const STRETCH_MINIMUM_DIMENSION = 0.001;
+    const STRETCH_PANEL_WIDTH = 0.01;
 
-    var BOUNDING_EDGE_OFFSET = 0.5;
-    var SCALE_CUBE_CAMERA_DISTANCE_MULTIPLE = 0.02;
-
-    var CLONER_OFFSET = { x: 0.9, y: -0.9, z: 0.9 };    
+    const SCALE_OVERLAY_CAMERA_DISTANCE_MULTIPLE = 0.02;
+    const SCALE_DIMENSIONS_CAMERA_DISTANCE_MULTIPLE = 0.5;
+    const SCALE_MINIMUM_DIMENSION = 0.01;
     
-    var CTRL_KEY_CODE = 16777249;
+    const BOUNDING_EDGE_OFFSET = 0.5;
 
-    var RAIL_AXIS_LENGTH = 10000;
-        
-    var NO_HAND = -1;
+    const DUPLICATOR_OFFSET = { x: 0.9, y: -0.9, z: 0.9 };    
+    
+    const CTRL_KEY_CODE = 16777249;
 
-    var TRANSLATE_DIRECTION = {
+    const RAIL_AXIS_LENGTH = 10000;
+    
+    const NEGATE_VECTOR = -1;
+    const NO_HAND = -1;
+    
+    const DEBUG_PICK_PLANE_HIT_LIMIT = 200;
+    const DEBUG_PICK_PLANE_HIT_CAMERA_DISTANCE_MULTIPLE = 0.01;
+
+    const TRANSLATE_DIRECTION = {
         X: 0,
         Y: 1,
         Z: 2
     };
 
-    var STRETCH_DIRECTION = {
+    const STRETCH_DIRECTION = {
         X: 0,
         Y: 1,
         Z: 2,
         ALL: 3
     };
 
-    var SCALE_DIRECTION = {
+    const SCALE_DIRECTION = {
         LBN: 0,
         RBN: 1,
         LBF: 2,
@@ -465,7 +470,7 @@ SelectionDisplay = (function() {
         RTF: 7
     };
 
-    var ROTATE_DIRECTION = {
+    const ROTATE_DIRECTION = {
         PITCH: 0,
         YAW: 1,
         ROLL: 2
@@ -478,10 +483,6 @@ SelectionDisplay = (function() {
         getControllerWorldLocation(Controller.Standard.RightHand, true)
     ];
 
-    var rotationZero;
-    var rotationNormal;
-    var rotationDegreesPosition;
-
     var worldRotationX;
     var worldRotationY;
     var worldRotationZ;
@@ -640,7 +641,7 @@ SelectionDisplay = (function() {
     var handleBoundingFREdge = Overlays.addOverlay("line3d", handlePropertiesBoundingEdge);
     var handleBoundingFLEdge = Overlays.addOverlay("line3d", handlePropertiesBoundingEdge);
 
-    var handleCloner = Overlays.addOverlay("cube", {
+    var handleDuplicator = Overlays.addOverlay("cube", {
         alpha: 1,
         size: 0.05,
         color: COLOR_GREEN,
@@ -705,7 +706,7 @@ SelectionDisplay = (function() {
             blue: 255
         },
         ignoreRayIntersection: true // always ignore this
-});
+    });
 
     var allOverlays = [
         handleTranslateXCone,
@@ -738,7 +739,7 @@ SelectionDisplay = (function() {
         handleBoundingNLEdge,
         handleBoundingFREdge,
         handleBoundingFLEdge,
-        handleCloner,
+        handleDuplicator,
         selectionBox,
         iconSelectionBox,
         xRailOverlay,
@@ -746,7 +747,7 @@ SelectionDisplay = (function() {
         zRailOverlay
 
     ];
-    var maximumHandleInAllOverlays = handleCloner;
+    var maximumHandleInAllOverlays = handleDuplicator;
 
     overlayNames[handleTranslateXCone] = "handleTranslateXCone";
     overlayNames[handleTranslateXCylinder] = "handleTranslateXCylinder";
@@ -783,12 +784,24 @@ SelectionDisplay = (function() {
     overlayNames[handleBoundingFREdge] = "handleBoundingFREdge";
     overlayNames[handleBoundingFLEdge] = "handleBoundingFLEdge";
 
-    overlayNames[handleCloner] = "handleCloner";
+    overlayNames[handleDuplicator] = "handleDuplicator";
     overlayNames[selectionBox] = "selectionBox";
     overlayNames[iconSelectionBox] = "iconSelectionBox";
 
     var activeTool = null;
     var handleTools = {};
+    
+    var debugPickPlaneEnabled = true;
+    var debugPickPlane = Overlays.addOverlay("shape", {
+        shape: "Quad",
+        alpha: 0.25,
+        color: COLOR_DEBUG_PICK_PLANE,
+        solid: true,
+        visible: false,
+        ignoreRayIntersection: true,
+        drawInFront: false
+    });
+    var debugPickPlaneHits = [];
 
     // We get mouseMoveEvents from the handControllers, via handControllerPointer.
     // But we dont' get mousePressEvents.
@@ -926,6 +939,7 @@ SelectionDisplay = (function() {
             var hitTool = handleTools[ hitOverlayID ];
             if (hitTool) {
                 activeTool = hitTool;
+                that.clearDebugPickPlane();
                 if (activeTool.onBegin) {
                     activeTool.onBegin(event, pickRay, results);
                 } else {
@@ -1194,6 +1208,7 @@ SelectionDisplay = (function() {
         for (var i = 0; i < allOverlays.length; i++) {
             Overlays.deleteOverlay(allOverlays[i]);
         }
+        that.clearDebugPickPlane();
     };
 
     that.select = function(entityID, event) {
@@ -1297,6 +1312,7 @@ SelectionDisplay = (function() {
 
         if (SelectionManager.selections.length === 0) {
             that.setOverlaysVisible(false);
+            that.clearDebugPickPlane();
             return;
         }
 
@@ -1420,8 +1436,8 @@ SelectionDisplay = (function() {
 
             // UPDATE SCALE CUBE
             var scaleCubeRotation = spaceMode === SPACE_LOCAL ? rotation : Quat.IDENTITY;            
-            var scaleCubeDimension = rotateDimension * SCALE_CUBE_CAMERA_DISTANCE_MULTIPLE / 
-                                                           ROTATE_RING_CAMERA_DISTANCE_MULTIPLE;
+            var scaleCubeDimension = rotateDimension * SCALE_OVERLAY_CAMERA_DISTANCE_MULTIPLE / 
+                                                       ROTATE_RING_CAMERA_DISTANCE_MULTIPLE;
             var scaleCubeDimensions = { x: scaleCubeDimension, y: scaleCubeDimension, z: scaleCubeDimension };
             Overlays.editOverlay(handleScaleCube, { 
                 position: position, 
@@ -1560,15 +1576,15 @@ SelectionDisplay = (function() {
                 Overlays.editOverlay(iconSelectionBox, { visible: false });
             }
 
-            // UPDATE CLONER (CURRENTLY HIDDEN FOR NOW)
-            var handleClonerOffset = { 
-                x: CLONER_OFFSET.x * dimensions.x, 
-                y: CLONER_OFFSET.y * dimensions.y, 
-                z: CLONER_OFFSET.z * dimensions.z 
+            // UPDATE DUPLICATOR (CURRENTLY HIDDEN FOR NOW)
+            var handleDuplicatorOffset = { 
+                x: DUPLICATOR_OFFSET.x * dimensions.x, 
+                y: DUPLICATOR_OFFSET.y * dimensions.y, 
+                z: DUPLICATOR_OFFSET.z * dimensions.z 
             };
-            var handleClonerPos = Vec3.sum(position, Vec3.multiplyQbyV(rotation, handleClonerOffset));
-            Overlays.editOverlay(handleCloner, {
-                position: handleClonerPos,
+            var handleDuplicatorPos = Vec3.sum(position, Vec3.multiplyQbyV(rotation, handleDuplicatorOffset));
+            Overlays.editOverlay(handleDuplicator, {
+                position: handleDuplicatorPos,
                 rotation: rotation,
                 dimensions: scaleCubeDimensions
             });
@@ -1588,7 +1604,7 @@ SelectionDisplay = (function() {
         that.setHandleStretchXVisible(showScaleStretch || isActiveTool(handleStretchXCube));
         that.setHandleStretchYVisible(showScaleStretch || isActiveTool(handleStretchYCube));
         that.setHandleStretchZVisible(showScaleStretch || isActiveTool(handleStretchZCube));
-        that.setHandleScaleCubeVisible(showScaleStretch || isActiveTool(handleScaleCube));
+        that.setHandleScaleVisible(showScaleStretch || isActiveTool(handleScaleCube));
 
         var showOutlineForZone = (SelectionManager.selections.length === 1 && 
                                     typeof SelectionManager.savedProperties[SelectionManager.selections[0]] !== "undefined" &&
@@ -1597,9 +1613,9 @@ SelectionDisplay = (function() {
                                                               !isActiveTool(handleRotateYawRing) &&
                                                               !isActiveTool(handleRotateRollRing)));
 
-        // keep cloner always hidden for now since you can hold Alt to clone while  
-        // translating an entity - we may bring cloner back for HMD only later
-        // that.setHandleClonerVisible(!activeTool || isActiveTool(handleCloner));
+        // keep duplicator always hidden for now since you can hold Alt to duplciate while  
+        // translating an entity - we may bring duplicator back for HMD only later
+        // that.setHandleDuplicatorVisible(!activeTool || isActiveTool(handleDuplicator));
 
         if (wantDebug) {
             print("====== Update Handles <=======");
@@ -1692,11 +1708,11 @@ SelectionDisplay = (function() {
     
     // FUNCTION: SET HANDLE SCALE VISIBLE
     that.setHandleScaleVisible = function(isVisible) {
-        that.setHandleScaleCubeVisible(isVisible);
+        that.setHandleScaleVisible(isVisible);
         that.setHandleBoundingEdgeVisible(isVisible);
     };
 
-    that.setHandleScaleCubeVisible = function(isVisible) {
+    that.setHandleScaleVisible = function(isVisible) {
         Overlays.editOverlay(handleScaleCube, { visible: isVisible });
     };
 
@@ -1715,186 +1731,126 @@ SelectionDisplay = (function() {
         Overlays.editOverlay(handleBoundingFLEdge, { visible: isVisible });
     };
 
-    // FUNCTION: SET HANDLE CLONER VISIBLE
-    that.setHandleClonerVisible = function(isVisible) {
-        Overlays.editOverlay(handleCloner, { visible: isVisible });
+    // FUNCTION: SET HANDLE DUPLICATOR VISIBLE
+    that.setHandleDuplicatorVisible = function(isVisible) {
+        Overlays.editOverlay(handleDuplicator, { visible: isVisible });
     };
 
-    // TOOL DEFINITION: TRANSLATE XZ TOOL
-    var initialXZPick = null;
-    var isConstrained = false;
-    var constrainMajorOnly = false;
-    var startPosition = null;
-    var duplicatedEntityIDs = null;
-    var translateXZTool = addHandleTool(selectionBox, {
-        mode: 'TRANSLATE_XZ',
-        pickPlanePosition: { x: 0, y: 0, z: 0 },
-        greatestDimension: 0.0,
-        startingDistance: 0.0,
-        startingElevation: 0.0,
-        onBegin: function(event, pickRay, pickResult, doClone) {
-            var wantDebug = false;
-            if (wantDebug) {
-                print("================== TRANSLATE_XZ(Beg) -> =======================");
-                Vec3.print("    pickRay", pickRay);
-                Vec3.print("    pickRay.origin", pickRay.origin);
-                Vec3.print("    pickResult.intersection", pickResult.intersection);
-            }
-
-            // Duplicate entities if alt is pressed.  This will make a
-            // copy of the selected entities and move the _original_ entities, not
-            // the new ones.
-            if (event.isAlt || doClone) {
-                duplicatedEntityIDs = SelectionManager.duplicateSelection();
-                var ids = [];
-                for (var i = 0; i < duplicatedEntityIDs.length; ++i) {
-                    ids.push(duplicatedEntityIDs[i].entityID);
-                }
-                SelectionManager.setSelections(ids);
-            } else {
-                duplicatedEntityIDs = null;
-            }
-
-            SelectionManager.saveProperties();
-            that.resetPreviousHandleColor();
-
-            that.setHandleTranslateVisible(false);
-            that.setHandleRotateVisible(false);
-            that.setHandleScaleCubeVisible(false);
-            that.setHandleStretchVisible(false);
-            that.setHandleClonerVisible(false);
-
-            startPosition = SelectionManager.worldPosition;
-
-            translateXZTool.pickPlanePosition = pickResult.intersection;
-            translateXZTool.greatestDimension = Math.max(Math.max(SelectionManager.worldDimensions.x, 
-                                                                  SelectionManager.worldDimensions.y),
-                                                                  SelectionManager.worldDimensions.z);
-            translateXZTool.startingDistance = Vec3.distance(pickRay.origin, SelectionManager.position);
-            translateXZTool.startingElevation = translateXZTool.elevation(pickRay.origin, translateXZTool.pickPlanePosition);
-            if (wantDebug) {
-                print("    longest dimension: " + translateXZTool.greatestDimension);
-                print("    starting distance: " + translateXZTool.startingDistance);
-                print("    starting elevation: " + translateXZTool.startingElevation);
-            }
-
-            initialXZPick = rayPlaneIntersection(pickRay, translateXZTool.pickPlanePosition, {
-                x: 0,
-                y: 1,
-                z: 0
-            });
-
-            isConstrained = false;
-            if (wantDebug) {
-                print("================== TRANSLATE_XZ(End) <- =======================");
-            }
-        },
-        onEnd: function(event, reason) {
-            pushCommandForSelections(duplicatedEntityIDs);
-            if (isConstrained) {
-                Overlays.editOverlay(xRailOverlay, {
-                    visible: false
-                });
-                Overlays.editOverlay(zRailOverlay, {
-                    visible: false
-                });
-            }
-        },
-        elevation: function(origin, intersection) {
-            return (origin.y - intersection.y) / Vec3.distance(origin, intersection);
-        },
-        onMove: function(event) {
-            var wantDebug = false;
-            var pickRay = generalComputePickRay(event.x, event.y);
-
-            var pick = rayPlaneIntersection2(pickRay, translateXZTool.pickPlanePosition, {
-                x: 0,
-                y: 1,
-                z: 0
-            });
-
-            // If the pick ray doesn't hit the pick plane in this direction, do nothing.
-            // this will happen when someone drags across the horizon from the side they started on.
-            if (!pick) {
+    // FUNCTION: DEBUG PICK PLANE
+    that.showDebugPickPlane = function(pickPlanePosition, pickPlaneNormal) {
+        var planePlusNormal = Vec3.sum(pickPlanePosition, pickPlaneNormal);
+        var rotation = Quat.lookAtSimple(planePlusNormal, pickPlanePosition);
+        var dimensionXZ = getDistanceToCamera(pickPlanePosition) * 1.25;   
+        var dimensions = { x:dimensionXZ, y:dimensionXZ, z:STRETCH_PANEL_WIDTH };
+        Overlays.editOverlay(debugPickPlane, {
+            position: pickPlanePosition,
+            rotation: rotation,
+            dimensions: dimensions,
+            visible: true 
+        });
+    };
+    
+    that.showDebugPickPlaneHit = function(pickHitPosition) {
+        var dimension = getDistanceToCamera(pickHitPosition) * DEBUG_PICK_PLANE_HIT_CAMERA_DISTANCE_MULTIPLE;
+        var pickPlaneHit = Overlays.addOverlay("shape", {
+            alpha: 0.5,
+            shape: "Sphere",
+            solid: true,
+            visible: true,
+            ignoreRayIntersection: true,
+            drawInFront: false,
+            color: COLOR_DEBUG_PICK_PLANE_HIT,
+            position: pickHitPosition,
+            dimensions: { x: dimension, y: dimension, z: dimension }
+        });
+        debugPickPlaneHits.push(pickPlaneHit);
+        if (debugPickPlaneHits.length > DEBUG_PICK_PLANE_HIT_LIMIT) {
+            var removedPickPlaneHit = debugPickPlaneHits.shift();
+            Overlays.deleteOverlay(removedPickPlaneHit);
+        }
+    };
+    
+    that.clearDebugPickPlane = function() {
+        Overlays.editOverlay(debugPickPlane, { visible: false });
+        for (var i = 0; i < debugPickPlaneHits.length; i++) {
+            Overlays.deleteOverlay(debugPickPlaneHits[i]);
+        }
+        debugPickPlaneHits = [];
+    };
+    
+    // TOOL DEFINITION: HANDLE TRANSLATE XZ TOOL
+    function addHandleTranslateXZTool(overlay, mode, doDuplicate) {
+        var initialPick = null;
+        var isConstrained = false;
+        var constrainMajorOnly = false;
+        var startPosition = null;
+        var duplicatedEntityIDs = null;
+        var pickPlanePosition = null;
+        var pickPlaneNormal = { x: 0, y: 1, z: 0 };
+        var greatestDimension = 0.0;
+        var startingDistance = 0.0;
+        var startingElevation = 0.0;
+        addHandleTool(overlay, {
+            mode: mode,
+            onBegin: function(event, pickRay, pickResult) {
+                var wantDebug = false;
                 if (wantDebug) {
-                    print("    "+ translateXZTool.mode + "Pick ray does not intersect XZ plane.");
-                }
-                
-                // EARLY EXIT--(Invalid ray detected.)
-                return;
-            }
-
-            var vector = Vec3.subtract(pick, initialXZPick);
-
-            // If the mouse is too close to the horizon of the pick plane, stop moving
-            var MIN_ELEVATION = 0.02; //  largest dimension of object divided by distance to it
-            var elevation = translateXZTool.elevation(pickRay.origin, pick);
-            if (wantDebug) {
-                print("Start Elevation: " + translateXZTool.startingElevation + ", elevation: " + elevation);
-            }
-            if ((translateXZTool.startingElevation > 0.0 && elevation < MIN_ELEVATION) ||
-                (translateXZTool.startingElevation < 0.0 && elevation > -MIN_ELEVATION)) {
-                if (wantDebug) {
-                    print("    "+ translateXZTool.mode + " - too close to horizon!");
+                    print("================== TRANSLATE_XZ(Beg) -> =======================");
+                    Vec3.print("    pickRay", pickRay);
+                    Vec3.print("    pickRay.origin", pickRay.origin);
+                    Vec3.print("    pickResult.intersection", pickResult.intersection);
                 }
 
-                // EARLY EXIT--(Don't proceed past the reached limit.)
-                return;
-            }
-
-            //  If the angular size of the object is too small, stop moving
-            var MIN_ANGULAR_SIZE = 0.01; //  Radians
-            if (translateXZTool.greatestDimension > 0) {
-                var angularSize = Math.atan(translateXZTool.greatestDimension / Vec3.distance(pickRay.origin, pick));
-                if (wantDebug) {
-                    print("Angular size = " + angularSize);
-                }
-                if (angularSize < MIN_ANGULAR_SIZE) {
-                    return;
-                }
-            }
-
-            // If shifted, constrain to one axis
-            if (event.isShifted) {
-                if (Math.abs(vector.x) > Math.abs(vector.z)) {
-                    vector.z = 0;
+                // Duplicate entities if alt is pressed.  This will make a
+                // copy of the selected entities and move the _original_ entities, not
+                // the new ones.
+                if (event.isAlt || doDuplicate) {
+                    duplicatedEntityIDs = SelectionManager.duplicateSelection();
+                    var ids = [];
+                    for (var i = 0; i < duplicatedEntityIDs.length; ++i) {
+                        ids.push(duplicatedEntityIDs[i].entityID);
+                    }
+                    SelectionManager.setSelections(ids);
                 } else {
-                    vector.x = 0;
+                    duplicatedEntityIDs = null;
                 }
-                if (!isConstrained) {
-                    var xStart = Vec3.sum(startPosition, {
-                        x: -RAIL_AXIS_LENGTH,
-                        y: 0,
-                        z: 0
-                    });
-                    var xEnd = Vec3.sum(startPosition, {
-                        x: RAIL_AXIS_LENGTH,
-                        y: 0,
-                        z: 0
-                    });
-                    var zStart = Vec3.sum(startPosition, {
-                        x: 0,
-                        y: 0,
-                        z: -RAIL_AXIS_LENGTH
-                    });
-                    var zEnd = Vec3.sum(startPosition, {
-                        x: 0,
-                        y: 0,
-                        z: RAIL_AXIS_LENGTH
-                    });
-                    Overlays.editOverlay(xRailOverlay, {
-                        start: xStart,
-                        end: xEnd,
-                        visible: true
-                    });
-                    Overlays.editOverlay(zRailOverlay, {
-                        start: zStart,
-                        end: zEnd,
-                        visible: true
-                    });
-                    isConstrained = true;
+
+                SelectionManager.saveProperties();
+                that.resetPreviousHandleColor();
+
+                that.setHandleTranslateVisible(false);
+                that.setHandleRotateVisible(false);
+                that.setHandleScaleVisible(false);
+                that.setHandleStretchVisible(false);
+                that.setHandleDuplicatorVisible(false);
+
+                startPosition = SelectionManager.worldPosition;
+                pickPlanePosition = pickResult.intersection;
+                greatestDimension = Math.max(Math.max(SelectionManager.worldDimensions.x, 
+                                                      SelectionManager.worldDimensions.y),
+                                                      SelectionManager.worldDimensions.z);
+                startingDistance = Vec3.distance(pickRay.origin, SelectionManager.position);
+                startingElevation = this.elevation(pickRay.origin, pickPlanePosition);
+                if (wantDebug) {
+                    print("    longest dimension: " + greatestDimension);
+                    print("    starting distance: " + startingDistance);
+                    print("    starting elevation: " + startingElevation);
                 }
-            } else {
+
+                initialPick = rayPlaneIntersection(pickRay, pickPlanePosition, pickPlaneNormal);
+                
+                if (debugPickPlaneEnabled) {
+                    that.showDebugPickPlane(pickPlanePosition, pickPlaneNormal);
+                    that.showDebugPickPlaneHit(initialPick);
+                }
+
+                isConstrained = false;
+                if (wantDebug) {
+                    print("================== TRANSLATE_XZ(End) <- =======================");
+                }
+            },
+            onEnd: function(event, reason) {
+                pushCommandForSelections(duplicatedEntityIDs);
                 if (isConstrained) {
                     Overlays.editOverlay(xRailOverlay, {
                         visible: false
@@ -1902,60 +1858,166 @@ SelectionDisplay = (function() {
                     Overlays.editOverlay(zRailOverlay, {
                         visible: false
                     });
-                    isConstrained = false;
                 }
-            }
+            },
+            elevation: function(origin, intersection) {
+                return (origin.y - intersection.y) / Vec3.distance(origin, intersection);
+            },
+            onMove: function(event) {
+                var wantDebug = false;
+                var pickRay = generalComputePickRay(event.x, event.y);
 
-            constrainMajorOnly = event.isControl;
-            var negateAndHalve = -0.5;
-            var cornerPosition = Vec3.sum(startPosition, Vec3.multiply(negateAndHalve, SelectionManager.worldDimensions));
-            vector = Vec3.subtract(
-                grid.snapToGrid(Vec3.sum(cornerPosition, vector), constrainMajorOnly),
-                cornerPosition);
+                var newPick = rayPlaneIntersection2(pickRay, pickPlanePosition, pickPlaneNormal);
 
-            // editing a parent will cause all the children to automatically follow along, so don't
-            // edit any entity who has an ancestor in SelectionManager.selections
-            var toMove = SelectionManager.selections.filter(function (selection) {
-                if (SelectionManager.selections.indexOf(SelectionManager.savedProperties[selection].parentID) >= 0) {
-                    return false; // a parent is also being moved, so don't issue an edit for this entity
-                } else {
-                    return true;
+                // If the pick ray doesn't hit the pick plane in this direction, do nothing.
+                // this will happen when someone drags across the horizon from the side they started on.
+                if (!newPick) {
+                    if (wantDebug) {
+                        print("    "+ mode + "Pick ray does not intersect XZ plane.");
+                    }
+                    
+                    // EARLY EXIT--(Invalid ray detected.)
+                    return;
                 }
-            });
-
-            for (var i = 0; i < toMove.length; i++) {
-                var properties = SelectionManager.savedProperties[toMove[i]];
-                if (!properties) {
-                    continue;
+                
+                if (debugPickPlaneEnabled) {
+                    that.showDebugPickPlaneHit(newPick);
                 }
-                var newPosition = Vec3.sum(properties.position, {
-                    x: vector.x,
-                    y: 0,
-                    z: vector.z
-                });
-                Entities.editEntity(toMove[i], {
-                    position: newPosition
-                });
 
+                var vector = Vec3.subtract(newPick, initialPick);
+
+                // If the mouse is too close to the horizon of the pick plane, stop moving
+                var MIN_ELEVATION = 0.02; //  largest dimension of object divided by distance to it
+                var elevation = this.elevation(pickRay.origin, newPick);
                 if (wantDebug) {
-                    print("translateXZ... ");
-                    Vec3.print("                 vector:", vector);
-                    Vec3.print("            newPosition:", properties.position);
-                    Vec3.print("            newPosition:", newPosition);
+                    print("Start Elevation: " + startingElevation + ", elevation: " + elevation);
                 }
-            }
+                if ((startingElevation > 0.0 && elevation < MIN_ELEVATION) ||
+                    (startingElevation < 0.0 && elevation > -MIN_ELEVATION)) {
+                    if (wantDebug) {
+                        print("    "+ mode + " - too close to horizon!");
+                    }
 
-            SelectionManager._update();
-        }
-    });
+                    // EARLY EXIT--(Don't proceed past the reached limit.)
+                    return;
+                }
+
+                //  If the angular size of the object is too small, stop moving
+                var MIN_ANGULAR_SIZE = 0.01; //  Radians
+                if (greatestDimension > 0) {
+                    var angularSize = Math.atan(greatestDimension / Vec3.distance(pickRay.origin, newPick));
+                    if (wantDebug) {
+                        print("Angular size = " + angularSize);
+                    }
+                    if (angularSize < MIN_ANGULAR_SIZE) {
+                        return;
+                    }
+                }
+
+                // If shifted, constrain to one axis
+                if (event.isShifted) {
+                    if (Math.abs(vector.x) > Math.abs(vector.z)) {
+                        vector.z = 0;
+                    } else {
+                        vector.x = 0;
+                    }
+                    if (!isConstrained) {
+                        var xStart = Vec3.sum(startPosition, {
+                            x: -RAIL_AXIS_LENGTH,
+                            y: 0,
+                            z: 0
+                        });
+                        var xEnd = Vec3.sum(startPosition, {
+                            x: RAIL_AXIS_LENGTH,
+                            y: 0,
+                            z: 0
+                        });
+                        var zStart = Vec3.sum(startPosition, {
+                            x: 0,
+                            y: 0,
+                            z: -RAIL_AXIS_LENGTH
+                        });
+                        var zEnd = Vec3.sum(startPosition, {
+                            x: 0,
+                            y: 0,
+                            z: RAIL_AXIS_LENGTH
+                        });
+                        Overlays.editOverlay(xRailOverlay, {
+                            start: xStart,
+                            end: xEnd,
+                            visible: true
+                        });
+                        Overlays.editOverlay(zRailOverlay, {
+                            start: zStart,
+                            end: zEnd,
+                            visible: true
+                        });
+                        isConstrained = true;
+                    }
+                } else {
+                    if (isConstrained) {
+                        Overlays.editOverlay(xRailOverlay, {
+                            visible: false
+                        });
+                        Overlays.editOverlay(zRailOverlay, {
+                            visible: false
+                        });
+                        isConstrained = false;
+                    }
+                }
+
+                constrainMajorOnly = event.isControl;
+                var negateAndHalve = -0.5;
+                var cornerPosition = Vec3.sum(startPosition, Vec3.multiply(negateAndHalve, SelectionManager.worldDimensions));
+                vector = Vec3.subtract(
+                    grid.snapToGrid(Vec3.sum(cornerPosition, vector), constrainMajorOnly),
+                    cornerPosition);
+
+                // editing a parent will cause all the children to automatically follow along, so don't
+                // edit any entity who has an ancestor in SelectionManager.selections
+                var toMove = SelectionManager.selections.filter(function (selection) {
+                    if (SelectionManager.selections.indexOf(SelectionManager.savedProperties[selection].parentID) >= 0) {
+                        return false; // a parent is also being moved, so don't issue an edit for this entity
+                    } else {
+                        return true;
+                    }
+                });
+
+                for (var i = 0; i < toMove.length; i++) {
+                    var properties = SelectionManager.savedProperties[toMove[i]];
+                    if (!properties) {
+                        continue;
+                    }
+                    var newPosition = Vec3.sum(properties.position, {
+                        x: vector.x,
+                        y: 0,
+                        z: vector.z
+                    });
+                    Entities.editEntity(toMove[i], {
+                        position: newPosition
+                    });
+
+                    if (wantDebug) {
+                        print("translateXZ... ");
+                        Vec3.print("                 vector:", vector);
+                        Vec3.print("            newPosition:", properties.position);
+                        Vec3.print("            newPosition:", newPosition);
+                    }
+                }
+
+                SelectionManager._update();
+            }
+        });
+    }
 
     // TOOL DEFINITION: HANDLE TRANSLATE TOOL    
     function addHandleTranslateTool(overlay, mode, direction) {
-        var pickNormal = null;
-        var lastPick = null;
-        var initialPosition = null;
+        var pickPlanePosition = null;
+        var pickPlaneNormal = null;
+        var initialPick = null;
         var projectionVector = null;
         var previousPickRay = null;
+        var rotation = null;
         addHandleTool(overlay, {
             mode: mode,
             onBegin: function(event, pickRay, pickResult) {
@@ -1981,13 +2043,12 @@ SelectionDisplay = (function() {
                 } else if (direction === TRANSLATE_DIRECTION.Z) {
                     axisVector = { x: 0, y: 0, z: 1 };
                 }
-
-                var rotation = spaceMode === SPACE_LOCAL ? SelectionManager.localRotation : SelectionManager.worldRotation;
+                
+                rotation = spaceMode === SPACE_LOCAL ? SelectionManager.localRotation : SelectionManager.worldRotation;
                 axisVector = Vec3.multiplyQbyV(rotation, axisVector);
-                pickNormal = Vec3.cross(Vec3.cross(pickRay.direction, axisVector), axisVector);
-
-                lastPick = rayPlaneIntersection(pickRay, SelectionManager.worldPosition, pickNormal);
-                initialPosition = SelectionManager.worldPosition;
+                pickPlaneNormal = Vec3.cross(Vec3.cross(pickRay.direction, axisVector), axisVector);
+                pickPlanePosition = SelectionManager.worldPosition;
+                initialPick = rayPlaneIntersection(pickRay, pickPlanePosition, pickPlaneNormal);
     
                 SelectionManager.saveProperties();
                 that.resetPreviousHandleColor();
@@ -1997,10 +2058,15 @@ SelectionDisplay = (function() {
                 that.setHandleTranslateZVisible(direction === TRANSLATE_DIRECTION.Z);
                 that.setHandleRotateVisible(false);
                 that.setHandleStretchVisible(false);
-                that.setHandleScaleCubeVisible(false);
-                that.setHandleClonerVisible(false);
+                that.setHandleScaleVisible(false);
+                that.setHandleDuplicatorVisible(false);
                 
                 previousPickRay = pickRay;
+                
+                if (debugPickPlaneEnabled) {
+                    that.showDebugPickPlane(pickPlanePosition, pickPlaneNormal);
+                    that.showDebugPickPlaneHit(initialPick);
+                }
             },
             onEnd: function(event, reason) {
                 pushCommandForSelections(duplicatedEntityIDs);
@@ -2009,12 +2075,16 @@ SelectionDisplay = (function() {
                 var pickRay = generalComputePickRay(event.x, event.y);
                 
                 // Use previousPickRay if new pickRay will cause resulting rayPlaneIntersection values to wrap around
-                if (usePreviousPickRay(pickRay.direction, previousPickRay.direction, pickNormal)) {
+                if (usePreviousPickRay(pickRay.direction, previousPickRay.direction, pickPlaneNormal)) {
                     pickRay = previousPickRay;
                 }
     
-                var newIntersection = rayPlaneIntersection(pickRay, initialPosition, pickNormal);
-                var vector = Vec3.subtract(newIntersection, lastPick);
+                var newPick = rayPlaneIntersection(pickRay, pickPlanePosition, pickPlaneNormal);
+                if (debugPickPlaneEnabled) {
+                    that.showDebugPickPlaneHit(newPick);
+                }
+                
+                var vector = Vec3.subtract(newPick, initialPick);
                 
                 if (direction === TRANSLATE_DIRECTION.X) {
                     projectionVector = { x: 1, y: 0, z: 0 };
@@ -2023,8 +2093,6 @@ SelectionDisplay = (function() {
                 } else if (direction === TRANSLATE_DIRECTION.Z) {
                     projectionVector = { x: 0, y: 0, z: 1 };
                 }
-
-                var rotation = spaceMode === SPACE_LOCAL ? SelectionManager.localRotation : SelectionManager.worldRotation;
                 projectionVector = Vec3.multiplyQbyV(rotation, projectionVector);
 
                 var dotVector = Vec3.dot(vector, projectionVector);
@@ -2064,361 +2132,302 @@ SelectionDisplay = (function() {
         });
     }
 
-    // FUNCTION: VEC 3 MULT
-    var vec3Mult = function(v1, v2) {
-        return {
-            x: v1.x * v2.x,
-            y: v1.y * v2.y,
-            z: v1.z * v2.z
-        };
-    };
-
     // TOOL DEFINITION: HANDLE STRETCH TOOL   
-    function makeStretchTool(stretchMode, directionEnum, directionVec, pivot, offset, stretchPanel, cubeHandle) {
-        var directionFor3DStretch = directionVec;
-        var distanceFor3DStretch = 0;
-        var DISTANCE_INFLUENCE_THRESHOLD = 1.2;
-        
-        var signs = {
-            x: directionVec.x < 0 ? -1 : (directionVec.x > 0 ? 1 : 0),
-            y: directionVec.y < 0 ? -1 : (directionVec.y > 0 ? 1 : 0),
-            z: directionVec.z < 0 ? -1 : (directionVec.z > 0 ? 1 : 0)
-        };
-
-        var mask = {
-            x: Math.abs(directionVec.x) > 0 ? 1 : 0,
-            y: Math.abs(directionVec.y) > 0 ? 1 : 0,
-            z: Math.abs(directionVec.z) > 0 ? 1 : 0
-        };
-
-        var numDimensions = mask.x + mask.y + mask.z;
-
-        var planeNormal = null;
-        var lastPick = null;
-        var lastPick3D = null;
+    function addHandleStretchTool(overlay, mode, directionEnum) {
+        var initialPick = null;
         var initialPosition = null;
         var initialDimensions = null;
-        var initialProperties = null;
-        var registrationPoint = null;
-        var deltaPivot = null;
-        var deltaPivot3D = null;
-        var pickRayPosition = null;
-        var pickRayPosition3D = null;
         var rotation = null;
+        var registrationPoint = null;
+        var pickPlanePosition = null;
+        var pickPlaneNormal = null;
         var previousPickRay = null;
-        var beginMouseEvent = null;
-        var beginControllerPosition = null;
-
-        var onBegin = function(event, pickRay, pickResult) {     
-            var proportional = directionEnum === STRETCH_DIRECTION.ALL;     
-            
-            var properties = Entities.getEntityProperties(SelectionManager.selections[0]);
-            initialProperties = properties;
-            rotation = (spaceMode === SPACE_LOCAL) ? properties.rotation : Quat.IDENTITY;
-
-            if (spaceMode === SPACE_LOCAL) {
+        var directionVector = null;
+        var axisVector = null;
+        var signs = null;
+        var mask = null;
+        var stretchPanel = null;
+        var handleStretchCube = null;
+        var deltaPivot = null;
+        addHandleTool(overlay, {
+            mode: mode,
+            onBegin: function(event, pickRay, pickResult) {             
+                if (directionEnum === STRETCH_DIRECTION.X) {
+                    stretchPanel = handleStretchXPanel;
+                    handleStretchCube = handleStretchXCube;
+                    directionVector = { x: -1, y: 0, z: 0 };
+                } else if (directionEnum === STRETCH_DIRECTION.Y) {
+                    stretchPanel = handleStretchYPanel;
+                    handleStretchCube = handleStretchYCube;
+                    directionVector = { x: 0, y: -1, z: 0 };
+                } else if (directionEnum === STRETCH_DIRECTION.Z) {
+                    stretchPanel = handleStretchZPanel;
+                    handleStretchCube = handleStretchZCube;
+                    directionVector = { x: 0, y: 0, z: -1 };
+                }
+                
                 rotation = SelectionManager.localRotation;
                 initialPosition = SelectionManager.localPosition;
                 initialDimensions = SelectionManager.localDimensions;
                 registrationPoint = SelectionManager.localRegistrationPoint;
-            } else {
-                rotation = SelectionManager.worldRotation;
-                initialPosition = SelectionManager.worldPosition;
-                initialDimensions = SelectionManager.worldDimensions;
-                registrationPoint = SelectionManager.worldRegistrationPoint;
-            }
-
-            // Modify range of registrationPoint to be [-0.5, 0.5]
-            var centeredRP = Vec3.subtract(registrationPoint, {
-                x: 0.5,
-                y: 0.5,
-                z: 0.5
-            });
-
-            // Scale pivot to be in the same range as registrationPoint
-            var scaledPivot = Vec3.multiply(0.5, pivot);
-            deltaPivot = Vec3.subtract(centeredRP, scaledPivot);
-
-            var scaledOffset = Vec3.multiply(0.5, offset);
-
-            // Offset from the registration point
-            var offsetRP = Vec3.subtract(scaledOffset, centeredRP);
-
-            // Scaled offset in world coordinates
-            var scaledOffsetWorld = vec3Mult(initialDimensions, offsetRP);
-            
-            pickRayPosition = Vec3.sum(initialPosition, Vec3.multiplyQbyV(rotation, scaledOffsetWorld));
-            
-            if (directionFor3DStretch) {
-                // pivot, offset and pickPlanePosition for 3D manipulation
-                var scaledPivot3D = Vec3.multiply(0.5, Vec3.multiply(1.0, directionFor3DStretch));
-                deltaPivot3D = Vec3.subtract(centeredRP, scaledPivot3D);                
-                pickRayPosition3D = Vec3.sum(initialPosition, Vec3.multiplyQbyV(rotation, scaledOffsetWorld));
-            }
-
-            if (numDimensions === 1) {
-                if (mask.x === 1) {
-                    planeNormal = {
-                        x: 0,
-                        y: 1,
-                        z: 0
-                    };
-                } else if (mask.y === 1) {
-                    planeNormal = {
-                        x: 1,
-                        y: 0,
-                        z: 0
-                    };
-                } else {
-                    planeNormal = {
-                        x: 0,
-                        y: 1,
-                        z: 0
-                    };
-                }
-            } else if (numDimensions === 2) {
-                if (mask.x === 0) {
-                    planeNormal = {
-                        x: 1,
-                        y: 0,
-                        z: 0
-                    };
-                } else if (mask.y === 0) {
-                    planeNormal = {
-                        x: 0,
-                        y: 1,
-                        z: 0
-                    };
-                } else {
-                    planeNormal = {
-                        x: 0,
-                        y: 0,
-                        z: 1
-                    };
-                }
-            }
-            
-            planeNormal = Vec3.multiplyQbyV(rotation, planeNormal);
-            lastPick = rayPlaneIntersection(pickRay, pickRayPosition, planeNormal);
                 
-            var planeNormal3D = {
-                x: 0,
-                y: 0,
-                z: 0
-            };
-            if (directionFor3DStretch) {
-                lastPick3D = rayPlaneIntersection(pickRay,
-                    pickRayPosition3D,
-                    planeNormal3D);
-                distanceFor3DStretch = Vec3.length(Vec3.subtract(pickRayPosition3D, pickRay.origin));
-            }
+                axisVector = Vec3.multiply(NEGATE_VECTOR, directionVector);
+                axisVector = Vec3.multiplyQbyV(rotation, axisVector);
+                
+                signs = {
+                    x: directionVector.x < 0 ? -1 : (directionVector.x > 0 ? 1 : 0),
+                    y: directionVector.y < 0 ? -1 : (directionVector.y > 0 ? 1 : 0),
+                    z: directionVector.z < 0 ? -1 : (directionVector.z > 0 ? 1 : 0)
+                };
+                mask = {
+                    x: Math.abs(directionVector.x) > 0 ? 1 : 0,
+                    y: Math.abs(directionVector.y) > 0 ? 1 : 0,
+                    z: Math.abs(directionVector.z) > 0 ? 1 : 0
+                };
+                
+                var pivot = directionVector;
+                var offset = Vec3.multiply(directionVector, NEGATE_VECTOR);
+                
+                // Modify range of registrationPoint to be [-0.5, 0.5]
+                var centeredRP = Vec3.subtract(registrationPoint, {
+                    x: 0.5,
+                    y: 0.5,
+                    z: 0.5
+                });
 
-            that.setHandleTranslateVisible(false);
-            that.setHandleRotateVisible(false);
-            that.setHandleScaleCubeVisible(true);
-            that.setHandleStretchXVisible(directionEnum === STRETCH_DIRECTION.X);
-            that.setHandleStretchYVisible(directionEnum === STRETCH_DIRECTION.Y);
-            that.setHandleStretchZVisible(directionEnum === STRETCH_DIRECTION.Z);
-            that.setHandleClonerVisible(false);
-        
-            SelectionManager.saveProperties();
-            that.resetPreviousHandleColor();
+                // Scale pivot to be in the same range as registrationPoint
+                var scaledPivot = Vec3.multiply(0.5, pivot);
+                deltaPivot = Vec3.subtract(centeredRP, scaledPivot);
 
-            if (stretchPanel !== null) {
-                Overlays.editOverlay(stretchPanel, { visible: true });
-            }
+                var scaledOffset = Vec3.multiply(0.5, offset);
 
-            var collisionToRemove = "myAvatar";
-            if (properties.collidesWith.indexOf(collisionToRemove) > -1) {
-                var newCollidesWith = properties.collidesWith.replace(collisionToRemove, "");
-                Entities.editEntity(SelectionManager.selections[0], {collidesWith: newCollidesWith});
-                that.replaceCollisionsAfterStretch = true;
-            }
+                // Offset from the registration point
+                var offsetRP = Vec3.subtract(scaledOffset, centeredRP);
+
+                // Scaled offset in world coordinates
+                var scaledOffsetWorld = Vec3.multiplyVbyV(initialDimensions, offsetRP);
+                
+                pickPlaneNormal = Vec3.cross(Vec3.cross(pickRay.direction, axisVector), axisVector);
+                pickPlanePosition = Vec3.sum(initialPosition, Vec3.multiplyQbyV(rotation, scaledOffsetWorld));
+                initialPick = rayPlaneIntersection(pickRay, pickPlanePosition, pickPlaneNormal);
+
+                that.setHandleTranslateVisible(false);
+                that.setHandleRotateVisible(false);
+                that.setHandleScaleVisible(true);
+                that.setHandleStretchXVisible(directionEnum === STRETCH_DIRECTION.X);
+                that.setHandleStretchYVisible(directionEnum === STRETCH_DIRECTION.Y);
+                that.setHandleStretchZVisible(directionEnum === STRETCH_DIRECTION.Z);
+                that.setHandleDuplicatorVisible(false);
             
-            if (!proportional) {
-                var stretchCubePosition = Overlays.getProperty(cubeHandle, "position");
+                SelectionManager.saveProperties();
+                that.resetPreviousHandleColor();
+
+                var collisionToRemove = "myAvatar";
+                var properties = Entities.getEntityProperties(SelectionManager.selections[0]);
+                if (properties.collidesWith.indexOf(collisionToRemove) > -1) {
+                    var newCollidesWith = properties.collidesWith.replace(collisionToRemove, "");
+                    Entities.editEntity(SelectionManager.selections[0], {collidesWith: newCollidesWith});
+                    that.replaceCollisionsAfterStretch = true;
+                }
+
+                if (stretchPanel !== null) {
+                    Overlays.editOverlay(stretchPanel, { visible: true });
+                }
+                var stretchCubePosition = Overlays.getProperty(handleStretchCube, "position");
                 var stretchPanelPosition = Overlays.getProperty(stretchPanel, "position");
                 activeStretchCubePanelOffset = Vec3.subtract(stretchPanelPosition, stretchCubePosition);
-            }
-            
-            previousPickRay = pickRay;
-            beginMouseEvent = event;
-            if (that.triggered()) {
-                beginControllerPosition = getControllerAvatarFramePositionFromPickRay(pickRay);
-            }
-        };
-
-        var onEnd = function(event, reason) {    
-            if (stretchPanel !== null) {
-                Overlays.editOverlay(stretchPanel, { visible: false });
-            }
-            
-            if (that.replaceCollisionsAfterStretch) {
-                var newCollidesWith = SelectionManager.savedProperties[SelectionManager.selections[0]].collidesWith;
-                Entities.editEntity(SelectionManager.selections[0], {collidesWith: newCollidesWith});
-                that.replaceCollisionsAfterStretch = false;
-            }
-            
-            activeStretchCubePanelOffset = null;
-            
-            pushCommandForSelections();
-        };
-
-        var onMove = function(event) {
-            var proportional = directionEnum === STRETCH_DIRECTION.ALL;
-            
-            var position, rotation;
-            if (spaceMode === SPACE_LOCAL) {
-                position = SelectionManager.localPosition;
-                rotation = SelectionManager.localRotation;
-            } else {
-                position = SelectionManager.worldPosition;
-                rotation = SelectionManager.worldRotation;
-            }
-            
-            var localDeltaPivot = deltaPivot;
-            var localSigns = signs;
-            var pickRay = generalComputePickRay(event.x, event.y);
-            
-            // Use previousPickRay if new pickRay will cause resulting rayPlaneIntersection values to wrap around
-            if (usePreviousPickRay(pickRay.direction, previousPickRay.direction, planeNormal)) {
-                pickRay = previousPickRay;
-            }
-            
-            var controllerPose = getControllerWorldLocation(that.triggeredHand, true);
-            var controllerTrigger = HMD.isHMDAvailable() && HMD.isHandControllerAvailable() && 
-                                    controllerPose.valid && that.triggered();
-
-            // Are we using handControllers or Mouse - only relevant for 3D tools
-            var vector = null;
-            var newPick = null;
-            if (controllerTrigger && directionFor3DStretch) {
-                localDeltaPivot = deltaPivot3D;
-                newPick = pickRay.origin;
-                vector = Vec3.subtract(newPick, lastPick3D);
-                vector = Vec3.multiplyQbyV(Quat.inverse(rotation), vector);
-                if (distanceFor3DStretch > DISTANCE_INFLUENCE_THRESHOLD) {
-                    // Range of Motion
-                    vector = Vec3.multiply(distanceFor3DStretch , vector);
-                }
-                localSigns = directionFor3DStretch;
-            } else {
-                newPick = rayPlaneIntersection(pickRay, pickRayPosition, planeNormal);
-                vector = Vec3.subtract(newPick, lastPick);
-                vector = Vec3.multiplyQbyV(Quat.inverse(rotation), vector);
-                vector = vec3Mult(mask, vector);
-            }
-            
-            vector = grid.snapToSpacing(vector);
-    
-            var changeInDimensions = Vec3.multiply(NEGATE_VECTOR, vec3Mult(localSigns, vector));
-            
-            var newDimensions;
-            if (proportional) {
-                var viewportDimensions = Controller.getViewportDimensions();
-                var toCameraDistance = getDistanceToCamera(position);   
-                var dimensionsMultiple = toCameraDistance * STRETCH_DIRECTION_ALL_CAMERA_DISTANCE_MULTIPLE; 
                 
-                var dimensionChange;
-                if (controllerTrigger) {
-                    var controllerPosition = getControllerAvatarFramePositionFromPickRay(pickRay);
-                    var vecControllerDifference = Vec3.subtract(controllerPosition, beginControllerPosition);
-                    var controllerDifference = vecControllerDifference.x + vecControllerDifference.y + 
-                                               vecControllerDifference.z;
-                    dimensionChange = controllerDifference * dimensionsMultiple;
-                } else {
-                    var mouseXDifference = (event.x - beginMouseEvent.x) / viewportDimensions.x;
-                    var mouseYDifference = (beginMouseEvent.y - event.y) / viewportDimensions.y;
-                    var mouseDifference = mouseXDifference + mouseYDifference;
-                    dimensionChange = mouseDifference * dimensionsMultiple;
+                previousPickRay = pickRay;
+
+                if (debugPickPlaneEnabled) {
+                    that.showDebugPickPlane(pickPlanePosition, pickPlaneNormal);
+                    that.showDebugPickPlaneHit(initialPick);
+                }
+            },
+            onEnd: function(event, reason) {                
+                if (that.replaceCollisionsAfterStretch) {
+                    var newCollidesWith = SelectionManager.savedProperties[SelectionManager.selections[0]].collidesWith;
+                    Entities.editEntity(SelectionManager.selections[0], {collidesWith: newCollidesWith});
+                    that.replaceCollisionsAfterStretch = false;
                 }
- 
-                var averageInitialDimension = (initialDimensions.x + initialDimensions.y + initialDimensions.z) / 3;
-                percentChange = dimensionChange / averageInitialDimension;
-                percentChange += 1.0;
-                newDimensions = Vec3.multiply(percentChange, initialDimensions);
-                newDimensions.x = Math.abs(newDimensions.x);
-                newDimensions.y = Math.abs(newDimensions.y);
-                newDimensions.z = Math.abs(newDimensions.z);
-            } else {
-                newDimensions = Vec3.sum(initialDimensions, changeInDimensions);
-            }
-
-            var minimumDimension = directionEnum ===
-                STRETCH_DIRECTION.ALL ? STRETCH_ALL_MINIMUM_DIMENSION : STRETCH_MINIMUM_DIMENSION; 
-            if (newDimensions.x < minimumDimension) {
-                newDimensions.x = minimumDimension;
-                changeInDimensions.x = minimumDimension - initialDimensions.x;
-            }
-            if (newDimensions.y < minimumDimension) {
-                newDimensions.y = minimumDimension;
-                changeInDimensions.y = minimumDimension - initialDimensions.y;
-            }
-            if (newDimensions.z < minimumDimension) {
-                newDimensions.z = minimumDimension;
-                changeInDimensions.z = minimumDimension - initialDimensions.z;
-            }
-
-            var changeInPosition = Vec3.multiplyQbyV(rotation, vec3Mult(localDeltaPivot, changeInDimensions));
-            if (proportional) {
-                changeInPosition = { x: 0, y: 0, z: 0 };
-            }
-            var newPosition = Vec3.sum(initialPosition, changeInPosition);
-    
-            Entities.editEntity(SelectionManager.selections[0], {
-                position: newPosition,
-                dimensions: newDimensions
-            });
                 
-            var wantDebug = false;
-            if (wantDebug) {
-                print(stretchMode);
-                Vec3.print("                 vector:", vector);
-                Vec3.print("            changeInDimensions:", changeInDimensions);
-                Vec3.print("                 newDimensions:", newDimensions);
-                Vec3.print("              changeInPosition:", changeInPosition);
-                Vec3.print("                   newPosition:", newPosition);
+                if (stretchPanel !== null) {
+                    Overlays.editOverlay(stretchPanel, { visible: false });
+                }
+                activeStretchCubePanelOffset = null;
+                
+                pushCommandForSelections();
+            },
+            onMove: function(event) {            
+                var pickRay = generalComputePickRay(event.x, event.y);
+                
+                // Use previousPickRay if new pickRay will cause resulting rayPlaneIntersection values to wrap around
+                if (usePreviousPickRay(pickRay.direction, previousPickRay.direction, pickPlaneNormal)) {
+                    pickRay = previousPickRay;
+                }
+                
+                var newPick = rayPlaneIntersection(pickRay, pickPlanePosition, pickPlaneNormal);
+                if (debugPickPlaneEnabled) {
+                    that.showDebugPickPlaneHit(newPick);
+                }
+                
+                var changeInDimensions = Vec3.subtract(newPick, initialPick);
+                var dotVector = Vec3.dot(changeInDimensions, axisVector);
+                changeInDimensions = Vec3.multiply(dotVector, axisVector);
+                changeInDimensions = Vec3.multiplyQbyV(Quat.inverse(rotation), changeInDimensions);
+                changeInDimensions = Vec3.multiplyVbyV(mask, changeInDimensions);
+                changeInDimensions = grid.snapToSpacing(changeInDimensions);
+                changeInDimensions = Vec3.multiply(NEGATE_VECTOR, Vec3.multiplyVbyV(signs, changeInDimensions));    
+
+                var newDimensions = Vec3.sum(initialDimensions, changeInDimensions);
+
+                var minimumDimension = STRETCH_MINIMUM_DIMENSION; 
+                if (newDimensions.x < minimumDimension) {
+                    newDimensions.x = minimumDimension;
+                    changeInDimensions.x = minimumDimension - initialDimensions.x;
+                }
+                if (newDimensions.y < minimumDimension) {
+                    newDimensions.y = minimumDimension;
+                    changeInDimensions.y = minimumDimension - initialDimensions.y;
+                }
+                if (newDimensions.z < minimumDimension) {
+                    newDimensions.z = minimumDimension;
+                    changeInDimensions.z = minimumDimension - initialDimensions.z;
+                }
+
+                var changeInPosition = Vec3.multiplyQbyV(rotation, Vec3.multiplyVbyV(deltaPivot, changeInDimensions));
+                var newPosition = Vec3.sum(initialPosition, changeInPosition);
+        
+                Entities.editEntity(SelectionManager.selections[0], {
+                    position: newPosition,
+                    dimensions: newDimensions
+                });
+                    
+                var wantDebug = false;
+                if (wantDebug) {
+                    print(mode);
+                    Vec3.print("            changeInDimensions:", changeInDimensions);
+                    Vec3.print("                 newDimensions:", newDimensions);
+                    Vec3.print("              changeInPosition:", changeInPosition);
+                    Vec3.print("                   newPosition:", newPosition);
+                }
+                
+                previousPickRay = pickRay;
+        
+                SelectionManager._update();
             }
-            
-            previousPickRay = pickRay;
-    
-            SelectionManager._update();
-        };// End of onMove def
-
-        return {
-            mode: stretchMode,
-            onBegin: onBegin,
-            onMove: onMove,
-            onEnd: onEnd
-        };
-    }
-
-    function addHandleStretchTool(overlay, mode, directionEnum) {
-        var directionVector, offset, stretchPanel, handleStretchCube;
-        if (directionEnum === STRETCH_DIRECTION.X) {
-            stretchPanel = handleStretchXPanel;
-            handleStretchCube = handleStretchXCube;
-            directionVector = { x: -1, y: 0, z: 0 };
-        } else if (directionEnum === STRETCH_DIRECTION.Y) {
-            stretchPanel = handleStretchYPanel;
-            handleStretchCube = handleStretchYCube;
-            directionVector = { x: 0, y: -1, z: 0 };
-        } else if (directionEnum === STRETCH_DIRECTION.Z) {
-            stretchPanel = handleStretchZPanel;
-            handleStretchCube = handleStretchZCube;
-            directionVector = { x: 0, y: 0, z: -1 };
-        }
-        offset = Vec3.multiply(directionVector, NEGATE_VECTOR);
-        var tool = makeStretchTool(mode, directionEnum, directionVector, directionVector, offset, stretchPanel, handleStretchCube);
-        return addHandleTool(overlay, tool);
+        });
     }
 
     // TOOL DEFINITION: HANDLE SCALE TOOL   
     function addHandleScaleTool(overlay, mode) {
-        var directionVector = { x:0, y:0, z:0 };
-        var offset = { x:0, y:0, z:0 };
-        var tool = makeStretchTool(mode, STRETCH_DIRECTION.ALL, directionVector, directionVector, offset, null, handleScaleCube);
-        return addHandleTool(overlay, tool);
+        var initialPick = null;
+        var initialPosition = null;
+        var initialDimensions = null;
+        var pickPlanePosition = null;
+        var pickPlaneNormal = null;
+        var previousPickRay = null;     
+        addHandleTool(overlay, {
+            mode: mode,
+            onBegin: function(event, pickRay, pickResult) {
+                initialPosition = SelectionManager.localPosition;
+                initialDimensions = SelectionManager.localDimensions;               
+                
+                pickPlanePosition = initialPosition;                
+                pickPlaneNormal = Vec3.subtract(pickRay.origin, pickPlanePosition);
+                initialPick = rayPlaneIntersection(pickRay, pickPlanePosition, pickPlaneNormal);
+
+                that.setHandleTranslateVisible(false);
+                that.setHandleRotateVisible(false);
+                that.setHandleScaleVisible(true);
+                that.setHandleStretchVisible(false);
+                that.setHandleDuplicatorVisible(false);
+            
+                SelectionManager.saveProperties();
+                that.resetPreviousHandleColor();
+
+                var collisionToRemove = "myAvatar";
+                var properties = Entities.getEntityProperties(SelectionManager.selections[0]);
+                if (properties.collidesWith.indexOf(collisionToRemove) > -1) {
+                    var newCollidesWith = properties.collidesWith.replace(collisionToRemove, "");
+                    Entities.editEntity(SelectionManager.selections[0], {collidesWith: newCollidesWith});
+                    that.replaceCollisionsAfterStretch = true;
+                }
+
+                previousPickRay = pickRay;
+                
+                if (debugPickPlaneEnabled) {
+                    that.showDebugPickPlane(pickPlanePosition, pickPlaneNormal);
+                    that.showDebugPickPlaneHit(initialPick);
+                }
+            },
+            onEnd: function(event, reason) {                
+                if (that.replaceCollisionsAfterStretch) {
+                    var newCollidesWith = SelectionManager.savedProperties[SelectionManager.selections[0]].collidesWith;
+                    Entities.editEntity(SelectionManager.selections[0], {collidesWith: newCollidesWith});
+                    that.replaceCollisionsAfterStretch = false;
+                }
+                
+                pushCommandForSelections();
+            },
+            onMove: function(event) {            
+                var pickRay = generalComputePickRay(event.x, event.y);
+                
+                // Use previousPickRay if new pickRay will cause resulting rayPlaneIntersection values to wrap around
+                if (usePreviousPickRay(pickRay.direction, previousPickRay.direction, pickPlaneNormal)) {
+                    pickRay = previousPickRay;
+                }
+                
+                var newPick = rayPlaneIntersection(pickRay, pickPlanePosition, pickPlaneNormal);
+                if (debugPickPlaneEnabled) {
+                    that.showDebugPickPlaneHit(newPick);
+                }
+                
+                var toCameraDistance = getDistanceToCamera(initialPosition);  
+                var dimensionsMultiple = toCameraDistance * SCALE_DIMENSIONS_CAMERA_DISTANCE_MULTIPLE;
+                var changeInDimensions = Vec3.subtract(newPick, initialPick);                   
+                changeInDimensions = Vec3.multiplyQbyV(Quat.inverse(Camera.orientation), changeInDimensions);
+                changeInDimensions = grid.snapToSpacing(changeInDimensions);
+                changeInDimensions = Vec3.multiply(changeInDimensions, dimensionsMultiple);
+                
+                var averageDimensionChange = (changeInDimensions.x + changeInDimensions.y + changeInDimensions.z) / 3;
+                var averageInitialDimension = (initialDimensions.x + initialDimensions.y + initialDimensions.z) / 3;
+                percentChange = averageDimensionChange / averageInitialDimension;
+                percentChange += 1.0;
+                
+                var newDimensions = Vec3.multiply(percentChange, initialDimensions);
+                newDimensions.x = Math.abs(newDimensions.x);
+                newDimensions.y = Math.abs(newDimensions.y);
+                newDimensions.z = Math.abs(newDimensions.z);
+
+                var minimumDimension = SCALE_MINIMUM_DIMENSION; 
+                if (newDimensions.x < minimumDimension) {
+                    newDimensions.x = minimumDimension;
+                    changeInDimensions.x = minimumDimension - initialDimensions.x;
+                }
+                if (newDimensions.y < minimumDimension) {
+                    newDimensions.y = minimumDimension;
+                    changeInDimensions.y = minimumDimension - initialDimensions.y;
+                }
+                if (newDimensions.z < minimumDimension) {
+                    newDimensions.z = minimumDimension;
+                    changeInDimensions.z = minimumDimension - initialDimensions.z;
+                }
+                
+                Entities.editEntity(SelectionManager.selections[0], { dimensions: newDimensions });
+                    
+                var wantDebug = false;
+                if (wantDebug) {
+                    print(mode);
+                    Vec3.print("            changeInDimensions:", changeInDimensions);
+                    Vec3.print("                 newDimensions:", newDimensions);
+                }
+                
+                previousPickRay = pickRay;
+        
+                SelectionManager._update();
+            }
+        });
     }
 
     // FUNCTION: UPDATE ROTATION DEGREES OVERLAY
@@ -2483,8 +2492,11 @@ SelectionDisplay = (function() {
     function addHandleRotateTool(overlay, mode, direction) {
         var selectedHandle = null;
         var worldRotation = null;
-        var rotationCenter = null;
         var initialRotation = null;
+        var rotationCenter = null;
+        var rotationNormal = null;
+        var rotationZero = null;
+        var rotationDegreesPosition = null;
         addHandleTool(overlay, {
             mode: mode,
             onBegin: function(event, pickRay, pickResult) {
@@ -2492,18 +2504,7 @@ SelectionDisplay = (function() {
                 if (wantDebug) {
                     print("================== " + getMode() + "(addHandleRotateTool onBegin) -> =======================");
                 }
-
-                SelectionManager.saveProperties();
-                that.resetPreviousHandleColor();
-    
-                that.setHandleTranslateVisible(false);
-                that.setHandleRotatePitchVisible(direction === ROTATE_DIRECTION.PITCH);
-                that.setHandleRotateYawVisible(direction === ROTATE_DIRECTION.YAW);
-                that.setHandleRotateRollVisible(direction === ROTATE_DIRECTION.ROLL);
-                that.setHandleStretchVisible(false);
-                that.setHandleScaleCubeVisible(false);
-                that.setHandleClonerVisible(false);
-
+                
                 if (direction === ROTATE_DIRECTION.PITCH) {
                     rotationNormal = { x: 1, y: 0, z: 0 };
                     worldRotation = worldRotationY;
@@ -2517,6 +2518,21 @@ SelectionDisplay = (function() {
                     worldRotation = worldRotationX;
                     selectedHandle = handleRotateRollRing;
                 }
+                
+                initialRotation = spaceMode === SPACE_LOCAL ? SelectionManager.localRotation : SelectionManager.worldRotation;
+                rotationNormal = Vec3.multiplyQbyV(initialRotation, rotationNormal);
+                rotationCenter = SelectionManager.worldPosition;
+
+                SelectionManager.saveProperties();
+                that.resetPreviousHandleColor();
+    
+                that.setHandleTranslateVisible(false);
+                that.setHandleRotatePitchVisible(direction === ROTATE_DIRECTION.PITCH);
+                that.setHandleRotateYawVisible(direction === ROTATE_DIRECTION.YAW);
+                that.setHandleRotateRollVisible(direction === ROTATE_DIRECTION.ROLL);
+                that.setHandleStretchVisible(false);
+                that.setHandleScaleVisible(false);
+                that.setHandleDuplicatorVisible(false);
 
                 Overlays.editOverlay(selectedHandle, { 
                     hasTickMarks: true,
@@ -2524,11 +2540,6 @@ SelectionDisplay = (function() {
                     innerRadius: ROTATE_RING_SELECTED_INNER_RADIUS
                 });
 
-                initialRotation = spaceMode === SPACE_LOCAL ? SelectionManager.localRotation : SelectionManager.worldRotation;
-                rotationNormal = Vec3.multiplyQbyV(initialRotation, rotationNormal);
-
-                rotationCenter = SelectionManager.worldPosition;
-
                 Overlays.editOverlay(rotationDegreesDisplay, { visible: true });
                 Overlays.editOverlay(handleRotateCurrentRing, {
                     position: rotationCenter,
@@ -2540,16 +2551,21 @@ SelectionDisplay = (function() {
 
                 // editOverlays may not have committed rotation changes.
                 // Compute zero position based on where the overlay will be eventually.
-                var result = rayPlaneIntersection(pickRay, rotationCenter, rotationNormal);
+                var initialPick = rayPlaneIntersection(pickRay, rotationCenter, rotationNormal);
                 // In case of a parallel ray, this will be null, which will cause early-out
                 // in the onMove helper.
-                rotationZero = result;
+                rotationZero = initialPick;
 
                 var rotationCenterToZero = Vec3.subtract(rotationZero, rotationCenter);
                 var rotationCenterToZeroLength = Vec3.length(rotationCenterToZero);
                 rotationDegreesPosition = Vec3.sum(rotationCenter, Vec3.multiply(Vec3.normalize(rotationCenterToZero), 
                                                    rotationCenterToZeroLength * ROTATE_DISPLAY_DISTANCE_MULTIPLIER));
                 updateRotationDegreesOverlay(0, rotationDegreesPosition);
+                
+                if (debugPickPlaneEnabled) {
+                    that.showDebugPickPlane(rotationCenter, rotationNormal);
+                    that.showDebugPickPlaneHit(initialPick);
+                }
 
                 if (wantDebug) {
                     print("================== " + getMode() + "(addHandleRotateTool onBegin) <- =======================");
@@ -2634,6 +2650,10 @@ SelectionDisplay = (function() {
                             });
                         }
                     }
+                    
+                    if (debugPickPlaneEnabled) {
+                        that.showDebugPickPlaneHit(result);
+                    }
                 }
 
                 if (wantDebug) {
@@ -2641,43 +2661,11 @@ SelectionDisplay = (function() {
                 }
             }
         });
-    }
+    }    
 
-    // TOOL DEFINITION: HANDLE CLONER
-    addHandleTool(handleCloner, {
-        mode: "CLONE",
-        onBegin: function(event, pickRay, pickResult) {
-            var doClone = true;
-            translateXZTool.onBegin(event,pickRay,pickResult,doClone);
-        },
-        elevation: function (event) {
-            translateXZTool.elevation(event);
-        },
-    
-        onEnd: function (event) {
-            translateXZTool.onEnd(event);
-        },
-    
-        onMove: function (event) {
-            translateXZTool.onMove(event);
-        }
-    });
-
-    addHandleTool(iconSelectionBox, {
-        mode: "TRANSLATE_XZ",
-        onBegin: function (event, pickRay, pickResult) {
-            translateXZTool.onBegin(event, pickRay, pickResult, false);
-        },
-        elevation: function (event) {
-            translateXZTool.elevation(event);
-        },
-        onEnd: function (event) {
-            translateXZTool.onEnd(event);
-        },
-        onMove: function (event) {
-            translateXZTool.onMove(event);
-        }
-    });
+    addHandleTranslateXZTool(selectionBox, "TRANSLATE_XZ", false);
+    addHandleTranslateXZTool(iconSelectionBox, "TRANSLATE_XZ", false);
+    addHandleTranslateXZTool(handleDuplicator, "DUPLICATE", true);
 
     addHandleTranslateTool(handleTranslateXCone, "TRANSLATE_X", TRANSLATE_DIRECTION.X);
     addHandleTranslateTool(handleTranslateXCylinder, "TRANSLATE_X", TRANSLATE_DIRECTION.X);

From 8c306b84281a8b46777b66d34d763576d1a0b0c7 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Thu, 27 Sep 2018 16:04:18 -0700
Subject: [PATCH 10/14] disable debug pick plane

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

diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index eaba6db34a..db205ca63b 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -791,7 +791,7 @@ SelectionDisplay = (function() {
     var activeTool = null;
     var handleTools = {};
     
-    var debugPickPlaneEnabled = true;
+    var debugPickPlaneEnabled = false;
     var debugPickPlane = Overlays.addOverlay("shape", {
         shape: "Quad",
         alpha: 0.25,

From 0d40d78343bfca81fce87f3728a01baba0bca033 Mon Sep 17 00:00:00 2001
From: Gabriel Calero <gcalero1984@gmail.com>
Date: Fri, 28 Sep 2018 12:04:05 -0300
Subject: [PATCH 11/14] Expand clic area for forget password

---
 android/app/src/main/res/layout/fragment_login.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/app/src/main/res/layout/fragment_login.xml b/android/app/src/main/res/layout/fragment_login.xml
index e9b2577ee7..6933ad1eb5 100644
--- a/android/app/src/main/res/layout/fragment_login.xml
+++ b/android/app/src/main/res/layout/fragment_login.xml
@@ -93,7 +93,6 @@
         android:id="@+id/loginButton"
         android:layout_width="154dp"
         android:layout_height="38dp"
-        android:layout_marginTop="16dp"
         android:background="@drawable/rounded_button"
         android:fontFamily="@font/raleway_semibold"
         android:paddingBottom="0dp"
@@ -110,7 +109,8 @@
         android:id="@+id/forgotPassword"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="9dp"
+        android:paddingTop="9dp"
+        android:paddingBottom="16dp"
         android:fontFamily="@font/raleway_semibold"
         android:textSize="14dp"
         android:text="@string/forgot_password"

From c0c95a1d33a147af907840817379481f80d2112f Mon Sep 17 00:00:00 2001
From: Gabriel Calero <gcalero1984@gmail.com>
Date: Fri, 28 Sep 2018 13:53:18 -0300
Subject: [PATCH 12/14] Fix flickering between login and signup screens

---
 .../hifiinterface/MainActivity.java           | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/MainActivity.java b/android/app/src/main/java/io/highfidelity/hifiinterface/MainActivity.java
index 451dc4ee00..c9d03f4633 100644
--- a/android/app/src/main/java/io/highfidelity/hifiinterface/MainActivity.java
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/MainActivity.java
@@ -146,45 +146,44 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
 
     private void loadHomeFragment(boolean addToBackStack) {
         Fragment fragment = HomeFragment.newInstance();
-        loadFragment(fragment, getString(R.string.home), getString(R.string.tagFragmentHome), addToBackStack);
+        loadFragment(fragment, getString(R.string.home), getString(R.string.tagFragmentHome), addToBackStack, true);
     }
 
     private void loadLoginFragment() {
         Fragment fragment = LoginFragment.newInstance();
-        loadFragment(fragment, getString(R.string.login), getString(R.string.tagFragmentLogin), true);
+        loadFragment(fragment, getString(R.string.login), getString(R.string.tagFragmentLogin), true, true);
     }
 
     private void loadSignedInFragment() {
         Fragment fragment = SignedInFragment.newInstance();
-        loadFragment(fragment, getString(R.string.welcome), getString(R.string.tagFragmentSignedIn), true);
+        loadFragment(fragment, getString(R.string.welcome), getString(R.string.tagFragmentSignedIn), true, true);
     }
 
     private void loadSignupFragment() {
         Fragment fragment = SignupFragment.newInstance();
-
-        loadFragment(fragment, getString(R.string.signup), getString(R.string.tagFragmentSignup), true);
+        loadFragment(fragment, getString(R.string.signup), getString(R.string.tagFragmentSignup), true, false);
     }
 
     private void loadPrivacyPolicyFragment() {
         Fragment fragment = PolicyFragment.newInstance();
 
-        loadFragment(fragment, getString(R.string.privacyPolicy), getString(R.string.tagFragmentPolicy), true);
+        loadFragment(fragment, getString(R.string.privacyPolicy), getString(R.string.tagFragmentPolicy), true, true);
     }
 
     private void loadPeopleFragment() {
         Fragment fragment = FriendsFragment.newInstance();
 
-        loadFragment(fragment, getString(R.string.people), getString(R.string.tagFragmentPeople), true);
+        loadFragment(fragment, getString(R.string.people), getString(R.string.tagFragmentPeople), true, true);
     }
 
     private void loadSettingsFragment() {
         SettingsFragment fragment = SettingsFragment.newInstance();
 
-        loadFragment(fragment, getString(R.string.settings), getString(R.string.tagSettings), true);
+        loadFragment(fragment, getString(R.string.settings), getString(R.string.tagSettings), true, true);
     }
 
 
-    private void loadFragment(Fragment fragment, String title, String tag, boolean addToBackStack) {
+    private void loadFragment(Fragment newFragment, String title, String tag, boolean addToBackStack, boolean goBackUntilHome) {
         FragmentManager fragmentManager = getFragmentManager();
 
         // check if it's the same fragment
@@ -196,17 +195,19 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
             return; // cancel as we are already in that fragment
         }
 
-        // go back until first transaction
-        int backStackEntryCount = fragmentManager.getBackStackEntryCount();
-        for (int i = 0; i < backStackEntryCount - 1; i++) {
-            fragmentManager.popBackStackImmediate();
+        if (goBackUntilHome) {
+            // go back until first transaction
+            int backStackEntryCount = fragmentManager.getBackStackEntryCount();
+            for (int i = 0; i < backStackEntryCount - 1; i++) {
+                fragmentManager.popBackStackImmediate();
+            }
         }
 
         // this case is when we wanted to go home.. rollback already did that!
         // But asking for a new Home fragment makes it easier to have an updated list so we let it to continue
 
         FragmentTransaction ft = fragmentManager.beginTransaction();
-        ft.replace(R.id.content_frame, fragment, tag);
+        ft.replace(R.id.content_frame, newFragment, tag);
 
         if (addToBackStack) {
             ft.addToBackStack(title);
@@ -354,7 +355,8 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
 
     @Override
     public void onLoginRequested() {
-        loadLoginFragment();
+        // go back from signup to login
+        onBackPressed();
     }
 
     @Override

From b7c421ba47371a16ff20387d20508c345cf4d25f Mon Sep 17 00:00:00 2001
From: Gabriel Calero <gcalero1984@gmail.com>
Date: Fri, 28 Sep 2018 14:39:15 -0300
Subject: [PATCH 13/14] Fixes according to review

---
 interface/src/AndroidHelper.cpp  |  4 ++--
 interface/src/Constants.h        | 15 +++++++++++++++
 interface/src/ui/LoginDialog.cpp |  3 +--
 3 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 interface/src/Constants.h

diff --git a/interface/src/AndroidHelper.cpp b/interface/src/AndroidHelper.cpp
index b05c7b4786..3c96817d4d 100644
--- a/interface/src/AndroidHelper.cpp
+++ b/interface/src/AndroidHelper.cpp
@@ -12,7 +12,9 @@
 #include <QDebug>
 #include <AccountManager.h>
 #include <AudioClient.h>
+#include <src/ui/LoginDialog.h>
 #include "Application.h"
+#include "Constants.h"
 
 #if defined(qApp)
 #undef qApp
@@ -84,8 +86,6 @@ void AndroidHelper::signup(QString email, QString username, QString password) {
 
     payload.insert("user", userObject);
 
-    static const QString API_SIGNUP_PATH = "api/v1/users";
-
     auto accountManager = DependencyManager::get<AccountManager>();
 
     accountManager->sendRequest(API_SIGNUP_PATH, AccountManagerAuth::None,
diff --git a/interface/src/Constants.h b/interface/src/Constants.h
new file mode 100644
index 0000000000..f40c08f558
--- /dev/null
+++ b/interface/src/Constants.h
@@ -0,0 +1,15 @@
+//
+//  Constants.h
+//  interface
+//
+//  Created by Gabriel Calero on 9/28/18.
+//  Copyright 2015 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#pragma once
+#include <QString>
+
+static const QString API_SIGNUP_PATH = "api/v1/users";
diff --git a/interface/src/ui/LoginDialog.cpp b/interface/src/ui/LoginDialog.cpp
index 43da6ea863..ed22492c33 100644
--- a/interface/src/ui/LoginDialog.cpp
+++ b/interface/src/ui/LoginDialog.cpp
@@ -27,6 +27,7 @@
 
 #include "Application.h"
 #include "scripting/HMDScriptingInterface.h"
+#include "Constants.h"
 
 HIFI_QML_DEF(LoginDialog)
 
@@ -220,8 +221,6 @@ void LoginDialog::signup(const QString& email, const QString& username, const QS
 
     payload.insert("user", userObject);
 
-    static const QString API_SIGNUP_PATH = "api/v1/users";
-
     qDebug() << "Sending a request to create an account for" << username;
 
     auto accountManager = DependencyManager::get<AccountManager>();

From b62ca2b75cdf642ea6731f1752873ddeaffb9591 Mon Sep 17 00:00:00 2001
From: Anthony Thibault <tony@highfidelity.io>
Date: Mon, 1 Oct 2018 18:43:19 -0700
Subject: [PATCH 14/14] Better configuration, i.e. which puck is associated
 with which limb.

Previously we where incorrectly sorting the pucks along the x axis.
This could cause the order to be wrong if you were not standing along the z axis w.r.t the vive tracked volume.
---
 plugins/openvr/src/ViveControllerManager.cpp | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/plugins/openvr/src/ViveControllerManager.cpp b/plugins/openvr/src/ViveControllerManager.cpp
index 50bae3e33c..3e26f304f8 100644
--- a/plugins/openvr/src/ViveControllerManager.cpp
+++ b/plugins/openvr/src/ViveControllerManager.cpp
@@ -77,14 +77,10 @@ static glm::mat4 computeOffset(glm::mat4 defaultToReferenceMat, glm::mat4 defaul
     return glm::inverse(poseMat) * referenceJointMat;
 }
 
-static bool sortPucksYPosition(PuckPosePair firstPuck, PuckPosePair secondPuck) {
+static bool sortPucksYPosition(const PuckPosePair& firstPuck, const PuckPosePair& secondPuck) {
     return (firstPuck.second.translation.y < secondPuck.second.translation.y);
 }
 
-static bool sortPucksXPosition(PuckPosePair firstPuck, PuckPosePair secondPuck) {
-    return (firstPuck.second.translation.x < secondPuck.second.translation.x);
-}
-
 static bool determineLimbOrdering(const controller::Pose& poseA, const controller::Pose& poseB, glm::vec3 axis, glm::vec3 axisOrigin) {
     glm::vec3 poseAPosition = poseA.getTranslation();
     glm::vec3 poseBPosition = poseB.getTranslation();
@@ -592,7 +588,17 @@ void ViveControllerManager::InputDevice::calibrate(const controller::InputCalibr
 }
 
 bool ViveControllerManager::InputDevice::configureHands(const glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration) {
-    std::sort(_validTrackedObjects.begin(), _validTrackedObjects.end(), sortPucksXPosition);
+
+    // Sort valid tracked objects in the default frame by the x dimension (left to right).
+    // Because the sort is in the default frame we guarentee that poses are relative to the head facing.
+    // i.e. -x will always be to the left of the head, and +x will be to the right.
+    // This allows the user to be facing in any direction in sensor space while calibrating.
+    glm::mat4 referenceToDefaultMat = glm::inverse(defaultToReferenceMat);
+    std::sort(_validTrackedObjects.begin(), _validTrackedObjects.end(), [&referenceToDefaultMat](const PuckPosePair& a, const PuckPosePair& b) {
+        glm::vec3 aPos = transformPoint(referenceToDefaultMat, a.second.translation);
+        glm::vec3 bPos = transformPoint(referenceToDefaultMat, b.second.translation);
+        return (aPos.x < bPos.x);
+    });
     int puckCount = (int)_validTrackedObjects.size();
     if (_handConfig == HandConfig::Pucks && puckCount >= MIN_PUCK_COUNT) {
         glm::vec3 headXAxis = getReferenceHeadXAxis(defaultToReferenceMat, inputCalibration.defaultHeadMat);