From 8cb09c37eed722dd701afa6b4868581381d03762 Mon Sep 17 00:00:00 2001
From: amantley <amantley@googlemail.com>
Date: Mon, 22 Oct 2018 21:26:30 -0700
Subject: [PATCH] changed the ui to the settings/controls

---
 interface/src/avatar/MyAvatar.cpp      |  2 +-
 interface/src/ui/PreferencesDialog.cpp | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index dd40a748af..c55a257d6a 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -533,7 +533,7 @@ void MyAvatar::update(float deltaTime) {
 
     float tau = deltaTime / HMD_FACING_TIMESCALE;
     setHipToHandController(computeHandAzimuth());
-
+    qCDebug(interfaceapp) << "lock " << _lockSitStandState.get() << " sit " << _isInSittingState.get() << " hmd lean "<< _hmdLeanRecenterEnabled;
     // put the average hand azimuth into sensor space.
     // then mix it with head facing direction to determine rotation recenter
     if (getControllerPoseInAvatarFrame(controller::Action::LEFT_HAND).isValid() && getControllerPoseInAvatarFrame(controller::Action::RIGHT_HAND).isValid()) {
diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp
index 5eccef5e9d..eeca96222b 100644
--- a/interface/src/ui/PreferencesDialog.cpp
+++ b/interface/src/ui/PreferencesDialog.cpp
@@ -243,6 +243,29 @@ void setupPreferences() {
         preference->setIndented(true);
         preferences->addPreference(preference);
     }
+    {
+        auto getter = [myAvatar]()->int { if (myAvatar->getUserRecenterModel() == MyAvatar::SitStandModelType::Auto) {
+                                              return 0;
+                                          } else if (myAvatar->getUserRecenterModel() == MyAvatar::SitStandModelType::ForceSit) {
+                                              return 1;
+                                          } else {
+                                              return 2;
+                                          }};
+        auto setter = [myAvatar](int value) { if (value == 0) {
+                                                  myAvatar->setUserRecenterModel(MyAvatar::SitStandModelType::Auto);
+                                              } else if (value == 1) {
+                                                  myAvatar->setUserRecenterModel(MyAvatar::SitStandModelType::ForceSit);
+                                              } else {
+                                                  myAvatar->setUserRecenterModel(MyAvatar::SitStandModelType::DisableHMDLean);
+                                              }};
+        auto preference = new RadioButtonsPreference(VR_MOVEMENT, "Auto / Force Sit / Disable Recenter", getter, setter);
+        QStringList items;
+        items << "Auto" << "Force Sitting" << "Disable Recenter";
+        preference->setHeading("User Activity mode");
+        preference->setItems(items);
+        preferences->addPreference(preference);
+    }
+
     {
         auto getter = [myAvatar]()->int { return myAvatar->getSnapTurn() ? 0 : 1; };
         auto setter = [myAvatar](int value) { myAvatar->setSnapTurn(value == 0); };