From 283ec97bb9e6137c42045406135d567ea4b33c78 Mon Sep 17 00:00:00 2001
From: r3tk0n <r3tk0n@gmail.com>
Date: Wed, 3 Apr 2019 16:09:13 -0700
Subject: [PATCH] Fix desktop movement.

---
 interface/src/avatar/MyAvatar.cpp | 68 +++++++++++++++++++------------
 1 file changed, 43 insertions(+), 25 deletions(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 0fca97be09..32c50021d6 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -3357,8 +3357,12 @@ glm::vec3 MyAvatar::scaleMotorSpeed(const glm::vec3 forward, const glm::vec3 rig
     auto zSpeed = getDriveKey(TRANSLATE_Z);
     auto xSpeed = getDriveKey(TRANSLATE_X);
     glm::vec3 direction;
-    if (qApp->isHMDMode()) {
-        switch(_controlSchemeIndex) {
+    if (!useAdvancedMovementControls() && qApp->isHMDMode()) {
+        // Walking disabled in settings.
+        return Vectors::ZERO;
+    } else if (qApp->isHMDMode()) {
+        // HMD advanced movement controls.
+        switch (_controlSchemeIndex) {
             case CONTROLS_DEFAULT:
                 // No acceleration curve for this one, constant speed.
                 if (zSpeed || xSpeed) {
@@ -4768,27 +4772,37 @@ bool MyAvatar::getIsSitStandStateLocked() const {
 }
 
 float MyAvatar::getWalkSpeed() const {
-    switch(_controlSchemeIndex) {
-        case CONTROLS_ANALOG:
-            return _analogWalkSpeed.get();
-        case CONTROLS_ANALOG_PLUS:
-            return _analogPlusWalkSpeed.get();
-        case CONTROLS_DEFAULT:
-        default:
-            return _defaultWalkSpeed.get();
+    if (qApp->isHMDMode()) {
+        switch (_controlSchemeIndex) {
+            case CONTROLS_ANALOG:
+                return _analogWalkSpeed.get();
+            case CONTROLS_ANALOG_PLUS:
+                return _analogPlusWalkSpeed.get();
+            case CONTROLS_DEFAULT:
+            default:
+                return _defaultWalkSpeed.get();
+        }
+    } else {
+        return _defaultWalkSpeed.get();
     }
+
 }
 
 float MyAvatar::getWalkBackwardSpeed() const {
-    switch(_controlSchemeIndex) {
-        case CONTROLS_ANALOG:
-            return _analogWalkBackwardSpeed.get();
-        case CONTROLS_ANALOG_PLUS:
-            return _analogPlusWalkBackwardSpeed.get();
-        case CONTROLS_DEFAULT:
-        default:
-            return _defaultWalkBackwardSpeed.get();
+    if (qApp->isHMDMode()) {
+        switch(_controlSchemeIndex) {
+            case CONTROLS_ANALOG:
+                return _analogWalkBackwardSpeed.get();
+            case CONTROLS_ANALOG_PLUS:
+                return _analogPlusWalkBackwardSpeed.get();
+            case CONTROLS_DEFAULT:
+            default:
+                return _defaultWalkBackwardSpeed.get();
+        }
+    } else {
+        return _defaultWalkBackwardSpeed.get();
     }
+
 }
 
 bool MyAvatar::isReadyForPhysics() const {
@@ -4907,13 +4921,17 @@ void MyAvatar::setSprintSpeed(float value) {
 }
 
 float MyAvatar::getSprintSpeed() const {
-    switch(_controlSchemeIndex) {
-    case CONTROLS_ANALOG:
-        return _analogSprintSpeed.get();
-    case CONTROLS_ANALOG_PLUS:
-        return _analogPlusSprintSpeed.get();
-    case CONTROLS_DEFAULT:
-    default:
+    if (qApp->isHMDMode()) {
+        switch (_controlSchemeIndex) {
+            case CONTROLS_ANALOG:
+                return _analogSprintSpeed.get();
+            case CONTROLS_ANALOG_PLUS:
+                return _analogPlusSprintSpeed.get();
+            case CONTROLS_DEFAULT:
+            default:
+                return _defaultSprintSpeed.get();
+        }
+    } else {
         return _defaultSprintSpeed.get();
     }
 }