From 52c616b688dbef39886dec3745365b3969fedb63 Mon Sep 17 00:00:00 2001
From: Andrzej Kapolka <drzej.k@gmail.com>
Date: Wed, 12 Jun 2013 13:06:28 -0700
Subject: [PATCH] Added configurable lean scale, fixed loadSetting.

---
 interface/src/Application.cpp | 5 +++++
 interface/src/Avatar.cpp      | 7 ++++++-
 interface/src/Avatar.h        | 4 +++-
 interface/src/Util.cpp        | 4 ++--
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 489150c8a1..e3c7ca0bdf 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -880,6 +880,10 @@ void Application::editPreferences() {
     headCameraPitchYawScale->setValue(_headCameraPitchYawScale);
     form->addRow("Head Camera Pitch/Yaw Scale:", headCameraPitchYawScale);
     
+    QDoubleSpinBox* leanScale = new QDoubleSpinBox();
+    leanScale->setValue(_myAvatar.getLeanScale());
+    form->addRow("Lean Scale:", leanScale);
+    
     QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
     dialog.connect(buttons, SIGNAL(accepted()), SLOT(accept()));
     dialog.connect(buttons, SIGNAL(rejected()), SLOT(reject()));
@@ -893,6 +897,7 @@ void Application::editPreferences() {
     sendAvatarVoxelURLMessage(url);
     
     _headCameraPitchYawScale = headCameraPitchYawScale->value();
+    _myAvatar.setLeanScale(leanScale->value());
 }
 
 void Application::pair() {
diff --git a/interface/src/Avatar.cpp b/interface/src/Avatar.cpp
index 168fa80016..771ce8e7e5 100644
--- a/interface/src/Avatar.cpp
+++ b/interface/src/Avatar.cpp
@@ -79,6 +79,7 @@ Avatar::Avatar(Agent* owningAgent) :
     _thrust(0.0f, 0.0f, 0.0f),
     _speed(0.0f),
     _maxArmLength(0.0f),
+    _leanScale(0.5f),
     _pelvisStandingHeight(0.0f),
     _pelvisFloatingHeight(0.0f),
     _distanceToNearestAvatar(std::numeric_limits<float>::max()),
@@ -286,7 +287,7 @@ void Avatar::updateHeadFromGyros(float deltaTime, SerialInterface* serialInterfa
     _head.setRoll(estimatedRotation.z * AMPLIFY_ROLL);
         
     //  Update torso lean distance based on accelerometer data
-    glm::vec3 estimatedPosition = serialInterface->getEstimatedPosition();
+    glm::vec3 estimatedPosition = serialInterface->getEstimatedPosition() * _leanScale;
     const float TORSO_LENGTH = 0.5f;
     const float MAX_LEAN = 45.0f;
     _head.setLeanSideways(glm::clamp(glm::degrees(atanf(-estimatedPosition.x / TORSO_LENGTH)), -MAX_LEAN, MAX_LEAN));
@@ -1223,6 +1224,8 @@ void Avatar::loadData(QSettings* settings) {
     
     _voxels.setVoxelURL(settings->value("voxelURL").toUrl());
     
+    _leanScale = loadSetting(settings, "leanScale", 0.5f);
+    
     settings->endGroup();
 }
 
@@ -1244,6 +1247,8 @@ void Avatar::saveData(QSettings* set) {
     
     set->setValue("voxelURL", _voxels.getVoxelURL());
     
+    set->setValue("leanScale", _leanScale);
+    
     set->endGroup();
 }
 
diff --git a/interface/src/Avatar.h b/interface/src/Avatar.h
index 8391c81e96..34483b6d93 100644
--- a/interface/src/Avatar.h
+++ b/interface/src/Avatar.h
@@ -96,6 +96,7 @@ public:
     void setMovedHandOffset        (glm::vec3 movedHandOffset        ) { _movedHandOffset = movedHandOffset;}
     void setThrust                 (glm::vec3 newThrust              ) { _thrust          = newThrust; };
     void setDisplayingLookatVectors(bool      displayingLookatVectors) { _head.setRenderLookatVectors(displayingLookatVectors);}
+    void setLeanScale              (float     scale                  ) { _leanScale = scale;}
     void setGravity                (glm::vec3 gravity);
     void setMouseRay               (const glm::vec3 &origin, const glm::vec3 &direction);
     void setOrientation            (const glm::quat& orientation);
@@ -115,6 +116,7 @@ public:
     float            getSpeed                  ()                const { return _speed;}
     float            getHeight                 ()                const { return _height;}
     AvatarMode       getMode                   ()                const { return _mode;}
+    float            getLeanScale              ()                const { return _leanScale;}
     float            getAbsoluteHeadYaw        () const;
     float            getAbsoluteHeadPitch      () const;
     Head&            getHead                   () {return _head; }
@@ -182,7 +184,7 @@ private:
     glm::vec3   _thrust;
     float       _speed;
     float       _maxArmLength;
-    glm::quat   _righting;
+    float       _leanScale;
     int         _driveKeys[MAX_DRIVE_KEYS];
     float       _pelvisStandingHeight;
     float       _pelvisFloatingHeight;
diff --git a/interface/src/Util.cpp b/interface/src/Util.cpp
index 74fe5abd1c..cc566dd6fb 100644
--- a/interface/src/Util.cpp
+++ b/interface/src/Util.cpp
@@ -498,9 +498,9 @@ void runTimingTests() {
 }
 
 float loadSetting(QSettings* settings, const char* name, float defaultValue) {
-    float value = settings->value(name, 0.0f).toFloat();
+    float value = settings->value(name, defaultValue).toFloat();
     if (isnan(value)) {
         value = defaultValue;
     }
     return value;
-}
\ No newline at end of file
+}