From d5d0fbd9d8ecb58101fe960f875fd9d24d4af544 Mon Sep 17 00:00:00 2001
From: Philip Rosedale <philip@highfidelity.io>
Date: Fri, 24 Oct 2014 16:08:01 -0700
Subject: [PATCH] Hair gravity always the same

---
 interface/src/Hair.cpp            | 6 +++---
 interface/src/Hair.h              | 4 ++--
 interface/src/avatar/Avatar.cpp   | 1 -
 interface/src/avatar/MyAvatar.cpp | 1 -
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/interface/src/Hair.cpp b/interface/src/Hair.cpp
index 6ca0d4a899..acc00c14b0 100644
--- a/interface/src/Hair.cpp
+++ b/interface/src/Hair.cpp
@@ -38,7 +38,7 @@ Hair::Hair(int strands,
     _acceleration(0.0f),
     _angularVelocity(0.0f),
     _angularAcceleration(0.0f),
-    _gravity(0.0f),
+    _gravity(DEFAULT_GRAVITY),
     _loudness(0.0f)
 {
     _hairPosition = new glm::vec3[_strands * _links];
@@ -53,7 +53,7 @@ Hair::Hair(int strands,
     for (int strand = 0; strand < _strands; strand++) {
         float strandAngle = randFloat() * PI;
         float azimuth;
-        float elevation = PI_OVER_TWO - (randFloat() * 0.10f * PI);
+        float elevation = - (randFloat() * PI);
         azimuth = PI_OVER_TWO;
         if (randFloat() < 0.5f) {
             azimuth *= -1.0f;
@@ -127,7 +127,7 @@ void Hair::simulate(float deltaTime) {
                 _hairPosition[vertexIndex] += randVector() * (QUIESCENT_LOUDNESS + loudnessFactor) * ((float)link / (float)_links);
 
                 //  Add gravity
-                const float SCALE_GRAVITY = 0.13f;
+                const float SCALE_GRAVITY = 0.001f;
                 _hairPosition[vertexIndex] += _gravity * deltaTime * SCALE_GRAVITY;
                 
                 //  Add linear acceleration
diff --git a/interface/src/Hair.h b/interface/src/Hair.h
index f799140c53..94378dfd6a 100644
--- a/interface/src/Hair.h
+++ b/interface/src/Hair.h
@@ -25,9 +25,10 @@ const int HAIR_CONSTRAINTS = 2;
 
 const int DEFAULT_HAIR_STRANDS = 20;
 const int DEFAULT_HAIR_LINKS = 10;
-const float DEFAULT_HAIR_RADIUS = 0.15f;
+const float DEFAULT_HAIR_RADIUS = 0.075f;
 const float DEFAULT_HAIR_LINK_LENGTH = 0.06f;
 const float DEFAULT_HAIR_THICKNESS = 0.025f;
+const glm::vec3 DEFAULT_GRAVITY(0.0f, -9.8f, 0.0f);
 
 class Hair {
 public:
@@ -41,7 +42,6 @@ public:
     void setAcceleration(const glm::vec3& acceleration) { _acceleration = acceleration; }
     void setAngularVelocity(const glm::vec3& angularVelocity) { _angularVelocity = angularVelocity; }
     void setAngularAcceleration(const glm::vec3& angularAcceleration) { _angularAcceleration = angularAcceleration; }
-    void setGravity(const glm::vec3& gravity) { _gravity = gravity; }
     void setLoudness(const float loudness) { _loudness = loudness; }
     
 private:
diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp
index 169583b14b..b1c4b44104 100644
--- a/interface/src/avatar/Avatar.cpp
+++ b/interface/src/avatar/Avatar.cpp
@@ -191,7 +191,6 @@ void Avatar::simulate(float deltaTime) {
             _hair.setAcceleration(getAcceleration() * getHead()->getFinalOrientationInWorldFrame());
             _hair.setAngularVelocity((getAngularVelocity() + getHead()->getAngularVelocity()) * getHead()->getFinalOrientationInWorldFrame());
             _hair.setAngularAcceleration(getAngularAcceleration() * getHead()->getFinalOrientationInWorldFrame());
-            _hair.setGravity(Application::getInstance()->getEnvironment()->getGravity(getPosition()) * getHead()->getFinalOrientationInWorldFrame());
             _hair.setLoudness((float) getHeadData()->getAudioLoudness());
             _hair.simulate(deltaTime);
         }
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 4751abfd84..7576d42325 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -217,7 +217,6 @@ void MyAvatar::simulate(float deltaTime) {
             _hair.setAcceleration(getAcceleration() * getHead()->getFinalOrientationInWorldFrame());
             _hair.setAngularVelocity((getAngularVelocity() + getHead()->getAngularVelocity()) * getHead()->getFinalOrientationInWorldFrame());
             _hair.setAngularAcceleration(getAngularAcceleration() * getHead()->getFinalOrientationInWorldFrame());
-            _hair.setGravity(Application::getInstance()->getEnvironment()->getGravity(getPosition()) * getHead()->getFinalOrientationInWorldFrame());
             _hair.setLoudness((float)getHeadData()->getAudioLoudness());
             _hair.simulate(deltaTime);
         }