From 78eee5961cd016671465a2396e24b6d2e244436a Mon Sep 17 00:00:00 2001
From: luiscuenca <luiscuenca@outboxcode.com>
Date: Thu, 5 Sep 2019 18:05:46 -0700
Subject: [PATCH] Fix key mapping for new camera

---
 .../resources/controllers/keyboardMouse.json  | 29 +++++++++++++++++++
 interface/src/Application.cpp                 |  3 +-
 interface/src/avatar/MyAvatar.cpp             |  2 +-
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/interface/resources/controllers/keyboardMouse.json b/interface/resources/controllers/keyboardMouse.json
index 9b3c711c63..c48269b83b 100644
--- a/interface/resources/controllers/keyboardMouse.json
+++ b/interface/resources/controllers/keyboardMouse.json
@@ -85,6 +85,15 @@
           "when": ["Application.CameraThirdPerson", "!Keyboard.Shift"],
           "to": "Actions.Yaw"
         },
+        
+        { "from": { "makeAxis" : [
+                ["Keyboard.Left"],
+                ["Keyboard.Right"]
+             ]
+          },
+          "when": ["Application.CameraLookAt", "!Keyboard.Shift"],
+          "to": "Actions.Yaw"
+        },
 
         { "from": { "makeAxis" : [
                 ["Keyboard.A"],
@@ -104,6 +113,15 @@
           "to": "Actions.Yaw"
         },
         
+        { "from": { "makeAxis" : [
+                ["Keyboard.A"],
+                ["Keyboard.D"]
+            ]
+          },
+          "when": ["Application.CameraLookAt", "!Keyboard.Control"],
+          "to": "Actions.Yaw"
+        },
+        
         { "from": { "makeAxis" : [
                 ["Keyboard.TouchpadLeft"],
                 ["Keyboard.TouchpadRight"]
@@ -122,6 +140,15 @@
           "to": "Actions.Yaw"
         },
         
+        { "from": { "makeAxis" : [
+                ["Keyboard.TouchpadLeft"],
+                ["Keyboard.TouchpadRight"]
+            ]
+          },
+          "when": "Application.CameraLookAt",
+          "to": "Actions.Yaw"
+        },
+        
         { "from": { "makeAxis" : ["Keyboard.MouseMoveLeft", "Keyboard.MouseMoveRight"] },
           "when": "Keyboard.RightMouseButton",
           "to": "Actions.DeltaYaw",
@@ -148,8 +175,10 @@
         { "from": "Keyboard.Right", "when": "Keyboard.Shift", "to": "Actions.LATERAL_RIGHT" },
         { "from": "Keyboard.Up", "when": "Application.CameraFirstPerson", "to": "Actions.LONGITUDINAL_FORWARD" },
         { "from": "Keyboard.Up", "when": "Application.CameraThirdPerson", "to": "Actions.LONGITUDINAL_FORWARD" },
+        { "from": "Keyboard.Up", "when": "Application.CameraLookAt", "to": "Actions.LONGITUDINAL_FORWARD" },
         { "from": "Keyboard.Down", "when": "Application.CameraFirstPerson", "to": "Actions.LONGITUDINAL_BACKWARD" },
         { "from": "Keyboard.Down", "when": "Application.CameraThirdPerson", "to": "Actions.LONGITUDINAL_BACKWARD" },
+        { "from": "Keyboard.Down", "when": "Application.CameraLookAt", "to": "Actions.LONGITUDINAL_BACKWARD" },
 
         { "from": "Keyboard.PgDown", "to": "Actions.VERTICAL_DOWN" },
         { "from": "Keyboard.PgUp", "to": "Actions.VERTICAL_UP" },
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 22bf3e2555..0dea3e2708 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1873,8 +1873,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     _applicationStateDevice->setInputVariant(STATE_CAMERA_THIRD_PERSON, []() -> float {
         return qApp->getCamera().getMode() == CAMERA_MODE_THIRD_PERSON ? 1 : 0;
     });
-    // Look at camera and third person camera use the same input mapping
-    _applicationStateDevice->setInputVariant(STATE_CAMERA_THIRD_PERSON, []() -> float {
+    _applicationStateDevice->setInputVariant(STATE_CAMERA_LOOK_AT, []() -> float {
         return qApp->getCamera().getMode() == CAMERA_MODE_LOOK_AT ? 1 : 0;
     });
     _applicationStateDevice->setInputVariant(STATE_CAMERA_ENTITY, []() -> float {
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 40d517767d..a367f6331f 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -3505,7 +3505,7 @@ glm::vec3 MyAvatar::scaleMotorSpeed(const glm::vec3 forward, const glm::vec3 rig
     } else {
         // Desktop mode.
         if (qApp->getCamera().getMode() == CAMERA_MODE_LOOK_AT) {
-            direction = (zSpeed * forward);
+            direction = (zSpeed * forward) + (xSpeed * right);
         } else {
             direction = (zSpeed * forward) + (xSpeed * right);
         }