From 8e272d6dd27c95a9a2a73dc14c6e7755a97d9887 Mon Sep 17 00:00:00 2001
From: amantley <amantley@googlemail.com>
Date: Mon, 15 Oct 2018 08:43:25 -0700
Subject: [PATCH] added the correction code for when you are misslabeled as
 sitting while you are standing. It will now handle a sit down correctly. Also
 made the first approximation of state based on the average user height. This
 should use the user input of their height associated with their account

---
 interface/src/avatar/MyAvatar.cpp | 12 ++++++++++++
 interface/src/avatar/MyAvatar.h   |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 172fdac96c..458c3ee422 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -546,6 +546,18 @@ void MyAvatar::update(float deltaTime) {
                     _averageUserHeightCount = 1;
                     setIsInSittingState(false);
                 }
+            } else if ((newHeightReading.getTranslation().y < (SITTING_HEIGHT_MULTIPLE * _tippingPoint)) && (angleSpine2 > COSINE_THIRTY_DEGREES)) {
+                _sitStandStateCount++;
+                if (_sitStandStateCount > SITTING_COUNT_THRESHOLD) {
+                    _sitStandStateCount = 0;
+                    _squatCount = 0;
+                    if (newHeightReading.isValid()) {
+                        _sumUserHeightSensorSpace = newHeightReading.getTranslation().y;
+                        _tippingPoint = newHeightReading.getTranslation().y;
+                    }
+                    _averageUserHeightCount = 1;
+                    setIsInSittingState(true);
+                }
             } else {
                 _sitStandStateCount = 0;
                 // tipping point is average height when sitting.
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index 10b5510e4d..61eed672ef 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -1846,7 +1846,7 @@ private:
     ThreadSafeValueCache<bool> _isInSittingState { false };
     int _sitStandStateCount { 0 };
     int _squatCount { 0 };
-    float _tippingPoint { DEFAULT_FLOOR_HEIGHT };
+    float _tippingPoint { DEFAULT_AVATAR_HEIGHT };
 
     // load avatar scripts once when rig is ready
     bool _shouldLoadScripts { false };