From 2df9d6c5e9065fbe9b83eb975dccec98a6273f2c Mon Sep 17 00:00:00 2001
From: amantley <amantley@googlemail.com>
Date: Tue, 23 Oct 2018 13:37:56 -0700
Subject: [PATCH] addressed missing changes for luis

---
 interface/src/avatar/MyAvatar.cpp      | 32 +++++++++---------
 interface/src/ui/PreferencesDialog.cpp | 46 ++++++++++++++------------
 2 files changed, 42 insertions(+), 36 deletions(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 78cfed9b30..71c3ba4fc6 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -530,6 +530,7 @@ void MyAvatar::update(float deltaTime) {
     const float PERCENTAGE_WEIGHT_HEAD_VS_SHOULDERS_AZIMUTH = 0.0f; // 100 percent shoulders
     const float COSINE_THIRTY_DEGREES = 0.866f;
     const float SQUATTY_TIMEOUT = 30.0f; // 30 seconds
+    const float HEIGHT_FILTER_COEFFICIENT = 0.01f;
 
     float tau = deltaTime / HMD_FACING_TIMESCALE;
     setHipToHandController(computeHandAzimuth());
@@ -559,7 +560,7 @@ void MyAvatar::update(float deltaTime) {
     controller::Pose newHeightReading = getControllerPoseInSensorFrame(controller::Action::HEAD);
     if (newHeightReading.isValid()) {
         int newHeightReadingInCentimeters = glm::floor(newHeightReading.getTranslation().y * CENTIMETERS_PER_METER);
-        _averageUserHeightSensorSpace = lerp(_averageUserHeightSensorSpace, newHeightReading.getTranslation().y, 0.01f);
+        _averageUserHeightSensorSpace = lerp(_averageUserHeightSensorSpace, newHeightReading.getTranslation().y, HEIGHT_FILTER_COEFFICIENT);
         _recentModeReadings.insert(newHeightReadingInCentimeters);
         setCurrentStandingHeight(computeStandingHeightMode(newHeightReading));
         setAverageHeadRotation(computeAverageHeadRotation(getControllerPoseInAvatarFrame(controller::Action::HEAD)));
@@ -4232,21 +4233,22 @@ bool MyAvatar::FollowHelper::shouldActivateVertical(const MyAvatar& myAvatar, co
 
     if (myAvatar.getSitStandStateChange()) {
         returnValue = true;
-    }
-    if (myAvatar.getIsInSittingState()) {
-        if (myAvatar.getIsSitStandStateLocked()) {
-            returnValue = (offset.y > CYLINDER_TOP);
-        }
-        if (offset.y < SITTING_BOTTOM) {
-            // we recenter more easily when in sitting state.
-            returnValue = true;
-        }
     } else {
-        // in the standing state
-        returnValue = (offset.y > CYLINDER_TOP) || (offset.y < CYLINDER_BOTTOM);
-        // finally check for squats in standing
-        if (_squatDetected) {
-            returnValue = true;
+        if (myAvatar.getIsInSittingState()) {
+            if (myAvatar.getIsSitStandStateLocked()) {
+                returnValue = (offset.y > CYLINDER_TOP);
+            }
+            if (offset.y < SITTING_BOTTOM) {
+                // we recenter more easily when in sitting state.
+                returnValue = true;
+            }
+        } else {
+            // in the standing state
+            returnValue = (offset.y > CYLINDER_TOP) || (offset.y < CYLINDER_BOTTOM);
+            // finally check for squats in standing
+            if (_squatDetected) {
+                returnValue = true;
+            }
         }
     }
     return returnValue;
diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp
index 2b8f991174..34d80f50cf 100644
--- a/interface/src/ui/PreferencesDialog.cpp
+++ b/interface/src/ui/PreferencesDialog.cpp
@@ -260,27 +260,31 @@ void setupPreferences() {
         preferences->addPreference(preference);
     }
     {
-        auto getter = [myAvatar]()->int { switch (myAvatar->getUserRecenterModel()) {
-                                              case MyAvatar::SitStandModelType::Auto:
-                                              default:
-                                                  return 0;
-                                              case MyAvatar::SitStandModelType::ForceSit:
-                                                  return 1;
-                                              case MyAvatar::SitStandModelType::DisableHMDLean:
-                                                  return 2;
-                                              }};
-        auto setter = [myAvatar](int value) { switch (value) {
-                                                  case 0:
-                                                  default:
-                                                      myAvatar->setUserRecenterModel(MyAvatar::SitStandModelType::Auto);
-                                                      break;
-                                                  case 1:
-                                                      myAvatar->setUserRecenterModel(MyAvatar::SitStandModelType::ForceSit);
-                                                      break;
-                                                  case 2:
-                                                      myAvatar->setUserRecenterModel(MyAvatar::SitStandModelType::DisableHMDLean);
-                                                      break;
-                                                  }};
+        auto getter = [myAvatar]()->int {
+            switch (myAvatar->getUserRecenterModel()) {
+                case MyAvatar::SitStandModelType::Auto:
+                    default:
+                    return 0;
+                case MyAvatar::SitStandModelType::ForceSit:
+                    return 1;
+                case MyAvatar::SitStandModelType::DisableHMDLean:
+                    return 2;
+            }
+        };
+        auto setter = [myAvatar](int value) {
+            switch (value) {
+                case 0:
+                default:
+                    myAvatar->setUserRecenterModel(MyAvatar::SitStandModelType::Auto);
+                    break;
+                case 1:
+                    myAvatar->setUserRecenterModel(MyAvatar::SitStandModelType::ForceSit);
+                    break;
+                case 2:
+                    myAvatar->setUserRecenterModel(MyAvatar::SitStandModelType::DisableHMDLean);
+                    break;
+            }
+        };
         auto preference = new RadioButtonsPreference(VR_MOVEMENT, "Auto / Force Sit / Disable Recenter", getter, setter);
         QStringList items;
         items << "Auto - turns on avatar leaning when standing in real world" << "Seated - disables all avatar leaning while sitting in real world" << "Disabled - allows avatar sitting on the floor [Experimental]";