From 812c28ef484c1453832389ab131bed004044d10b Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Fri, 8 Jun 2018 14:15:42 -0700
Subject: [PATCH] Fix MS13761: Change the move conditions under which overlays
 hide

---
 interface/src/ui/OverlayConductor.cpp | 53 +++++++--------------------
 interface/src/ui/OverlayConductor.h   | 11 ++----
 2 files changed, 17 insertions(+), 47 deletions(-)

diff --git a/interface/src/ui/OverlayConductor.cpp b/interface/src/ui/OverlayConductor.cpp
index e7e3c91d13..924a5d6179 100644
--- a/interface/src/ui/OverlayConductor.cpp
+++ b/interface/src/ui/OverlayConductor.cpp
@@ -18,7 +18,6 @@
 #include "InterfaceLogging.h"
 
 OverlayConductor::OverlayConductor() {
-
 }
 
 OverlayConductor::~OverlayConductor() {
@@ -33,8 +32,8 @@ bool OverlayConductor::headOutsideOverlay() const {
     glm::vec3 uiPos = uiTransform.getTranslation();
     glm::vec3 uiForward = uiTransform.getRotation() * glm::vec3(0.0f, 0.0f, -1.0f);
 
-    const float MAX_COMPOSITOR_DISTANCE = 0.99f; // If you're 1m from center of ui sphere, you're at the surface.
-    const float MAX_COMPOSITOR_ANGLE = 180.0f;  // rotation check is effectively disabled
+    const float MAX_COMPOSITOR_DISTANCE = 0.99f;  // If you're 1m from center of ui sphere, you're at the surface.
+    const float MAX_COMPOSITOR_ANGLE = 180.0f;    // rotation check is effectively disabled
     if (glm::distance(uiPos, hmdPos) > MAX_COMPOSITOR_DISTANCE ||
         glm::dot(uiForward, hmdForward) < cosf(glm::radians(MAX_COMPOSITOR_ANGLE))) {
         return true;
@@ -43,10 +42,9 @@ bool OverlayConductor::headOutsideOverlay() const {
 }
 
 bool OverlayConductor::updateAvatarIsAtRest() {
-
     auto myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
 
-    const quint64 REST_ENABLE_TIME_USECS = 1000 * 1000; // 1 s
+    const quint64 REST_ENABLE_TIME_USECS = 1000 * 1000;  // 1 s
     const quint64 REST_DISABLE_TIME_USECS = 200 * 1000;  // 200 ms
 
     const float AT_REST_THRESHOLD = 0.01f;
@@ -69,31 +67,6 @@ bool OverlayConductor::updateAvatarIsAtRest() {
     return _currentAtRest;
 }
 
-bool OverlayConductor::updateAvatarHasDriveInput() {
-    auto myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
-
-    const quint64 DRIVE_ENABLE_TIME_USECS = 200 * 1000;  // 200 ms
-    const quint64 DRIVE_DISABLE_TIME_USECS = 1000 * 1000; // 1 s
-
-    bool desiredDriving = myAvatar->hasDriveInput();
-    if (desiredDriving != _desiredDriving) {
-        // start timer
-        _desiredDrivingTimer = usecTimestampNow() + (desiredDriving ? DRIVE_ENABLE_TIME_USECS : DRIVE_DISABLE_TIME_USECS);
-    }
-
-    _desiredDriving = desiredDriving;
-
-    if (_desiredDrivingTimer != 0 && usecTimestampNow() > _desiredDrivingTimer) {
-        // timer expired
-        // change state!
-        _currentDriving = _desiredDriving;
-        // disable timer
-        _desiredDrivingTimer = 0;
-    }
-
-    return _currentDriving;
-}
-
 void OverlayConductor::centerUI() {
     // place the overlay at the current hmd position in sensor space
     auto camMat = cancelOutRollAndPitch(qApp->getHMDSensorPose());
@@ -115,20 +88,21 @@ void OverlayConductor::update(float dt) {
         _hmdMode = false;
     }
 
-    bool prevDriving = _currentDriving;
-    bool isDriving = updateAvatarHasDriveInput();
-    bool drivingChanged = prevDriving != isDriving;
     bool isAtRest = updateAvatarIsAtRest();
+    bool prevMoving = _currentMoving;
+    bool isMoving = !isAtRest;
+    bool movingChanged = prevMoving != isMoving;
+
     bool shouldRecenter = false;
 
-    if (_flags & SuppressedByDrive) {
-        if (!isDriving) {
-            _flags &= ~SuppressedByDrive;
-             shouldRecenter = true;
+    if (_flags & SuppressedByMove) {
+        if (!isMoving) {
+            _flags &= ~SuppressedByMove;
+            shouldRecenter = true;
         }
     } else {
-        if (myAvatar->getClearOverlayWhenMoving() && drivingChanged && isDriving) {
-            _flags |= SuppressedByDrive;
+        if (myAvatar->getClearOverlayWhenMoving() && movingChanged && isMoving) {
+            _flags |= SuppressedByMove;
         }
     }
 
@@ -143,7 +117,6 @@ void OverlayConductor::update(float dt) {
         }
     }
 
-
     bool targetVisible = Menu::getInstance()->isOptionChecked(MenuOption::Overlays) && (0 == (_flags & SuppressMask));
     if (targetVisible != currentVisible) {
         offscreenUi->setPinned(!targetVisible);
diff --git a/interface/src/ui/OverlayConductor.h b/interface/src/ui/OverlayConductor.h
index cdd596a7bc..509292b775 100644
--- a/interface/src/ui/OverlayConductor.h
+++ b/interface/src/ui/OverlayConductor.h
@@ -27,18 +27,15 @@ private:
     bool updateAvatarIsAtRest();
 
     enum SupressionFlags {
-        SuppressedByDrive = 0x01,
+        SuppressedByMove = 0x01,
         SuppressedByHead = 0x02,
         SuppressMask = 0x03,
     };
 
-    uint8_t _flags { SuppressedByDrive };
+    uint8_t _flags { SuppressedByMove };
     bool _hmdMode { false };
-
-    // used by updateAvatarHasDriveInput
-    uint64_t _desiredDrivingTimer { 0 };
-    bool _desiredDriving { false };
-    bool _currentDriving { false };
+    
+    bool _currentMoving { false };
 
     // used by updateAvatarIsAtRest
     uint64_t _desiredAtRestTimer { 0 };