From cd7af8b6052c887276e552b99be6a341530a459b Mon Sep 17 00:00:00 2001
From: amantley <amantley@googlemail.com>
Date: Wed, 17 Oct 2018 08:51:40 -0700
Subject: [PATCH] changed the name of sumuserheightsensorspace to
 averageuserheightSensorSpace

---
 interface/src/avatar/MyAvatar.cpp | 16 ++++++++--------
 interface/src/avatar/MyAvatar.h   |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index b85f19a06d..9fe91e44b9 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -478,7 +478,7 @@ void MyAvatar::updateSitStandState(float newHeightReading, float angleHeadUp) {
                 // if we recenter upwards then no longer in sitting state
                 _sitStandStateCount++;
                 if (_sitStandStateCount > STANDING_COUNT_THRESHOLD) {
-                    _sumUserHeightSensorSpace = newHeightReading;
+                    _averageUserHeightSensorSpace = newHeightReading;
                     _tippingPoint = newHeightReading;
                     setIsInSittingState(false);
                 }
@@ -487,18 +487,18 @@ void MyAvatar::updateSitStandState(float newHeightReading, float angleHeadUp) {
                 // make sure that a real sit is still recognized so we won't be stuck in sitting unable to change state
                 _sitStandStateCount++;
                 if (_sitStandStateCount > SITTING_COUNT_THRESHOLD) {
-                    _sumUserHeightSensorSpace = newHeightReading;
+                    _averageUserHeightSensorSpace = newHeightReading;
                     _tippingPoint = newHeightReading;
                     // here we stay in sit state but reset the average height
                     setIsInSittingState(true);
                 }
             } else {
                 // sanity check if average height greater than 5ft they are not sitting(or get off your dangerous barstool please)
-                if (_sumUserHeightSensorSpace > SITTING_UPPER_BOUND) {
+                if (_averageUserHeightSensorSpace > SITTING_UPPER_BOUND) {
                     setIsInSittingState(false);
                 } else {
                     // tipping point is average height when sitting.
-                    _tippingPoint = _sumUserHeightSensorSpace;
+                    _tippingPoint = _averageUserHeightSensorSpace;
                     _sitStandStateCount = 0;
                 }
             }
@@ -507,7 +507,7 @@ void MyAvatar::updateSitStandState(float newHeightReading, float angleHeadUp) {
             if (newHeightReading < (SITTING_HEIGHT_MULTIPLE * _tippingPoint)) {
                 _sitStandStateCount++;
                 if (_sitStandStateCount > SITTING_COUNT_THRESHOLD) {
-                    _sumUserHeightSensorSpace = newHeightReading;
+                    _averageUserHeightSensorSpace = newHeightReading;
                     _tippingPoint = newHeightReading;
                     setIsInSittingState(true);
                 }
@@ -519,7 +519,7 @@ void MyAvatar::updateSitStandState(float newHeightReading, float angleHeadUp) {
         }
     } else {
         // if you are away then reset the average and set state to standing.
-        _sumUserHeightSensorSpace = _userHeight.get();
+        _averageUserHeightSensorSpace = _userHeight.get();
         _tippingPoint = _userHeight.get();
         setIsInSittingState(false);
     }
@@ -559,7 +559,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);
-        _sumUserHeightSensorSpace = lerp(_sumUserHeightSensorSpace, newHeightReading.getTranslation().y, 0.01f);
+        _averageUserHeightSensorSpace = lerp(_averageUserHeightSensorSpace, newHeightReading.getTranslation().y, 0.01f);
         _recentModeReadings.insert(newHeightReadingInCentimeters);
         setCurrentStandingHeight(computeStandingHeightMode(newHeightReading));
         setAverageHeadRotation(computeAverageHeadRotation(getControllerPoseInAvatarFrame(controller::Action::HEAD)));
@@ -3910,7 +3910,7 @@ void MyAvatar::setIsInSittingState(bool isSitting) {
 void MyAvatar::setIsSitStandStateLocked(bool isLocked) {
     _lockSitStandState.set(isLocked);
     _sitStandStateCount = 0;
-    _sumUserHeightSensorSpace = _userHeight.get();
+    _averageUserHeightSensorSpace = _userHeight.get();
     _tippingPoint = _userHeight.get();
     if (!isLocked) {
         // always start the auto transition mode in standing state.
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index 59f9145404..d1ba0fd9cf 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -1832,7 +1832,7 @@ private:
 
     // height of user in sensor space, when standing erect.
     ThreadSafeValueCache<float> _userHeight { DEFAULT_AVATAR_HEIGHT };
-    float _sumUserHeightSensorSpace { _userHeight.get() };
+    float _averageUserHeightSensorSpace { _userHeight.get() };
     bool _sitStandStateChange { false };
     ThreadSafeValueCache<bool> _lockSitStandState { false };